[Kstars-devel] kdeedu/kstars/kstars

[Jason Harris]

CVS commit by harris: 

Using the Alt/Az mode of the Manual Focus tool will no longer engage 
tracking.  So, setting the focus this way will keep the Alt and Az fixed 
as time passes.

Also, there was a bug where the "Tracking" icon was displayed in its 
inactive state when the program was started with tracking active.  Fixed 
this.

CCMAIL: kstars-devel at kde.org


  M +3 -0      kstarsactions.cpp   1.76
  M +12 -6     kstarsinit.cpp   1.74


--- kdeedu/kstars/kstars/kstarsactions.cpp  #1.75:1.76
@@ -604,4 +604,7 @@ void KStars::slotManualFocus() {
 
                 map()->slotCenter();
+                
+                //Don't track if we set Alt/Az coordinates.  This way, Alt/Az remain constant.
+                if ( focusDialog.usedAltAz() ) map()->stopTracking();
         }
 }

--- kdeedu/kstars/kstars/kstarsinit.cpp  #1.73:1.74
@@ -77,6 +77,12 @@ void KStars::initActions() {
         tmpAction->setText( i18n( "&Find Object..." ) );
         tmpAction->setToolTip( i18n( "Find object" ) );
+        
         new KAction( i18n( "Engage &Tracking" ), "decrypted", KShortcut( "Ctrl+T"  ),
                 this, SLOT( slotTrack() ), actionCollection(), "track_object" );
+        if ( options()->isTracking ) { 
+                actionCollection()->action("track_object")->setText( i18n( "Stop &Tracking" ) );
+                actionCollection()->action("track_object")->setIconSet( BarIcon( "encrypted" ) );
+        }
+
         new KAction( i18n( "Set Focus &Manually..." ), KShortcut( "Ctrl+M" ),
                         this, SLOT( slotManualFocus() ),  actionCollection(), "manual_focus" );
@@ -554,16 +561,16 @@ void KStars::privatedata::buildGUI() {
                 if ( (ks->options()->focusObject== i18n( "star" ) ) ||
                      (ks->options()->focusObject== i18n( "nothing" ) ) ) {
-                        ks->map()->setClickedPoint( &newPoint );
+                        ks->map()->setFocusPoint( &newPoint );
                 } else {
                         ks->map()->setClickedObject( ks->data()->objectNamed( ks->options()->focusObject ) );
                         if ( ks->map()->clickedObject() ) {
-                                ks->map()->setClickedPoint( ks->map()->clickedObject() );
+                                ks->map()->setFocusPoint( ks->map()->clickedObject() );
                         } else {
-                                ks->map()->setClickedPoint( &newPoint );
+                                ks->map()->setFocusPoint( &newPoint );
                         }
                 }
 //              ks->map()->slotCenter();
         } else {
-                ks->map()->setClickedPoint( &newPoint );
+                ks->map()->setFocusPoint( &newPoint );
 //              ks->map()->slotCenter();
         }
@@ -571,5 +578,5 @@ void KStars::privatedata::buildGUI() {
         if ( ks->options()->focusObject== i18n( "star" ) ) ks->options()->focusObject = i18n( "nothing" );
 
-        ks->map()->setDestination( ks->map()->clickedPoint() );
+        ks->map()->setDestination( ks->map()->focusPoint() );
         ks->map()->destination()->EquatorialToHorizontal( ks->LST(), ks->geo()->lat() );
         ks->map()->setFocus( ks->map()->destination() );