diff --git a/CHANGELOG.md b/CHANGELOG.md index e935364264..4e0d96dec1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -229,6 +229,7 @@ Feature #7914: Do not allow to move GUI windows out of screen Feature #7923: Don't show non-existent higher ranks for factions with fewer than 9 ranks Feature #7932: Support two-channel normal maps + Feature #7936: Scalable icons in Qt applications Task #5896: Do not use deprecated MyGUI properties Task #6085: Replace boost::filesystem with std::filesystem Task #6149: Dehardcode Lua API_REVISION diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp index f671089bff..a15770fc73 100644 --- a/apps/launcher/datafilespage.cpp +++ b/apps/launcher/datafilespage.cpp @@ -349,7 +349,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName) { // Pad to correct vertical alignment QPixmap pixmap(QSize(200, 200)); // Arbitrary big number, will be scaled down to widget size - pixmap.fill(ui.directoryListWidget->palette().base().color()); + pixmap.fill(QColor(0, 0, 0, 0)); auto emptyIcon = QIcon(pixmap); item->setIcon(emptyIcon); } diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp index 5486251731..df4c6fb22d 100644 --- a/apps/launcher/maindialog.cpp +++ b/apps/launcher/maindialog.cpp @@ -65,6 +65,14 @@ Launcher::MainDialog::MainDialog(const Files::ConfigurationManager& configuratio setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); createIcons(); + + QWidget* spacer = new QWidget(); + spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + toolBar->addWidget(spacer); + + QLabel* logo = new QLabel(this); + logo->setPixmap(QIcon(":/images/openmw-header.png").pixmap(QSize(294, 64))); + toolBar->addWidget(logo); } Launcher::MainDialog::~MainDialog() @@ -76,7 +84,7 @@ Launcher::MainDialog::~MainDialog() void Launcher::MainDialog::createIcons() { if (!QIcon::hasThemeIcon("document-new")) - QIcon::setThemeName("tango"); + QIcon::setThemeName("fallback"); connect(dataAction, &QAction::triggered, this, &MainDialog::enableDataPage); connect(graphicsAction, &QAction::triggered, this, &MainDialog::enableGraphicsPage); diff --git a/apps/launcher/ui/mainwindow.ui b/apps/launcher/ui/mainwindow.ui index 9a7352654a..862ae2430e 100644 --- a/apps/launcher/ui/mainwindow.ui +++ b/apps/launcher/ui/mainwindow.ui @@ -77,10 +77,6 @@ QToolBar { - background-attachment: fixed; - background-image: url(:/images/openmw-header.png); - background-repeat: none; - background-position: right; border: 0px; } diff --git a/files/lang/launcher_ru.ts b/files/lang/launcher_ru.ts index c5a036c4b2..5c6719c11c 100644 --- a/files/lang/launcher_ru.ts +++ b/files/lang/launcher_ru.ts @@ -342,7 +342,7 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Clone Content List - Создать копию списка плагинов + Создать копию списка Delete Content List diff --git a/files/launcher/icons/fallback/16x16/document-new.svg b/files/launcher/icons/fallback/16x16/document-new.svg new file mode 100644 index 0000000000..a212e2e0c0 --- /dev/null +++ b/files/launcher/icons/fallback/16x16/document-new.svg @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files/launcher/icons/fallback/16x16/edit-clear.svg b/files/launcher/icons/fallback/16x16/edit-clear.svg new file mode 100644 index 0000000000..e1d10b86ef --- /dev/null +++ b/files/launcher/icons/fallback/16x16/edit-clear.svg @@ -0,0 +1,45 @@ + + + + + + + + diff --git a/files/launcher/icons/fallback/16x16/edit-copy.svg b/files/launcher/icons/fallback/16x16/edit-copy.svg new file mode 100644 index 0000000000..4933e2267e --- /dev/null +++ b/files/launcher/icons/fallback/16x16/edit-copy.svg @@ -0,0 +1,44 @@ + + + + + + + + diff --git a/files/launcher/icons/fallback/16x16/edit-delete.svg b/files/launcher/icons/fallback/16x16/edit-delete.svg new file mode 100644 index 0000000000..ff86e2020e --- /dev/null +++ b/files/launcher/icons/fallback/16x16/edit-delete.svg @@ -0,0 +1,33 @@ + + + + clear + + + + + + clear + + + + diff --git a/files/launcher/icons/fallback/16x16/view-refresh.svg b/files/launcher/icons/fallback/16x16/view-refresh.svg new file mode 100644 index 0000000000..8401259040 --- /dev/null +++ b/files/launcher/icons/fallback/16x16/view-refresh.svg @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files/launcher/icons/tango/index.theme b/files/launcher/icons/fallback/index.theme similarity index 60% rename from files/launcher/icons/tango/index.theme rename to files/launcher/icons/fallback/index.theme index 1f54489ebb..ac524b79b5 100644 --- a/files/launcher/icons/tango/index.theme +++ b/files/launcher/icons/fallback/index.theme @@ -1,6 +1,5 @@ [Icon Theme] -Name=Tango -Comment=Tango Theme +Name=Fallback Inherits=default Directories=16x16 diff --git a/files/launcher/icons/tango/16x16/document-new.png b/files/launcher/icons/tango/16x16/document-new.png deleted file mode 100644 index 4c3efdd6fa..0000000000 Binary files a/files/launcher/icons/tango/16x16/document-new.png and /dev/null differ diff --git a/files/launcher/icons/tango/16x16/edit-clear.png b/files/launcher/icons/tango/16x16/edit-clear.png deleted file mode 100644 index 74684bfb5d..0000000000 Binary files a/files/launcher/icons/tango/16x16/edit-clear.png and /dev/null differ diff --git a/files/launcher/icons/tango/16x16/edit-copy.png b/files/launcher/icons/tango/16x16/edit-copy.png deleted file mode 100644 index 8dd48c4949..0000000000 Binary files a/files/launcher/icons/tango/16x16/edit-copy.png and /dev/null differ diff --git a/files/launcher/icons/tango/16x16/edit-delete.png b/files/launcher/icons/tango/16x16/edit-delete.png deleted file mode 100644 index d7667c36b4..0000000000 Binary files a/files/launcher/icons/tango/16x16/edit-delete.png and /dev/null differ diff --git a/files/launcher/icons/tango/16x16/view-refresh.png b/files/launcher/icons/tango/16x16/view-refresh.png deleted file mode 100644 index 3fd71d6e59..0000000000 Binary files a/files/launcher/icons/tango/16x16/view-refresh.png and /dev/null differ diff --git a/files/launcher/images/openmw-header.png b/files/launcher/images/openmw-header.png index 6c88d8f549..81961c411e 100755 Binary files a/files/launcher/images/openmw-header.png and b/files/launcher/images/openmw-header.png differ diff --git a/files/launcher/launcher.qrc b/files/launcher/launcher.qrc index 766f636468..b7a7a19c16 100644 --- a/files/launcher/launcher.qrc +++ b/files/launcher/launcher.qrc @@ -7,12 +7,12 @@ images/preferences-advanced.png images/preferences-video.png - - icons/tango/index.theme - icons/tango/16x16/document-new.png - icons/tango/16x16/edit-clear.png - icons/tango/16x16/edit-copy.png - icons/tango/16x16/edit-delete.png - icons/tango/16x16/view-refresh.png + + icons/fallback/index.theme + icons/fallback/16x16/document-new.svg + icons/fallback/16x16/edit-clear.svg + icons/fallback/16x16/edit-copy.svg + icons/fallback/16x16/edit-delete.svg + icons/fallback/16x16/view-refresh.svg