diff --git a/qt/src/EmuMainWindow.cpp b/qt/src/EmuMainWindow.cpp index 1706c72e..b529eb5c 100644 --- a/qt/src/EmuMainWindow.cpp +++ b/qt/src/EmuMainWindow.cpp @@ -167,9 +167,11 @@ void EmuMainWindow::createWidgets() setWindowTitle("Snes9x"); setWindowIcon(QIcon(":/icons/snes9x.svg")); + auto iconset = app->iconPrefix(); + // File menu auto file_menu = new QMenu(tr("&File")); - auto open_item = file_menu->addAction(QIcon::fromTheme("document-open"), tr("&Open File...")); + auto open_item = file_menu->addAction(QIcon(iconset + "open.svg"), tr("&Open File...")); open_item->connect(open_item, &QAction::triggered, this, [&] { openFile(); }); @@ -200,7 +202,7 @@ void EmuMainWindow::createWidgets() load_state_menu->addSeparator(); - auto load_state_file_item = load_state_menu->addAction(QIcon::fromTheme("document-open"), tr("From &File...")); + auto load_state_file_item = load_state_menu->addAction(QIcon(iconset + "open.svg"), tr("From &File...")); connect(load_state_file_item, &QAction::triggered, [&] { this->chooseState(false); }); @@ -208,7 +210,7 @@ void EmuMainWindow::createWidgets() load_state_menu->addSeparator(); - auto load_state_undo_item = load_state_menu->addAction(QIcon::fromTheme("edit-undo"), tr("&Undo Load State")); + auto load_state_undo_item = load_state_menu->addAction(QIcon(iconset + "refresh.svg"), tr("&Undo Load State")); connect(load_state_undo_item, &QAction::triggered, [&] { app->loadUndoState(); }); @@ -217,14 +219,14 @@ void EmuMainWindow::createWidgets() file_menu->addMenu(load_state_menu); save_state_menu->addSeparator(); - auto save_state_file_item = save_state_menu->addAction(QIcon::fromTheme("document-save"), tr("To &File...")); + auto save_state_file_item = save_state_menu->addAction(QIcon(iconset + "save.svg"), tr("To &File...")); connect(save_state_file_item, &QAction::triggered, [&] { this->chooseState(true); }); core_actions.push_back(save_state_file_item); file_menu->addMenu(save_state_menu); - auto exit_item = new QAction(QIcon::fromTheme("application-exit"), tr("E&xit")); + auto exit_item = new QAction(QIcon(iconset + "exit.svg"), tr("E&xit")); exit_item->connect(exit_item, &QAction::triggered, this, [&](bool checked) { close(); }); @@ -245,7 +247,7 @@ void EmuMainWindow::createWidgets() }); core_actions.push_back(run_item); - auto pause_item = emulation_menu->addAction(QIcon::fromTheme("media-playback-pause"), tr("&Pause")); + auto pause_item = emulation_menu->addAction(QIcon(iconset + "pause.svg"), tr("&Pause")); connect(pause_item, &QAction::triggered, [&] { if (!manual_pause) { @@ -257,7 +259,7 @@ void EmuMainWindow::createWidgets() emulation_menu->addSeparator(); - auto reset_item = emulation_menu->addAction(QIcon::fromTheme("view-refresh"), tr("Rese&t")); + auto reset_item = emulation_menu->addAction(QIcon(iconset + "refresh.svg"), tr("Rese&t")); connect(reset_item, &QAction::triggered, [&] { app->reset(); if (manual_pause) @@ -268,7 +270,7 @@ void EmuMainWindow::createWidgets() }); core_actions.push_back(reset_item); - auto hard_reset_item = emulation_menu->addAction(QIcon::fromTheme("process-stop"), tr("&Hard Reset")); + auto hard_reset_item = emulation_menu->addAction(QIcon(iconset + "reset.svg"), tr("&Hard Reset")); connect(hard_reset_item, &QAction::triggered, [&] { app->powerCycle(); if (manual_pause) @@ -308,7 +310,7 @@ void EmuMainWindow::createWidgets() view_menu->addSeparator(); - auto fullscreen_item = new QAction(QIcon::fromTheme("view-fullscreen"), tr("&Fullscreen")); + auto fullscreen_item = new QAction(QIcon(iconset + "fullscreen.svg"), tr("&Fullscreen")); view_menu->addAction(fullscreen_item); fullscreen_item->connect(fullscreen_item, &QAction::triggered, [&](bool checked) { toggleFullscreen(); @@ -328,7 +330,6 @@ void EmuMainWindow::createWidgets() tr("&Controllers..."), tr("Shortcu&ts..."), tr("&Files...") }; - QString iconset = app->iconPrefix(); const char *setting_icons[] = { "settings.svg", "display.svg", "sound.svg", diff --git a/qt/src/resources/blackicons/exit.svg b/qt/src/resources/blackicons/exit.svg new file mode 100644 index 00000000..1b785f84 --- /dev/null +++ b/qt/src/resources/blackicons/exit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/blackicons/fullscreen.svg b/qt/src/resources/blackicons/fullscreen.svg new file mode 100644 index 00000000..742640d5 --- /dev/null +++ b/qt/src/resources/blackicons/fullscreen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/blackicons/open.svg b/qt/src/resources/blackicons/open.svg new file mode 100644 index 00000000..e0df5cff --- /dev/null +++ b/qt/src/resources/blackicons/open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/blackicons/pause.svg b/qt/src/resources/blackicons/pause.svg new file mode 100644 index 00000000..568d723b --- /dev/null +++ b/qt/src/resources/blackicons/pause.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/blackicons/play.svg b/qt/src/resources/blackicons/play.svg new file mode 100644 index 00000000..178bd3a4 --- /dev/null +++ b/qt/src/resources/blackicons/play.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/blackicons/refresh.svg b/qt/src/resources/blackicons/refresh.svg new file mode 100644 index 00000000..eb0b5b1d --- /dev/null +++ b/qt/src/resources/blackicons/refresh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/blackicons/reset.svg b/qt/src/resources/blackicons/reset.svg new file mode 100644 index 00000000..5961fe82 --- /dev/null +++ b/qt/src/resources/blackicons/reset.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/blackicons/save.svg b/qt/src/resources/blackicons/save.svg new file mode 100644 index 00000000..5cb9c0fe --- /dev/null +++ b/qt/src/resources/blackicons/save.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/snes9x.qrc b/qt/src/resources/snes9x.qrc index 267d5359..1fd5a8a8 100644 --- a/qt/src/resources/snes9x.qrc +++ b/qt/src/resources/snes9x.qrc @@ -21,6 +21,14 @@ whiteicons/up.svg whiteicons/x.svg whiteicons/y.svg + whiteicons/open.svg + whiteicons/pause.svg + whiteicons/play.svg + whiteicons/refresh.svg + whiteicons/reset.svg + whiteicons/save.svg + whiteicons/exit.svg + whiteicons/fullscreen.svg snes9x.svg blackicons/settings.svg blackicons/folders.svg @@ -43,5 +51,13 @@ blackicons/x.svg blackicons/y.svg blackicons/shader.svg + blackicons/open.svg + blackicons/pause.svg + blackicons/play.svg + blackicons/refresh.svg + blackicons/reset.svg + blackicons/save.svg + blackicons/exit.svg + blackicons/fullscreen.svg diff --git a/qt/src/resources/whiteicons/exit.svg b/qt/src/resources/whiteicons/exit.svg new file mode 100644 index 00000000..cab9dc3f --- /dev/null +++ b/qt/src/resources/whiteicons/exit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/whiteicons/fullscreen.svg b/qt/src/resources/whiteicons/fullscreen.svg new file mode 100644 index 00000000..2ce70f31 --- /dev/null +++ b/qt/src/resources/whiteicons/fullscreen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/whiteicons/open.svg b/qt/src/resources/whiteicons/open.svg new file mode 100644 index 00000000..3b6037fc --- /dev/null +++ b/qt/src/resources/whiteicons/open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/whiteicons/pause.svg b/qt/src/resources/whiteicons/pause.svg new file mode 100644 index 00000000..350e2b84 --- /dev/null +++ b/qt/src/resources/whiteicons/pause.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/whiteicons/play.svg b/qt/src/resources/whiteicons/play.svg new file mode 100644 index 00000000..5f53dfac --- /dev/null +++ b/qt/src/resources/whiteicons/play.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/whiteicons/refresh.svg b/qt/src/resources/whiteicons/refresh.svg new file mode 100644 index 00000000..bd53323a --- /dev/null +++ b/qt/src/resources/whiteicons/refresh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/whiteicons/reset.svg b/qt/src/resources/whiteicons/reset.svg new file mode 100644 index 00000000..04efc696 --- /dev/null +++ b/qt/src/resources/whiteicons/reset.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qt/src/resources/whiteicons/save.svg b/qt/src/resources/whiteicons/save.svg new file mode 100644 index 00000000..ed967b59 --- /dev/null +++ b/qt/src/resources/whiteicons/save.svg @@ -0,0 +1 @@ + \ No newline at end of file