Merge pull request #6 from m1ld3/fix_some_linux_stuff

Fix wrong display of "Single Out" toggle switch, extend "About" menu
m1ld3 · Sep 27, 2024 · fdfc7de · fdfc7de
2 parents 4c4b9b5 + 3442a86
commit fdfc7de
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,6 +39,8 @@ if(GIT_FOUND)
     OUTPUT_VARIABLE GIT_TAG_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
+
+  message("Using Git Tag: " "${GIT_TAG_VERSION}")
 
   string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[0-9]+-g([0-9a-f]+))?" VERSION_REGEX ${GIT_TAG_VERSION})
   if(VERSION_REGEX)

diff --git a/src/dartomat_mainwindow.cpp b/src/dartomat_mainwindow.cpp
@@ -179,7 +179,17 @@ void CDartomatMain::push_button_select_players_clicked_slot()
 
 void CDartomatMain::show_about_dialog()
 {
-  QMessageBox::about(this, "About", QString("Version: ") + VER_FILEVERSION_STR);
+//  QMessageBox::about(this, "About", QString("Version: ") + VER_FILEVERSION_STR);
+  QMessageBox::about(this, "About",
+      QString("Dartomato \n") + "Version: " + VER_FILEVERSION_STR + "\n" +
+      "License: LGPL-3.0\n" +
+      "Built with Qt " + QT_VERSION_STR + "\n" +
+      "\n" + "\n" +
+      "For more information, visit: \n" +
+      "https://github.com/m1ld3/dartomato\n" +
+      "\n"+
+      "© 2024 Michael Mildner."
+  );
 }
 
 void CDartomatMain::push_button_game_history_clicked_slot()

diff --git a/src/dartomat_mainwindow.ui b/src/dartomat_mainwindow.ui
@@ -68,7 +68,7 @@
         </property>
         <property name="maximumSize">
          <size>
-          <width>782</width>
+          <width>16777215</width>
           <height>16777215</height>
          </size>
         </property>
@@ -362,8 +362,8 @@
           </property>
           <property name="maximumSize">
            <size>
-            <width>75</width>
-            <height>75</height>
+            <width>16777215</width>
+            <height>16777215</height>
            </size>
           </property>
           <property name="text">
@@ -547,7 +547,7 @@
      <x>0</x>
      <y>0</y>
      <width>400</width>
-     <height>21</height>
+     <height>17</height>
     </rect>
    </property>
   </widget>
@@ -563,7 +563,7 @@
  <resources/>
  <connections/>
  <buttongroups>
-  <buttongroup name="buttonGroup"/>
   <buttongroup name="buttonGroup_2"/>
+  <buttongroup name="buttonGroup"/>
  </buttongroups>
 </ui>