Hello community, here is the log from the commit of package klines for openSUSE:Factory checked in at 2015-05-11 18:10:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klines (Old) and /work/SRC/openSUSE:Factory/.klines.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "klines" Changes: -------- --- /work/SRC/openSUSE:Factory/klines/klines.changes 2015-03-11 09:49:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.klines.new/klines.changes 2015-05-11 18:10:26.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Apr 11 13:17:27 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:25 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:46:13 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- klines-14.12.3.tar.xz New: ---- klines-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klines.spec ++++++ --- /var/tmp/diff_new_pack.TLfcUS/_old 2015-05-11 18:10:27.000000000 +0200 +++ /var/tmp/diff_new_pack.TLfcUS/_new 2015-05-11 18:10:27.000000000 +0200 @@ -18,16 +18,44 @@ Name: klines BuildRequires: libkdegames-devel -BuildRequires: xz +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kwindowsystem-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdeclarative-devel +BuildRequires: ki18n-devel +BuildRequires: kguiaddons-devel +BuildRequires: kservice-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kitemviews-devel +BuildRequires: kiconthemes-devel +BuildRequires: kcompletion-devel +BuildRequires: kjobwidgets-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kxmlgui-devel +BuildRequires: kio-devel +BuildRequires: knotifyconfig-devel +BuildRequires: knewstuff-devel +BuildRequires: extra-cmake-modules +BuildRequires: kdelibs4support-devel +BuildRequires: update-desktop-files Summary: Tactical 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: klines-%{version}.tar.xz +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Klines is the KDE version of the russian game Lines where you have to @@ -39,23 +67,23 @@ %setup -q -n klines-%{version} %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall - %suse_update_desktop_file -r klines Game LogicGame - %kde_post_install + %kf5_makeinstall -C build + %suse_update_desktop_file -r org.kde.klines Game LogicGame %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kde4_bindir}/klines -%{_kde4_htmldir}/en/klines/ -%{_kde4_applicationsdir}/klines.desktop -%{_kde4_iconsdir}/hicolor/*/apps/klines.* -%{_kde4_appsdir}/klines/ -%{_kde4_configkcfgdir}/klines.kcfg +%{_kf5_bindir}/klines +%{_kf5_htmldir}/en/klines/ +%{_kf5_applicationsdir}/org.kde.klines.desktop +%{_kf5_iconsdir}/hicolor/*/apps/klines.* +%{_datadir}/klines/ +%{_datadir}/kxmlgui5/klines/ +%dir %{_kf5_configkcfgdir} +%{_kf5_configkcfgdir}/klines.kcfg %changelog ++++++ klines-14.12.3.tar.xz -> klines-15.04.0.tar.xz ++++++ Files old/klines-14.12.3/128-apps-klines.png and new/klines-15.04.0/128-apps-klines.png differ Files old/klines-14.12.3/16-apps-klines.png and new/klines-15.04.0/16-apps-klines.png differ Files old/klines-14.12.3/22-apps-klines.png and new/klines-15.04.0/22-apps-klines.png differ Files old/klines-14.12.3/32-apps-klines.png and new/klines-15.04.0/32-apps-klines.png differ Files old/klines-14.12.3/48-apps-klines.png and new/klines-15.04.0/48-apps-klines.png differ Files old/klines-14.12.3/64-apps-klines.png and new/klines-15.04.0/64-apps-klines.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/CMakeLists.txt new/klines-15.04.0/CMakeLists.txt --- old/klines-14.12.3/CMakeLists.txt 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/CMakeLists.txt 2015-03-07 21:22:31.000000000 +0100 @@ -1,17 +1,40 @@ project(klines) -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.3.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 Qml Quick QuickWidgets Svg Test) +find_package(KF5 REQUIRED COMPONENTS + CoreAddons + Config + WidgetsAddons + Config + DBusAddons + I18n + GuiAddons + Service + ConfigWidgets + ItemViews + IconThemes + XmlGui + KIO + NewStuff) + +find_package(KF5KDEGames 4.9.0 REQUIRED) + +include(FeatureSummary) +include(ECMInstallIcons) +include(KDEInstallDirs) +include(KDECompilerSettings) +include(KDECMakeSettings) + +add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DTRANSLATION_DOMAIN="klines") +add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") -include_directories( ${CMAKE_SOURCE_DIR}/libkdegames/highscore ) add_subdirectory( themes ) add_subdirectory( doc ) @@ -28,21 +51,30 @@ previewitem.cpp animator.cpp) +kconfig_add_kcfg_files(klines_SRCS prefs.kcfgc ) +#kde4_add_app_icon(klines_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-klines.png") +add_executable(klines ${klines_SRCS}) -kde4_add_kcfg_files(klines_SRCS prefs.kcfgc ) - -kde4_add_app_icon(klines_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-klines.png") -kde4_add_executable(klines ${klines_SRCS}) - -target_link_libraries(klines ${KDE4_KDEUI_LIBS} kdegames ) +target_link_libraries(klines KF5KDEGames KF5::XmlGui KF5::DBusAddons) install(TARGETS klines ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS klines.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( PROGRAMS org.kde.klines.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES klines.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -install( FILES klinesui.rc DESTINATION ${DATA_INSTALL_DIR}/klines ) +install( FILES klinesui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/klines ) + +ecm_install_icons(ICONS + 16-apps-klines.png + 22-apps-klines.png + 32-apps-klines.png + 48-apps-klines.png + 64-apps-klines.png + 128-apps-klines.png + DESTINATION ${ICON_INSTALL_DIR} + THEME hicolor +) -kde4_install_icons( ${ICON_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/klines-14.12.3/animator.cpp new/klines-15.04.0/animator.cpp --- old/klines-14.12.3/animator.cpp 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/animator.cpp 2015-03-07 21:22:31.000000000 +0100 @@ -25,7 +25,6 @@ #include "ballitem.h" #include "renderer.h" -#include <kdebug.h> #include <math.h> // for pow, sqrt // Needed by A* pathfinding algorithm @@ -58,16 +57,16 @@ { // timing & framing setup is done in corresponding animate* functions - connect(&m_moveTimeLine, SIGNAL(frameChanged(int)), SLOT(moveAnimationFrame(int)) ); - connect(&m_moveTimeLine, SIGNAL(finished()), SIGNAL(moveFinished())); + connect(&m_moveTimeLine, &QTimeLine::frameChanged, this, &KLinesAnimator::moveAnimationFrame); + connect(&m_moveTimeLine, &QTimeLine::finished, this, &KLinesAnimator::moveFinished); m_removeTimeLine.setCurveShape(QTimeLine::LinearCurve); - connect(&m_removeTimeLine, SIGNAL(frameChanged(int)), SLOT(removeAnimationFrame(int)) ); - connect(&m_removeTimeLine, SIGNAL(finished()), SIGNAL(removeFinished())); + connect(&m_removeTimeLine, &QTimeLine::frameChanged, this, &KLinesAnimator::removeAnimationFrame); + connect(&m_removeTimeLine, &QTimeLine::finished, this, &KLinesAnimator::removeFinished); m_bornTimeLine.setCurveShape(QTimeLine::LinearCurve); - connect(&m_bornTimeLine, SIGNAL(frameChanged(int)), SLOT(bornAnimationFrame(int)) ); - connect(&m_bornTimeLine, SIGNAL(finished()), SLOT(slotBornFinished())); + connect(&m_bornTimeLine, &QTimeLine::frameChanged, this, &KLinesAnimator::bornAnimationFrame); + connect(&m_bornTimeLine, &QTimeLine::finished, this, &KLinesAnimator::slotBornFinished); } bool KLinesAnimator::isAnimating() const @@ -323,4 +322,4 @@ emit bornFinished(); } -#include "animator.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/ballitem.cpp new/klines-15.04.0/ballitem.cpp --- old/klines-14.12.3/ballitem.cpp 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/ballitem.cpp 2015-03-07 21:22:31.000000000 +0100 @@ -23,12 +23,11 @@ #include "ballitem.h" #include "renderer.h" -#include <kdebug.h> #include <QGraphicsScene> #include <KGameRenderer> BallItem::BallItem( QGraphicsScene* parent ) - : KGameRenderedItem(KLinesRenderer::renderer() , "", NULL) + : KGameRenderedItem(KLinesRenderer::renderer() , QString(), NULL) { parent->addItem(this); setShapeMode( BoundingRectShape ); @@ -38,7 +37,7 @@ m_timeLine.setCurveShape( QTimeLine::LinearCurve ); m_timeLine.setLoopCount(0); - connect(&m_timeLine, SIGNAL(frameChanged(int)), SLOT(animFrameChanged(int)) ); + connect(&m_timeLine, &QTimeLine::frameChanged, this, &BallItem::animFrameChanged); } void BallItem::setColor( BallColor c, bool setPix ) @@ -73,4 +72,4 @@ setSpriteKey(KLinesRenderer::animationFrameId(KLinesRenderer::SelectedAnim, m_color, frame )); } -#include "ballitem.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/ballitem.h new/klines-15.04.0/ballitem.h --- old/klines-14.12.3/ballitem.h 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/ballitem.h 2015-03-07 21:22:31.000000000 +0100 @@ -58,7 +58,7 @@ // enable use of qgraphicsitem_cast enum { Type = UserType + 1 }; - virtual int type() const { return Type; } + int type() const Q_DECL_OVERRIDE { return Type; } private slots: void animFrameChanged(int); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/doc/CMakeLists.txt new/klines-15.04.0/doc/CMakeLists.txt --- old/klines-14.12.3/doc/CMakeLists.txt 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/doc/CMakeLists.txt 2015-03-07 21:22:31.000000000 +0100 @@ -3,4 +3,4 @@ #KDE_DOCS = klines # # -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR klines) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR klines) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/doc/index.docbook new/klines-15.04.0/doc/index.docbook --- old/klines-14.12.3/doc/index.docbook 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/doc/index.docbook 2015-03-07 21:22:31.000000000 +0100 @@ -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 "&kolorlines;"> <!ENTITY kappversion "1.5"><!--Application version. Use this variable everywhere it's needed.--> <!ENTITY package "kdegames"> <!-- do not change this! --> Files old/klines-14.12.3/hi128-app-klines.png and new/klines-15.04.0/hi128-app-klines.png differ Files old/klines-14.12.3/hi16-app-klines.png and new/klines-15.04.0/hi16-app-klines.png differ Files old/klines-14.12.3/hi22-app-klines.png and new/klines-15.04.0/hi22-app-klines.png differ Files old/klines-14.12.3/hi32-app-klines.png and new/klines-15.04.0/hi32-app-klines.png differ Files old/klines-14.12.3/hi48-app-klines.png and new/klines-15.04.0/hi48-app-klines.png differ Files old/klines-14.12.3/hi64-app-klines.png and new/klines-15.04.0/hi64-app-klines.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/klines.cpp new/klines-15.04.0/klines.cpp --- old/klines-14.12.3/klines.cpp 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/klines.cpp 2015-03-07 21:22:31.000000000 +0100 @@ -25,17 +25,17 @@ #include "mwidget.h" #include "scene.h" +#include <QStatusBar> +#include <QAction> + #include <KConfig> -#include <KAction> #include <KActionCollection> #include <KStandardAction> #include <KScoreDialog> #include <KToggleAction> -#include <KStatusBar> -#include <KLocale> #include <KConfigDialog> #include <KMessageBox> - +#include <KLocalizedString> #include <KStandardGameAction> #include <KGameRenderer> #include <KgThemeSelector> @@ -51,11 +51,13 @@ connect(mwidget->scene(), SIGNAL(stateChanged(QString)), SLOT(slotStateChanged(QString))); connect(mwidget->scene(), SIGNAL(gameOver(int)), SLOT(gameOver(int))); - statusBar()->insertItem(i18n("Score:"), 0); + scoreLabel->setText(i18n("Score:")); + statusBar()->addPermanentWidget(scoreLabel); + updateScore(0); KgThemeProvider* prov = KLinesRenderer::renderer()->themeProvider(); - connect(prov, SIGNAL(currentThemeChanged(const KgTheme*)), SLOT(loadSettings())); + connect(prov, &KgThemeProvider::currentThemeChanged, this, &KLinesMainWindow::loadSettings); mselector = new KgThemeSelector(KLinesRenderer::renderer()->themeProvider()); setupActions(); @@ -82,30 +84,34 @@ // Preferences KToggleAction *showNext = actionCollection()->add<KToggleAction>(QLatin1String( "show_next" )); showNext->setText( i18n( "Show Next" ) ); - connect(showNext, SIGNAL(triggered(bool)), SLOT(showNextToggled(bool))); + connect(showNext, &KToggleAction::triggered, this, &KLinesMainWindow::showNextToggled); showNext->setChecked(Prefs::showNext()); mwidget->setShowNextColors(Prefs::showNext()); // Navigation - KAction* naviLeft = new KAction( KIcon( QLatin1String( "arrow-left") ), i18n("Move Left" ), this ); - naviLeft->setShortcut( Qt::Key_Left ); + QAction* naviLeft = new QAction( i18n("Move Left" ), this ); + naviLeft->setIcon(QIcon::fromTheme(QLatin1String( "arrow-left"))); + actionCollection()->setDefaultShortcut(naviLeft, Qt::Key_Left ); actionCollection()->addAction( QLatin1String( "navi_left" ), naviLeft); - KAction* naviRight = new KAction( KIcon( QLatin1String( "arrow-right") ), i18n("Move Right" ), this ); - naviRight->setShortcut( Qt::Key_Right ); + QAction* naviRight = new QAction( i18n("Move Right" ), this ); + naviRight->setIcon(QIcon::fromTheme(QLatin1String( "arrow-right"))); + actionCollection()->setDefaultShortcut(naviRight, Qt::Key_Right ); actionCollection()->addAction( QLatin1String( "navi_right" ), naviRight); - KAction* naviUp = new KAction( KIcon( QLatin1String( "arrow-up") ), i18n("Move Up" ), this ); - naviUp->setShortcut( Qt::Key_Up ); + QAction* naviUp = new QAction( i18n("Move Up" ), this ); + naviUp->setIcon(QIcon::fromTheme(QLatin1String( "arrow-up"))); + actionCollection()->setDefaultShortcut(naviUp, Qt::Key_Up ); actionCollection()->addAction( QLatin1String( "navi_up" ), naviUp); - KAction* naviDown = new KAction( KIcon( QLatin1String( "arrow-down") ), i18n("Move Down" ), this ); - naviDown->setShortcut( Qt::Key_Down ); + QAction* naviDown = new QAction( i18n("Move Down" ), this ); + naviDown->setIcon(QIcon::fromTheme(QLatin1String( "arrow-down"))); + actionCollection()->setDefaultShortcut(naviDown, Qt::Key_Down ); actionCollection()->addAction( QLatin1String( "navi_down" ), naviDown); - KAction* naviSelect = new KAction( i18n("Select"), this ); - naviSelect->setShortcut( Qt::Key_Space ); + QAction* naviSelect = new QAction( i18n("Select"), this ); + actionCollection()->setDefaultShortcut(naviSelect, Qt::Key_Space ); actionCollection()->addAction( QLatin1String( "navi_select" ), naviSelect); connect( naviLeft, SIGNAL(triggered(bool)), mwidget->scene(), SLOT(moveFocusLeft())); @@ -120,7 +126,7 @@ void KLinesMainWindow::updateScore(int score) { - statusBar()->changeItem(i18n("Score: %1", score), 0); + scoreLabel->setText(i18n("Score: %1", score)); } void KLinesMainWindow::gameOver(int score) @@ -148,7 +154,7 @@ { mwidget->setShowNextColors(show); Prefs::setShowNext(show); - Prefs::self()->writeConfig(); + Prefs::self()->save(); } @@ -186,4 +192,4 @@ mwidget->scene()->resizeScene( (int)r.width(), (int)r.height() ); // redraw scene } -#include "klines.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/klines.desktop new/klines-15.04.0/klines.desktop --- old/klines-14.12.3/klines.desktop 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/klines.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,148 +0,0 @@ -# KDE Config File -[Desktop Entry] -Type=Application -Exec=klines -caption %c -Icon=klines -X-DocPath=klines/index.html -GenericName=Tactical Game -GenericName[af]=Taktiese Speletjie -GenericName[ast]=Xuegu de táctica -GenericName[be]=Тактычная гульня -GenericName[bn]=কৌশলের খেলা -GenericName[br]=C'hoari a vrezelekaouriezh -GenericName[bs]=Taktična igra -GenericName[ca]=Joc de tàctica -GenericName[ca@valencia]=Joc de tàctica -GenericName[cs]=Taktická hra -GenericName[cy]=Gêm Dactegol -GenericName[da]=Taktisk spil -GenericName[de]=Kugeln entfernen -GenericName[el]=Παιχνίδι τακτικής -GenericName[en_GB]=Tactical Game -GenericName[eo]=Taktika ludo -GenericName[es]=Juego de táctica -GenericName[et]=Taktikamäng -GenericName[eu]=Joko taktikoa -GenericName[fa]=بازی برنامهریزیشده -GenericName[fi]=Taktiikkapeli -GenericName[fr]=Jeu de tactique -GenericName[ga]=Cluiche Taicticiúil -GenericName[gl]=Xogo de táctica -GenericName[he]=משחק טקטי -GenericName[hne]=रननीतिक खेल -GenericName[hr]=Taktička igra -GenericName[hu]=Taktikai játék -GenericName[is]=Herkænskuleikur -GenericName[it]=Gioco di tattica -GenericName[ja]=戦略的ゲーム -GenericName[kk]=Тактикалық ойын -GenericName[km]=ល្បែងក្បួនយុទ្ធសាស្ត្រ -GenericName[ko]=전략 게임 -GenericName[lt]=Taktinis žaidimas -GenericName[lv]=Taktiskā spēle -GenericName[mai]=रणनीतिक खेल -GenericName[mk]=Тактичка игра -GenericName[mr]=सामरिक खेळ -GenericName[nb]=Taktikk-spill -GenericName[nds]=Taktikspeel -GenericName[ne]=कौशल खेल -GenericName[nl]=Tactisch spel -GenericName[nn]=Taktisk spel -GenericName[pa]=ਟਾਕਟੀਕਲ ਖੇਡ -GenericName[pl]=Gra taktyczna -GenericName[pt]=Jogo de Estratégia -GenericName[pt_BR]=Jogo tático -GenericName[ro]=Un joc de tactică -GenericName[ru]=Тактическая игра -GenericName[se]=Taktihkkaspeallu -GenericName[sk]=Taktická hra -GenericName[sl]=Taktična igra -GenericName[sq]=Lojë Taktike -GenericName[sr]=Тактичка игра -GenericName[sr@ijekavian]=Тактичка игра -GenericName[sr@ijekavianlatin]=Taktička igra -GenericName[sr@latin]=Taktička igra -GenericName[sv]=Taktikspel -GenericName[ta]=தந்திரமான விளையாட்டு -GenericName[tg]=Бозии Тактикӣ -GenericName[tr]=Taktik Oyunu -GenericName[ug]=تاكتىكىلىق ئويۇن -GenericName[uk]=Тактична гра -GenericName[vi]=Trò chơi chiến thuật -GenericName[wa]=Djeu di tactike -GenericName[xh]=Umdlalo onamaqhinga -GenericName[x-test]=xxTactical Gamexx -GenericName[zh_CN]=战术游戏 -GenericName[zh_TW]=戰術遊戲 -Terminal=false -Name=Kolor Lines -Name[af]=Kleur Lyne -Name[ast]=Kolor Lines -Name[be]=Каляровыя лініі -Name[bn]=কালার লাইন্স -Name[br]=Linenn Kolor -Name[bs]=Linije u boji -Name[ca]=Kolor Lines -Name[ca@valencia]=Kolor Lines -Name[cs]=Kolor Lines -Name[cy]=Kolor Lines -Name[da]=Kolor Lines -Name[de]=Kolor Lines -Name[el]=Kolor Lines -Name[en_GB]=Kolor Lines -Name[eo]=Kolorlinioj -Name[es]=Kolor Lines -Name[et]=Kolor Lines -Name[eu]=Kolor Lines -Name[fa]=خطوط رنگی -Name[fi]=Kolor Lines -Name[fr]=Kolor Lines -Name[ga]=Kolor Lines -Name[gl]=Liñas de cores -Name[he]=Kolor Lines -Name[hne]=कलर लाइन्स -Name[hr]=KNiz u boji -Name[hu]=Színes vonalak -Name[is]=Kolor Lines -Name[it]=Kolor Lines -Name[ja]=Kolor Lines -Name[kk]=Kolor Lines -Name[km]=Kolor Lines -Name[ko]=Kolor Lines -Name[lt]=Kolor Lines -Name[lv]=Kolor Lines -Name[mk]=Kolor Lines -Name[mr]=कलर लाईन्स -Name[nb]=Klinjer -Name[nds]=Kolor Lines -Name[ne]=रङ रेखा -Name[nl]=Kolor Lines -Name[nn]=Fargelinjer -Name[pa]=ਰੰਗ ਖੇਡ -Name[pl]=Kolorowe linie -Name[pt]=Linhas Coloridas -Name[pt_BR]=Kolor Lines -Name[ro]=Linii colorate -Name[ru]=Kolor Lines -Name[se]=Kolor Lines -Name[sk]=Farebné čiary -Name[sl]=Kolor Lines -Name[sq]=Vija me Ngjyra -Name[sr]=Обојене линије -Name[sr@ijekavian]=Обојене линије -Name[sr@ijekavianlatin]=Obojene linije -Name[sr@latin]=Obojene linije -Name[sv]=Färglinjer -Name[ta]=வண்ணக்கோடுகள் -Name[tg]=Хатҳои Рангӣ -Name[tr]=Renkli Çizgiler -Name[ug]=Kolor Lines -Name[uk]=Кольорові лінії -Name[vi]=Kolor Lines -Name[wa]=Royes di coleur -Name[xh]=Iilayini zeKolor -Name[x-test]=xxKolor Linesxx -Name[zh_CN]=Kolor Lines -Name[zh_TW]=Kolor Lines 彩色線條 -X-DBUS-StartupType=Multi -Categories=Qt;KDE;Game;StrategyGame; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/klines.h new/klines-15.04.0/klines.h --- old/klines-14.12.3/klines.h 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/klines.h 2015-03-07 21:22:31.000000000 +0100 @@ -18,9 +18,13 @@ #ifndef KLINES_H #define KLINES_H -class KgThemeSelector; +#include <QLabel> +#include <QPointer> + #include <KXmlGuiWindow> +class KgThemeSelector; + class MainWidget; class KLinesMainWindow : public KXmlGuiWindow @@ -44,6 +48,8 @@ private: KgThemeSelector *mselector; MainWidget *mwidget; + + QPointer<QLabel> scoreLabel = new QLabel; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/main.cpp new/klines-15.04.0/main.cpp --- old/klines-14.12.3/main.cpp 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/main.cpp 2015-03-07 21:22:31.000000000 +0100 @@ -19,36 +19,49 @@ * Roman Razilov 2000-05-21 qimgio */ +#include <QApplication> -#include <KApplication> -#include <KLocale> +#include <KLocalizedString> #include <KAboutData> -#include <KCmdLineArgs> -#include <KGlobal> - +#include <kdelibs4configmigrator.h> +#include <QCommandLineParser> +#include <KDBusService> #include "klines.h" static const char description[] = I18N_NOOP("Kolor Lines - a little game about balls and how to get rid of them"); int main( int argc, char **argv ) { - KAboutData aboutData("klines", 0, ki18n("Kolor Lines"), "1.5", - ki18n(description), KAboutData::License_GPL, - ki18n("(c) 2000-2008 The KLines Authors"), KLocalizedString(), "http://games.kde.org/klines";); - aboutData.addAuthor(ki18n("Roman Merzlyakov"), ki18n("Original author"), "ro...@sbrf.barrt.ru"); - aboutData.addAuthor(ki18n("Roman Razilov"), ki18n("Rewrite and Extension"), "roman.razi...@gmx.de"); - aboutData.addAuthor(ki18n("Dmitry Suzdalev"), ki18n("Rewrite to use QGraphicsView. Current maintainer"), "dim...@gmail.com"); - aboutData.addCredit(ki18n("Eugene Trounev"), ki18n("New SVG artwork for KDE4 version of the game"), "eugene.trou...@gmail.com"); - KCmdLineArgs::init(argc, argv, &aboutData); - - KApplication application; - KGlobal::locale()->insertCatalog( QLatin1String( "libkdegames" )); - - if (application.isSessionRestored()) + QApplication app(argc, argv); + Kdelibs4ConfigMigrator migrate(QLatin1String("klines")); + migrate.setConfigFiles(QStringList() << QLatin1String("klinesrc")); + migrate.setUiFiles(QStringList() << QLatin1String("klinesui.rc")); + migrate.migrate(); + + KAboutData aboutData(QStringLiteral("klines"), i18n("Kolor Lines"), QStringLiteral("1.6"), + i18n(description), KAboutLicense::GPL, + i18n("(c) 2000-2015 The KLines Authors"), QString(), QStringLiteral("http://games.kde.org/klines";)); + aboutData.addAuthor(i18n("Roman Merzlyakov"), i18n("Original author"), QStringLiteral("ro...@sbrf.barrt.ru")); + aboutData.addAuthor(i18n("Roman Razilov"), i18n("Rewrite and Extension"), QStringLiteral("roman.razi...@gmx.de")); + aboutData.addAuthor(i18n("Dmitry Suzdalev"), i18n("Rewrite to use QGraphicsView. Current maintainer"), QStringLiteral("dim...@gmail.com")); + aboutData.addCredit(i18n("Eugene Trounev"), i18n("New SVG artwork for KDE4 version of the game"), QStringLiteral("eugene.trou...@gmail.com")); + + app.setWindowIcon(QIcon::fromTheme(QLatin1String("klines"))); + KAboutData::setApplicationData(aboutData); + + QCommandLineParser parser; + parser.addVersionOption(); + parser.addHelpOption(); + aboutData.setupCommandLine(&parser); + parser.process(app); + aboutData.processCommandLine(&parser); + + KDBusService service; + if (app.isSessionRestored()) RESTORE(KLinesMainWindow) else { KLinesMainWindow *window = new KLinesMainWindow; window->show(); } - return application.exec(); + return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/mwidget.cpp new/klines-15.04.0/mwidget.cpp --- old/klines-14.12.3/mwidget.cpp 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/mwidget.cpp 2015-03-07 21:22:31.000000000 +0100 @@ -62,4 +62,4 @@ m_scene->resizeScene( ev->size().width(), ev->size().height() ); } -#include "mwidget.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/mwidget.h new/klines-15.04.0/mwidget.h --- old/klines-14.12.3/mwidget.h 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/mwidget.h 2015-03-07 21:22:31.000000000 +0100 @@ -29,14 +29,14 @@ { Q_OBJECT public: - explicit MainWidget( QWidget* parent=0 ); + explicit MainWidget( QWidget* parent=Q_NULLPTR); ~MainWidget(); KLinesScene* scene() { return m_scene; } public slots: void setShowNextColors(bool); private: - virtual void resizeEvent( QResizeEvent* ); + void resizeEvent( QResizeEvent* ) Q_DECL_OVERRIDE; KLinesScene* m_scene; QLabel *m_next_label; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/org.kde.klines.desktop new/klines-15.04.0/org.kde.klines.desktop --- old/klines-14.12.3/org.kde.klines.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/klines-15.04.0/org.kde.klines.desktop 2015-03-07 21:22:31.000000000 +0100 @@ -0,0 +1,149 @@ +# KDE Config File +[Desktop Entry] +Type=Application +Exec=klines -qwindowtitle %c +Icon=klines +X-DocPath=klines/index.html +GenericName=Tactical Game +GenericName[af]=Taktiese Speletjie +GenericName[ast]=Xuegu de táctica +GenericName[be]=Тактычная гульня +GenericName[bn]=কৌশলের খেলা +GenericName[br]=C'hoari a vrezelekaouriezh +GenericName[bs]=Taktična igra +GenericName[ca]=Joc de tàctica +GenericName[ca@valencia]=Joc de tàctica +GenericName[cs]=Taktická hra +GenericName[cy]=Gêm Dactegol +GenericName[da]=Taktisk spil +GenericName[de]=Kugeln entfernen +GenericName[el]=Παιχνίδι τακτικής +GenericName[en_GB]=Tactical Game +GenericName[eo]=Taktika ludo +GenericName[es]=Juego de táctica +GenericName[et]=Taktikamäng +GenericName[eu]=Joko taktikoa +GenericName[fa]=بازی برنامهریزیشده +GenericName[fi]=Taktiikkapeli +GenericName[fr]=Jeu de tactique +GenericName[ga]=Cluiche Taicticiúil +GenericName[gl]=Xogo de táctica +GenericName[he]=משחק טקטי +GenericName[hne]=रननीतिक खेल +GenericName[hr]=Taktička igra +GenericName[hu]=Taktikai játék +GenericName[is]=Herkænskuleikur +GenericName[it]=Gioco di tattica +GenericName[ja]=戦略的ゲーム +GenericName[kk]=Тактикалық ойын +GenericName[km]=ល្បែងក្បួនយុទ្ធសាស្ត្រ +GenericName[ko]=전략 게임 +GenericName[lt]=Taktinis žaidimas +GenericName[lv]=Taktiskā spēle +GenericName[mai]=रणनीतिक खेल +GenericName[mk]=Тактичка игра +GenericName[mr]=सामरिक खेळ +GenericName[nb]=Taktikk-spill +GenericName[nds]=Taktikspeel +GenericName[ne]=कौशल खेल +GenericName[nl]=Tactisch spel +GenericName[nn]=Taktisk spel +GenericName[pa]=ਟਾਕਟੀਕਲ ਖੇਡ +GenericName[pl]=Gra taktyczna +GenericName[pt]=Jogo de Estratégia +GenericName[pt_BR]=Jogo tático +GenericName[ro]=Un joc de tactică +GenericName[ru]=Тактическая игра +GenericName[se]=Taktihkkaspeallu +GenericName[sk]=Taktická hra +GenericName[sl]=Taktična igra +GenericName[sq]=Lojë Taktike +GenericName[sr]=Тактичка игра +GenericName[sr@ijekavian]=Тактичка игра +GenericName[sr@ijekavianlatin]=Taktička igra +GenericName[sr@latin]=Taktička igra +GenericName[sv]=Taktikspel +GenericName[ta]=தந்திரமான விளையாட்டு +GenericName[tg]=Бозии Тактикӣ +GenericName[tr]=Taktik Oyunu +GenericName[ug]=تاكتىكىلىق ئويۇن +GenericName[uk]=Тактична гра +GenericName[vi]=Trò chơi chiến thuật +GenericName[wa]=Djeu di tactike +GenericName[xh]=Umdlalo onamaqhinga +GenericName[x-test]=xxTactical Gamexx +GenericName[zh_CN]=战术游戏 +GenericName[zh_TW]=戰術遊戲 +Terminal=false +Name=Kolor Lines +Name[af]=Kleur Lyne +Name[ast]=Kolor Lines +Name[be]=Каляровыя лініі +Name[bn]=কালার লাইন্স +Name[br]=Linenn Kolor +Name[bs]=Linije u boji +Name[ca]=Kolor Lines +Name[ca@valencia]=Kolor Lines +Name[cs]=Kolor Lines +Name[cy]=Kolor Lines +Name[da]=Kolor Lines +Name[de]=Kolor Lines +Name[el]=Kolor Lines +Name[en_GB]=Kolor Lines +Name[eo]=Kolorlinioj +Name[es]=Kolor Lines +Name[et]=Kolor Lines +Name[eu]=Kolor Lines +Name[fa]=خطوط رنگی +Name[fi]=Kolor Lines +Name[fr]=Kolor Lines +Name[ga]=Kolor Lines +Name[gl]=Liñas de cores +Name[he]=Kolor Lines +Name[hne]=कलर लाइन्स +Name[hr]=KNiz u boji +Name[hu]=Színes vonalak +Name[is]=Kolor Lines +Name[it]=Kolor Lines +Name[ja]=Kolor Lines +Name[kk]=Kolor Lines +Name[km]=Kolor Lines +Name[ko]=Kolor Lines +Name[lt]=Kolor Lines +Name[lv]=Kolor Lines +Name[mk]=Kolor Lines +Name[mr]=कलर लाईन्स +Name[nb]=Klinjer +Name[nds]=Kolor Lines +Name[ne]=रङ रेखा +Name[nl]=Kolor Lines +Name[nn]=Fargelinjer +Name[pa]=ਰੰਗ ਖੇਡ +Name[pl]=Kolorowe linie +Name[pt]=Linhas Coloridas +Name[pt_BR]=Kolor Lines +Name[ro]=Linii colorate +Name[ru]=Kolor Lines +Name[se]=Kolor Lines +Name[sk]=Farebné čiary +Name[sl]=Kolor Lines +Name[sq]=Vija me Ngjyra +Name[sr]=Обојене линије +Name[sr@ijekavian]=Обојене линије +Name[sr@ijekavianlatin]=Obojene linije +Name[sr@latin]=Obojene linije +Name[sv]=Färglinjer +Name[ta]=வண்ணக்கோடுகள் +Name[tg]=Хатҳои Рангӣ +Name[tr]=Renkli Çizgiler +Name[ug]=Kolor Lines +Name[uk]=Кольорові лінії +Name[vi]=Kolor Lines +Name[wa]=Royes di coleur +Name[xh]=Iilayini zeKolor +Name[x-test]=xxKolor Linesxx +Name[zh_CN]=Kolor Lines +Name[zh_TW]=Kolor Lines 彩色線條 +X-DBUS-StartupType=Multi +Categories=Qt;KDE;Game;StrategyGame; +X-DBUS-ServiceName=org.kde.klines diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/previewitem.cpp new/klines-15.04.0/previewitem.cpp --- old/klines-14.12.3/previewitem.cpp 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/previewitem.cpp 2015-03-07 21:22:31.000000000 +0100 @@ -24,10 +24,9 @@ #include "renderer.h" #include <QPainter> -#include <KDebug> PreviewItem::PreviewItem( QGraphicsScene* scene ) - : QGraphicsItem( 0, scene ) + : QGraphicsItem( 0 ) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/previewitem.h new/klines-15.04.0/previewitem.h --- old/klines-14.12.3/previewitem.h 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/previewitem.h 2015-03-07 21:22:31.000000000 +0100 @@ -37,8 +37,8 @@ void setPreviewColors( const QList<BallColor>& colors ); // reimplemented functions - virtual void paint( QPainter* p, const QStyleOptionGraphicsItem* option, QWidget* widget = 0 ); - virtual QRectF boundingRect() const; + void paint( QPainter* p, const QStyleOptionGraphicsItem* option, QWidget* widget = Q_NULLPTR ) Q_DECL_OVERRIDE; + QRectF boundingRect() const Q_DECL_OVERRIDE; private: QList<BallColor> m_colors; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/renderer.cpp new/klines-15.04.0/renderer.cpp --- old/klines-14.12.3/renderer.cpp 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/renderer.cpp 2015-03-07 21:22:31.000000000 +0100 @@ -22,7 +22,6 @@ ********************************************************************/ #include "renderer.h" -#include <KDebug> #include <KGameRenderer> #include <KgThemeProvider> @@ -115,10 +114,10 @@ case DieAnim: return QLatin1Char(color2char(color)) + QLatin1String("_die_") + QString::number(frame + 1); case MoveAnim: - kDebug() << "Move animation type isn't supposed to be handled by KLinesRenderer!"; + qDebug() << "Move animation type isn't supposed to be handled by KLinesRenderer!"; return QString(); default: - kDebug() << "Warning! Animation type not handled in switch!"; + qDebug() << "Warning! Animation type not handled in switch!"; return QString(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/scene.cpp new/klines-15.04.0/scene.cpp --- old/klines-14.12.3/scene.cpp 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/scene.cpp 2015-03-07 21:22:31.000000000 +0100 @@ -29,10 +29,10 @@ #include <QGraphicsSceneMouseEvent> #include <QPainter> #include <QSet> +#include <QDebug> #include <KGamePopupItem> -#include <KLocale> -#include <KDebug> +#include <KLocalizedString> inline uint qHash( const FieldPos& pos ) { @@ -45,11 +45,11 @@ m_score(0), m_bonusScore(0), m_cellSize(32), m_previewZoneVisible(true) { m_animator = new KLinesAnimator(this); - connect( m_animator, SIGNAL(moveFinished()), SLOT(moveAnimFinished()) ); - connect( m_animator, SIGNAL(removeFinished()), SLOT(removeAnimFinished()) ); - connect( m_animator, SIGNAL(bornFinished()), SLOT(bornAnimFinished()) ); + connect(m_animator, &KLinesAnimator::moveFinished, this, &KLinesScene::moveAnimFinished); + connect(m_animator, &KLinesAnimator::removeFinished, this, &KLinesScene::removeAnimFinished); + connect(m_animator, &KLinesAnimator::bornFinished, this, &KLinesScene::bornAnimFinished); - m_focusItem = new QGraphicsRectItem( QRectF(0, 0, m_cellSize, m_cellSize), 0, this ); + m_focusItem = new QGraphicsRectItem( QRectF(0, 0, m_cellSize, m_cellSize), 0); m_focusItem->setZValue(1.0); m_focusItem->setPen( Qt::DashLine ); @@ -172,7 +172,7 @@ m_previewItem->setPos( previewOriginX, previewOriginY ); m_previewItem->setPreviewColors( m_nextColors ); - //kDebug() << "resize:" << width << "," << height << "; cellSize:" << m_cellSize; + //qDebug() << "resize:" << width << "," << height << "; cellSize:" << m_cellSize; } void KLinesScene::endTurn() @@ -680,7 +680,7 @@ if( m_gameOver ) return; // don't emit twice m_gameOver = true; - kDebug() << "GAME OVER"; + qDebug() << "GAME OVER"; emit stateChanged(QLatin1String( "not_undoable" )); //emit enableUndo(false); emit gameOver(m_score); @@ -690,4 +690,4 @@ m_popupItem->showMessage(i18n("<h1>Game over</h1>"), KGamePopupItem::Center); } -#include "scene.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-14.12.3/scene.h new/klines-15.04.0/scene.h --- old/klines-14.12.3/scene.h 2014-12-30 09:54:10.000000000 +0100 +++ new/klines-15.04.0/scene.h 2015-03-07 21:22:31.000000000 +0100 @@ -24,6 +24,7 @@ #define KL_SCENE_H #include <QGraphicsScene> + #include <KRandomSequence> #include "commondefs.h"
