Merge pull request #5065 from IvanSavenko/launcher_ui

Launcher changes from Discord suggestions

Mods/vcmi/Content/config/english.json

@@ -53,7 +53,7 @@
 	"vcmi.quickExchange.moveAllUnits" : "Move All Units",
 	"vcmi.quickExchange.swapAllUnits" : "Swap Armies",
 	"vcmi.quickExchange.moveAllArtifacts" : "Move All Artifacts",
-	"vcmi.quickExchange.swapAllArtifacts" : "Swap Artifact",
+	"vcmi.quickExchange.swapAllArtifacts" : "Swap Artifacts",
 	
 	"vcmi.radialWheel.mergeSameUnit" : "Merge same creatures",
 	"vcmi.radialWheel.fillSingleUnit" : "Fill with single creatures",

launcher/mainwindow_moc.ui

@@ -29,6 +29,57 @@
    <layout class="QHBoxLayout" name="horizontalLayout">
     <item>
      <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QToolButton" name="startGameButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+          <horstretch>1</horstretch>
+          <verstretch>10</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Game</string>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>64</width>
+          <height>64</height>
+         </size>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+        <property name="autoExclusive">
+         <bool>true</bool>
+        </property>
+        <property name="toolButtonStyle">
+         <enum>Qt::ToolButtonTextUnderIcon</enum>
+        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QToolButton" name="modslistButton">
         <property name="sizePolicy">
@@ -146,8 +197,8 @@
         </property>
         <property name="iconSize">
          <size>
-          <width>32</width>
+          <width>48</width>
-          <height>32</height>
+          <height>48</height>
          </size>
         </property>
         <property name="checkable">
@@ -180,57 +231,6 @@
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QToolButton" name="startGameButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-          <horstretch>1</horstretch>
-          <verstretch>10</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="font">
-         <font>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Game</string>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>64</width>
-          <height>64</height>
-         </size>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive">
-         <bool>true</bool>
-        </property>
-        <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonTextUnderIcon</enum>
-        </property>
-        <property name="autoRaise">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
      </layout>
     </item>
     <item>

launcher/modManager/cmodlistview_moc.cpp

@@ -792,9 +792,9 @@ void CModListView::installFiles(QStringList files)
 
 	if(!exe.empty())
 	{
+		ui->progressBar->setFormat(tr("Installing Heroes Chronicles"));
 		ui->progressWidget->setVisible(true);
 		ui->pushButton->setEnabled(false);
-		ui->progressBar->setFormat(tr("Installing chronicles"));
 
 		float prog = 0.0;
 

launcher/modManager/cmodlistview_moc.ui

@@ -42,6 +42,9 @@
        <property name="placeholderText">
         <string>Filter</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>

launcher/translation/chinese.ts

@@ -480,8 +480,8 @@ Install successfully downloaded?</source>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
-        <translation>安装历代记</translation>
+        <translation type="unfinished">安装历代记</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="853"/>

launcher/translation/english.ts

@@ -327,7 +327,7 @@ Install successfully downloaded?</source>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

launcher/translation/french.ts

@@ -469,7 +469,7 @@ Installer les téchargements réussis?</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

launcher/translation/german.ts

@@ -476,8 +476,8 @@ Installation erfolgreich heruntergeladen?</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
-        <translation>Installation der Chronicles</translation>
+        <translation type="unfinished">Installation der Chronicles</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="853"/>

launcher/translation/polish.ts

@@ -476,8 +476,8 @@ Zainstalować pomyślnie pobrane?</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
-        <translation>Instalowanie Kronik</translation>
+        <translation type="unfinished">Instalowanie Kronik</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="853"/>

launcher/translation/portuguese.ts

@@ -377,8 +377,8 @@ O download da instalação foi bem-sucedido?</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
-        <translation>Instalando crônicas</translation>
+        <translation type="unfinished">Instalando crônicas</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="853"/>

launcher/translation/russian.ts

@@ -426,7 +426,7 @@ Install successfully downloaded?</source>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

launcher/translation/spanish.ts

@@ -440,7 +440,7 @@ Instalar lo correctamente descargado?</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

launcher/translation/swedish.ts

@@ -476,8 +476,8 @@ Installation framgångsrikt nedladdad?</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
-        <translation>Installera Chronicles</translation>
+        <translation type="unfinished">Installera Chronicles</translation>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="853"/>

launcher/translation/ukrainian.ts

@@ -464,7 +464,7 @@ Install successfully downloaded?</source>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

launcher/translation/vietnamese.ts

@@ -426,7 +426,7 @@ Install successfully downloaded?</source>
     </message>
     <message>
         <location filename="../modManager/cmodlistview_moc.cpp" line="791"/>
-        <source>Installing chronicles</source>
+        <source>Installing Heroes Chronicles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>