Commit 8ba9f086 authored by Jason Harris's avatar Jason Harris
Browse files

Minor cosmetic bugfixes: changed Tracking action icons from "lock"/"unlock" to...

Minor cosmetic bugfixes: changed Tracking action icons from "lock"/"unlock" to "encrypted"/"decrypted";
also applied a small systematic offset to positions of star bitmaps so that they are properly centered in the map.

svn path=/branches/KDE_3_0_BRANCH/kdeedu/kstars/; revision=146093
parent c93ae81c
...@@ -410,7 +410,7 @@ void KStars::initMenuBar() { ...@@ -410,7 +410,7 @@ void KStars::initMenuBar() {
actFind->setText( i18n( "&Find Object..." ) ); actFind->setText( i18n( "&Find Object..." ) );
actFind->setToolTip( i18n( "Find Object" ) ); actFind->setToolTip( i18n( "Find Object" ) );
actFind->plug( p ); actFind->plug( p );
actTrack = new KAction( i18n( "&Track Object" ), BarIcon( "unlock" ), 0, this, SLOT( mTrack() ), actionCollection() ); actTrack = new KAction( i18n( "&Track Object" ), BarIcon( "decrypted" ), 0, this, SLOT( mTrack() ), actionCollection() );
actTrack->setAccel( CTRL+Key_T ); actTrack->setAccel( CTRL+Key_T );
actTrack->plug( p ); actTrack->plug( p );
p->insertSeparator(); p->insertSeparator();
...@@ -846,12 +846,12 @@ void KStars::mFind() { ...@@ -846,12 +846,12 @@ void KStars::mFind() {
void KStars::mTrack() { void KStars::mTrack() {
if ( options()->isTracking ) { if ( options()->isTracking ) {
options()->isTracking = false; options()->isTracking = false;
actTrack->setIconSet( BarIcon( "unlock" ) ); actTrack->setIconSet( BarIcon( "decrypted" ) );
skymap->setClickedObject( NULL ); skymap->setClickedObject( NULL );
skymap->setFoundObject( NULL );//no longer tracking foundObject skymap->setFoundObject( NULL );//no longer tracking foundObject
} else { } else {
options()->isTracking = true; options()->isTracking = true;
actTrack->setIconSet( BarIcon( "lock" ) ); actTrack->setIconSet( BarIcon( "encrypted" ) );
} }
} }
......
...@@ -176,10 +176,10 @@ void SkyMap::slotCenter( void ) { ...@@ -176,10 +176,10 @@ void SkyMap::slotCenter( void ) {
setFoundObject( ClickedObject ); setFoundObject( ClickedObject );
if ( foundObject() != NULL ) { //set tracking to true if ( foundObject() != NULL ) { //set tracking to true
ksw->options()->isTracking = true; ksw->options()->isTracking = true;
ksw->actTrack->setIconSet( BarIcon( "lock" ) ); ksw->actTrack->setIconSet( BarIcon( "encrypted" ) );
} else { } else {
ksw->options()->isTracking = false; ksw->options()->isTracking = false;
ksw->actTrack->setIconSet( BarIcon( "unlock" ) ); ksw->actTrack->setIconSet( BarIcon( "decrypted" ) );
} }
ksw->showFocusCoords(); //updateinfoPanel ksw->showFocusCoords(); //updateinfoPanel
...@@ -423,7 +423,7 @@ void SkyMap::keyPressEvent( QKeyEvent *e ) { ...@@ -423,7 +423,7 @@ void SkyMap::keyPressEvent( QKeyEvent *e ) {
setClickedObject( NULL ); setClickedObject( NULL );
setFoundObject( NULL );//no longer tracking foundObject setFoundObject( NULL );//no longer tracking foundObject
ksw->options()->isTracking = false; ksw->options()->isTracking = false;
ksw->actTrack->setIconSet( BarIcon( "unlock" ) ); ksw->actTrack->setIconSet( BarIcon( "decrypted" ) );
} }
ksw->showFocusCoords(); ksw->showFocusCoords();
} }
...@@ -446,7 +446,7 @@ void SkyMap::mouseMoveEvent( QMouseEvent *e ) { ...@@ -446,7 +446,7 @@ void SkyMap::mouseMoveEvent( QMouseEvent *e ) {
if (!slewing) { if (!slewing) {
slewing = true; slewing = true;
ksw->options()->isTracking = false; //break tracking on slew ksw->options()->isTracking = false; //break tracking on slew
ksw->actTrack->setIconSet( BarIcon( "unlock" ) ); ksw->actTrack->setIconSet( BarIcon( "decrypted" ) );
setClickedObject( NULL ); setClickedObject( NULL );
setFoundObject( NULL );//no longer tracking foundObject setFoundObject( NULL );//no longer tracking foundObject
} }
...@@ -1872,7 +1872,7 @@ void SkyMap::drawSymbol( QPainter &psky, int type, int x, int y, int size, QChar ...@@ -1872,7 +1872,7 @@ void SkyMap::drawSymbol( QPainter &psky, int type, int x, int y, int size, QChar
if ( QT_VERSION >=300 && size==2 ) size = 1; if ( QT_VERSION >=300 && size==2 ) size = 1;
star = starpix->getPixmap (&color, size); star = starpix->getPixmap (&color, size);
bitBlt ((QPaintDevice *) sky, x1-star->width()/2, y1-star->height()/2, star); bitBlt ((QPaintDevice *) sky, xa-star->width()/2, ya-star->height()/2, star);
break; break;
case 1: //catalog star case 1: //catalog star
//Some NGC/IC objects are stars...changed their type to 1 (was double star) //Some NGC/IC objects are stars...changed their type to 1 (was double star)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment