Fix for client version update and upgrade to QT 6.8

hatz2 · Jan 29, 2025 · 1873b73 · 1873b73
1 parent 77deb6c
commit 1873b73
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 17 deletions.
diff --git a/GflessDLL/GflessDLL/GameStructures/TCharacterSelectWidget.h b/GflessDLL/GflessDLL/GameStructures/TCharacterSelectWidget.h
@@ -28,7 +28,7 @@ class TCharacterSelectWidget : public TLBSWidget
 protected:
 	static constexpr int MAX_CHARACTERS = 4;
 
-	char pad_0024[68]; //0x0024
+	char pad_0024[76]; //0x0024
 	uint8_t selectedIndex; //0x0068
 	char pad_0069[3]; //0x0069
 	uint32_t numberOfCharacters; //0x006C
@@ -68,5 +68,5 @@ class TCharacterSelectWidget : public TLBSWidget
 	uint32_t N00000267; //0x03B4 TEWControlWidgetEX / fourth character (no char widget)
 	uint32_t N00000268; //0x03B8 TLBSWidget / Top main widget
 	TLBSWidget* bottomMenu; //0x03BC TLBSWidget / Bottom menu widget (Select server, Start, Delete character) TEWGraphicButtonWidget
-}; //Size: 0x03C0
-static_assert(sizeof(TCharacterSelectWidget) == 0x3C0);
+}; //Size: 0x03C8
+static_assert(sizeof(TCharacterSelectWidget) == 0x3C8);
diff --git a/GflessDLL/GflessDLL/GameStructures/TEWButtonWidget.h b/GflessDLL/GflessDLL/GameStructures/TEWButtonWidget.h
@@ -5,5 +5,5 @@ class TEWButtonWidget : public TEWGraphicButtonWidget
 {
 protected:
 	char pad_00DC[60]; //0x00DC
-}; //Size: 0x0118
-static_assert(sizeof(TEWButtonWidget) == 0x118);
+}; //Size: 0x0120
+static_assert(sizeof(TEWButtonWidget) == 0x120);
diff --git a/GflessDLL/GflessDLL/GameStructures/TEWGraphicButtonWidget.h b/GflessDLL/GflessDLL/GameStructures/TEWGraphicButtonWidget.h
@@ -12,9 +12,9 @@ class TEWGraphicButtonWidget : public TLBSWidget
 protected:
 	char pad_0024[60]; //0x0024
 	int32_t selectedIndex; //0x0060
-	char pad_0064[76]; //0x0064
+	char pad_0064[84]; //0x0064
 	uint32_t clickFunction; //0x00B0
 	uint32_t parameters; //0x00B4
 	char pad_00B8[36]; //0x00B8
-}; //Size: 0x00DC
-static_assert(sizeof(TEWGraphicButtonWidget) == 0xDC);
+}; //Size: 0x00E4
+static_assert(sizeof(TEWGraphicButtonWidget) == 0xE4);
diff --git a/GflessDLL/GflessDLL/GameStructures/TNTNewServerSelectWidget2.h b/GflessDLL/GflessDLL/GameStructures/TNTNewServerSelectWidget2.h
@@ -14,11 +14,11 @@ class TNTNewServerSelectWidget2 : public TLBSWidget
 	void selectChannel(int channel);
 
 protected:
-	char pad_0024[80]; //0x0024
+	char pad_0024[88]; //0x0024
 	TEWGraphicButtonWidget* selectLanguageButton; //0x0074
 	char pad_0078[140]; //0x0078
 	TEWGraphicButtonWidget* selectServerButton; //0x0104
 	TEWGraphicButtonWidget* selectChannelButton; //0x0108
 	char pad_010C[344]; //0x010C
-}; //Size: 0x0264
-static_assert(sizeof(TNTNewServerSelectWidget2) == 0x264);
+}; //Size: 0x026C
+static_assert(sizeof(TNTNewServerSelectWidget2) == 0x26C);
diff --git a/Launcher/GflessClient.pro b/Launcher/GflessClient.pro
@@ -1,4 +1,4 @@
-QT       += core gui network webenginewidgets
+QT       += core gui network webenginecore
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
@@ -10,7 +10,7 @@ QMAKE_LFLAGS_WINDOWS += "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='f
 
 LIBS += -lkernel32 -luser32 -lgdi32
 
-VERSION = 1.0.10
+VERSION = 1.0.11
 
 INCLUDEPATH += ./src ./src/gui ./src/auth
 

diff --git a/Launcher/src/gui/settingsdialog.cpp b/Launcher/src/gui/settingsdialog.cpp
@@ -69,9 +69,12 @@ void SettingsDialog::setTheme(int index)
 {
     switch (index) {
     case 0:
-        QApplication::setStyle("Fusion");
+        QApplication::setStyle("Windows11");
         break;
     case 1:
+        QApplication::setStyle("Fusion");
+        break;
+    case 2:
         QApplication::setStyle("Windowsvista");
         break;
     default:

diff --git a/Launcher/src/gui/settingsdialog.ui b/Launcher/src/gui/settingsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>393</width>
-    <height>203</height>
+    <height>231</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -102,7 +102,7 @@
         </size>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
        <property name="suffix">
         <string> secs</string>
@@ -121,6 +121,11 @@
      </item>
      <item row="4" column="1">
       <widget class="QComboBox" name="themeComboBox">
+       <item>
+        <property name="text">
+         <string>Modern Windows</string>
+        </property>
+       </item>
        <item>
         <property name="text">
          <string>Fusion</string>
@@ -152,7 +157,7 @@
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>