[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Added UI for event monitoring


  A            eventmonitor.ui   1.1
  A            ksteventmonitor_i.cpp   1.1 [GPL (v2+)]
  A            ksteventmonitor_i.h   1.1 [GPL (v2+)]
  A            ksteventtable.cpp   1.1 [GPL (v2+)]
  A            ksteventtable.h   1.1 [GPL (v2+)]
  M +4 -0      .cvsignore   1.18
  M +3 -0      Makefile.am   1.80
  M +16 -0     kst.cpp   1.90
  M +9 -0      kst.h   1.38
  M +1 -0      kstui.rc   1.20


--- kdeextragear-2/kst/kst/.cvsignore  #1.17:1.18
@@ -5,4 +5,8 @@
 *.swp
 *.moc
+eventmonitor.cpp
+eventmonitor.h
+extensiondlg.cpp
+extensiondlg.h
 viewscalarsdialog.cpp
 viewscalarsdialog.h

--- kdeextragear-2/kst/kst/kst.cpp  #1.89:1.90
@@ -70,4 +70,5 @@
 #include "kstviewscalarsdialog_i.h"
 #include "kstviewvectorsdialog_i.h"
+#include "ksteventmonitor_i.h"
 #include "pluginmanager.h"
 #include "updatethread.h"
@@ -104,4 +105,6 @@ KstApp::KstApp(QWidget *parent, const ch
   graphFileDialog = new KstGraphFileDialogI(this);
   vectorSaveDialog = new VectorSaveDialog(this);
+  eventMonitorDialog = new KstEventMonitorI(this);
+  
   connect(KstVectorDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
   connect(KstCurveDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
@@ -442,4 +445,13 @@ void KstApp::initActions() {
 
   /************/
+  EventMonitorAction = new KAction(i18n("Edit Event &Monitoring"),
+                                     0, 0,
+                                     this, SLOT(showEventMonitorDialog()),
+                                     actionCollection(),
+                                     "eventmonitor_action");
+  EventMonitorAction->setWhatsThis(i18n("Bring up a dialog box\n"
+                                          "to edit event monitoring."));
+  
+  /************/
   GraphFileDialogAction = new KAction(i18n("Export to Graphics File..."),
                                   "kst_graphfile", 0,
@@ -917,4 +929,8 @@ void KstApp::showDebugDialog() {
 }
 
+void KstApp::showEventMonitorDialog() {
+  eventMonitorDialog->showEventMonitorDialog();
+}
+
 void KstApp::samplesUp() {
   setPaused(false);

--- kdeextragear-2/kst/kst/kst.h  #1.37:1.38
@@ -48,4 +48,5 @@ class KstQuickCurvesDialogI;
 class KstQuickPSDDialogI;
 class KstGraphFileDialogI;
+class KstEventMonitorI;
 class KstDataManagerI;
 class UpdateThread;
@@ -261,4 +262,7 @@ public slots:
   void showDataWizard();
 
+  /** creates the event monitor */
+  void showEventMonitorDialog();
+  
   /** calls doc->samplesDown */
   void samplesDown();
@@ -328,4 +332,7 @@ private:
   KstDebugDialogI *debugDialog;
 
+  /* Dialog for event monitoring */
+  KstEventMonitorI *eventMonitorDialog;
+  
   /** contains the recently used filenames */
   KRecentFilesAction *recent;
@@ -398,4 +405,6 @@ private:
   /** ExtensionManagerAction: Brings up the extension manager window */
   KAction *ExtensionManagerAction;
+  /** EventMonitorAction: Brings up the event monitor window */
+  KAction *EventMonitorAction;
 
   KAction *DataWizardAction;

--- kdeextragear-2/kst/kst/kstui.rc  #1.19:1.20
@@ -24,4 +24,5 @@
     <Action name="plugindialog_action"/>
     <Action name="filterdialog_action"/>
+    <Action name="eventmonitor_action"/>
     <Separator/>
     <Action name="viewscalarsdialog_action"/>

--- kdeextragear-2/kst/kst/Makefile.am  #1.79:1.80
@@ -32,4 +32,5 @@
         kstscalartable.cpp \
         kstvectortable.cpp \
+        ksteventtable.cpp \
         kstlogtable.cpp \
         kstplotbase.cpp \
@@ -67,4 +68,5 @@
         kstchangenptsdialog_i.cpp \
         kstchangefiledialog_i.cpp \
+        ksteventmonitor_i.cpp \
         kstplotdialog_i.cpp \
         kstdebugdialog_i.cpp \
@@ -84,4 +86,5 @@
         ksthistogram.cpp \
         fftsg_h.c \
+        eventmonitor.ui \
         debugdialog.ui \
         datawizard.ui \