Qt: Add icons by @andercard0

This commit is contained in:
Connor McLaughlin 2021-08-15 14:23:14 +10:00
parent 3236917479
commit e87761b9e6
255 changed files with 431 additions and 190 deletions

View file

@ -60,8 +60,7 @@
<string>Add</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
<iconset theme="PostProcessingAdd"/>
</property>
</widget>
</item>
@ -77,8 +76,7 @@
<string>Remove</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/list-remove.png</normaloff>:/icons/list-remove.png</iconset>
<iconset theme="PostProcessingRemove"/>
</property>
</widget>
</item>
@ -121,8 +119,7 @@
<string>Add</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
<iconset theme="PostProcessingAdd"/>
</property>
</widget>
</item>
@ -138,8 +135,7 @@
<string>Remove</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/list-remove.png</normaloff>:/icons/list-remove.png</iconset>
<iconset theme="PostProcessingRemove"/>
</property>
</widget>
</item>
@ -175,8 +171,7 @@
<string>Scan For New Games</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/folder-open.png</normaloff>:/icons/folder-open.png</iconset>
<iconset theme="ScanForGames"/>
</property>
</widget>
</item>
@ -192,8 +187,7 @@
<string>Rescan All Games</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset>
<iconset theme="RescanAllGames"/>
</property>
</widget>
</item>

View file

