vlp-27 Moving kernel to use QtDesigner files. Important note: need to use uic-qt4...

[vlp.git] / src / kernel / kernel.h

diff --git a/src/kernel/kernel.h b/src/kernel/kernel.h
index 168777c1631efb92c7b7132affc23f2c8151936b..a95a6f98b99e1436a6d9b85e36658dd5c64eda0b 100644 (file)
--- a/src/kernel/kernel.h
+++ b/src/kernel/kernel.h
@@ -38,6 +38,7 @@
 #include <QtCore/QSocketNotifier>
 
 #include "comm.h"
+#include "ui/main-window.h"
 
 #define GPATH "loggr"
 #define IPATH "logi"
@@ -90,44 +91,37 @@ public:
 /**
  * Kernel class
  */
-class QKernel : public QMainWindow {
+class QKernel : public QMainWindow, private Ui::MainWindow {
        Q_OBJECT
 public:
-       QTextEdit *desktop;
-       QMenuBar *bar;
-       QMenu *programMenu;
-       QMenu *machineMenu;
-       QMenu *toolsMenu;
        char progdir[256];
        int NodeNumber;
        int ConType;
 
-       QKernel();
-
-       virtual void resizeEvent(QResizeEvent *ev);
+       QKernel(QWidget *parent = 0);
 
        void WriteMessage(char* msg);
        void InitMessage();
 
 public slots:
        void n_impl();
-       void Run_Prog();
-       void Edit();
-       void Help();
-       void SetOptions();
+       void on_actionExecute_triggered();
+       void on_actionEditor_triggered();
+       void on_actionHelp_triggered();
+       void on_actionOptions_triggered();
        void AddAddress();
        void DelAddress();
-       void LockConsole();
-       void UnlockConsole();
-       void MessageToNode();
+       void on_actionLock_Console_triggered();
+       void on_actionUnlock_console_triggered();
+       void on_actionMessage_triggered();
        void QuitProc();
        void NetMessage();
        void IntMessage(int);
-       void KillInterpreter();
-       void Disconnect();
-       void SetMessages();
-       void Connect();
-       void Info();
+       void on_actionKill_triggered();
+       void on_actionDisconnect_triggered();
+       void on_actionInfo_messages_triggered();
+       void on_actionConnect_triggered();
+       void on_actionInfo_triggered();
 
 protected:
        virtual void closeEvent (QCloseEvent * e);
@@ -154,18 +148,6 @@ private:
        bool synchro;
        bool wait_for_info;
        char LockPasswd[25];
-       QAction * toolsEditorAction;
-       QAction * toolsOptionsAction;
-       QAction * toolsInfoAction;
-       QAction * programExecuteAction;
-       QAction * programKillAction;
-       QAction * machineMessageAction;
-       QAction * machineConnectAction;
-       QAction * machineDisconnectAction;
-       QAction * machineInfoAction;
-       QAction * toolsLockAction;
-       QAction * toolsUnlockAction;
-       QAction * quitAction;
        
        int net_sock;
        int freeINTid;