[Kstars-devel] [kstars] kstars: Lots of changes that were tightly coupled:

Akarsh Simha akarshsimha at gmail.com
Sat Apr 14 11:55:34 UTC 2012


Git commit c1f1f8e133248d319d6523c9c6ea6dd5156aa3ad by Akarsh Simha.
Committed on 14/04/2012 at 13:50.
Pushed by asimha into branch 'master'.

Lots of changes that were tightly coupled:

1. Reorganize options related to Observing List in kstars.kcfg under a
   new group.

2. Revamp the design of the "Advanced" options section to introduce a
   Tab Widget [I need feedback on this decision]. This is so that we
   can put all the advanced options in there without any clutter. [Q:
   Does observing list belong there?]

3. Remove the hackish DSS vs. SDSS preference option in the Observing
   List view and introduce the setting in the Advanced options under
   Observing List.

CCMAIL: kstars-devel at kde.org

M  +27   -16   kstars/kstars.kcfg
M  +502  -469  kstars/options/opsadvanced.ui
M  +2    -2    kstars/tools/observinglist.cpp
M  +0    -7    kstars/tools/observinglist.ui

http://commits.kde.org/kstars/c1f1f8e133248d319d6523c9c6ea6dd5156aa3ad

diff --git a/kstars/kstars.kcfg b/kstars/kstars.kcfg
index b8c8714..8724478 100644
--- a/kstars/kstars.kcfg
+++ b/kstars/kstars.kcfg
@@ -603,21 +603,6 @@
 			<whatsthis>Toggle whether the object under the mouse cursor gets a transient name label.</whatsthis>
 			<default>true</default>
 		</entry>
-		<entry name="ObsListSymbol" type="Bool">
-			<label>Use symbols to label observing list objects</label>
-			<whatsthis>Objects in the observing list will be highlighted with a symbol in the map.</whatsthis>
-			<default>true</default>
-		</entry>
-		<entry name="ObsListText" type="Bool">
-			<label>Use text to label observing list objects</label>
-			<whatsthis>Objects in the observing list will be highlighted with a colored name label in the map.</whatsthis>
-			<default>false</default>
-		</entry>
-        <entry name="ObsListSaveImage" type="Bool">
-            <label>Save the DSS/SDSS images to disk</label>
-            <whatisthis>The images of objects in the obseving list will be autosaved if you download them</whatisthis>
-            <default>false</default>
-        </entry>
 		<entry name="UseRefraction" type="Bool">
 			<label>Correct positions for atmospheric refraction?</label>
 			<whatsthis>Toggle whether object positions are corrected for the effects of atmospheric refraction (only applies when horizontal coordinates are used).</whatsthis>
@@ -715,7 +700,33 @@
             <default>true</default>
         </entry>
 	</group>
-
+	<group name="ObservingList">
+	  <entry name="ObsListSymbol" type="Bool">
+			<label>Use symbols to label observing list objects</label>
+			<whatsthis>Objects in the observing list will be highlighted with a symbol in the map.</whatsthis>
+			<default>true</default>
+		</entry>
+		<entry name="ObsListText" type="Bool">
+			<label>Use text to label observing list objects</label>
+			<whatsthis>Objects in the observing list will be highlighted with a colored name label in the map.</whatsthis>
+			<default>false</default>
+		</entry>
+        <entry name="ObsListSaveImage" type="Bool">
+            <label>Save the DSS/SDSS images to disk</label>
+            <whatisthis>The images of objects in the obseving list will be autosaved if you download them</whatisthis>
+            <default>false</default>
+        </entry>
+	<entry name="ObsListPreferDSS" type="Bool">
+	  <label>Prefer Digitized Sky Survey imagery in the observing list</label>
+			<whatsthis>The observing list will prefer DSS imagery while downloading imagery.</whatsthis>
+			<default>true</default>
+		</entry>
+		<entry name="ObsListPreferSDSS" type="Bool">
+			<label>Prefer Sloan Digital Sky Survey imagery in the observing list</label>
+			<whatsthis>The observing list will prefer SDSS imagery while downloading imagery.</whatsthis>
+			<default>false</default>
+		</entry>
+      </group>
 	<group name="Colors">
 		<entry name="ColorSchemeFile" type="String">
 		    <label>The name of the color scheme</label>
