Qt: More built-in icons.

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",

qt/src/resources/blackicons/exit.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><path d="M0,0h24v24H0V0z" fill="none"/></g><g><path d="M17,8l-1.41,1.41L17.17,11H9v2h8.17l-1.58,1.58L17,16l4-4L17,8z M5,5h7V3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h7v-2H5V5z"/></g></svg>

qt/src/resources/blackicons/fullscreen.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg>

qt/src/resources/blackicons/open.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><rect fill="none" height="24" width="24"/></g><g><path d="M15,22H6c-1.1,0-2-0.9-2-2V4c0-1.1,0.9-2,2-2h8l6,6v6h-2V9h-5V4H6v16h9V22z M19,21.66l0-2.24l2.95,2.95l1.41-1.41L20.41,18 h2.24v-2H17v5.66H19z"/></g></svg>

qt/src/resources/blackicons/pause.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/></svg>

qt/src/resources/blackicons/play.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M8 5v14l11-7z"/></svg>

qt/src/resources/blackicons/refresh.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 5V1L7 6l5 5V7c3.31 0 6 2.69 6 6s-2.69 6-6 6-6-2.69-6-6H4c0 4.42 3.58 8 8 8s8-3.58 8-8-3.58-8-8-8z"/></svg>

qt/src/resources/blackicons/reset.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><path d="M0,0h24v24H0V0z" fill="none"/></g><g><g><path d="M6,13c0-1.65,0.67-3.15,1.76-4.24L6.34,7.34C4.9,8.79,4,10.79,4,13c0,4.08,3.05,7.44,7,7.93v-2.02 C8.17,18.43,6,15.97,6,13z M20,13c0-4.42-3.58-8-8-8c-0.06,0-0.12,0.01-0.18,0.01l1.09-1.09L11.5,2.5L8,6l3.5,3.5l1.41-1.41 l-1.08-1.08C11.89,7.01,11.95,7,12,7c3.31,0,6,2.69,6,6c0,2.97-2.17,5.43-5,5.91v2.02C16.95,20.44,20,17.08,20,13z"/></g></g></svg>

qt/src/resources/blackicons/save.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M17 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V7l-4-4zm2 16H5V5h11.17L19 7.83V19zm-7-7c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3zM6 6h9v4H6z"/></svg>

qt/src/resources/snes9x.qrc

@@ -21,6 +21,14 @@
     <file>whiteicons/up.svg</file>
     <file>whiteicons/x.svg</file>
     <file>whiteicons/y.svg</file>
+    <file>whiteicons/open.svg</file>
+    <file>whiteicons/pause.svg</file>
+    <file>whiteicons/play.svg</file>
+    <file>whiteicons/refresh.svg</file>
+    <file>whiteicons/reset.svg</file>
+    <file>whiteicons/save.svg</file>
+    <file>whiteicons/exit.svg</file>
+    <file>whiteicons/fullscreen.svg</file>
     <file>snes9x.svg</file>
     <file>blackicons/settings.svg</file>
     <file>blackicons/folders.svg</file>
@@ -43,5 +51,13 @@
     <file>blackicons/x.svg</file>
     <file>blackicons/y.svg</file>
     <file>blackicons/shader.svg</file>
+    <file>blackicons/open.svg</file>
+    <file>blackicons/pause.svg</file>
+    <file>blackicons/play.svg</file>
+    <file>blackicons/refresh.svg</file>
+    <file>blackicons/reset.svg</file>
+    <file>blackicons/save.svg</file>
+    <file>blackicons/exit.svg</file>
+    <file>blackicons/fullscreen.svg</file>
   </qresource>
 </RCC>

qt/src/resources/whiteicons/exit.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><g><path d="M0,0h24v24H0V0z" fill="none"/></g><g><path d="M17,8l-1.41,1.41L17.17,11H9v2h8.17l-1.58,1.58L17,16l4-4L17,8z M5,5h7V3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h7v-2H5V5z"/></g></svg>

qt/src/resources/whiteicons/fullscreen.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg>

qt/src/resources/whiteicons/open.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><g><rect fill="none" height="24" width="24"/></g><g><path d="M15,22H6c-1.1,0-2-0.9-2-2V4c0-1.1,0.9-2,2-2h8l6,6v6h-2V9h-5V4H6v16h9V22z M19,21.66l0-2.24l2.95,2.95l1.41-1.41L20.41,18 h2.24v-2H17v5.66H19z"/></g></svg>

qt/src/resources/whiteicons/pause.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/></svg>

qt/src/resources/whiteicons/play.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><path d="M0 0h24v24H0z" fill="none"/><path d="M8 5v14l11-7z"/></svg>

qt/src/resources/whiteicons/refresh.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 5V1L7 6l5 5V7c3.31 0 6 2.69 6 6s-2.69 6-6 6-6-2.69-6-6H4c0 4.42 3.58 8 8 8s8-3.58 8-8-3.58-8-8-8z"/></svg>

qt/src/resources/whiteicons/reset.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><g><path d="M0,0h24v24H0V0z" fill="none"/></g><g><g><path d="M6,13c0-1.65,0.67-3.15,1.76-4.24L6.34,7.34C4.9,8.79,4,10.79,4,13c0,4.08,3.05,7.44,7,7.93v-2.02 C8.17,18.43,6,15.97,6,13z M20,13c0-4.42-3.58-8-8-8c-0.06,0-0.12,0.01-0.18,0.01l1.09-1.09L11.5,2.5L8,6l3.5,3.5l1.41-1.41 l-1.08-1.08C11.89,7.01,11.95,7,12,7c3.31,0,6,2.69,6,6c0,2.97-2.17,5.43-5,5.91v2.02C16.95,20.44,20,17.08,20,13z"/></g></g></svg>

qt/src/resources/whiteicons/save.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M17 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V7l-4-4zm2 16H5V5h11.17L19 7.83V19zm-7-7c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3zM6 6h9v4H6z"/></svg>