diff --git a/apps/wizard/installationtargetpage.cpp b/apps/wizard/installationtargetpage.cpp index dc94d2d002..1da28b1237 100644 --- 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 index 7dcf642dd6..7d4c2184ee 100644 --- 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 index b3a1c73635..2ff7db5487 100644 --- 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 index c87214d8d9..4b1f4238d4 100644 --- a/apps/wizard/ui/installationtargetpage.ui +++ b/apps/wizard/ui/installationtargetpage.ui @@ -30,9 +30,6 @@ 0 - - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - Qt::RichText diff --git a/apps/wizard/ui/languageselectionpage.ui b/apps/wizard/ui/languageselectionpage.ui index fccd2aa424..3cff2c5b44 100644 --- a/apps/wizard/ui/languageselectionpage.ui +++ b/apps/wizard/ui/languageselectionpage.ui @@ -30,9 +30,6 @@ 0 - - <html><head/><body><p><img src=":/icons/tango/48x48/preferences-desktop-locale.png"/></p></body></html> - Qt::RichText diff --git a/apps/wizard/ui/methodselectionpage.ui b/apps/wizard/ui/methodselectionpage.ui index c2dd260527..28755ad438 100644 --- a/apps/wizard/ui/methodselectionpage.ui +++ b/apps/wizard/ui/methodselectionpage.ui @@ -59,9 +59,6 @@ 0 - - <html><head/><body><p><img src=":/icons/tango/48x48/system-installer.png"/></p></body></html> - Qt::RichText @@ -124,9 +121,6 @@ 0 - - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - Qt::RichText @@ -191,9 +185,6 @@ 0 - - <html><head/><body><p><img src=":/icons/tango/48x48/dollar.png"/></p></body></html> - diff --git a/files/lang/wizard_de.ts b/files/lang/wizard_de.ts index 33c7a5fb53..c3ef55b04a 100644 --- 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 Where should Morrowind be installed? - - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - - Morrowind will be installed to the following location. @@ -170,10 +166,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov What is the language of the Morrowind installation? - - <html><head/><body><p><img src=":/icons/tango/48x48/preferences-desktop-locale.png"/></p></body></html> - - Select the language of the Morrowind installation. @@ -197,10 +189,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Retail CD/DVD - - <html><head/><body><p><img src=":/icons/tango/48x48/system-installer.png"/></p></body></html> - - Install from a retail disc to a new location. @@ -209,10 +197,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Existing Installation - - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - - Select an existing installation. @@ -221,10 +205,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Don't have a copy? - - <html><head/><body><p><img src=":/icons/tango/48x48/dollar.png"/></p></body></html> - - Buy the game diff --git a/files/lang/wizard_fr.ts b/files/lang/wizard_fr.ts index 6c655885d2..010883d0c4 100644 --- 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 Where should Morrowind be installed? À quel emplacement Morrowind doit-il être installé ? - - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - Morrowind will be installed to the following location. Morrowind sera installé à l'emplacement suivant : @@ -170,10 +166,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov What is the language of the Morrowind installation? Dans quelle langue est cette installation de Morrowind ? - - <html><head/><body><p><img src=":/icons/tango/48x48/preferences-desktop-locale.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/preferences-desktop-locale.png"/></p></body></html> - Select the language of the Morrowind installation. Sélectionnez la langue de cette installation de Morrowind. @@ -197,10 +189,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Retail CD/DVD Copie CD/DVD physique - - <html><head/><body><p><img src=":/icons/tango/48x48/system-installer.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/system-installer.png"/></p></body></html> - Install from a retail disc to a new location. Installer depuis un CD/DVD et choisir la destination sur l'ordinateur. @@ -209,10 +197,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Existing Installation Installation existante - - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - Select an existing installation. Sélectionnez une installation existante. @@ -221,10 +205,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Don't have a copy? Vous n'avez pas de copie du jeu ? - - <html><head/><body><p><img src=":/icons/tango/48x48/dollar.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/dollar.png"/></p></body></html> - Buy the game Achetez le jeu. diff --git a/files/lang/wizard_ru.ts b/files/lang/wizard_ru.ts index 5784b11eac..ba9815f634 100644 --- 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 Where should Morrowind be installed? Куда нужно установить Morrowind? - - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - Morrowind will be installed to the following location. Morrowind будет установлен в следующее место. @@ -172,10 +168,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov What is the language of the Morrowind installation? Какой язык использует ваша копия Morrowind? - - <html><head/><body><p><img src=":/icons/tango/48x48/preferences-desktop-locale.png"/></p></body></html> - ><html><head/><body><p><img src=":/icons/tango/48x48/preferences-desktop-locale.png"/></p></body></html> - Select the language of the Morrowind installation. Выберите язык, используемый вашей копией Morrowind. @@ -199,10 +191,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Retail CD/DVD CD/DVD-диск - - <html><head/><body><p><img src=":/icons/tango/48x48/system-installer.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/system-installer.png"/></p></body></html> - Install from a retail disc to a new location. Установить игру с диска. @@ -211,10 +199,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Existing Installation Установленная копия игры - - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - Select an existing installation. Выбрать установленную копию игры. @@ -223,10 +207,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Don't have a copy? Нет копии игры? - - <html><head/><body><p><img src=":/icons/tango/48x48/dollar.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/dollar.png"/></p></body></html> - Buy the game Купить игру diff --git a/files/lang/wizard_sv.ts b/files/lang/wizard_sv.ts index 7f2f4f67fc..099a95d128 100644 --- 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 Where should Morrowind be installed? Var ska Morrowind installeras? - - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - Morrowind will be installed to the following location. Morrowind kommer installeras på följande plats. @@ -172,10 +168,6 @@ de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ord What is the language of the Morrowind installation? Vad är språket på Morrowindinstallationen? - - <html><head/><body><p><img src=":/icons/tango/48x48/preferences-desktop-locale.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/preferences-desktop-locale.png"/></p></body></html> - Select the language of the Morrowind installation. Välj språket på Morrowindinstallationen. @@ -199,10 +191,6 @@ de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ord Retail CD/DVD Köpt CD/DVD - - <html><head/><body><p><img src=":/icons/tango/48x48/system-installer.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/system-installer.png"/></p></body></html> - Install from a retail disc to a new location. Installera från en köpt skiva till en ny plats. @@ -211,10 +199,6 @@ de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ord Existing Installation Befintlig installation - - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/folder.png"/></p></body></html> - Select an existing installation. Välj en befintlig installation. @@ -223,10 +207,6 @@ de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ord Don't have a copy? Äger du inte spelet? - - <html><head/><body><p><img src=":/icons/tango/48x48/dollar.png"/></p></body></html> - <html><head/><body><p><img src=":/icons/tango/48x48/dollar.png"/></p></body></html> - Buy the game Köp spelet diff --git a/files/wizard/icons/dollar.svg b/files/wizard/icons/dollar.svg new file mode 100644 index 0000000000..60c5a4b23c --- /dev/null +++ b/files/wizard/icons/dollar.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files/wizard/icons/folder.svg b/files/wizard/icons/folder.svg new file mode 100644 index 0000000000..a976bad226 --- /dev/null +++ b/files/wizard/icons/folder.svg @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + 2009-01-13, 2020-12-18 + + + Jakub Steiner, Daniel S. Fowler + + + + https://tekeye.uk/free_resources/tango_desktop_project/index + + + folder + directory + icon + + + + + Public Domain + + + + + https://tekeye.uk/ + + + https://tekeye.uk/free_resources/tango_desktop_project/images/folder.svg + computing + A representation of a folder for file storage. + en-GB + https://tekeye.uk/free_resources/tango_desktop_project/images/folder-remote.svg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files/wizard/icons/preferences-desktop-locale.svg b/files/wizard/icons/preferences-desktop-locale.svg new file mode 100644 index 0000000000..51098cfa13 --- /dev/null +++ b/files/wizard/icons/preferences-desktop-locale.svg @@ -0,0 +1,307 @@ + + + Locale Preferences Icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner, Daniel S. Fowler + + + https://tekeye.uk/free_resources/tango_desktop_project/index + + Locale Preferences Icon + + + locale + settings + preferences + location + flag + computer + icon + + + 2021-01-02 + + + Public Domain + + + + + https://tekeye.uk/ + + + https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/preferences-desktop-locale.svg + https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/preferences-desktop-screensaver.svg + en-GB + computing + An icon for locale settings. + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files/wizard/icons/system-installer.svg b/files/wizard/icons/system-installer.svg new file mode 100644 index 0000000000..7d95eea080 --- /dev/null +++ b/files/wizard/icons/system-installer.svg @@ -0,0 +1,456 @@ + + + System Installer Icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + System Installer Icon + + + Jakub Steiner, Daniel S. Fowler + + + https://tekeye.uk/free_resources/tango_desktop_project/index + + 2021-01-02 + + + Public Domain + + + + + https://tekeye.uk/ + + + https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/system-installer.svg + https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/preferences-desktop-screensaver.svg + en-GB + + + install + setup + packages + manager + settings + preferences + cd + dvd + computer + icon + + + computing + An icon for system setup and installation. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files/wizard/icons/tango/48x48/dollar.png b/files/wizard/icons/tango/48x48/dollar.png deleted file mode 100644 index a14ba2505d..0000000000 Binary files a/files/wizard/icons/tango/48x48/dollar.png and /dev/null differ diff --git a/files/wizard/icons/tango/48x48/folder.png b/files/wizard/icons/tango/48x48/folder.png deleted file mode 100644 index e93d7cf8f8..0000000000 Binary files a/files/wizard/icons/tango/48x48/folder.png and /dev/null differ diff --git a/files/wizard/icons/tango/48x48/preferences-desktop-locale.png b/files/wizard/icons/tango/48x48/preferences-desktop-locale.png deleted file mode 100644 index f56497bd23..0000000000 Binary files a/files/wizard/icons/tango/48x48/preferences-desktop-locale.png and /dev/null differ diff --git a/files/wizard/icons/tango/48x48/system-installer.png b/files/wizard/icons/tango/48x48/system-installer.png deleted file mode 100644 index dbd08f7e2f..0000000000 Binary files a/files/wizard/icons/tango/48x48/system-installer.png and /dev/null differ diff --git a/files/wizard/icons/tango/index.theme b/files/wizard/icons/tango/index.theme deleted file mode 100644 index 3ffebebc9a..0000000000 --- a/files/wizard/icons/tango/index.theme +++ /dev/null @@ -1,8 +0,0 @@ -[Icon Theme] -Name=Tango -Comment=Tango Theme -Inherits=default -Directories=48x48 - -[48x48] -Size=48 \ No newline at end of file diff --git a/files/wizard/wizard.qrc b/files/wizard/wizard.qrc index 7dbb8fe080..6f7bf69eb0 100644 --- a/files/wizard/wizard.qrc +++ b/files/wizard/wizard.qrc @@ -1,10 +1,9 @@ - - icons/tango/48x48/preferences-desktop-locale.png - icons/tango/index.theme - icons/tango/48x48/folder.png - icons/tango/48x48/system-installer.png - icons/tango/48x48/dollar.png + + icons/preferences-desktop-locale.svg + icons/folder.svg + icons/system-installer.svg + icons/dollar.svg images/intropage-background.png