diff --git a/kstars/options/opsadvanced.ui b/kstars/options/opsadvanced.ui
index 9321edd..2b236c6 100644
--- a/kstars/options/opsadvanced.ui
+++ b/kstars/options/opsadvanced.ui
@@ -1,485 +1,522 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>OpsAdvanced</class>
- <widget class="QWidget" name="OpsAdvanced" >
-  <property name="geometry" >
+ <widget class="QWidget" name="OpsAdvanced">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>484</width>
-    <height>582</height>
+    <width>583</width>
+    <height>636</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="leftMargin" >
+   <property name="margin">
     <number>8</number>
    </property>
-   <property name="topMargin" >
-    <number>8</number>
-   </property>
-   <property name="rightMargin" >
-    <number>8</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>8</number>
-   </property>
-   <item>
-    <widget class="QCheckBox" name="kcfg_UseRefraction" >
-     <property name="toolTip" >
-      <string>Correct coordinates of objects for the effects of the atmosphere</string>
-     </property>
-     <property name="whatsThis" >
-      <string>The atmosphere bends light passing through it, like a lens.  If this item is checked, this "atmospheric refraction" will be simulated in the sky map.  Note that this correction is only applied when using the Horizontal coordinate system.</string>
-     </property>
-     <property name="text" >
-      <string>Correct for atmospheric refraction</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="kcfg_UseRelativistic" >
-     <property name="toolTip" >
-      <string>Correct for the effect of sun's gravity on star positions, as predicted by General Relativity, and verified by Eddington's experiment.</string>
-     </property>
-     <property name="text" >
-      <string>General Relativity effects near the sun</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="kcfg_UseAnimatedSlewing" >
-     <property name="toolTip" >
-      <string>Show slewing motion when focus changes?</string>
-     </property>
-     <property name="whatsThis" >
-      <string>If checked, changing the focus position will result in a visible animated "slew" to the new position.  Otherwise, the display will center on the new position instantaneously.</string>
-     </property>
-     <property name="text" >
-      <string>Use animated slewing</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="kcfg_UseAutoLabel" >
-     <property name="toolTip" >
-      <string>Show name label of centered object?</string>
-     </property>
-     <property name="whatsThis" >
-      <string>If checked, a name label will be temporarily attached to an object while it is centered in the display.  You can attach a more persistent label to any object using the right-click popup menu.</string>
-     </property>
-     <property name="text" >
-      <string>Attach label to centered object</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="kcfg_UseHoverLabel" >
-     <property name="toolTip" >
-      <string>Show name label of centered object?</string>
-     </property>
-     <property name="whatsThis" >
-      <string>If checked, a name label will be temporarily attached to an object while it is centered in the display.  You can attach a more persistent label to any object using the right-click popup menu.</string>
-     </property>
-     <property name="text" >
-      <string>Attach temporary label when hovering mouse</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="kcfg_UseAntialias" >
-     <property name="toolTip" >
-      <string>Select this for smoother (but slower) graphics</string>
-     </property>
-     <property name="text" >
-      <string>Use antialiased drawing</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="ObsListOptions" >
-     <property name="title" >
-      <string>Observing List Labels</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <property name="leftMargin" >
-       <number>8</number>
-      </property>
-      <property name="topMargin" >
-       <number>8</number>
-      </property>
-      <property name="rightMargin" >
-       <number>8</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>8</number>
-      </property>
-      <item>
-       <widget class="QRadioButton" name="kcfg_ObsListSymbol" >
-        <property name="text" >
-         <string>Symbol</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="kcfg_ObsListText" >
-        <property name="text" >
-         <string>Text</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-     <widget class="QCheckBox" name="kcfg_ObsListSaveImage" >
-     <property name="toolTip" >
-      <string>Save the downloaded DSS/SDSS images?</string>
-     </property>
-     <property name="whatsThis" >
-      <string>Do you want the downloaded DSS/SDSS images to be saved when closing the observing list?</string>
-     </property>
-     <property name="text" >
-      <string>Save downloaded images on exit</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="kcfg_HideOnSlew" >
-     <property name="toolTip" >
-      <string>Do not draw all objects while the map is moving?</string>
-     </property>
-     <property name="whatsThis" >
-      <string>When the map is in motion, smooth animation is compromised if the program has too many objects to draw on the map; check this item to temporarily hide some of the objects while the display is in motion.</string>
-     </property>
-     <property name="text" >
-      <string>Hide objects while moving</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="textLabelHideTimeStep" >
-       <property name="text" >
-        <string>Also hide if time step larger than:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="TimeStepBox" name="SlewTimeScale" />
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>111</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
    <item>
