Hello community, here is the log from the commit of package kiriki for openSUSE:Factory checked in at 2015-10-03 20:21:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiriki (Old) and /work/SRC/openSUSE:Factory/.kiriki.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiriki" Changes: -------- --- /work/SRC/openSUSE:Factory/kiriki/kiriki.changes 2015-07-14 17:35:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiriki.new/kiriki.changes 2015-10-03 20:21:29.000000000 +0200 @@ -1,0 +2,23 @@ +Sun Sep 13 19:16:29 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.1 + * KDE Applications 15.08.1 + * https://www.kde.org/announcements/announce-applications-15.08.1.php + + +------------------------------------------------------------------- +Wed Aug 19 19:43:23 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.0 + * KDE Applications 15.08.0 + * https://www.kde.org/announcements/announce-applications-15.08.0.php + +------------------------------------------------------------------- +Fri Aug 7 06:55:19 UTC 2015 - [email protected] + +- Update to KDE Applications 15.07.90 + * KDE Applications 15.08.0 RC1 + * https://www.kde.org/announcements/announce-applications-15.07.90.php + + +------------------------------------------------------------------- Old: ---- kiriki-15.04.3.tar.xz New: ---- kiriki-15.08.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiriki.spec ++++++ --- /var/tmp/diff_new_pack.V599N2/_old 2015-10-03 20:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V599N2/_new 2015-10-03 20:21:30.000000000 +0200 @@ -17,17 +17,43 @@ Name: kiriki -BuildRequires: libkdegames4-devel -BuildRequires: xz +BuildRequires: libkdegames-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: extra-cmake-modules +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kitemmodels-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kwindowsystem-devel +BuildRequires: kcodecs-devel +BuildRequires: karchive-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdnssd-framework-devel +BuildRequires: ki18n-devel +BuildRequires: kservice-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kitemviews-devel +BuildRequires: kiconthemes-devel +BuildRequires: kcompletion-devel +BuildRequires: kxmlgui-devel +BuildRequires: kio-devel +BuildRequires: knotifyconfig-devel +BuildRequires: kdoctools-devel +BuildRequires: kdelibs4support-devel Summary: Yahtzee-like Game License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 15.04.3 +Version: 15.08.1 Release: 0 Source0: kiriki-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Kiriki is the KDE version of the dice game Yahtzee where you roll dices @@ -38,22 +64,21 @@ %setup -q -n kiriki-%{version} %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall - %suse_update_desktop_file -r kiriki Game BoardGame - %kde_post_install + %kf5_makeinstall -C build + %suse_update_desktop_file -r org.kde.kiriki Game BoardGame %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kde4_bindir}/kiriki -%{_kde4_htmldir}/en/kiriki/ -%{_kde4_applicationsdir}/kiriki.desktop -%{_kde4_iconsdir}/hicolor/*/apps/kiriki.* -%{_kde4_appsdir}/kiriki/ +%{_kf5_bindir}/kiriki +%{_kf5_htmldir}/en/kiriki/ +%{_kf5_applicationsdir}/org.kde.kiriki.desktop +%{_kf5_iconsdir}/hicolor/*/apps/kiriki.* +%{_kf5_appsdir}/kiriki/ +%_datadir/kxmlgui5/kiriki/ %changelog ++++++ kiriki-15.04.3.tar.xz -> kiriki-15.08.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/CMakeLists.txt new/kiriki-15.08.1/CMakeLists.txt --- old/kiriki-15.04.3/CMakeLists.txt 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/CMakeLists.txt 2015-07-12 01:15:27.000000000 +0200 @@ -1,17 +1,37 @@ project(kiriki) -if(NOT COMPILING_KDEGAMES) - find_package(KDE4 REQUIRED) - include(KDE4Defaults) - include(MacroLibrary) - find_package(KDEGames REQUIRED) - - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) - include_directories(${KDEGAMES_INCLUDE_DIRS} ${KDEGAMES_INCLUDE_DIR}/highscore ${KDE4_INCLUDES} ${QDBUS_INCLUDE_DIRS}) -endif(NOT COMPILING_KDEGAMES) +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +set (QT_MIN_VERSION "5.3.0") + +find_package(ECM 1.7.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 Svg PrintSupport) +find_package(KF5 REQUIRED COMPONENTS + CoreAddons + Config + DBusAddons + I18n + GuiAddons + ConfigWidgets + IconThemes + XmlGui + KIO) + +find_package(KF5KDEGames 4.9.0 REQUIRED) + +include(FeatureSummary) +include(ECMAddAppIcon) +include(ECMInstallIcons) +include(KDEInstallDirs) +include(KDECompilerSettings) +include(KDECMakeSettings) + +add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) + add_subdirectory(src) add_subdirectory(images) add_subdirectory(icons) -add_subdirectory(doc) \ No newline at end of file +add_subdirectory(doc) +feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/README.PACKAGERS new/kiriki-15.08.1/README.PACKAGERS --- old/kiriki-15.04.3/README.PACKAGERS 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/README.PACKAGERS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -EXTENDED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/doc/CMakeLists.txt new/kiriki-15.08.1/doc/CMakeLists.txt --- old/kiriki-15.04.3/doc/CMakeLists.txt 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/doc/CMakeLists.txt 2015-07-12 01:15:27.000000000 +0200 @@ -1,2 +1,2 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kiriki) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kiriki) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/doc/index.docbook new/kiriki-15.08.1/doc/index.docbook --- old/kiriki-15.04.3/doc/index.docbook 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/doc/index.docbook 2015-07-12 01:15:27.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <!--IMPORTANT: please note that'do not change this!' notice does not apply to translators --> -<!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 "&kiriki;"> <!ENTITY kappversion "0.2"><!--Applicaion version. Use this variable everywhere it's needed.--> <!ENTITY package "kdegames"> <!-- do not change this! --> Files old/kiriki-15.04.3/icons/128-apps-kiriki.png and new/kiriki-15.08.1/icons/128-apps-kiriki.png differ Files old/kiriki-15.04.3/icons/16-apps-kiriki.png and new/kiriki-15.08.1/icons/16-apps-kiriki.png differ Files old/kiriki-15.04.3/icons/22-apps-kiriki.png and new/kiriki-15.08.1/icons/22-apps-kiriki.png differ Files old/kiriki-15.04.3/icons/32-apps-kiriki.png and new/kiriki-15.08.1/icons/32-apps-kiriki.png differ Files old/kiriki-15.04.3/icons/48-apps-kiriki.png and new/kiriki-15.08.1/icons/48-apps-kiriki.png differ Files old/kiriki-15.04.3/icons/64-apps-kiriki.png and new/kiriki-15.08.1/icons/64-apps-kiriki.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/icons/CMakeLists.txt new/kiriki-15.08.1/icons/CMakeLists.txt --- old/kiriki-15.04.3/icons/CMakeLists.txt 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/icons/CMakeLists.txt 2015-07-12 01:15:27.000000000 +0200 @@ -1,2 +1,2 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +ecm_install_icons( ICONS 128-apps-kiriki.png 16-apps-kiriki.png 22-apps-kiriki.png 32-apps-kiriki.png 48-apps-kiriki.png 64-apps-kiriki.png DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor ) Files old/kiriki-15.04.3/icons/hi128-app-kiriki.png and new/kiriki-15.08.1/icons/hi128-app-kiriki.png differ Files old/kiriki-15.04.3/icons/hi16-app-kiriki.png and new/kiriki-15.08.1/icons/hi16-app-kiriki.png differ Files old/kiriki-15.04.3/icons/hi22-app-kiriki.png and new/kiriki-15.08.1/icons/hi22-app-kiriki.png differ Files old/kiriki-15.04.3/icons/hi32-app-kiriki.png and new/kiriki-15.08.1/icons/hi32-app-kiriki.png differ Files old/kiriki-15.04.3/icons/hi48-app-kiriki.png and new/kiriki-15.08.1/icons/hi48-app-kiriki.png differ Files old/kiriki-15.04.3/icons/hi64-app-kiriki.png and new/kiriki-15.08.1/icons/hi64-app-kiriki.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/images/CMakeLists.txt new/kiriki-15.08.1/images/CMakeLists.txt --- old/kiriki-15.04.3/images/CMakeLists.txt 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/images/CMakeLists.txt 2015-07-12 01:15:27.000000000 +0200 @@ -5,6 +5,6 @@ dice-4.png dice-5.png dice-6.png - dice-none.png DESTINATION ${DATA_INSTALL_DIR}/kiriki/images + dice-none.png DESTINATION ${KDE_INSTALL_DATADIR}/kiriki/images ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/CMakeLists.txt new/kiriki-15.08.1/src/CMakeLists.txt --- old/kiriki-15.04.3/src/CMakeLists.txt 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/CMakeLists.txt 2015-07-12 01:15:27.000000000 +0200 @@ -1,5 +1,4 @@ -include_directories( ${CMAKE_SOURCE_DIR}/libkdegames/highscore ) set(kiriki_SRCS main.cpp @@ -14,19 +13,21 @@ itemdelegate.cpp ) -kde4_add_ui_files(kiriki_SRCS configPage.ui) +ki18n_wrap_ui(kiriki_SRCS configPage.ui) -kde4_add_kcfg_files(kiriki_SRCS settings.kcfgc) +kconfig_add_kcfg_files(kiriki_SRCS settings.kcfgc) -kde4_add_app_icon(kiriki_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-kiriki.png") -kde4_add_executable(kiriki ${kiriki_SRCS}) +file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/*-apps-kiriki.png") +ecm_add_app_icon(kiriki_SRCS ICONS ${ICONS_SRCS}) +add_executable(kiriki ${kiriki_SRCS}) -target_link_libraries(kiriki ${KDE4_KDEUI_LIBS} kdegames) +target_link_libraries(kiriki KF5KDEGames KF5::XmlGui KF5::I18n KF5::IconThemes KF5::DBusAddons Qt5::PrintSupport) -install(TARGETS kiriki ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kiriki ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -install(FILES kirikiui.rc DESTINATION ${DATA_INSTALL_DIR}/kiriki ) -install(PROGRAMS kiriki.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install(FILES kirikiui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kiriki ) +install(PROGRAMS org.kde.kiriki.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/configPage.ui new/kiriki-15.08.1/src/configPage.ui --- old/kiriki-15.04.3/src/configPage.ui 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/configPage.ui 2015-07-12 01:15:27.000000000 +0200 @@ -53,7 +53,7 @@ </widget> </item> <item> - <widget class="KIntSpinBox" name="kcfg_numberOfPlayers"/> + <widget class="QSpinBox" name="kcfg_numberOfPlayers"/> </item> </layout> </item> @@ -203,7 +203,7 @@ </widget> </item> <item> - <widget class="KIntSpinBox" name="kcfg_waitTime"/> + <widget class="QSpinBox" name="kcfg_waitTime"/> </item> </layout> </item> @@ -217,7 +217,7 @@ </widget> </item> <item> - <widget class="KIntSpinBox" name="kcfg_fontSize"> + <widget class="QSpinBox" name="kcfg_fontSize"> <property name="minimumSize"> <size> <width>324</width> @@ -238,7 +238,7 @@ </widget> </item> <item> - <widget class="KIntSpinBox" name="kcfg_rowHeight"> + <widget class="QSpinBox" name="kcfg_rowHeight"> <property name="minimumSize"> <size> <width>324</width> @@ -274,13 +274,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>KIntSpinBox</class> - <extends>QSpinBox</extends> - <header>knuminput.h</header> - </customwidget> - </customwidgets> <tabstops> <tabstop>kcfg_numberOfPlayers</tabstop> <tabstop>kcfg_player1Name</tabstop> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/configwidget.cpp new/kiriki-15.08.1/src/configwidget.cpp --- old/kiriki-15.04.3/src/configwidget.cpp 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/configwidget.cpp 2015-07-12 01:15:27.000000000 +0200 @@ -15,8 +15,8 @@ { setupUi(this); KAcceleratorManager::setNoAccel(this); - connect(kcfg_numberOfPlayers, SIGNAL(valueChanged(int)), this, SLOT(numberOfPlayersChanged(int))); - connect(kcfg_fontSize, SIGNAL(valueChanged(int)), this, SLOT(minimumRowHeightChanged(int))); + connect(kcfg_numberOfPlayers, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &configWidget::numberOfPlayersChanged); + connect(kcfg_fontSize, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &configWidget::minimumRowHeightChanged); } void configWidget::numberOfPlayersChanged(int numberOfPlayers) @@ -56,5 +56,5 @@ kcfg_rowHeight -> setMinimum(height); } -#include "configwidget.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/diceswidget.cpp new/kiriki-15.08.1/src/diceswidget.cpp --- old/kiriki-15.04.3/src/diceswidget.cpp 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/diceswidget.cpp 2015-07-12 01:15:27.000000000 +0200 @@ -17,7 +17,8 @@ #include <QStyleOptionViewItemV4> #include <krandom.h> -#include <kstandarddirs.h> +#include <QStandardPaths> + dicesWidget::dicesWidget(QWidget *parent) : QWidget(parent) { @@ -28,13 +29,13 @@ m_highlightDice[4] = 0; setMinimumSize(90, 450); - m_images[0] = QPixmap(KStandardDirs::locate("appdata", "images/dice-none.png")); - m_images[1] = QPixmap(KStandardDirs::locate("appdata", "images/dice-1.png")); - m_images[2] = QPixmap(KStandardDirs::locate("appdata", "images/dice-2.png")); - m_images[3] = QPixmap(KStandardDirs::locate("appdata", "images/dice-3.png")); - m_images[4] = QPixmap(KStandardDirs::locate("appdata", "images/dice-4.png")); - m_images[5] = QPixmap(KStandardDirs::locate("appdata", "images/dice-5.png")); - m_images[6] = QPixmap(KStandardDirs::locate("appdata", "images/dice-6.png")); + m_images[0] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, "images/dice-none.png")); + m_images[1] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, "images/dice-1.png")); + m_images[2] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, "images/dice-2.png")); + m_images[3] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, "images/dice-3.png")); + m_images[4] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, "images/dice-4.png")); + m_images[5] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, "images/dice-5.png")); + m_images[6] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, "images/dice-6.png")); rollAll(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/kiriki.cpp new/kiriki-15.08.1/src/kiriki.cpp --- old/kiriki-15.04.3/src/kiriki.cpp 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/kiriki.cpp 2015-07-12 01:15:27.000000000 +0200 @@ -23,20 +23,18 @@ #include <QTreeView> #include <QDateTime> -#include <kapplication.h> +#include <qapplication.h> #include <kconfigdialog.h> #include <klocalizedstring.h> #include <kmessagebox.h> -#include <kscoredialog.h> +#include <highscore/kscoredialog.h> #include <kstandardaction.h> #include <kstandardgameaction.h> #include <kactioncollection.h> -#include <kaction.h> -#include <KStatusBar> +#include <QAction> +#include <QStatusBar> #include <KToggleAction> #include <KToolBar> -#include <kdeprintdialog.h> - #include "computer.h" #include "configwidget.h" #include "lateralwidget.h" @@ -79,28 +77,28 @@ QFontMetrics fm(f); m_scoresWidget -> header() -> setMinimumSectionSize(fm.width("9999")); - connect(m_scoresWidget, SIGNAL(pressed(QModelIndex)), this, SLOT(pressed(QModelIndex))); + connect(m_scoresWidget, &QTreeView::pressed, this, &kiriki::pressed); lay -> addWidget(m_scoresWidget, 1); m_scores = 0; // Game - KAction *gameNewAction = KStandardGameAction::gameNew(this, SLOT(newGame()), actionCollection()); + QAction *gameNewAction = KStandardGameAction::gameNew(this, SLOT(newGame()), actionCollection()); KStandardGameAction::highscores(this, SLOT(showHighScores()), actionCollection()); KStandardGameAction::print(this, SLOT(print()), actionCollection()); - KStandardGameAction::quit(kapp, SLOT(quit()), actionCollection()); + KStandardGameAction::quit(qApp, SLOT(quit()), actionCollection()); m_hintAction = KStandardGameAction::hint(this, SLOT(showHint()), actionCollection()); m_demoAction = KStandardGameAction::demo(this, SLOT(demo()), actionCollection()); - connect(gameNewAction, SIGNAL(triggered(bool)), m_demoAction, SLOT(setChecked(bool))); - connect(gameNewAction, SIGNAL(triggered(bool)), m_demoAction, SLOT(setDisabled(bool))); - connect(gameNewAction, SIGNAL(triggered(bool)), m_hintAction, SLOT(setDisabled(bool))); - connect(gameNewAction, SIGNAL(triggered(bool)), m_lateral, SLOT(disableDemoMode())); - connect(gameNewAction, SIGNAL(triggered(bool)), m_lateral, SLOT(unhighlightAllDice())); - connect(this, SIGNAL(demoStarted(bool)), m_demoAction, SLOT(setDisabled(bool))); - connect(this, SIGNAL(demoStarted(bool)), m_demoAction, SLOT(setChecked(bool))); - connect(this, SIGNAL(demoStarted(bool)), m_hintAction, SLOT(setDisabled(bool))); - connect(this, SIGNAL(demoStarted(bool)), m_lateral, SLOT(unhighlightAllDice())); - connect(m_lateral, SIGNAL(newGameClicked()), gameNewAction, SLOT(trigger())); + connect(gameNewAction, &QAction::triggered, m_demoAction, &KToggleAction::setChecked); + connect(gameNewAction, &QAction::triggered, m_demoAction, &KToggleAction::setDisabled); + connect(gameNewAction, &QAction::triggered, m_hintAction, &QAction::setDisabled); + connect(gameNewAction, &QAction::triggered, m_lateral, &lateralWidget::disableDemoMode); + connect(gameNewAction, &QAction::triggered, m_lateral, &lateralWidget::unhighlightAllDice); + connect(this, &kiriki::demoStarted, m_demoAction, &KToggleAction::setDisabled); + connect(this, &kiriki::demoStarted, m_demoAction, &KToggleAction::setChecked); + connect(this, &kiriki::demoStarted, m_hintAction, &QAction::setDisabled); + connect(this, &kiriki::demoStarted, m_lateral, &lateralWidget::unhighlightAllDice); + connect(m_lateral, &lateralWidget::newGameClicked, gameNewAction, &QAction::trigger); // Preferences KStandardAction::preferences(this, SLOT(showPreferences()), actionCollection()); @@ -326,8 +324,7 @@ KConfigDialog *configDialog = new KConfigDialog(this, "settings", kirikiSettings::self()); configDialog->setFaceType(KConfigDialog::Plain); configDialog -> addPage(new configWidget(configDialog), QString(), QString()); - configDialog->setHelp(QString(),"kiriki"); - connect( configDialog, SIGNAL(settingsChanged(QString)), this, SLOT(settingsChanged()) ); + connect(configDialog, &KConfigDialog::settingsChanged, this, &kiriki::settingsChanged); configDialog -> exec(); delete configDialog; @@ -353,7 +350,7 @@ { QPrinter printer; printer.setFullPage( true ); - QPrintDialog *printDialog = KdePrint::createPrintDialog(&printer, this); + QPrintDialog *printDialog = new QPrintDialog(&printer, this); if (printDialog->exec()) { QPainter painter(&printer); @@ -406,4 +403,4 @@ else m_lateral -> setEnabled(true); } -#include "kiriki.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/kiriki.desktop new/kiriki-15.08.1/src/kiriki.desktop --- old/kiriki-15.04.3/src/kiriki.desktop 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/kiriki.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,115 +0,0 @@ -[Desktop Entry] -Name=Kiriki -Name[ast]=Kiriki -Name[bs]=Kiriki -Name[ca]=Kiriki -Name[ca@valencia]=Kiriki -Name[cs]=Kiriki -Name[da]=Kiriki -Name[de]=Kiriki -Name[el]=Kiriki -Name[en_GB]=Kiriki -Name[eo]=Kiriki -Name[es]=Kiriki -Name[et]=Kiriki -Name[eu]=Kiriki -Name[fa]=کیریکی -Name[fi]=Kiriki -Name[fr]=Kiriki -Name[ga]=Kiriki -Name[gl]=Kiriki -Name[hne]=किरिकि -Name[hu]=Kiriki -Name[it]=Kiriki -Name[ja]=Kiriki -Name[kk]=Kiriki -Name[km]=Kiriki -Name[ko]=Kiriki -Name[lt]=Kiriki -Name[lv]=Kiriki -Name[mr]=किरिकि -Name[nb]=Kiriki -Name[nds]=Kiriki -Name[ne]=किरिकि -Name[nl]=Kiriki -Name[nn]=Kiriki -Name[pl]=Kiriki -Name[pt]=Kiriki -Name[pt_BR]=Kiriki -Name[ro]=Kiriki -Name[ru]=Kiriki -Name[sk]=Kiriki -Name[sl]=Kiriki -Name[sq]=Kiriki -Name[sr]=Кирики -Name[sr@ijekavian]=Кирики -Name[sr@ijekavianlatin]=Kiriki -Name[sr@latin]=Kiriki -Name[sv]=Kiriki -Name[te]=కిరికి -Name[tr]=Kiriki -Name[ug]=Kiriki -Name[uk]=Kiriki -Name[wa]=Kiriki -Name[x-test]=xxKirikixx -Name[zh_CN]=Kiriki -Name[zh_TW]=Kiriki -Icon=kiriki -Type=Application -Exec=kiriki -caption %c -X-DocPath=kiriki/index.html -GenericName=Yahtzee-like Dice Game -GenericName[ast]=Xuegu de daos asemeyáu al Yahtzee -GenericName[bs]=Yahtzee-kao jamb -GenericName[ca]=Joc de daus com el Yahtzee -GenericName[ca@valencia]=Joc de daus com el Yahtzee -GenericName[cs]=Hra s kostkami podobná Yahtzee -GenericName[da]=Yatzy-lignende terningspil -GenericName[de]=„Kniffel“-Würfelspiel -GenericName[el]=Παιχνίδι με ζάρια παρόμοιο με το Yahtzee -GenericName[en_GB]=Yahtzee-like Dice Game -GenericName[eo]=Ĵetkuba ludo simila al Yahtzee -GenericName[es]=Juego de dados similar al Yahtzee -GenericName[et]=Yahtzee moodi täringumäng -GenericName[eu]=Yahtzee-ren antzeko fitxa-jokoa -GenericName[fa]=بازی طاس شبیه Yahtzee -GenericName[fi]=Yatzin kaltainen noppapeli -GenericName[fr]=Jeu de dés dans le style du Yam's -GenericName[ga]=Cluiche Dísle cosúil le Yahtzee -GenericName[gl]=Xogo de dados ao estilo do «Yahtzee» -GenericName[hne]=याहत्जी जइसन पांसे वाले खेल -GenericName[hu]=Yahtzee-szerű kockajáték -GenericName[it]=Gioco di dadi simile a Yahtzee -GenericName[ja]=ヤッツィーのようなダイスゲーム -GenericName[kk]=Yahtzee-секілді сүйек тастау ойыны -GenericName[km]=ល្បែងកូនឡុកឡាក់ដូចល្បែង Yahtzee -GenericName[ko]=얏지 같은 주사위 게임 -GenericName[lv]=Yathzee līdzīga kauliņu spēle -GenericName[mr]=याहत्झी सारखा पास्यांचा खेळ -GenericName[nb]=Yatzy-liknende terningspill -GenericName[nds]=Yahtzee-liek Wörpelspeel -GenericName[ne]=याहेट्जी जस्तै पासा खेल -GenericName[nl]=Yahtzee-achtig dobbelsteenspel -GenericName[nn]=Yatzy-liknande terningspel -GenericName[pl]=Gra typu Yahtzee -GenericName[pt]=Jogo de Dados tipo Yahtzee -GenericName[pt_BR]=Jogo de dados parecido com Yahtzee ou Yam -GenericName[ro]=Joc de zaruri ca Yahtzee -GenericName[ru]=Головоломная игра в кости -GenericName[sk]=Hra s kockami podobná Yahtzee -GenericName[sl]=Igra s kockami, podobna Jamb-u (Yahtzee) -GenericName[sr]=Јамболика игра са коцкицама -GenericName[sr@ijekavian]=Јамболика игра са коцкицама -GenericName[sr@ijekavianlatin]=Jambolika igra sa kockicama -GenericName[sr@latin]=Jambolika igra sa kockicama -GenericName[sv]=Yatzy-liknande tärningsspel -GenericName[tr]=Yahtzee-benzeri Zar Oyunu -GenericName[ug]=Yahtzee غا ئوخشاپ قالىدىغان ئىشغلا ئويۇنى -GenericName[uk]=Гра схожа на покер з кістками -GenericName[wa]=On djeu d' dés ki ravize li djeu Yahtzee -GenericName[x-test]=xxYahtzee-like Dice Gamexx -GenericName[zh_CN]=快艇骰子游戏 -GenericName[zh_TW]=類似 Yahtzee 的骰子遊戲 -X-KDE-StartupNotify=true -X-DBUS-StartupType=Multi -Categories=Qt;KDE;Game;BoardGame; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/kiriki.h new/kiriki-15.08.1/src/kiriki.h --- old/kiriki-15.04.3/src/kiriki.h 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/kiriki.h 2015-07-12 01:15:27.000000000 +0200 @@ -16,7 +16,7 @@ class QStyledItemDelegate; class QTreeView; -class KAction; +class QAction; class KToggleAction; class lateralWidget; @@ -56,7 +56,7 @@ QStyledItemDelegate *m_delegateHighlighted; int m_highlightedRowIndex; bool m_hintGiven; - KAction* m_hintAction; + QAction * m_hintAction; int m_fontSize; itemDelegate *m_itemDelegate; int m_rowHeight; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/kiriki.kcfg new/kiriki-15.08.1/src/kiriki.kcfg --- old/kiriki-15.04.3/src/kiriki.kcfg 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/kiriki.kcfg 2015-07-12 01:15:27.000000000 +0200 @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <kcfgfile name="kirikirc" /> - <include>klocale.h</include> + <include>KLocalizedString</include> <include>QFont</include> <group name="general"> <entry key="waitTime" type="Int" > diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/lateralwidget.cpp new/kiriki-15.08.1/src/lateralwidget.cpp --- old/kiriki-15.04.3/src/lateralwidget.cpp 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/lateralwidget.cpp 2015-07-12 01:15:27.000000000 +0200 @@ -14,10 +14,10 @@ #include <QStackedWidget> #include <QVBoxLayout> -#include <kaction.h> -#include <kicon.h> +#include <QAction> +#include <QIcon> #include <kstandardgameaction.h> -#include <klocale.h> +#include <KLocalizedString> #include "diceswidget.h" @@ -27,9 +27,9 @@ m_rolls = new QLabel(this); m_dices = new dicesWidget(this); m_buttons = new QStackedWidget(this); - m_rollButton = new QPushButton(KIcon( QLatin1String( "roll") ), i18n("&Roll" ), this); + m_rollButton = new QPushButton(QIcon::fromTheme( QLatin1String( "roll") ), i18n("&Roll" ), this); - KAction *dummyAction = KStandardGameAction::gameNew(0, 0, 0); + QAction *dummyAction = KStandardGameAction::gameNew(0, 0, 0); m_newGameButton = new QPushButton(dummyAction->icon(), dummyAction->text(), this); delete dummyAction; @@ -43,9 +43,9 @@ lay -> addWidget(m_buttons); lay -> addStretch(1); - connect(m_rollButton, SIGNAL(clicked(bool)), this, SLOT(roll())); - connect(m_rollButton, SIGNAL(clicked(bool)), this, SLOT(unhighlightAllDice())); - connect(m_newGameButton, SIGNAL(clicked(bool)), this, SLOT(newGame())); + connect(m_rollButton, &QPushButton::clicked, this, &lateralWidget::roll); + connect(m_rollButton, &QPushButton::clicked, this, &lateralWidget::unhighlightAllDice); + connect(m_newGameButton, &QPushButton::clicked, this, &lateralWidget::newGame); nextTurn(); } @@ -199,4 +199,4 @@ if (!m_demoMode) setEnabled(m_roll != 3); } -#include "lateralwidget.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/main.cpp new/kiriki-15.08.1/src/main.cpp --- old/kiriki-15.04.3/src/main.cpp 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/main.cpp 2015-07-12 01:15:27.000000000 +0200 @@ -7,20 +7,31 @@ * (at your option) any later version. * ***************************************************************************/ -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> -#include <klocale.h> +#include <KAboutData> + +#include <KLocalizedString> +#include <QApplication> +#include <QCommandLineParser> +#include <KDBusService> #include "kiriki.h" int main(int argc, char *argv[]) { - KAboutData about("kiriki", 0, ki18n("Kiriki"), "0.2.1", ki18n("A Yahtzee dice game for KDE"), KAboutData::License_GPL, ki18n("© 2005-2007 Albert Astals Cid"), KLocalizedString(), "http://games.kde.org/kiriki"; ); - about.addAuthor(ki18n("Albert Astals Cid"), KLocalizedString(), "[email protected]"); - KCmdLineArgs::init(argc, argv, &about); - KApplication app; - KGlobal::locale()->insertCatalog( QLatin1String( "libkdegames" )); - app.setTopWidget(new kiriki()); + QApplication app(argc, argv); + + KLocalizedString::setApplicationDomain("kiriki"); + KAboutData about("kiriki", i18n("Kiriki"), "0.3.0", i18n("A Yahtzee dice game for KDE"), KAboutLicense::GPL, i18n("© 2005-2007 Albert Astals Cid"), "http://games.kde.org/kiriki"; ); + about.addAuthor(i18n("Albert Astals Cid"), QString(), "[email protected]"); + QCommandLineParser parser; + KAboutData::setApplicationData(about); + parser.addVersionOption(); + parser.addHelpOption(); + about.setupCommandLine(&parser); + parser.process(app); + about.processCommandLine(&parser); + KDBusService service; + kiriki *w = new kiriki(); + w->show(); return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/org.kde.kiriki.desktop new/kiriki-15.08.1/src/org.kde.kiriki.desktop --- old/kiriki-15.04.3/src/org.kde.kiriki.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kiriki-15.08.1/src/org.kde.kiriki.desktop 2015-07-12 01:15:27.000000000 +0200 @@ -0,0 +1,116 @@ +[Desktop Entry] +Name=Kiriki +Name[ast]=Kiriki +Name[bs]=Kiriki +Name[ca]=Kiriki +Name[ca@valencia]=Kiriki +Name[cs]=Kiriki +Name[da]=Kiriki +Name[de]=Kiriki +Name[el]=Kiriki +Name[en_GB]=Kiriki +Name[eo]=Kiriki +Name[es]=Kiriki +Name[et]=Kiriki +Name[eu]=Kiriki +Name[fa]=کیریکی +Name[fi]=Kiriki +Name[fr]=Kiriki +Name[ga]=Kiriki +Name[gl]=Kiriki +Name[hne]=किरिकि +Name[hu]=Kiriki +Name[it]=Kiriki +Name[ja]=Kiriki +Name[kk]=Kiriki +Name[km]=Kiriki +Name[ko]=Kiriki +Name[lt]=Kiriki +Name[lv]=Kiriki +Name[mr]=किरिकि +Name[nb]=Kiriki +Name[nds]=Kiriki +Name[ne]=किरिकि +Name[nl]=Kiriki +Name[nn]=Kiriki +Name[pl]=Kiriki +Name[pt]=Kiriki +Name[pt_BR]=Kiriki +Name[ro]=Kiriki +Name[ru]=Kiriki +Name[sk]=Kiriki +Name[sl]=Kiriki +Name[sq]=Kiriki +Name[sr]=Кирики +Name[sr@ijekavian]=Кирики +Name[sr@ijekavianlatin]=Kiriki +Name[sr@latin]=Kiriki +Name[sv]=Kiriki +Name[te]=కిరికి +Name[tr]=Kiriki +Name[ug]=Kiriki +Name[uk]=Kiriki +Name[wa]=Kiriki +Name[x-test]=xxKirikixx +Name[zh_CN]=Kiriki +Name[zh_TW]=Kiriki +Icon=kiriki +Type=Application +Exec=kiriki -qwindowtitle %c +X-DocPath=kiriki/index.html +GenericName=Yahtzee-like Dice Game +GenericName[ast]=Xuegu de daos asemeyáu al Yahtzee +GenericName[bs]=Yahtzee-kao jamb +GenericName[ca]=Joc de daus com el Yahtzee +GenericName[ca@valencia]=Joc de daus com el Yahtzee +GenericName[cs]=Hra s kostkami podobná Yahtzee +GenericName[da]=Yatzy-lignende terningspil +GenericName[de]=„Kniffel“-Würfelspiel +GenericName[el]=Παιχνίδι με ζάρια παρόμοιο με το Yahtzee +GenericName[en_GB]=Yahtzee-like Dice Game +GenericName[eo]=Ĵetkuba ludo simila al Yahtzee +GenericName[es]=Juego de dados similar al Yahtzee +GenericName[et]=Yahtzee moodi täringumäng +GenericName[eu]=Yahtzee-ren antzeko fitxa-jokoa +GenericName[fa]=بازی طاس شبیه Yahtzee +GenericName[fi]=Yatzin kaltainen noppapeli +GenericName[fr]=Jeu de dés dans le style du Yam's +GenericName[ga]=Cluiche Dísle cosúil le Yahtzee +GenericName[gl]=Xogo de dados ao estilo do «Yahtzee» +GenericName[hne]=याहत्जी जइसन पांसे वाले खेल +GenericName[hu]=Yahtzee-szerű kockajáték +GenericName[it]=Gioco di dadi simile a Yahtzee +GenericName[ja]=ヤッツィーのようなダイスゲーム +GenericName[kk]=Yahtzee-секілді сүйек тастау ойыны +GenericName[km]=ល្បែងកូនឡុកឡាក់ដូចល្បែង Yahtzee +GenericName[ko]=얏지 같은 주사위 게임 +GenericName[lv]=Yathzee līdzīga kauliņu spēle +GenericName[mr]=याहत्झी सारखा पास्यांचा खेळ +GenericName[nb]=Yatzy-liknende terningspill +GenericName[nds]=Yahtzee-liek Wörpelspeel +GenericName[ne]=याहेट्जी जस्तै पासा खेल +GenericName[nl]=Yahtzee-achtig dobbelsteenspel +GenericName[nn]=Yatzy-liknande terningspel +GenericName[pl]=Gra typu Yahtzee +GenericName[pt]=Jogo de Dados tipo Yahtzee +GenericName[pt_BR]=Jogo de dados parecido com Yahtzee ou Yam +GenericName[ro]=Joc de zaruri ca Yahtzee +GenericName[ru]=Головоломная игра в кости +GenericName[sk]=Hra s kockami podobná Yahtzee +GenericName[sl]=Igra s kockami, podobna Jamb-u (Yahtzee) +GenericName[sr]=Јамболика игра са коцкицама +GenericName[sr@ijekavian]=Јамболика игра са коцкицама +GenericName[sr@ijekavianlatin]=Jambolika igra sa kockicama +GenericName[sr@latin]=Jambolika igra sa kockicama +GenericName[sv]=Yatzy-liknande tärningsspel +GenericName[tr]=Yahtzee-benzeri Zar Oyunu +GenericName[ug]=Yahtzee غا ئوخشاپ قالىدىغان ئىشغلا ئويۇنى +GenericName[uk]=Гра схожа на покер з кістками +GenericName[wa]=On djeu d' dés ki ravize li djeu Yahtzee +GenericName[x-test]=xxYahtzee-like Dice Gamexx +GenericName[zh_CN]=快艇骰子游戏 +GenericName[zh_TW]=類似 Yahtzee 的骰子遊戲 +StartupNotify=true +X-DBUS-StartupType=Multi +Categories=Qt;KDE;Game;BoardGame; +X-DBUS-ServiceName=org.kde.kiriki diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-15.04.3/src/scores.cpp new/kiriki-15.08.1/src/scores.cpp --- old/kiriki-15.04.3/src/scores.cpp 2014-07-25 07:36:09.000000000 +0200 +++ new/kiriki-15.08.1/src/scores.cpp 2015-07-12 01:15:27.000000000 +0200 @@ -14,7 +14,7 @@ #include <QPalette> #include <kiconloader.h> -#include <klocale.h> +#include <KLocalizedString> #include "settings.h" @@ -329,7 +329,7 @@ for (int i = 1; i <= 20; ++i) { QRectF cell(margin, margin + i * cellHeight, cellWidth, cellHeight); - painter.drawText( cell, Qt::AlignCenter, data( index(i-1, 0), Qt::DisplayRole ).toString() ); + painter.drawText( cell, Qt::AlignCenter, data( index(i, 0), Qt::DisplayRole ).toString() ); } // write the scores @@ -338,7 +338,7 @@ for (int j = 1; j <= 20; ++j) { QRectF cell(margin + i * cellWidth, margin + j * cellHeight, cellWidth, cellHeight); - painter.drawText( cell, Qt::AlignCenter, data( index(j-1, i), Qt::DisplayRole ).toString() ); + painter.drawText( cell, Qt::AlignCenter, data( index(j, i), Qt::DisplayRole ).toString() ); } } }
