Final changes before Pre-release 3.0

justinjk007 · Feb 2, 2018 · 7cc9751 · 7cc9751
1 parent a100af1
commit 7cc9751
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,14 +4,14 @@ PROJECT (PentagonalTiling)
 set(CMAKE_CXX_STANDARD 11)
 
 # The version number.
-set(VERSION_MAJOR 2)
-set(VERSION_MINOR 0)
+set(VER_MAJOR 3)
+set(VER_MINOR 0)
 
 # Project Configuration Settings
 file(
   WRITE ${PROJECT_BINARY_DIR}/Config.h.in
-  "#define VERSION_MAJOR @VERSION_MAJOR@\n"
-  "#define VERSION_MINOR @VERSION_MINOR@"
+  "const int VER_MAJOR = @VER_MAJOR@;"
+  " const int VER_MINOR = @VER_MINOR@;"
   )
 configure_file (
   "${PROJECT_BINARY_DIR}/Config.h.in"

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -84,6 +84,12 @@
         <property name="cursor" stdset="0">
          <cursorShape>IBeamCursor</cursorShape>
         </property>
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="lineWidth">
+         <number>1</number>
+        </property>
        </widget>
       </item>
       <item>

diff --git a/src/run_gui.cpp b/src/run_gui.cpp
@@ -1,5 +1,6 @@
 #include <QApplication>
 #include <QString>
+#include "Config.h"  // Written by CMake
 #include "mainwindow.h"
 
 // This macro disables the extra cmd window popup when in Microsoft windows
@@ -16,7 +17,7 @@ int main(int argc, char* argv[])
     QApplication a(argc, argv);
     MainWindow w;
     // Window settings
-    w.setWindowTitle("Pentagonal Tiling - Visulization");
+    w.setWindowTitle("Pentagonal Tiling - Visulization " + QString::number(VER_MAJOR) + "." +QString::number(VER_MINOR));
     w.setWindowIcon(QIcon("favicon.ico"));
     // After all this time
     w.show();