X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fkernel%2Fkernel.h;h=13494ea14501afe438e37af3b90e8d9f7ecc54e7;hb=7b665056a5881222031cb1aebbae3e84d701a291;hp=168777c1631efb92c7b7132affc23f2c8151936b;hpb=3490d8d1eee73348bc8ed4938d27d19d8f41660b;p=vlp.git

diff --git a/src/kernel/kernel.h b/src/kernel/kernel.h
index 168777c..13494ea 100644
--- a/src/kernel/kernel.h
+++ b/src/kernel/kernel.h
@@ -39,6 +39,8 @@
 
 #include "comm.h"
 
+#include "kernelwindow.h"
+
 #define GPATH "loggr"
 #define IPATH "logi"
 #define NPATH "logn"
@@ -90,13 +92,9 @@ public:
 /**
  * Kernel class
  */
-class QKernel : public QMainWindow {
+class QKernel : public QMainWindow, private Ui::KernelWindow {
 	Q_OBJECT
 public:
-	QTextEdit *desktop;
-	QMenuBar *bar;
-	QMenu *programMenu;
-	QMenu *machineMenu;
 	QMenu *toolsMenu;
 	char progdir[256];
 	int NodeNumber;
@@ -104,30 +102,15 @@ public:
 
 	QKernel();
 
-	virtual void resizeEvent(QResizeEvent *ev);
-
 	void WriteMessage(char* msg);
 	void InitMessage();
 
 public slots:
 	void n_impl();
-	void Run_Prog();
-	void Edit();
-	void Help();
-	void SetOptions();
 	void AddAddress();
 	void DelAddress();
-	void LockConsole();
-	void UnlockConsole();
-	void MessageToNode();
-	void QuitProc();
 	void NetMessage();
 	void IntMessage(int);
-	void KillInterpreter();
-	void Disconnect();
-	void SetMessages();
-	void Connect();
-	void Info();
 
 protected:
 	virtual void closeEvent (QCloseEvent * e);
@@ -154,18 +137,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;
@@ -187,6 +158,23 @@ private:
 	 * @param locked status which will be set on the menu entries.
 	 */
 	void setLocked(bool locked);
+
+private slots:
+	void on_actionExecute_triggered();
+	void on_actionKill_triggered();
+	void on_actionQuit_triggered();
+	
+	void on_actionMessage_triggered();
+	void on_actionConnect_triggered();
+	void on_actionDisconnect_triggered();
+	void on_actionInfo_triggered();
+
+	void on_actionEditor_triggered();
+	void on_actionHelp_triggered();
+	void on_actionOptions_triggered();
+	void on_actionInfo_messages_triggered();
+	void on_actionLock_console_triggered();
+	void on_actionUnlock_console_triggered();
 };
 
 #endif /* VLP_KERNEL_H */