Hello community, here is the log from the commit of package kmines for openSUSE:Factory checked in at 2015-05-11 19:08:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmines (Old) and /work/SRC/openSUSE:Factory/.kmines.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmines" Changes: -------- --- /work/SRC/openSUSE:Factory/kmines/kmines.changes 2015-03-11 09:50:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmines.new/kmines.changes 2015-05-11 19:08:35.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Apr 11 13:17:48 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 18:11:50 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:46:29 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- kmines-14.12.3.tar.xz New: ---- kmines-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmines.spec ++++++ --- /var/tmp/diff_new_pack.vkHEkj/_old 2015-05-11 19:08:36.000000000 +0200 +++ /var/tmp/diff_new_pack.vkHEkj/_new 2015-05-11 19:08:36.000000000 +0200 @@ -17,17 +17,53 @@ Name: kmines +BuildRequires: extra-cmake-modules +BuildRequires: karchive-devel +BuildRequires: kbookmarks-devel +BuildRequires: kcodecs-devel +BuildRequires: kcompletion-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdeclarative-devel +BuildRequires: kdelibs4support-devel +BuildRequires: kdnssd-framework-devel +BuildRequires: kglobalaccel-devel +BuildRequires: kguiaddons-devel +BuildRequires: ki18n-devel +BuildRequires: kiconthemes-devel +BuildRequires: kio-devel +BuildRequires: kitemviews-devel +BuildRequires: kjobwidgets-devel +BuildRequires: knewstuff-devel +BuildRequires: knotifyconfig-devel +BuildRequires: kservice-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kxmlgui-devel BuildRequires: libkdegames-devel +BuildRequires: phonon4qt5-devel +BuildRequires: update-desktop-files BuildRequires: xz +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Widgets) Summary: Minesweeper-like game License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 14.12.3 +Version: 15.04.0 Release: 0 Source0: kmines-%{version}.tar.xz +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description KMines is the classical Minesweeper game where you have to find mines @@ -38,23 +74,23 @@ %setup -q -n kmines-%{version} %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall - %suse_update_desktop_file -r kmines Game LogicGame - %kde_post_install + %kf5_makeinstall -C build + %suse_update_desktop_file -r org.kde.kmines Game LogicGame %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kde4_bindir}/kmines -%{_kde4_htmldir}/en/kmines/ -%{_kde4_applicationsdir}/kmines.desktop -%{_kde4_iconsdir}/hicolor/*/apps/kmines.* -%{_kde4_appsdir}/kmines/ -%{_kde4_configdir}/kmines.knsrc +%{_kf5_bindir}/kmines +%{_kf5_htmldir}/en/kmines/ +%{_kf5_applicationsdir}/org.kde.kmines.desktop +%{_kf5_iconsdir}/hicolor/*/apps/kmines.* +%{_kf5_sharedir}/kmines/ +%config %{_kf5_configdir}/kmines.knsrc +%{_kf5_notifydir}/ +%{_kf5_kxmlguidir}/ %changelog ++++++ kmines-14.12.3.tar.xz -> kmines-15.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/CHANGELOG new/kmines-15.04.0/CHANGELOG --- old/kmines-14.12.3/CHANGELOG 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/CHANGELOG 1970-01-01 01:00:00.000000000 +0100 @@ -1,330 +0,0 @@ -[25 Jul 2007] KMines got rewritten to QGraphicsView framework and -old code was removed. If you still wish to look at it, you can find it in -SVN revision before 689063 (i.e. r689063 is the revision on which deletion happened) - ------------------------------------- -2.1.10 (25 Aug 2005) [KDE 3.5 devel] - -2.1.9a (25 Aug 2005) [KDE 3.4.3 stable] - * fix constness in solver [reported by Garrett Kajmowicz] - * fix bug: cannot load log [reported by Tobias Meyer] - -2.1.9 (27 Jun 2004) [KDE 3.3 stable] - * fix compilation of solver debugging code. - * add missing events - * replace case size option by zoom in/zoom out actions - -2.1.8c (31 May 2004) [KDE 3.2.3 stable] - * fix bug: hint not displayed [reported by Daniel Schepler] - * fix bug: log file restarted when game paused [reported by Astharoth] - -2.1.8b (26 February 2004) [KDE 3.2.1 stable] - * fix solver crash when "magic reveal" on. - * fix longstanding crash in solver dialog. - -2.1.8 (17 January 2003) [KDE 3.2 stable] - * configure button in highscores dialog - * notifications - -2.1.7e (11 May 2003) [KDE 3.1.3 stable] - * fix score trends display - -2.1.7d (30 April 2003) [KDE 3.1.2 stable] - * fix assert in custom dialog [reported by Albert Astals Cid] - -2.1.7c (17 January 2003) [KDE 3.1.1 stable] - * fix score lcd colors for custom games - -2.1.7b (3 December 2002) [KDE 3.1 stable] - * fix bug in highscores dialog in statistics and histogram tabs - * fix icons in adviser menu and in configuration dialog - * fix bug in XML configuration that was leading to a crash at program - end [report by connyosis and "Quel Qun"] - * fix bug in mean score computation - * fix bug that prevents logging solver actions - -2.1.7 (27 July 2002) - * XML configuration is working !! - * separate keyboard and general shortcuts in configuration dialog - * add "advanced" tab to highscores configuration + possibility to remove - registration - * export highscores to text file - * add (optionnal) statistics and histogram to highscores dialog - * track lost games and black marks for kmines - * histogram for kmines - * some cosmetic fixes in configuration dialog - * view/save/replay/load game log - * fix a bug in KMultiConfigItem [reported by ...] - * at game end and in case of victory, do not show mines but add flags [bug - reported by ...] - -2.1.6 (24 April 2002) - * mark/unmark actions on mouse release [patch by Thomas Capricelli] - * "magic reveal" : a new option that leave only the non-trivial cases to - solve [patch by Thomas Capricelli] - * fix obscure flicker condition : keyboard play and moving pressed mouse - outside field :) - * add home/end/pageup/pagedown keyboard actions - * fix pause menu entry state in some situation - * fix resize when case size changed - * first step for game logs - -2.1.5 (14 February 2002) - * now include a solver/adviser ! [contributed by Mikhail Kourinny] - * revamped game state management - * slightly changed settings API - -2.1.4c (1 May 2002) [KDE 3.0.1 stable] - * fixed case drawing for all styles [bug reported by kanthoney and fixed by - Maksim Orlovich] - -2.1.4 (23 January 2002) - * completely revamped API for highscores + dynamic library - * revamped settings (now includes Custom minefield) - * fixed repaint of LCDs in inactive mode - -2.1.3 (29 November 2001) - * use KConfigGroupSaver everywhere - * config entry for wwhs server url (just in case ...) - -2.1.2 (19 November 2001) - * date for each highscores and for best highscore [proposed by Jenne] - * some more reorganisation - * better custom dialog - * slightly modify the init/repaint at game start : more clean & repaint could - leak some infos about mines position (?) - * forward port the bug fix from 2.1.0b (in 2.2.x branch) - * do not bother people who want to stay anonymous with message boxes - [suggestion from Bernhard Berger] - * autoreveal does not take "?" flag into account anymore - * changing nickname will change nickname in highscores list too [suggestion - from Juliette] - -2.1.1 (16 October 2001) - * port to Qt 3.0 completed (hopefully) - * some changes in highscores (nicer dialog) - * i18n error messages for wwhs - * new smiley pixmap for pause - * clicking smiley resumes when game paused - * changes in keyboard accelators since Ctrl and Shift seems to be - forbidden as keys now ... - * count nb of clicks (reveal, autoreveal, mark) and display it in highscores. - -2.1.0b (19 November 2001) - * fix a nasty bug : uncorrect flag was not shown at game over in certain - cases [thanx for the bug reports from Viira and from an anonymous admin :)] - -2.1.0 (17 July 2001) [KDE 2.2 stable] - * fixed checked entry in "show highscores" submenu - -2.0.13 (10 June 2001) - * enable world-wide highscores !! - -2.0.12 (09 June 2001) - * option to put the game in pause mode if the window loses focus [proposed by - Bernhard Berger] - * better default keys + fixed autoreveal display for keyboard game - * use KStdGameAction - * big revamping of highscores + use of KHighscores - * removed status bar (ugly and not very useful) - -2.0.11 (14 March 2001) - * changed highscores accelerator to CTRL + H (more standard) - * better use of session-management - -2.0.10 (23 October 2000) [KDE 2.1 stable] - * fixed mouse action in settings (autoreveal and toggle mark were inversed) - -2.0.9 (21 September 2000) [KDE 2.0 stable] - * fix obscure bug reported by Tobias Oed (was crashing version 1.0.1a !) - : mouse buttons were messing things when pressed simultaneously. - * in the same move : simplified some code and correct a small buglet due to - rounding error (with left mouse button pressed, the first line and first - column case was pressed when the mouse was moved just outside the top and - left side of the field). - -2.0.8 (7 September 2000) - * fix bug that was pausing a stopped game when calling highscores - -2.0.7 (4 September 2000) - * fixed bug in mine field drawing with some styles [found by Gerard Delafond - and Tobias Kretschmar] that induces a complete rewrite of the drawing code. - now it honors the global style (beautiful in marble style) and it even - leads to code simplification ! - * the keyboard cursor uses now the focus drawing method. - * fixed bug when field.width != field.height when exploding - * fixed font in the pause button (with non standard case size) - * fixed behaviour of button in highscores dialog when entering the winner name - [proposed by Lotta Inkovaara for ksirtet] - * keyboard is disabled by default - -2.0.6 (23 August 2000) - * use of KMainWindow (replace KTMainWindow) but this does not solve the - resizing problems :( - * pause game when high scores requested - * custom game settings are saved [feature suggested by Toan Nguyen, - Williaw Barnes and François-Xavier Duranceau] - * solve the resizing problems by intercepting the Layout Hint event ... - (due to limitations in K/QMainWindow IMHO) - -2.0.5 (14 June 2000) - * default for mouse binding changed - * added color configuration for numbers, flag and explosion (for B&W monitors - and few-colors themes) [feature suggested by Hume Smith and François-Xavier - Duranceau] - * moved around some things about configuration (cleaned up "defines.h") - * case state is now more clean (but some bugs might have crept in) - * properly mark all the flagged cases with no mine to error on game end - * versioning the XMLGUI file - -2.0.4 (11 April 2000) - * hack to resize correctly when menu is hidden (due to bugs - in KTMainWindow) - * nicer (and simpler) custom level dialog with KNumIntInput - * kstatusbar in place of the label - * remove the title in dialogs (more consistent with other apps) - -2.0.3 (6 April 2000) - * use kkeydialog for actions - * rationalize settings (much better now) - * animate autoreveal with keyboard - * enable/disable and change text for pause in menu - * configuration of mouse bindings [idea of FX Duranceau] - -2.0.2 (28 February 2000) - * XMLify the GUI - -2.0.1 (19 February 2000) - * KAction/KAccel integrated - * keyboard play - * can choose case size (font is scaled) - * less flicker in repainting (+ fixed a strange divide negative int by - uint thing) - * fix the pixmaps drawing so that they are not too bad in custom case sizes - -2.0.0 (14 December 1999) - * use of KDialogBase and KAboutData/KAboutDialog - * unflagged mines are shown at game's end - * hack for focus handling in highscores dialog ... - * slightly better LCDs, message label and smiley button - * fixed a bug when clicking on the frame outside the mine field - * small fixes for custom games - * "What's This" added. - -1.0.6 (21 July 1999) - * slightly better highscores dialog - * fixed a bug in flagged mines display (cannot be negative) - * the LCDs gets red when there are more flagged cases than mines - and when you have used more time than the better player. - * use of a status bar. - * the smiley moods are now XPMs [made by Andreas Zehender] - -1.0.5 (6 July 1999) - * fixed layout handling (all this "updateGeometry" and "LayoutHint" stuff) - * space bar hit cannot restart game anymore - * clean code (config) + level is saved - -1.0.4 (12 March 1999) - * porting to QT 2.0 - -1.0.3 (10 March 1999) -Mario Weilguni <mweilg...@kde.org> - * fixed the bug in the level selection (showed up with Qt 2.0) - * fixed layout for Qt 2.0 - * fixed signal/slot handling for Qt 2.0 - * fixed layout with floating menubar - * level menu items are now checked - -1.0.2 (23 February 1999) - * bug fix : argh! a "brown paper bag" one [bug report by Szokovacs Robert] - -1.0.1 (2 Junuary 1999) [KDE 1.1 stable] - * bug fix : when paused a game can be continued by changing desktops or - iconifying/deiconifying without time consumption ... [bug report by - François-Xavier Duranceau, Frank Pieczynski & Oliver Eiden] - * add printing facility : well it seems hacky to me and certainly not perfect - but it works ... [feature suggested by Tomislav Marsic] - -1.0.0 (18 June 1998) [KDE 1.0 stable] - * final cleanup before 1.0 ! - -0.6.12 (9 June 1998) - * use QLayout for "custom level dialog" and "highscore dialog" - * some cleanup - * and a fix ! (yes there was a bug still lurking : when only two - uncovered cases remain, it was possible to win on clicking on the mine) - -0.6.11 - * Added kapp->getHelpMenu() & setCaption() [Robert Williams] - -0.6.10 - * included in the CVS tree - -0.6.9 - * bugfix from Anders Widell (doesn't allow anymore to middle click on a flag) - -0.6.8 - * some polishing (game over message do not overwrite mines number & marked - mines stay marked even when the game is lost : so you can completely analyse - why you have lost :) [thanx to Christoph Rummel for pointing these to me] - -0.6.7 - * internationalization - -0.6.6 - * no more NULLs (for the sake of 64bits) - * nicer dialog boxes - * no mine on first click - -0.6.5 - * minor changes - * "kexample 0.31" compliant - -0.6.4 - * adapted to libkdecore 0.7 - * hide/show menubar and popup - * more compliant to the Style Guide - -0.6.3 - * use kdehelp - * updating of Makefile (use KDEDIR) - * use kmsgbox - -0.62 - * use KKeyCode to manage some keyboard shortcuts - -0.6 - * change the class name "Status" to "KStatus" as an include file present on my - system defines something called "Status"... - -0.5 - * use KApp for configuration and highscoring save (via KConfig) - * better look of option & highscores windows - -0.4 - * minor bug fix - * 4 spaces tabs indentation - * slight change in the "pause code" - -0.3 - * the random configuration seems to be a bit too repetitive ... - (fixed : silly me !) - * a red cross must show where the marked cases have not contained mines - * uncover case on button release, not on button push and also allow moving - the mouse with the left button pressed - * clear function with the mid*button : it should be kool :) - * a pause entry in the menu - * QLCD for timer and mines left - * cleaning of the highscore stuff (the highscore file is now in the home dir) - * option : "'?' mark" on/off (the default behaviour is on : you can change - it by editing the defines.h file) - -0.2 - * some code reorganisation - * timer starts at first click now - * it is no more possible to click on a marked or uncertain case now - * a small help - * colored pixmaps - * a better look (?) - * highscoring - * custom level diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/CMakeLists.txt new/kmines-15.04.0/CMakeLists.txt --- old/kmines-14.12.3/CMakeLists.txt 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/CMakeLists.txt 2015-03-25 13:25:37.000000000 +0100 @@ -1,21 +1,42 @@ project(kmines) -if(NOT COMPILING_KDEGAMES) - find_package(KDE4 REQUIRED) - include(KDE4Defaults) - include(MacroLibrary) - find_package(KDEGames 4.9.0 REQUIRED) - - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) - include_directories(${KDEGAMES_INCLUDE_DIRS} ${KDE4_INCLUDES} ${QDBUS_INCLUDE_DIRS}) -endif(NOT COMPILING_KDEGAMES) +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +set (QT_MIN_VERSION "5.2.0") + +find_package(ECM 1.3.0 REQUIRED CONFIG) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Test Qml) +find_package(KF5 REQUIRED COMPONENTS + CoreAddons + Config + WidgetsAddons + Config + DBusAddons + I18n + ConfigWidgets + TextWidgets + XmlGui + KIO + NotifyConfig) + +find_package(KF5KDEGames 4.9.0 REQUIRED) +find_package(Phonon4Qt5) + +include(FeatureSummary) +include(ECMInstallIcons) +include(KDEInstallDirs) +include(KDECompilerSettings) +include(KDECMakeSettings) + +add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) add_subdirectory( data ) add_subdirectory( themes ) add_subdirectory( doc ) -include_directories( ${CMAKE_SOURCE_DIR}/libkdegames/highscore ) +include_directories( ${CMAKE_SOURCE_DIR}/KF5KDEGames/highscore ) +add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") ########### next target ############### @@ -28,18 +49,24 @@ scene.cpp main.cpp ) -kde4_add_ui_files(kmines_SRCS customgame.ui generalopts.ui) - -kde4_add_kcfg_files(kmines_SRCS settings.kcfgc ) - -kde4_add_app_icon(kmines_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/data/hi*-app-kmines.png") -kde4_add_executable(kmines ${kmines_SRCS}) - -target_link_libraries(kmines kdegames) +ki18n_wrap_ui(kmines_SRCS customgame.ui generalopts.ui) +kconfig_add_kcfg_files(kmines_SRCS settings.kcfgc ) +#kde4_add_app_icon(kmines_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/data/*-apps-kmines.png") +add_executable(kmines ${kmines_SRCS}) + +target_link_libraries(kmines + KF5::TextWidgets + KF5::WidgetsAddons + KF5::DBusAddons + Qt5::Qml + KF5::XmlGui + KF5KDEGames) install(TARGETS kmines ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( FILES kminesui.rc DESTINATION ${DATA_INSTALL_DIR}/kmines ) +install( FILES kminesui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kmines ) install( FILES kmines.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) + +feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/README.PACKAGERS new/kmines-15.04.0/README.PACKAGERS --- old/kmines-14.12.3/README.PACKAGERS 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/README.PACKAGERS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -MINIMAL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/cellitem.cpp new/kmines-15.04.0/cellitem.cpp --- old/kmines-14.12.3/cellitem.cpp 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/cellitem.cpp 2015-03-25 13:25:37.000000000 +0100 @@ -21,8 +21,6 @@ #include "settings.h" -#include <kdebug.h> - QHash<int, QString> CellItem::s_digitNames; QHash<KMinesState::CellState, QList<QString> > CellItem::s_stateNames; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/customgame.ui new/kmines-15.04.0/customgame.ui --- old/kmines-14.12.3/customgame.ui 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/customgame.ui 2015-03-25 13:25:37.000000000 +0100 @@ -18,7 +18,7 @@ </widget> </item> <item row="0" column="1" > - <widget class="KIntSpinBox" name="kcfg_CustomWidth" /> + <widget class="KPluralHandlingSpinBox" name="kcfg_CustomWidth" /> </item> <item row="1" column="0" > <widget class="QLabel" name="label_2" > @@ -28,7 +28,7 @@ </widget> </item> <item row="1" column="1" > - <widget class="KIntSpinBox" name="kcfg_CustomHeight" /> + <widget class="KPluralHandlingSpinBox" name="kcfg_CustomHeight" /> </item> <item row="2" column="0" > <widget class="QLabel" name="label_3" > @@ -38,7 +38,7 @@ </widget> </item> <item row="2" column="1" > - <widget class="KIntSpinBox" name="kcfg_CustomMines" /> + <widget class="KPluralHandlingSpinBox" name="kcfg_CustomMines" /> </item> <item row="0" column="2" > <spacer> @@ -70,9 +70,9 @@ </widget> <customwidgets> <customwidget> - <class>KIntSpinBox</class> + <class>KPluralHandlingSpinBox</class> <extends>QSpinBox</extends> - <header>knuminput.h</header> + <header>kpluralhandlingspinbox.h</header> </customwidget> </customwidgets> <resources/> Files old/kmines-14.12.3/data/16-apps-kmines.png and new/kmines-15.04.0/data/16-apps-kmines.png differ Files old/kmines-14.12.3/data/22-apps-kmines.png and new/kmines-15.04.0/data/22-apps-kmines.png differ Files old/kmines-14.12.3/data/32-apps-kmines.png and new/kmines-15.04.0/data/32-apps-kmines.png differ Files old/kmines-14.12.3/data/48-apps-kmines.png and new/kmines-15.04.0/data/48-apps-kmines.png differ Files old/kmines-14.12.3/data/64-apps-kmines.png and new/kmines-15.04.0/data/64-apps-kmines.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/data/CMakeLists.txt new/kmines-15.04.0/data/CMakeLists.txt --- old/kmines-14.12.3/data/CMakeLists.txt 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/data/CMakeLists.txt 2015-03-25 13:25:37.000000000 +0100 @@ -1,6 +1,14 @@ -install( PROGRAMS kmines.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES kmines.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kmines ) +install( PROGRAMS org.kde.kmines.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES kmines.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} ) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +ecm_install_icons(ICONS + 16-apps-kmines.png + 22-apps-kmines.png + 32-apps-kmines.png + 48-apps-kmines.png + 64-apps-kmines.png + DESTINATION ${ICON_INSTALL_DIR} + THEME hicolor +) Files old/kmines-14.12.3/data/hi16-app-kmines.png and new/kmines-15.04.0/data/hi16-app-kmines.png differ Files old/kmines-14.12.3/data/hi22-app-kmines.png and new/kmines-15.04.0/data/hi22-app-kmines.png differ Files old/kmines-14.12.3/data/hi32-app-kmines.png and new/kmines-15.04.0/data/hi32-app-kmines.png differ Files old/kmines-14.12.3/data/hi48-app-kmines.png and new/kmines-15.04.0/data/hi48-app-kmines.png differ Files old/kmines-14.12.3/data/hi64-app-kmines.png and new/kmines-15.04.0/data/hi64-app-kmines.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/data/kmines.desktop new/kmines-15.04.0/data/kmines.desktop --- old/kmines-14.12.3/data/kmines.desktop 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/data/kmines.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,141 +0,0 @@ -[Desktop Entry] -Name=KMines -Name[af]=Kmyne -Name[ast]=KMines -Name[be]=Сапёр -Name[bn]=কে-মাইন্স -Name[br]=KMines -Name[bs]=KMines -Name[ca]=KMines -Name[ca@valencia]=KMines -Name[cs]=KMines -Name[cy]=KMines -Name[da]=KMines -Name[de]=KMines -Name[el]=KMines -Name[en_GB]=KMines -Name[eo]=KMines -Name[es]=KMines -Name[et]=KMines -Name[eu]=KMines -Name[fa]=مینیاب -Name[fi]=KMines -Name[fr]=KMines -Name[ga]=KMines -Name[gl]=KMines -Name[he]=KMines -Name[hne]=के-माइन्स -Name[hr]=KMines -Name[hu]=KMines -Name[is]=KMines -Name[it]=KMines -Name[ja]=KMines -Name[kk]=KMines -Name[km]=KMines -Name[ko]=KMines -Name[lt]=KMines -Name[lv]=KMines -Name[mk]=KMines -Name[mr]=के-माइन्स -Name[nb]=KMines -Name[nds]=KMines -Name[ne]=केडीई बारुद -Name[nl]=KMines -Name[nn]=KMinesveipar -Name[pa]=ਕੇ-ਸਰੁੰਗ -Name[pl]=Miny -Name[pt]=KMines -Name[pt_BR]=KMines -Name[ro]=KMine -Name[ru]=KMines -Name[se]=KMines -Name[sk]=KMines -Name[sl]=KMine -Name[sq]=KMines -Name[sr]=К‑мине -Name[sr@ijekavian]=К‑мине -Name[sr@ijekavianlatin]=K‑mine -Name[sr@latin]=K‑mine -Name[sv]=Röja minor -Name[ta]=கேகன்னிவெடிகள் -Name[tg]=KСапёр -Name[tr]=KMines -Name[ug]=KMines -Name[uk]=Сапер -Name[vi]=KMines -Name[wa]=KMenes -Name[xh]=KMines -Name[x-test]=xxKMinesxx -Name[zh_CN]=KMines -Name[zh_TW]=KMines 踩地雷 -Icon=kmines -Exec=kmines -caption %c -Type=Application -X-DocPath=kmines/index.html -GenericName=Minesweeper-like Game -GenericName[ast]=Xuegu asemeyáu al guetamines -GenericName[be]=Гульня ў сапёра -GenericName[bn]=মাইনসুইপার-জাতীয় খেলা -GenericName[br]=C'hoari doare Minesweeper -GenericName[bs]=Igra kao minolovac -GenericName[ca]=Joc a l'estil del buscamines -GenericName[ca@valencia]=Joc a l'estil del buscamines -GenericName[cs]=Hra s minovým polem -GenericName[cy]=Gêm tebyg i Minesweeper -GenericName[da]=Minestryger-lignende spil -GenericName[de]=„Minesweeper“-Spiel -GenericName[el]=Παιχνίδι παρόμοιο με το ναρκαλιευτή -GenericName[en_GB]=Minesweeper-like Game -GenericName[eo]="Minesweeper"-simila ludo -GenericName[es]=Juego similar al Buscaminas -GenericName[et]=Miiniväljamäng -GenericName[eu]=Mina bilatzailearen antzeko jokoa -GenericName[fa]=بازی شبیه مینیاب -GenericName[fi]=Miinaharava-tyylinen peli -GenericName[fr]=Jeu dans le style du démineur -GenericName[ga]=Cluiche cosúil le Minesweeper -GenericName[gl]=Xogo como o busca minas -GenericName[he]=חיקוי שולה מוקשים -GenericName[hne]=माइनस्वीपर जइसन खेल -GenericName[hr]=Igra s poput Minesweepera -GenericName[hu]=Aknakereső -GenericName[is]=Leikur sem líkist Minesweeper -GenericName[it]=Gioco simile a Mine -GenericName[ja]=地雷ゲーム -GenericName[kk]="Сапёр" секілді ойын -GenericName[km]=ល្បែងដូច Minesweeper -GenericName[ko]=지뢰찾기 게임 -GenericName[lt]=Išminuotojo tipo žaidimas -GenericName[lv]=Minesweeper līdzīga spēle -GenericName[mk]=Игра слична на Minesweeper -GenericName[mr]=माइनस्वीपर सारखा खेळ -GenericName[nb]=Minesveiper-lignende spill -GenericName[nds]=Minesweeper-liek Speel -GenericName[ne]=बारुद हटाउने जस्तै खेल -GenericName[nl]=Mijnenveger-achtig spel -GenericName[nn]=Minesveipar-liknande spel -GenericName[pa]=ਸੁਰੰਗ ਹਟਾਓਣ ਵਰਗੀ ਖੇਡ -GenericName[pl]=Gra typu saper -GenericName[pt]=Jogo tipo Minas -GenericName[pt_BR]=Jogo semelhante ao Campo Minado -GenericName[ro]=Un joc ca Detectorul de mine -GenericName[ru]=Игра в сапёра -GenericName[sk]=Hra typu hľadanie mín -GenericName[sl]=Igra podobna Minolovcu -GenericName[sq]=Lojë si Minesweeper -GenericName[sr]=Игра налик на Миноловац -GenericName[sr@ijekavian]=Игра налик на Миноловац -GenericName[sr@ijekavianlatin]=Igra nalik na Minolovac -GenericName[sr@latin]=Igra nalik na Minolovac -GenericName[sv]=Minröjarliknande spel -GenericName[ta]=சுரங்கம்வெட்டும் விளையாட்டு -GenericName[tr]=Mayın Tarlası-benzeri Oyun -GenericName[ug]=مىنا تازىلاشقا ئوخشاش ئويۇن -GenericName[uk]=Гра в сапера -GenericName[wa]=On djeu di tchamp d' menes -GenericName[x-test]=xxMinesweeper-like Gamexx -GenericName[zh_CN]=扫雷游戏 -GenericName[zh_TW]=類似踩地雷的遊戲 -X-KDE-StartupNotify=true -X-DBUS-StartupType=Multi -Categories=Qt;KDE;Game;StrategyGame; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/data/org.kde.kmines.desktop new/kmines-15.04.0/data/org.kde.kmines.desktop --- old/kmines-14.12.3/data/org.kde.kmines.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kmines-15.04.0/data/org.kde.kmines.desktop 2015-03-25 13:25:37.000000000 +0100 @@ -0,0 +1,142 @@ +[Desktop Entry] +Name=KMines +Name[af]=Kmyne +Name[ast]=KMines +Name[be]=Сапёр +Name[bn]=কে-মাইন্স +Name[br]=KMines +Name[bs]=KMines +Name[ca]=KMines +Name[ca@valencia]=KMines +Name[cs]=KMines +Name[cy]=KMines +Name[da]=KMines +Name[de]=KMines +Name[el]=KMines +Name[en_GB]=KMines +Name[eo]=KMines +Name[es]=KMines +Name[et]=KMines +Name[eu]=KMines +Name[fa]=مینیاب +Name[fi]=KMines +Name[fr]=KMines +Name[ga]=KMines +Name[gl]=KMines +Name[he]=KMines +Name[hne]=के-माइन्स +Name[hr]=KMines +Name[hu]=KMines +Name[is]=KMines +Name[it]=KMines +Name[ja]=KMines +Name[kk]=KMines +Name[km]=KMines +Name[ko]=KMines +Name[lt]=KMines +Name[lv]=KMines +Name[mk]=KMines +Name[mr]=के-माइन्स +Name[nb]=KMines +Name[nds]=KMines +Name[ne]=केडीई बारुद +Name[nl]=KMines +Name[nn]=KMinesveipar +Name[pa]=ਕੇ-ਸਰੁੰਗ +Name[pl]=Miny +Name[pt]=KMines +Name[pt_BR]=KMines +Name[ro]=KMine +Name[ru]=KMines +Name[se]=KMines +Name[sk]=KMines +Name[sl]=KMine +Name[sq]=KMines +Name[sr]=К‑мине +Name[sr@ijekavian]=К‑мине +Name[sr@ijekavianlatin]=K‑mine +Name[sr@latin]=K‑mine +Name[sv]=Röja minor +Name[ta]=கேகன்னிவெடிகள் +Name[tg]=KСапёр +Name[tr]=KMines +Name[ug]=KMines +Name[uk]=Сапер +Name[vi]=KMines +Name[wa]=KMenes +Name[xh]=KMines +Name[x-test]=xxKMinesxx +Name[zh_CN]=KMines +Name[zh_TW]=KMines 踩地雷 +Icon=kmines +Exec=kmines -qwindowtitle %c +Type=Application +X-DocPath=kmines/index.html +GenericName=Minesweeper-like Game +GenericName[ast]=Xuegu asemeyáu al guetamines +GenericName[be]=Гульня ў сапёра +GenericName[bn]=মাইনসুইপার-জাতীয় খেলা +GenericName[br]=C'hoari doare Minesweeper +GenericName[bs]=Igra kao minolovac +GenericName[ca]=Joc a l'estil del buscamines +GenericName[ca@valencia]=Joc a l'estil del buscamines +GenericName[cs]=Hra s minovým polem +GenericName[cy]=Gêm tebyg i Minesweeper +GenericName[da]=Minestryger-lignende spil +GenericName[de]=„Minesweeper“-Spiel +GenericName[el]=Παιχνίδι παρόμοιο με το ναρκαλιευτή +GenericName[en_GB]=Minesweeper-like Game +GenericName[eo]="Minesweeper"-simila ludo +GenericName[es]=Juego similar al Buscaminas +GenericName[et]=Miiniväljamäng +GenericName[eu]=Mina bilatzailearen antzeko jokoa +GenericName[fa]=بازی شبیه مینیاب +GenericName[fi]=Miinaharava-tyylinen peli +GenericName[fr]=Jeu dans le style du démineur +GenericName[ga]=Cluiche cosúil le Minesweeper +GenericName[gl]=Xogo como o busca minas +GenericName[he]=חיקוי שולה מוקשים +GenericName[hne]=माइनस्वीपर जइसन खेल +GenericName[hr]=Igra s poput Minesweepera +GenericName[hu]=Aknakereső +GenericName[is]=Leikur sem líkist Minesweeper +GenericName[it]=Gioco simile a Mine +GenericName[ja]=地雷ゲーム +GenericName[kk]="Сапёр" секілді ойын +GenericName[km]=ល្បែងដូច Minesweeper +GenericName[ko]=지뢰찾기 게임 +GenericName[lt]=Išminuotojo tipo žaidimas +GenericName[lv]=Minesweeper līdzīga spēle +GenericName[mk]=Игра слична на Minesweeper +GenericName[mr]=माइनस्वीपर सारखा खेळ +GenericName[nb]=Minesveiper-lignende spill +GenericName[nds]=Minesweeper-liek Speel +GenericName[ne]=बारुद हटाउने जस्तै खेल +GenericName[nl]=Mijnenveger-achtig spel +GenericName[nn]=Minesveipar-liknande spel +GenericName[pa]=ਸੁਰੰਗ ਹਟਾਓਣ ਵਰਗੀ ਖੇਡ +GenericName[pl]=Gra typu saper +GenericName[pt]=Jogo tipo Minas +GenericName[pt_BR]=Jogo semelhante ao Campo Minado +GenericName[ro]=Un joc ca Detectorul de mine +GenericName[ru]=Игра в сапёра +GenericName[sk]=Hra typu hľadanie mín +GenericName[sl]=Igra podobna Minolovcu +GenericName[sq]=Lojë si Minesweeper +GenericName[sr]=Игра налик на Миноловац +GenericName[sr@ijekavian]=Игра налик на Миноловац +GenericName[sr@ijekavianlatin]=Igra nalik na Minolovac +GenericName[sr@latin]=Igra nalik na Minolovac +GenericName[sv]=Minröjarliknande spel +GenericName[ta]=சுரங்கம்வெட்டும் விளையாட்டு +GenericName[tr]=Mayın Tarlası-benzeri Oyun +GenericName[ug]=مىنا تازىلاشقا ئوخشاش ئويۇن +GenericName[uk]=Гра в сапера +GenericName[wa]=On djeu di tchamp d' menes +GenericName[x-test]=xxMinesweeper-like Gamexx +GenericName[zh_CN]=扫雷游戏 +GenericName[zh_TW]=類似踩地雷的遊戲 +StartupNotify=true +X-DBUS-StartupType=Multi +Categories=Qt;KDE;Game;StrategyGame; +X-DBUS-ServiceName=org.kde.kmines diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/doc/CMakeLists.txt new/kmines-15.04.0/doc/CMakeLists.txt --- old/kmines-14.12.3/doc/CMakeLists.txt 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/doc/CMakeLists.txt 2015-03-25 13:25:37.000000000 +0100 @@ -1,4 +1,4 @@ ########### install files ############### # # -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmines) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmines) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/doc/index.docbook new/kmines-15.04.0/doc/index.docbook --- old/kmines-14.12.3/doc/index.docbook 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/doc/index.docbook 2015-03-25 13:25:37.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&kmines;"> <!ENTITY package "kdegames"> <!ENTITY % addindex "IGNORE"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/main.cpp new/kmines-15.04.0/main.cpp --- old/kmines-14.12.3/main.cpp 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/main.cpp 2015-03-25 13:25:37.000000000 +0100 @@ -16,11 +16,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kapplication.h> -#include <klocale.h> -#include <kcmdlineargs.h> #include <kaboutdata.h> +#include <kdelibs4configmigrator.h> +#include <klocalizedstring.h> +#include <QApplication> +#include <QCommandLineParser> +#include <KDBusService> +#include <KSharedConfig> #include "version.h" #include "mainwindow.h" @@ -30,31 +33,52 @@ int main(int argc, char **argv) { - KAboutData aboutData("kmines", 0, ki18n("KMines"), LONG_VERSION, - ki18n(DESCRIPTION), KAboutData::License_GPL, - ki18n(COPYLEFT), KLocalizedString(), HOMEPAGE); - aboutData.addAuthor(ki18n("Nicolas Hadacek"), - ki18n("Original author"), "hada...@kde.org"); - aboutData.addAuthor(ki18n("Mauricio Piacentini"), - ki18n("Code refactoring and SVG support. Current maintainer"), - "mauri...@tabuleiro.com"); - aboutData.addAuthor(ki18n("Dmitry Suzdalev"), - ki18n("Rewrite to use QGraphicsView framework. Current maintainer"), - "dim...@gmail.com"); - aboutData.addCredit(ki18n("Andreas Zehender"), ki18n("Smiley pixmaps")); - aboutData.addCredit(ki18n("Mikhail Kourinny"), ki18n("Solver/Adviser")); - aboutData.addCredit(ki18n("Thomas Capricelli"), ki18n("Magic reveal mode")); - aboutData.addCredit(ki18n("Brian Croom"), ki18n("Port to use KGameRenderer")); - KCmdLineArgs::init(argc, argv, &aboutData); + QApplication app(argc, argv); - KApplication a; - KGlobal::locale()->insertCatalog( QLatin1String( "libkdegames" )); + Kdelibs4ConfigMigrator migrate(QLatin1String("kmines")); + migrate.setConfigFiles(QStringList() << QLatin1String("kminesrc")); + migrate.setUiFiles(QStringList() << QLatin1String("kminesui.rc")); + if(migrate.migrate()) + { + // update the configuration cache + KSharedConfig::openConfig()->reparseConfiguration(); + } - if ( a.isSessionRestored() ) + KAboutData aboutData(QStringLiteral("kmines"), i18n("KMines"), QStringLiteral(LONG_VERSION), + i18n(DESCRIPTION), KAboutLicense::GPL, + i18n(COPYLEFT), QString(), QStringLiteral(HOMEPAGE)); + aboutData.addAuthor(i18n("Nicolas Hadacek"), + i18n("Original author"), QStringLiteral("hada...@kde.org")); + aboutData.addAuthor(i18n("Mauricio Piacentini"), + i18n("Code refactoring and SVG support. Current maintainer"), + QStringLiteral("mauri...@tabuleiro.com")); + aboutData.addAuthor(i18n("Dmitry Suzdalev"), + i18n("Rewrite to use QGraphicsView framework. Current maintainer"), + QStringLiteral("dim...@gmail.com")); + aboutData.addCredit(i18n("Andreas Zehender"), i18n("Smiley pixmaps")); + aboutData.addCredit(i18n("Mikhail Kourinny"), i18n("Solver/Adviser")); + aboutData.addCredit(i18n("Thomas Capricelli"), i18n("Magic reveal mode")); + aboutData.addCredit(i18n("Brian Croom"), i18n("Port to use KGameRenderer")); + + aboutData.setOrganizationDomain(QByteArray("kde.org")); + aboutData.setProductName(QByteArray("kmines")); + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kmines"))); + KAboutData::setApplicationData(aboutData); + + QCommandLineParser parser; + parser.addVersionOption(); + parser.addHelpOption(); + aboutData.setupCommandLine(&parser); + parser.process(app); + aboutData.processCommandLine(&parser); + KDBusService service; + + if ( app.isSessionRestored() ) RESTORE(KMinesMainWindow) else { KMinesMainWindow *mw = new KMinesMainWindow; mw->show(); } - return a.exec(); + + return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/mainwindow.cpp new/kmines-15.04.0/mainwindow.cpp --- old/kmines-14.12.3/mainwindow.cpp 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/mainwindow.cpp 2015-03-25 13:25:37.000000000 +0100 @@ -26,14 +26,13 @@ #include <KStandardGameAction> #include <KActionCollection> #include <KToggleAction> -#include <KStatusBar> #include <KScoreDialog> #include <KConfigDialog> #include <KgThemeSelector> #include <KMessageBox> -#include <KLocale> + +#include <QStatusBar> #include <QDesktopWidget> -#include <QPointer> #include "ui_customgame.h" #include "ui_generalopts.h" @@ -87,9 +86,10 @@ KMinesMainWindow::KMinesMainWindow() { m_scene = new KMinesScene(this); - connect(m_scene, SIGNAL(minesCountChanged(int)), SLOT(onMinesCountChanged(int))); - connect(m_scene, SIGNAL(gameOver(bool)), SLOT(onGameOver(bool))); - connect(m_scene, SIGNAL(firstClickDone()), SLOT(onFirstClick())); + + connect(m_scene, &KMinesScene::minesCountChanged, this, &KMinesMainWindow::onMinesCountChanged); + connect(m_scene, &KMinesScene::gameOver, this, &KMinesMainWindow::onGameOver); + connect(m_scene, &KMinesScene::firstClickDone, this, &KMinesMainWindow::onFirstClick); m_view = new KMinesView( m_scene, this ); m_view->setCacheMode( QGraphicsView::CacheBackground ); @@ -103,10 +103,13 @@ m_gameClock = new KGameClock(this, KGameClock::MinSecOnly); - connect(m_gameClock, SIGNAL(timeChanged(QString)), SLOT(advanceTime(QString))); + connect(m_gameClock, &KGameClock::timeChanged, this, &KMinesMainWindow::advanceTime); - statusBar()->insertItem( i18n("Mines: 0/0"), 0 ); - statusBar()->insertItem( i18n("Time: 00:00"), 1); + mineLabel->setText(i18n("Mines: 0/0")); + timeLabel->setText(i18n("Time: 00:00")); + + statusBar()->insertPermanentWidget( 0, mineLabel ); + statusBar()->insertPermanentWidget( 1, timeLabel ); setCentralWidget(m_view); setupActions(); @@ -136,11 +139,12 @@ void KMinesMainWindow::onMinesCountChanged(int count) { - statusBar()->changeItem( i18n("Mines: %1/%2", count, m_scene->totalMines()), 0 ); + mineLabel->setText(i18n("Mines: %1/%2", count, m_scene->totalMines())); } void KMinesMainWindow::newGame() { + qDebug() << "Inside game"; m_gameClock->restart(); m_gameClock->pause(); // start only with the 1st click @@ -172,7 +176,8 @@ //unsupported break; } - statusBar()->changeItem( i18n("Time: 00:00"), 1); + + timeLabel->setText(i18n("Time: 00:00")); } void KMinesMainWindow::onGameOver(bool won) @@ -202,7 +207,7 @@ void KMinesMainWindow::advanceTime(const QString& timeStr) { - statusBar()->changeItem( i18n("Time: %1", timeStr), 1 ); + timeLabel->setText(i18n("Time: %1", timeStr)); } void KMinesMainWindow::onFirstClick() @@ -232,8 +237,8 @@ dialog->addPage( new KgThemeSelector( m_scene->renderer().themeProvider() ), i18n( "Theme" ), QLatin1String( "games-config-theme" )); dialog->addPage( new CustomGameConfig( dialog ), i18n("Custom Game"), QLatin1String( "games-config-custom" )); connect( m_scene->renderer().themeProvider(), SIGNAL(currentThemeChanged(const KgTheme*)), SLOT(loadSettings()) ); - connect( dialog, SIGNAL(settingsChanged(QString)), this, SLOT(loadSettings()) ); - dialog->setHelp(QString(),QLatin1String( "kmines" )); + connect(dialog, &KConfigDialog::settingsChanged, this, &KMinesMainWindow::loadSettings); + dialog->show(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/mainwindow.h new/kmines-15.04.0/mainwindow.h --- old/kmines-14.12.3/mainwindow.h 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/mainwindow.h 2015-03-25 13:25:37.000000000 +0100 @@ -20,6 +20,9 @@ #include <KXmlGuiWindow> +#include <QPointer> +#include <QLabel> + class KMinesScene; class KMinesView; class KGameClock; @@ -46,5 +49,8 @@ KMinesView* m_view; KGameClock* m_gameClock; KToggleAction* m_actionPause; + + QPointer<QLabel> mineLabel = new QLabel; + QPointer<QLabel> timeLabel = new QLabel; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/minefielditem.cpp new/kmines-15.04.0/minefielditem.cpp --- old/kmines-14.12.3/minefielditem.cpp 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/minefielditem.cpp 2015-03-25 13:25:37.000000000 +0100 @@ -18,7 +18,7 @@ */ #include "minefielditem.h" -#include <kdebug.h> +#include <QDebug> #include <QGraphicsScene> #include <QGraphicsSceneMouseEvent> @@ -314,7 +314,7 @@ CellItem* itemUnderMouse = itemAt(row,col); if(!itemUnderMouse) { - kDebug() << "unexpected - no item under mouse"; + qDebug() << "unexpected - no item under mouse"; return; } @@ -528,7 +528,7 @@ int idx = m_cells.indexOf(item); if(idx == -1) { - kDebug() << "really strange - item not found"; + qDebug() << "really strange - item not found"; return; } @@ -604,4 +604,4 @@ -#include "minefielditem.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/scene.cpp new/kmines-15.04.0/scene.cpp --- old/kmines-14.12.3/scene.cpp 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/scene.cpp 2015-03-25 13:25:37.000000000 +0100 @@ -21,8 +21,9 @@ #include "settings.h" #include <QResizeEvent> + #include <KGamePopupItem> -#include <KLocale> +#include <KLocalizedString> #include <KgThemeProvider> #include "minefielditem.h" @@ -44,6 +45,7 @@ { KgThemeProvider* prov = new KgThemeProvider; prov->discoverThemes("appdata", QLatin1String("themes")); + return prov; } @@ -52,24 +54,24 @@ { setItemIndexMethod( NoIndex ); m_fieldItem = new MineFieldItem(&m_renderer); - connect(m_fieldItem, SIGNAL(flaggedMinesCountChanged(int)), SIGNAL(minesCountChanged(int))); - connect(m_fieldItem, SIGNAL(firstClickDone()), SIGNAL(firstClickDone())); - connect(m_fieldItem, SIGNAL(gameOver(bool)), SLOT(onGameOver(bool))); + connect(m_fieldItem, &MineFieldItem::flaggedMinesCountChanged, this, &KMinesScene::minesCountChanged); + connect(m_fieldItem, &MineFieldItem::firstClickDone, this, &KMinesScene::firstClickDone); + connect(m_fieldItem, &MineFieldItem::gameOver, this, &KMinesScene::onGameOver); // and re-emit it for others - connect(m_fieldItem, SIGNAL(gameOver(bool)), SIGNAL(gameOver(bool))); + connect(m_fieldItem, &MineFieldItem::gameOver, this, &KMinesScene::gameOver); addItem(m_fieldItem); m_messageItem = new KGamePopupItem; m_messageItem->setMessageOpacity(0.9); m_messageItem->setMessageTimeout(4000); addItem(m_messageItem); - + m_gamePausedMessageItem = new KGamePopupItem; m_gamePausedMessageItem->setMessageOpacity(0.9); m_gamePausedMessageItem->setMessageTimeout(0); m_gamePausedMessageItem->setHideOnMouseClick(false); addItem(m_gamePausedMessageItem); - + setBackgroundBrush(m_renderer.spritePixmap(QLatin1String( "mainWidget" ), sceneRect().size().toSize())); } @@ -118,4 +120,4 @@ m_messageItem->showMessage(i18n("You have lost."), KGamePopupItem::Center); } -#include "scene.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-14.12.3/version.h new/kmines-15.04.0/version.h --- old/kmines-14.12.3/version.h 2014-12-30 09:54:13.000000000 +0100 +++ new/kmines-15.04.0/version.h 2015-03-25 13:25:37.000000000 +0100 @@ -20,8 +20,8 @@ #ifndef KMINES_VERSION_H #define KMINES_VERSION_H -#define VERSION "3.0" -#define LONG_VERSION "3.0 (02 Aug 2007)" +#define VERSION "4.0" +#define LONG_VERSION "4.0 (29 Jan 2015)" #define COPYLEFT "(c) 1996-2005, Nicolas Hadacek\n(c) 2001, Mikhail Kourinny\n(c) 2006-2007, Mauricio Piacentini\n(c) 2007, Dmitry Suzdalev" #define HOMEPAGE "http://games.kde.org/kmines";
