icons/oxygen/16x16/application-exit.png icons/oxygen/16x16/document-new.png icons/oxygen/16x16/games-config-options.png icons/oxygen/16x16/games-highscores.png icons/oxygen/16x16/games-hint.png icons/oxygen/16x16/help-about.png icons/oxygen/16x16/media-playback-pause.png icons/oxygen/16x16/zoom-in.png icons/oxygen/16x16/zoom-out.png icons/oxygen/22x22/application-exit.png icons/oxygen/22x22/document-new.png icons/oxygen/22x22/games-config-options.png icons/oxygen/22x22/games-highscores.png icons/oxygen/22x22/games-hint.png icons/oxygen/22x22/help-about.png icons/oxygen/22x22/media-playback-pause.png icons/oxygen/22x22/zoom-in.png icons/oxygen/22x22/zoom-out.png icons/oxygen/LGPL icons/oxygen/scalable/application-exit.svgz icons/oxygen/scalable/document-new.svgz icons/oxygen/scalable/games-config-options.svgz icons/oxygen/scalable/games-highscores.svgz icons/oxygen/scalable/games-hint.svgz icons/oxygen/scalable/help-about.svgz icons/oxygen/scalable/media-playback-pause.svgz icons/oxygen/scalable/zoom-in.svgz icons/oxygen/scalable/zoom-out.svgz @@ -1,4 +1,5 @@ 2009-09-18 Graeme Gott <graeme@gottcode.org> + * Add proper Oxygen attribution. * Save and restore window position. 2009-09-17 Graeme Gott <graeme@gottcode.org> ChangeLog @@ -2,22 +2,24 @@ <qresource> <file>cutemaze.png</file> - <file>16x16/application-exit.png</file> - <file>16x16/document-new.png</file> - <file>16x16/games-config-options.png</file> - <file>16x16/games-highscores.png</file> - <file>16x16/games-hint.png</file> - <file>16x16/media-playback-pause.png</file> - <file>16x16/zoom-in.png</file> - <file>16x16/zoom-out.png</file> + <file>oxygen/16x16/application-exit.png</file> + <file>oxygen/16x16/document-new.png</file> + <file>oxygen/16x16/games-config-options.png</file> + <file>oxygen/16x16/games-highscores.png</file> + <file>oxygen/16x16/games-hint.png</file> + <file>oxygen/16x16/help-about.png</file> + <file>oxygen/16x16/media-playback-pause.png</file> + <file>oxygen/16x16/zoom-in.png</file> + <file>oxygen/16x16/zoom-out.png</file> - <file>22x22/application-exit.png</file> - <file>22x22/document-new.png</file> - <file>22x22/games-config-options.png</file> - <file>22x22/games-highscores.png</file> - <file>22x22/games-hint.png</file> - <file>22x22/media-playback-pause.png</file> - <file>22x22/zoom-in.png</file> - <file>22x22/zoom-out.png</file> + <file>oxygen/22x22/application-exit.png</file> + <file>oxygen/22x22/document-new.png</file> + <file>oxygen/22x22/games-config-options.png</file> + <file>oxygen/22x22/games-highscores.png</file> + <file>oxygen/22x22/games-hint.png</file> + <file>oxygen/22x22/help-about.png</file> + <file>oxygen/22x22/media-playback-pause.png</file> + <file>oxygen/22x22/zoom-in.png</file> + <file>oxygen/22x22/zoom-out.png</file> </qresource> </RCC> icons/icons.qrc @@ -46,6 +46,15 @@ // ============================================================================ +static QIcon fetchIcon(const QString& name) +{ + QIcon icon(QString(":/oxygen/22x22/%1.png").arg(name)); + icon.addFile(QString(":/oxygen/16x16/%1.png").arg(name)); + return icon; +} + +// ============================================================================ + Window::Window() { setWindowIcon(QIcon(":/cutemaze.png")); @@ -122,54 +131,31 @@ void Window::initActions() game_menu->addAction(tr("New Game"), m_board, SLOT(newGame())); #else // Create menubar - QMenu* game_menu = menuBar()->addMenu(tr("Game")); - - QIcon new_icon(QPixmap(":/22x22/document-new.png")); - new_icon.addPixmap(QPixmap(":/16x16/document-new.png")); - QAction* new_action = game_menu->addAction(new_icon, tr("New"), m_board, SLOT(newGame()), tr("Ctrl+N")); +#if defined(Q_OS_MAC) + qApp->setAttribute(Qt::AA_DontShowIconsInMenus); +#endif - QIcon pause_icon(QPixmap(":/22x22/media-playback-pause.png")); - pause_icon.addPixmap(QPixmap(":/16x16/media-playback-pause.png")); - m_pause_action = game_menu->addAction(pause_icon, tr("Pause")); + QMenu* game_menu = menuBar()->addMenu(tr("Game")); + QAction* new_action = game_menu->addAction(fetchIcon("document-new"), tr("New"), m_board, SLOT(newGame()), tr("Ctrl+N")); + m_pause_action = game_menu->addAction(fetchIcon("media-playback-pause"), tr("Pause")); m_pause_action->setShortcut(tr("P")); - - QIcon hint_icon(QPixmap(":/22x22/games-hint.png")); - hint_icon.addPixmap(QPixmap(":/16x16/games-hint.png")); - m_hint_action = game_menu->addAction(hint_icon, tr("Hint"), m_board, SLOT(hint()), tr("H")); - + m_hint_action = game_menu->addAction(fetchIcon("games-hint"), tr("Hint"), m_board, SLOT(hint()), tr("H")); game_menu->addSeparator(); - - QIcon scores_icon(QPixmap(":/22x22/games-highscores.png")); - scores_icon.addPixmap(QPixmap(":/16x16/games-highscores.png")); - game_menu->addAction(scores_icon, tr("High Scores"), m_scores, SLOT(exec())); - + game_menu->addAction(fetchIcon("games-highscores"), tr("High Scores"), m_scores, SLOT(exec())); game_menu->addSeparator(); - - QIcon config_icon(QPixmap(":/22x22/games-config-options.png")); - config_icon.addPixmap(QPixmap(":/16x16/games-config-options.png")); - game_menu->addAction(config_icon, tr("Settings"), m_settings, SLOT(exec())); - + game_menu->addAction(fetchIcon("games-config-options"), tr("Settings"), m_settings, SLOT(exec())); game_menu->addSeparator(); - - QIcon quit_icon(QPixmap(":/22x22/application-exit.png")); - quit_icon.addPixmap(QPixmap(":/16x16/application-exit.png")); - game_menu->addAction(quit_icon, tr("Quit"), this, SLOT(close()), tr("Ctrl+Q")); + game_menu->addAction(fetchIcon("application-exit"), tr("Quit"), this, SLOT(close()), tr("Ctrl+Q")); QMenu* view_menu = menuBar()->addMenu(tr("View")); - - QIcon zoom_in_icon(QPixmap(":/22x22/zoom-in.png")); - zoom_in_icon.addPixmap(QPixmap(":/16x16/zoom-in.png")); - QAction* zoom_in_action = view_menu->addAction(zoom_in_icon, tr("Zoom In"), m_board, SLOT(zoomIn()), tr("Ctrl++")); + QAction* zoom_in_action = view_menu->addAction(fetchIcon("zoom-in"), tr("Zoom In"), m_board, SLOT(zoomIn()), tr("Ctrl++")); connect(m_board, SIGNAL(zoomInAvailable(bool)), zoom_in_action, SLOT(setEnabled(bool))); - - QIcon zoom_out_icon(QPixmap(":/22x22/zoom-out.png")); - zoom_out_icon.addPixmap(QPixmap(":/16x16/zoom-out.png")); - QAction* zoom_out_action = view_menu->addAction(zoom_out_icon, tr("Zoom Out"), m_board, SLOT(zoomOut()), tr("Ctrl+-")); + QAction* zoom_out_action = view_menu->addAction(fetchIcon("zoom-out"), tr("Zoom Out"), m_board, SLOT(zoomOut()), tr("Ctrl+-")); connect(m_board, SIGNAL(zoomOutAvailable(bool)), zoom_out_action, SLOT(setEnabled(bool))); QMenu* help_menu = menuBar()->addMenu(tr("Help")); - help_menu->addAction(tr("About"), this, SLOT(about())); - help_menu->addAction(tr("About &Qt"), qApp, SLOT(aboutQt())); + help_menu->addAction(fetchIcon("help-about"), tr("About"), this, SLOT(about())); + help_menu->addAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), qApp, SLOT(aboutQt())); // Create toolbar QToolBar* toolbar = new QToolBar(this); @@ -193,12 +179,12 @@ void Window::initActions() void Window::about() { QMessageBox::about(this, tr("About CuteMaze"), tr( - "<center>" - "<big>CuteMaze 1.0.2</big> " + "<center><big>CuteMaze 1.0.2</big> " "A top-down maze game " - "Copyright © 2007-2009 Graeme Gott " - "Toolbar icons are from <a href=\"http://www.oxygen-icons.org/\">Oyxgen</a>" - "</center>" + "Copyright © 2007-2009 Graeme Gott " + "Released under the <a href=\"http://www.gnu.org/licenses/gpl.html\">GPL 3</a> license</center>" + "<center>Icons are from the <a href=\"http://www.oxygen-icons.org/\">Oxygen</a> theme " + "Used under the <a href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL 3</a> license</center>" )); } src/window.cpp icons/16x16/application-exit.png icons/16x16/document-new.png icons/16x16/games-config-options.png icons/16x16/games-highscores.png icons/16x16/games-hint.png icons/16x16/media-playback-pause.png icons/16x16/zoom-in.png icons/16x16/zoom-out.png icons/22x22/application-exit.png icons/22x22/document-new.png icons/22x22/games-config-options.png icons/22x22/games-highscores.png icons/22x22/games-hint.png icons/22x22/media-playback-pause.png icons/22x22/zoom-in.png icons/22x22/zoom-out.png 276d4609dd21bd9858f3377a7c4d06466f5eed0b Graeme Gott graeme@gottcode.org http://github.com/gottcode/cutemaze/commit/971563ea4a9269d2b9fc7eef5c2b24541ffbe1bf 971563ea4a9269d2b9fc7eef5c2b24541ffbe1bf

2009-09-21T08:23:53-07:00

2009-09-18T10:46:12-07:00

Add proper Oxygen attribution. 16b3492a99e253d3e3e6376ee2d350e27fea5b02 Graeme Gott graeme@gottcode.org