summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-02 02:50:32 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-02 02:50:32 (GMT)
commit98649c60807d1635eb8d1c7a50261331fe8efe3f (patch)
tree79feab66b37dc7ed9088e0a7085ccec7de28960d
parente252eeac05980be37d841dd2c4bd65f64ae83ff0 (diff)
parent3ff4e3428c9f504bf20d20a4e0091c211340a507 (diff)
Master sync
-rw-r--r--kstars/auxiliary/imageviewer.cpp2
-rw-r--r--kstars/data/icons/advanced.pngbin2440 -> 0 bytes
-rw-r--r--kstars/data/icons/catalog.pngbin1700 -> 0 bytes
-rw-r--r--kstars/data/icons/cbound.pngbin1757 -> 0 bytes
-rw-r--r--kstars/data/icons/clines.pngbin654 -> 0 bytes
-rw-r--r--kstars/data/icons/cnames.pngbin1075 -> 0 bytes
-rw-r--r--kstars/data/icons/colors.pngbin3587 -> 0 bytes
-rw-r--r--kstars/data/icons/constellationart.pngbin1836 -> 0 bytes
-rw-r--r--kstars/data/icons/deepsky.pngbin1319 -> 0 bytes
-rw-r--r--kstars/data/icons/ekos.pngbin6488 -> 0 bytes
-rw-r--r--kstars/data/icons/fitsviewer.pngbin1980 -> 0 bytes
-rw-r--r--kstars/data/icons/flag.pngbin813 -> 0 bytes
-rw-r--r--kstars/data/icons/go-ne.svg63
-rw-r--r--kstars/data/icons/go-nw.svg63
-rw-r--r--kstars/data/icons/go-se.svg63
-rw-r--r--kstars/data/icons/go-sw.svg63
-rw-r--r--kstars/data/icons/grid.pngbin2025 -> 0 bytes
-rw-r--r--kstars/data/icons/guides.pngbin821 -> 0 bytes
-rw-r--r--kstars/data/icons/hgrid.pngbin2611 -> 0 bytes
-rw-r--r--kstars/data/icons/horizon.pngbin493 -> 0 bytes
-rw-r--r--kstars/data/icons/indi.pngbin3211 -> 0 bytes
-rw-r--r--kstars/data/icons/mw.pngbin932 -> 0 bytes
-rw-r--r--kstars/data/icons/planets.pngbin2544 -> 0 bytes
-rw-r--r--kstars/data/icons/satellites.pngbin2887 -> 0 bytes
-rw-r--r--kstars/data/icons/solarsystem.pngbin3382 -> 0 bytes
-rw-r--r--kstars/data/icons/stars.pngbin1026 -> 0 bytes
-rw-r--r--kstars/data/icons/supernovae.pngbin4062 -> 0 bytes
-rw-r--r--kstars/data/icons/xplanet.pngbin3014 -> 0 bytes
-rw-r--r--kstars/data/kstars.qrc34
-rw-r--r--kstars/dialogs/detaildialog.cpp11
-rw-r--r--kstars/dialogs/locationdialog.cpp6
-rw-r--r--kstars/ekos/align/align.cpp4
-rw-r--r--kstars/ekos/capture/capture.cpp38
-rw-r--r--kstars/ekos/ekosmanager.cpp4
-rw-r--r--kstars/ekos/mount/mount.cpp18
-rw-r--r--kstars/ekos/scheduler/mosaic.cpp2
-rw-r--r--kstars/ekos/scheduler/scheduler.cpp60
-rw-r--r--kstars/fitsviewer/fitsviewer.cpp34
-rw-r--r--kstars/indi/drivermanager.cpp12
-rw-r--r--kstars/indi/indiproperty.cpp2
-rw-r--r--kstars/indi/opsindi.cpp4
-rw-r--r--kstars/indi/streamwg.cpp6
-rw-r--r--kstars/kstars.cpp2
-rw-r--r--kstars/kstarsactions.cpp24
-rw-r--r--kstars/kstarsinit.cpp84
-rw-r--r--kstars/oal/observeradd.cpp4
-rw-r--r--kstars/skymap.cpp2
-rw-r--r--kstars/skyobjects/skyobject.cpp9
-rw-r--r--kstars/skyobjects/skyobject.h8
-rw-r--r--kstars/skyobjects/skypoint.cpp11
-rw-r--r--kstars/skyobjects/skypoint.h2
-rw-r--r--kstars/time/kstarsdatetime.cpp1
-rw-r--r--kstars/tools/altvstime.cpp2
-rw-r--r--kstars/tools/conjunctions.cpp2
-rw-r--r--kstars/tools/horizonmanager.cpp30
-rw-r--r--kstars/tools/observinglist.cpp35
-rw-r--r--kstars/tools/planetviewer.cpp12
-rw-r--r--kstars/tools/scriptbuilder.cpp20
-rw-r--r--kstars/tools/skycalendar.cpp2
59 files changed, 501 insertions, 238 deletions
diff --git a/kstars/auxiliary/imageviewer.cpp b/kstars/auxiliary/imageviewer.cpp
index 5dcfb6e..0e28948 100644
--- a/kstars/auxiliary/imageviewer.cpp
+++ b/kstars/auxiliary/imageviewer.cpp
@@ -154,7 +154,7 @@ void ImageViewer::init(QString caption, QString capText)
QPushButton *invertB = new QPushButton(i18n("Invert colors"));
invertB->setToolTip(i18n("Reverse colors of the image. This is useful to enhance contrast at times. This affects only the display and not the saving."));
- QPushButton *saveB = new QPushButton(QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.png")), i18n("Save"));
+ QPushButton *saveB = new QPushButton(QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.svg")), i18n("Save"));
saveB->setToolTip(i18n("Save the image to disk"));
buttonBox->addButton(invertB, QDialogButtonBox::ActionRole);
diff --git a/kstars/data/icons/advanced.png b/kstars/data/icons/advanced.png
deleted file mode 100644
index e53e8b2..0000000
--- a/kstars/data/icons/advanced.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/catalog.png b/kstars/data/icons/catalog.png
deleted file mode 100644
index 2d6bf22..0000000
--- a/kstars/data/icons/catalog.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/cbound.png b/kstars/data/icons/cbound.png
deleted file mode 100644
index b4a8cb4..0000000
--- a/kstars/data/icons/cbound.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/clines.png b/kstars/data/icons/clines.png
deleted file mode 100644
index 935ba26..0000000
--- a/kstars/data/icons/clines.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/cnames.png b/kstars/data/icons/cnames.png
deleted file mode 100644
index bec8544..0000000
--- a/kstars/data/icons/cnames.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/colors.png b/kstars/data/icons/colors.png
deleted file mode 100644
index 373e723..0000000
--- a/kstars/data/icons/colors.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/constellationart.png b/kstars/data/icons/constellationart.png
deleted file mode 100644
index 967b2fc..0000000
--- a/kstars/data/icons/constellationart.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/deepsky.png b/kstars/data/icons/deepsky.png
deleted file mode 100644
index c33515f..0000000
--- a/kstars/data/icons/deepsky.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/ekos.png b/kstars/data/icons/ekos.png
deleted file mode 100644
index cb41f64..0000000
--- a/kstars/data/icons/ekos.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/fitsviewer.png b/kstars/data/icons/fitsviewer.png
deleted file mode 100644
index 4e9da94..0000000
--- a/kstars/data/icons/fitsviewer.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/flag.png b/kstars/data/icons/flag.png
deleted file mode 100644
index 9d5134e..0000000
--- a/kstars/data/icons/flag.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/go-ne.svg b/kstars/data/icons/go-ne.svg
new file mode 100644
index 0000000..a47f877
--- /dev/null
+++ b/kstars/data/icons/go-ne.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ viewBox="0 0 24 24"
+ id="svg3513"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="go-ne.svg">
+ <metadata
+ id="metadata3521">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1288"
+ inkscape:window-height="838"
+ id="namedview3519"
+ showgrid="false"
+ inkscape:zoom="27.041667"
+ inkscape:cx="5.6394453"
+ inkscape:cy="11.94104"
+ inkscape:window-x="95"
+ inkscape:window-y="3"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3513" />
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ </style>
+ </defs>
+ <path
+ style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 15.0784,7.568084 -2.65165,0 -8.6620582,1e-7 10e-8,0.999893 8.6620581,-10e-8 1.651757,10e-8 0,1.6517579 0,8.662058 0.999893,0 0,-8.662059 0,-2.65165 z"
+ class="ColorScheme-Text"
+ id="path3517"
+ inkscape:connector-curvature="0" />
+</svg>
diff --git a/kstars/data/icons/go-nw.svg b/kstars/data/icons/go-nw.svg
new file mode 100644
index 0000000..4423c5d
--- /dev/null
+++ b/kstars/data/icons/go-nw.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ viewBox="0 0 24 24"
+ id="svg3513"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="go-nw.svg">
+ <metadata
+ id="metadata3521">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1288"
+ inkscape:window-height="838"
+ id="namedview3519"
+ showgrid="false"
+ inkscape:zoom="27.041667"
+ inkscape:cx="5.6394453"
+ inkscape:cy="11.94104"
+ inkscape:window-x="95"
+ inkscape:window-y="3"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3513" />
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ </style>
+ </defs>
+ <path
+ style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 3.7646914,7.5680844 0,2.6516496 0,8.662059 0.999893,0 0,-8.662059 0,-1.6517566 1.651758,0 8.6620576,0 0,-0.999893 -8.6620586,0 -2.65165,0 z"
+ class="ColorScheme-Text"
+ id="path3517"
+ inkscape:connector-curvature="0" />
+</svg>
diff --git a/kstars/data/icons/go-se.svg b/kstars/data/icons/go-se.svg
new file mode 100644
index 0000000..08fcf8a
--- /dev/null
+++ b/kstars/data/icons/go-se.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ viewBox="0 0 24 24"
+ id="svg3513"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="go-se.svg">
+ <metadata
+ id="metadata3521">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1288"
+ inkscape:window-height="838"
+ id="namedview3519"
+ showgrid="false"
+ inkscape:zoom="27.041667"
+ inkscape:cx="5.6394453"
+ inkscape:cy="11.94104"
+ inkscape:window-x="95"
+ inkscape:window-y="3"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3513" />
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ </style>
+ </defs>
+ <path
+ style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 15.0784,18.881793 0,-2.65165 0,-8.6620586 -0.999893,1e-7 0,8.6620585 0,1.651757 -1.651758,0 -8.6620576,0 0,0.999893 8.6620586,0 2.65165,0 z"
+ class="ColorScheme-Text"
+ id="path3517"
+ inkscape:connector-curvature="0" />
+</svg>
diff --git a/kstars/data/icons/go-sw.svg b/kstars/data/icons/go-sw.svg
new file mode 100644
index 0000000..bd1459b
--- /dev/null
+++ b/kstars/data/icons/go-sw.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ viewBox="0 0 24 24"
+ id="svg3513"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="go-sw.svg">
+ <metadata
+ id="metadata3521">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1288"
+ inkscape:window-height="838"
+ id="namedview3519"
+ showgrid="false"
+ inkscape:zoom="27.041667"
+ inkscape:cx="5.6394453"
+ inkscape:cy="11.94104"
+ inkscape:window-x="95"
+ inkscape:window-y="3"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3513" />
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ </style>
+ </defs>
+ <path
+ style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 3.7646914,18.881793 2.65165,0 8.6620586,0 0,-0.999893 -8.6620586,0 -1.651757,0 0,-1.651758 0,-8.6620576 -0.999893,0 0,8.6620586 0,2.65165 z"
+ class="ColorScheme-Text"
+ id="path3517"
+ inkscape:connector-curvature="0" />
+</svg>
diff --git a/kstars/data/icons/grid.png b/kstars/data/icons/grid.png
deleted file mode 100644
index 61a155a..0000000
--- a/kstars/data/icons/grid.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/guides.png b/kstars/data/icons/guides.png
deleted file mode 100644
index 8b4c67c..0000000
--- a/kstars/data/icons/guides.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/hgrid.png b/kstars/data/icons/hgrid.png
deleted file mode 100644
index cf01f62..0000000
--- a/kstars/data/icons/hgrid.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/horizon.png b/kstars/data/icons/horizon.png
deleted file mode 100644
index 0825ff6..0000000
--- a/kstars/data/icons/horizon.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/indi.png b/kstars/data/icons/indi.png
deleted file mode 100644
index e9c5949..0000000
--- a/kstars/data/icons/indi.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/mw.png b/kstars/data/icons/mw.png
deleted file mode 100644
index 4358107..0000000
--- a/kstars/data/icons/mw.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/planets.png b/kstars/data/icons/planets.png
deleted file mode 100644
index c7fa497..0000000
--- a/kstars/data/icons/planets.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/satellites.png b/kstars/data/icons/satellites.png
deleted file mode 100644
index abbd209..0000000
--- a/kstars/data/icons/satellites.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/solarsystem.png b/kstars/data/icons/solarsystem.png
deleted file mode 100644
index c7dc711..0000000
--- a/kstars/data/icons/solarsystem.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/stars.png b/kstars/data/icons/stars.png
deleted file mode 100644
index 62bc95f..0000000
--- a/kstars/data/icons/stars.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/supernovae.png b/kstars/data/icons/supernovae.png
deleted file mode 100644
index 68584ef..0000000
--- a/kstars/data/icons/supernovae.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/icons/xplanet.png b/kstars/data/icons/xplanet.png
deleted file mode 100644
index 599bf75..0000000
--- a/kstars/data/icons/xplanet.png
+++ /dev/null
Binary files differ
diff --git a/kstars/data/kstars.qrc b/kstars/data/kstars.qrc
index 7383e90..36368da 100644
--- a/kstars/data/kstars.qrc
+++ b/kstars/data/kstars.qrc
@@ -1,36 +1,18 @@
<RCC>
<qresource prefix="/">
- <file>icons/catalog.png</file>
- <file>icons/cbound.png</file>
- <file>icons/clines.png</file>
- <file>icons/cnames.png</file>
- <file>icons/colors.png</file>
- <file>icons/constellationart.png</file>
- <file>icons/deepsky.png</file>
<file>icons/ekos_align.png</file>
<file>icons/ekos_ccd.png</file>
<file>icons/ekos_focus.png</file>
+ <file>icons/go-nw.svg</file>
+ <file>icons/go-ne.svg</file>
+ <file>icons/go-sw.svg</file>
+ <file>icons/go-se.svg</file>
<file>icons/ekos_guide.png</file>
<file>icons/ekos_mount.png</file>
<file>icons/ekos_scheduler.png</file>
<file>icons/ekos_setup.png</file>
- <file>icons/ekos.png</file>
- <file>icons/fitsviewer.png</file>
- <file>icons/flag.png</file>
<file>icons/fov.png</file>
- <file>icons/grid.png</file>
- <file>icons/guides.png</file>
- <file>icons/hgrid.png</file>
- <file>icons/horizon.png</file>
- <file>icons/indi.png</file>
- <file>icons/mw.png</file>
- <file>icons/planets.png</file>
- <file>icons/satellites.png</file>
- <file>icons/solarsystem.png</file>
- <file>icons/stars.png</file>
- <file>icons/supernovae.png</file>
- <file>icons/xplanet.png</file>
- <file>icons/advanced.png</file>
+ <file>icons/histogram.png</file>
<file>icons/breeze/index.theme</file>
<file>icons/breeze/default/accessories-calculator.svg</file>
<file>icons/breeze/default/application-exit.svg</file>
@@ -132,6 +114,12 @@
<file>icons/breeze/default/kstars_fitsviewer.svg</file>
<file>icons/breeze/default/kstars_xplanet.svg</file>
<file>icons/breeze/default/kstars_flag.svg</file>
+ <file>icons/glstarbase.png</file>
+ <file>icons/go-ne.png</file>
+ <file>icons/go-nw.png</file>
+ <file>icons/go-se.png</file>
+ <file>icons/go-sw.png</file>
+ <file>icons/histogram.png</file>
</qresource>
<qresource prefix="/kconfig">
<file>kstars.knsrc</file>
diff --git a/kstars/dialogs/detaildialog.cpp b/kstars/dialogs/detaildialog.cpp
index 3a0df9b..227ada4 100644
--- a/kstars/dialogs/detaildialog.cpp
+++ b/kstars/dialogs/detaildialog.cpp
@@ -210,7 +210,7 @@ void DetailDialog::createGeneralTab()
Data->Illumination->setText(QString("%1 %").arg(QLocale().toString(((KSMoon*)selectedObject)->illum()*100., 'f', 0)));
((KSMoon *)selectedObject)->updateMag();
}
-
+
// JM: Shouldn't we use the calculated magnitude? Disabling the following
/*
if(selectedObject->type() == SkyObject::COMET){
@@ -450,11 +450,12 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo
//Coordinates Section:
//Don't use KLocale::formatNumber() for the epoch string,
//because we don't want a thousands-place separator!
- QString sEpoch = QString::number( ut.epoch(), 'f', 1 );
+ selectedObject->updateCoords( data->updateNum(), true, data->geo()->lat(), data->lst(), false );
+ QString sEpoch = QString::number( KStarsDateTime::jdToEpoch( selectedObject->getLastPrecessJD() ), 'f', 1 );
//Replace the decimal point with localized decimal symbol
- sEpoch.replace( '.', QLocale().decimalPoint() );
-
- qDebug() << (selectedObject->deprecess(data->updateNum(),2451545.0l)).ra0().toHMSString() << (selectedObject->deprecess(data->updateNum(),2451545.0l)).dec0().toDMSString() << endl;
+ sEpoch.replace( '.', QLocale().decimalPoint() ); // Is this necessary? -- asimha Oct 2016
+
+ qDebug() << (selectedObject->deprecess(data->updateNum())).ra0().toHMSString() << (selectedObject->deprecess(data->updateNum())).dec0().toDMSString() << endl;
//qDebug() << selectedObject->ra().toHMSString() << selectedObject->dec().toDMSString() << endl;
Pos->RALabel->setText( i18n( "RA (%1):", sEpoch ) );
Pos->DecLabel->setText( i18n( "Dec (%1):", sEpoch ) );
diff --git a/kstars/dialogs/locationdialog.cpp b/kstars/dialogs/locationdialog.cpp
index 40e8838..4c47e7d 100644
--- a/kstars/dialogs/locationdialog.cpp
+++ b/kstars/dialogs/locationdialog.cpp
@@ -68,9 +68,9 @@ LocationDialog::LocationDialog( QWidget* parent ) :
ld->DSTRuleBox->addItem( key );
}
- ld->AddCityButton->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.png")));
- ld->RemoveButton->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.png")));
- ld->UpdateButton->setIcon(QIcon::fromTheme("svn-update", QIcon(":/icons/breeze/default/svn-update.png")));
+ ld->AddCityButton->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.svg")));
+ ld->RemoveButton->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.svg")));
+ ld->UpdateButton->setIcon(QIcon::fromTheme("svn-update", QIcon(":/icons/breeze/default/svn-update.svg")));
connect( ld->CityFilter, SIGNAL( textChanged( const QString & ) ), this, SLOT( enqueueFilterCity() ) );
connect( ld->ProvinceFilter, SIGNAL( textChanged( const QString & ) ), this, SLOT( enqueueFilterCity() ) );
diff --git a/kstars/ekos/align/align.cpp b/kstars/ekos/align/align.cpp
index bc04608..e6bb973 100644
--- a/kstars/ekos/align/align.cpp
+++ b/kstars/ekos/align/align.cpp
@@ -117,8 +117,8 @@ Align::Align()
currentGotoMode = static_cast<GotoMode>(Options::solverGotoOption());
gotoModeButtonGroup->button(currentGotoMode)->setChecked(true);
- syncBoxesB->setIcon(QIcon::fromTheme("edit-copy", QIcon(":/icons/breeze/default/edit-copy.png")));
- clearBoxesB->setIcon(QIcon::fromTheme("edit-clear", QIcon(":/icons/breeze/default/edit-clear.png")));
+ syncBoxesB->setIcon(QIcon::fromTheme("edit-copy", QIcon(":/icons/breeze/default/edit-copy.svg")));
+ clearBoxesB->setIcon(QIcon::fromTheme("edit-clear", QIcon(":/icons/breeze/default/edit-clear.svg")));
raBox->setDegType(false); //RA box should be HMS-style
diff --git a/kstars/ekos/capture/capture.cpp b/kstars/ekos/capture/capture.cpp
index ce457b5..0e6135e 100644
--- a/kstars/ekos/capture/capture.cpp
+++ b/kstars/ekos/capture/capture.cpp
@@ -121,8 +121,8 @@ Capture::Capture()
connect(startB, SIGNAL(clicked()), this, SLOT(toggleSequence()));
connect(pauseB, SIGNAL(clicked()), this, SLOT(pause()));
- startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png") ));
- pauseB->setIcon(QIcon::fromTheme("media-playback-pause", QIcon(":/icons/breeze/default/media-playback-pause.png") ));
+ startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg") ));
+ pauseB->setIcon(QIcon::fromTheme("media-playback-pause", QIcon(":/icons/breeze/default/media-playback-pause.svg") ));
connect(binXIN, SIGNAL(valueChanged(int)), binYIN, SLOT(setValue(int)));
@@ -153,17 +153,17 @@ Capture::Capture()
connect(resetFrameB, SIGNAL(clicked()), this, SLOT(resetFrame()));
connect(calibrationB, SIGNAL(clicked()), this, SLOT(openCalibrationDialog()));
- addToQueueB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.png") ));
- removeFromQueueB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.png") ));
- queueUpB->setIcon(QIcon::fromTheme("go-up", QIcon(":/icons/breeze/default/go-up.png") ));
- queueDownB->setIcon(QIcon::fromTheme("go-down", QIcon(":/icons/go-down.png") ));
- selectFITSDirB->setIcon(QIcon::fromTheme("document-open-folder", QIcon(":/icons/breeze/default/document-open-folder.png") ));
- queueLoadB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.png") ));
- queueSaveB->setIcon(QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.png") ));
- queueSaveAsB->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/icons/breeze/default/document-save-as.png") ));
- resetB->setIcon(QIcon::fromTheme("system-reboot", QIcon(":/icons/breeze/default/system-reboot.png") ));
- resetFrameB->setIcon(QIcon::fromTheme("view-refresh", QIcon(":/icons/breeze/default/view-refresh.png") ));
- calibrationB->setIcon(QIcon::fromTheme("run-build", QIcon(":/icons/breeze/default/run-build.png") ));
+ addToQueueB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.svg") ));
+ removeFromQueueB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.svg") ));
+ queueUpB->setIcon(QIcon::fromTheme("go-up", QIcon(":/icons/breeze/default/go-up.svg") ));
+ queueDownB->setIcon(QIcon::fromTheme("go-down", QIcon(":/icons/breeze/default/go-down.svg") ));
+ selectFITSDirB->setIcon(QIcon::fromTheme("document-open-folder", QIcon(":/icons/breeze/default/document-open-folder.svg") ));
+ queueLoadB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.svg") ));
+ queueSaveB->setIcon(QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.svg") ));
+ queueSaveAsB->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/icons/breeze/default/document-save-as.svg") ));
+ resetB->setIcon(QIcon::fromTheme("system-reboot", QIcon(":/icons/breeze/default/system-reboot.svg") ));
+ resetFrameB->setIcon(QIcon::fromTheme("view-refresh", QIcon(":/icons/breeze/default/view-refresh.svg") ));
+ calibrationB->setIcon(QIcon::fromTheme("run-build", QIcon(":/icons/breeze/default/run-build.svg") ));
addToQueueB->setToolTip(i18n("Add job to sequence queue"));
removeFromQueueB->setToolTip(i18n("Remove job from sequence queue"));
@@ -266,7 +266,7 @@ void Capture::pause()
appendLogText(i18n("Sequence shall be paused after current exposure is complete."));
pauseB->setEnabled(false);
- startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png") ));
+ startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg") ));
startB->setToolTip(i18n("Resume Sequence"));
}
@@ -274,7 +274,7 @@ void Capture::toggleSequence()
{
if (state == CAPTURE_PAUSED)
{
- startB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.png") ));
+ startB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.svg") ));
startB->setToolTip(i18n("Stop Sequence"));
pauseB->setEnabled(true);
@@ -373,7 +373,7 @@ void Capture::start()
state = CAPTURE_PROGRESS;
emit newStatus(Ekos::CAPTURE_PROGRESS);
- startB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.png") ));
+ startB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.svg") ));
startB->setToolTip(i18n("Stop Sequence"));
pauseB->setEnabled(true);
@@ -442,7 +442,7 @@ void Capture::stop(bool abort)
if (abort)
{
- startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png") ));
+ startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg") ));
startB->setToolTip(i18n("Start Sequence"));
pauseB->setEnabled(false);
}
@@ -2584,7 +2584,7 @@ void Capture::editJob(QModelIndex i)
appendLogText(i18n("Editing job #%1...", i.row()+1));
- addToQueueB->setIcon(QIcon::fromTheme("dialog-ok-apply", QIcon(":/icons/breeze/default/dialog-ok-apply.png") ));
+ addToQueueB->setIcon(QIcon::fromTheme("dialog-ok-apply", QIcon(":/icons/breeze/default/dialog-ok-apply.svg") ));
addToQueueB->setToolTip(i18n("Apply job changes."));
removeFromQueueB->setToolTip(i18n("Cancel job changes."));
@@ -2598,7 +2598,7 @@ void Capture::resetJobEdit()
appendLogText(i18n("Editing job canceled."));
jobUnderEdit = false;
- addToQueueB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.png") ));
+ addToQueueB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.svg") ));
addToQueueB->setToolTip(i18n("Add job to sequence queue"));
removeFromQueueB->setToolTip(i18n("Remove job from sequence queue"));
diff --git a/kstars/ekos/ekosmanager.cpp b/kstars/ekos/ekosmanager.cpp
index 7559b10..3860166 100644
--- a/kstars/ekos/ekosmanager.cpp
+++ b/kstars/ekos/ekosmanager.cpp
@@ -123,9 +123,9 @@ EkosManager::EkosManager(QWidget *parent) : QDialog(parent)
connect(profileCombo, SIGNAL(activated(QString)), this, SLOT(saveDefaultProfile(QString)));
// Set Profile icons
- addProfileB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.png")));
+ addProfileB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.svg")));
editProfileB->setIcon(QIcon::fromTheme("document-edit", QIcon(":/icons/indi.png")));
- deleteProfileB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.png")));
+ deleteProfileB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.svg")));
// Load all drivers
loadDrivers();
diff --git a/kstars/ekos/mount/mount.cpp b/kstars/ekos/mount/mount.cpp
index 725b642..74e0d81 100644
--- a/kstars/ekos/mount/mount.cpp
+++ b/kstars/ekos/mount/mount.cpp
@@ -42,21 +42,21 @@ Mount::Mount()
currentTelescope = NULL;
- stopB->setIcon(QIcon::fromTheme("process-stop", QIcon(":/icons/breeze/default/process-stop.png")));
- northB->setIcon(QIcon::fromTheme("go-up", QIcon(":/icons/breeze/default/go-up.png")));
- westB->setIcon(QIcon::fromTheme("go-previous", QIcon(":/icons/breeze/default/go-previous.png")));
- eastB->setIcon(QIcon::fromTheme("go-next", QIcon(":/icons/breeze/default/go-next.png")));
- southB->setIcon(QIcon::fromTheme("go-down", QIcon(":/icons/breeze/default/go-down.png")));
+ stopB->setIcon(QIcon::fromTheme("process-stop", QIcon(":/icons/breeze/default/process-stop.svg")));
+ northB->setIcon(QIcon::fromTheme("go-up", QIcon(":/icons/breeze/default/go-up.svg")));
+ westB->setIcon(QIcon::fromTheme("go-previous", QIcon(":/icons/breeze/default/go-previous.svg")));
+ eastB->setIcon(QIcon::fromTheme("go-next", QIcon(":/icons/breeze/default/go-next.svg")));
+ southB->setIcon(QIcon::fromTheme("go-down", QIcon(":/icons/breeze/default/go-down.svg")));
abortDispatch = -1;
minAltLimit->setValue(Options::minimumAltLimit());
maxAltLimit->setValue(Options::maximumAltLimit());
- northwestB->setIcon(QIcon(":/icons/go-nw.png"));
- northeastB->setIcon(QIcon(":/icons/go-nw.png"));
- southwestB->setIcon(QIcon(":/icons/go-sw.png"));
- southeastB->setIcon(QIcon(":/icons/go-se.png"));
+ northwestB->setIcon(QIcon(":/icons/go-nw.svg"));
+ northeastB->setIcon(QIcon(":/icons/go-ne.svg"));
+ southwestB->setIcon(QIcon(":/icons/go-sw.svg"));
+ southeastB->setIcon(QIcon(":/icons/go-se.svg"));
connect(northB, SIGNAL(pressed()), this, SLOT(move()));
connect(northB, SIGNAL(released()), this, SLOT(stop()));
diff --git a/kstars/ekos/scheduler/mosaic.cpp b/kstars/ekos/scheduler/mosaic.cpp
index ef4514d..a085d57 100644
--- a/kstars/ekos/scheduler/mosaic.cpp
+++ b/kstars/ekos/scheduler/mosaic.cpp
@@ -220,7 +220,7 @@ Mosaic::Mosaic(Scheduler *scheduler)
scene.addItem(mosaicTile);
mosaicView->setScene(&scene);
- selectJobsDirB->setIcon(QIcon::fromTheme("document-open-folder", QIcon(":/icons/breeze/default/document-open-folder.png")));
+ selectJobsDirB->setIcon(QIcon::fromTheme("document-open-folder", QIcon(":/icons/breeze/default/document-open-folder.svg")));
//mosaicView->setResizeAnchor(QGraphicsView::AnchorViewCenter);
diff --git a/kstars/ekos/scheduler/scheduler.cpp b/kstars/ekos/scheduler/scheduler.cpp
index 60eca6e..cd3ace1 100644
--- a/kstars/ekos/scheduler/scheduler.cpp
+++ b/kstars/ekos/scheduler/scheduler.cpp
@@ -129,7 +129,7 @@ Scheduler::Scheduler()
moon = dynamic_cast<KSMoon*> (KStarsData::Instance()->skyComposite()->findByName("Moon"));
- sleepLabel->setPixmap(QIcon::fromTheme("chronometer", QIcon(":/icons/breeze/default/chronometer.png")).pixmap(QSize(32,32)));
+ sleepLabel->setPixmap(QIcon::fromTheme("chronometer", QIcon(":/icons/breeze/default/chronometer.svg")).pixmap(QSize(32,32)));
sleepLabel->hide();
schedulerTimer.setInterval(UPDATE_PERIOD_MS);
@@ -146,26 +146,26 @@ Scheduler::Scheduler()
raBox->setDegType(false); //RA box should be HMS-style
- addToQueueB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.png")));
+ addToQueueB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.svg")));
addToQueueB->setToolTip(i18n("Add observation job to list."));
- removeFromQueueB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.png")));
+ removeFromQueueB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.svg")));
removeFromQueueB->setToolTip(i18n("Remove observation job from list."));
- evaluateOnlyB->setIcon(QIcon::fromTheme("tools-wizard", QIcon(":/icons/breeze/default/tools-wizard.png")));
- mosaicB->setIcon(QIcon::fromTheme("zoom-draw", QIcon(":/icons/breeze/default/zoom-draw.png")));
+ evaluateOnlyB->setIcon(QIcon::fromTheme("tools-wizard", QIcon(":/icons/breeze/default/tools-wizard.svg")));
+ mosaicB->setIcon(QIcon::fromTheme("zoom-draw", QIcon(":/icons/breeze/default/zoom-draw.svg")));
- queueSaveAsB->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/icons/breeze/default/document-save-as.png")));
- queueSaveB->setIcon(QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.png")));
- queueLoadB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.png")));
+ queueSaveAsB->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/icons/breeze/default/document-save-as.svg")));
+ queueSaveB->setIcon(QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.svg")));
+ queueLoadB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.svg")));
- loadSequenceB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.png")));
- selectStartupScriptB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.png")));
- selectShutdownScriptB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.png")));
- selectFITSB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.png")));
+ loadSequenceB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.svg")));
+ selectStartupScriptB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.svg")));
+ selectShutdownScriptB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.svg")));
+ selectFITSB->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.svg")));
- startupB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png")));
- shutdownB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png")));
+ startupB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg")));
+ shutdownB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg")));
connect(startupB, SIGNAL(clicked()), this, SLOT(runStartupProcedure()));
connect(shutdownB, SIGNAL(clicked()), this, SLOT(runShutdownProcedure()));
@@ -183,8 +183,8 @@ Scheduler::Scheduler()
connect(queueTable, SIGNAL(clicked(QModelIndex)), this, SLOT(loadJob(QModelIndex)));
connect(queueTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(resetJobState(QModelIndex)));
- startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png")));
- pauseB->setIcon(QIcon::fromTheme("media-playback-pause", QIcon(":/icons/breeze/default/media-playback-pause.png")));
+ startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg")));
+ pauseB->setIcon(QIcon::fromTheme("media-playback-pause", QIcon(":/icons/breeze/default/media-playback-pause.svg")));
connect(startB,SIGNAL(clicked()),this,SLOT(toggleScheduler()));
connect(pauseB,SIGNAL(clicked()),this,SLOT(pause()));
@@ -732,7 +732,7 @@ void Scheduler::loadJob(QModelIndex i)
appendLogText(i18n("Editing job #%1...", i.row()+1));
- addToQueueB->setIcon(QIcon::fromTheme("edit-undo", QIcon(":/icons/breeze/default/edit-undo.png")));
+ addToQueueB->setIcon(QIcon::fromTheme("edit-undo", QIcon(":/icons/breeze/default/edit-undo.svg")));
addToQueueB->setStyleSheet("background-color:orange;}");
addToQueueB->setEnabled(true);
startB->setEnabled(false);
@@ -755,7 +755,7 @@ void Scheduler::resetJobEdit()
watchJobChanges(false);
- addToQueueB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.png")));
+ addToQueueB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.svg")));
addToQueueB->setStyleSheet(QString());
addToQueueB->setToolTip(i18n("Add observation job to list."));
queueTable->clearSelection();
@@ -918,7 +918,7 @@ void Scheduler::stop()
sleepLabel->hide();
pi->stopAnimation();
- startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png")));
+ startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg")));
startB->setToolTip(i18n("Start Scheduler"));
pauseB->setEnabled(false);
//startB->setText("Start Scheduler");
@@ -939,7 +939,7 @@ void Scheduler::start()
state = SCHEDULER_RUNNIG;
appendLogText(i18n("Scheduler resumed."));
- startB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.png")));
+ startB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.svg")));
startB->setToolTip(i18n("Stop Scheduler"));
return;
}
@@ -966,7 +966,7 @@ void Scheduler::start()
sleepLabel->hide();
//startB->setText("Stop Scheduler");
- startB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.png")));
+ startB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.svg")));
startB->setToolTip(i18n("Stop Scheduler"));
pauseB->setEnabled(true);
@@ -1006,7 +1006,7 @@ void Scheduler::pause()
appendLogText(i18n("Scheduler paused."));
pauseB->setEnabled(false);
- startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png")));
+ startB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg")));
startB->setToolTip(i18n("Resume Scheduler"));
}
@@ -1615,19 +1615,19 @@ void Scheduler::checkWeather()
qDebug() << "Scheduler: " << statusString;
if (weatherStatus == IPS_OK)
- weatherLabel->setPixmap(QIcon::fromTheme("security-high", QIcon(":/icons/breeze/default/security-high.png")).pixmap(QSize(32,32)));
+ weatherLabel->setPixmap(QIcon::fromTheme("security-high", QIcon(":/icons/breeze/default/security-high.svg")).pixmap(QSize(32,32)));
else if (weatherStatus == IPS_BUSY)
{
- weatherLabel->setPixmap(QIcon::fromTheme("security-medium", QIcon(":/icons/breeze/default/security-medium.png")).pixmap(QSize(32,32)));
+ weatherLabel->setPixmap(QIcon::fromTheme("security-medium", QIcon(":/icons/breeze/default/security-medium.svg")).pixmap(QSize(32,32)));
KNotification::event( QLatin1String( "WeatherWarning" ) , i18n("Weather conditions in warning zone"));
}
else if (weatherStatus == IPS_ALERT)
{
- weatherLabel->setPixmap(QIcon::fromTheme("security-low", QIcon(":/icons/breeze/default/security-low.png")).pixmap(QSize(32,32)));
+ weatherLabel->setPixmap(QIcon::fromTheme("security-low", QIcon(":/icons/breeze/default/security-low.svg")).pixmap(QSize(32,32)));
KNotification::event( QLatin1String( "WeatherAlert" ) , i18n("Weather conditions are critical. Observatory shutdown is imminent"));
}
else
- weatherLabel->setPixmap(QIcon::fromTheme("chronometer", QIcon(":/icons/breeze/default/chronometer.png")).pixmap(QSize(32,32)));
+ weatherLabel->setPixmap(QIcon::fromTheme("chronometer", QIcon(":/icons/breeze/default/chronometer.svg")).pixmap(QSize(32,32)));
weatherLabel->show();
weatherLabel->setToolTip(statusString);
@@ -4501,7 +4501,7 @@ void Scheduler::checkStartupProcedure()
else if (startupState == STARTUP_ERROR)
appendLogText(i18n("Manual startup procedure terminated due to errors."));
- startupB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png")));
+ startupB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg")));
}
}
@@ -4512,7 +4512,7 @@ void Scheduler::runStartupProcedure()
if (KMessageBox::questionYesNo(NULL, i18n("Are you sure you want to execute the startup procedure manually?")) == KMessageBox::Yes)
{
appendLogText(i18n("Warning! Executing startup procedure manually..."));
- startupB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.png")));
+ startupB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.svg")));
startupState = STARTUP_IDLE;
checkStartupState();
QTimer::singleShot(1000, this, SLOT(checkStartupProcedure()));
@@ -4577,7 +4577,7 @@ void Scheduler::checkShutdownProcedure()
appendLogText(i18n("Manual shutdown procedure terminated due to errors."));
shutdownState = SHUTDOWN_IDLE;
- shutdownB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png")));
+ shutdownB->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg")));
}
}
@@ -4589,7 +4589,7 @@ void Scheduler::runShutdownProcedure()
if (KMessageBox::questionYesNo(NULL, i18n("Are you sure you want to execute the shutdown procedure manually?")) == KMessageBox::Yes)
{
appendLogText(i18n("Warning! Executing shutdown procedure manually..."));
- shutdownB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.png")));
+ shutdownB->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/breeze/default/media-playback-stop.svg")));
shutdownState = SHUTDOWN_IDLE;
checkShutdownState();
QTimer::singleShot(1000, this, SLOT(checkShutdownProcedure()));
diff --git a/kstars/fitsviewer/fitsviewer.cpp b/kstars/fitsviewer/fitsviewer.cpp
index 222fb1a..07adc94 100644
--- a/kstars/fitsviewer/fitsviewer.cpp
+++ b/kstars/fitsviewer/fitsviewer.cpp
@@ -104,19 +104,19 @@ FITSViewer::FITSViewer (QWidget *parent)
action = actionCollection()->addAction("rotate_right", this, SLOT(rotateCW()));
action->setText(i18n("Rotate Right"));
- action->setIcon(QIcon::fromTheme("object-rotate-right", QIcon(":/icons/breeze/default/object-rotate-right.png")));
+ action->setIcon(QIcon::fromTheme("object-rotate-right", QIcon(":/icons/breeze/default/object-rotate-right.svg")));
action = actionCollection()->addAction("rotate_left", this, SLOT(rotateCCW()));
action->setText(i18n("Rotate Left"));
- action->setIcon(QIcon::fromTheme("object-rotate-left", QIcon(":/icons/breeze/default/object-rotate-left.png")));
+ action->setIcon(QIcon::fromTheme("object-rotate-left", QIcon(":/icons/breeze/default/object-rotate-left.svg")));
action = actionCollection()->addAction("flip_horizontal", this, SLOT(flipHorizontal()));
action->setText(i18n("Flip Horizontal"));
- action->setIcon(QIcon::fromTheme("object-flip-horizontal", QIcon(":/icons/breeze/default/object-flip-horizontal.png")));
+ action->setIcon(QIcon::fromTheme("object-flip-horizontal", QIcon(":/icons/breeze/default/object-flip-horizontal.svg")));
action = actionCollection()->addAction("flip_vertical", this, SLOT(flipVertical()));
action->setText(i18n("Flip Vertical"));
- action->setIcon(QIcon::fromTheme("object-flip-vertical", QIcon(":/icons/breeze/default/object-flip-vertical.png")));
+ action->setIcon(QIcon::fromTheme("object-flip-vertical", QIcon(":/icons/breeze/default/object-flip-vertical.svg")));
action = actionCollection()->addAction("image_histogram");
action->setText(i18n("Histogram"));
@@ -126,23 +126,23 @@ FITSViewer::FITSViewer (QWidget *parent)
action->setIcon(QIcon(":/icons/histogram.png"));
action = KStandardAction::open(this, SLOT(openFile()), actionCollection());
- action->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.png")));
+ action->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.svg")));
saveFileAction = KStandardAction::save(this, SLOT(saveFile()), actionCollection());
- saveFileAction->setIcon(QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.png")));
+ saveFileAction->setIcon(QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.svg")));
action=saveFileAsAction = KStandardAction::saveAs(this, SLOT(saveFileAs()), actionCollection());
- saveFileAsAction->setIcon(QIcon::fromTheme("document-save_as", QIcon(":/icons/breeze/default/document-save-as.png")));
+ saveFileAsAction->setIcon(QIcon::fromTheme("document-save_as", QIcon(":/icons/breeze/default/document-save-as.svg")));
action = actionCollection()->addAction("fits_header");
actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL+Qt::Key_H));
- action->setIcon(QIcon::fromTheme("document-properties", QIcon(":/icons/breeze/default/document-properties.png")));
+ action->setIcon(QIcon::fromTheme("document-properties", QIcon(":/icons/breeze/default/document-properties.svg")));
action->setText(i18n( "FITS Header"));
connect(action, SIGNAL(triggered(bool) ), SLOT(headerFITS()));
action = actionCollection()->addAction("fits_debayer");
actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL+Qt::Key_D));
- action->setIcon(QIcon::fromTheme("view-preview", QIcon(":/icons/breeze/default/view-preview.png")));
+ action->setIcon(QIcon::fromTheme("view-preview", QIcon(":/icons/breeze/default/view-preview.svg")));
action->setText(i18n( "Debayer..."));
connect(action, SIGNAL(triggered(bool) ), SLOT(debayerFITS()));
@@ -150,34 +150,34 @@ FITSViewer::FITSViewer (QWidget *parent)
action->setText(i18n("Auto stretch"));
connect(action, SIGNAL(triggered(bool)), SLOT (stretchFITS()));
actionCollection()->setDefaultShortcut(action, QKeySequence::SelectAll);
- action->setIcon(QIcon::fromTheme("transform-move", QIcon(":/icons/breeze/default/transform-move.png")));
+ action->setIcon(QIcon::fromTheme("transform-move", QIcon(":/icons/breeze/default/transform-move.svg")));
action = KStandardAction::close(this, SLOT(close()), actionCollection());
- action->setIcon(QIcon::fromTheme("window-close", QIcon(":/icons/breeze/default/window-close.png")));
+ action->setIcon(QIcon::fromTheme("window-close", QIcon(":/icons/breeze/default/window-close.svg")));
action = KStandardAction::copy(this, SLOT(copyFITS()), actionCollection());
- action->setIcon(QIcon::fromTheme("edit-copy", QIcon(":/icons/breeze/default/edit-copy.png")));
+ action->setIcon(QIcon::fromTheme("edit-copy", QIcon(":/icons/breeze/default/edit-copy.svg")));
action=KStandardAction::zoomIn(this, SLOT(ZoomIn()), actionCollection());
- action->setIcon(QIcon::fromTheme("zoom-in", QIcon(":/icons/breeze/default/zoom-in.png")));
+ action->setIcon(QIcon::fromTheme("zoom-in", QIcon(":/icons/breeze/default/zoom-in.svg")));
action=KStandardAction::zoomOut(this, SLOT(ZoomOut()), actionCollection());
- action->setIcon(QIcon::fromTheme("zoom-out", QIcon(":/icons/breeze/default/zoom-out.png")));
+ action->setIcon(QIcon::fromTheme("zoom-out", QIcon(":/icons/breeze/default/zoom-out.svg")));
action=KStandardAction::actualSize(this, SLOT(ZoomDefault()), actionCollection());
action->setIcon(QIcon::fromTheme("zoom-fit-best", QIcon(":/icons/breeze/default/zoom-fit-best.svg")));
QAction *kundo = KStandardAction::undo(undoGroup, SLOT(undo()), actionCollection());
- kundo->setIcon(QIcon::fromTheme("edit-undo", QIcon(":/icons/breeze/default/edit-undo.png")));
+ kundo->setIcon(QIcon::fromTheme("edit-undo", QIcon(":/icons/breeze/default/edit-undo.svg")));
QAction *kredo = KStandardAction::redo(undoGroup, SLOT(redo()), actionCollection());
- kredo->setIcon(QIcon::fromTheme("edit-redo", QIcon(":/icons/breeze/default/edit-redo.png")));
+ kredo->setIcon(QIcon::fromTheme("edit-redo", QIcon(":/icons/breeze/default/edit-redo.svg")));
connect(undoGroup, SIGNAL(canUndoChanged(bool)), kundo, SLOT(setEnabled(bool)));
connect(undoGroup, SIGNAL(canRedoChanged(bool)), kredo, SLOT(setEnabled(bool)));
action = actionCollection()->addAction("image_stats");
- action->setIcon(QIcon::fromTheme("view-statistics", QIcon(":/icons/breeze/default/view-statistics.png")));
+ action->setIcon(QIcon::fromTheme("view-statistics", QIcon(":/icons/breeze/default/view-statistics.svg")));
action->setText(i18n( "Statistics"));
connect(action, SIGNAL(triggered(bool)), SLOT(statFITS()));
diff --git a/kstars/indi/drivermanager.cpp b/kstars/indi/drivermanager.cpp
index 70ac9eb..58c0f94 100644
--- a/kstars/indi/drivermanager.cpp
+++ b/kstars/indi/drivermanager.cpp
@@ -60,13 +60,13 @@ DriverManagerUI::DriverManagerUI(QWidget *parent) : QFrame(parent)
clientTreeWidget->setSortingEnabled(false);
- runningPix = QIcon::fromTheme( "system-run" , QIcon(":/icons/breeze/default/system-run.png"));
- stopPix = QIcon::fromTheme( "dialog-cancel" , QIcon(":/icons/breeze/default/dialog-cancel.png"));
- localMode = QIcon::fromTheme( "computer" , QIcon(":/icons/breeze/default/computer.png"));
- serverMode = QIcon::fromTheme( "network-server" , QIcon(":/icons/breeze/default/network-server.png"));
+ runningPix = QIcon::fromTheme( "system-run" , QIcon(":/icons/breeze/default/system-run.svg"));
+ stopPix = QIcon::fromTheme( "dialog-cancel" , QIcon(":/icons/breeze/default/dialog-cancel.svg"));
+ localMode = QIcon::fromTheme( "computer" , QIcon(":/icons/breeze/default/computer.svg"));
+ serverMode = QIcon::fromTheme( "network-server" , QIcon(":/icons/breeze/default/network-server.svg"));
- connected = QIcon::fromTheme( "network-connect" , QIcon(":/icons/breeze/default/network-connect.png"));
- disconnected = QIcon::fromTheme( "network-disconnect" , QIcon(":/icons/breeze/default/network-disconnect.png"));
+ connected = QIcon::fromTheme( "network-connect" , QIcon(":/icons/breeze/default/network-connect.svg"));
+ disconnected = QIcon::fromTheme( "network-disconnect" , QIcon(":/icons/breeze/default/network-disconnect.svg"));
connect(localTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(makePortEditable(QTreeWidgetItem*,int)));
}
diff --git a/kstars/indi/indiproperty.cpp b/kstars/indi/indiproperty.cpp
index 3fc5494..ccad01e 100644
--- a/kstars/indi/indiproperty.cpp
+++ b/kstars/indi/indiproperty.cpp
@@ -341,7 +341,7 @@ void INDI_P::buildBLOBGUI()
PHBox->addItem(horSpacer);
enableBLOBC = new QCheckBox();
- enableBLOBC->setIcon(QIcon::fromTheme("modem", QIcon(":/icons/breeze/default/modem.png")));
+ enableBLOBC->setIcon(QIcon::fromTheme("modem", QIcon(":/icons/breeze/default/modem.svg")));
enableBLOBC->setChecked(true);
enableBLOBC->setToolTip(i18n("Enable binary data transfer from this property to KStars and vice-versa."));
diff --git a/kstars/indi/opsindi.cpp b/kstars/indi/opsindi.cpp
index f75b667..1d20c07 100644
--- a/kstars/indi/opsindi.cpp
+++ b/kstars/indi/opsindi.cpp
@@ -39,8 +39,8 @@ OpsINDI::OpsINDI()
else
kcfg_fitsDir->setText ( Options::fitsDir());
- selectFITSDirB->setIcon( QIcon::fromTheme( "document-open-folder", QIcon(":/icons/breeze/default/document-open-folder.png")) );
- selectDriversDirB->setIcon( QIcon::fromTheme( "document-open-folder", QIcon(":/icons/breeze/default/document-open-folder.png")) );
+ selectFITSDirB->setIcon( QIcon::fromTheme( "document-open-folder", QIcon(":/icons/breeze/default/document-open-folder.svg")) );
+ selectDriversDirB->setIcon( QIcon::fromTheme( "document-open-folder", QIcon(":/icons/breeze/default/document-open-folder.svg")) );
connect(selectFITSDirB, SIGNAL(clicked()), this, SLOT(saveFITSDirectory()));
connect(selectDriversDirB, SIGNAL(clicked()), this, SLOT(saveDriversDirectory()));
diff --git a/kstars/indi/streamwg.cpp b/kstars/indi/streamwg.cpp
index 202219a..5d5cf19 100644
--- a/kstars/indi/streamwg.cpp
+++ b/kstars/indi/streamwg.cpp
@@ -49,9 +49,9 @@ StreamWG::StreamWG(QWidget * parent) : QWidget(parent)
streamFrame = new VideoWG(videoFrame);
- playPix = QIcon::fromTheme( "media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.png"));
- pausePix = QIcon::fromTheme( "media-playback-pause", QIcon(":/icons/breeze/default/media-playback-pause.png"));
- capturePix = QIcon::fromTheme( "media-record", QIcon(":/icons/breeze/default/media-record.png"));
+ playPix = QIcon::fromTheme( "media-playback-start", QIcon(":/icons/breeze/default/media-playback-start.svg"));
+ pausePix = QIcon::fromTheme( "media-playback-pause", QIcon(":/icons/breeze/default/media-playback-pause.svg"));
+ capturePix = QIcon::fromTheme( "media-record", QIcon(":/icons/breeze/default/media-record.svg"));
foreach (const QByteArray &format, QImageWriter::supportedImageFormats())
imgFormatCombo->addItem(QString(format));
diff --git a/kstars/kstars.cpp b/kstars/kstars.cpp
index 6e8ce58..5a383d1 100644
--- a/kstars/kstars.cpp
+++ b/kstars/kstars.cpp
@@ -206,7 +206,7 @@ void KStars::clearCachedFindDialog() {
void KStars::applyConfig( bool doApplyFocus ) {
if ( Options::isTracking() ) {
actionCollection()->action("track_object")->setText( i18n( "Stop &Tracking" ) );
- actionCollection()->action("track_object")->setIcon( QIcon::fromTheme("document-encrypt", QIcon(":/icons/breeze/default/document-encrypt.png")) );
+ actionCollection()->action("track_object")->setIcon( QIcon::fromTheme("document-encrypt", QIcon(":/icons/breeze/default/document-encrypt.svg")) );
}
actionCollection()->action("coordsys")->setText(
diff --git a/kstars/kstarsactions.cpp b/kstars/kstarsactions.cpp
index 291b95f..0a37957 100644
--- a/kstars/kstarsactions.cpp
+++ b/kstars/kstarsactions.cpp
@@ -656,32 +656,32 @@ void KStars::slotViewOps() {
KPageWidgetItem *page;
page = dialog->addPage(opcatalog, i18n("Catalogs"), "kstars_catalog");
- page->setIcon(QIcon::fromTheme("kstars_catalog", QIcon(":/icons/catalog.png")));
+ page->setIcon(QIcon::fromTheme("kstars_catalog", QIcon(":/icons/breeze/default/kstars_catalog.svg")));
page = dialog->addPage(opsolsys, i18n("Solar System"), "kstars_solarsystem");
- page->setIcon(QIcon::fromTheme("kstars_solarsystem", QIcon(":/icons/solarsystem.png")));
+ page->setIcon(QIcon::fromTheme("kstars_solarsystem", QIcon(":/icons/breeze/default/kstars_solarsystem.svg")));
page = dialog->addPage(opssatellites, i18n("Satellites"), "kstars_satellites");
- page->setIcon(QIcon::fromTheme("kstars_satellites", QIcon(":/icons/satellites.png")));
+ page->setIcon(QIcon::fromTheme("kstars_satellites", QIcon(":/icons/breeze/default/kstars_satellites.svg")));
page = dialog->addPage(opssupernovae, i18n("Supernovae"), "kstars_supernovae");
- page->setIcon(QIcon::fromTheme("kstars_supernovae", QIcon(":/icons/supernovae.png")));
+ page->setIcon(QIcon::fromTheme("kstars_supernovae", QIcon(":/icons/breeze/default/kstars_supernovae.svg")));
page = dialog->addPage(opguides, i18n("Guides"), "kstars_guides");
- page->setIcon(QIcon::fromTheme("kstars_guides", QIcon(":/icons/guides.png")));
+ page->setIcon(QIcon::fromTheme("kstars_guides", QIcon(":/icons/breeze/default/kstars_guides.svg")));
page = dialog->addPage(opcolors, i18n("Colors"), "kstars_colors");
- page->setIcon(QIcon::fromTheme("kstars_colors", QIcon(":/icons/colors.png")));
+ page->setIcon(QIcon::fromTheme("kstars_colors", QIcon(":/icons/breeze/default/kstars_colors.svg")));
#ifdef HAVE_INDI
opsindi = new OpsINDI();
page= dialog->addPage(opsindi, i18n("INDI"), "kstars_indi");
- page->setIcon(QIcon::fromTheme("kstars_indi", QIcon(":/icons/indi.png")));
+ page->setIcon(QIcon::fromTheme("kstars_indi", QIcon(":/icons/breeze/default/kstars_indi.svg")));
#ifdef HAVE_CFITSIO
opsekos = new OpsEkos();
KPageWidgetItem *ekosOption = dialog->addPage(opsekos, i18n("Ekos"), "kstars_ekos");
- ekosOption->setIcon(QIcon::fromTheme("kstars_ekos", QIcon(":/icons/ekos.png")));
+ ekosOption->setIcon(QIcon::fromTheme("kstars_ekos", QIcon(":/icons/breeze/default/kstars_ekos.svg")));
if (m_EkosManager)
m_EkosManager->setOptionsWidget(ekosOption);
#endif
@@ -691,11 +691,11 @@ void KStars::slotViewOps() {
#ifdef HAVE_XPLANET
opsxplanet = new OpsXplanet( this );
page = dialog->addPage(opsxplanet, i18n("Xplanet"), "kstars_xplanet");
- page->setIcon(QIcon::fromTheme("kstars_xplanet", QIcon(":/icons/xplanet.png")));
+ page->setIcon(QIcon::fromTheme("kstars_xplanet", QIcon(":/icons/breeze/default/kstars_xplanet.svg")));
#endif
page=dialog->addPage(opadvanced, i18n("Advanced"), "kstars_advanced");
- page->setIcon(QIcon::fromTheme("kstars_advanced", QIcon(":/icons/advanced.png")));
+ page->setIcon(QIcon::fromTheme("kstars_advanced", QIcon(":/icons/breeze/default/kstars_advanced.svg")));
dialog->show();
}
@@ -1103,7 +1103,7 @@ void KStars::slotTrack() {
if ( Options::isTracking() ) {
Options::setIsTracking( false );
actionCollection()->action("track_object")->setText( i18n( "Engage &Tracking" ) );
- actionCollection()->action("track_object")->setIcon( QIcon::fromTheme("document-decrypt", QIcon(":/icons/breeze/default/document-encrypt.png")) );
+ actionCollection()->action("track_object")->setIcon( QIcon::fromTheme("document-decrypt", QIcon(":/icons/breeze/default/document-encrypt.svg")) );
KSPlanetBase* planet = dynamic_cast<KSPlanetBase*>( map()->focusObject() );
if( planet && data()->temporaryTrail ) {
@@ -1121,7 +1121,7 @@ void KStars::slotTrack() {
map()->setFocusPoint( map()->clickedPoint() );
Options::setIsTracking( true );
actionCollection()->action("track_object")->setText( i18n( "Stop &Tracking" ) );
- actionCollection()->action("track_object")->setIcon( QIcon::fromTheme("document-encrypt", QIcon(":/icons/breeze/default/document-encrypt.png")) );
+ actionCollection()->action("track_object")->setIcon( QIcon::fromTheme("document-encrypt", QIcon(":/icons/breeze/default/document-encrypt.svg")) );
}
map()->forceUpdate();
diff --git a/kstars/kstarsinit.cpp b/kstars/kstarsinit.cpp
index cdbcf0b..92560bc 100644
--- a/kstars/kstarsinit.cpp
+++ b/kstars/kstarsinit.cpp
@@ -148,7 +148,7 @@ void KStars::initActions() {
// ==== File menu ================
ka = KNS3::standardAction(i18n("Download New Data..."), this, SLOT(slotDownload()), actionCollection(), "get_data")
<< QKeySequence( Qt::CTRL+Qt::Key_N );
- ka ->setIcon(QIcon::fromTheme("favorites" , QIcon(":/icons/breeze/default/favorites.png")));
+ ka ->setIcon(QIcon::fromTheme("favorites" , QIcon(":/icons/breeze/default/favorites.svg")));
ka->setWhatsThis(i18n("Downloads new data"));
ka->setToolTip(ka->whatsThis());
ka->setStatusTip(ka->whatsThis());
@@ -157,39 +157,39 @@ void KStars::initActions() {
#ifdef HAVE_CFITSIO
actionCollection()->addAction("open_file", this, SLOT(slotOpenFITS()) )
<< i18n("Open FITS...")
- << QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.png"))
+ << QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.svg"))
<< QKeySequence( Qt::CTRL+Qt::Key_O );
#endif
actionCollection()->addAction("export_image", this, SLOT( slotExportImage() ) )
<< i18n("&Save Sky Image...")
- << QIcon::fromTheme("document-export-image", QIcon(":/icons/breeze/default/document-export.png"))
+ << QIcon::fromTheme("document-export-image", QIcon(":/icons/breeze/default/document-export.svg"))
<< QKeySequence( Qt::CTRL+Qt::Key_I );
actionCollection()->addAction("run_script", this, SLOT( slotRunScript() ))
<< i18n("&Run Script...")
- << QIcon::fromTheme("system-run", QIcon(":/icons/breeze/default/system-run.png"))
+ << QIcon::fromTheme("system-run", QIcon(":/icons/breeze/default/system-run.svg"))
<< QKeySequence( Qt::CTRL+Qt::Key_R );
actionCollection()->addAction("printing_wizard", this, SLOT(slotPrintingWizard() ) )
<< i18nc("start Printing Wizard", "Printing &Wizard");
ka = actionCollection()->addAction( KStandardAction::Print, "print", this, SLOT( slotPrint() ) );
- ka->setIcon( QIcon::fromTheme("document-print", QIcon(":/icons/breeze/default/document-print.png")));
+ ka->setIcon( QIcon::fromTheme("document-print", QIcon(":/icons/breeze/default/document-print.svg")));
//actionCollection()->addAction( KStandardAction::Quit, "quit", this, SLOT(close) );
ka = actionCollection()->addAction( KStandardAction::Quit, "quit", qApp, SLOT(closeAllWindows()));
- ka->setIcon( QIcon::fromTheme("application-exit", QIcon(":/icons/breeze/default/application-exit.png")));
+ ka->setIcon( QIcon::fromTheme("application-exit", QIcon(":/icons/breeze/default/application-exit.svg")));
// ==== Time Menu ================
actionCollection()->addAction("time_to_now", this, SLOT( slotSetTimeToNow() ))
<< i18n("Set Time to &Now")
<< QKeySequence( Qt::CTRL+Qt::Key_E )
- << QIcon::fromTheme("clock", QIcon(":/icons/breeze/default/clock.png"));
+ << QIcon::fromTheme("clock", QIcon(":/icons/breeze/default/clock.svg"));
actionCollection()->addAction("time_dialog", this, SLOT( slotSetTime() ) )
<< i18nc("set Clock to New Time", "&Set Time..." )
<< QKeySequence( Qt::CTRL+Qt::Key_S )
- << QIcon::fromTheme("view-history", QIcon(":/icons/breeze/default/view-history.png"));
+ << QIcon::fromTheme("view-history", QIcon(":/icons/breeze/default/view-history.svg"));
ka = actionCollection()->add<KToggleAction>("clock_startstop")
<< i18n("Stop &Clock" )
- << QIcon::fromTheme("media-playback-pause" , QIcon(":/icons/breeze/default/media-playback-pause.png"));
+ << QIcon::fromTheme("media-playback-pause" , QIcon(":/icons/breeze/default/media-playback-pause.svg"));
if ( ! StartClockRunning )
ka->toggle();
QObject::connect( ka, SIGNAL( triggered() ), this, SLOT( slotToggleTimer() ) );
@@ -198,11 +198,11 @@ void KStars::initActions() {
QObject::connect(data()->clock(), SIGNAL(clockToggled(bool)), this, SLOT(updateTime()) );
actionCollection()->addAction("time_step_forward", this, SLOT( slotStepForward() ) )
<< i18n("Advance one step forward in time")
- << QIcon::fromTheme("media-skip-forward" , QIcon(":/icons/breeze/default/media-skip-forward.png"))
+ << QIcon::fromTheme("media-skip-forward" , QIcon(":/icons/breeze/default/media-skip-forward.svg"))
<< QKeySequence( Qt::Key_Greater, Qt::Key_Period );
actionCollection()->addAction("time_step_backward", this, SLOT( slotStepBackward() ) )
<< i18n("Advance one step backward in time")
- << QIcon::fromTheme("media-skip-backward" , QIcon(":/icons/breeze/default/media-skip-backward.png"))
+ << QIcon::fromTheme("media-skip-backward" , QIcon(":/icons/breeze/default/media-skip-backward.svg"))
<< QKeySequence( Qt::Key_Less, Qt::Key_Comma );
// ==== Pointing Menu ================
@@ -224,11 +224,11 @@ void KStars::initActions() {
actionCollection()->addAction("find_object", this, SLOT( slotFind() ) )
<< i18n("&Find Object...")
- << QIcon::fromTheme("edit-find", QIcon(":/icons/breeze/default/edit-find.png") )
+ << QIcon::fromTheme("edit-find", QIcon(":/icons/breeze/default/edit-find.svg") )
<< QKeySequence( Qt::CTRL+Qt::Key_F );
actionCollection()->addAction("track_object", this, SLOT( slotTrack() ) )
<< i18n("Engage &Tracking")
- << QIcon::fromTheme("object-locked", QIcon(":/icons/breeze/default/object-locked.png"))
+ << QIcon::fromTheme("object-locked", QIcon(":/icons/breeze/default/object-locked.svg"))
<< QKeySequence( Qt::CTRL+Qt::Key_T );
actionCollection()->addAction("manual_focus", this, SLOT( slotManualFocus() ) )
<< i18n("Set Coordinates &Manually..." )
@@ -238,10 +238,10 @@ void KStars::initActions() {
// ==== View Menu ================
action = actionCollection()->addAction( KStandardAction::ZoomIn, "zoom_in", map(), SLOT( slotZoomIn() ) );
- action->setIcon(QIcon::fromTheme("zoom-in", QIcon(":/icons/breeze/default/zoom-in.png")));
+ action->setIcon(QIcon::fromTheme("zoom-in", QIcon(":/icons/breeze/default/zoom-in.svg")));
action = actionCollection()->addAction( KStandardAction::ZoomOut, "zoom_out", map(), SLOT( slotZoomOut() ) );
- action->setIcon(QIcon::fromTheme("zoom-out", QIcon(":/icons/breeze/default/zoom-out.png")));
+ action->setIcon(QIcon::fromTheme("zoom-out", QIcon(":/icons/breeze/default/zoom-out.svg")));
actionCollection()->addAction("zoom_default", map(), SLOT( slotZoomDefault() ) )
<< i18n("&Default Zoom")
@@ -249,11 +249,11 @@ void KStars::initActions() {
<< QKeySequence( Qt::CTRL+Qt::Key_Z );
actionCollection()->addAction("zoom_set", this, SLOT( slotSetZoom() ) )
<< i18n("&Zoom to Angular Size..." )
- << QIcon::fromTheme("zoom-original", QIcon(":/icons/breeze/default/zoom-original.png"))
+ << QIcon::fromTheme("zoom-original", QIcon(":/icons/breeze/default/zoom-original.svg"))
<< QKeySequence( Qt::CTRL+Qt::SHIFT+Qt::Key_Z );
action = actionCollection()->addAction( KStandardAction::FullScreen, this, SLOT( slotFullScreen() ) );
- action->setIcon( QIcon::fromTheme("view-fullscreen", QIcon(":/icons/breeze/default/view-fullscreen.png")));
+ action->setIcon( QIcon::fromTheme("view-fullscreen", QIcon(":/icons/breeze/default/view-fullscreen.svg")));
actionCollection()->addAction("coordsys", this, SLOT( slotCoordSys() ) )
<< (Options::useAltAz() ? i18n("Switch to star globe view (Equatorial &Coordinates)"): i18n("Switch to horizonal view (Horizontal &Coordinates)"))
@@ -361,21 +361,21 @@ void KStars::initActions() {
fovActionMenu = actionCollection()->add<KActionMenu>("fovsymbols" );
fovActionMenu->setText( i18n("&FOV Symbols" ) );
fovActionMenu->setDelayed(false);
- fovActionMenu->setIcon(QIcon::fromTheme("crosshairs", QIcon(":/icons/breeze/default/crosshairs.png")));
+ fovActionMenu->setIcon(QIcon::fromTheme("crosshairs", QIcon(":/icons/breeze/default/crosshairs.svg")));
FOVManager::readFOVs();
repopulateFOV();
actionCollection()->addAction("geolocation", this, SLOT( slotGeoLocator() ) )
<< i18nc("Location on Earth", "&Geographic..." )
- << QIcon::fromTheme("kstars_planets" , QIcon(":/icons/breeze/default/applications-internet.png"))
+ << QIcon::fromTheme("kstars_planets" , QIcon(":/icons/breeze/default/kstars_planets.svg"))
<< QKeySequence( Qt::CTRL+Qt::Key_G );
ka = actionCollection()->addAction( KStandardAction::Preferences, "configure", this, SLOT( slotViewOps() ) );
//I am not sure what icon preferences is supposed to be.
- //ka->setIcon( QIcon::fromTheme("", QIcon(":/icons/breeze/default/.png")));
+ //ka->setIcon( QIcon::fromTheme("", QIcon(":/icons/breeze/default/.svg")));
actionCollection()->addAction("startwizard", this, SLOT( slotWizard() ) )
<< i18n("Startup Wizard..." )
- << QIcon::fromTheme("tools-wizard", QIcon(":/icons/breeze/default/tools-wizard.png"));
+ << QIcon::fromTheme("tools-wizard", QIcon(":/icons/breeze/default/tools-wizard.svg"));
// Manual data entry
actionCollection()->addAction( "manual_add_dso", this, SLOT( slotAddDeepSkyObject() ) )
@@ -394,7 +394,7 @@ void KStars::initActions() {
//Tools Menu:
actionCollection()->addAction("astrocalculator", this, SLOT( slotCalculator() ) )
<< i18n("Calculator")
- << QIcon::fromTheme("accessories-calculator", QIcon(":/icons/breeze/default/accessories-calculator.png"))
+ << QIcon::fromTheme("accessories-calculator", QIcon(":/icons/breeze/default/accessories-calculator.svg"))
<< QKeySequence( Qt::CTRL+Qt::Key_C );
/* FIXME Enable once port to KF5 is complete for moonphasetool
@@ -470,11 +470,11 @@ void KStars::initActions() {
#ifndef Q_OS_WIN
actionCollection()->addAction("telescope_wizard", this, SLOT( slotTelescopeWizard() ) )
<< i18n("Telescope Wizard...")
- << QIcon::fromTheme("tools-wizard", QIcon(":/icons/breeze/default/tools-wizard.png"));
+ << QIcon::fromTheme("tools-wizard", QIcon(":/icons/breeze/default/tools-wizard.svg"));
#endif
actionCollection()->addAction("device_manager", this, SLOT( slotINDIDriver() ) )
<< i18n("Device Manager...")
- << QIcon::fromTheme("network-server", QIcon(":/icons/breeze/default/network-server.png"))
+ << QIcon::fromTheme("network-server", QIcon(":/icons/breeze/default/network-server.svg"))
<< QKeySequence(Qt::CTRL+Qt::Key_D);
ka = actionCollection()->addAction("indi_cpl", this, SLOT( slotINDIPanel() ) )
<< i18n("INDI Control Panel...");
@@ -488,7 +488,7 @@ void KStars::initActions() {
//Help Menu:
ka = actionCollection()->addAction( KStandardAction::TipofDay, "help_tipofday", this, SLOT( slotTipOfDay() ) );
ka->setWhatsThis(i18n("Displays the Tip of the Day"));
- ka->setIcon( QIcon::fromTheme("help-hint", QIcon(":/icons/breeze/default/help-hint.png")));
+ ka->setIcon( QIcon::fromTheme("help-hint", QIcon(":/icons/breeze/default/help-hint.svg")));
// KStandardAction::help(this, SLOT( appHelpActivated() ), actionCollection(), "help_contents" );
//Add timestep widget for toolbar
@@ -505,75 +505,75 @@ void KStars::initActions() {
// ==== viewToolBar actions ================
actionCollection()->add<KToggleAction>("show_stars", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle Stars in the display", "Stars" )
- << QIcon::fromTheme("kstars_stars", QIcon(":/icons/stars.png") )
+ << QIcon::fromTheme("kstars_stars", QIcon(":/icons/breeze/default/kstars_stars.svg") )
<< ToolTip( i18n("Toggle stars") );
actionCollection()->add<KToggleAction>("show_deepsky", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle Deep Sky Objects in the display", "Deep Sky" )
- << QIcon::fromTheme("kstars_deepsky" , QIcon(":/icons/deepsky.png") )
+ << QIcon::fromTheme("kstars_deepsky" , QIcon(":/icons/breeze/default/kstars_deepsky.svg") )
<< ToolTip( i18n("Toggle deep sky objects") );
actionCollection()->add<KToggleAction>("show_planets", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle Solar System objects in the display", "Solar System" )
- << QIcon::fromTheme("kstars_planets" , QIcon(":/icons/planets.png"))
+ << QIcon::fromTheme("kstars_planets" , QIcon(":/icons/breeze/default/kstars_planets.svg"))
<< ToolTip( i18n("Toggle Solar system objects") );
actionCollection()->add<KToggleAction>("show_clines", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle Constellation Lines in the display", "Const. Lines" )
- << QIcon::fromTheme("kstars_clines" , QIcon(":/icons/clines.png"))
+ << QIcon::fromTheme("kstars_clines" , QIcon(":/icons/breeze/default/kstars_clines.svg"))
<< ToolTip( i18n("Toggle constellation lines") );
actionCollection()->add<KToggleAction>("show_cnames", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle Constellation Names in the display", "Const. Names" )
- << QIcon::fromTheme("kstars_cnames" , QIcon(":/icons/cnames.png"))
+ << QIcon::fromTheme("kstars_cnames" , QIcon(":/icons/breeze/default/kstars_cnames.svg"))
<< ToolTip( i18n("Toggle constellation names") );
actionCollection()->add<KToggleAction>("show_cbounds", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle Constellation Boundaries in the display", "C. Boundaries" )
- << QIcon::fromTheme("kstars_cbound" , QIcon(":/icons/cbound.png"))
+ << QIcon::fromTheme("kstars_cbound" , QIcon(":/icons/breeze/default/kstars_cbound.svg"))
<< ToolTip( i18n("Toggle constellation boundaries") );
actionCollection()->add<KToggleAction>("show_constellationart", this, SLOT( slotViewToolBar() ) )
<< xi18nc("Toggle Constellation Art in the display", "C. Art (BETA)" )
- << QIcon::fromTheme("kstars_constellationart" , QIcon(":/icons/constellationart.png"))
+ << QIcon::fromTheme("kstars_constellationart" , QIcon(":/icons/breeze/default/kstars_constellationart.svg"))
<< ToolTip( xi18n("Toggle constellation art (BETA)") );
actionCollection()->add<KToggleAction>("show_mw", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle Milky Way in the display", "Milky Way" )
- << QIcon::fromTheme("kstars_mw" , QIcon(":/icons/mw.png"))
+ << QIcon::fromTheme("kstars_mw" , QIcon(":/icons/breeze/default/kstars_mw.svg"))
<< ToolTip( i18n("Toggle milky way") );
actionCollection()->add<KToggleAction>("show_equatorial_grid", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle Equatorial Coordinate Grid in the display", "Equatorial coord. grid" )
- << QIcon::fromTheme("kstars_grid" , QIcon(":/icons/grid.png") )
+ << QIcon::fromTheme("kstars_grid" , QIcon(":/icons/breeze/default/kstars_grid.svg") )
<< ToolTip( i18n("Toggle equatorial coordinate grid") );
actionCollection()->add<KToggleAction>("show_horizontal_grid", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle Horizontal Coordinate Grid in the display", "Horizontal coord. grid" )
- << QIcon::fromTheme("kstars_hgrid" , QIcon(":/icons/hgrid.png") )
+ << QIcon::fromTheme("kstars_hgrid" , QIcon(":/icons/breeze/default/kstars_hgrid.svg") )
<< ToolTip( i18n("Toggle horizontal coordinate grid") );
actionCollection()->add<KToggleAction>("show_horizon", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle the opaque fill of the ground polygon in the display", "Ground" )
- << QIcon::fromTheme("kstars_horizon" , QIcon(":/icons/horizon.png") )
+ << QIcon::fromTheme("kstars_horizon" , QIcon(":/icons/breeze/default/kstars_horizon.svg") )
<< ToolTip( i18n("Toggle opaque ground") );
actionCollection()->add<KToggleAction>("show_flags", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle flags in the display", "Flags" )
- << QIcon::fromTheme("kstars_flag" , QIcon(":/icons/flag.png") )
+ << QIcon::fromTheme("kstars_flag" , QIcon(":/icons/breeze/default/kstars_flag.svg") )
<< ToolTip( i18n("Toggle flags") );
actionCollection()->add<KToggleAction>("show_satellites", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle satellites in the display", "Satellites" )
- << QIcon::fromTheme("kstars_satellites" , QIcon(":/icons/satellites.png"))
+ << QIcon::fromTheme("kstars_satellites" , QIcon(":/icons/breeze/default/kstars_satellites.svg"))
<< ToolTip( i18n("Toggle satellites") );
actionCollection()->add<KToggleAction>("show_supernovae", this, SLOT( slotViewToolBar() ) )
<< i18nc("Toggle supernovae in the display", "Supernovae" )
- << QIcon::fromTheme("kstars_supernovae" , QIcon(":/icons/supernovae.png"))
+ << QIcon::fromTheme("kstars_supernovae" , QIcon(":/icons/breeze/default/kstars_supernovae.svg"))
<< ToolTip( i18n("Toggle supernovae") );
#ifdef HAVE_INDI
// ==== INDIToolBar actions ================
actionCollection()->add<KToggleAction>("show_ekos", this, SLOT( slotINDIToolBar() ) )
<< i18nc("Toggle Ekos in the display", "Ekos" )
- << QIcon::fromTheme("kstars_ekos", QIcon(":/icons/ekos.png") )
+ << QIcon::fromTheme("kstars_ekos", QIcon(":/icons/breeze/default/kstars_ekos.svg") )
<< ToolTip( i18n("Toggle Ekos") );
ka = actionCollection()->add<KToggleAction>("show_control_panel", this, SLOT( slotINDIToolBar() ) )
<< i18nc("Toggle the INDI Control Panel in the display", "INDI Control Panel" )
- << QIcon::fromTheme("kstars_indi", QIcon(":/icons/indi.png") )
+ << QIcon::fromTheme("kstars_indi", QIcon(":/icons/breeze/default/kstars_indi.svg") )
<< ToolTip( i18n("Toggle INDI Control Panel") );
ka->setEnabled(false);
ka = actionCollection()->add<KToggleAction>("show_fits_viewer", this, SLOT( slotINDIToolBar() ) )
<< i18nc("Toggle the FITS Viewer in the display", "FITS Viewer" )
- << QIcon::fromTheme("kstars_fitsviewer" , QIcon(":/icons/fitsviewer.png") )
+ << QIcon::fromTheme("kstars_fitsviewer" , QIcon(":/icons/breeze/default/kstars_fitsviewer.svg") )
<< ToolTip( i18n("Toggle FITS Viewer") );
ka->setEnabled(false);
#endif
diff --git a/kstars/oal/observeradd.cpp b/kstars/oal/observeradd.cpp
index 77ca08b..02e9fe1 100644
--- a/kstars/oal/observeradd.cpp
+++ b/kstars/oal/observeradd.cpp
@@ -41,8 +41,8 @@ ObserverAdd::ObserverAdd() {
mainLayout->addWidget(buttonBox);
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
- ui.AddObserverB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.png")));
- ui.RemoveObserverB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.png")));
+ ui.AddObserverB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.svg")));
+ ui.RemoveObserverB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.svg")));
nextObserver = 0;
diff --git a/kstars/skymap.cpp b/kstars/skymap.cpp
index c3692e0..213b542 100644
--- a/kstars/skymap.cpp
+++ b/kstars/skymap.cpp
@@ -377,7 +377,7 @@ void SkyMap::slotCenter() {
setFocusObject( ClickedObject );
Options::setIsTracking( true );
if ( kstars ) {
- kstars->actionCollection()->action("track_object")->setIcon( QIcon::fromTheme("document-encrypt", QIcon(":/icons/breeze/default/document-encrypt.png")) );
+ kstars->actionCollection()->action("track_object")->setIcon( QIcon::fromTheme("document-encrypt", QIcon(":/icons/breeze/default/document-encrypt.svg")) );
kstars->actionCollection()->action("track_object")->setText( i18n( "Stop &Tracking" ) );
}
diff --git a/kstars/skyobjects/skyobject.cpp b/kstars/skyobjects/skyobject.cpp
index 3efb3b1..33916fc 100644
--- a/kstars/skyobjects/skyobject.cpp
+++ b/kstars/skyobjects/skyobject.cpp
@@ -339,6 +339,15 @@ SkyPoint SkyObject::recomputeCoords( const KStarsDateTime &dt, const GeoLocation
return p;
}
+
+SkyPoint SkyObject::recomputeHorizontalCoords(const KStarsDateTime& dt, const GeoLocation *geo) const {
+ Q_ASSERT( geo );
+ SkyPoint ret = recomputeCoords( dt, geo );
+ CachingDms LST = geo->GSTtoLST( dt.gst() );
+ ret.EquatorialToHorizontal( &LST, geo->lat() );
+ return ret;
+}
+
QString SkyObject::typeName( int t ) {
switch( t ) {
diff --git a/kstars/skyobjects/skyobject.h b/kstars/skyobjects/skyobject.h
index e367510..663b4db 100644
--- a/kstars/skyobjects/skyobject.h
+++ b/kstars/skyobjects/skyobject.h
@@ -257,14 +257,20 @@ public:
dms transitAltitude( const KStarsDateTime &dt, const GeoLocation *geo ) const;
/**
- *The coordinates for the object on date dt are computed and returned,
+ *The equatorial coordinates for the object on date dt are computed and returned,
*but the object's internal coordinates are not modified.
*@return the coordinates of the selected object for the time given by jd
*@param dt date/time for which the coords will be computed.
*@param geo pointer to geographic location (used for solar system only)
+ *@note Does not update the horizontal coordinates. Call EquatorialToHorizontal for that.
*/
SkyPoint recomputeCoords( const KStarsDateTime &dt, const GeoLocation *geo=0 ) const;
+ /**
+ * @short Like recomputeCoords, but also calls EquatorialToHorizontal before returning
+ */
+ SkyPoint recomputeHorizontalCoords( const KStarsDateTime &dt, const GeoLocation *geo ) const;
+
inline bool hasName() const { return ! Name.isEmpty(); }
inline bool hasName2() const { return ! Name2.isEmpty(); }
diff --git a/kstars/skyobjects/skypoint.cpp b/kstars/skyobjects/skypoint.cpp
index 0b21b22..16f9927 100644
--- a/kstars/skyobjects/skypoint.cpp
+++ b/kstars/skyobjects/skypoint.cpp
@@ -227,10 +227,12 @@ SkyPoint SkyPoint::deprecess( const KSNumbers *num, long double epoch ) {
long double now = num->julianDay();
p1.precessFromAnyEpoch( now, epoch );
if( ( std::isnan( RA0.Degrees() ) || std::isnan( Dec0.Degrees() ) ) ||
- ( !std::isnan( Dec0.Degrees() ) && fabs( Dec0.Degrees() ) > 90.0 ) ) {
- // We have invalid RA0 and Dec0, so set them.
- RA0 = p1.ra();
- Dec0 = p1.dec();
+ ( !std::isnan( Dec0.Degrees() ) && fabs( Dec0.Degrees() ) > 90.0 ) ) {
+ // We have invalid RA0 and Dec0, so set them if epoch = J2000. Otherwise, do not touch.
+ if ( epoch == J2000 ) {
+ RA0 = p1.ra();
+ Dec0 = p1.dec();
+ }
}
return p1;
}
@@ -885,4 +887,5 @@ double SkyPoint::minAlt(const dms& lat) const {
if ( retval < -90. )
retval = 180. + retval;
return retval;
+
}
diff --git a/kstars/skyobjects/skypoint.h b/kstars/skyobjects/skypoint.h
index acd9d8b..4a83318 100644
--- a/kstars/skyobjects/skypoint.h
+++ b/kstars/skyobjects/skypoint.h
@@ -317,7 +317,7 @@ public:
/**
*@short Obtain a Skypoint with RA0 and Dec0 set from the RA, Dec
* of this skypoint. Also set the RA0, Dec0 of this SkyPoint if not
- * set already.
+ * set already and the target epoch is J2000.
*/
SkyPoint deprecess( const KSNumbers *num, long double epoch=J2000 );
diff --git a/kstars/time/kstarsdatetime.cpp b/kstars/time/kstarsdatetime.cpp
index 10a1e1a..ee94753 100644
--- a/kstars/time/kstarsdatetime.cpp
+++ b/kstars/time/kstarsdatetime.cpp
@@ -47,6 +47,7 @@ KStarsDateTime::KStarsDateTime( const KStarsDateTime &kdt ) : QDateTime()
KStarsDateTime::KStarsDateTime( const QDateTime &qdt ) :
QDateTime( qdt )//, QDateTime::Spec::UTC() )
{
+ // FIXME: This method might be buggy. Need to write some tests -- asimha (Oct 2016)
QTime _t = qdt.time();
QDate _d = qdt.date();
long double jdFrac = ( _t.hour()-12 + ( _t.minute() + ( _t.second() + _t.msec()/1000.)/60.)/60.)/24.;
diff --git a/kstars/tools/altvstime.cpp b/kstars/tools/altvstime.cpp
index 5a2ffda..099374e 100644
--- a/kstars/tools/altvstime.cpp
+++ b/kstars/tools/altvstime.cpp
@@ -164,7 +164,7 @@ AltVsTime::AltVsTime( QWidget* parent) :
topLayout->addWidget(buttonBox);
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
- QPushButton *printB = new QPushButton(QIcon::fromTheme("document-print", QIcon(":/icons/breeze/default/document-print.png")), i18n("&Print..."));
+ QPushButton *printB = new QPushButton(QIcon::fromTheme("document-print", QIcon(":/icons/breeze/default/document-print.svg")), i18n("&Print..."));
printB->setToolTip(i18n("Print the Altitude vs. time plot"));
buttonBox->addButton(printB, QDialogButtonBox::ActionRole);
connect(printB, SIGNAL(clicked()), this, SLOT(slotPrint()));
diff --git a/kstars/tools/conjunctions.cpp b/kstars/tools/conjunctions.cpp
index 92f6006..64e6be4 100644
--- a/kstars/tools/conjunctions.cpp
+++ b/kstars/tools/conjunctions.cpp
@@ -120,7 +120,7 @@ ConjunctionsTool::ConjunctionsTool(QWidget *parentSplit)
OutputList->horizontalHeader()->resizeSection(4, 120); //is it bad way to fix default size of columns ?
//FilterEdit->showClearButton = true;
- ClearFilterButton->setIcon( QIcon::fromTheme( "edit-clear" , QIcon(":/icons/breeze/default/edit-clear.png") ) );
+ ClearFilterButton->setIcon( QIcon::fromTheme( "edit-clear" , QIcon(":/icons/breeze/default/edit-clear.svg") ) );
m_index = 0;
diff --git a/kstars/tools/horizonmanager.cpp b/kstars/tools/horizonmanager.cpp
index bd90c3b..1fe5d64 100644
--- a/kstars/tools/horizonmanager.cpp
+++ b/kstars/tools/horizonmanager.cpp
@@ -41,17 +41,17 @@ HorizonManager::HorizonManager( QWidget *w )
ui->setStyleSheet("QPushButton:checked { background-color: red; }");
- ui->addRegionB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.png")));
- ui->addPointB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.png")));
- ui->removeRegionB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.png")));
- ui->removePointB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.png")));
- ui->clearPointsB->setIcon(QIcon::fromTheme("edit-clear", QIcon(":/icons/breeze/default/edit-clear.png")));
- ui->saveB->setIcon(QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.png")));
- ui->selectPointsB->setIcon(QIcon::fromTheme("snap-orthogonal", QIcon(":/icons/breeze/default/snap-orthogonal.png")));
+ ui->addRegionB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.svg")));
+ ui->addPointB->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/breeze/default/list-add.svg")));
+ ui->removeRegionB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.svg")));
+ ui->removePointB->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/breeze/default/list-remove.svg")));
+ ui->clearPointsB->setIcon(QIcon::fromTheme("edit-clear", QIcon(":/icons/breeze/default/edit-clear.svg")));
+ ui->saveB->setIcon(QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.svg")));
+ ui->selectPointsB->setIcon(QIcon::fromTheme("snap-orthogonal", QIcon(":/icons/breeze/default/snap-orthogonal.svg")));
- ui->tipLabel->setPixmap((QIcon::fromTheme("help-hint", QIcon(":/icons/breeze/default/help-hint.png")).pixmap(64,64)));
+ ui->tipLabel->setPixmap((QIcon::fromTheme("help-hint", QIcon(":/icons/breeze/default/help-hint.svg")).pixmap(64,64)));
- ui->polygonValidatoin->setPixmap(QIcon::fromTheme("process-stop", QIcon(":/icons/breeze/default/process-stop.png")).pixmap(32,32));
+ ui->polygonValidatoin->setPixmap(QIcon::fromTheme("process-stop", QIcon(":/icons/breeze/default/process-stop.svg")).pixmap(32,32));
ui->polygonValidatoin->setToolTip(i18n("Region is invalid. The polygon must be closed and located at the horizon"));
ui->polygonValidatoin->hide();
@@ -151,13 +151,13 @@ void HorizonManager::showRegion( int regionID )
{
if (validatePolygon(regionID))
{
- ui->polygonValidatoin->setPixmap(QIcon::fromTheme("dialog-ok", QIcon(":/icons/breeze/default/dialog-ok.png")).pixmap(32,32));
+ ui->polygonValidatoin->setPixmap(QIcon::fromTheme("dialog-ok", QIcon(":/icons/breeze/default/dialog-ok.svg")).pixmap(32,32));
ui->polygonValidatoin->setEnabled(true);
ui->polygonValidatoin->setToolTip(i18n("Region is valid"));
}
else
{
- ui->polygonValidatoin->setPixmap(QIcon::fromTheme("process-stop", QIcon(":/icons/breeze/default/process-stop.png")).pixmap(32,32));
+ ui->polygonValidatoin->setPixmap(QIcon::fromTheme("process-stop", QIcon(":/icons/breeze/default/process-stop.svg")).pixmap(32,32));
ui->polygonValidatoin->setEnabled(false);
ui->polygonValidatoin->setToolTip(i18n("Region is invalid. The polygon must be closed"));
}
@@ -406,13 +406,13 @@ void HorizonManager::processSkyPoint(QStandardItem *item, int row)
{
if (validatePolygon(ui->regionsList->currentIndex().row()))
{
- ui->polygonValidatoin->setPixmap(QIcon::fromTheme("dialog-ok", QIcon(":/icons/breeze/default/dialog-ok.png")).pixmap(32,32));
+ ui->polygonValidatoin->setPixmap(QIcon::fromTheme("dialog-ok", QIcon(":/icons/breeze/default/dialog-ok.svg")).pixmap(32,32));
ui->polygonValidatoin->setEnabled(true);
ui->polygonValidatoin->setToolTip(i18n("Region is valid"));
}
else
{
- ui->polygonValidatoin->setPixmap(QIcon::fromTheme("process-stop", QIcon(":/icons/breeze/default/process-stop.png")).pixmap(32,32));
+ ui->polygonValidatoin->setPixmap(QIcon::fromTheme("process-stop", QIcon(":/icons/breeze/default/process-stop.svg")).pixmap(32,32));
ui->polygonValidatoin->setEnabled(false);
ui->polygonValidatoin->setToolTip(i18n("Region is invalid. The polygon must be closed and located at the horizon"));
}
@@ -474,13 +474,13 @@ void HorizonManager::slotRemovePoint()
{
if (validatePolygon(ui->regionsList->currentIndex().row()))
{
- ui->polygonValidatoin->setPixmap(QIcon::fromTheme("dialog-ok", QIcon(":/icons/breeze/default/dialog-ok.png")).pixmap(32,32));
+ ui->polygonValidatoin->setPixmap(QIcon::fromTheme("dialog-ok", QIcon(":/icons/breeze/default/dialog-ok.svg")).pixmap(32,32));
ui->polygonValidatoin->setEnabled(true);
ui->polygonValidatoin->setToolTip(i18n("Region is valid"));
}
else
{
- ui->polygonValidatoin->setPixmap(QIcon::fromTheme("process-stop", QIcon(":/icons/breeze/default/process-stop.png")).pixmap(32,32));
+ ui->polygonValidatoin->setPixmap(QIcon::fromTheme("process-stop", QIcon(":/icons/breeze/default/process-stop.svg")).pixmap(32,32));
ui->polygonValidatoin->setEnabled(false);
ui->polygonValidatoin->setToolTip(i18n("Region is invalid. The polygon must be closed"));
}
diff --git a/kstars/tools/observinglist.cpp b/kstars/tools/observinglist.cpp
index 09af72e..c83df77 100644
--- a/kstars/tools/observinglist.cpp
+++ b/kstars/tools/observinglist.cpp
@@ -214,11 +214,11 @@ ObservingList::ObservingList()
connect( ui->OALExport, SIGNAL( clicked() ),
this, SLOT( slotOALExport() ) );
//Add icons to Push Buttons
- ui->OpenButton->setIcon( QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.png")) );
- ui->SaveButton->setIcon( QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.png")) );
- ui->SaveAsButton->setIcon( QIcon::fromTheme("document-save-as", QIcon(":/icons/breeze/default/document-save-as.png")) );
- ui->WizardButton->setIcon( QIcon::fromTheme("tools-wizard", QIcon(":/icons/breeze/default/tools-wizard.png")) );
- ui->MiniButton->setIcon( QIcon::fromTheme("view-restore", QIcon(":/icons/breeze/default/view-restore.png")) );
+ ui->OpenButton->setIcon( QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.svg")) );
+ ui->SaveButton->setIcon( QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.svg")) );
+ ui->SaveAsButton->setIcon( QIcon::fromTheme("document-save-as", QIcon(":/icons/breeze/default/document-save-as.svg")) );
+ ui->WizardButton->setIcon( QIcon::fromTheme("tools-wizard", QIcon(":/icons/breeze/default/tools-wizard.svg")) );
+ ui->MiniButton->setIcon( QIcon::fromTheme("view-restore", QIcon(":/icons/breeze/default/view-restore.svg")) );
noSelection = true;
showScope = false;
ui->NotesLabel->setEnabled( false );
@@ -236,7 +236,6 @@ ObservingList::ObservingList()
double inf = std::numeric_limits<double>::infinity();
double altCost = 0.;
QString itemText;
- qDebug() << "p has Dec" << p.dec().toDMSString() << "and p.maxAlt( " << geo->lat()->toDMSString() << " ) returns " << p.maxAlt( *( geo->lat() ) );
if ( p.maxAlt( *( geo->lat() ) ) <= 0. ) {
altCost = -inf;
itemText = i18n( "Never rises" );
@@ -251,6 +250,7 @@ ObservingList::ObservingList()
QStandardItem *altItem = new QStandardItem( itemText );
altItem->setData( altCost, Qt::UserRole );
+ qDebug() << "Updating altitude for " << p.ra().toHMSString() << " " << p.dec().toDMSString() << " alt = " << p.alt().toDMSString() << " info to " << itemText;
return altItem;
};
@@ -264,6 +264,7 @@ ObservingList::ObservingList()
bIsLarge = false;
slotToggleSize();
+ slotUpdateAltitudes();
m_altitudeUpdater = new QTimer( this );
connect( m_altitudeUpdater, SIGNAL( timeout() ), this, SLOT( slotUpdateAltitudes() ) );
m_altitudeUpdater->start( 120000 ); // update altitudes every 2 minutes
@@ -326,7 +327,7 @@ void ObservingList::slotAddObject( SkyObject *obj, bool session, bool update ) {
if ( - 30.0 < obj->mag() && obj->mag() < 90.0 )
smag = QString::number( obj->mag(), 'f', 2 ); // The lower limit to avoid display of unrealistic comet magnitudes
- SkyPoint p = obj->recomputeCoords( dt, geo );
+ SkyPoint p = obj->recomputeHorizontalCoords( dt, geo );
QList<QStandardItem*> itemList;
@@ -364,7 +365,7 @@ void ObservingList::slotAddObject( SkyObject *obj, bool session, bool update ) {
// - First sort by (max altitude) - (current altitude) rounded off to the nearest
// - Weight by declination - latitude (in the northern hemisphere, southern objects get higher precedence)
// - Demote objects in the hole
- SkyPoint p = obj->recomputeCoords( KStarsDateTime( QDateTime::currentDateTime() ), geo ); // Current => now
+ SkyPoint p = obj->recomputeHorizontalCoords( KStarsDateTime::currentDateTimeUtc(), geo ); // Current => now
itemList << m_altCostHelper( p );
m_WishListModel->appendRow( itemList );
@@ -1006,15 +1007,15 @@ double ObservingList::findAltitude( SkyPoint *p, double hour ) {
void ObservingList::slotToggleSize() {
if ( isLarge() ) {
- ui->MiniButton->setIcon( QIcon::fromTheme("view-fullscreen", QIcon(":/icons/breeze/default/view-fullscreen.png")) );
+ ui->MiniButton->setIcon( QIcon::fromTheme("view-fullscreen", QIcon(":/icons/breeze/default/view-fullscreen.svg")) );
//Abbreviate text on each button
ui->FindButton->setText( "" );
- ui->FindButton->setIcon( QIcon::fromTheme("edit-find", QIcon(":/icons/breeze/default/edit-find.png")) );
+ ui->FindButton->setIcon( QIcon::fromTheme("edit-find", QIcon(":/icons/breeze/default/edit-find.svg")) );
ui->WUTButton->setText( i18nc( "Abbreviation of What's Up Tonight", "WUT" ) );
ui->saveImages->setText( "" );
ui->DeleteAllImages->setText( "" );
- ui->saveImages->setIcon( QIcon::fromTheme( "download", QIcon(":/icons/breeze/default/download.png")) );
- ui->DeleteAllImages->setIcon( QIcon::fromTheme( "edit-delete", QIcon(":/icons/breeze/default/edit-delete.png")) );
+ ui->saveImages->setIcon( QIcon::fromTheme( "download", QIcon(":/icons/breeze/default/download.svg")) );
+ ui->DeleteAllImages->setIcon( QIcon::fromTheme( "edit-delete", QIcon(":/icons/breeze/default/edit-delete.svg")) );
ui->refLabel->setText( i18nc( "Abbreviation for Reference Images:", "RefImg:" ) );
ui->addLabel->setText( i18nc( "Add objects to a list", "Add:" ) );
//Hide columns 1-5
@@ -1052,7 +1053,7 @@ void ObservingList::slotToggleSize() {
this->resize( 400, this->height() );
update();
} else {
- ui->MiniButton->setIcon( QIcon::fromTheme( "view-restore", QIcon(":/icons/breeze/default/view-restore.png")) );
+ ui->MiniButton->setIcon( QIcon::fromTheme( "view-restore", QIcon(":/icons/breeze/default/view-restore.svg")) );
//Show columns 1-5
ui->WishListView->showColumn(1);
ui->WishListView->showColumn(2);
@@ -1495,17 +1496,19 @@ QString ObservingList::getObjectName(const SkyObject *o, bool translated)
void ObservingList::slotUpdateAltitudes() {
// FIXME: Update upon gaining visibility, do not update when not visible
- KStarsDateTime now( QDateTime::currentDateTime() );
- qDebug() << "Updating altitudes in observation planner.";
+ KStarsDateTime now = KStarsDateTime::currentDateTimeUtc();
+ qDebug() << "Updating altitudes in observation planner @ JD - J2000 = " << double( now.djd() - J2000 );
for ( int irow = m_WishListModel->rowCount() - 1; irow >= 0; --irow ) {
QModelIndex idx = m_WishListSortModel->mapToSource( m_WishListSortModel->index( irow, 0 ) );
SkyObject *o = static_cast<SkyObject *>( idx.data( Qt::UserRole + 1 ).value<void *>() );
Q_ASSERT( o );
- SkyPoint p = o->recomputeCoords( now, geo );
+ SkyPoint p = o->recomputeHorizontalCoords( now, geo );
idx = m_WishListSortModel->mapToSource( m_WishListSortModel->index( irow, m_WishListSortModel->columnCount() - 1 ) );
QStandardItem *replacement = m_altCostHelper( p );
m_WishListModel->setData( idx, replacement->data( Qt::DisplayRole ), Qt::DisplayRole );
m_WishListModel->setData( idx, replacement->data( Qt::UserRole ), Qt::UserRole );
delete replacement;
}
+ emit m_WishListModel->dataChanged( m_WishListModel->index( 0, m_WishListModel->columnCount() - 1 ),
+ m_WishListModel->index( m_WishListModel->rowCount() - 1, m_WishListModel->columnCount() - 1 ) );
}
diff --git a/kstars/tools/planetviewer.cpp b/kstars/tools/planetviewer.cpp
index 05e8e99..46c908c 100644
--- a/kstars/tools/planetviewer.cpp
+++ b/kstars/tools/planetviewer.cpp
@@ -70,9 +70,9 @@ PlanetViewer::PlanetViewer(QWidget *parent)
pw->TimeStep->setDaysOnly( true );
pw->TimeStep->tsbox()->setValue( 1 ); //start with 1-day timestep
- pw->RunButton->setIcon( QIcon::fromTheme("arrow-right", QIcon(":/icons/breeze/default/arrow-right.png")) );
- pw->ZoomInButton->setIcon( QIcon::fromTheme("zoom-in", QIcon(":/icons/breeze/default/zoom-in.png")) );
- pw->ZoomOutButton->setIcon( QIcon::fromTheme("zoom-out", QIcon(":/icons/breeze/default/zoom-out.png")) );
+ pw->RunButton->setIcon( QIcon::fromTheme("arrow-right", QIcon(":/icons/breeze/default/arrow-right.svg")) );
+ pw->ZoomInButton->setIcon( QIcon::fromTheme("zoom-in", QIcon(":/icons/breeze/default/zoom-in.svg")) );
+ pw->ZoomOutButton->setIcon( QIcon::fromTheme("zoom-out", QIcon(":/icons/breeze/default/zoom-out.svg")) );
pw->DateBox->setDate( data->lt().date() );
resize( 500, 500 );
@@ -145,11 +145,11 @@ void PlanetViewer::slotRunClock() {
isClockRunning = !isClockRunning;
if ( isClockRunning ) {
- pw->RunButton->setIcon( QIcon::fromTheme("media-playback-pause", QIcon(":/icons/breeze/default/media-playback-pause.png")) );
+ pw->RunButton->setIcon( QIcon::fromTheme("media-playback-pause", QIcon(":/icons/breeze/default/media-playback-pause.svg")) );
tmr.start( 100 );
// pw->DateBox->setEnabled( false );
} else {
- pw->RunButton->setIcon( QIcon::fromTheme("arrow-right", QIcon(":/icons/breeze/default/arrow-right.png")) );
+ pw->RunButton->setIcon( QIcon::fromTheme("arrow-right", QIcon(":/icons/breeze/default/arrow-right.svg")) );
tmr.stop();
// pw->DateBox->setEnabled( true );
}
@@ -165,7 +165,7 @@ void PlanetViewer::slotCloseWindow() {
if ( isClockRunning ) {
tmr.stop();
isClockRunning = false;
- pw->RunButton->setIcon( QIcon::fromTheme("arrow-right", QIcon(":/icons/breeze/default/arrow-right.png")) );
+ pw->RunButton->setIcon( QIcon::fromTheme("arrow-right", QIcon(":/icons/breeze/default/arrow-right.svg")) );
}
}
diff --git a/kstars/tools/scriptbuilder.cpp b/kstars/tools/scriptbuilder.cpp
index d186ac0..03489cf 100644
--- a/kstars/tools/scriptbuilder.cpp
+++ b/kstars/tools/scriptbuilder.cpp
@@ -217,16 +217,16 @@ ScriptBuilder::ScriptBuilder( QWidget *parent )
sb->FunctionTree->setSortingEnabled( false );
//Add icons to Push Buttons
- sb->NewButton->setIcon( QIcon::fromTheme( "document-new", QIcon(":/icons/breeze/default/document-new.png")) );
- sb->OpenButton->setIcon( QIcon::fromTheme( "document-open" , QIcon(":/icons/breeze/default/document-open.png")) );
- sb->SaveButton->setIcon( QIcon::fromTheme( "document-save" , QIcon(":/icons/breeze/default/document-save.png")) );
- sb->SaveAsButton->setIcon( QIcon::fromTheme( "document-save-as" , QIcon(":/icons/breeze/default/document-save-as.png")) );
- sb->RunButton->setIcon( QIcon::fromTheme( "system-run" , QIcon(":/icons/breeze/default/system-run.png")) );
- sb->CopyButton->setIcon( QIcon::fromTheme( "view-refresh" , QIcon(":/icons/breeze/default/view-refresh.png")) );
- sb->AddButton->setIcon( QIcon::fromTheme( "go-previous" , QIcon(":/icons/breeze/default/go-previous.png")) );
- sb->RemoveButton->setIcon( QIcon::fromTheme( "go-next" , QIcon(":/icons/breeze/default/go-next.png")) );
- sb->UpButton->setIcon( QIcon::fromTheme( "go-up" , QIcon(":/icons/breeze/default/go-up.png")) );
- sb->DownButton->setIcon( QIcon::fromTheme( "go-down" , QIcon(":/icons/breeze/default/go-down.png")) );
+ sb->NewButton->setIcon( QIcon::fromTheme( "document-new", QIcon(":/icons/breeze/default/document-new.svg")) );
+ sb->OpenButton->setIcon( QIcon::fromTheme( "document-open" , QIcon(":/icons/breeze/default/document-open.svg")) );
+ sb->SaveButton->setIcon( QIcon::fromTheme( "document-save" , QIcon(":/icons/breeze/default/document-save.svg")) );
+ sb->SaveAsButton->setIcon( QIcon::fromTheme( "document-save-as" , QIcon(":/icons/breeze/default/document-save-as.svg")) );
+ sb->RunButton->setIcon( QIcon::fromTheme( "system-run" , QIcon(":/icons/breeze/default/system-run.svg")) );
+ sb->CopyButton->setIcon( QIcon::fromTheme( "view-refresh" , QIcon(":/icons/breeze/default/view-refresh.svg")) );
+ sb->AddButton->setIcon( QIcon::fromTheme( "go-previous" , QIcon(":/icons/breeze/default/go-previous.svg")) );
+ sb->RemoveButton->setIcon( QIcon::fromTheme( "go-next" , QIcon(":/icons/breeze/default/go-next.svg")) );
+ sb->UpButton->setIcon( QIcon::fromTheme( "go-up" , QIcon(":/icons/breeze/default/go-up.svg")) );
+ sb->DownButton->setIcon( QIcon::fromTheme( "go-down" , QIcon(":/icons/breeze/default/go-down.svg")) );
//Prepare the widget stack
argBlank = new QWidget();
diff --git a/kstars/tools/skycalendar.cpp b/kstars/tools/skycalendar.cpp
index 0c6f35a..4730bab 100644
--- a/kstars/tools/skycalendar.cpp
+++ b/kstars/tools/skycalendar.cpp
@@ -59,7 +59,7 @@ SkyCalendar::SkyCalendar( QWidget *parent )
mainLayout->addWidget(buttonBox);
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
- QPushButton *printB = new QPushButton(QIcon::fromTheme("document-print", QIcon(":/icons/breeze/default/document-print.png")), i18n("&Print..."));
+ QPushButton *printB = new QPushButton(QIcon::fromTheme("document-print", QIcon(":/icons/breeze/default/document-print.svg")), i18n("&Print..."));
printB->setToolTip(i18n("Print the Sky Calendar"));
buttonBox->addButton(printB, QDialogButtonBox::ActionRole);
connect(printB, SIGNAL(clicked()), this, SLOT(slotPrint()));