-    <widget class="QGroupBox" name="HideBox" >
-     <property name="title" >
-      <string>Configure Hidden Objects</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <property name="leftMargin" >
-       <number>8</number>
-      </property>
-      <property name="topMargin" >
-       <number>8</number>
-      </property>
-      <property name="rightMargin" >
-       <number>8</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>8</number>
-      </property>
-      <item>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QCheckBox" name="kcfg_HideStars" >
-          <property name="toolTip" >
-           <string>Hide faint stars while moving?</string>
-          </property>
-          <property name="whatsThis" >
-           <string>If checked, then fainter stars will be hidden when the map is in motion.</string>
-          </property>
-          <property name="text" >
-           <string>Stars fainter than</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="MagnitudeSpinBox" name="kcfg_MagLimitHideStar" >
-          <property name="minimumSize" >
-           <size>
-            <width>40</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="focusPolicy" >
-           <enum>Qt::StrongFocus</enum>
-          </property>
-          <property name="whatsThis" >
-           <string>Stars fainter than this will not be drawn while the map is moving.</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="textLabelMag1" >
-          <property name="text" >
-           <string>mag</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>240</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QGridLayout" >
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
-        <property name="horizontalSpacing" >
-         <number>6</number>
-        </property>
-        <property name="verticalSpacing" >
-         <number>6</number>
-        </property>
-        <item rowspan="2" row="4" column="0" >
-         <widget class="QCheckBox" name="kcfg_HideIC" >
-          <property name="toolTip" >
-           <string>Hide IC objects while moving?</string>
-          </property>
-          <property name="whatsThis" >
-           <string>If checked, then objects in the IC catalog will be hidden when the map is in motion.</string>
-          </property>
-          <property name="text" >
-           <string>IC objects</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1" >
-         <widget class="QCheckBox" name="kcfg_HideMilkyWay" >
-          <property name="toolTip" >
-           <string>Hide the Milky Way contour while moving?</string>
-          </property>
-          <property name="whatsThis" >
-           <string>If checked, then the Milky Way contour will be hidden when the map is in motion.</string>
-          </property>
-          <property name="text" >
-           <string>Milky Way</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0" >
-         <widget class="QCheckBox" name="kcfg_HidePlanets" >
-          <property name="toolTip" >
-           <string>Hide solar system bodies while moving?</string>
-          </property>
-          <property name="whatsThis" >
-           <string>If checked, then all solar system bodies will be hidden when the map is in motion.</string>
-          </property>
-          <property name="text" >
-           <string>Solar system</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="1" >
-         <widget class="QCheckBox" name="kcfg_HideCBounds" >
-          <property name="text" >
-           <string>Constellation boundaries</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0" >
-         <widget class="QCheckBox" name="kcfg_HideMessier" >
-          <property name="toolTip" >
-           <string>Hide Messier objects when moving?</string>
-          </property>
-          <property name="whatsThis" >
-           <string>If checked, then objects in the Messier catalog will be hidden when the map is in motion.</string>
-          </property>
-          <property name="text" >
-           <string>Messier objects</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="1" >
-         <widget class="QCheckBox" name="kcfg_HideGrids" >
-          <property name="toolTip" >
-           <string>Hide coordinate grids while moving?</string>
-          </property>
-          <property name="whatsThis" >
-           <string>If checked, then the coordinate grids will be hidden when the map is in motion.</string>
-          </property>
-          <property name="text" >
-           <string>Coordinate grids</string>
-          </property>
-         </widget>
-        </item>
-        <item rowspan="2" row="2" column="0" >
-         <widget class="QCheckBox" name="kcfg_HideNGC" >
-          <property name="toolTip" >
-           <string>Hide NGC objects while moving?</string>
-          </property>
-          <property name="whatsThis" >
-           <string>If checked, then objects in the NGC catalog will be hidden when the map is in motion.</string>
-          </property>
-          <property name="text" >
-           <string>NGC objects</string>
-          </property>
-         </widget>
-        </item>
-        <item rowspan="2" row="3" column="1" >
-         <widget class="QCheckBox" name="kcfg_HideCLines" >
-          <property name="toolTip" >
-           <string>Hide constellation lines while moving?</string>
-          </property>
-          <property name="whatsThis" >
-           <string>If checked, then constellation lines will be hidden when the map is in motion.</string>
-          </property>
-          <property name="text" >
-           <string>Constellation lines</string>
-          </property>
-         </widget>
-        </item>
-        <item rowspan="2" row="1" column="1" >
-         <widget class="QCheckBox" name="kcfg_HideCNames" >
-          <property name="toolTip" >
-           <string>Hide constellation names while moving?</string>
-          </property>
-          <property name="whatsThis" >
-           <string>If checked, then constellation names will be hidden when the map is in motion.</string>
-          </property>
-          <property name="text" >
-           <string>Constellation names</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="0" >
-         <widget class="QCheckBox" name="kcfg_HideLabels" >
-          <property name="text" >
-           <string>Object labels</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
+    <widget class="QTabWidget" name="AdvancedOptionsTabWidget">
+     <property name="currentIndex">
+      <number>2</number>
+     </property>
+     <widget class="QWidget" name="tab_3">
+      <attribute name="title">
+       <string>Look and &Feel</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QCheckBox" name="kcfg_UseAnimatedSlewing">
+         <property name="toolTip">
+          <string>Show slewing motion when focus changes?</string>
+         </property>
+         <property name="whatsThis">
+          <string>If checked, changing the focus position will result in a visible animated "slew" to the new position.  Otherwise, the display will center on the new position instantaneously.</string>
+         </property>
+         <property name="text">
+          <string>Use animated slewing</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="kcfg_UseAutoLabel">
+         <property name="toolTip">
+          <string>Show name label of centered object?</string>
+         </property>
+         <property name="whatsThis">
+          <string>If checked, a name label will be temporarily attached to an object while it is centered in the display.  You can attach a more persistent label to any object using the right-click popup menu.</string>
+         </property>
+         <property name="text">
+          <string>Attach label to centered object</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="kcfg_UseHoverLabel">
+         <property name="toolTip">
+          <string>Show name label of centered object?</string>
+         </property>
+         <property name="whatsThis">
+          <string>If checked, a name label will be temporarily attached to an object while it is centered in the display.  You can attach a more persistent label to any object using the right-click popup menu.</string>
+         </property>
+         <property name="text">
+          <string>Attach temporary label when hovering mouse</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="kcfg_UseAntialias">
+         <property name="toolTip">
+          <string>Select this for smoother (but slower) graphics</string>
+         </property>
+         <property name="text">
+          <string>Use antialiased drawing</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="kcfg_HideOnSlew">
+         <property name="toolTip">
+          <string>Do not draw all objects while the map is moving?</string>
+         </property>
+         <property name="whatsThis">
+          <string>When the map is in motion, smooth animation is compromised if the program has too many objects to draw on the map; check this item to temporarily hide some of the objects while the display is in motion.</string>
+         </property>
+         <property name="text">
+          <string>Hide objects while moving</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout">
+         <property name="spacing">
+          <number>6</number>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="textLabelHideTimeStep">
+           <property name="text">
+            <string>Also hide if time step larger than:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="TimeStepBox" name="SlewTimeScale"/>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>111</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="HideBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Configure Hidden Objects</string>
+         </property>
+         <layout class="QVBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
+           <number>8</number>
+          </property>
+          <item>
+           <layout class="QHBoxLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QCheckBox" name="kcfg_HideStars">
+              <property name="toolTip">
+               <string>Hide faint stars while moving?</string>
+              </property>
+              <property name="whatsThis">
+               <string>If checked, then fainter stars will be hidden when the map is in motion.</string>
+              </property>
+              <property name="text">
+               <string>Stars fainter than</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="MagnitudeSpinBox" name="kcfg_MagLimitHideStar">
+              <property name="minimumSize">
+               <size>
+                <width>40</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
+              <property name="whatsThis">
+               <string>Stars fainter than this will not be drawn while the map is moving.</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="textLabelMag1">
+              <property name="text">
+               <string>mag</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Expanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>240</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QGridLayout">
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <item row="4" column="0" rowspan="2">
+             <widget class="QCheckBox" name="kcfg_HideIC">
+              <property name="toolTip">
+               <string>Hide IC objects while moving?</string>
+              </property>
+              <property name="whatsThis">
+               <string>If checked, then objects in the IC catalog will be hidden when the map is in motion.</string>
+              </property>
+              <property name="text">
+               <string>IC objects</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QCheckBox" name="kcfg_HideMilkyWay">
+              <property name="toolTip">
+               <string>Hide the Milky Way contour while moving?</string>
+              </property>
+              <property name="whatsThis">
+               <string>If checked, then the Milky Way contour will be hidden when the map is in motion.</string>
+              </property>
+              <property name="text">
+               <string>Milky Way</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="0">
+             <widget class="QCheckBox" name="kcfg_HidePlanets">
+              <property name="toolTip">
+               <string>Hide solar system bodies while moving?</string>
+              </property>
+              <property name="whatsThis">
+               <string>If checked, then all solar system bodies will be hidden when the map is in motion.</string>
+              </property>
+              <property name="text">
+               <string>Solar system</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="1">
+             <widget class="QCheckBox" name="kcfg_HideCBounds">
+              <property name="text">
+               <string>Constellation boundaries</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QCheckBox" name="kcfg_HideMessier">
+              <property name="toolTip">
+               <string>Hide Messier objects when moving?</string>
+              </property>
+              <property name="whatsThis">
+               <string>If checked, then objects in the Messier catalog will be hidden when the map is in motion.</string>
+              </property>
+              <property name="text">
+               <string>Messier objects</string>
+              </property>
+             </widget>
+            </item>
+            <item row="6" column="1">
+             <widget class="QCheckBox" name="kcfg_HideGrids">
+              <property name="toolTip">
+               <string>Hide coordinate grids while moving?</string>
+              </property>
+              <property name="whatsThis">
+               <string>If checked, then the coordinate grids will be hidden when the map is in motion.</string>
+              </property>
+              <property name="text">
+               <string>Coordinate grids</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0" rowspan="2">
+             <widget class="QCheckBox" name="kcfg_HideNGC">
+              <property name="toolTip">
+               <string>Hide NGC objects while moving?</string>
+              </property>
+              <property name="whatsThis">
+               <string>If checked, then objects in the NGC catalog will be hidden when the map is in motion.</string>
+              </property>
+              <property name="text">
+               <string>NGC objects</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1" rowspan="2">
+             <widget class="QCheckBox" name="kcfg_HideCLines">
+              <property name="toolTip">
+               <string>Hide constellation lines while moving?</string>
+              </property>
+              <property name="whatsThis">
+               <string>If checked, then constellation lines will be hidden when the map is in motion.</string>
+              </property>
+              <property name="text">
+               <string>Constellation lines</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1" rowspan="2">
+             <widget class="QCheckBox" name="kcfg_HideCNames">
+              <property name="toolTip">
+               <string>Hide constellation names while moving?</string>
+              </property>
+              <property name="whatsThis">
+               <string>If checked, then constellation names will be hidden when the map is in motion.</string>
+              </property>
+              <property name="text">
+               <string>Constellation names</string>
+              </property>
+             </widget>
+            </item>
+            <item row="6" column="0">
+             <widget class="QCheckBox" name="kcfg_HideLabels">
+              <property name="text">
+               <string>Object labels</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>211</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+      <zorder>textLabelHideTimeStep</zorder>
+      <zorder>verticalLayoutWidget_3</zorder>
+      <zorder>verticalLayoutWidget_2</zorder>
+     </widget>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>&Backends</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QCheckBox" name="kcfg_UseRefraction">
+         <property name="toolTip">
+          <string>Correct coordinates of objects for the effects of the atmosphere</string>
+         </property>
+         <property name="whatsThis">
+          <string>The atmosphere bends light passing through it, like a lens.  If this item is checked, this "atmospheric refraction" will be simulated in the sky map.  Note that this correction is only applied when using the Horizontal coordinate system.</string>
+         </property>
+         <property name="text">
+          <string>Correct for atmospheric refraction</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="kcfg_UseRelativistic">
+         <property name="toolTip">
+          <string>Correct for the effect of sun's gravity on star positions, as predicted by General Relativity, and verified by Eddington's experiment.</string>
+         </property>
+         <property name="text">
+          <string>General Relativity effects near the sun</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>537</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>Observing &List</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QGroupBox" name="ObsListOptions">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Observing List Labels</string>
+         </property>
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
+           <number>8</number>
+          </property>
+          <item>
+           <widget class="QRadioButton" name="kcfg_ObsListSymbol">
+            <property name="text">
+             <string>Symbol</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="kcfg_ObsListText">
+            <property name="text">
+             <string>Text</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="kcfg_ObsListSaveImage">
+         <property name="toolTip">
+          <string>Save the downloaded DSS/SDSS images?</string>
+         </property>
+         <property name="whatsThis">
+          <string>Do you want the downloaded DSS/SDSS images to be saved when closing the observing list?</string>
+         </property>
+         <property name="text">
+          <string>Save downloaded images on exit</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="ObsListImageryOptions">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Preferred Imagery</string>
+         </property>
+         <layout class="QHBoxLayout" name="_3">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
+           <number>8</number>
+          </property>
+          <item>
+           <widget class="QRadioButton" name="kcfg_ObsListPreferDSS">
+            <property name="text">
+             <string>&Digitized Sky Survey (DSS)</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="kcfg_ObsListPreferSDSS">
+            <property name="text">
+             <string>&Sloan Digital Sky Survey (SDSS)</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>417</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>468</width>
-       <height>16</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
+   <class>KDoubleNumInput</class>
+   <extends>QWidget</extends>
+   <header>knuminput.h</header>
+  </customwidget>
+  <customwidget>
    <class>MagnitudeSpinBox</class>
    <extends>KDoubleNumInput</extends>
    <header>widgets/magnitudespinbox.h</header>
