starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-04 05:04:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

Qt: Set appropriate window icons for subwindows

Browse Source 
Too bad it won't work on most Wankland compositors, too bad.
This commit is contained in:
Stenzek
2025-11-15 23:59:59 +10:00
parent 67208460f4
commit 75aee64772
22 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/duckstation-qt/autoupdaterwindow.cpp
View File

@@ -80,7 +80,6 @@ LOG_CHANNEL(Host);
AutoUpdaterWindow::AutoUpdaterWindow() : QWidget()
{
m_ui.setupUi(this);
setWindowIcon(QtHost::GetAppIcon());
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
connect(m_ui.downloadAndInstall, &QPushButton::clicked, this, &AutoUpdaterWindow::downloadUpdateClicked);

5
src/duckstation-qt/autoupdaterwindow.ui
View File

@@ -13,6 +13,11 @@
<property name="windowTitle">
<string>Automatic Updater</string>
</property>
<property name="windowIcon">
<iconset>
<normalon>:/icons/UpdateDuck.png</normalon>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="updateTextLayout" stretch="0,1">

7
src/duckstation-qt/controllersettingswindow.ui
View File

@@ -20,8 +20,7 @@
<string>DuckStation Controller Settings</string>
</property>
<property name="windowIcon">
<iconset resource="resources/duckstation-qt.qrc">
<normaloff>:/icons/duck.png</normaloff>:/icons/duck.png</iconset>
<iconset theme="controller-digital-line"/>
</property>
<property name="class" stdset="0">
<string>settings-window</string>
@@ -142,8 +141,6 @@
</item>
</layout>
</widget>
<resources>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

1
src/duckstation-qt/coverdownloadwindow.cpp
View File

@@ -13,7 +13,6 @@
CoverDownloadWindow::CoverDownloadWindow() : QWidget()
{
m_ui.setupUi(this);
setWindowIcon(QtHost::GetAppIcon());
m_ui.coverIcon->setPixmap(QIcon::fromTheme(QStringLiteral("artboard-2-line")).pixmap(32));
updateEnabled();
QtUtils::RestoreWindowGeometry("CoverDownloadWindow", this);

3
src/duckstation-qt/coverdownloadwindow.ui
View File

@@ -13,6 +13,9 @@
<property name="windowTitle">
<string>Download Covers</string>
</property>
<property name="windowIcon">
<iconset theme="artboard-2-line"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,1">

2
src/duckstation-qt/debuggerwindow.cpp
View File

@@ -443,8 +443,6 @@ void DebuggerWindow::closeEvent(QCloseEvent* event)
void DebuggerWindow::setupAdditionalUi()
{
setWindowIcon(QtHost::GetAppIcon());
const QFont& fixed_font = QtHost::GetFixedFont();
m_ui.codeView->setFont(fixed_font);
m_ui.codeView->updateRowHeight();

28
src/duckstation-qt/debuggerwindow.ui
View File

@@ -13,6 +13,9 @@
<property name="windowTitle">
<string>CPU Debugger</string>
</property>
<property name="windowIcon">
<iconset theme="code-line"/>
</property>
<property name="dockNestingEnabled">
<bool>true</bool>
</property>
@@ -22,8 +25,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1210</width>
<height>30</height>
<width>1270</width>
<height>33</height>
</rect>
</property>
<widget class="QMenu" name="menu_Debugger">
@@ -86,7 +89,7 @@
</widget>
<widget class="QDockWidget" name="dockWidget_2">
<property name="features">
<set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
<set>QDockWidget::DockWidgetFeature::DockWidgetFloatable|QDockWidget::DockWidgetFeature::DockWidgetMovable</set>
</property>
<property name="windowTitle">
<string>Disassembly</string>
@@ -101,14 +104,11 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
</widget>
</widget>
<widget class="QDockWidget" name="dockWidget_3">
<property name="features">
<set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
<set>QDockWidget::DockWidgetFeature::DockWidgetFloatable|QDockWidget::DockWidgetFeature::DockWidgetMovable</set>
</property>
<property name="windowTitle">
<string>Registers</string>
@@ -139,7 +139,7 @@
</sizepolicy>
</property>
<property name="features">
<set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
<set>QDockWidget::DockWidgetFeature::DockWidgetFloatable|QDockWidget::DockWidgetFeature::DockWidgetMovable</set>
</property>
<property name="windowTitle">
<string>Memory</string>
@@ -195,7 +195,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -238,7 +238,7 @@
</size>
</property>
<property name="features">
<set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
<set>QDockWidget::DockWidgetFeature::DockWidgetFloatable|QDockWidget::DockWidgetFeature::DockWidgetMovable</set>
</property>
<property name="windowTitle">
<string>Breakpoints</string>
@@ -248,10 +248,10 @@
</attribute>
<widget class="QTreeWidget" name="breakpointsWidget">
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
<enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
<enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
@@ -283,7 +283,7 @@
</widget>
<widget class="QDockWidget" name="dockWidget_4">
<property name="features">
<set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
<set>QDockWidget::DockWidgetFeature::DockWidgetFloatable|QDockWidget::DockWidgetFeature::DockWidgetMovable</set>
</property>
<property name="windowTitle">
<string>Stack</string>
@@ -489,7 +489,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="resources/resources.qrc"/>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<connections/>
</ui>

3
src/duckstation-qt/isobrowserwindow.ui
View File

@@ -14,8 +14,7 @@
<string>ISO Browser</string>
</property>
<property name="windowIcon">
<iconset resource="resources/duckstation-qt.qrc">
<normaloff>:/icons/media-optical.png</normaloff>:/icons/media-optical.png</iconset>
<iconset theme="disc-line"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
<item>

5
src/duckstation-qt/mainwindow.cpp
View File

@@ -190,11 +190,12 @@ void MainWindow::initialize()
updateToolbarArea();
updateEmulationActions(false, false, false);
updateDisplayRelatedActions(false, false);
updateWindowTitle();
connectSignals();
QtUtils::RestoreWindowGeometry("MainWindow", this);
switchToGameListView();
updateWindowTitle();
QtUtils::RestoreWindowGeometry("MainWindow", this);
#ifdef _WIN32
registerForDeviceNotifications();

3
src/duckstation-qt/memorycardeditorwindow.ui
View File

@@ -14,8 +14,7 @@
<string>Memory Card Editor</string>
</property>
<property name="windowIcon">
<iconset resource="resources/duckstation-qt.qrc">
<normaloff>:/icons/duck.png</normaloff>:/icons/duck.png</iconset>
<iconset theme="memcard-line"/>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">

2
src/duckstation-qt/memoryeditorwindow.cpp
View File

@@ -380,8 +380,6 @@ QString MemoryEditorWindow::formatNumber(u64 value, bool is_signed, int byte_siz
void MemoryEditorWindow::setupAdditionalUi()
{
setWindowIcon(QtHost::GetAppIcon());
const QFont& fixed_font = QtHost::GetFixedFont();
m_ui.memoryView->setFont(fixed_font);

5
src/duckstation-qt/memoryeditorwindow.ui
View File

@@ -13,6 +13,9 @@
<property name="windowTitle">
<string>Memory Editor</string>
</property>
<property name="windowIcon">
<iconset theme="chip-line"/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5" stretch="1,0">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -416,7 +419,7 @@
<connections/>
<buttongroups>
<buttongroup name="baseButtonGroup"/>
<buttongroup name="memoryRegionButtonGroup"/>
<buttongroup name="endianButtonGroup"/>
<buttongroup name="memoryRegionButtonGroup"/>
</buttongroups>
</ui>

3
src/duckstation-qt/memoryscannerwindow.ui
View File

@@ -14,8 +14,7 @@
<string>Memory Scanner</string>
</property>
<property name="windowIcon">
<iconset>
<normaloff>:/icons/duck.png</normaloff>:/icons/duck.png</iconset>
<iconset theme="mag-line"/>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">

1
src/duckstation-qt/qthost.cpp
View File

@@ -433,7 +433,6 @@ std::optional<bool> QtHost::DownloadFile(QWidget* parent, const QString& title,
.arg(QtUtils::StringViewToQString(std::string_view(url).substr(
(url_file_part_pos >= 0) ? (url_file_part_pos + 1) : 0))));
progress.GetDialog().setWindowTitle(title);
progress.GetDialog().setWindowIcon(GetAppIcon());
progress.SetCancellable(true);
progress.MakeVisible();

6
src/duckstation-qt/resources/duckstation-qt.qrc
View File

@@ -35,12 +35,14 @@
<file>icons/black/svg/arrow-left-right-line.svg</file>
<file>icons/black/svg/arrow-up-line.svg</file>
<file>icons/black/svg/artboard-2-line.svg</file>
<file>icons/black/svg/camera-switch-line.svg</file>
<file>icons/black/svg/chat-off-line.svg</file>
<file>icons/black/svg/cheats-line.svg</file>
<file>icons/black/svg/checkbox-multiple-blank-line.svg</file>
<file>icons/black/svg/chip-2-line.svg</file>
<file>icons/black/svg/chip-line.svg</file>
<file>icons/black/svg/close-line.svg</file>
<file>icons/black/svg/code-line.svg</file>
<file>icons/black/svg/controller-digital-line.svg</file>
<file>icons/black/svg/controller-line.svg</file>
<file>icons/black/svg/controller-strike-line.svg</file>
@@ -118,6 +120,7 @@
<file>icons/black/svg/trash-fill.svg</file>
<file>icons/black/svg/trophy-line.svg</file>
<file>icons/black/svg/tv-2-line.svg</file>
<file>icons/black/svg/video-on-line.svg</file>
<file>icons/black/svg/volume-up-line.svg</file>
<file>icons/black/svg/window-2-line.svg</file>
<file>icons/camera-photo.png</file>
@@ -260,6 +263,7 @@
<file>icons/white/svg/arrow-left-right-line.svg</file>
<file>icons/white/svg/arrow-up-line.svg</file>
<file>icons/white/svg/artboard-2-line.svg</file>
<file>icons/white/svg/camera-switch-line.svg</file>
<file>icons/white/svg/chat-off-line.svg</file>
<file>icons/white/svg/cheats-line.svg</file>
<file>icons/white/svg/checkbox-checked-disabled.svg</file>
@@ -275,6 +279,7 @@
<file>icons/white/svg/chip-2-line.svg</file>
<file>icons/white/svg/chip-line.svg</file>
<file>icons/white/svg/close-line.svg</file>
<file>icons/white/svg/code-line.svg</file>
<file>icons/white/svg/controller-digital-line.svg</file>
<file>icons/white/svg/controller-line.svg</file>
<file>icons/white/svg/controller-strike-line.svg</file>
@@ -352,6 +357,7 @@
<file>icons/white/svg/trash-fill.svg</file>
<file>icons/white/svg/trophy-line.svg</file>
<file>icons/white/svg/tv-2-line.svg</file>
<file>icons/white/svg/video-on-line.svg</file>
<file>icons/white/svg/volume-up-line.svg</file>
<file>icons/white/svg/window-2-line.svg</file>
<file>qdarkstyle/arrow_down.png</file>

1
src/duckstation-qt/resources/icons/black/svg/camera-switch-line.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000"><path d="M9.82843 5L7.82843 7H4V19H20V7H16.1716L14.1716 5H9.82843ZM9 3H15L17 5H21C21.5523 5 22 5.44772 22 6V20C22 20.5523 21.5523 21 21 21H3C2.44772 21 2 20.5523 2 20V6C2 5.44772 2.44772 5 3 5H7L9 3ZM9.64042 7.53044C10.3555 7.19033 11.1555 7 12 7C15.0376 7 17.5 9.46243 17.5 12.5C17.5 14.05 16.8588 15.4502 15.8273 16.4499L13.75 12.6H15.4986C15.4995 12.5668 15.5 12.5334 15.5 12.5C15.5 10.567 13.933 9 12 9C11.4912 9 11.0078 9.10856 10.5716 9.30378L9.64042 7.53044ZM14.3175 17.4894C13.6132 17.817 12.828 18 12 18C8.96243 18 6.5 15.5376 6.5 12.5C6.5 10.9678 7.12654 9.58193 8.13738 8.58462L10.25 12.5H8.5C8.5 14.433 10.067 16 12 16C12.4923 16 12.9608 15.8984 13.3857 15.715L14.3175 17.4894Z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 779 B

1
src/duckstation-qt/resources/icons/black/svg/code-line.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000"><path d="M23 12L15.9289 19.0711L14.5147 17.6569L20.1716 12L14.5147 6.34317L15.9289 4.92896L23 12ZM3.82843 12L9.48528 17.6569L8.07107 19.0711L1 12L8.07107 4.92896L9.48528 6.34317L3.82843 12Z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 279 B

1
src/duckstation-qt/resources/icons/black/svg/video-on-line.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000"><path d="M17 9.2L22.2133 5.55071C22.4395 5.39235 22.7513 5.44737 22.9096 5.6736C22.9684 5.75764 23 5.85774 23 5.96033V18.0397C23 18.3158 22.7761 18.5397 22.5 18.5397C22.3974 18.5397 22.2973 18.5081 22.2133 18.4493L17 14.8V19C17 19.5523 16.5523 20 16 20H2C1.44772 20 1 19.5523 1 19V5C1 4.44772 1.44772 4 2 4H16C16.5523 4 17 4.44772 17 5V9.2ZM17 12.3587L21 15.1587V8.84131L17 11.6413V12.3587ZM3 6V18H15V6H3Z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 495 B

1
src/duckstation-qt/resources/icons/white/svg/camera-switch-line.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#ffffff"><path d="M9.82843 5L7.82843 7H4V19H20V7H16.1716L14.1716 5H9.82843ZM9 3H15L17 5H21C21.5523 5 22 5.44772 22 6V20C22 20.5523 21.5523 21 21 21H3C2.44772 21 2 20.5523 2 20V6C2 5.44772 2.44772 5 3 5H7L9 3ZM9.64042 7.53044C10.3555 7.19033 11.1555 7 12 7C15.0376 7 17.5 9.46243 17.5 12.5C17.5 14.05 16.8588 15.4502 15.8273 16.4499L13.75 12.6H15.4986C15.4995 12.5668 15.5 12.5334 15.5 12.5C15.5 10.567 13.933 9 12 9C11.4912 9 11.0078 9.10856 10.5716 9.30378L9.64042 7.53044ZM14.3175 17.4894C13.6132 17.817 12.828 18 12 18C8.96243 18 6.5 15.5376 6.5 12.5C6.5 10.9678 7.12654 9.58193 8.13738 8.58462L10.25 12.5H8.5C8.5 14.433 10.067 16 12 16C12.4923 16 12.9608 15.8984 13.3857 15.715L14.3175 17.4894Z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 779 B

1
src/duckstation-qt/resources/icons/white/svg/code-line.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#ffffff"><path d="M23 12L15.9289 19.0711L14.5147 17.6569L20.1716 12L14.5147 6.34317L15.9289 4.92896L23 12ZM3.82843 12L9.48528 17.6569L8.07107 19.0711L1 12L8.07107 4.92896L9.48528 6.34317L3.82843 12Z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 279 B

1
src/duckstation-qt/resources/icons/white/svg/video-on-line.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#ffffff"><path d="M17 9.2L22.2133 5.55071C22.4395 5.39235 22.7513 5.44737 22.9096 5.6736C22.9684 5.75764 23 5.85774 23 5.96033V18.0397C23 18.3158 22.7761 18.5397 22.5 18.5397C22.3974 18.5397 22.2973 18.5081 22.2133 18.4493L17 14.8V19C17 19.5523 16.5523 20 16 20H2C1.44772 20 1 19.5523 1 19V5C1 4.44772 1.44772 4 2 4H16C16.5523 4 17 4.44772 17 5V9.2ZM17 12.3587L21 15.1587V8.84131L17 11.6413V12.3587ZM3 6V18H15V6H3Z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 495 B

7
src/duckstation-qt/settingswindow.ui
View File

@@ -20,8 +20,7 @@
<string>DuckStation Settings</string>
</property>
<property name="windowIcon">
<iconset resource="resources/duckstation-qt.qrc">
<normaloff>:/icons/duck.png</normaloff>:/icons/duck.png</iconset>
<iconset theme="settings-3-line"/>
</property>
<property name="class" stdset="0">
<string>settings-window</string>
@@ -147,8 +146,6 @@
</item>
</layout>
</widget>
<resources>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<resources/>
<connections/>
</ui>