Merge branch 'scalable_wizard' into 'master'

Use scalable icons for wizard See merge request OpenMW/openmw!4050
OpenMW · Apr 24, 2024 · 5f926bd · 5f926bd
2 parents a20f456 + 0873eb6
commit 5f926bd
Show file tree

Hide file tree

Showing 20 changed files with 1,214 additions and 109 deletions.
diff --git a/apps/wizard/installationtargetpage.cpp b/apps/wizard/installationtargetpage.cpp
@@ -19,6 +19,8 @@ Wizard::InstallationTargetPage::InstallationTargetPage(QWidget* parent, const Fi
 
     setupUi(this);
 
+    folderIconLabel->setPixmap(QIcon(":folder").pixmap(QSize(48, 48)));
+
     registerField(QLatin1String("installation.path*"), targetLineEdit);
 }
 

diff --git a/apps/wizard/languageselectionpage.cpp b/apps/wizard/languageselectionpage.cpp
@@ -9,6 +9,8 @@ Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent)
 
     setupUi(this);
 
+    flagIconLabel->setPixmap(QIcon(":preferences-desktop-locale").pixmap(QSize(48, 48)));
+
     registerField(QLatin1String("installation.language"), languageComboBox, "currentData", "currentDataChanged");
 }
 

diff --git a/apps/wizard/methodselectionpage.cpp b/apps/wizard/methodselectionpage.cpp
@@ -11,6 +11,10 @@ Wizard::MethodSelectionPage::MethodSelectionPage(QWidget* parent)
 
     setupUi(this);
 
+    installerIconLabel->setPixmap(QIcon(":system-installer").pixmap(QSize(48, 48)));
+    folderIconLabel->setPixmap(QIcon(":folder").pixmap(QSize(48, 48)));
+    buyIconLabel->setPixmap(QIcon(":dollar").pixmap(QSize(48, 48)));
+
 #ifndef OPENMW_USE_UNSHIELD
     retailDiscRadioButton->setEnabled(false);
     existingLocationRadioButton->setChecked(true);

diff --git a/apps/wizard/ui/installationtargetpage.ui b/apps/wizard/ui/installationtargetpage.ui
@@ -30,9 +30,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>

diff --git a/apps/wizard/ui/languageselectionpage.ui b/apps/wizard/ui/languageselectionpage.ui
@@ -30,9 +30,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>

diff --git a/apps/wizard/ui/methodselectionpage.ui b/apps/wizard/ui/methodselectionpage.ui
@@ -59,9 +59,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>
@@ -124,9 +121,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>
@@ -191,9 +185,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
       </widget>
      </item>
      <item>

diff --git a/files/lang/wizard_de.ts b/files/lang/wizard_de.ts
@@ -128,10 +128,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Where should Morrowind be installed?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Morrowind will be installed to the following location. </source>
         <translation type="unfinished"></translation>
@@ -170,10 +166,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>What is the language of the Morrowind installation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Select the language of the Morrowind installation.</source>
         <translation type="unfinished"></translation>
@@ -197,10 +189,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Retail CD/DVD</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Install from a retail disc to a new location.</source>
         <translation type="unfinished"></translation>
@@ -209,10 +197,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Existing Installation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Select an existing installation.</source>
         <translation type="unfinished"></translation>
@@ -221,10 +205,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Don&apos;t have a copy?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Buy the game</source>
         <translation type="unfinished"></translation>

diff --git a/files/lang/wizard_fr.ts b/files/lang/wizard_fr.ts
@@ -128,10 +128,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Where should Morrowind be installed?</source>
         <translation>À quel emplacement Morrowind doit-il être installé ?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Morrowind will be installed to the following location. </source>
         <translation>Morrowind sera installé à l&apos;emplacement suivant :</translation>
@@ -170,10 +166,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>What is the language of the Morrowind installation?</source>
         <translation>Dans quelle langue est cette installation de Morrowind ?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Select the language of the Morrowind installation.</source>
         <translation>Sélectionnez la langue de cette installation de Morrowind.</translation>
@@ -197,10 +189,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Retail CD/DVD</source>
         <translation>Copie CD/DVD physique</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Install from a retail disc to a new location.</source>
         <translation>Installer depuis un CD/DVD et choisir la destination sur l&apos;ordinateur.</translation>
@@ -209,10 +197,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Existing Installation</source>
         <translation>Installation existante</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Select an existing installation.</source>
         <translation>Sélectionnez une installation existante.</translation>
@@ -221,10 +205,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Don&apos;t have a copy?</source>
         <translation>Vous n&apos;avez pas de copie du jeu ?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Buy the game</source>
         <translation>Achetez le jeu.</translation>

diff --git a/files/lang/wizard_ru.ts b/files/lang/wizard_ru.ts
@@ -130,10 +130,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Where should Morrowind be installed?</source>
         <translation>Куда нужно установить Morrowind?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Morrowind will be installed to the following location. </source>
         <translation>Morrowind будет установлен в следующее место. </translation>
@@ -172,10 +168,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>What is the language of the Morrowind installation?</source>
         <translation>Какой язык использует ваша копия Morrowind?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&gt;&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Select the language of the Morrowind installation.</source>
         <translation>Выберите язык, используемый вашей копией Morrowind.</translation>
@@ -199,10 +191,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Retail CD/DVD</source>
         <translation>CD/DVD-диск</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Install from a retail disc to a new location.</source>
         <translation>Установить игру с диска.</translation>
@@ -211,10 +199,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Existing Installation</source>
         <translation>Установленная копия игры</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Select an existing installation.</source>
         <translation>Выбрать установленную копию игры.</translation>
@@ -223,10 +207,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Don&apos;t have a copy?</source>
         <translation>Нет копии игры?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Buy the game</source>
         <translation>Купить игру</translation>

diff --git a/files/lang/wizard_sv.ts b/files/lang/wizard_sv.ts
@@ -130,10 +130,6 @@ de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ord
         <source>Where should Morrowind be installed?</source>
         <translation>Var ska Morrowind installeras?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Morrowind will be installed to the following location. </source>
         <translation>Morrowind kommer installeras på följande plats. </translation>
@@ -172,10 +168,6 @@ de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ord
         <source>What is the language of the Morrowind installation?</source>
         <translation>Vad är språket på Morrowindinstallationen?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Select the language of the Morrowind installation.</source>
         <translation>Välj språket på Morrowindinstallationen.</translation>
@@ -199,10 +191,6 @@ de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ord
         <source>Retail CD/DVD</source>
         <translation>Köpt CD/DVD</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Install from a retail disc to a new location.</source>
         <translation>Installera från en köpt skiva till en ny plats.</translation>
@@ -211,10 +199,6 @@ de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ord
         <source>Existing Installation</source>
         <translation>Befintlig installation</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Select an existing installation.</source>
         <translation>Välj en befintlig installation.</translation>
@@ -223,10 +207,6 @@ de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ord
         <source>Don&apos;t have a copy?</source>
         <translation>Äger du inte spelet?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Buy the game</source>
         <translation>Köp spelet</translation>