@@ -491,10 +528,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>kcfg_UseRefraction</tabstop>
-  <tabstop>kcfg_UseAnimatedSlewing</tabstop>
-  <tabstop>kcfg_UseAutoLabel</tabstop>
-  <tabstop>kcfg_HideOnSlew</tabstop>
   <tabstop>kcfg_HideStars</tabstop>
   <tabstop>kcfg_MagLimitHideStar</tabstop>
   <tabstop>kcfg_HidePlanets</tabstop>
diff --git a/kstars/tools/observinglist.cpp b/kstars/tools/observinglist.cpp
index 0dfa3cd..25ff29a 100644
--- a/kstars/tools/observinglist.cpp
+++ b/kstars/tools/observinglist.cpp
@@ -1118,7 +1118,7 @@ void ObservingList::slotSaveAllImages() {
     foreach( SkyObject *o, currList ) {
         setCurrentImage( o );
         QString img( CurrentImagePath  );
-        KUrl url( ( ui->preferDSS->isChecked() ) ? DSSUrl : SDSSUrl );
+        KUrl url( ( Options::obsListPreferDSS() ) ? DSSUrl : SDSSUrl );
         if( ! o->isSolarSystem() )//TODO find a way for adding support for solar system images
             saveImage( url, img );
     }
@@ -1194,7 +1194,7 @@ bool ObservingList::eventFilter( QObject *obj, QEvent *event ) {
             if( currentObject() ) {
                 if( ( ( QFile( CurrentImagePath ).size() < 13000 ) && (  QFile( CurrentTempPath ).size() < 13000 ) ) ) {
                     if( ! currentObject()->isSolarSystem() )
-                        slotGetImage( ui->preferDSS->isChecked() );
+                        slotGetImage( Options::obsListPreferDSS() );
                     else
                         slotGoogleImage();
                 }
diff --git a/kstars/tools/observinglist.ui b/kstars/tools/observinglist.ui
index f06421e..af749b3 100644
--- a/kstars/tools/observinglist.ui
+++ b/kstars/tools/observinglist.ui
@@ -301,13 +301,6 @@
       </widget>
      </item>
      <item>
-      <widget class="QCheckBox" name="preferDSS">
-       <property name="text">
-        <string> Prefer DSS</string>
-       </property>
-      </widget>
-     </item>
-     <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>



More information about the Kstars-devel mailing list