@ -46,6 +46,8 @@ static constexpr char DISC_IMAGE_FILTER[] = QT_TRANSLATE_NOOP(
"(*.ecm);;Media Descriptor Sidecar Images (*.mds);;PlayStation EBOOTs (*.pbp);;PlayStation Executables (*.exe "
"*.psexe);;Portable Sound Format Files (*.psf *.minipsf);;Playlists (*.m3u)");
static const char* DEFAULT_THEME_NAME = "darkfusion";
ALWAYS_INLINE static QString getWindowTitle(const QString& game_title)
{
if (game_title.isEmpty())
@ -90,7 +92,7 @@ void MainWindow::initializeAndShow()
m_ui.setupUi(this);
setupAdditionalUi();
connectSignals();
updateTheme();
setThemeFromSettings();
resize(800, 700);
@ -474,7 +476,7 @@ void MainWindow::onSystemPerformanceCountersUpdated(float speed, float fps, floa
void MainWindow::onRunningGameChanged(const QString& filename, const QString& game_code, const QString& game_title)
{
setWindowTitle(getWindowTitle(game_title));
if (m_display_widget)
m_display_widget->setWindowTitle(windowTitle());
@ -1288,6 +1290,7 @@ void MainWindow::connectSignals()
addThemeToMenu(tr("Dark Fusion (Gray)"), QStringLiteral("darkfusion"));
addThemeToMenu(tr("Dark Fusion (Blue)"), QStringLiteral("darkfusionblue"));
addThemeToMenu(tr("QDarkStyle"), QStringLiteral("qdarkstyle"));
updateMenuSelectedTheme();
}
void MainWindow::addThemeToMenu(const QString& name, const QString& key)
@ -1301,12 +1304,15 @@ void MainWindow::addThemeToMenu(const QString& name, const QString& key)
void MainWindow::setTheme(const QString& theme)
{
m_host_interface->SetStringSettingValue("UI", "Theme", theme.toUtf8().constData());
updateTheme();
setThemeFromSettings();
updateMenuSelectedTheme();
}
void MainWindow::updateTheme()
void MainWindow::setThemeFromSettings()
{
QString theme = QString::fromStdString(m_host_interface->GetStringSettingValue("UI", "Theme", "darkfusion"));
QString theme = QString::fromStdString(m_host_interface->GetStringSettingValue("UI", "Theme", DEFAULT_THEME_NAME));
QString icon_theme;
if (theme == QStringLiteral("qdarkstyle"))
{
qApp->setStyle(m_unthemed_style_name);
@ -1315,12 +1321,16 @@ void MainWindow::updateTheme()
QFile f(QStringLiteral(":qdarkstyle/style.qss"));
if (f.open(QFile::ReadOnly | QFile::Text))
qApp->setStyleSheet(f.readAll());
icon_theme = QStringLiteral("white");
}
else if (theme == QStringLiteral("fusion"))
{
qApp->setPalette(QApplication::style()->standardPalette());
qApp->setStyleSheet(QString());
qApp->setStyle(QStyleFactory::create("Fusion"));
icon_theme = QStringLiteral("black");
}
else if (theme == QStringLiteral("darkfusion"))
{
@ -1356,6 +1366,8 @@ void MainWindow::updateTheme()
qApp->setPalette(darkPalette);
qApp->setStyleSheet("QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }");
icon_theme = QStringLiteral("white");
}
else if (theme == QStringLiteral("darkfusionblue"))
{
@ -1392,27 +1404,19 @@ void MainWindow::updateTheme()
qApp->setPalette(darkPalette);
qApp->setStyleSheet("QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }");
icon_theme = QStringLiteral("white");
}
else
{
qApp->setPalette(QApplication::style()->standardPalette());
qApp->setStyleSheet(QString());
qApp->setStyle(m_unthemed_style_name);
icon_theme = QStringLiteral("black");
}
for (QObject* obj : m_ui.menuSettingsTheme->children())
{
QAction* action = qobject_cast<QAction*>(obj);
if (action)
{
QVariant action_data(action->data());
if (action_data.isValid())
{
QSignalBlocker blocker(action);
action->setChecked(action_data == theme);
}
}
}
QIcon::setThemeName(icon_theme);
}
void MainWindow::onSettingsResetToDefault()
@ -1435,6 +1439,7 @@ void MainWindow::onSettingsResetToDefault()
updateDebugMenuGPURenderer();
updateDebugMenuCropMode();
updateDebugMenuVisibility();
updateMenuSelectedTheme();
}
void MainWindow::saveStateToConfig()
@ -1575,6 +1580,25 @@ void MainWindow::updateDebugMenuCropMode()
}
}
void MainWindow::updateMenuSelectedTheme()
{
QString theme = QString::fromStdString(m_host_interface->GetStringSettingValue("UI", "Theme", DEFAULT_THEME_NAME));
for (QObject* obj : m_ui.menuSettingsTheme->children())
{
QAction* action = qobject_cast<QAction*>(obj);
if (action)
{
QVariant action_data(action->data());
if (action_data.isValid())
{
QSignalBlocker blocker(action);
action->setChecked(action_data == theme);
}
}
}
}
void MainWindow::ensureGameListLoaded()
{
if (m_host_interface->getGameList()->IsGameListLoaded())

View file

@ -63,9 +63,6 @@ private Q_SLOTS:
void onMouseModeRequested(bool relative_mode, bool hide_cursor);
void updateMouseMode(bool paused);
void setTheme(const QString& theme);
void updateTheme();
void onSettingsResetToDefault();
void onEmulationStarting();
void onEmulationStarted();
@ -127,6 +124,8 @@ private:
return (m_display_container ? static_cast<QWidget*>(m_display_container) : static_cast<QWidget*>(m_display_widget));
}
void setTheme(const QString& theme);
void setThemeFromSettings();
void setupAdditionalUi();
void connectSignals();
void addThemeToMenu(const QString& name, const QString& key);
@ -147,6 +146,7 @@ private:
void updateDebugMenuCPUExecutionMode();
void updateDebugMenuGPURenderer();
void updateDebugMenuCropMode();
void updateMenuSelectedTheme();
void ensureGameListLoaded();
std::string getDeviceDiscPath(const QString& title);

View file

