diff -Nru cutemaze-1.1.0/CREDITS cutemaze-1.1.1/CREDITS --- cutemaze-1.1.0/CREDITS 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/CREDITS 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,38 @@ +Developers +---------- +* Graeme Gott + + +Translations +------------ +German: +* Danny Krug + +Polish: +* michtrz (M T) + +Portuguese (Brazil): +* Enrico Nicoletto + +Romanian: +* Jaff (Oprea Nicolae) + +Russian: +* Artem Krosheninnikov + +Spanish: +* Edgar Carballo + +Turkish: +* Özcan Zafer AYAN +* Yusuf Kayan + + +Icons +----- +* Oxygen, http://www.oxygen-icons.org/ + + +Libraries +--------- +* Qt, http://qt-project.org/ diff -Nru cutemaze-1.1.0/ChangeLog cutemaze-1.1.1/ChangeLog --- cutemaze-1.1.0/ChangeLog 2009-09-21 15:24:52.000000000 +0000 +++ cutemaze-1.1.1/ChangeLog 2014-02-03 23:05:27.000000000 +0000 @@ -1,275 +1,341 @@ -2009-09-21 Graeme Gott - * Tag version 1.1.0. +commit 05dcd76606747e0d3571bb3b846c729d261d5ab4 +Author: Graeme Gott +Date: 2014-02-03 -2009-09-19 Graeme Gott - * Improve settings dialog code. - * Add saved game version check. - * Add new game dialog. - -2009-09-18 Graeme Gott - * Make pause behavior consistent across platforms. - * FIXED: Scores were not sorted correctly. - * FIXED: Success message was off-center. - * Add proper Oxygen attribution. - * Save and restore window position. - -2009-09-17 Graeme Gott - * FIXED: Player could always request hint. - * Improve rendering code. - -2009-06-20 Graeme Gott - * Add zoom support. - -2009-03-16 Graeme Gott - * Use only one scoreboard. - -2009-03-15 Graeme Gott - * Use menubar and toolbar on all platforms. - * Embed Oxygen icons. - -2009-03-14 Graeme Gott - * Add hint support to board class. - * Add solver class. - -2009-03-07 Graeme Gott - * Add path class. - -2009-03-03 Graeme Gott - * Improve dialog text. - * Use one SVG file per theme. - * Always pause game when focus is lost. - * Rewrite algorithm for placing targets. - -2008-08-12 Graeme Gott - * Tag version 1.0.2. - * FIXED: Settings dialog was inaccessible in KDE. - * Load correct icons in GNOME 2, KDE 3, and KDE 4. - -2008-06-17 Graeme Gott - * FIXED: Binary not installed with make install. - -2008-05-31 Alessandro Briosi - * Ported to Qtopia4. - -2008-05-25 Graeme Gott - * Improve statusbar message handling. - -2008-03-20 Graeme Gott - * Tag version 1.0.1. - * Relicense to GPLv3. - -2008-02-15 Graeme Gott - * Tag version 1.0. - * FIXED: Themes were not installing on the Mac. - -2008-02-13 Graeme Gott - * FIXED: Theme loading did not work on the Mac. - * Use menubar on the Mac. - -2008-02-12 Graeme Gott - * Add Mac support. - -2008-02-03 Graeme Gott - * Tag version 0.9.4. - -2008-02-02 Graeme Gott - * FIXED: Controls set to modifier keys showed boxes in settings dialog. - -2008-01-31 Graeme Gott - * Detect archive formats. - * Add ability to install and uninstall themes. - -2008-01-23 Graeme Gott - * Tag version 0.9.3. - -2008-01-22 Graeme Gott - * Add Windows support. - -2008-01-21 Graeme Gott - * Tag version 0.9.2. - -2008-01-20 Graeme Gott - * Speed up implementation of Kruskal's algorithm. - * Speed up implementation of Prim's algorithm. - -2008-01-18 Graeme Gott - * Speed up maze generation. - -2008-01-17 Graeme Gott - * FIXED: Native icon detection missed any KDE not installed in /usr. - * FIXED: Theme switching was not working with cached SVG's. - -2008-01-16 Graeme Gott - * FIXED: Corrupted games prompted user twice. - * FIXED: High scores was not using username. - * Speed up rendering. - -2008-01-15 Graeme Gott - * Tag version 0.9.1. - -2008-01-13 Graeme Gott - * FIXED: Native icon detection missed user installed themes. - -2008-01-11 Graeme Gott - * FIXED: Long generation of a maze with targets covering half (or more). - -2008-01-10 Graeme Gott - * FIXED: Targets could be stacked on each other. - * FIXED: Setting more than 10 targets was ignored. - -2008-01-07 Graeme Gott - * Tag version 0.9. - -2008-01-06 Graeme Gott - * FIXED: Pause was not always working properly. - * FIXED: Native icon detection sometimes missed icons. - * Pause game when focus is lost. - -2008-01-05 Graeme Gott - * Resize to show all scores. - * Pause while score board is open. - * Show steps taken and time elapsed after game is over. - * Speed up native icon detection. - * Start new games in unpaused state. - * Add high score board. - -2008-01-01 Graeme Gott - * Add smooth movement. - * FIXED: Cancelling settings showed finished game contents. - * Stop using seed value to determine if game is done. - -2007-12-31 Graeme Gott - * Simplify native icon detection. - * Add option to hide path markers. - -2007-12-30 Graeme Gott - * Add option to hide steps taken. - * Add option to hide time elapsed. - * Pause game when settings dialog is shown. - * FIXED: Closing the settings revealed a paused game. - * FIXED: Resizing the window revealed a paused game. - -2007-12-29 Graeme Gott - * FIXED: Pausing and then quitting increased time. - * Track time elapsed. - * Track player's steps. - * FIXED: Did not remove a target if the player was saved on it. - -2007-12-28 Graeme Gott - * Use native icons. - -2007-12-22 Graeme Gott - * Add window icon. - * Show algorithm previews. - -2007-12-20 Graeme Gott - * Tag version 0.8. - -2007-12-19 Graeme Gott - * Add install commands. - * Add desktop file. - -2007-12-17 Graeme Gott - * Allow overriding of theme files. - * Add Penguin theme. - -2007-12-16 Graeme Gott - * Add Mouse theme. - -2007-12-14 Graeme Gott - * Inform user when unable to load old game. - * Add prompt for new game. - * Rotate player on key press. - * Read themes from $XDG_DATA_DIRS/games/maze. - * Add complete theme support. - * Render theme preview dynamically. - * Move renderer code to theme class. - * Remove duplicated code in maze algorithms. - -2007-12-13 Graeme Gott - * Use configurable maze generation algorithm. - * Use configurable maze size. - * Use configurable target count. - * Load and save new maze settings. - * Load and save control key settings. - * Add control button class. - -2007-12-12 Graeme Gott - * Use preview image from theme. - * FIXED: Path marker was dropped even if you didn't move. - * Add setting control keys. - -2007-12-11 Graeme Gott - * Add settings dialog. - * Simplify new renderer. - * Add Kruskal's algorithm. - -2007-12-10 Graeme Gott - * Add Hunt and Kill algorithm. - * Add Recursive Backtracker algorithm. - * Integrate stack algorithms. - * Add Stack 2,5 algorithms. - -2007-12-09 Graeme Gott - * Add Stack 1,3,4 algorithms. - * Add Prim's algorithm. - * Clean up maze class. - * Remove old game classes. - * Add new/load/save functions to board class. - * Create new renderer. - -2007-12-08 Graeme Gott - * Create board class. - * Switch from menubar to toolbar. - * Split out window code from game class. - -2007-12-07 Graeme Gott - * Convert corners to SVG. - * Convert walls to SVG. - * Load themes as individual SVG files. - -2007-12-06 Graeme Gott - * Convert to SVG rendering. - * Show entire maze when game is finished. - * FIXED: Target list was covered up by status messages. - * Remember window size. - * FIXED: View was incorrect size on start. - -2007-12-05 Graeme Gott - * FIXED: Menubar was hidden by game area. - * FIXED: Statusbar disappeared on resize. - * List number of targets remaining. - * Autosave every 5 minutes. - * Allow player to drop flags. - * Add marker at start. - * Save progress on program close. - * Add back cell class. - -2007-12-04 Graeme Gott - * Save seed across runs. - * Make messages prettier. - * FIXED: Menubar was covered by view. - * FIXED: Could not resize view to fill window. - -2007-12-03 Graeme Gott - * Switch path markers from dots to arrows. - * Allow window resizing. - * Zoom in and follow player. - * Show loading and success messages. - * Add menubar. - * Replace target class with function call. - * Add developer walk-through-walls cheat. - -2007-12-02 Graeme Gott - * Fetching all targets generates a new maze. - * Add target class. - * Add trail behind player. - * Add player class. - * Add maze to QGraphicsScene. - -2007-12-01 Graeme Gott - * Switch to Stack algorithm. - * Create maze class. - * Implement Prim's algorithm. - * Create cell class. - * Initial project layout. + Bump version number. + +commit 52f203b60e5429ccfb15fca2fe8e82a1d97c3b9a +Author: Graeme Gott +Date: 2014-02-03 + + FIXED: Could not interact with board on the Mac. + +commit 294f76a10107ead418df4235fca4236ea3ec8b00 +Author: Graeme Gott +Date: 2014-02-03 + + Add NSIS installer for Windows. + +commit 7eb3a733fb05a69e627a83bf8823f397edcf92ef +Author: Graeme Gott +Date: 2014-02-03 + + Add README file. + +commit 3cd3bbc311b2a9ff3097cc32a7f343c8af5ea1b8 +Author: Graeme Gott +Date: 2014-02-03 + + Replace ChangeLog with NEWS file. + +commit 2f82abeb85410d7fe9c394c7378b161f9c7cb068 +Author: Graeme Gott +Date: 2014-02-03 + + Update build system. + +commit 755a6a2ae3a5c65192fa4b4240b5e7de8fc0dea8 +Author: Graeme Gott +Date: 2014-02-03 + + Sync translations with Transifex. + +commit f081ac69066214c6fa70564d506f154fed1b11bc +Author: Graeme Gott +Date: 2014-02-03 + + Update copyright year. + +commit 8a837cfcf2e794a22253580a264335194435b42b +Author: Graeme Gott +Date: 2013-02-07 + + Improve desktop file. + +commit b19b5b2bb7c2287632027a6b243692a918e362bc +Author: Graeme Gott +Date: 2013-02-07 + + Update locale dialog. + +commit ab462dbbd4f768549aac08a1ab4658bf26f9884b +Author: Graeme Gott +Date: 2012-12-24 + + Add support for compiling with Qt 5.0.0. + +commit 2f638212132a2a1db72911898e8befb6c1dbe7c8 +Author: Graeme Gott +Date: 2012-11-19 + + Move data to DataLocation of QDesktopServices. + +commit 154a917e380950df2b2dd2ad49de10f6657aa7cb +Author: Graeme Gott +Date: 2012-11-18 + + Sync translations with Transifex. + +commit abff099f3a3c0eb9514e5c5eb02b2baad5f0decb +Author: Graeme Gott +Date: 2012-06-18 + + Update translations. + +commit 95d72db9610506906f854cf3cea7972c34640365 +Author: Graeme Gott +Date: 2012-06-09 + + Update locale dialog. + +commit 7242f685ec43cc85be352c39b47187d832149924 +Author: Graeme Gott +Date: 2012-05-29 + + Improve about dialog. + +commit 416da0d2fd08c30dfef462b7292623da663bfeb0 +Author: Graeme Gott +Date: 2012-05-29 + + Update deployment scripts. + +commit c5e96caa77393d76995f02c269b51df4d4945d2f +Author: Graeme Gott +Date: 2012-05-28 + + Add locale dialog. + +commit ca160c66b7f11ce4ae3e632c32015e2c0a467cde +Author: Graeme Gott +Date: 2012-05-28 + + Make sure to show all settings. + +commit d0b23ad08eb59c4164a9c3e3f37bde624f3182a6 +Author: Graeme Gott +Date: 2012-05-28 + + Remove Qtopia support. + +commit c1a0341b9cbd9c5a68acf175e6f238940c687846 +Author: Graeme Gott +Date: 2012-05-27 + + Use git revision ID as version number. + +commit 29104760cb015d92e5da33a44ba05d94392af2f0 +Author: Graeme Gott +Date: 2009-10-14 + + Support more platforms. + +commit 3271821a8bfaf24ba87cdf1d869bab0dae4ea502 +Author: Graeme Gott +Date: 2009-09-21 + + Tag version 1.1.0 + +commit 014544f1ab71c989cd64a77b908f4541eaaec63f +Author: Graeme Gott +Date: 2009-09-19 + + Improve settings dialog code. + +commit 65eb41af9532e59394dfcd9e2bf9184df2fbd340 +Author: Graeme Gott +Date: 2009-09-19 + + Add saved game version check. + +commit e6179cf831af20a1db19d977fb6d25c6b2e14bbd +Author: Graeme Gott +Date: 2009-09-19 + + Add new game dialog. + +commit 602f42b573dd6418c95198f9d84544cf6cf3fc6d +Author: Graeme Gott +Date: 2009-09-18 + + Make pause behavior consistent across platforms. + +commit 7bde29f0dc356abaec821346672bf3eeadfa788c +Author: Graeme Gott +Date: 2009-09-18 + + FIXED: Scores were not sorted correctly. + +commit 715156d604d8c7ea1edeeef97e07aaff14430bf9 +Author: Graeme Gott +Date: 2009-09-18 + + FIXED: Success message was off-center. + +commit 971563ea4a9269d2b9fc7eef5c2b24541ffbe1bf +Author: Graeme Gott +Date: 2009-09-18 + + Add proper Oxygen attribution. + +commit 276d4609dd21bd9858f3377a7c4d06466f5eed0b +Author: Graeme Gott +Date: 2009-09-18 + + Save and restore window position. + +commit 0ab98b3b5f8b0b921c522a2d5aff593ea48f7365 +Author: Graeme Gott +Date: 2009-09-17 + + Simplify code to show times. + +commit a9e5b7cf6e382c00d34d8176ca9ecc8db0aa163a +Author: Graeme Gott +Date: 2009-09-17 + + FIXED: Player could always request hint. + +commit 0e37f5d36f2c5685387085f8d4f1925c9f56c40a +Author: Graeme Gott +Date: 2009-09-17 + + Improve rendering code. + +commit bb942959579cd278308c318ac1e6e57383dd5e9c +Author: Graeme Gott +Date: 2009-06-20 + + Add zoom support. + +commit 57e7986dc6025e77df2882db8b60f1fecc794d05 +Author: Graeme Gott +Date: 2009-03-16 + + Use only one scoreboard. + +commit 6bfade37fe5fc26e01988f358726fe08e5af514b +Author: Graeme Gott +Date: 2009-03-15 + + Use menubar and toolbar on all platforms. + +commit 030706cdfee9411fa1e4b10143b58bd748c2df37 +Author: Graeme Gott +Date: 2009-03-14 + + Add hint support. + +commit 147631c7c28a3bd7b89acf88abf0be9c16cedccf +Author: Graeme Gott +Date: 2009-03-04 + + FIXED: Hunt and Kill algorithm didn't show preview. + +commit 62390f974c0055ac5c53ad62d0b68a693b022a79 +Author: Graeme Gott +Date: 2009-03-04 + + Use qgetenv instead of getenv. + +commit 8a08c0cf6854b024e15d6085ef3f75b9517b8e21 +Author: Graeme Gott +Date: 2009-03-04 + + Use QChars instead of QStrings when possible. + +commit def91294b8171639a64b38c802598bc513160070 +Author: Graeme Gott +Date: 2009-03-04 + + Remove unused function parameters. + +commit e6cfb1603ab6d9755859ec6028247b92974017fb +Author: Graeme Gott +Date: 2009-03-04 + + Always use const references in foreach loops. + +commit e008f0376e6329dd1fa450857c95d852afa6a76d +Author: Graeme Gott +Date: 2009-03-03 + + Improve dialog text. + +commit 3fe828b279de755bd47d2f47c34081817c2ec503 +Author: Graeme Gott +Date: 2009-03-03 + + Use one SVG file per theme. + +commit 17445ef12ad9ecd388eb022f830cc918f9e55268 +Author: Graeme Gott +Date: 2009-03-03 + + Always pause game when focus is lost. + +commit 9882ebd87ae670c77a44d9b6420248f9b03ce526 +Author: Graeme Gott +Date: 2009-03-03 + + Rewrite algorithm for placing targets. + +commit 364a81e30645947e7b50a5e195ef0960e168526f +Author: Graeme Gott +Date: 2008-08-12 + + Update ChangeLog. + +commit a5b99459c222781c609ac064ce1f99ae976684ce +Author: Graeme Gott +Date: 2008-08-12 + + * FIXED: Settings dialog was inaccessible in KDE. + +commit 5356b1280619c2dee8b6d04d891e4bb99d05ef3a +Author: Graeme Gott +Date: 2008-08-12 + + * Load correct icons in GNOME 2, KDE 3, and KDE 4. + +commit 9c5719820393b1fe707941e79bd635ddd02f7d4c +Author: Graeme Gott +Date: 2008-06-25 + + Remove close button in scores dialog for Qtopia4. + +commit 2169bb88b0f2d069ac4ba0557c09a156bc0b751a +Author: Graeme Gott +Date: 2008-06-25 + + Enable quit for Qtopia4. + +commit 3b654341e097ff44972cd1397829ceba2ddc22a3 +Author: Graeme Gott +Date: 2008-06-25 + + Enable configuration buttons for Qtopia4. + +commit 4cceeeab3d920903ba31a03141f05e17582a0f35 +Author: Graeme Gott +Date: 2008-06-21 + + Ported to Qtopia4 + +commit 863c61a92c005b80aeb630e1ee8f57782d965b75 +Author: Graeme Gott +Date: 2008-06-16 + + Improve statusbar message handling. + +commit 9101f392d81447be77c18c3b07fc18e0b7d22821 +Author: Graeme Gott +Date: 2008-06-16 + + Added a git-ignore. + +commit 2f37b67d260ad8d7e4b97a0a5ae750d48b5342b4 +Author: Graeme Gott +Date: 2008-06-16 + + Initial commit v1.0.1 diff -Nru cutemaze-1.1.0/INSTALL cutemaze-1.1.1/INSTALL --- cutemaze-1.1.0/INSTALL 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/INSTALL 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,31 @@ +Installation +============ + +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/local, pass a new value for PREFIX + during configuration: 'qmake PREFIX=/opt'. If you would like to place + the program under a different subfolder, pass a new value for BINDIR + during configuration: 'qmake PREFIX=/opt BINDIR=games'. + + 2.) Type 'make' to compile the program. + + 3.) Type 'sudo make install' to install the program. + +Mac OS X: + 1.) Type 'qmake -spec macx-g++' to configure the program. + + 2.) Type 'make' to compile the program. + + 3.) Type './mac_deploy.sh' to create a disk image of the program. + +Windows: + 1.) Type 'qmake' to configure the program. + + 2.) Type 'make' to compile the program. + + 3.) Type 'windows_deploy' to create a compressed image of the program. Note + that you must have the 7z executable from 7-zip.org in your %PATH% for + this to work. diff -Nru cutemaze-1.1.0/NEWS cutemaze-1.1.1/NEWS --- cutemaze-1.1.0/NEWS 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/NEWS 2014-02-03 23:33:40.000000000 +0000 @@ -0,0 +1,55 @@ +1.1.1 +===== +- Added dialog to switch translation. +- Added support for Qt 5. +- Removed Qtopia support. +- Translation updates: French, German, Hebrew, Polish, Portugese (Brazil), + Romanian, Russian, Spanish, Turkish. + +1.1.0 +===== +- Added hint support. +- Added zooming. +- Improved background rendering. +- Rewrote code for placing targets. +- Bug fixes. + +1.0.2 +===== +- Ported by Alessandro Briosi to Qtopia4. +- Improved statusbar message layout. +- Bug fixes. + +1.0.1 +===== +- Relicensed to GPLv3. + +1.0.0 +===== +- Added Mac support. +- Minor bug fixes. + +0.9.4 +===== +- Add and remove themes in game. + +0.9.3 +===== +- Added Windows support. + +0.9.2 +===== +- Faster maze rendering. +- Faster maze creation. + +0.9.1 +===== +- Fixed bugs with large numbers of targets. + +0.9 +=== +- Added option to show number of steps taken. +- Added option to show time elapsed. +- Added high score board. +- Added algorithm previews. +- Added smooth player movement. diff -Nru cutemaze-1.1.0/README cutemaze-1.1.1/README --- cutemaze-1.1.0/README 2009-09-21 15:24:52.000000000 +0000 +++ cutemaze-1.1.1/README 2014-02-03 22:57:23.000000000 +0000 @@ -1,28 +1,16 @@ -Installation -============ +About +===== -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/local, pass a new value for PREFIX - during configuration: 'qmake PREFIX=/opt'. - - 2.) Type 'make' to compile the program. - - 3.) Type 'sudo make install' to install the program. - -Mac OS X: - 1.) Type 'qmake -spec macx-g++' to configure the program. - - 2.) Type 'make' to compile the program. - - 3.) Type './mac_deploy.sh' to create a disk image of the program. - -Windows: - 1.) Type 'qmake' 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. +CuteMaze is a simple, top-down game in which mazes are randomly generated +using one of a choice of several different algorithms. You move the character +through the maze while hunting for targets (cheese, by default)--the game is +won once all of these targets have been picked up. + +Features + +* Showing the amount of time and steps it has taken to play the maze (optional) +* "Bread crumb" trail to show you where you've already been (optional) +* Flag system which allows you to mark and later un-mark any square on the board +* Hints that direct you to the closest target +* Zooming out to see more of the maze +* SVG themes (two themes come with the game) diff -Nru cutemaze-1.1.0/cutemaze.pro cutemaze-1.1.1/cutemaze.pro --- cutemaze-1.1.0/cutemaze.pro 2009-09-21 15:24:52.000000000 +0000 +++ cutemaze-1.1.1/cutemaze.pro 2014-02-03 23:34:04.000000000 +0000 @@ -1,19 +1,16 @@ -TEMPLATE = app -QT += svg -CONFIG += warn_on release -macx { - # Uncomment the following line to compile on PowerPC Macs - # QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk - CONFIG += x86 ppc +lessThan(QT_VERSION, 4.6) { + error("FocusWriter requires Qt 4.6 or greater") } -qws { - qtopia_project(qtopia app) +TEMPLATE = app +greaterThan(QT_MAJOR_VERSION, 4) { + QT += widgets } +QT += svg +CONFIG += warn_on -MOC_DIR = build -OBJECTS_DIR = build -RCC_DIR = build +VERSION = 1.1.1 +DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" unix: !macx { TARGET = cutemaze @@ -23,6 +20,7 @@ HEADERS = src/board.h \ src/cell.h \ + src/locale_dialog.h \ src/maze.h \ src/new_game_dialog.h \ src/path.h \ @@ -34,6 +32,7 @@ SOURCES = src/board.cpp \ src/cell.cpp \ + src/locale_dialog.cpp \ src/main.cpp \ src/maze.cpp \ src/new_game_dialog.cpp \ @@ -44,6 +43,8 @@ src/theme.cpp \ src/window.cpp +TRANSLATIONS = $$files(translations/cutemaze_*.ts) + RESOURCES = icons/icons.qrc themes/theme.qrc preview/preview.qrc macx { ICON = icons/cutemaze.icns @@ -56,21 +57,20 @@ isEmpty(PREFIX) { PREFIX = /usr/local } + isEmpty(BINDIR) { + BINDIR = bin + } + + target.path = $$PREFIX/$$BINDIR/ icon.files = icons/cutemaze.png + icon.path = $$PREFIX/share/icons/hicolor/48x48/apps + desktop.files = icons/cutemaze.desktop + desktop.path = $$PREFIX/share/applications/ - qws { - target.path = /bin/ - icon.path = /pics/cutemaze - icon.hint = pics - desktop.path = /apps/Games - desktop.hint = desktop - } else { - target.path = $$PREFIX/bin/ - icon.path = $$PREFIX/share/icons/hicolor/48x48/apps - desktop.path = $$PREFIX/share/applications/ - } + qm.files = translations/*.qm + qm.path = $$PREFIX/share/cutemaze/translations - INSTALLS += target icon desktop + INSTALLS += target icon desktop qm } diff -Nru cutemaze-1.1.0/debian/changelog cutemaze-1.1.1/debian/changelog --- cutemaze-1.1.0/debian/changelog 2013-06-25 16:59:13.000000000 +0000 +++ cutemaze-1.1.1/debian/changelog 2014-02-04 00:01:13.000000000 +0000 @@ -1,3 +1,14 @@ +cutemaze (1.1.1-0ppa1~saucy1) saucy; urgency=low + + * Update to 1.1.1 + - Added dialog to switch translation. + - Added support for Qt 5. + - Removed Qtopia support. + - Translation updates: French, German, Hebrew, Polish, Portugese (Brazil), + Romanian, Russian, Spanish, Turkish. + + -- Graeme Gott Mon, 03 Feb 2014 23:49:57 +0000 + cutemaze (1.1.0-0ppa1~saucy1) saucy; urgency=low * Initial release diff -Nru cutemaze-1.1.0/debian/compat cutemaze-1.1.1/debian/compat --- cutemaze-1.1.0/debian/compat 2013-06-25 16:56:34.000000000 +0000 +++ cutemaze-1.1.1/debian/compat 2013-06-26 12:28:41.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru cutemaze-1.1.0/debian/control cutemaze-1.1.1/debian/control --- cutemaze-1.1.0/debian/control 2013-06-25 16:56:15.000000000 +0000 +++ cutemaze-1.1.1/debian/control 2013-06-26 12:28:47.000000000 +0000 @@ -2,7 +2,7 @@ Section: games Priority: optional Maintainer: Graeme Gott -Build-Depends: debhelper (>= 8), libqt4-dev, imagemagick +Build-Depends: debhelper (>= 9), libqt4-dev, imagemagick Standards-Version: 3.9.3 Homepage: http://gottcode.org/cutemaze/ diff -Nru cutemaze-1.1.0/debian/patches/path.patch cutemaze-1.1.1/debian/patches/path.patch --- cutemaze-1.1.0/debian/patches/path.patch 2010-05-05 16:42:20.000000000 +0000 +++ cutemaze-1.1.1/debian/patches/path.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/cutemaze.pro -+++ b/cutemaze.pro -@@ -67,7 +67,7 @@ - desktop.path = /apps/Games - desktop.hint = desktop - } else { -- target.path = $$PREFIX/bin/ -+ target.path = $$PREFIX/games/ - icon.path = $$PREFIX/share/icons/hicolor/48x48/apps - desktop.path = $$PREFIX/share/applications/ - } diff -Nru cutemaze-1.1.0/debian/patches/series cutemaze-1.1.1/debian/patches/series --- cutemaze-1.1.0/debian/patches/series 2010-05-05 14:30:31.000000000 +0000 +++ cutemaze-1.1.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -path.patch diff -Nru cutemaze-1.1.0/icons/cutemaze.desktop cutemaze-1.1.1/icons/cutemaze.desktop --- cutemaze-1.1.0/icons/cutemaze.desktop 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/icons/cutemaze.desktop 2014-02-03 22:57:23.000000000 +0000 @@ -1,7 +1,24 @@ [Desktop Entry] Name=CuteMaze +Name[de]=CuteMaze +Name[es]=CuteMaze +Name[he]=CuteMaze +Name[pl]=CuteMaze +Name[pt_BR]=CuteMaze +Name[ro]=CuteMaze +Name[ru]=CuteMaze +Name[tr]=CuteMaze +GenericName=Simple Maze Game +GenericName[de]=Ein einfaches Labyrinth-Spiel +GenericName[es]=Juego de laberinto sencillo +GenericName[he]=משחק מבוך פשוט +GenericName[pl]=Prosta gra labiryntu +GenericName[pt_BR]=Um jogo simples de labirinto +GenericName[ro]=Simplu joc labirint +GenericName[ru]=Простая игра-лабиринт +GenericName[tr]=Basit Labirent Oyunu Exec=cutemaze Icon=cutemaze Terminal=false Type=Application -Categories=Qt;Game; +Categories=Qt;Game;LogicGame; diff -Nru cutemaze-1.1.0/icons/icons.qrc cutemaze-1.1.1/icons/icons.qrc --- cutemaze-1.1.0/icons/icons.qrc 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/icons/icons.qrc 2014-02-03 22:57:23.000000000 +0000 @@ -9,6 +9,7 @@ oxygen/16x16/games-hint.png oxygen/16x16/help-about.png oxygen/16x16/media-playback-pause.png + oxygen/16x16/preferences-desktop-locale.png oxygen/16x16/zoom-in.png oxygen/16x16/zoom-out.png @@ -19,6 +20,7 @@ oxygen/22x22/games-hint.png oxygen/22x22/help-about.png oxygen/22x22/media-playback-pause.png + oxygen/22x22/preferences-desktop-locale.png oxygen/22x22/zoom-in.png oxygen/22x22/zoom-out.png Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/icons/oxygen/16x16/preferences-desktop-locale.png and /tmp/2Ys85cZaNU/cutemaze-1.1.1/icons/oxygen/16x16/preferences-desktop-locale.png differ Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/icons/oxygen/22x22/preferences-desktop-locale.png and /tmp/2Ys85cZaNU/cutemaze-1.1.1/icons/oxygen/22x22/preferences-desktop-locale.png differ Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/icons/oxygen/scalable/preferences-desktop-locale.svgz and /tmp/2Ys85cZaNU/cutemaze-1.1.1/icons/oxygen/scalable/preferences-desktop-locale.svgz differ Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/mac/background.png and /tmp/2Ys85cZaNU/cutemaze-1.1.1/mac/background.png differ diff -Nru cutemaze-1.1.0/mac/locversion.plist cutemaze-1.1.1/mac/locversion.plist --- cutemaze-1.1.0/mac/locversion.plist 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/mac/locversion.plist 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,15 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + ???? + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff -Nru cutemaze-1.1.0/mac_deploy.sh cutemaze-1.1.1/mac_deploy.sh --- cutemaze-1.1.0/mac_deploy.sh 2009-09-21 15:24:52.000000000 +0000 +++ cutemaze-1.1.1/mac_deploy.sh 2014-02-03 23:34:04.000000000 +0000 @@ -2,7 +2,125 @@ APP='CuteMaze' BUNDLE="$APP.app" -VERSION='1.1.0' +VERSION='1.1.1' -macdeployqt $BUNDLE -dmg -no-plugins -mv "$APP.dmg" "${APP}_$VERSION.dmg" +# Remove any previous disk folder or DMG +echo -n 'Preparing... ' +rm -f "${APP}_$VERSION.dmg" +if [ -e "/Volumes/${APP}" ]; then + hdiutil detach -quiet "/Volumes/${APP}" +fi +rm -Rf "$APP" +echo 'Done' + +# Create disk folder +echo -n 'Copying application bundle... ' +mkdir "$APP" +cp -Rpf "$BUNDLE" "$APP/" +strip "$APP/$BUNDLE/Contents/MacOS/$APP" +cp COPYING "$APP/License.txt" +cp CREDITS "$APP/Credits.txt" +echo 'Done' + +# Copy translations +echo -n 'Copying translations... ' +TRANSLATIONS="$APP/$BUNDLE/Contents/Resources/translations" +mkdir "$TRANSLATIONS" +cp -Rpf translations/*.qm "$TRANSLATIONS" +echo 'Done' + +# Copy Qt translations +echo -n 'Copying Qt translations... ' +for translation in $(ls translations | grep qm | cut -d'.' -f1 | cut -d'_' -f2- | uniq) +do + LPROJ="$APP/$BUNDLE/Contents/Resources/${translation}.lproj" + mkdir "$LPROJ" + sed "s/????/${translation}/" < 'mac/locversion.plist' > "${LPROJ}/locversion.plist" + + QT_TRANSLATION="${QTDIR}/translations/qt_${translation}.qm" + if [ -e "$QT_TRANSLATION" ]; then + cp -f "$QT_TRANSLATION" "$TRANSLATIONS" + fi + + QT_TRANSLATION="${QTDIR}/translations/qt_${translation:0:2}.qm" + if [ -e "$QT_TRANSLATION" ]; then + cp -f "$QT_TRANSLATION" "$TRANSLATIONS" + fi +done +echo 'Done' + +# Copy frameworks and plugins +echo -n 'Copying frameworks and plugins... ' +macdeployqt "$APP/$BUNDLE" +# Remove QML copied in by macdeployqt with >= 4.7.2 +rm -Rf "$APP/$BUNDLE/Contents/Frameworks/QtDeclarative.framework" +rm -Rf "$APP/$BUNDLE/Contents/Frameworks/QtScript.framework" +rm -Rf "$APP/$BUNDLE/Contents/Frameworks/QtSql.framework" +rm -Rf "$APP/$BUNDLE/Contents/Frameworks/QtXmlPatterns.framework" +rm -Rf "$APP/$BUNDLE/Contents/PlugIns/qmltooling" +echo 'Done' + +# Copy background +echo -n 'Copying background... ' +mkdir "${APP}/.background" +cp 'mac/background.png' "${APP}/.background/background.png" +echo 'Done' + +# Create disk image +echo -n 'Creating disk image... ' +hdiutil create -quiet -srcfolder "${APP}" -volname "${APP}" -fs HFS+ -format UDRW 'temp.dmg' +echo 'Done' + +echo -n 'Configuring disk image... ' +hdiutil attach -quiet -readwrite -noverify -noautoopen 'temp.dmg' +echo ' + tell application "Finder" + tell disk "'${APP}'" + open + + tell container window + set the bounds to {400, 100, 949, 458} + set current view to icon view + set toolbar visible to false + set statusbar visible to true + set the bounds to {400, 100, 800, 420} + end tell + + set viewOptions to the icon view options of container window + tell viewOptions + set arrangement to not arranged + set icon size to 80 + set label position to bottom + set shows icon preview to true + set shows item info to false + end tell + set background picture of viewOptions to file ".background:background.png" + + make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"} + set position of item "'${BUNDLE}'" of container window to {90, 90} + set position of item "Applications" of container window to {310, 90} + set position of item "Credits.txt" of container window to {140, 215} + set position of item "License.txt" of container window to {260, 215} + close + open + + update without registering applications + delay 5 + end tell + end tell +' | osascript +chmod -Rf go-w "/Volumes/${APP}" >& /dev/null +sync +hdiutil detach -quiet "/Volumes/${APP}" +echo 'Done' + +echo -n 'Compressing disk image... ' +hdiutil convert -quiet 'temp.dmg' -format UDBZ -o "${APP}_${VERSION}.dmg" +hdiutil internet-enable -quiet -yes "${APP}_${VERSION}.dmg" +rm -f temp.dmg +echo 'Done' + +# Clean up disk folder +echo -n 'Cleaning up... ' +rm -Rf "$APP" +echo 'Done' diff -Nru cutemaze-1.1.0/src/board.cpp cutemaze-1.1.1/src/board.cpp --- cutemaze-1.1.0/src/board.cpp 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/src/board.cpp 2014-02-03 23:33:16.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2007-2009 Graeme Gott + * Copyright (C) 2007, 2008, 2009, 2012, 2014 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,9 +59,8 @@ m_hint(-1, -1), m_hint_angle(0) { -#if !defined(QTOPIA_PHONE) setMinimumSize(448, 448); -#endif + setFocusPolicy(Qt::StrongFocus); m_move_animation = new QTimeLine(100, this); m_move_animation->setFrameRange(0, 3); @@ -72,18 +71,15 @@ // 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); - -#if !defined(QTOPIA_PHONE) - parent->statusBar()->addPermanentWidget(m_status_time_message); - parent->statusBar()->addPermanentWidget(m_status_steps_message); parent->statusBar()->addPermanentWidget(m_status_remain_message); -#endif m_status_timer = new QTimer(this); m_status_timer->setInterval(1000); @@ -147,9 +143,7 @@ // Show update(); updateStatusMessage(); -#if !defined(QTOPIA_PHONE) m_status_remain_message->setVisible(true); -#endif m_paused = false; emit pauseAvailable(true); @@ -204,9 +198,7 @@ // Show update(); updateStatusMessage(); -#if !defined(QTOPIA_PHONE) m_status_remain_message->setVisible(true); -#endif // Should not happen, but handle a finished game if (m_targets.isEmpty()) { @@ -308,10 +300,8 @@ m_zoom = qMax(m_zoom, 5); // Load gameplay settings -#if !defined(QTOPIA_PHONE) m_status_steps_message->setVisible(settings.value("Show Steps", true).toBool()); m_status_time_message->setVisible(settings.value("Show Time", true).toBool()); -#endif m_show_path = settings.value("Show Path", true).toBool(); m_smooth_movement = settings.value("Smooth Movement", true).toBool(); diff -Nru cutemaze-1.1.0/src/locale_dialog.cpp cutemaze-1.1.1/src/locale_dialog.cpp --- cutemaze-1.1.0/src/locale_dialog.cpp 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/src/locale_dialog.cpp 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,186 @@ +/*********************************************************************** + * + * Copyright (C) 2010, 2011, 2012, 2013 Graeme Gott + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + ***********************************************************************/ + +#include "locale_dialog.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//----------------------------------------------------------------------------- + +QString LocaleDialog::m_current; +QString LocaleDialog::m_path; +QString LocaleDialog::m_appname; + +//----------------------------------------------------------------------------- + +LocaleDialog::LocaleDialog(QWidget* parent) : + QDialog(parent, Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint) +{ + QString title = parent ? parent->window()->windowTitle() : QString(); + setWindowTitle(!title.isEmpty() ? title : QCoreApplication::applicationName()); + + QLabel* text = new QLabel(tr("Select application language:"), this); + + m_translations = new QComboBox(this); + m_translations->addItem(tr("")); + QString translation; + QStringList translations = findTranslations(); + foreach (translation, translations) { + if (translation.startsWith("qt")) { + continue; + } + translation.remove(m_appname); + m_translations->addItem(languageName(translation), translation); + } + int index = qMax(0, m_translations->findData(m_current)); + m_translations->setCurrentIndex(index); + + QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this); + connect(buttons, SIGNAL(accepted()), this, SLOT(accept())); + connect(buttons, SIGNAL(rejected()), this, SLOT(reject())); + + QVBoxLayout* layout = new QVBoxLayout(this); + layout->setSizeConstraint(QLayout::SetFixedSize); + layout->addWidget(text); + layout->addWidget(m_translations); + layout->addWidget(buttons); +} + +//----------------------------------------------------------------------------- + +void LocaleDialog::loadTranslator(const QString& name, const QStringList& datadirs) +{ + m_appname = name; + + // Find translator path + QStringList paths = datadirs; + if (paths.isEmpty()) { + QString appdir = QCoreApplication::applicationDirPath(); + paths.append(appdir); + paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower()); + paths.append(appdir + "/../Resources"); + } + foreach (const QString& path, paths) { + if (QFile::exists(path + "/translations/")) { + m_path = path + "/translations/"; + break; + } + } + + // Find current locale + m_current = QSettings().value("Locale/Language").toString(); + QString current = !m_current.isEmpty() ? m_current : QLocale::system().name(); + QStringList translations = findTranslations(); + if (!translations.contains(m_appname + current)) { + current = current.left(2); + if (!translations.contains(m_appname + current)) { + current.clear(); + } + } + if (!current.isEmpty()) { + QLocale::setDefault(current); + } else { + current = "en"; + } + + // Load translators + static QTranslator qt_translator; + if (translations.contains("qt_" + current) || translations.contains("qt_" + current.left(2))) { + qt_translator.load("qt_" + current, m_path); + } else { + qt_translator.load("qt_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + } + QCoreApplication::installTranslator(&qt_translator); + + static QTranslator translator; + translator.load(m_appname + current, m_path); + QCoreApplication::installTranslator(&translator); +} + +//----------------------------------------------------------------------------- + +QString LocaleDialog::languageName(const QString& language) +{ + QString lang_code = language.left(5); + QLocale locale(lang_code); + QString name; +#if (QT_VERSION >= QT_VERSION_CHECK(4,8,0)) + if (lang_code.length() > 2) { + if (locale.name() == lang_code) { + name = locale.nativeLanguageName() + " (" + locale.nativeCountryName() + ")"; + } else { + name = locale.nativeLanguageName() + " (" + language + ")"; + } + } else { + name = locale.nativeLanguageName(); + } + if (locale.textDirection() == Qt::RightToLeft) { + name.prepend(QChar(0x202b)); + } +#else + if (lang_code.length() > 2) { + if (locale.name() == lang_code) { + name = QLocale::languageToString(locale.language()) + " (" + QLocale::countryToString(locale.country()) + ")"; + } else { + name = QLocale::languageToString(locale.language()) + " (" + language + ")"; + } + } else { + name = QLocale::languageToString(locale.language()); + } +#endif + return name; +} + +//----------------------------------------------------------------------------- + +QStringList LocaleDialog::findTranslations() +{ + QStringList result = QDir(m_path, "*.qm").entryList(QDir::Files); + result.replaceInStrings(".qm", ""); + return result; +} + +//----------------------------------------------------------------------------- + +void LocaleDialog::accept() +{ + int current = m_translations->findData(m_current); + if (current == m_translations->currentIndex()) { + return reject(); + } + QDialog::accept(); + + m_current = m_translations->itemData(m_translations->currentIndex()).toString(); + QSettings().setValue("Locale/Language", m_current); + QMessageBox::information(this, tr("Note"), tr("Please restart this application for the change in language to take effect."), QMessageBox::Ok); +} + +//----------------------------------------------------------------------------- diff -Nru cutemaze-1.1.0/src/locale_dialog.h cutemaze-1.1.1/src/locale_dialog.h --- cutemaze-1.1.0/src/locale_dialog.h 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/src/locale_dialog.h 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,81 @@ +/*********************************************************************** + * + * Copyright (C) 2010, 2011, 2012, 2013 Graeme Gott + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + ***********************************************************************/ + +#ifndef CUTEMAZE_LOCALE_DIALOG_H +#define CUTEMAZE_LOCALE_DIALOG_H + +#include +class QComboBox; + +/** + * Dialog to set application language. + * + * This class handles setting the application language when the application is + * launched, as well as allowing the user to choose a different language for + * future launches. + */ +class LocaleDialog : public QDialog +{ + Q_OBJECT + +public: + /** + * Construct a dialog to choose application language. + * + * @param parent the parent widget of the dialog + */ + LocaleDialog(QWidget* parent = 0); + + /** + * Load the stored language into the application; defaults to system language. + * + * @param appname application name to prepend to translation filenames + * @param datadirs locations to search for directory containing translations + */ + static void loadTranslator(const QString& appname, const QStringList& datadirs = QStringList()); + + /** + * Fetch native language name for QLocale name. + * + * @param language QLocale name to look up + * @return translated language name + */ + static QString languageName(const QString& language); + +public slots: + /** Override parent function to store application language. */ + void accept(); + +private: + /** + * Fetch list of application translations. + * + * @return list of QLocale names + */ + static QStringList findTranslations(); + +private: + QComboBox* m_translations; /**< list of found translations */ + + static QString m_current; /**< stored application language */ + static QString m_path; /**< location of translations; found in loadTranslator() */ + static QString m_appname; /**< application name passed to loadTranslator() */ +}; + +#endif // CUTEMAZE_LOCALE_DIALOG_H diff -Nru cutemaze-1.1.0/src/main.cpp cutemaze-1.1.1/src/main.cpp --- cutemaze-1.1.0/src/main.cpp 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/src/main.cpp 2014-02-03 22:57:23.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2007-2008 Graeme Gott + * Copyright (C) 2007, 2008, 2012 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,36 +17,22 @@ * ***********************************************************************/ +#include "locale_dialog.h" #include "window.h" -#if defined(QTOPIA_PHONE) -#include -QTOPIA_ADD_APPLICATION(QTOPIA_TARGET,Window) -QTOPIA_MAIN -#else - #include -#include -#include int main(int argc, char** argv) { QApplication app(argc, argv); app.setApplicationName("CuteMaze"); - app.setApplicationVersion("1.1.0"); + app.setApplicationVersion(VERSIONSTR); app.setOrganizationDomain("gottcode.org"); app.setOrganizationName("GottCode"); - QTranslator qt_translator; - qt_translator.load("qt_" + QLocale::system().name()); - app.installTranslator(&qt_translator); - - QTranslator cutemaze_translator; - cutemaze_translator.load("cutemaze_" + QLocale::system().name()); - app.installTranslator(&cutemaze_translator); + LocaleDialog::loadTranslator("cutemaze_"); Window window; window.show(); return app.exec(); } -#endif diff -Nru cutemaze-1.1.0/src/maze.cpp cutemaze-1.1.1/src/maze.cpp --- cutemaze-1.1.0/src/maze.cpp 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/src/maze.cpp 2014-02-03 22:57:23.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2007-2008 Graeme Gott + * Copyright (C) 2007, 2008, 2012 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #include "maze.h" +#include #include namespace { diff -Nru cutemaze-1.1.0/src/maze.h cutemaze-1.1.1/src/maze.h --- cutemaze-1.1.0/src/maze.h 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/src/maze.h 2014-02-03 22:57:23.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2007-2008 Graeme Gott + * Copyright (C) 2007, 2008, 2012 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include "cell.h" #include +#include #include #include @@ -74,7 +75,7 @@ virtual void generate(); typedef QList Set; - QList m_sets; + QLinkedList m_sets; QVector< QVector > m_set_ids; }; diff -Nru cutemaze-1.1.0/src/new_game_dialog.cpp cutemaze-1.1.1/src/new_game_dialog.cpp --- cutemaze-1.1.0/src/new_game_dialog.cpp 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/src/new_game_dialog.cpp 2014-02-03 22:57:23.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2007-2009 Graeme Gott + * Copyright (C) 2007, 2008, 2009, 2012 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,12 +34,6 @@ { setWindowTitle(tr("New Game")); -#if !defined(QTOPIA_PHONE) - QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this); - connect(buttons, SIGNAL(accepted()), this, SLOT(accept())); - connect(buttons, SIGNAL(rejected()), this, SLOT(reject())); -#endif - // Create widgets m_mazes_preview = new QLabel(this); @@ -62,6 +56,10 @@ m_mazes_size = new QSpinBox(this); m_mazes_size->setRange(10, 99); + QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this); + connect(buttons, SIGNAL(accepted()), this, SLOT(accept())); + connect(buttons, SIGNAL(rejected()), this, SLOT(reject())); + // Load settings QSettings settings; int algorithm = settings.value("New/Algorithm", 4).toInt(); @@ -78,9 +76,7 @@ QVBoxLayout* layout = new QVBoxLayout(this); layout->addLayout(contents_layout); -#if !defined(QTOPIA_PHONE) layout->addWidget(buttons); -#endif } // ============================================================================ diff -Nru cutemaze-1.1.0/src/scores.cpp cutemaze-1.1.1/src/scores.cpp --- cutemaze-1.1.0/src/scores.cpp 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/src/scores.cpp 2014-02-03 22:57:23.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2008-2009 Graeme Gott + * Copyright (C) 2008, 2009, 2012 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -107,16 +107,18 @@ m_board->setColumnCount(5); m_board->setHeaderLabels(QStringList() << tr("Name") << tr("Score") << tr("Time") << tr("Steps") << tr("Algorithm") << tr("Size")); m_board->header()->setStretchLastSection(false); +#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0)) + m_board->header()->setSectionResizeMode(QHeaderView::ResizeToContents); +#else m_board->header()->setResizeMode(QHeaderView::ResizeToContents); +#endif layout->addWidget(m_board); -#if !defined(QTOPIA_PHONE) layout->addSpacing(12); QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Close, Qt::Horizontal, this); connect(buttons, SIGNAL(rejected()), this, SLOT(reject())); layout->addWidget(buttons); -#endif read(); } @@ -135,7 +137,6 @@ // Get player's name QString name; -#if !defined(QTOPIA_PHONE) #if defined(Q_OS_UNIX) { passwd* pws = getpwuid(geteuid()); @@ -160,9 +161,6 @@ if (!ok || name.isEmpty()) { return; } -#else - name = "root"; -#endif // Create score QTreeWidgetItem* score = new Score(seconds, steps, algorithm, size); diff -Nru cutemaze-1.1.0/src/settings.cpp cutemaze-1.1.1/src/settings.cpp --- cutemaze-1.1.0/src/settings.cpp 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/src/settings.cpp 2014-02-03 22:57:23.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2007-2009 Graeme Gott + * Copyright (C) 2007, 2008, 2009, 2012 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,11 +23,10 @@ #include #include +#include #include #include -#if !defined(QTOPIA_PHONE) #include -#endif #include #include #include @@ -54,6 +53,8 @@ path += "/games/cutemaze"; #elif defined(Q_OS_WIN32) QString path = QDir::homePath() + "/Application Data/GottCode/CuteMaze"; +#else + QString path = QDesktopServices::storageLocation(QDesktopServices::DataLocation); #endif return path; } @@ -192,19 +193,15 @@ m_theme = new Theme; QTabWidget* tabs = new QTabWidget(this); -#if !defined(QTOPIA_PHONE) QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this); connect(buttons, SIGNAL(accepted()), this, SLOT(accept())); connect(buttons, SIGNAL(rejected()), this, SLOT(reject())); -#endif QVBoxLayout* layout = new QVBoxLayout(this); layout->setMargin(10); layout->setSpacing(18); layout->addWidget(tabs); -#if !defined(QTOPIA_PHONE) layout->addWidget(buttons); -#endif // Create Gameplay tab @@ -215,10 +212,6 @@ m_gameplay_steps = new QCheckBox(tr("Show number of steps taken"), gameplay_tab); m_gameplay_time = new QCheckBox(tr("Show elapsed time"), gameplay_tab); m_gameplay_smooth = new QCheckBox(tr("Smooth movement"), gameplay_tab); -#if defined(QTOPIA_PHONE) - m_gameplay_steps->hide(); - m_gameplay_time->hide(); -#endif QFormLayout* gameplay_layout = new QFormLayout(gameplay_tab); gameplay_layout->addRow(m_gameplay_path); @@ -258,7 +251,6 @@ themes_selector_layout->setMargin(0); themes_selector_layout->addWidget(m_themes_selector, 1); -#if !defined(QTOPIA_PHONE) QPushButton* add_button = new QPushButton(tr("Add"), themes_tab); connect(add_button, SIGNAL(clicked()), this, SLOT(addTheme())); m_themes_remove_button = new QPushButton(tr("Remove"), themes_tab); @@ -266,7 +258,6 @@ themes_selector_layout->addWidget(add_button, 0); themes_selector_layout->addWidget(m_themes_remove_button, 0); -#endif QVBoxLayout* themes_layout = new QVBoxLayout(themes_tab); themes_layout->addWidget(m_themes_preview, 1, Qt::AlignCenter); @@ -317,9 +308,7 @@ if (!theme.isEmpty()) { m_theme->load(theme); generatePreview(); -#if !defined(QTOPIA_PHONE) m_themes_remove_button->setEnabled(QFileInfo(homeDataPath() + '/' + theme + ".svg").exists()); -#endif } } @@ -328,11 +317,7 @@ void Settings::addTheme() { // Select theme file -#if !defined(QTOPIA_PHONE) QString path = QFileDialog::getOpenFileName(this, tr("Select Theme File"), QDir::homePath(), QString("*.svg")); -#else - QString path; -#endif if (path.isEmpty()) { return; } diff -Nru cutemaze-1.1.0/src/theme.cpp cutemaze-1.1.1/src/theme.cpp --- cutemaze-1.1.0/src/theme.cpp 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/src/theme.cpp 2014-02-03 22:57:23.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2007-2009 Graeme Gott + * Copyright (C) 2007, 2008, 2009, 2012 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,7 @@ #include "theme.h" #include +#include #include #include #include @@ -68,7 +69,6 @@ #if defined(Q_OS_MAC) m_locations.append(QDir::homePath() + "/Library/Application Support/GottCode/CuteMaze"); m_locations.append("/Library/Application Support/GottCode/CuteMaze"); - m_locations.append(":/games/cutemaze"); #elif defined(Q_OS_UNIX) QString xdg; xdg = qgetenv("$XDG_DATA_HOME"); @@ -88,8 +88,10 @@ #elif defined(Q_OS_WIN32) m_locations.append(QDir::homePath() + "/Application Data/GottCode/CuteMaze"); m_locations.append(QCoreApplication::applicationDirPath() + "/Themes"); - m_locations.append(":/games/cutemaze"); +#else + m_locations.append(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); #endif + m_locations.append(":/games/cutemaze"); } // ============================================================================ @@ -104,7 +106,7 @@ QStringList Theme::available() const { QSet files; - QDir dir(QString(), "*.svg"); + QDir dir("", "*.svg"); foreach (const QString& path, m_locations) { if (dir.cd(path)) { files += dir.entryList(QDir::Files).toSet(); @@ -190,7 +192,7 @@ if (angle == 4) { angle = 0; } - painter.drawPixmap(column * 3 * m_unit, row * 3 * m_unit, m_pixmap_rotated[element][angle]); + painter.drawPixmap(column * 3 * m_unit, row * 3 * m_unit, m_pixmap_rotated[element][angle]); } // ============================================================================ diff -Nru cutemaze-1.1.0/src/window.cpp cutemaze-1.1.1/src/window.cpp --- cutemaze-1.1.0/src/window.cpp 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/src/window.cpp 2014-02-03 22:57:23.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2007-2009 Graeme Gott + * Copyright (C) 2007, 2008, 2009, 2012, 2014 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,7 @@ #include "window.h" #include "board.h" +#include "locale_dialog.h" #include "new_game_dialog.h" #include "scores.h" #include "settings.h" @@ -30,20 +31,15 @@ #include #include #include +#include #include #include #include #include #include #include -#include - -#if defined(QTOPIA_PHONE) -#include -#else -#include #include -#endif +#include // ============================================================================ @@ -51,7 +47,7 @@ { QIcon icon(QString(":/oxygen/22x22/%1.png").arg(name)); icon.addFile(QString(":/oxygen/16x16/%1.png").arg(name)); - return icon; + return QIcon::fromTheme(name, icon); } // ============================================================================ @@ -65,9 +61,6 @@ m_board = new Board(this); setCentralWidget(m_board); m_board->setFocus(); -#if defined(QTOPIA_PHONE) - connect(qApp, SIGNAL(aboutToQuit()), m_board, SLOT(saveGame())); -#endif // Create scores window m_scores = new Scores(this); @@ -83,9 +76,7 @@ // Setup window setWindowTitle(tr("CuteMaze")); -#if !defined(QTOPIA_PHONE) restoreGeometry(QSettings().value("Geometry").toByteArray()); -#endif // Create auto-save timer QTimer *timer = new QTimer(this); @@ -128,41 +119,33 @@ void Window::initActions() { -#if defined(QTOPIA_PHONE) - QMenu* game_menu = QSoftMenuBar::menuFor(this); - - game_menu->addAction(tr("Quit Game"), qApp, SLOT(quit())); - game_menu->addAction(tr("Settings"), this, SLOT(showSettings())); - m_hint_action = game_menu->addAction(tr("Hint"), m_board, SLOT(hint())); - game_menu->addAction(tr("High Scores"), m_scores, SLOT(exec())); - m_pause_action = game_menu->addAction(tr("Pause Game")); - game_menu->addAction(tr("New Game"), this, SLOT(newGame())); -#else // Create menubar #if defined(Q_OS_MAC) qApp->setAttribute(Qt::AA_DontShowIconsInMenus); #endif - QMenu* game_menu = menuBar()->addMenu(tr("Game")); - QAction* new_action = game_menu->addAction(fetchIcon("document-new"), tr("New"), this, SLOT(newGame()), tr("Ctrl+N")); - m_pause_action = game_menu->addAction(fetchIcon("media-playback-pause"), tr("Pause")); + QMenu* game_menu = menuBar()->addMenu(tr("&Game")); + QAction* new_action = game_menu->addAction(fetchIcon("document-new"), tr("&New"), this, SLOT(newGame()), tr("Ctrl+N")); + m_pause_action = game_menu->addAction(fetchIcon("media-playback-pause"), tr("&Pause")); m_pause_action->setShortcut(tr("P")); - m_hint_action = game_menu->addAction(fetchIcon("games-hint"), 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(); - game_menu->addAction(fetchIcon("games-highscores"), tr("High Scores"), m_scores, SLOT(exec())); + game_menu->addAction(fetchIcon("games-highscores"), tr("High &Scores"), m_scores, SLOT(exec())); game_menu->addSeparator(); - game_menu->addAction(fetchIcon("games-config-options"), tr("Settings"), this, SLOT(showSettings())); - game_menu->addSeparator(); - game_menu->addAction(fetchIcon("application-exit"), 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")); - QAction* zoom_in_action = view_menu->addAction(fetchIcon("zoom-in"), 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))); - QAction* zoom_out_action = view_menu->addAction(fetchIcon("zoom-out"), 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(fetchIcon("help-about"), tr("About"), this, SLOT(about())); + QMenu* settings_menu = menuBar()->addMenu(tr("&Settings")); + settings_menu->addAction(fetchIcon("preferences-desktop-locale"), tr("Application &Language..."), this, SLOT(setLocale())); + settings_menu->addAction(fetchIcon("games-config-options"), tr("&Preferences..."), this, SLOT(showSettings())); + + QMenu* help_menu = menuBar()->addMenu(tr("&Help")); + 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 @@ -179,21 +162,20 @@ toolbar->addAction(zoom_out_action); addToolBar(toolbar); setContextMenuPolicy(Qt::NoContextMenu); -#endif } // ============================================================================ void Window::about() { - QMessageBox::about(this, tr("About"), tr( - "

