vlp-15 Set version to 3.1. Replaced hardcoded strings with generated ones.

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

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index b5e1cd168c7f490955a39f0b21e5b83601f16483..16bda4f4ed2546a6526d2367b966c5ec947a69be 100644 (file)
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -73,6 +73,9 @@
 
 #include <libconfig.h>
 
+/* File resides in top directory (where are Makefiles)*/
+#include "../../config.h"
+
 #define GPATH "loggr"
 #define IPATH "logi"
 #define NPATH "logn"
@@ -217,11 +220,11 @@ private:
 
 /**
  * Event invoked on program close.
- * @copydoc QWidget::closeEvent(QCloseEvent*)
+ * Closes application. Displays additional window to confirm exit.
  */
 void QKernel::closeEvent(QCloseEvent * e)
 {
-       e->ignore();
+       QuitProc();
 }
 
 /**
@@ -244,7 +247,7 @@ QKernel::QKernel()
        info_messages = TRUE;
        wait_for_info = FALSE;
 
-       setCaption("Virtual LOGLAN Processor");
+       setCaption(PACKAGE_NAME);
        setBackgroundColor(white);
 
        bar = new QMenuBar(this);
@@ -1231,7 +1234,7 @@ void QKernel::UnlockConsole()
  */
 void QKernel::InitMessage()
 {
-       WriteMessage("\n Virtual LOGLAN Processor - ver 1.9: READY \n");
+       WriteMessage("\n " PACKAGE_STRING ": READY \n");
 }
 
 /**
@@ -1517,5 +1520,6 @@ int main(int argc, char **argv)
        app->setMainWidget(&kernel);
        kernel.show();
        kernel.InitMessage();
+       
        return app->exec();
 }