[Kstars-devel] KDE/kdeedu/kstars/kstars

[Alexey Khudyakov]

SVN commit 1083013 by khudyakov:

* Remove options Show{Main,View}Toolbar. It turn out that toolbars
have their own facilities to preserve state between program runs and
these options interfere. This should resolve bug 20797.

It's based on Sruthi Devi's patch.

CCMAIL: kstars-devel at kde.org
CCBUG: 207797

 M  +0 -2      kstars.cpp  
 M  +0 -10     kstars.kcfg  
 M  +4 -4      kstarsactions.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/kstars.cpp #1083012:1083013
@@ -159,8 +159,6 @@
     actionCollection()->action("show_time_box"    )->setChecked( Options::showTimeBox() );
     actionCollection()->action("show_location_box")->setChecked( Options::showGeoBox() );
     actionCollection()->action("show_focus_box"   )->setChecked( Options::showFocusBox() );
-    actionCollection()->action("show_mainToolBar" )->setChecked( Options::showMainToolBar() );
-    actionCollection()->action("show_viewToolBar" )->setChecked( Options::showViewToolBar() );
     actionCollection()->action("show_statusBar"   )->setChecked( Options::showStatusBar() );
     actionCollection()->action("show_sbAzAlt"     )->setChecked( Options::showAltAzField() );
     actionCollection()->action("show_sbRADec"     )->setChecked( Options::showRADecField() );
--- trunk/KDE/kdeedu/kstars/kstars/kstars.kcfg #1083012:1083013
@@ -89,16 +89,6 @@
 			<whatsthis>Toggle display of the Equatorial coordinates of the mouse cursor in the status bar.</whatsthis>
 			<default>true</default>
 		</entry>
-		<entry name="ShowMainToolBar" type="Bool">
-			<label>Display main toolbar?</label>
-			<whatsthis>Toggle display of the main toolbar.</whatsthis>
-			<default>true</default>
-		</entry>
-		<entry name="ShowViewToolBar" type="Bool">
-			<label>Display view toolbar?</label>
-			<whatsthis>Toggle display of the "view" toolbar.</whatsthis>
-			<default>true</default>
-		</entry>
 		<entry name="WindowWidth" type="UInt">
 			<label>Width of main window, in pixels</label>
 			<default>600</default>
--- trunk/KDE/kdeedu/kstars/kstars/kstarsactions.cpp #1083012:1083013
@@ -946,12 +946,10 @@
 void KStars::slotShowGUIItem( bool show ) {
     //Toolbars
     if ( sender() == actionCollection()->action( "show_mainToolBar" ) ) {
-        Options::setShowMainToolBar( show );
         toolBar("kstarsToolBar")->setVisible(show);
     }
 
     if ( sender() == actionCollection()->action( "show_viewToolBar" ) ) {
-        Options::setShowViewToolBar( show );
         toolBar( "viewToolBar" )->setVisible(show);
     }
 
@@ -962,12 +960,14 @@
 
     if ( sender() == actionCollection()->action( "show_sbAzAlt" ) ) {
         Options::setShowAltAzField( show );
-        if ( ! show ) { statusBar()->changeItem( QString(), 1 ); }
+        if( !show )
+            statusBar()->changeItem( QString(), 1 );
     }
 
     if ( sender() == actionCollection()->action( "show_sbRADec" ) ) {
         Options::setShowRADecField( show );
-        if ( ! show ) { statusBar()->changeItem( QString(), 2 ); }
+        if( ! show )
+            statusBar()->changeItem( QString(), 2 );
     }
 
 }