SVN commit 885900 by ingwa:

Remove the None alternative in the Sun Shading dropdown box in the Sun
Control dialog.



 M  +5 -7      SunControlWidget.cpp  
 M  +0 -5      SunControlWidget.ui  


--- trunk/KDE/kdeedu/marble/src/lib/SunControlWidget.cpp #885899:885900
@@ -54,6 +54,7 @@
     else
         m_uiWidget.showToolButton->setText( tr("Sh&ow") );
 
+    //m_sunLocator->setShow( checked );
     emit showSun( checked );
 }
 
@@ -68,15 +69,12 @@
 
 void SunControlWidget::showSunShadingClicked( int index )
 {
-    if ( index == 0 ) {
-        m_sunLocator->setShow( false );
-    } else if ( index == 1 ) {
+    // Control whether the dark side should be a shadow or the
+    // Citylights theme.
+    if ( index == 0 )
         m_sunLocator->setCitylights( false );
-        m_sunLocator->setShow( true );
-    } else if ( index == 2 ) {
+    else if ( index == 1 )
         m_sunLocator->setCitylights( true );
-        m_sunLocator->setShow( true );
-    }
 }
 
 void SunControlWidget::centerSunClicked(bool checked)
--- trunk/KDE/kdeedu/marble/src/lib/SunControlWidget.ui #885899:885900
@@ -144,11 +144,6 @@
          <widget class="QComboBox" name="sunShadingComboBox" >
           <item>
            <property name="text" >
-            <string>None</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
             <string>Shadow</string>
            </property>
           </item>