%1 %2
" - "A top-down maze game
" - "Copyright © 2007-2009 Graeme Gott
" - "Released under the GPL 3 license

" - "

Icons are from the Oxygen theme
" - "Used under the LGPL 3 license

" - ).arg(QCoreApplication::applicationName()).arg(QCoreApplication::applicationVersion())); + QMessageBox::about(this, tr("About"), QString("

%1 %2
%3
%4
%5

%6
%7

") + .arg(tr("CuteMaze"), QCoreApplication::applicationVersion(), + tr("A top-down maze game"), + tr("Copyright © 2007-%1 Graeme Gott").arg("2014"), + tr("Released under the GPL 3 license").arg("\"http://www.gnu.org/licenses/gpl.html\""), + tr("Icons are from the Oxygen theme").arg("\"http://www.oxygen-icons.org/\""), + tr("Used under the LGPL 3 license").arg("\"http://www.gnu.org/licenses/lgpl.html\"")) + ); } // ============================================================================ @@ -216,3 +198,11 @@ } // ============================================================================ + +void Window::setLocale() +{ + LocaleDialog dialog; + dialog.exec(); +} + +// ============================================================================ diff -Nru cutemaze-1.1.0/src/window.h cutemaze-1.1.1/src/window.h --- cutemaze-1.1.0/src/window.h 2009-09-21 15:24:51.000000000 +0000 +++ cutemaze-1.1.1/src/window.h 2014-02-03 22:57:23.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2007-2009 Graeme Gott + * Copyright (C) 2007,2008, 2009, 2012 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,6 +40,7 @@ void about(); void newGame(); void showSettings(); + void setLocale(); private: void initActions(); Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/translations/cutemaze_de.qm and /tmp/2Ys85cZaNU/cutemaze-1.1.1/translations/cutemaze_de.qm differ diff -Nru cutemaze-1.1.0/translations/cutemaze_de.ts cutemaze-1.1.1/translations/cutemaze_de.ts --- cutemaze-1.1.0/translations/cutemaze_de.ts 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/translations/cutemaze_de.ts 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,538 @@ + + + + + Board + + + Sorry + Sorry + + + + Unable to load previous game. A new game will be started. + Das vorherige Spiel konnte nicht geladen werden. Ein neues Spiel wird gestartet. + + + + %1 elapsed + %1 verstrichen + + + + %1 steps taken + %1 Schritte genommen + + + + %1 of %2 targets remain + %1 von %2 Zielen verbleiben + + + + Success + Geschafft + + + + Paused + Pausiert + + + + ControlButton + + + Shift + Shift + + + + Ctrl + Strg + + + + Meta + Meta + + + + Alt + Alt + + + + Super + Super + + + + Windows + Windows + + + + Command + Command + + + + Control + Control + + + + Option + Optionen + + + + LocaleDialog + + + Select application language: + Wähle eine Sprache + + + + <System Language> + <Systemsprache> + + + + Note + Notiz + + + + Please restart this application for the change in language to take effect. + Bitte starte die Anwendung neu damit die Änderungen wirksam werden. + + + + NewGameDialog + + + New Game + Neues Spiel + + + + Hunt and Kill + Jage und Töte + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Recursive Backtracker + + + + Stack + Stapel + + + + Stack 2 + Stapel 2 + + + + Stack 3 + Stapel 3 + + + + Stack 4 + Stapel 4 + + + + Stack 5 + Stapel 5 + + + + Algorithm: + Algorithmus: + + + + Targets: + Ziele: + + + + Size: + Größe: + + + + QLabel + + + Hunt and Kill + Jage und Töte + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Recursive Backtracker + + + + Stack + Stapel + + + + Stack 2 + Stapel 2 + + + + Stack 3 + Stapel 3 + + + + Stack 4 + Stapel 4 + + + + Stack 5 + Stapel 5 + + + + Scores + + + CuteMaze Scores + CuteMaze Punkte + + + + Name + Name + + + + Score + Punkte + + + + Time + Zeit + + + + Steps + Schritte + + + + Algorithm + Algorithmen + + + + Size + Größe + + + + Congratulations! + Gratulation! + + + + Your score has made the top ten. +Please enter your name: + Du hast es in die Top 10 geschafft. +Bitte trege deinen Namen ein: + + + + Settings + + + Settings + Einstellungen + + + + Game + Spiel + + + + Show where you've been + Zeige wo du warst + + + + Show number of steps taken + Zeige die Anzahl an genommenen Schritten + + + + Show elapsed time + Zeige verstrichene Zeit + + + + Smooth movement + sanfte Bewegung + + + + Controls + Steuerung + + + + Move Up: + Hoch: + + + + Move Down: + Runter: + + + + Move Left: + Links: + + + + Move Right: + Rechts: + + + + Toggle Flag: + Toggle Flagge + + + + Themes + Themes + + + + Add + Hinzufügen + + + + Remove + Entfernen + + + + Select Theme File + Wähle Theme + + + + + + Sorry + Sorry + + + + Unable to create data folder. + Konnte keinen Data Ordner erstellen. + + + + Unable to copy theme file. + Konnte die Theme Datei nicht kopieren. + + + + Question + Frage + + + + Remove the selected theme? + Das gewählte Theme entfernen? + + + + Unable to remove the selected theme. + Kann das gewählte Theme nicht entfernen. + + + + Window + + + + CuteMaze + CuteMaze + + + + Ctrl+N + Strg+N + + + + P + P + + + + H + H + + + + Ctrl+Q + Strg+Q + + + + View + Ansicht + + + + Ctrl++ + Strg++ + + + + Ctrl+- + Strg+- + + + + About + Über + + + + About &Qt + Über &Qt + + + + &Game + &Spiel + + + + &New + &Neu + + + + &Pause + &Pause + + + + &Hint + &Tipp + + + + High &Scores + High &Scores + + + + &Quit + &Beenden + + + + Zoom &In + Zoom &Rein + + + + Zoom &Out + Zoom &Raus + + + + &Settings + &Einstellungen + + + + Application &Language... + Programm &Sprache + + + + &Preferences... + &Voreinstellungen + + + + &Help + &Hilfe + + + + &About + &Über + + + + A top-down maze game + Ein Top-Down Labyrinth Spiel + + + + Copyright &copy; 2007-%1 Graeme Gott + copyright &cop; 2007-%1 Graeme Gott + + + + Released under the <a href=%1>GPL 3</a> license + Veröffentlicht unter der <a href=%1>GPL 3</a> Lizenz + + + + Icons are from the <a href=%1>Oxygen</a> theme + Icons entstammen dem <a href=%1>Oxygen</a> Theme + + + + Used under the <a href=%1>LGPL 3</a> license + Unter der <a href=%1>LGPL 3</a> Lizenz genutzt + + + Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/translations/cutemaze_en.qm and /tmp/2Ys85cZaNU/cutemaze-1.1.1/translations/cutemaze_en.qm differ diff -Nru cutemaze-1.1.0/translations/cutemaze_en.ts cutemaze-1.1.1/translations/cutemaze_en.ts --- cutemaze-1.1.0/translations/cutemaze_en.ts 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/translations/cutemaze_en.ts 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,537 @@ + + + + + Board + + + Sorry + + + + + Unable to load previous game. A new game will be started. + + + + + %1 elapsed + + + + + %1 steps taken + + + + + %1 of %2 targets remain + + + + + Success + + + + + Paused + + + + + ControlButton + + + Shift + + + + + Ctrl + + + + + Meta + + + + + Alt + + + + + Super + + + + + Windows + + + + + Command + + + + + Control + + + + + Option + + + + + LocaleDialog + + + Select application language: + + + + + <System Language> + + + + + Note + + + + + Please restart this application for the change in language to take effect. + + + + + NewGameDialog + + + New Game + + + + + Hunt and Kill + + + + + Kruskal + + + + + Prim + + + + + Recursive Backtracker + + + + + Stack + + + + + Stack 2 + + + + + Stack 3 + + + + + Stack 4 + + + + + Stack 5 + + + + + Algorithm: + + + + + Targets: + + + + + Size: + + + + + QLabel + + + Hunt and Kill + + + + + Kruskal + + + + + Prim + + + + + Recursive Backtracker + + + + + Stack + + + + + Stack 2 + + + + + Stack 3 + + + + + Stack 4 + + + + + Stack 5 + + + + + Scores + + + CuteMaze Scores + + + + + Name + + + + + Score + + + + + Time + + + + + Steps + + + + + Algorithm + + + + + Size + + + + + Congratulations! + + + + + Your score has made the top ten. +Please enter your name: + + + + + Settings + + + Settings + + + + + Game + + + + + Show where you've been + + + + + Show number of steps taken + + + + + Show elapsed time + + + + + Smooth movement + + + + + Controls + + + + + Move Up: + + + + + Move Down: + + + + + Move Left: + + + + + Move Right: + + + + + Toggle Flag: + + + + + Themes + + + + + Add + + + + + Remove + + + + + Select Theme File + + + + + + + Sorry + + + + + Unable to create data folder. + + + + + Unable to copy theme file. + + + + + Question + + + + + Remove the selected theme? + + + + + Unable to remove the selected theme. + + + + + Window + + + + CuteMaze + + + + + Ctrl+N + + + + + P + + + + + H + + + + + Ctrl+Q + + + + + View + + + + + Ctrl++ + + + + + Ctrl+- + + + + + About + + + + + About &Qt + + + + + &Game + + + + + &New + + + + + &Pause + + + + + &Hint + + + + + High &Scores + + + + + &Quit + + + + + Zoom &In + + + + + Zoom &Out + + + + + &Settings + + + + + Application &Language... + + + + + &Preferences... + + + + + &Help + + + + + &About + + + + + A top-down maze game + + + + + Copyright &copy; 2007-%1 Graeme Gott + + + + + Released under the <a href=%1>GPL 3</a> license + + + + + Icons are from the <a href=%1>Oxygen</a> theme + + + + + Used under the <a href=%1>LGPL 3</a> license + + + + Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/translations/cutemaze_es.qm and /tmp/2Ys85cZaNU/cutemaze-1.1.1/translations/cutemaze_es.qm differ diff -Nru cutemaze-1.1.0/translations/cutemaze_es.ts cutemaze-1.1.1/translations/cutemaze_es.ts --- cutemaze-1.1.0/translations/cutemaze_es.ts 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/translations/cutemaze_es.ts 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,538 @@ + + + + + Board + + + Sorry + Lo sentimos + + + + Unable to load previous game. A new game will be started. + No se pudo cargar la partida anterior. Se iniciará una nueva. + + + + %1 elapsed + %1 transcurridos + + + + %1 steps taken + %1 pasos dados + + + + %1 of %2 targets remain + Quedan %1 de %2 objetivos + + + + Success + Éxito + + + + Paused + En pausa + + + + ControlButton + + + Shift + Mayús + + + + Ctrl + Ctrl + + + + Meta + Meta + + + + Alt + Alt + + + + Super + Super + + + + Windows + Windows + + + + Command + Comando + + + + Control + Control + + + + Option + Opción + + + + LocaleDialog + + + Select application language: + Seleccione el idioma de la aplicación: + + + + <System Language> + <Idioma del sistema> + + + + Note + Nota + + + + Please restart this application for the change in language to take effect. + Reinicie la aplicación para que el cambio de idioma surta efecto. + + + + NewGameDialog + + + New Game + Partida nueva + + + + Hunt and Kill + Hunt-and-Kill + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Vuelta atrás recursiva + + + + Stack + Pila + + + + Stack 2 + Pila 2 + + + + Stack 3 + Pila 3 + + + + Stack 4 + Pila 4 + + + + Stack 5 + Pila 5 + + + + Algorithm: + Algoritmo: + + + + Targets: + Objetivos: + + + + Size: + Tamaño: + + + + QLabel + + + Hunt and Kill + Hunt-and-Kill + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Vuelta atrás recursiva + + + + Stack + Pila + + + + Stack 2 + Pila 2 + + + + Stack 3 + Pila 3 + + + + Stack 4 + Pila 4 + + + + Stack 5 + Pila 5 + + + + Scores + + + CuteMaze Scores + Puntuaciones de CuteMaze + + + + Name + Nombre + + + + Score + Puntuación + + + + Time + Tiempo + + + + Steps + Pasos + + + + Algorithm + Algoritmo + + + + Size + Tamaño + + + + Congratulations! + ¡Felicidades! + + + + Your score has made the top ten. +Please enter your name: + Su puntuación está entre las diez mejores. +Escriba su nombre: + + + + Settings + + + Settings + Configuración + + + + Game + Partida + + + + Show where you've been + Mostrar dónde ha estado + + + + Show number of steps taken + Mostrar la cantidad de pasos dados + + + + Show elapsed time + Mostrar el tiempo transcurrido + + + + Smooth movement + Movimiento suave + + + + Controls + Controles + + + + Move Up: + Mover hacia arriba: + + + + Move Down: + Mover hacia abajo: + + + + Move Left: + Mover hacia la izquierda: + + + + Move Right: + Mover hacia la derecha: + + + + Toggle Flag: + Conmutar la marca: + + + + Themes + Temas: + + + + Add + Añadir + + + + Remove + Eliminar + + + + Select Theme File + Seleccione el archivo de tema + + + + + + Sorry + Lo sentimos + + + + Unable to create data folder. + No se pudo crear la carpeta de datos. + + + + Unable to copy theme file. + No se pudo copiar el archivo de tema. + + + + Question + Pregunta + + + + Remove the selected theme? + ¿Quiere eliminar el tema seleccionado? + + + + Unable to remove the selected theme. + No se pudo eliminar el tema seleccionado. + + + + Window + + + + CuteMaze + CuteMaze + + + + Ctrl+N + Ctrl+N + + + + P + P + + + + H + H + + + + Ctrl+Q + Ctrl+Q + + + + View + Ver + + + + Ctrl++ + Ctrl++ + + + + Ctrl+- + Ctrl+- + + + + About + Acerca de + + + + About &Qt + Acerca de &Qt + + + + &Game + &Partida + + + + &New + &Nuevo + + + + &Pause + &Pausar + + + + &Hint + P&ista + + + + High &Scores + P&untuaciones altas + + + + &Quit + &Salir + + + + Zoom &In + &Acercar + + + + Zoom &Out + Al&ejar + + + + &Settings + &Configuración + + + + Application &Language... + I&dioma de la aplicación… + + + + &Preferences... + &Preferencias… + + + + &Help + Ay&uda + + + + &About + &Acerca de + + + + A top-down maze game + Un juego de laberinto en vista superior + + + + Copyright &copy; 2007-%1 Graeme Gott + Copyright &copy; 2007–%1 Graeme Gott + + + + Released under the <a href=%1>GPL 3</a> license + Publicado bajo la licencia <a href=%1>GPL 3</a> + + + + Icons are from the <a href=%1>Oxygen</a> theme + Los iconos provienen del tema <a href=%1>Oxygen</a> + + + + Used under the <a href=%1>LGPL 3</a> license + Utilizado bajo la licencia <a href=%1>LGPL 3</a> + + + Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/translations/cutemaze_fr.qm and /tmp/2Ys85cZaNU/cutemaze-1.1.1/translations/cutemaze_fr.qm differ diff -Nru cutemaze-1.1.0/translations/cutemaze_fr.ts cutemaze-1.1.1/translations/cutemaze_fr.ts --- cutemaze-1.1.0/translations/cutemaze_fr.ts 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/translations/cutemaze_fr.ts 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,538 @@ + + + + + Board + + + Sorry + Désolé + + + + Unable to load previous game. A new game will be started. + Impossible de charger le dernier jeu. Démarrage d'une nouvelle partie. + + + + %1 elapsed + %1 écoulées + + + + %1 steps taken + %1 étapes franchies + + + + %1 of %2 targets remain + %1 cibles restantes sur %2 + + + + Success + Succès + + + + Paused + En pause + + + + ControlButton + + + Shift + Maj + + + + Ctrl + Ctrl + + + + Meta + Meta + + + + Alt + Alt + + + + Super + Super + + + + Windows + Fenêtre + + + + Command + Commande + + + + Control + Contrôle + + + + Option + Option + + + + LocaleDialog + + + Select application language: + Sélectionner la langue de l'application : + + + + <System Language> + <Langue du système> + + + + Note + Remarque + + + + Please restart this application for the change in language to take effect. + Veuillez relancer l'application pour que la modification prenne effet. + + + + NewGameDialog + + + New Game + Nouvelle partie + + + + Hunt and Kill + Chasse et tue + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Retour sur trace récursif + + + + Stack + Tas + + + + Stack 2 + Tas 2 + + + + Stack 3 + Tas 3 + + + + Stack 4 + Tas 4 + + + + Stack 5 + Tas 5 + + + + Algorithm: + Algorithme : + + + + Targets: + Cibles : + + + + Size: + Taille : + + + + QLabel + + + Hunt and Kill + Chasse et tue + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Retour sur trace récursif + + + + Stack + Tas + + + + Stack 2 + Tas 2 + + + + Stack 3 + Tas 3 + + + + Stack 4 + Tas 4 + + + + Stack 5 + Tas 5 + + + + Scores + + + CuteMaze Scores + Scores de CuteMaze + + + + Name + Nom + + + + Score + Score + + + + Time + Temps + + + + Steps + Étapes + + + + Algorithm + Algorithme + + + + Size + Taille + + + + Congratulations! + Félicitations ! + + + + Your score has made the top ten. +Please enter your name: + Votre score est dans le Top 10. +Veuillez saisir votre nom : + + + + Settings + + + Settings + Paramètres + + + + Game + Partie + + + + Show where you've been + Montrer où vous étiez + + + + Show number of steps taken + Afficher le nombre d'étapes franchies + + + + Show elapsed time + Afficher le temps écoulé + + + + Smooth movement + Mouvement doux + + + + Controls + Contrôles + + + + Move Up: + Vers le haut : + + + + Move Down: + Vers le bas : + + + + Move Left: + Vers la gauche : + + + + Move Right: + Vers la droite : + + + + Toggle Flag: + Changer le drapeau : + + + + Themes + Thèmes + + + + Add + Ajouter + + + + Remove + Supprimer + + + + Select Theme File + Sélectionner le fichier de thème + + + + + + Sorry + Désolé + + + + Unable to create data folder. + Impossible de créer le répertoire de données. + + + + Unable to copy theme file. + Impossible de copier le fichier de thème. + + + + Question + Question + + + + Remove the selected theme? + Supprimer le thème sélectionné ? + + + + Unable to remove the selected theme. + Impossible de supprimer le thème sélectionné. + + + + Window + + + + CuteMaze + CuteMaze + + + + Ctrl+N + Ctrl+N + + + + P + P + + + + H + H + + + + Ctrl+Q + Ctrl+Q + + + + View + Afficher + + + + Ctrl++ + Ctrl++ + + + + Ctrl+- + Ctrl+- + + + + About + À propos de… + + + + About &Qt + À propos de &Qt + + + + &Game + &Jeu + + + + &New + &Nouveau + + + + &Pause + &Pause + + + + &Hint + &Suggestion + + + + High &Scores + &Palmarès + + + + &Quit + &Quitter + + + + Zoom &In + Zoom &avant + + + + Zoom &Out + Zoom &arrière + + + + &Settings + &Paramètres + + + + Application &Language... + &Langue de l'application… + + + + &Preferences... + &Préférences… + + + + &Help + &Aide + + + + &About + À &propos de… + + + + A top-down maze game + Un jeu de labyrinthe de haut en bas + + + + Copyright &copy; 2007-%1 Graeme Gott + Copyright &copy; 2007-%1 Graeme Gott + + + + Released under the <a href=%1>GPL 3</a> license + Distribué sous licence GNU <a href=%1>GPL 3</a> + + + + Icons are from the <a href=%1>Oxygen</a> theme + Utilise les icônes du thème <a href=%1>Oxygen</a> + + + + Used under the <a href=%1>LGPL 3</a> license + Distribué sous licence GNU <a href=%1>GPL 3</a> + + + Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/translations/cutemaze_he.qm and /tmp/2Ys85cZaNU/cutemaze-1.1.1/translations/cutemaze_he.qm differ diff -Nru cutemaze-1.1.0/translations/cutemaze_he.ts cutemaze-1.1.1/translations/cutemaze_he.ts --- cutemaze-1.1.0/translations/cutemaze_he.ts 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/translations/cutemaze_he.ts 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,538 @@ + + + + + Board + + + Sorry + צר לי + + + + Unable to load previous game. A new game will be started. + לא ניתן להטעין משחק קודם. משחק חדש יוחל כעת. + + + + %1 elapsed + %1 חלפו + + + + %1 steps taken + נלקחו %1 צעדים + + + + %1 of %2 targets remain + נותרו %1 מתוך %2 מטרות + + + + Success + הצלחה + + + + Paused + מושהה + + + + ControlButton + + + Shift + + + + + Ctrl + + + + + Meta + + + + + Alt + + + + + Super + + + + + Windows + + + + + Command + פקודה + + + + Control + בקרה + + + + Option + אפשרות + + + + LocaleDialog + + + Select application language: + בחירת שפת יישום: + + + + <System Language> + <שפת מערכת> + + + + Note + הערה + + + + Please restart this application for the change in language to take effect. + נא לאתחל את יישום זה כדי להחיל את השינוי בשפה. + + + + NewGameDialog + + + New Game + משחק חדש + + + + Hunt and Kill + צידה והריגה + + + + Kruskal + + + + + Prim + עדין + + + + Recursive Backtracker + + + + + Stack + מחסנית + + + + Stack 2 + מחסנית 2 + + + + Stack 3 + מחסנית 3 + + + + Stack 4 + מחסנית 4 + + + + Stack 5 + מחסנית 5 + + + + Algorithm: + אלגוריתם: + + + + Targets: + מטרות: + + + + Size: + גודל: + + + + QLabel + + + Hunt and Kill + צידה והריגה + + + + Kruskal + + + + + Prim + עדין + + + + Recursive Backtracker + + + + + Stack + מחסנית + + + + Stack 2 + מחסנית 2 + + + + Stack 3 + מחסנית 3 + + + + Stack 4 + מחסנית 4 + + + + Stack 5 + מחסנית 5 + + + + Scores + + + CuteMaze Scores + ניקוד CuteMaze + + + + Name + שם + + + + Score + ניקוד + + + + Time + זמן + + + + Steps + צעדים + + + + Algorithm + אלגוריתם + + + + Size + גודל + + + + Congratulations! + ברכותיי! + + + + Your score has made the top ten. +Please enter your name: + ניקודך צלח אל העשירון העליון. +נא להזין את שמך: + + + + Settings + + + Settings + הגדרות + + + + Game + משחק + + + + Show where you've been + הצג היכן היית + + + + Show number of steps taken + הצג מספר צעדים שנלקחו + + + + Show elapsed time + הצג זמן שחלף + + + + Smooth movement + תזוזה חלקה + + + + Controls + בקרים + + + + Move Up: + תזוזה מעלה: + + + + Move Down: + תזוזה מטה: + + + + Move Left: + תזוזה שמאלה: + + + + Move Right: + תזוזה ימינה: + + + + Toggle Flag: + מתג דגלון: + + + + Themes + מוטיבים + + + + Add + הוספה + + + + Remove + הסרה + + + + Select Theme File + בחר קובץ מוטיב + + + + + + Sorry + צר לי + + + + Unable to create data folder. + לא ניתן ליצור תיקיית נתונים. + + + + Unable to copy theme file. + לא ניתן להעתיק קובץ מוטיב. + + + + Question + שאלה + + + + Remove the selected theme? + להסיר קובץ המוטיב הנבחר? + + + + Unable to remove the selected theme. + לא ניתן להסיר את המוטיב הנבחר. + + + + Window + + + + CuteMaze + + + + + Ctrl+N + + + + + P + + + + + H + + + + + Ctrl+Q + + + + + View + תצוגה + + + + Ctrl++ + + + + + Ctrl+- + + + + + About + אודות + + + + About &Qt + אודות &Qt + + + + &Game + &משחק + + + + &New + &חדש + + + + &Pause + ה&שהה + + + + &Hint + &רמז + + + + High &Scores + ניקוד &גבוה + + + + &Quit + י&ציאה + + + + Zoom &In + זום &פנימה + + + + Zoom &Out + זום ה&חוצה + + + + &Settings + ה&גדרות + + + + Application &Language... + &שפת יישום... + + + + &Preferences... + ה&עדפות... + + + + &Help + &עזרה + + + + &About + &אודות + + + + A top-down maze game + משחק מבוך מעלה-מטה + + + + Copyright &copy; 2007-%1 Graeme Gott + + + + + Released under the <a href=%1>GPL 3</a> license + משוחרר תחת הרשיון ‫<a href=%1>GPL 3</a> + + + + Icons are from the <a href=%1>Oxygen</a> theme + הצלמיות נלקחו מן הפרויקט <a href=%1>Oxygen</a> + + + + Used under the <a href=%1>LGPL 3</a> license + בשימוש תחת הרשיון <a href=%1>LGPL 3</a> + + + Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/translations/cutemaze_pl.qm and /tmp/2Ys85cZaNU/cutemaze-1.1.1/translations/cutemaze_pl.qm differ diff -Nru cutemaze-1.1.0/translations/cutemaze_pl.ts cutemaze-1.1.1/translations/cutemaze_pl.ts --- cutemaze-1.1.0/translations/cutemaze_pl.ts 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/translations/cutemaze_pl.ts 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,538 @@ + + + + + Board + + + Sorry + Przepraszam + + + + Unable to load previous game. A new game will be started. + Nie można załadować poprzedniej gry. Rozpoczęcie nowej gry. + + + + %1 elapsed + %1 upłynęło + + + + %1 steps taken + %1 podjętych kroków + + + + %1 of %2 targets remain + %1 z %2 pozostałych celów + + + + Success + Sukces + + + + Paused + Wstrzymane + + + + ControlButton + + + Shift + Shift + + + + Ctrl + Ctrl + + + + Meta + Meta + + + + Alt + Alt + + + + Super + Super + + + + Windows + Windows + + + + Command + Polecenie + + + + Control + Sterowanie + + + + Option + Opcja + + + + LocaleDialog + + + Select application language: + Wybierz język aplikacji: + + + + <System Language> + <Język systemowy> + + + + Note + Uwaga + + + + Please restart this application for the change in language to take effect. + Proszę ponownie uruchomić ten program, aby zastosować zmianę języka. + + + + NewGameDialog + + + New Game + Nowa gra + + + + Hunt and Kill + Polowanie i zabijanie + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Rekurencyjny Backtracker + + + + Stack + Stos + + + + Stack 2 + Stos 2 + + + + Stack 3 + Stos 3 + + + + Stack 4 + Stos 4 + + + + Stack 5 + Stos 5 + + + + Algorithm: + Algorytm: + + + + Targets: + Cele: + + + + Size: + Rozmiar: + + + + QLabel + + + Hunt and Kill + Polowanie i zabijanie + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Rekurencyjny Backtracker + + + + Stack + Stos + + + + Stack 2 + Stos 2 + + + + Stack 3 + Stos 3 + + + + Stack 4 + Stos 4 + + + + Stack 5 + Stos 5 + + + + Scores + + + CuteMaze Scores + Wyniki CuteMaze + + + + Name + Nazwa + + + + Score + Wynik + + + + Time + Czas + + + + Steps + Kroki + + + + Algorithm + Algorytm + + + + Size + Rozmiar + + + + Congratulations! + Gratulacje! + + + + Your score has made the top ten. +Please enter your name: + Twój wynik znajduje się w pierwszej dziesiątce. +Podaj swoje imię: + + + + Settings + + + Settings + Ustawienia + + + + Game + Gra + + + + Show where you've been + Pokaż, gdzie byłeś + + + + Show number of steps taken + Pokaż ilość podjętych kroków + + + + Show elapsed time + Pokaż upływający czas + + + + Smooth movement + Płynny ruch + + + + Controls + Przesuń w górę: + + + + Move Up: + Przesuń w górę: + + + + Move Down: + Przesuń w dół: + + + + Move Left: + Przesuń w lewo: + + + + Move Right: + Przesuń w prawo: + + + + Toggle Flag: + Przełącz flagę: + + + + Themes + Motywy + + + + Add + Dodaj + + + + Remove + Usuń + + + + Select Theme File + Wybierz plik motywu + + + + + + Sorry + Przepraszamy + + + + Unable to create data folder. + Nie można utworzyć folderu danych. + + + + Unable to copy theme file. + Nie można skopiować pliku motywu + + + + Question + Pytanie + + + + Remove the selected theme? + Usunąć wybrany motyw? + + + + Unable to remove the selected theme. + Nie można usunąć wybranego motywu. + + + + Window + + + + CuteMaze + CuteMaze + + + + Ctrl+N + Ctrl+N + + + + P + P + + + + H + H + + + + Ctrl+Q + Ctrl+Q + + + + View + Widok + + + + Ctrl++ + Ctrl++ + + + + Ctrl+- + Ctrl+- + + + + About + O + + + + About &Qt + O &Qt + + + + &Game + &Gra + + + + &New + &Nowa + + + + &Pause + &Pauza + + + + &Hint + &Wskazówka + + + + High &Scores + &Najlepsze wyniki + + + + &Quit + &Zakończ + + + + Zoom &In + Po&większ + + + + Zoom &Out + Po&mniejsz + + + + &Settings + &Ustawienia + + + + Application &Language... + &Język aplikacji... + + + + &Preferences... + &Preferencje... + + + + &Help + &Pomoc + + + + &About + &O + + + + A top-down maze game + Gra labiryntu z góry na dół + + + + Copyright &copy; 2007-%1 Graeme Gott + Prawo autorskie &copy; 2007-%1 Graeme Gott + + + + Released under the <a href=%1>GPL 3</a> license + Wydano na licencji <a href=%1>GPL 3</a> + + + + Icons are from the <a href=%1>Oxygen</a> theme + Ikony pochodzą z motywu <a href=%1>Oxygen</a> + + + + Used under the <a href=%1>LGPL 3</a> license + Używany zgodnie z licencją <a href=%1>LGPL 3</a> + + + Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/translations/cutemaze_pt_BR.qm and /tmp/2Ys85cZaNU/cutemaze-1.1.1/translations/cutemaze_pt_BR.qm differ diff -Nru cutemaze-1.1.0/translations/cutemaze_pt_BR.ts cutemaze-1.1.1/translations/cutemaze_pt_BR.ts --- cutemaze-1.1.0/translations/cutemaze_pt_BR.ts 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/translations/cutemaze_pt_BR.ts 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,538 @@ + + + + + Board + + + Sorry + Desculpe + + + + Unable to load previous game. A new game will be started. + Não foi possível carregar o jogo anterior. Um novo jogo será iniciado. + + + + %1 elapsed + %1 transcorrido(s) + + + + %1 steps taken + %1 passo(s) dado(s) + + + + %1 of %2 targets remain + %1 de %2 alvos restantes + + + + Success + Sucesso + + + + Paused + Em pausa + + + + ControlButton + + + Shift + Shift + + + + Ctrl + Ctrl + + + + Meta + Meta + + + + Alt + Alt + + + + Super + Super + + + + Windows + Janelas + + + + Command + Comando + + + + Control + Control + + + + Option + Opções + + + + LocaleDialog + + + Select application language: + Selecione o idioma do aplicativo: + + + + <System Language> + <Idioma do sistema> + + + + Note + Nota + + + + Please restart this application for the change in language to take effect. + Por favor reinicie o aplicativo para que a alteração de idioma surta efeito. + + + + NewGameDialog + + + New Game + Novo jogo + + + + Hunt and Kill + Hunt and Kill + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Backtracker recursivo + + + + Stack + Stack + + + + Stack 2 + Stack 2 + + + + Stack 3 + Stack 3 + + + + Stack 4 + Stack 4 + + + + Stack 5 + Stack 5 + + + + Algorithm: + Algoritmo: + + + + Targets: + Alvos: + + + + Size: + Tamanho: + + + + QLabel + + + Hunt and Kill + Hunt and Kill + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Backtracker recursivo + + + + Stack + Stack + + + + Stack 2 + Stack 2 + + + + Stack 3 + Stack 3 + + + + Stack 4 + Stack 4 + + + + Stack 5 + Stack 5 + + + + Scores + + + CuteMaze Scores + Pontuações do CuteMaze + + + + Name + Nome + + + + Score + Pontuação + + + + Time + Tempo + + + + Steps + Passos + + + + Algorithm + Algoritmo + + + + Size + Tamanho + + + + Congratulations! + Parabéns! + + + + Your score has made the top ten. +Please enter your name: + Sua pontuação está entre as dez melhores. +Por favor digite seu nome: + + + + Settings + + + Settings + Configurações + + + + Game + Jogo + + + + Show where you've been + Mostrar trilha de onde passou + + + + Show number of steps taken + Mostrar números de passos dados + + + + Show elapsed time + Mostrar tempo decorrido + + + + Smooth movement + Movimento suave + + + + Controls + Controles + + + + Move Up: + Mover para cima: + + + + Move Down: + Mover para baixo: + + + + Move Left: + Mover para a esquerda: + + + + Move Right: + Mover para a direita: + + + + Toggle Flag: + Alternar sinalizador: + + + + Themes + Temas + + + + Add + Adicionar + + + + Remove + Remover + + + + Select Theme File + Selecionar arquivo de tema + + + + + + Sorry + Perdão + + + + Unable to create data folder. + Não foi possível criar pasta de dados. + + + + Unable to copy theme file. + Não foi possível copiar arquivo de tema. + + + + Question + Pergunta + + + + Remove the selected theme? + Deseja remover o tema selecionado? + + + + Unable to remove the selected theme. + Não foi possível remover o tema selecionado. + + + + Window + + + + CuteMaze + CuteMaze + + + + Ctrl+N + Ctrl+N + + + + P + P + + + + H + H + + + + Ctrl+Q + Ctrl+Q + + + + View + Visão + + + + Ctrl++ + Ctrl++ + + + + Ctrl+- + Ctrl+- + + + + About + Sobre + + + + About &Qt + Sobre &Qt + + + + &Game + &Jogo + + + + &New + &Novo + + + + &Pause + &Pausar + + + + &Hint + &Dica + + + + High &Scores + Maiores po&ntuações + + + + &Quit + &Sair + + + + Zoom &In + &Ampliar + + + + Zoom &Out + &Reduzir + + + + &Settings + &Configurações + + + + Application &Language... + &Idioma do aplicativo... + + + + &Preferences... + &Preferências... + + + + &Help + A&juda + + + + &About + &Sobre + + + + A top-down maze game + Um jogo de labirinto de visão superior + + + + Copyright &copy; 2007-%1 Graeme Gott + Copyright &copy; 2007-%1 Graeme Gott + + + + Released under the <a href=%1>GPL 3</a> license + Lançado sob a licença <a href=%1>GPL 3</a> + + + + Icons are from the <a href=%1>Oxygen</a> theme + Os ícones são do tema <a href=%1>Oxygen</a> + + + + Used under the <a href=%1>LGPL 3</a> license + Usado sob a licença <a href=%1>LGPL 3</a> + + + Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/translations/cutemaze_ro.qm and /tmp/2Ys85cZaNU/cutemaze-1.1.1/translations/cutemaze_ro.qm differ diff -Nru cutemaze-1.1.0/translations/cutemaze_ro.ts cutemaze-1.1.1/translations/cutemaze_ro.ts --- cutemaze-1.1.0/translations/cutemaze_ro.ts 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/translations/cutemaze_ro.ts 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,538 @@ + + + + + Board + + + Sorry + Scuze + + + + Unable to load previous game. A new game will be started. + Nu s-a putut încărca jocul precedent. Un joc nou va fi pornit. + + + + %1 elapsed + %1 scurs + + + + %1 steps taken + %1 mutări făcute + + + + %1 of %2 targets remain + %1 din %2 obiective rămase + + + + Success + Succes + + + + Paused + În pauză + + + + ControlButton + + + Shift + Shift + + + + Ctrl + Ctrl + + + + Meta + Meta + + + + Alt + Alt + + + + Super + Super + + + + Windows + Fereastră + + + + Command + Comandă + + + + Control + Control + + + + Option + Opţiuni + + + + LocaleDialog + + + Select application language: + Selectaţi limba aplicaţiei: + + + + <System Language> + <Limbaj Sistem> + + + + Note + Notă + + + + Please restart this application for the change in language to take effect. + Vă rugăm reporniţi această aplicaţie pentru ca schimbarea limbii să aibă efect. + + + + NewGameDialog + + + New Game + Joc nou + + + + Hunt and Kill + Vînează şi omoară + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Backtracker recursiv + + + + Stack + Stivă + + + + Stack 2 + Stivă 2 + + + + Stack 3 + Stivă 3 + + + + Stack 4 + Stivă 4 + + + + Stack 5 + Stivă 5 + + + + Algorithm: + Algoritm: + + + + Targets: + Obiective: + + + + Size: + Mărime: + + + + QLabel + + + Hunt and Kill + Vînează şi omoară + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Backtracker recursiv + + + + Stack + Stivă + + + + Stack 2 + Stivă 2 + + + + Stack 3 + Stivă 3 + + + + Stack 4 + Stivă 4 + + + + Stack 5 + Stivă 5 + + + + Scores + + + CuteMaze Scores + Scoruri CuteMaze + + + + Name + Nume + + + + Score + Scor + + + + Time + Timp + + + + Steps + Paşi + + + + Algorithm + Algoritm + + + + Size + Mărime + + + + Congratulations! + Felicitări! + + + + Your score has made the top ten. +Please enter your name: + Scorul dvs. a intrat în top 10. +Vă rugăm tastaţi numele dvs.: + + + + Settings + + + Settings + Setări + + + + Game + Joc + + + + Show where you've been + Arată unde aţi fost + + + + Show number of steps taken + Arată numărul de mutări făcute + + + + Show elapsed time + Arată timpul scurs + + + + Smooth movement + Mişcări line + + + + Controls + Controale + + + + Move Up: + Mută în sus: + + + + Move Down: + Mută în jos: + + + + Move Left: + Mută la stînga: + + + + Move Right: + Mută la dreapta: + + + + Toggle Flag: + Comutare steguleţ: + + + + Themes + Teme + + + + Add + Adaugă + + + + Remove + Elimină + + + + Select Theme File + Selectaţi fişierul temă + + + + + + Sorry + Scuze + + + + Unable to create data folder. + Nu s-a putut crea folder-ul datelor. + + + + Unable to copy theme file. + Nu s-a putut copia fişierul temă. + + + + Question + Întrebare + + + + Remove the selected theme? + Eliminaţi tema selectată? + + + + Unable to remove the selected theme. + Nu s-a putut elimina tema selectată. + + + + Window + + + + CuteMaze + CuteMaze + + + + Ctrl+N + Ctrl+N + + + + P + P + + + + H + H + + + + Ctrl+Q + Ctrl+Q + + + + View + Vizualizare + + + + Ctrl++ + Ctrl++ + + + + Ctrl+- + Ctrl+- + + + + About + Despre + + + + About &Qt + Despre &Qt + + + + &Game + &Joc + + + + &New + &Nou + + + + &Pause + &Pauză + + + + &Hint + Indiciu + + + + High &Scores + Scoruri &record + + + + &Quit + &Ieşire + + + + Zoom &In + &Mărire + + + + Zoom &Out + M&icşorare + + + + &Settings + &Setări + + + + Application &Language... + &Limbă aplicaţie... + + + + &Preferences... + &Preferinţe... + + + + &Help + &Ajutor + + + + &About + &Despre + + + + A top-down maze game + Un joc labirint sus-jos + + + + Copyright &copy; 2007-%1 Graeme Gott + Toate drepturile rezervate &copy; 2007-%1 Graeme Gott + + + + Released under the <a href=%1>GPL 3</a> license + Lansat sub licenţă <a href=%1>GPL 3</a> + + + + Icons are from the <a href=%1>Oxygen</a> theme + Icon-urile sînt din tema <a href=%1>Oxygen</a> + + + + Used under the <a href=%1>LGPL 3</a> license + Folosit sub licenţă <a href=%1>LGPL 3</a> + + + Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/translations/cutemaze_ru.qm and /tmp/2Ys85cZaNU/cutemaze-1.1.1/translations/cutemaze_ru.qm differ diff -Nru cutemaze-1.1.0/translations/cutemaze_ru.ts cutemaze-1.1.1/translations/cutemaze_ru.ts --- cutemaze-1.1.0/translations/cutemaze_ru.ts 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/translations/cutemaze_ru.ts 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,538 @@ + + + + + Board + + + Sorry + Извините + + + + Unable to load previous game. A new game will be started. + Невозможно загрузить предыдущую игру. Будет создана новая игра. + + + + %1 elapsed + %1 прошло + + + + %1 steps taken + %1 шагов сделано + + + + %1 of %2 targets remain + %1 из %2 целей осталось + + + + Success + Успех + + + + Paused + Пауза + + + + ControlButton + + + Shift + Shift + + + + Ctrl + Ctrl + + + + Meta + Meta + + + + Alt + Alt + + + + Super + Super + + + + Windows + Windows + + + + Command + Command + + + + Control + Command + + + + Option + Опция + + + + LocaleDialog + + + Select application language: + Выберите язык приложения: + + + + <System Language> + <Системный язык> + + + + Note + Предупреждение + + + + Please restart this application for the change in language to take effect. + Пожалуйста, перезапустите программу для того, чтобы изменения вступили в силу. + + + + NewGameDialog + + + New Game + Новая игра + + + + Hunt and Kill + Охота и убийство + + + + Kruskal + Краскал + + + + Prim + Прим + + + + Recursive Backtracker + Рекурсивный обход + + + + Stack + Стек + + + + Stack 2 + Стек 2 + + + + Stack 3 + Стек 3 + + + + Stack 4 + Стек 4 + + + + Stack 5 + Стек 5 + + + + Algorithm: + Алгоритм: + + + + Targets: + Целей: + + + + Size: + Размер: + + + + QLabel + + + Hunt and Kill + Охота и убийство + + + + Kruskal + Краскал + + + + Prim + Прим + + + + Recursive Backtracker + Рекурсивный обход + + + + Stack + Стек + + + + Stack 2 + Стек 2 + + + + Stack 3 + Стек 3 + + + + Stack 4 + Стек 4 + + + + Stack 5 + Стек 5 + + + + Scores + + + CuteMaze Scores + Очки CuteMaze + + + + Name + Имя + + + + Score + Очки + + + + Time + Время + + + + Steps + Шагов + + + + Algorithm + Алгоритм + + + + Size + Размер + + + + Congratulations! + Поздравляем! + + + + Your score has made the top ten. +Please enter your name: + Вы попали в десятку лучших. +Пожалуйста. введите свое имя: + + + + Settings + + + Settings + Настройки + + + + Game + Игра + + + + Show where you've been + Показывать, где вы уже были + + + + Show number of steps taken + Показывать количество шагов + + + + Show elapsed time + Показывать прошедшее время + + + + Smooth movement + Гладкое движение + + + + Controls + Управление + + + + Move Up: + Вверх: + + + + Move Down: + Вниз: + + + + Move Left: + Влево: + + + + Move Right: + Вправо: + + + + Toggle Flag: + Активировать флаг: + + + + Themes + Темы + + + + Add + Добавить + + + + Remove + Удалить + + + + Select Theme File + Выберите файл темы + + + + + + Sorry + Извините + + + + Unable to create data folder. + Невозможно создать папку для данных. + + + + Unable to copy theme file. + Невозможно скопировать файл темы. + + + + Question + Подтверждение + + + + Remove the selected theme? + Удалить выбранную тему? + + + + Unable to remove the selected theme. + Невозможно удалить выбранную тему. + + + + Window + + + + CuteMaze + CuteMaze + + + + Ctrl+N + Ctrl+N + + + + P + P + + + + H + H + + + + Ctrl+Q + Ctrl+Q + + + + View + Вид + + + + Ctrl++ + Ctrl++ + + + + Ctrl+- + Ctrl+- + + + + About + Об игре + + + + About &Qt + О &Qt + + + + &Game + &Игра + + + + &New + &Новая + + + + &Pause + &Пауза + + + + &Hint + &Подсказка + + + + High &Scores + &Очки + + + + &Quit + &Выход + + + + Zoom &In + У&величить + + + + Zoom &Out + Ум&еньшить + + + + &Settings + &Настройки + + + + Application &Language... + &Язык приложения + + + + &Preferences... + &Предпочтения + + + + &Help + &Помощь + + + + &About + &Об игре + + + + A top-down maze game + Игра в лабиринт с видом сверху + + + + Copyright &copy; 2007-%1 Graeme Gott + Копирайт &copy; 2007-%1 Graeme Gott + + + + Released under the <a href=%1>GPL 3</a> license + Выпущено под лицензией <a href=%1>GPL 3</a> + + + + Icons are from the <a href=%1>Oxygen</a> theme + Иконки из темы <a href=%1>Oxygen</a> + + + + Used under the <a href=%1>LGPL 3</a> license + Используются под лицензией <a href=%1>LGPL 3</a> + + + Binary files /tmp/fvZxUln7lD/cutemaze-1.1.0/translations/cutemaze_tr.qm and /tmp/2Ys85cZaNU/cutemaze-1.1.1/translations/cutemaze_tr.qm differ diff -Nru cutemaze-1.1.0/translations/cutemaze_tr.ts cutemaze-1.1.1/translations/cutemaze_tr.ts --- cutemaze-1.1.0/translations/cutemaze_tr.ts 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/translations/cutemaze_tr.ts 2014-02-03 22:57:23.000000000 +0000 @@ -0,0 +1,537 @@ + + + + + Board + + + Sorry + Üzgünüm + + + + Unable to load previous game. A new game will be started. + Önceki oyunu yüklemede hata. Yeni bir oyun başlatılacak. + + + + %1 elapsed + Geçen süre: %1 + + + + %1 steps taken + %1 adım atıldı + + + + %1 of %2 targets remain + %1/%2 hedef kaldı + + + + Success + Başarılı + + + + Paused + Durdu + + + + ControlButton + + + Shift + Shift + + + + Ctrl + Ctrl + + + + Meta + Meta + + + + Alt + Alt + + + + Super + Super + + + + Windows + Pencereler + + + + Command + Komut + + + + Control + Kontrol + + + + Option + Seçenek + + + + LocaleDialog + + + Select application language: + Uygulama dilini seçiniz: + + + + <System Language> + <Sistem Dili> + + + + Note + Önemli + + + + Please restart this application for the change in language to take effect. + Değişikliklerin geçerli olabilmesi için bu uygulamayı tekrar başlatınız. + + + + NewGameDialog + + + New Game + Yeni Oyun + + + + Hunt and Kill + Avla ve Yoket + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Recursive Backtracker + + + + Stack + Yığın + + + + Stack 2 + Yığın 2 + + + + Stack 3 + Yığın 3 + + + + Stack 4 + Yığın 4 + + + + Stack 5 + Yığın 5 + + + + Algorithm: + Algoritma: + + + + Targets: + Hedefler: + + + + Size: + Boyut: + + + + QLabel + + + Hunt and Kill + Avla ve Yoket + + + + Kruskal + Kruskal + + + + Prim + Prim + + + + Recursive Backtracker + Recursive Backtracker + + + + Stack + Yığın + + + + Stack 2 + Yığın 2 + + + + Stack 3 + Yığın 3 + + + + Stack 4 + Yığın 4 + + + + Stack 5 + Yığın 5 + + + + Scores + + + CuteMaze Scores + Skor Tablosu + + + + Name + İsim + + + + Score + Skor + + + + Time + Zaman + + + + Steps + Adımlar + + + + Algorithm + Algoritma + + + + Size + Boyut + + + + Congratulations! + Tebrikler! + + + + Your score has made the top ten. +Please enter your name: + İlk 10'a girdiniz.\nLütfen adınızı giriniz: + + + + Settings + + + Settings + Ayarlar + + + + Game + Oyun + + + + Show where you've been + İzleri göster + + + + Show number of steps taken + Adım sayısını göster + + + + Show elapsed time + Geçen süreyi göster + + + + Smooth movement + Yumuşak ilerleme + + + + Controls + Kontroller + + + + Move Up: + Yukarı: + + + + Move Down: + Aşağı: + + + + Move Left: + Sola: + + + + Move Right: + Sağa: + + + + Toggle Flag: + İz bayrağı: + + + + Themes + Temalar + + + + Add + Ekle + + + + Remove + Sil + + + + Select Theme File + Tema Dosyasını Seç + + + + + + Sorry + Üzgünüm + + + + Unable to create data folder. + Veri klasörü oluşturulamıyor. + + + + Unable to copy theme file. + Tema dosyası kopyalanamıyor. + + + + Question + Emin Misiniz + + + + Remove the selected theme? + Seçilen tema silinsin mi? + + + + Unable to remove the selected theme. + Seçilen tema kaldırılamadı. + + + + Window + + + + CuteMaze + CuteMaze + + + + Ctrl+N + Ctrl+N + + + + P + P + + + + H + H + + + + Ctrl+Q + Ctrl+Q + + + + View + Görünüm + + + + Ctrl++ + Ctrl++ + + + + Ctrl+- + Ctrl+- + + + + About + Hakkında + + + + About &Qt + &Qt Hakkında + + + + &Game + &Oyun + + + + &New + &Yeni + + + + &Pause + &Durdur + + + + &Hint + &İpucu + + + + High &Scores + &Yüksek Skorlar + + + + &Quit + &Çıkış + + + + Zoom &In + &Yakınlaştır + + + + Zoom &Out + &Uzaklaştır + + + + &Settings + &Ayarlar + + + + Application &Language... + &Uygulama Dili... + + + + &Preferences... + &Tercihler + + + + &Help + &Yardım + + + + &About + &Hakkında + + + + A top-down maze game + Bir Labirent Oyunudur + + + + Copyright &copy; 2007-%1 Graeme Gott + Copyright &copy; 2007-%1 Graeme Gott + + + + Released under the <a href=%1>GPL 3</a> license + Sürüm <a href=%1>GPL 3</a> lisansı altındadır. + + + + Icons are from the <a href=%1>Oxygen</a> theme + İkonlar <a href=%1>Oxygen</a> temasındandır + + + + Used under the <a href=%1>LGPL 3</a> license + <a href=%1>LGPL 3</a> lisansı altındadır + + + diff -Nru cutemaze-1.1.0/windows/installer.nsi cutemaze-1.1.1/windows/installer.nsi --- cutemaze-1.1.0/windows/installer.nsi 1970-01-01 00:00:00.000000000 +0000 +++ cutemaze-1.1.1/windows/installer.nsi 2014-02-03 23:34:04.000000000 +0000 @@ -0,0 +1,265 @@ +;-------------------------------- +;Definitions + +!define APPNAME "CuteMaze" +!define VERSIONMAJOR 1 +!define VERSIONMINOR 1 +!define VERSIONPATCH 1 +!define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}" +!define ABOUTURL "http://gottcode.org/cutemaze/" + +;-------------------------------- +;Includes + +!include "MUI2.nsh" +!include "FileFunc.nsh" +!include "TextFunc.nsh" + +;-------------------------------- +;General + +;Use highest compression +SetCompressor /SOLID /FINAL lzma + +;Name and file +Name "${APPNAME}" +OutFile "${APPNAME}_${APPVERSION}.exe" + +;Default installation folder +InstallDir "$PROGRAMFILES\${APPNAME}" +InstallDirRegKey HKLM "Software\${APPNAME}" "" + +;Request application privileges for Windows Vista +RequestExecutionLevel admin + +;-------------------------------- +;Variables + +Var StartMenuFolder + +;-------------------------------- +;Interface Settings + +!define MUI_ICON "..\icons\cutemaze.ico" +!define MUI_UNICON "..\icons\cutemaze.ico" +!define MUI_ABORTWARNING +!define MUI_LANGDLL_ALLLANGUAGES + +;-------------------------------- +;Language Selection Dialog Settings + +;Remember the installer language +!define MUI_LANGDLL_REGISTRY_ROOT "HKLM" +!define MUI_LANGDLL_REGISTRY_KEY "Software\${APPNAME}" +!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" + +;-------------------------------- +;Start Menu Folder Page Settings + +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${APPNAME}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" + +;-------------------------------- +;Finish Page Settings + +!define MUI_FINISHPAGE_RUN "$INSTDIR\CuteMaze.exe" +!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\ReadMe.txt" + +;-------------------------------- +;Pages + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "..\COPYING" +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +;-------------------------------- +;Languages + +!insertmacro MUI_LANGUAGE "English" ;first language is the default language +!insertmacro MUI_LANGUAGE "French" +!insertmacro MUI_LANGUAGE "German" +!insertmacro MUI_LANGUAGE "Spanish" +!insertmacro MUI_LANGUAGE "SpanishInternational" +!insertmacro MUI_LANGUAGE "SimpChinese" +!insertmacro MUI_LANGUAGE "TradChinese" +!insertmacro MUI_LANGUAGE "Japanese" +!insertmacro MUI_LANGUAGE "Korean" +!insertmacro MUI_LANGUAGE "Italian" +!insertmacro MUI_LANGUAGE "Dutch" +!insertmacro MUI_LANGUAGE "Danish" +!insertmacro MUI_LANGUAGE "Swedish" +!insertmacro MUI_LANGUAGE "Norwegian" +!insertmacro MUI_LANGUAGE "NorwegianNynorsk" +!insertmacro MUI_LANGUAGE "Finnish" +!insertmacro MUI_LANGUAGE "Greek" +!insertmacro MUI_LANGUAGE "Russian" +!insertmacro MUI_LANGUAGE "Portuguese" +!insertmacro MUI_LANGUAGE "PortugueseBR" +!insertmacro MUI_LANGUAGE "Polish" +!insertmacro MUI_LANGUAGE "Ukrainian" +!insertmacro MUI_LANGUAGE "Czech" +!insertmacro MUI_LANGUAGE "Slovak" +!insertmacro MUI_LANGUAGE "Croatian" +!insertmacro MUI_LANGUAGE "Bulgarian" +!insertmacro MUI_LANGUAGE "Hungarian" +!insertmacro MUI_LANGUAGE "Thai" +!insertmacro MUI_LANGUAGE "Romanian" +!insertmacro MUI_LANGUAGE "Latvian" +!insertmacro MUI_LANGUAGE "Macedonian" +!insertmacro MUI_LANGUAGE "Estonian" +!insertmacro MUI_LANGUAGE "Turkish" +!insertmacro MUI_LANGUAGE "Lithuanian" +!insertmacro MUI_LANGUAGE "Slovenian" +!insertmacro MUI_LANGUAGE "Serbian" +!insertmacro MUI_LANGUAGE "SerbianLatin" +!insertmacro MUI_LANGUAGE "Arabic" +!insertmacro MUI_LANGUAGE "Farsi" +!insertmacro MUI_LANGUAGE "Hebrew" +!insertmacro MUI_LANGUAGE "Indonesian" +!insertmacro MUI_LANGUAGE "Mongolian" +!insertmacro MUI_LANGUAGE "Luxembourgish" +!insertmacro MUI_LANGUAGE "Albanian" +!insertmacro MUI_LANGUAGE "Breton" +!insertmacro MUI_LANGUAGE "Belarusian" +!insertmacro MUI_LANGUAGE "Icelandic" +!insertmacro MUI_LANGUAGE "Malay" +!insertmacro MUI_LANGUAGE "Bosnian" +!insertmacro MUI_LANGUAGE "Kurdish" +!insertmacro MUI_LANGUAGE "Irish" +!insertmacro MUI_LANGUAGE "Uzbek" +!insertmacro MUI_LANGUAGE "Galician" +!insertmacro MUI_LANGUAGE "Afrikaans" +!insertmacro MUI_LANGUAGE "Catalan" +!insertmacro MUI_LANGUAGE "Esperanto" +!insertmacro MUI_LANGUAGE "Asturian" + +;-------------------------------- +;Reserve Files + +!insertmacro MUI_RESERVEFILE_LANGDLL + +;-------------------------------- +;Installer Functions + +Function .onInit + + !insertmacro MUI_LANGDLL_DISPLAY + +FunctionEnd + +;-------------------------------- +;Installer Section + +Section "install" + + ;Copy files + SetOutPath $INSTDIR + File ..\release\CuteMaze.exe + File $%QTDIR%\bin\icudt51.dll + File $%QTDIR%\bin\icuin51.dll + File $%QTDIR%\bin\icuuc51.dll + File $%QTDIR%\bin\libgcc_s_dw2-1.dll + File $%QTDIR%\bin\libstdc++-6.dll + File $%QTDIR%\bin\libwinpthread-1.dll + File $%QTDIR%\bin\Qt5Core.dll + File $%QTDIR%\bin\Qt5Gui.dll + File $%QTDIR%\bin\Qt5Svg.dll + File $%QTDIR%\bin\Qt5Widgets.dll + + ;Create ReadMe file + File /oname=ReadMe.txt ..\README + FileOpen $4 "ReadMe.txt" a + FileSeek $4 0 END + FileWrite $4 "$\r$\n$\r$\nCredits$\r$\n=======$\r$\n$\r$\n" + FileClose $4 + File ..\CREDITS + ${FileJoin} "ReadMe.txt" "CREDITS" "ReadMe.txt" + Delete $INSTDIR\CREDITS + FileOpen $4 "ReadMe.txt" a + FileSeek $4 0 END + FileWrite $4 "$\r$\n$\r$\nNews$\r$\n====$\r$\n$\r$\n" + FileClose $4 + File ..\NEWS + ${FileJoin} "ReadMe.txt" "NEWS" "ReadMe.txt" + Delete $INSTDIR\NEWS + + SetOutPath $INSTDIR\platforms + File $%QTDIR%\plugins\platforms\qwindows.dll + + SetOutPath $INSTDIR\translations + File ..\translations\*.qm + File $%QTDIR%\translations\qt_*.qm + + ;Registry information for add/remove programs + WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "Graeme Gott" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\"" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "InstallLocation" "$\"$INSTDIR$\"" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$\"$INSTDIR\CuteMaze.exe$\"" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "URLInfoAbout" "$\"${ABOUTURL}$\"" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${APPVERSION}" + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMajor" ${VERSIONMAJOR} + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMinor" ${VERSIONMINOR} + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1 + ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 + IntFmt $0 "0x%08X" $0 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EstimatedSize" "$0" + + ;Create uninstaller + WriteUninstaller "$INSTDIR\uninstall.exe" + + ;Create shortcut + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateDirectory "$SMPROGRAMS\$StartMenuFolder" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME}.lnk" "$INSTDIR\CuteMaze.exe" + !insertmacro MUI_STARTMENU_WRITE_END + +SectionEnd + +;-------------------------------- +;Uninstaller Functions + +Function un.onInit + + !insertmacro MUI_UNGETLANGUAGE + +FunctionEnd + +;-------------------------------- +;Uninstaller Section + +Section "Uninstall" + + ; Remove from registry + DeleteRegKey HKLM "Software\${APPNAME}" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" + + ;Remove files + Delete $INSTDIR\CuteMaze.exe + Delete $INSTDIR\ReadMe.txt + Delete $INSTDIR\*.dll + Delete $INSTDIR\platforms\qwindows.dll + Delete $INSTDIR\translations\*.qm + Delete $INSTDIR\uninstall.exe + + ;Remove directories + RMDir $INSTDIR\platforms + RMDir $INSTDIR\translations + RMDir $INSTDIR + + ;Remove shortcut + !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder + Delete "$SMPROGRAMS\$StartMenuFolder\${APPNAME}.lnk" + RMDir "$SMPROGRAMS\$StartMenuFolder" + +SectionEnd diff -Nru cutemaze-1.1.0/windows_deploy.bat cutemaze-1.1.1/windows_deploy.bat --- cutemaze-1.1.0/windows_deploy.bat 2009-09-21 15:24:52.000000000 +0000 +++ cutemaze-1.1.1/windows_deploy.bat 2014-02-03 23:34:04.000000000 +0000 @@ -1,7 +1,34 @@ -MKDIR CuteMaze -COPY release\CuteMaze.exe CuteMaze -COPY %QTDIR%\bin\mingwm10.dll CuteMaze -COPY %QTDIR%\bin\QtCore4.dll CuteMaze -COPY %QTDIR%\bin\QtGui4.dll CuteMaze -COPY %QTDIR%\bin\QtXml4.dll CuteMaze -COPY %QTDIR%\bin\QtSvg4.dll CuteMaze +@ECHO OFF + +SET APP=CuteMaze +SET VERSION=1.1.1 + +ECHO Copying executable +MKDIR %APP% +TYPE COPYING | FIND "" /V > %APP%\COPYING.txt +TYPE CREDITS | FIND "" /V > %APP%\CREDITS.txt +COPY release\%APP%.exe %APP% >nul +strip %APP%\%APP%.exe + +ECHO Copying translations +SET TRANSLATIONS=%APP%\translations +MKDIR %TRANSLATIONS% +COPY translations\*.qm %TRANSLATIONS% >nul +COPY %QTDIR%\translations\qt_*.qm %TRANSLATIONS% >nul + +ECHO Copying Qt libraries +COPY %QTDIR%\bin\libgcc_s_dw2-1.dll %APP% >nul +COPY %QTDIR%\bin\mingwm10.dll %APP% >nul +COPY %QTDIR%\bin\QtCore4.dll %APP% >nul +COPY %QTDIR%\bin\QtGui4.dll %APP% >nul +COPY %QTDIR%\bin\QtXml4.dll %APP% >nul +COPY %QTDIR%\bin\QtSvg4.dll %APP% >nul + +ECHO Creating compressed file +CD %APP% +7z a %APP%_%VERSION%.zip * >nul +CD .. +MOVE %APP%\%APP%_%VERSION%.zip . >nul + +ECHO Cleaning up +RMDIR /S /Q %APP%