Merge pull request #17 from AhmedAredah/main

Enhance installer and UI improvements

Author: AhmedAredah

CMakeLists.txt

@@ -1,6 +1,12 @@
 # min required cmake version
 cmake_minimum_required(VERSION 3.24)
 
+include(InstallRequiredSystemLibraries)
+
+# Enable automatic runtime dependency detection
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
 # Define the project name (ShipNetSim) and
 # the programming language used (CXX for C++)
 set(ShipNetSim_VERSION "0.0.3" CACHE STRING "Project version" FORCE)

build_and_package.bat

@@ -15,7 +15,7 @@ REM Build the project with CMake
 cmake --build . --config Release --parallel %NUMBER_OF_PROCESSORS%
 
 REM Package the project with CPack and the IFW generator
-cpack -G IFW
+cpack -G IFW -j %NUMBER_OF_PROCESSORS%
 
 cd ..
 

src/ShipNetSimGUI/gui/windowMangement/aboutwindow.ui

@@ -63,7 +63,7 @@ li.checked::marker { content: "\2612"; }
 <p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><br /></p>
 <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:700;">Contributors</span><span style=" font-size:11pt;">:</span></p>
 <ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;">
-<li style=" font-size:11pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ahmed Aredah, M.Sc.</li>
+<li style=" font-size:11pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ahmed Aredah, Ph.D.</li>
 <li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hesham A. Rakha, Ph.D. P.Eng., F.IEEE.</li></ul>
 <p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><br /></p>
 <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:700;">License</span></p>

src/ShipNetSimGUI/gui/windowMangement/shipnetsim.ui

@@ -24,7 +24,7 @@
       <item row="0" column="0">
        <widget class="QTabWidget" name="tabWidget_project">
         <property name="tabPosition">
-         <enum>QTabWidget::TabPosition::West</enum>
+         <enum>QTabWidget::West</enum>
         </property>
         <property name="currentIndex">
          <number>0</number>
@@ -42,10 +42,10 @@
             <item row="4" column="0">
              <spacer name="verticalSpacer_2">
               <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
+               <enum>Qt::Vertical</enum>
               </property>
               <property name="sizeType">
-               <enum>QSizePolicy::Policy::Expanding</enum>
+               <enum>QSizePolicy::Expanding</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -98,7 +98,7 @@
               <item>
                <spacer name="horizontalSpacer_2">
                 <property name="orientation">
-                 <enum>Qt::Orientation::Horizontal</enum>
+                 <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -153,7 +153,7 @@
               <item>
                <spacer name="horizontalSpacer">
                 <property name="orientation">
-                 <enum>Qt::Orientation::Horizontal</enum>
+                 <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -196,7 +196,7 @@
               <item>
                <spacer name="horizontalSpacer_10">
                 <property name="orientation">
-                 <enum>Qt::Orientation::Horizontal</enum>
+                 <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -292,7 +292,7 @@
                    <item row="0" column="3">
                     <spacer name="horizontalSpacer_11">
                      <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
+                      <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
@@ -339,7 +339,7 @@
                      <item>
                       <spacer name="horizontalSpacer_5">
                        <property name="orientation">
-                        <enum>Qt::Orientation::Horizontal</enum>
+                        <enum>Qt::Horizontal</enum>
                        </property>
                        <property name="sizeHint" stdset="0">
                         <size>
@@ -603,7 +603,7 @@
                      <item>
                       <spacer name="horizontalSpacer_6">
                        <property name="orientation">
-                        <enum>Qt::Orientation::Horizontal</enum>
+                        <enum>Qt::Horizontal</enum>
                        </property>
                        <property name="sizeHint" stdset="0">
                         <size>
@@ -630,7 +630,7 @@
                    <item row="2" column="0">
                     <layout class="QHBoxLayout" name="horizontalLayout_3">
                      <property name="sizeConstraint">
-                      <enum>QLayout::SizeConstraint::SetMaximumSize</enum>
+                      <enum>QLayout::SetMaximumSize</enum>
                      </property>
                      <item>
                       <widget class="QLabel" name="label_21">
@@ -648,7 +648,7 @@
                      <item>
                       <spacer name="horizontalSpacer_15">
                        <property name="orientation">
-                        <enum>Qt::Orientation::Horizontal</enum>
+                        <enum>Qt::Horizontal</enum>
                        </property>
                        <property name="sizeHint" stdset="0">
                         <size>
@@ -679,7 +679,7 @@
           <item row="0" column="0">
            <widget class="QSplitter" name="splitter_simulator">
             <property name="orientation">
-             <enum>Qt::Orientation::Vertical</enum>
+             <enum>Qt::Vertical</enum>
             </property>
             <widget class="QWidget" name="layoutWidget_2">
              <layout class="QHBoxLayout" name="horizontalLayout_18">
@@ -701,11 +701,11 @@
                  <string>Simulation options</string>
                 </property>
                 <property name="alignment">
-                 <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
                 </property>
                 <layout class="QGridLayout" name="gridLayout_20">
                  <property name="sizeConstraint">
-                  <enum>QLayout::SizeConstraint::SetFixedSize</enum>
+                  <enum>QLayout::SetFixedSize</enum>
                  </property>
                  <item row="0" column="3">
                   <widget class="QGroupBox" name="verticalGroupBox_6">
@@ -1048,7 +1048,7 @@
                         <item>
                          <spacer name="horizontalSpacer_4">
                           <property name="orientation">
-                           <enum>Qt::Orientation::Horizontal</enum>
+                           <enum>Qt::Horizontal</enum>
                           </property>
                           <property name="sizeHint" stdset="0">
                            <size>
@@ -1071,7 +1071,7 @@
               <item>
                <spacer name="horizontalSpacer_12">
                 <property name="orientation">
-                 <enum>Qt::Orientation::Horizontal</enum>
+                 <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -1134,7 +1134,7 @@
               <item row="2" column="0">
                <widget class="QTabWidget" name="tabWidget">
                 <property name="tabPosition">
-                 <enum>QTabWidget::TabPosition::West</enum>
+                 <enum>QTabWidget::West</enum>
                 </property>
                 <property name="currentIndex">
                  <number>0</number>
@@ -1202,7 +1202,7 @@
                 <item>
                  <spacer name="horizontalSpacer_20">
                   <property name="orientation">
-                   <enum>Qt::Orientation::Horizontal</enum>
+                   <enum>Qt::Horizontal</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -1278,7 +1278,7 @@
       <item>
        <spacer name="horizontalSpacer_3">
         <property name="orientation">
-         <enum>Qt::Orientation::Horizontal</enum>
+         <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -1313,7 +1313,7 @@
       <item>
        <spacer name="horizontalSpacer_13">
         <property name="orientation">
-         <enum>Qt::Orientation::Horizontal</enum>
+         <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -1360,7 +1360,7 @@
      <x>0</x>
      <y>0</y>
      <width>1286</width>
-     <height>22</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuShipNetSim">