Pārlūkot izejas kodu

Replace unnecessary buttons with labels

Ivan Savenko 10 mēneši atpakaļ
vecāks
revīzija
277adab03f
2 mainītis faili ar 59 papildinājumiem un 61 dzēšanām
  1. 3 2
      launcher/startGame/StartGameTab.cpp
  2. 56 59
      launcher/startGame/StartGameTab.ui

+ 3 - 2
launcher/startGame/StartGameTab.cpp

@@ -3,6 +3,7 @@
 
 #include "../mainwindow_moc.h"
 #include "../main.h"
+#include "../updatedialog_moc.h"
 
 #include "../modManager/cmodlistview_moc.h"
 
@@ -120,7 +121,7 @@ void StartGameTab::refreshMods()
 
 void StartGameTab::refreshUpdateStatus(EGameUpdateStatus status)
 {
-	ui->buttonEngine->setText("VCMI " VCMI_VERSION_STRING);
+	ui->labelTitleEngine->setText("VCMI " VCMI_VERSION_STRING);
 	ui->buttonUpdateCheck->setVisible(status == EGameUpdateStatus::NOT_CHECKED);
 	ui->labelUpdateNotFound->setVisible(status == EGameUpdateStatus::NO_UPDATE);
 	ui->labelUpdateAvailable->setVisible(status == EGameUpdateStatus::UPDATE_AVAILABLE);
@@ -146,7 +147,7 @@ void StartGameTab::on_buttonOpenDownloads_clicked()
 
 void StartGameTab::on_buttonUpdateCheck_clicked()
 {
-	// TODO: implement
+	UpdateDialog::showUpdateDialog(true);
 }
 
 void StartGameTab::on_buttonGameEditor_clicked()

+ 56 - 59
launcher/startGame/StartGameTab.ui

@@ -16,44 +16,6 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,1,1">
-     <item row="0" column="2">
-      <widget class="QToolButton" name="buttonPreset">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Preset: %1</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QToolButton" name="buttonGameFiles">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Game Data Files</string>
-       </property>
-      </widget>
-     </item>
      <item row="1" column="2">
       <widget class="QScrollArea" name="scrollArea">
        <property name="widgetResizable">
@@ -65,7 +27,7 @@
           <x>0</x>
           <y>0</y>
           <width>240</width>
-          <height>206</height>
+          <height>222</height>
          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout" rowstretch="1,0,0,0,0,0,0">
@@ -183,25 +145,6 @@
        </widget>
       </widget>
      </item>
-     <item row="0" column="0">
-      <widget class="QToolButton" name="buttonEngine">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
      <item row="1" column="1">
       <widget class="QScrollArea" name="scrollArea_2">
        <property name="frameShadow">
@@ -605,7 +548,7 @@
           <x>0</x>
           <y>0</y>
           <width>240</width>
-          <height>206</height>
+          <height>222</height>
          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_3">
@@ -727,6 +670,60 @@
        </widget>
       </widget>
      </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="labelTitleEngine">
+       <property name="font">
+        <font>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+       <property name="indent">
+        <number>6</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="labelTitleDataFiles">
+       <property name="font">
+        <font>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Game Data Files</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+       <property name="indent">
+        <number>6</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QLabel" name="labelTitleModPreset">
+       <property name="font">
+        <font>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Mod Preset</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+       <property name="indent">
+        <number>6</number>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>