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

[Jason Harris]

SVN commit 457949 by harris:

Two fixes:  Make sure that the default startup position is applied on 
first startup, and disable the Glossary tool (since no content has 
been added to it yet).

CCMAIL: kstars-devel at kde.org


 M  +5 -4      kstars.h  
 M  +17 -10    kstarsactions.cpp  
 M  +7 -2      kstarsinit.cpp  
 M  +2 -0      kstarsui.rc  


--- branches/KDE/3.5/kdeedu/kstars/kstars/kstars.h #457948:457949
@@ -492,10 +492,11 @@
 		 */
 		 void slotWUT();
 
-		 /**
-		  * action slot: open the glossary
-		  */
-		 void slotGlossary();
+//FIXME GLOSSARY
+//		 /**
+//		  * action slot: open the glossary
+//		  */
+//		 void slotGlossary();
 
 		/**
 		 * action slot: open ScriptBuilder dialog
--- branches/KDE/3.5/kdeedu/kstars/kstars/kstarsactions.cpp #457948:457949
@@ -38,7 +38,8 @@
 #include <qcheckbox.h>
 #include <qdir.h>
 #include <kdeversion.h>
-#include <libkdeedu/kdeeduui/kdeeduglossary.h>
+//FIXME GLSOSSARY (uncomment these when content is added)
+//#include <libkdeedu/kdeeduui/kdeeduglossary.h>
 
 #include "opscatalog.h"
 #include "opsguides.h"
@@ -195,15 +196,16 @@
 	dialog.exec();
 }
 
-void KStars::slotGlossary(){
-	GlossaryDialog *dlg = new GlossaryDialog( true, this, "glossary" );
-	QString glossaryfile =data()->stdDirs->findResource( "data", "kstars/glossary.xml" );
-	KURL u = glossaryfile;
-	Glossary *g = Glossary::readFromXML( u );
-	g->setName( i18n( "Knowledge" ) );
-	dlg->addGlossary( g );
-	dlg->show();
-}
+//FIXME GLOSSARY
+// void KStars::slotGlossary(){
+// 	GlossaryDialog *dlg = new GlossaryDialog( true, this, "glossary" );
+// 	QString glossaryfile =data()->stdDirs->findResource( "data", "kstars/glossary.xml" );
+// 	KURL u = glossaryfile;
+// 	Glossary *g = Glossary::readFromXML( u );
+// 	g->setName( i18n( "Knowledge" ) );
+// 	dlg->addGlossary( g );
+// 	dlg->show();
+// }
 
 void KStars::slotScriptBuilder() {
 	ScriptBuilder sb(this);
@@ -558,6 +560,11 @@
 					i18n( "Script Validation Failed" ), i18n("Run Nevertheless"), "daExecuteScript" );
 			if ( answer == KMessageBox::Cancel ) return;
 		}
+
+		//FIXME STRINGS FREEZE
+		//Add statusbar message that script is running
+		//ks->statusBar()->changeItem( i18n( "Running script: %1" ).arg( fileURL.fileName() ), 0 );
+
 		KProcess p;
 		p << f.name();
 		p.start( KProcess::DontCare );
--- branches/KDE/3.5/kdeedu/kstars/kstars/kstarsinit.cpp #457948:457949
@@ -215,8 +215,9 @@
 						this, SLOT( slotAVT() ), actionCollection(), "altitude_vs_time");
 	new KAction(i18n( "What's up Tonight..."), KShortcut("Ctrl+U"),
 						this, SLOT(slotWUT()), actionCollection(), "whats_up_tonight");
-	new KAction(i18n( "Glossary..."), KShortcut("Ctrl+K"),
-						this, SLOT(slotGlossary()), actionCollection(), "glossary");
+//FIXME GLOSSARY
+//	new KAction(i18n( "Glossary..."), KShortcut("Ctrl+K"),
+//						this, SLOT(slotGlossary()), actionCollection(), "glossary");
 	new KAction(i18n( "Script Builder..."), KShortcut("Ctrl+B"),
 						this, SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder");
 	new KAction(i18n( "Solar System..."), KShortcut("Ctrl+Y"),
@@ -424,6 +425,10 @@
 		}
 	}
 
+	//Store focus coords in Options object before calling applyConfig()
+	Options::setFocusRA( map()->focus()->ra()->Hours() );
+	Options::setFocusDec( map()->focus()->dec()->Degrees() );
+
 	//Propagate Options values through the program
 	applyConfig();
 
--- branches/KDE/3.5/kdeedu/kstars/kstars/kstarsui.rc #457948:457949
@@ -67,7 +67,9 @@
 		<Action name="lightcurvegenerator" />
 		<Action name="altitude_vs_time" />
 		<Action name="whats_up_tonight" />
+<!--FIXME GLOSSARY
 		<Action name="glossary" />
+-->
 		<Action name="scriptbuilder" />
 		<Action name="solarsystem" />
 		<Action name="jmoontool" />