diff --git a/icons/application-exit.png b/icons/application-exit.png new file mode 100644 index 00000000..9512d7e1 Binary files /dev/null and b/icons/application-exit.png differ diff --git a/icons/camera.png b/icons/camera.png new file mode 100644 index 00000000..37075dc1 Binary files /dev/null and b/icons/camera.png differ diff --git a/icons/graphics-palette.png b/icons/graphics-palette.png new file mode 100644 index 00000000..fc711bdc Binary files /dev/null and b/icons/graphics-palette.png differ diff --git a/icons/input-gaming-symbolic.png b/icons/input-gaming-symbolic.png new file mode 100644 index 00000000..2c82e693 Binary files /dev/null and b/icons/input-gaming-symbolic.png differ diff --git a/icons/input-gaming.png b/icons/input-gaming.png new file mode 100644 index 00000000..9d5b1d5f Binary files /dev/null and b/icons/input-gaming.png differ diff --git a/icons/input-keyboard.png b/icons/input-keyboard.png new file mode 100644 index 00000000..631587b1 Binary files /dev/null and b/icons/input-keyboard.png differ diff --git a/icons/media-record.png b/icons/media-record.png new file mode 100644 index 00000000..072ed7f9 Binary files /dev/null and b/icons/media-record.png differ diff --git a/icons/movie.png b/icons/movie.png new file mode 100644 index 00000000..376ff3a5 Binary files /dev/null and b/icons/movie.png differ diff --git a/icons/record.png b/icons/record.png deleted file mode 100644 index d25752bf..00000000 Binary files a/icons/record.png and /dev/null differ diff --git a/icons/timer.png b/icons/timer.png new file mode 100644 index 00000000..4e539e1f Binary files /dev/null and b/icons/timer.png differ diff --git a/icons/view-fullscreen.png b/icons/view-fullscreen.png new file mode 100644 index 00000000..731c660f Binary files /dev/null and b/icons/view-fullscreen.png differ diff --git a/resources.qrc b/resources.qrc index 7a5b080f..58ea0097 100644 --- a/resources.qrc +++ b/resources.qrc @@ -3,6 +3,15 @@ fceux.png fceux1.png icons/power.png - icons/record.png + icons/media-record.png + icons/application-exit.png + icons/graphics-palette.png + icons/view-fullscreen.png + icons/input-keyboard.png + icons/input-gaming.png + icons/input-gaming-symbolic.png + icons/timer.png + icons/movie.png + icons/camera.png diff --git a/src/drivers/Qt/ConsoleWindow.cpp b/src/drivers/Qt/ConsoleWindow.cpp index 06522e9b..df1220ff 100644 --- a/src/drivers/Qt/ConsoleWindow.cpp +++ b/src/drivers/Qt/ConsoleWindow.cpp @@ -360,6 +360,7 @@ void consoleWin_t::createMainMenu(void) loadLuaAct = new QAction(tr("Load Lua Script"), this); //loadLuaAct->setShortcut( QKeySequence(tr("F5"))); loadLuaAct->setStatusTip(tr("Load Lua Script")); + //loadLuaAct->setIcon( QIcon(":icons/lua-logo.png") ); connect(loadLuaAct, SIGNAL(triggered()), this, SLOT(loadLua(void)) ); fileMenu->addAction(loadLuaAct); @@ -373,7 +374,7 @@ void consoleWin_t::createMainMenu(void) scrShotAct = new QAction(tr("Screenshot"), this); scrShotAct->setShortcut( QKeySequence(tr("F12"))); scrShotAct->setStatusTip(tr("Screenshot")); - //scrShotAct->setIcon( QIcon(":icons/camera.png") ); + scrShotAct->setIcon( QIcon(":icons/camera.png") ); connect(scrShotAct, SIGNAL(triggered()), this, SLOT(takeScreenShot())); fileMenu->addAction(scrShotAct); @@ -382,7 +383,8 @@ void consoleWin_t::createMainMenu(void) quitAct = new QAction(tr("Quit"), this); quitAct->setShortcut( QKeySequence(tr("Ctrl+Q"))); quitAct->setStatusTip(tr("Quit the Application")); - quitAct->setIcon( style->standardIcon( QStyle::SP_DialogCloseButton ) ); + //quitAct->setIcon( style->standardIcon( QStyle::SP_DialogCloseButton ) ); + quitAct->setIcon( QIcon(":icons/application-exit.png") ); connect(quitAct, SIGNAL(triggered()), this, SLOT(closeApp())); fileMenu->addAction(quitAct); @@ -395,7 +397,7 @@ void consoleWin_t::createMainMenu(void) inputConfig = new QAction(tr("Input Config"), this); //inputConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); inputConfig->setStatusTip(tr("Input Configure")); - //inputConfig->setIcon( QIcon(":icons/zapper.png") ); + inputConfig->setIcon( QIcon(":icons/input-gaming.png") ); connect(inputConfig, SIGNAL(triggered()), this, SLOT(openInputConfWin(void)) ); optMenu->addAction(inputConfig); @@ -404,7 +406,7 @@ void consoleWin_t::createMainMenu(void) gamePadConfig = new QAction(tr("GamePad Config"), this); //gamePadConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); gamePadConfig->setStatusTip(tr("GamePad Configure")); - //gamePadConfig->setIcon( QIcon(":icons/gamepad.png") ); + gamePadConfig->setIcon( QIcon(":icons/input-gaming-symbolic.png") ); connect(gamePadConfig, SIGNAL(triggered()), this, SLOT(openGamePadConfWin(void)) ); optMenu->addAction(gamePadConfig); @@ -431,7 +433,7 @@ void consoleWin_t::createMainMenu(void) hotkeyConfig = new QAction(tr("Hotkey Config"), this); //hotkeyConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); hotkeyConfig->setStatusTip(tr("Hotkey Configure")); - //hotkeyConfig->setIcon( QIcon(":icons/keyboard.png") ); + hotkeyConfig->setIcon( QIcon(":icons/input-keyboard.png") ); connect(hotkeyConfig, SIGNAL(triggered()), this, SLOT(openHotkeyConfWin(void)) ); optMenu->addAction(hotkeyConfig); @@ -440,6 +442,7 @@ void consoleWin_t::createMainMenu(void) paletteConfig = new QAction(tr("Palette Config"), this); //paletteConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); paletteConfig->setStatusTip(tr("Palette Configure")); + paletteConfig->setIcon( QIcon(":icons/graphics-palette.png") ); connect(paletteConfig, SIGNAL(triggered()), this, SLOT(openPaletteConfWin(void)) ); optMenu->addAction(paletteConfig); @@ -448,6 +451,7 @@ void consoleWin_t::createMainMenu(void) guiConfig = new QAction(tr("GUI Config"), this); //guiConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); guiConfig->setStatusTip(tr("GUI Configure")); + guiConfig->setIcon( style->standardIcon( QStyle::SP_TitleBarNormalButton ) ); connect(guiConfig, SIGNAL(triggered()), this, SLOT(openGuiConfWin(void)) ); optMenu->addAction(guiConfig); @@ -456,6 +460,7 @@ void consoleWin_t::createMainMenu(void) timingConfig = new QAction(tr("Timing Config"), this); //timingConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); timingConfig->setStatusTip(tr("Timing Configure")); + timingConfig->setIcon( QIcon(":icons/timer.png") ); connect(timingConfig, SIGNAL(triggered()), this, SLOT(openTimingConfWin(void)) ); optMenu->addAction(timingConfig); @@ -464,6 +469,7 @@ void consoleWin_t::createMainMenu(void) movieConfig = new QAction(tr("Movie Options"), this); //movieConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); movieConfig->setStatusTip(tr("Movie Options")); + movieConfig->setIcon( QIcon(":icons/movie.png") ); connect(movieConfig, SIGNAL(triggered()), this, SLOT(openMovieOptWin(void)) ); optMenu->addAction(movieConfig); @@ -482,9 +488,9 @@ void consoleWin_t::createMainMenu(void) // Options -> Full Screen fullscreen = new QAction(tr("Fullscreen"), this); fullscreen->setShortcut( QKeySequence(tr("Alt+Return"))); - //fullscreen->setCheckable(true); fullscreen->setStatusTip(tr("Fullscreen")); - fullscreen->setIcon( style->standardIcon( QStyle::SP_TitleBarMaxButton ) ); + //fullscreen->setIcon( style->standardIcon( QStyle::SP_TitleBarMaxButton ) ); + fullscreen->setIcon( QIcon(":icons/view-fullscreen.png") ); connect(fullscreen, SIGNAL(triggered()), this, SLOT(toggleFullscreen(void)) ); optMenu->addAction(fullscreen); @@ -791,7 +797,7 @@ void consoleWin_t::createMainMenu(void) recMovAct = new QAction(tr("Record"), this); recMovAct->setShortcut( QKeySequence(tr("Shift+F5"))); recMovAct->setStatusTip(tr("Record Movie")); - recMovAct->setIcon( QIcon(":icons/record.png") ); + recMovAct->setIcon( QIcon(":icons/media-record.png") ); connect(recMovAct, SIGNAL(triggered()), this, SLOT(recordMovie(void)) ); movieMenu->addAction(recMovAct);