[Kstars-devel] kdeedu/kstars/kstars

[Jason Harris]

CVS commit by harris: 

Two fixes:  1: Show the long name of objects in the Focus InfoBox, not 
the primary name.  2: When using the Setup Wizard for the first time, 
reset the clock to the CPU clock after changing the geographic location.

CCMAIL: kstars-devel at kde.org


  M +2 -0      kstarsinit.cpp   1.97
  M +10 -15    skymap.cpp   1.138


--- kdeedu/kstars/kstars/skymap.cpp  #1.137:1.138
@@ -167,12 +167,7 @@ void SkyMap::showFocusCoords( void ) {
         //display object info in infoBoxes
         QString oname;
-
         oname = i18n( "nothing" );
-        if ( focusObject() != NULL && Options::isTracking() ) {
-                oname = focusObject()->translatedName();
-                //add genetive name for stars
-          if ( focusObject()->type()==0 && focusObject()->name2().length() )
-                        oname += " (" + focusObject()->name2() + ")";
-        }
+        if ( focusObject() != NULL && Options::isTracking() ) 
+                oname = focusObject()->translatedLongName();
 
         infoBoxes()->focusObjChanged(oname);
@@ -530,5 +525,4 @@ void SkyMap::slotCenter( void ) {
 
         showFocusCoords(); //update FocusBox
-//      forceUpdate();  // must be new computed
 }
 
@@ -913,10 +907,11 @@ void SkyMap::slewFocus( void ) {
                 focus()->EquatorialToHorizontal( data->LST, data->geo()->lat() );
 
-                if ( focusObject() )
-                        infoBoxes()->focusObjChanged( focusObject()->translatedName() );
-                else
-                        infoBoxes()->focusObjChanged( i18n( "nothing" ) );
-
-                infoBoxes()->focusCoordChanged( focus() );
+//Deprecated...this is already done by showFocusCoords() call at end of slotFocus()
+//              if ( focusObject() )
+//                      infoBoxes()->focusObjChanged( focusObject()->translatedLongName() );
+//              else
+//                      infoBoxes()->focusObjChanged( i18n( "nothing" ) );
+// 
+//              infoBoxes()->focusCoordChanged( focus() );
 
                 data->HourAngle->setH( data->LST->Hours() - focus()->ra()->Hours() );

--- kdeedu/kstars/kstars/kstarsinit.cpp  #1.96:1.97
@@ -527,4 +527,6 @@ void KStars::datainitFinished(bool worke
         if ( Options::runStartupWizard() ) {
                 slotWizard();
+                //reset the clock to the system CPU
+                slotSetTimeToNow();
         }