@ -10,6 +10,9 @@
<height>600</height>
</rect>
</property>
<property name="acceptDrops">
<bool>true</bool>
</property>
<property name="windowTitle">
<string>DuckStation</string>
</property>
@ -17,9 +20,6 @@
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/duck.png</normaloff>:/icons/duck.png</iconset>
</property>
<property name="acceptDrops">
<bool>true</bool>
</property>
<widget class="QStackedWidget" name="mainContainer">
<property name="currentIndex">
<number>0</number>
@ -33,7 +33,7 @@
<x>0</x>
<y>0</y>
<width>754</width>
<height>21</height>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuSystem">
@ -45,14 +45,13 @@
<string>Change Disc</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/media-optical.png</normaloff>:/icons/media-optical.png</iconset>
<iconset theme="ChangeDisc"/>
</property>
<actiongroup name="actionGroupChangeDiscSubImages"/>
<addaction name="actionChangeDiscFromFile"/>
<addaction name="actionChangeDiscFromDevice"/>
<addaction name="actionChangeDiscFromDevice"/>
<addaction name="actionChangeDiscFromGameList"/>
<addaction name="actionRemoveDisc"/>
<actiongroup name="actionGroupChangeDiscSubImages" />
<addaction name="separator"/>
</widget>
<widget class="QMenu" name="menuCheats">
@ -60,8 +59,7 @@
<string>Cheats</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/conical-flask-red.png</normaloff>:/icons/conical-flask-red.png</iconset>
<iconset theme="Cheats"/>
</property>
</widget>
<widget class="QMenu" name="menuLoadState">
@ -69,8 +67,7 @@
<string>Load State</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
<iconset theme="LoadState"/>
</property>
</widget>
<widget class="QMenu" name="menuSaveState">
@ -78,8 +75,7 @@
<string>Save State</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
<iconset theme="SaveState"/>
</property>
</widget>
<addaction name="actionStartFile"/>
@ -275,8 +271,7 @@
<widget class="QStatusBar" name="statusBar"/>
<action name="actionStartFile">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/media-optical.png</normaloff>:/icons/media-optical.png</iconset>
<iconset theme="StartfileSettings"/>
</property>
<property name="text">
<string>Start &amp;File...</string>
@ -284,8 +279,7 @@
</action>
<action name="actionStartDisc">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/drive-optical.png</normaloff>:/icons/drive-optical.png</iconset>
<iconset theme="StartdiscSettings"/>
</property>
<property name="text">
<string>Start &amp;Disc...</string>
@ -293,8 +287,7 @@
</action>
<action name="actionStartBios">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/drive-removable-media.png</normaloff>:/icons/drive-removable-media.png</iconset>
<iconset theme="BIOSSettings"/>
</property>
<property name="text">
<string>Start &amp;BIOS</string>
@ -302,8 +295,7 @@
</action>
<action name="actionScanForNewGames">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/folder-open.png</normaloff>:/icons/folder-open.png</iconset>
<iconset theme="ScanForGames"/>
</property>
<property name="text">
<string>&amp;Scan For New Games</string>
@ -311,8 +303,7 @@
</action>
<action name="actionRescanAllGames">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset>
<iconset theme="RescanAllGames"/>
</property>
<property name="text">
<string>&amp;Rescan All Games</string>
@ -320,8 +311,7 @@
</action>
<action name="actionPowerOff">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/system-shutdown.png</normaloff>:/icons/system-shutdown.png</iconset>
<iconset theme="PowerOff"/>
</property>
<property name="text">
<string>Power &amp;Off</string>
@ -329,8 +319,7 @@
</action>
<action name="actionReset">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset>
<iconset theme="Reset"/>
</property>
<property name="text">
<string>&amp;Reset</string>
@ -341,8 +330,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/media-playback-pause.png</normaloff>:/icons/media-playback-pause.png</iconset>
<iconset theme="Pause"/>
</property>
<property name="text">
<string>&amp;Pause</string>
@ -350,8 +338,7 @@
</action>
<action name="actionLoadState">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
<iconset theme="LoadState"/>
</property>
<property name="text">
<string>&amp;Load State</string>
@ -359,22 +346,23 @@
</action>
<action name="actionSaveState">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
<iconset theme="SaveState"/>
</property>
<property name="text">
<string>&amp;Save State</string>
</property>
</action>
<action name="actionExit">
<property name="icon">
<iconset theme="Exit"/>
</property>
<property name="text">
<string>E&amp;xit</string>
</property>
</action>
<action name="actionBIOSSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/media-flash-2.png</normaloff>:/icons/media-flash-2.png</iconset>
<iconset theme="BIOSSettings"/>
</property>
<property name="text">
<string>B&amp;IOS Settings...</string>
@ -382,8 +370,7 @@
</action>
<action name="actionConsoleSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/utilities-system-monitor.png</normaloff>:/icons/utilities-system-monitor.png</iconset>
<iconset theme="ConsoleSettings"/>
</property>
<property name="text">
<string>C&amp;onsole Settings...</string>
@ -391,8 +378,7 @@
</action>
<action name="actionEmulationSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/applications-other.png</normaloff>:/icons/applications-other.png</iconset>
<iconset theme="EmulationSettings"/>
</property>
<property name="text">
<string>E&amp;mulation Settings...</string>
@ -400,8 +386,7 @@
</action>
<action name="actionControllerSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/input-gaming.png</normaloff>:/icons/input-gaming.png</iconset>
<iconset theme="ControllerSettings"/>
</property>
<property name="text">
<string>&amp;Controller Settings...</string>
@ -409,8 +394,7 @@
</action>
<action name="actionHotkeySettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/preferences-desktop-keyboard-shortcuts.png</normaloff>:/icons/preferences-desktop-keyboard-shortcuts.png</iconset>
<iconset theme="HotkeySettings"/>
</property>
<property name="text">
<string>&amp;Hotkey Settings...</string>
@ -418,8 +402,7 @@
</action>
<action name="actionDisplaySettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/video-display.png</normaloff>:/icons/video-display.png</iconset>
<iconset theme="DisplaySettings"/>
</property>
<property name="text">
<string>&amp;Display Settings...</string>
@ -427,8 +410,7 @@
</action>
<action name="actionEnhancementSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/antialias-icon.png</normaloff>:/icons/antialias-icon.png</iconset>
<iconset theme="EnhancementSettings"/>
</property>
<property name="text">
<string>&amp;Enhancement Settings...</string>
@ -436,8 +418,7 @@
</action>
<action name="actionPostProcessingSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/applications-graphics.png</normaloff>:/icons/applications-graphics.png</iconset>
<iconset theme="PostprocessingSettings"/>
</property>
<property name="text">
<string>&amp;Post-Processing Settings...</string>
@ -445,8 +426,7 @@
</action>
<action name="actionFullscreen">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/view-fullscreen.png</normaloff>:/icons/view-fullscreen.png</iconset>
<iconset theme="Fullscreen"/>
</property>
<property name="text">
<string>Fullscreen</string>
@ -458,62 +438,56 @@
</property>
</action>
<action name="actionGitHubRepository">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/github.png</normaloff>:/icons/github.png
</iconset>
</property>
<property name="text">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/github.png</normaloff>:/icons/github.png</iconset>
</property>
<property name="text">
<string>&amp;GitHub Repository...</string>
</property>
</action>
<action name="actionIssueTracker">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/IssueTracker.png</normaloff>:/icons/IssueTracker.png
</iconset>
</property>
<property name="text">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/IssueTracker.png</normaloff>:/icons/IssueTracker.png</iconset>
</property>
<property name="text">
<string>&amp;Issue Tracker...</string>
</property>
</action>
<action name="actionDiscordServer">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/discord.png</normaloff>:/icons/discord.png
</iconset>
</property>
<property name="text">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/discord.png</normaloff>:/icons/discord.png</iconset>
</property>
<property name="text">
<string>&amp;Discord Server...</string>
</property>
</action>
<action name="actionCheckForUpdates">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/update.png</normaloff>:/icons/update.png
</iconset>
</property>
<property name="text">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/update.png</normaloff>:/icons/update.png</iconset>
</property>
<property name="text">
<string>Check for &amp;Updates...</string>
</property>
</action>
<action name="actionAboutQt">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/QT.png</normaloff>:/icons/QT.png
</iconset>
</property>
<property name="text">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/QT.png</normaloff>:/icons/QT.png</iconset>
</property>
<property name="text">
<string>About &amp;Qt...</string>
</property>
</action>
<action name="actionAbout">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/duck_64.png</normaloff>:/icons/duck_64.png
</iconset>
</property>
<property name="text">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/duck_64.png</normaloff>:/icons/duck_64.png</iconset>
</property>
<property name="text">
<string>&amp;About DuckStation...</string>
</property>
</action>
@ -528,8 +502,7 @@
</action>
<action name="actionCheats">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/conical-flask-red.png</normaloff>:/icons/conical-flask-red.png</iconset>
<iconset theme="Cheats"/>
</property>
<property name="text">
<string>Cheats...</string>
@ -537,8 +510,7 @@
</action>
<action name="actionAudioSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/audio-card.png</normaloff>:/icons/audio-card.png</iconset>
<iconset theme="AudioSettings"/>
</property>
<property name="text">
<string>Audio Settings...</string>
@ -546,8 +518,7 @@
</action>
<action name="actionAchievementSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/trophy.png</normaloff>:/icons/trophy.png</iconset>
<iconset theme="AchievementsSettings"/>
</property>
<property name="text">
<string>Achievement Settings...</string>
@ -555,8 +526,7 @@
</action>
<action name="actionGameListSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/folder-open.png</normaloff>:/icons/folder-open.png</iconset>
<iconset theme="GamelistSettings"/>
</property>
<property name="text">
<string>Game List Settings...</string>
@ -564,8 +534,7 @@
</action>
<action name="actionGeneralSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/applications-system.png</normaloff>:/icons/applications-system.png</iconset>
<iconset theme="GeneralSettings"/>
</property>
<property name="text">
<string>General Settings...</string>
@ -573,8 +542,7 @@
</action>
<action name="actionAdvancedSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/applications-development.png</normaloff>:/icons/applications-development.png</iconset>
<iconset theme="AdvancedSettings"/>
</property>
<property name="text">
<string>Advanced Settings...</string>
@ -582,8 +550,7 @@
</action>
<action name="actionAddGameDirectory">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset>
<iconset theme="AddGameDirectory"/>
</property>
<property name="text">
<string>Add Game Directory...</string>
@ -591,8 +558,7 @@
</action>
<action name="actionSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/preferences-system.png</normaloff>:/icons/preferences-system.png</iconset>
<iconset theme="GeneralSettings"/>
</property>
<property name="text">
<string>&amp;Settings...</string>
@ -659,7 +625,7 @@
<property name="text">
<string>Disable All Enhancements</string>
</property>
</action>
</action>
<action name="actionDisableInterlacing">
<property name="checkable">
<bool>true</bool>
@ -749,8 +715,7 @@
</action>
<action name="actionScreenshot">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/camera-photo.png</normaloff>:/icons/camera-photo.png</iconset>
<iconset theme="Screenshot"/>
</property>
<property name="text">
<string>&amp;Screenshot</string>
@ -758,8 +723,7 @@
</action>
<action name="actionMemoryCardSettings">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/media-flash-24.png</normaloff>:/icons/media-flash-24.png</iconset>
<iconset theme="MemorycardSettings"/>
</property>
<property name="text">
<string>&amp;Memory Card Settings...</string>
@ -767,8 +731,7 @@
</action>
<action name="actionResumeLastState">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/media-playback-start.png</normaloff>:/icons/media-playback-start.png</iconset>
<iconset theme="Resume"/>
</property>
<property name="text">
<string>Resume</string>
@ -811,6 +774,9 @@
</property>
</action>
<action name="actionViewGameList">
<property name="icon">
<iconset theme="GameList"/>
</property>
<property name="text">
<string>Game &amp;List</string>
</property>
@ -847,6 +813,9 @@
</property>
</action>
<action name="actionViewGameGrid">
<property name="icon">
<iconset theme="GameGrid"/>
</property>
<property name="text">
<string>Game &amp;Grid</string>
</property>
@ -895,8 +864,7 @@
</action>
<action name="actionPowerOffWithoutSaving">
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset>
<iconset theme="PoweroffWsaving"/>
</property>
<property name="text">
<string>Power Off &amp;Without Saving</string>

