icons/cutemaze.desktop @@ -1,3 +1,6 @@ +2008-05-25 Graeme Gott <graeme@gottcode.org> + * Improve statusbar message handling. + 2008-03-20 Graeme Gott <graeme@gottcode.org> * Tag version 1.0.1. * Relicense to GPLv3. ChangeLog @@ -1,29 +1,28 @@ Installation ============ -Open a terminal and browse into the extracted "cutemaze" folder. +Open a terminal and browse into the extracted folder. Linux: 1.) Type 'qmake' to configure the program. If you would like to install the - program somewhere other than /usr, pass a new value for PREFIX during - configuration: 'qmake PREFIX=/opt'. + program somewhere other than /usr/local, pass a new value for PREFIX + during configuration: 'qmake PREFIX=/opt'. 2.) Type 'make' to compile the program. - 3.) Become root (type 'su') and type 'make install' to install the program. + 3.) Type 'sudo make install' to install the program. -Windows: - 1.) Type 'qmake' to configure the program. +Mac OS X: + 1.) Type 'qmake -spec macx-g++' to configure the program. 2.) Type 'make' to compile the program. - 3.) Type 'windows_deploy' to copy the program and its required libraries - into a subfolder named "CuteMaze". + 3.) Type './mac_deploy.sh' to create a disk image of the program. -Mac OS X: - 1.) Type 'qmake -spec macx-g++' to configure the program. +Windows: + 1.) Type 'qmake' to configure the program. 2.) Type 'make' to compile the program. - 3.) Type './mac_deploy.sh' to create two disk images of the program, one - with QT bundled and one without. + 3.) Type 'windows_deploy' to copy the program and its required libraries + into a subfolder. README @@ -44,7 +44,7 @@ win32 { unix: !macx { isEmpty(PREFIX) { - PREFIX = /usr + PREFIX = /usr/local } binary.path = $$PREFIX/bin/ @@ -54,7 +54,7 @@ unix: !macx { icon.files = icons/cutemaze.png desktop.path = $$PREFIX/share/applications/ - desktop.files = cutemaze.desktop + desktop.files = icons/cutemaze.desktop INSTALLS += binary icon desktop } cutemaze.pro @@ -1,25 +1,21 @@ #!/bin/bash APP="CuteMaze" -VERSION="1.0.1" +VERSION="1.0.2" BUNDLE="$APP.app" +BUNDLE_FW="$BUNDLE/Contents/Frameworks" EXE="$BUNDLE/Contents/MacOS/CuteMaze" EXE_FW="@executable_path/../Frameworks" QT_FW=`qmake -query QT_INSTALL_LIBS` +QTCORE="QtCore.framework/Versions/4/QtCore" +QTGUI="QtGui.framework/Versions/4/QtGui" +QTXML="QtXml.framework/Versions/4/QtXml" +QTSVG="QtSvg.framework/Versions/4/QtSvg" -# Strip executable strip $EXE -# Create disk image without bundled Qt -echo -n "Creating disk image... " -hdiutil create -quiet -ov -srcfolder $BUNDLE -format UDBZ -volname "$APP" "$APP $VERSION.dmg" -hdiutil internet-enable -quiet -yes "$APP $VERSION.dmg" -echo "Done" - -# Copy Frameworks echo -n "Copying frameworks... " -BUNDLE_FW="$BUNDLE/Contents/Frameworks" mkdir $BUNDLE_FW cp -R $QT_FW/QtCore.framework $BUNDLE_FW cp -R $QT_FW/QtGui.framework $BUNDLE_FW @@ -27,19 +23,13 @@ cp -R $QT_FW/QtXml.framework $BUNDLE_FW cp -R $QT_FW/QtSvg.framework $BUNDLE_FW echo "Done" -# Set framework names echo -n "Setting framework names... " -QTCORE="QtCore.framework/Versions/4/QtCore" -QTGUI="QtGui.framework/Versions/4/QtGui" -QTXML="QtXml.framework/Versions/4/QtXml" -QTSVG="QtSvg.framework/Versions/4/QtSvg" install_name_tool -id $EXE_FW/$QTCORE $BUNDLE_FW/$QTCORE install_name_tool -id $EXE_FW/$QTGUI $BUNDLE_FW/$QTGUI install_name_tool -id $EXE_FW/$QTXML $BUNDLE_FW/$QTXML install_name_tool -id $EXE_FW/$QTSVG $BUNDLE_FW/$QTSVG echo "Done" -# Update locations in executable echo -n "Updating locations in executable... " install_name_tool -change $QTCORE $EXE_FW/$QTCORE $EXE install_name_tool -change $QTGUI $EXE_FW/$QTGUI $EXE @@ -47,7 +37,6 @@ install_name_tool -change $QTXML $EXE_FW/$QTXML $EXE install_name_tool -change $QTSVG $EXE_FW/$QTSVG $EXE echo "Done" -# Update locations in frameworks echo -n "Updating locations in frameworks... " install_name_tool -change $QTCORE $EXE_FW/$QTCORE $BUNDLE_FW/$QTGUI install_name_tool -change $QTCORE $EXE_FW/$QTCORE $BUNDLE_FW/$QTXML @@ -56,8 +45,7 @@ install_name_tool -change $QTGUI $EXE_FW/$QTGUI $BUNDLE_FW/$QTSVG install_name_tool -change $QTXML $EXE_FW/$QTXML $BUNDLE_FW/$QTSVG echo "Done" -# Create second disk image -echo -n "Creating disk image with bundled Qt... " -hdiutil create -quiet -ov -srcfolder $BUNDLE -format UDBZ -volname "$APP" "$APP Qt $VERSION.dmg" -hdiutil internet-enable -quiet -yes "$APP Qt $VERSION.dmg" +echo -n "Creating disk image... " +hdiutil create -quiet -ov -srcfolder $BUNDLE -format UDBZ -volname "$APP" "${APP}_$VERSION.dmg" +hdiutil internet-enable -quiet -yes "${APP}_$VERSION.dmg" echo "Done" mac_deploy.sh @@ -44,8 +44,6 @@ Board::Board(QMainWindow* parent) m_total_targets(3), m_maze(0), m_show_path(true), - m_show_time(true), - m_show_steps(true), m_smooth_movement(true), m_col_delta(0), m_row_delta(0), @@ -62,9 +60,19 @@ Board::Board(QMainWindow* parent) m_move_animation->setUpdateInterval(25); connect(m_move_animation, SIGNAL(frameChanged(int)), this, SLOT(repaint())); - // Create status message - m_status_message = new QLabel; - parent->statusBar()->addPermanentWidget(m_status_message); + // Create status messages + m_status_time_message = new QLabel; + m_status_time_message->setContentsMargins(10, 0, 10, 0); + parent->statusBar()->addPermanentWidget(m_status_time_message); + + m_status_steps_message = new QLabel; + m_status_steps_message->setContentsMargins(10, 0, 10, 0); + parent->statusBar()->addPermanentWidget(m_status_steps_message); + + m_status_remain_message = new QLabel; + m_status_remain_message->setContentsMargins(10, 0, 10, 0); + parent->statusBar()->addPermanentWidget(m_status_remain_message); + m_status_timer = new QTimer(this); m_status_timer->setInterval(1000); connect(m_status_timer, SIGNAL(timeout()), this, SLOT(updateStatusMessage())); @@ -138,6 +146,7 @@ void Board::newGame() // Show update(); updateStatusMessage(); + m_status_remain_message->setVisible(true); m_paused = false; emit pauseAvailable(true); @@ -148,7 +157,9 @@ void Board::newGame() void Board::loadGame() { - m_status_message->clear(); + m_status_time_message->clear(); + m_status_steps_message->clear(); + m_status_remain_message->clear(); QSettings settings; @@ -187,6 +198,7 @@ void Board::loadGame() // Show update(); updateStatusMessage(); + m_status_remain_message->setVisible(true); // Should not happen, but handle a finished game if (m_targets.isEmpty()) { @@ -235,9 +247,9 @@ void Board::loadSettings() QSettings settings; // Load gameplay settings + m_status_steps_message->setVisible(settings.value("Show Steps", true).toBool()); + m_status_time_message->setVisible(settings.value("Show Time", true).toBool()); m_show_path = settings.value("Show Path", true).toBool(); - m_show_steps = settings.value("Show Steps", true).toBool(); - m_show_time = settings.value("Show Time", true).toBool(); m_smooth_movement = settings.value("Smooth Movement", true).toBool(); // Load player controls @@ -387,22 +399,12 @@ void Board::updateStatusMessage() return; } - QString time; - if (m_show_time) { - QTime t(0, 0, 0); - t = t.addMSecs(m_player_time.elapsed() + m_player_total_time); - time = t.toString("hh:mm:ss"); - } + QTime t(0, 0, 0); + t = t.addMSecs(m_player_time.elapsed() + m_player_total_time); - if (m_show_steps && m_show_time) { - m_status_message->setText(tr("%1 elapsed, %2 steps taken, %3 of %4 targets remaining") .arg(time) .arg(m_player_steps) .arg(m_targets.size()) .arg(m_total_targets)); - } else if (m_show_steps) { - m_status_message->setText(tr("%1 steps taken, %2 of %3 targets remaining") .arg(m_player_steps) .arg(m_targets.size()) .arg(m_total_targets)); - } else if (m_show_time) { - m_status_message->setText(tr("%1 elapsed, %2 of %3 targets remaining") .arg(time) .arg(m_targets.size()) .arg(m_total_targets)); - } else { - m_status_message->setText(tr("%1 of %2 targets remaining") .arg(m_targets.size()) .arg(m_total_targets)); - } + m_status_time_message->setText(tr("%1 elapsed") .arg(t.toString("hh:mm:ss"))); + m_status_steps_message->setText(tr("%1 steps taken") .arg(m_player_steps)); + m_status_remain_message->setText(tr("%1 of %2 targets remain") .arg(m_targets.size()) .arg(m_total_targets)); } // ============================================================================ @@ -508,23 +510,6 @@ void Board::finish() m_status_timer->stop(); update(); - QString time; - if (m_show_time) { - QTime t(0, 0, 0); - t = t.addSecs(seconds); - time = t.toString("hh:mm:ss"); - } - - if (m_show_steps && m_show_time) { - m_status_message->setText(tr("%1 elapsed, %2 steps taken") .arg(time) .arg(m_player_steps)); - } else if (m_show_steps) { - m_status_message->setText(tr("%1 steps taken") .arg(m_player_steps)); - } else if (m_show_time) { - m_status_message->setText(tr("%1 elapsed") .arg(time)); - } else { - m_status_message->setText(tr("Success!")); - } - // Add high score emit finished(m_player_steps, seconds, algorithm, size); } src/board.cpp @@ -72,13 +72,12 @@ private: Maze* m_maze; QPoint m_start; QList<QPoint> m_targets; - QLabel* m_status_message; + QLabel* m_status_time_message; + QLabel* m_status_steps_message; + QLabel* m_status_remain_message; QTimer* m_status_timer; bool m_show_path; - bool m_show_time; - bool m_show_steps; - bool m_smooth_movement; int m_col_delta; int m_row_delta; src/board.h @@ -286,7 +286,7 @@ Window::Window() #else initMenuBar(); #endif - m_pause_action->setShortcut(Qt::Key_P); + m_pause_action->setShortcut(tr("P")); m_pause_action->setCheckable(true); connect(m_pause_action, SIGNAL(toggled(bool)), m_board, SLOT(pauseGame(bool))); connect(m_board, SIGNAL(pauseAvailable(bool)), m_pause_action, SLOT(setEnabled(bool))); @@ -348,9 +348,9 @@ void Window::closeEvent(QCloseEvent* event) void Window::initMenuBar() { QMenu* game_menu = menuBar()->addMenu(tr("Game")); - game_menu->addAction(tr("New Game"), m_board, SLOT(newGame()), tr("Ctrl+N")); - m_pause_action = game_menu->addAction(tr("Pause Game")); - game_menu->addAction(tr("High Scores"), m_scores, SLOT(show()), tr("Ctrl+H")); + game_menu->addAction(tr("New"), m_board, SLOT(newGame()), tr("Ctrl+N")); + m_pause_action = game_menu->addAction(tr("Pause")); + game_menu->addAction(tr("Scores"), m_scores, SLOT(show())); game_menu->addAction(tr("Settings"), m_settings, SLOT(show())); game_menu->addAction(tr("Quit"), this, SLOT(close()), tr("Ctrl+Q")); } @@ -380,10 +380,8 @@ void Window::initToolBar() action = toolbar->addAction(icons.at(0), tr("New"), m_board, SLOT(newGame())); action->setShortcut(tr("Ctrl+N")); m_pause_action = toolbar->addAction(icons.at(1), tr("Pause")); - action = toolbar->addAction(icons.at(2), tr("Scores"), m_scores, SLOT(show())); - action->setShortcut(tr("Ctrl+H")); - action = toolbar->addAction(icons.at(3), tr("Settings"), m_settings, SLOT(show())); - action->setShortcut(tr("Ctrl+S")); + toolbar->addAction(icons.at(2), tr("Scores"), m_scores, SLOT(show())); + toolbar->addAction(icons.at(3), tr("Settings"), m_settings, SLOT(show())); action = toolbar->addAction(icons.at(4), tr("Quit"), this, SLOT(close())); action->setShortcut(tr("Ctrl+Q")); addToolBar(toolbar); src/window.cpp @@ -1,5 +1,4 @@ MKDIR CuteMaze -STRIP release\CuteMaze.exe COPY release\CuteMaze.exe CuteMaze COPY %QTDIR%\bin\mingwm10.dll CuteMaze COPY %QTDIR%\bin\QtCore4.dll CuteMaze windows_deploy.bat cutemaze.desktop 9101f392d81447be77c18c3b07fc18e0b7d22821 Graeme Gott graeme@gottcode.org http://github.com/gottcode/cutemaze/commit/863c61a92c005b80aeb630e1ee8f57782d965b75 863c61a92c005b80aeb630e1ee8f57782d965b75 2008-06-16T14:10:21-07:00 2008-06-16T14:10:21-07:00 Improve statusbar message handling. 161eaa75b57bb9889fc4ed7672a53435e021ebf4 Graeme Gott graeme@gottcode.org