[Kstars-devel] branches/kstars/summer/kstars/kstars

[Prakash Mohan]

SVN commit 1002409 by prakash:

Adding an Observer Add UI, for adding observers in the OAL logs.

CCMAIL: kstars-devel at kde.org


 M  +3 -1      CMakeLists.txt  
 A             comast/observeradd.cpp   [License: GPL (v2+)]
 A             comast/observeradd.h   [License: GPL (v2+)]
 A             comast/observeradd.ui  
 M  +5 -0      kstars.h  
 M  +4 -0      kstarsactions.cpp  
 M  +7 -0      kstarsinit.cpp  
 M  +1 -0      kstarsui-indi.rc  
 M  +1 -0      kstarsui-win.rc  
 M  +1 -0      kstarsui.rc  


--- branches/kstars/summer/kstars/kstars/CMakeLists.txt #1002408:1002409
@@ -321,6 +321,7 @@
     comast/observation.cpp
     comast/lens.cpp
     comast/equipmentwriter.cpp
+    comast/observeradd.cpp
 )
 
 set(kstars_SRCS ${indi_SRCS} ${fits_SRCS} 
@@ -338,7 +339,8 @@
 
 kde4_add_ui_files(kstars_SRCS
        ${indiui_SRCS} ${fitsui_SRCS} ${xplanetui_SRCS} ${kstars_optionsui_SRCS} ${kstars_dialogsui_SRCS}
-         thumbnailpicker.ui thumbnaileditor.ui comast/equipmentwriter.ui
+         thumbnailpicker.ui thumbnaileditor.ui comast/observeradd.ui comast/equipmentwriter.ui
+
 )
 
 #kde4_add_app_icon(kstars_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/kstars.png")
--- branches/kstars/summer/kstars/kstars/kstars.h #1002408:1002409
@@ -24,6 +24,7 @@
 
 #include "tools/observinglist.h"
 #include "comast/equipmentwriter.h"
+#include "comast/observeradd.h"
 
 // forward declaration is enough. We only need pointers
 class QPalette;
@@ -53,6 +54,7 @@
 class FlagManager;
 class ObservingList;
 class EquipmentWriter;
+class ObserverAdd;
 
 class OpsCatalog;
 class OpsGuides;
@@ -696,6 +698,8 @@
 
     void slotEquipmentWriter();
 
+    void slotObserverAdd();
+
 private:
     /**
         *Initialize Menu bar, toolbars and all Actions.
@@ -738,6 +742,7 @@
     //FIXME: move to KStarsData
     ObservingList *obsList;
     EquipmentWriter *eWriter;
+    ObserverAdd *oAdd;
     AltVsTime *avt;
     WUTDialog *wut;
     SkyCalendar *skycal;
--- branches/kstars/summer/kstars/kstars/kstarsactions.cpp #1002408:1002409
@@ -1052,6 +1052,10 @@
 void KStars::slotEquipmentWriter() {
     eWriter->show();
 }
+
+void KStars::slotObserverAdd() {
+    oAdd->show();
+}
 //Help Menu
 void KStars::slotTipOfDay() {
     KTipDialog::showTip(this, "kstars/tips", true);
--- branches/kstars/summer/kstars/kstars/kstarsinit.cpp #1002408:1002409
@@ -48,6 +48,7 @@
 #include "simclock.h"
 #include "widgets/timestepbox.h"
 #include "comast/equipmentwriter.h"
+#include "comast/observeradd.h"
 
 #include <config-kstars.h>
 
@@ -395,6 +396,11 @@
     ka->setShortcuts( KShortcut( Qt::CTRL+Qt::Key_0 ) );
     connect( ka, SIGNAL( triggered() ), this, SLOT( slotEquipmentWriter() ) );
 
+    ka = actionCollection()->addAction( "obsadd" );
+    ka->setText( i18n( "Add Observer..." ) );
+    ka->setShortcuts( KShortcut( Qt::CTRL+Qt::Key_1 ) );
+    connect( ka, SIGNAL( triggered() ), this, SLOT( slotObserverAdd() ) );
+
     // devices Menu
 #ifdef HAVE_INDI_H
 #ifndef Q_WS_WIN
@@ -638,6 +644,7 @@
     //Initialize Observing List
     obsList = new ObservingList( this );
     eWriter = new EquipmentWriter();
+    oAdd = new ObserverAdd;
 
     //Do not start the clock if "--paused" specified on the cmd line
     if ( StartClockRunning )
--- branches/kstars/summer/kstars/kstars/kstarsui-indi.rc #1002408:1002409
@@ -108,6 +108,7 @@
 
 	<Menu name="comast" noMerge="1"><text>&amp;Comast</text>
         <Action name="ewriter"/>
+        <Action name="obsadd"/>
     </Menu>
 
 	<Menu name="help"><text>&amp;Help</text>
--- branches/kstars/summer/kstars/kstars/kstarsui-win.rc #1002408:1002409
@@ -100,6 +100,7 @@
 
 	<Menu name="comast" noMerge="1"><text>&amp;Comast</text>
         <Action name="ewriter"/>
+        <Action name="obsadd"/>
     </Menu>
 
 	<Menu name="help"><text>&amp;Help</text>
--- branches/kstars/summer/kstars/kstars/kstarsui.rc #1002408:1002409
@@ -98,6 +98,7 @@
 
 	<Menu name="comast" noMerge="1"><text>&amp;Comast</text>
         <Action name="ewriter"/>
+        <Action name="obsadd"/>
     </Menu>
 
 	<Menu name="help"><text>&amp;Help</text>