View file

@ -50,8 +50,7 @@
<string>Add</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
<iconset theme="PostProcessingAdd"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
@ -70,8 +69,7 @@
<string>Remove</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/list-remove.png</normaloff>:/icons/list-remove.png</iconset>
<iconset theme="PostProcessingRemove"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
@ -90,8 +88,7 @@
<string>Clear</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/edit-clear-16.png</normaloff>:/icons/edit-clear-16.png</iconset>
<iconset theme="Clear"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
@ -110,8 +107,7 @@
<string>Move Up</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/go-up-16.png</normaloff>:/icons/go-up-16.png</iconset>
<iconset theme="MoveUp"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
@ -130,8 +126,7 @@
<string>Move Down</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/go-down-16.png</normaloff>:/icons/go-down-16.png</iconset>
<iconset theme="MoveDown"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
@ -150,8 +145,7 @@
<string>Options...</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/preferences-system.png</normaloff>:/icons/preferences-system.png</iconset>
<iconset theme="Options"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>

Binary file not shown.

After

Width:  |  Height:  |  Size: 378 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 356 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 394 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 649 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 441 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 379 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 360 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 525 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 562 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 392 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 486 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 462 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 468 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 395 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 579 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 560 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 615 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 686 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 655 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 867 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 745 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 785 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 912 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 877 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 507 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 983 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 574 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 737 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 763 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 563 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 599 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 968 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 637 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 619 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 828 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 451 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 898 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 749 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 881 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 629 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 711 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Some files were not shown because too many files have changed in this diff Show more