Hello community, here is the log from the commit of package blinken for openSUSE:Factory checked in at 2015-05-11 17:23:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blinken (Old) and /work/SRC/openSUSE:Factory/.blinken.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blinken" Changes: -------- --- /work/SRC/openSUSE:Factory/blinken/blinken.changes 2015-03-11 09:43:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.blinken.new/blinken.changes 2015-05-11 17:23:21.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Apr 11 12:39:37 UTC 2015 - [email protected] + +- 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 17:15:31 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:34:25 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- blinken-14.12.3.tar.xz New: ---- blinken-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blinken.spec ++++++ --- /var/tmp/diff_new_pack.vjaaS5/_old 2015-05-11 17:23:21.000000000 +0200 +++ /var/tmp/diff_new_pack.vjaaS5/_new 2015-05-11 17:23:21.000000000 +0200 @@ -17,20 +17,30 @@ Name: blinken -Version: 14.12.3 +Version: 15.04.0 Release: 0 Summary: Simon Says Game License: GPL-2.0+ Group: Amusements/Games/Other Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -BuildRequires: libkde4-devel BuildRequires: perl -BuildRequires: xz -Provides: kde4-blinken = 4.3.0 -Obsoletes: kde4-blinken < 4.3.0 +BuildRequires: update-desktop-files +BuildRequires: extra-cmake-modules +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: kconfig-devel +BuildRequires: ki18n-devel +BuildRequires: kxmlgui-devel +BuildRequires: kguiaddons-devel +BuildRequires: kdoctools-devel +BuildRequires: kdbusaddons-devel +BuildRequires: phonon4qt5-devel +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires + %description A memory enhancement game. @@ -42,23 +52,22 @@ %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -%kde4_makeinstall -C build -%suse_update_desktop_file blinken X-KDE-Edu-Teaching -%kde_post_install +%kf5_makeinstall -C build +%suse_update_desktop_file org.kde.blinken X-KDE-Edu-Teaching %files %defattr(-,root,root) -%dir %{_kde4_datadir}/appdata -%{_kde4_applicationsdir}/blinken.desktop -%{_kde4_appsdir}/blinken/ -%{_kde4_bindir}/blinken -%{_kde4_configkcfgdir}/blinken.kcfg -%{_kde4_datadir}/appdata/blinken.appdata.xml -%{_kde4_htmldir}/en/blinken/ -%{_kde4_iconsdir}/hicolor/*/apps/blinken.* +%dir %{_datadir}/appdata +%{_kf5_applicationsdir}/org.kde.blinken.desktop +%{_kf5_appsdir}/blinken/ +%{_kf5_bindir}/blinken +%{_kf5_configkcfgdir}/ +%{_datadir}/appdata/blinken.appdata.xml +%{_kf5_htmldir}/en/blinken/ +%{_kf5_iconsdir}/hicolor/*/apps/blinken.* %changelog ++++++ blinken-14.12.3.tar.xz -> blinken-15.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/CMakeLists.txt new/blinken-15.04.0/CMakeLists.txt --- old/blinken-14.12.3/CMakeLists.txt 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/CMakeLists.txt 2015-02-28 10:37:33.000000000 +0100 @@ -1,12 +1,35 @@ project(blinken) -find_package(KDE4 REQUIRED) -include(KDE4Defaults) -include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) + +# minimal Qt requirement +set (QT_MIN_VERSION "5.2.0") + +# ECM +find_package (ECM 1.3.0 REQUIRED NO_MODULE) + +# where to look first for cmake modules +set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + +find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Svg) + +find_package (KF5 REQUIRED COMPONENTS + I18n XmlGui GuiAddons DocTools DBusAddons +) + +find_package (Phonon4Qt5) + +include(KDEInstallDirs) +include(KDECompilerSettings) +include(KDECMakeSettings) +include(FeatureSummary) +include(ECMInstallIcons) -set(CMAKE_MODULE_PATH ${blinken_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +# global include directories +include_directories (${CMAKE_CURRENT_BINARY_DIR}) + add_subdirectory( doc ) add_subdirectory( src ) add_subdirectory( images ) @@ -19,3 +42,5 @@ install( FILES README.packagers DESTINATION ${DATA_INSTALL_DIR}/blinken/ ) install( FILES blinken.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/ ) +feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/blinken.appdata.xml new/blinken-15.04.0/blinken.appdata.xml --- old/blinken-14.12.3/blinken.appdata.xml 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/blinken.appdata.xml 2015-02-28 10:37:33.000000000 +0100 @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <component type="desktop"> - <id>blinken.desktop</id> + <id>org.kde.blinken.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-2.0+</project_license> <name>Blinken</name> + <name xml:lang="ast">Blinken</name> <name xml:lang="bs">Blinken</name> <name xml:lang="ca">Blinken</name> <name xml:lang="cs">Blinken</name> @@ -15,6 +16,7 @@ <name xml:lang="fi">Blinken</name> <name xml:lang="fr">Blinken</name> <name xml:lang="it">Blinken</name> + <name xml:lang="lt">Blinken</name> <name xml:lang="nds">Blinken</name> <name xml:lang="nl">Blinken</name> <name xml:lang="pl">Blinken</name> @@ -23,11 +25,12 @@ <name xml:lang="sk">Blinken</name> <name xml:lang="sl">Blinken</name> <name xml:lang="sv">Blinken</name> - <name xml:lang="tr">Blinken</name> <name xml:lang="uk">Blinken</name> <name xml:lang="x-test">xxBlinkenxx</name> + <name xml:lang="zh-CN">Blinken</name> <name xml:lang="zh-TW">記憶_BlinKen</name> <summary>Memory Enhancement Game</summary> + <summary xml:lang="ast">Xuegu p'ameyorar la memoria</summary> <summary xml:lang="bs">Igra za poboljšanje pamćenja</summary> <summary xml:lang="ca">Un joc per millorar la memòria</summary> <summary xml:lang="cs">Hra k procvičování paměti</summary> @@ -39,6 +42,7 @@ <summary xml:lang="fi">Muistipeli</summary> <summary xml:lang="fr">Jeu pour améliorer la mémoire</summary> <summary xml:lang="it">Gioco per esercitare la memoria</summary> + <summary xml:lang="lt">Atminties gerinimo žaidimas</summary> <summary xml:lang="nds">Speel för't Verbetern vun't Behollen</summary> <summary xml:lang="nl">Geheugenoefenspel</summary> <summary xml:lang="pl">Gra na ćwiczenie pamięci</summary> @@ -47,9 +51,9 @@ <summary xml:lang="sk">Hra na zlepšenie pamäte</summary> <summary xml:lang="sl">Igra za izboljšanje spomina</summary> <summary xml:lang="sv">Minnesförbättringsspel</summary> - <summary xml:lang="tr">Bellek Geliştirme Oyunu</summary> <summary xml:lang="uk">Гра для розвитку пам'яті</summary> <summary xml:lang="x-test">xxMemory Enhancement Gamexx</summary> + <summary xml:lang="zh-CN">记忆强化游戏</summary> <summary xml:lang="zh-TW">加強記憶力的遊戲</summary> <description> <p>Blinken is based on an electronic game released in 1978, which challenges players to remember sequences of increasing length. On the face of the device, there are 4 different color buttons, each one with their own distinctive sound. These buttons light up randomly, creating the sequence that the player must then recall. If the player is successful in remembering the sequence of lights in the correct order, they advance to the next stage, where an identical sequence with one extra step is presented. If they are incorrect, the game is lost, and the player must start again from the beginning. The goal is to get a high score - each step in the sequence is worth one point, so correct entry of a sequence of 8 lights is worth 8 points on the high score table.</p> @@ -70,7 +74,6 @@ <p xml:lang="sk">Blinken je založený na elektronickej hre z roku 1978, ktorá vyžaduje od hráčov, aby si zapamätali sekvencie zvyšujúcej sa dĺžky. Na zariadení sú 4 rôznofarebné tlačidlá, každé so svojim vlastným zvukom. Tieto tlačidlá sa náhodne rozsvecujú, čím vytvárajú sekvenciu, ktorú si hráč musí zapamätať. Ak je hráč úspešný, postúpi na ďalšiu úroveň, kde sú rovnaké sekvencie s jedným ďalším krokom. Ak je neúspešný, hra je stratená a hráč musí začať od začiatku. Cieľom je dosiahnuť čo najviac bodov, každý krok v sekvencii je za jeden bod, teda správny vstup sekvencie s 8 svetlami je za 8 bodov.</p> <p xml:lang="sl">Blinken temelji na elektronski igri izšli leta 1978, ki od igralca zahteva, da si zapomni vedno daljša zaporedja. Na prednji strani naprave so štirje različno obarvani gumbi, ki oddajajo različne zvoke. Gumbi se naključno osvetlijo in to zaporedje mora igralec ponoviti. Če igralec uspešno ugane pravilni vrstni red luči v zaporedju, preide na naslednji nivo, kjer je pred njega postavljeno enako zaporedje, le da ima dodan en korak več. Če igralec zaporedja ne ugane, se igra konča in začne znova. Cilj igre je doseči najvišji rezultat. Vsak korak v zaporedju je vreden eno točko, zato je npr. pravilno vneseno zaporedje 8 luči vredno 8 točk.</p> <p xml:lang="sv">Blinken är baserat på ett elektroniskt spel, utgivet 1978, som utmanar spelare att komma ihåg sekvenser av ökande längd. På apparatens framsida finns fyra olika färgade knappar, var och en med ett eget karakteristiskt ljud. De fyra knapparna lyser upp slumpmässigt, och skapar sekvensen som spelaren därefter måste komma ihåg. Om spelaren lyckas komma ihåg sekvensen av ljus i rätt ordning, går han vidare till nästa nivå, där en identisk sekvens med ytterligare ett steg presenteras. Om spelaren har fel, förloras spelet, och spelaren måste börja om från början igen. Målet är att få högsta poäng: Varje steg i sekvensen är värt ett poäng, och att skriva in en sekvens med åtta ljus är alltså värt 8 poäng i tabellen med högsta poäng.</p> - <p xml:lang="tr">Blinken 1978 yılında yayınlanan ve oyuncuları zorlukları artan uzunlukta dizileri hatırlamaları için zorlayan bir oyunu temel alır. Aygıtın yüzünde her biri kendi ayırt edici sesi olan 4 farklı renkte düğme vardır. Bu düğmeler oyuncunun tekrarlaması gereken bir sırayla rasgele yanarlar. Eğer oyuncu ışıkların sıralamasını başarıyla tekrarlarsa bu sıralamaya bir ilave adım eklenen bir sonraki seviyeye geçer. Tekrarlayamazsa oyunu kaybeder ve en baştan başlamak zorunda kalır. Hedef en yüksek puanı almaktır - sıralamadaki her adım bir puan olduğundan 8 ışığın doğru sıralamasını hatırlayan yüksek puan tablosuna 8 puanla girer.</p> <p xml:lang="uk">Blinken засновано на електронній грі, випущеній у 1978, у якій гравці мали запам’ятовувати послідовності зі зростаючою довжиною. На передній панелі приладу знаходяться чотири кнопки різних кольорів, кожній з яких відповідає певний звук. Ці кнопки підсвічувалися у певній випадковій послідовності, утворюючи послідовність, яку гравець мав потім відтворити. Якщо гравець запам’ятовував послідовність у правильному порядку, він переходив на наступний рівень гри, де до послідовності додавався ще один додатковий крок. Якщо гравець робив помилку, гра вважалася програною, і гравець мав продовжувати її з початку. Метою гри є отримання максимальної кількості очок — кожен крок послідовності оцінювався у одне очко, отже, правильне введення послідовності з 8 елементів дає 8 залікових очок.</p> <p xml:lang="x-test">xxBlinken is based on an electronic game released in 1978, which challenges players to remember sequences of increasing length. On the face of the device, there are 4 different color buttons, each one with their own distinctive sound. These buttons light up randomly, creating the sequence that the player must then recall. If the player is successful in remembering the sequence of lights in the correct order, they advance to the next stage, where an identical sequence with one extra step is presented. If they are incorrect, the game is lost, and the player must start again from the beginning. The goal is to get a high score - each step in the sequence is worth one point, so correct entry of a sequence of 8 lights is worth 8 points on the high score table.xx</p> <p xml:lang="zh-TW">Blinken 是基於一套 1978 年發行的遊戲而來。該遊戲可以挑戰玩家的記憶力，並不斷增加長度與難度。一開始，有四個不同顏色的按鈕，每個鈕有自己不同的聲音。這些按鈕會隨機亮起，產生一組讓玩家記憶的序列。如果玩家成功記住這樣的序列順序，則可以進到下一關。若是失敗，則要從頭開始。得分越高越好。</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/doc/CMakeLists.txt new/blinken-15.04.0/doc/CMakeLists.txt --- old/blinken-14.12.3/doc/CMakeLists.txt 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/doc/CMakeLists.txt 2015-02-28 10:37:33.000000000 +0100 @@ -1,4 +1,4 @@ ########### install files ############### # -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR blinken) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR blinken) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/doc/index.docbook new/blinken-15.04.0/doc/index.docbook --- old/blinken-14.12.3/doc/index.docbook 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/doc/index.docbook 2015-02-28 10:37:33.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 blinken "<application>Blinken</application>"> <!ENTITY kappname "&blinken;"> <!ENTITY package "kdeedu"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/icons/CMakeLists.txt new/blinken-15.04.0/icons/CMakeLists.txt --- old/blinken-14.12.3/icons/CMakeLists.txt 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/icons/CMakeLists.txt 2015-02-28 10:37:33.000000000 +0100 @@ -1,2 +1,11 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +ecm_install_icons( ICONS + hi128-apps-blinken.png + hi16-apps-blinken.png + hi22-apps-blinken.png + hi32-apps-blinken.png + hi48-apps-blinken.png + hi64-apps-blinken.png + hisc-apps-blinken.svgz + DESTINATION ${ICON_INSTALL_DIR} +) Files old/blinken-14.12.3/icons/hi128-app-blinken.png and new/blinken-15.04.0/icons/hi128-app-blinken.png differ Files old/blinken-14.12.3/icons/hi128-apps-blinken.png and new/blinken-15.04.0/icons/hi128-apps-blinken.png differ Files old/blinken-14.12.3/icons/hi16-app-blinken.png and new/blinken-15.04.0/icons/hi16-app-blinken.png differ Files old/blinken-14.12.3/icons/hi16-apps-blinken.png and new/blinken-15.04.0/icons/hi16-apps-blinken.png differ Files old/blinken-14.12.3/icons/hi22-app-blinken.png and new/blinken-15.04.0/icons/hi22-app-blinken.png differ Files old/blinken-14.12.3/icons/hi22-apps-blinken.png and new/blinken-15.04.0/icons/hi22-apps-blinken.png differ Files old/blinken-14.12.3/icons/hi32-app-blinken.png and new/blinken-15.04.0/icons/hi32-app-blinken.png differ Files old/blinken-14.12.3/icons/hi32-apps-blinken.png and new/blinken-15.04.0/icons/hi32-apps-blinken.png differ Files old/blinken-14.12.3/icons/hi48-app-blinken.png and new/blinken-15.04.0/icons/hi48-app-blinken.png differ Files old/blinken-14.12.3/icons/hi48-apps-blinken.png and new/blinken-15.04.0/icons/hi48-apps-blinken.png differ Files old/blinken-14.12.3/icons/hi64-app-blinken.png and new/blinken-15.04.0/icons/hi64-app-blinken.png differ Files old/blinken-14.12.3/icons/hi64-apps-blinken.png and new/blinken-15.04.0/icons/hi64-apps-blinken.png differ Files old/blinken-14.12.3/icons/hisc-app-blinken.svgz and new/blinken-15.04.0/icons/hisc-app-blinken.svgz differ Files old/blinken-14.12.3/icons/hisc-apps-blinken.svgz and new/blinken-15.04.0/icons/hisc-apps-blinken.svgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/CMakeLists.txt new/blinken-15.04.0/src/CMakeLists.txt --- old/blinken-14.12.3/src/CMakeLists.txt 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/CMakeLists.txt 2015-02-28 10:37:33.000000000 +0100 @@ -11,21 +11,26 @@ counter.cpp button.cpp ) +include_directories(${PHONON_INCLUDES}) -kde4_add_kcfg_files(blinken_SRCS settings.kcfgc ) +kconfig_add_kcfg_files(blinken_SRCS settings.kcfgc ) -#uncomment this if oxygen icons for blinken are available -#kde4_add_app_icon(blinken_SRCS "${CMAKE_INSTALL_PREFIX}/share/icons/oxygen/*/apps/blinken.png") -kde4_add_app_icon(blinken_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-blinken.png") +add_executable(blinken ${blinken_SRCS}) -kde4_add_executable(blinken ${blinken_SRCS}) +target_link_libraries(blinken + KF5::I18n + KF5::XmlGui + KF5::GuiAddons + Qt5::Svg + KF5::DBusAddons + ${PHONON_LIBRARIES} + ) -target_link_libraries(blinken ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS}) +install(TARGETS blinken EXPORT blinken ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(TARGETS blinken ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS blinken.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( PROGRAMS org.kde.blinken.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES blinken.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/blinken.cpp new/blinken-15.04.0/src/blinken.cpp --- old/blinken-14.12.3/src/blinken.cpp 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/blinken.cpp 2015-02-28 10:37:33.000000000 +0100 @@ -14,18 +14,16 @@ #include <qpainter.h> #include <qsvgrenderer.h> #include <qtimer.h> +#include <QAction> #include <QApplication> +#include <QInputDialog> +#include <QKeySequence> -#include <kaction.h> #include <kconfig.h> #include <khelpmenu.h> -#include <kinputdialog.h> #include <kfontutils.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kmenu.h> -#include <kstandarddirs.h> -#include <KComponentData> +#include <klocalizedstring.h> +#include <KAboutData> #include "button.h" #include "counter.h" @@ -44,7 +42,7 @@ blinken::blinken() : m_overHighscore(false), m_overQuit(false), m_overCentralText(false), m_overMenu(false), m_overAboutKDE(false), m_overAboutBlinken(false), m_overSettings(false), m_overManual(false), m_overCentralLetters(false), m_overCounter(false), m_overFont(false), m_overSound(false), m_showPreferences(false), m_updateButtonHighlighting(false), m_highlighted(blinkenGame::none) { - m_renderer = new QSvgRenderer(KStandardDirs::locate("appdata", "images/blinken.svg")); + m_renderer = new QSvgRenderer(QStandardPaths::locate(QStandardPaths::DataLocation, "images/blinken.svg")); m_buttons[0] = new button(blinkenGame::blue); m_buttons[1] = new button(blinkenGame::yellow); @@ -60,13 +58,13 @@ show(); m_unhighlighter = new QTimer(this); - connect(m_unhighlighter, SIGNAL(timeout()), this, SLOT(unhighlight())); + connect(m_unhighlighter, &QTimer::timeout, this, &blinken::unhighlight); - connect(&m_game, SIGNAL(gameEnded()), this, SLOT(checkHS())); + connect(&m_game, &blinkenGame::gameEnded, this, &blinken::checkHS); connect(&m_game, SIGNAL(phaseChanged()), this, SLOT(update())); - connect(&m_game, SIGNAL(highlight(blinkenGame::color, bool)), this, SLOT(highlight(blinkenGame::color, bool))); + connect(&m_game, &blinkenGame::highlight, this, &blinken::highlight); - m_helpMenu = new KHelpMenu(this, KGlobal::mainComponent().aboutData()); + m_helpMenu = new KHelpMenu(this, KAboutData::applicationData()); m_helpMenu->menu(); // ensures the actions are created for (int i = 0; i < 3; i++) m_overLevels[i] = false; @@ -220,13 +218,13 @@ area = p.boundingRect(QRect(), Qt::AlignLeft, sounds); area.translate(212, 209 - (area.height() / 2)); p.drawText(area, Qt::AlignCenter, sounds); - m_soundRect = m_soundRect.unite(area); + m_soundRect = m_soundRect.united(area); if (!m_alwaysUseNonCoolFont) { area = p.boundingRect(QRect(), Qt::AlignLeft, font); area.translate(426 - area.width(), 209 - (area.height() / 2)); p.drawText(area, Qt::AlignCenter, font); - m_fontRect = m_fontRect.unite(area); + m_fontRect = m_fontRect.united(area); } p.setFont(oFont); @@ -291,7 +289,7 @@ } else { - KShortcut ks(e -> key()); + QKeySequence ks(e -> key()); if (!ks.toString().isEmpty()) { bool different = true; @@ -384,13 +382,13 @@ else if (m_showPreferences && m_fontRect.contains(e -> pos()) && !m_alwaysUseNonCoolFont) { blinkenSettings::setCustomFont(!blinkenSettings::customFont()); - blinkenSettings::self()->writeConfig(); + blinkenSettings::self()->save(); update(); } else if (m_showPreferences && m_soundRect.contains(e -> pos())) { blinkenSettings::setPlaySounds(!blinkenSettings::playSounds()); - blinkenSettings::self()->writeConfig(); + blinkenSettings::self()->save(); update(); } else if (m_overQuit) qApp->quit(); @@ -444,7 +442,7 @@ if (hsm.scoreGoodEnough(m_game.level(), m_game.score())) { bool ok; - QString name = KInputDialog::getText(i18n("Enter Your Name"), i18nc("@label:textbox refers to the user's name", "Name:"), m_lastName, &ok); + const QString name = QInputDialog::getText(this, i18n("Enter Your Name"), i18nc("@label:textbox refers to the user's name", "Name:"), QLineEdit::Normal, m_lastName, &ok); if (!name.isNull() && ok) { m_lastName = name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/blinken.desktop new/blinken-15.04.0/src/blinken.desktop --- old/blinken-14.12.3/src/blinken.desktop 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/blinken.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,173 +0,0 @@ -[Desktop Entry] -Name=Blinken -Name[ast]=Blinken -Name[bg]=Blinken -Name[bs]=Blinken -Name[ca]=Blinken -Name[ca@valencia]=Blinken -Name[cs]=Blinken -Name[csb]=Blinken -Name[da]=Blinken -Name[de]=Blinken -Name[el]=Blinken -Name[en_GB]=Blinken -Name[eo]=Blinken -Name[es]=Blinken -Name[et]=Blinken -Name[eu]=Blinken -Name[fi]=Blinken -Name[fr]=Blinken -Name[ga]=Blinken -Name[gl]=BlinKen -Name[gu]=બ્લિન્કેન -Name[he]=Blinken -Name[hi]=ब्लिंकन -Name[hne]=ब्लिंकन -Name[hr]=Blinken -Name[hu]=Blinken -Name[is]=Blinken -Name[it]=Blinken -Name[ja]=Blinken -Name[kk]=Blinken -Name[km]=Blinken -Name[ko]=Blinken -Name[lt]=Blinken -Name[lv]=Blinken -Name[ml]=ബ്ലിങ്കന് -Name[mr]=ब्लिंकन -Name[nb]=Blinken -Name[nds]=Blinken -Name[ne]=झिम्केको -Name[nl]=Blinken -Name[nn]=Blinken -Name[pa]=ਬਲੀਕਿਨ -Name[pl]=Blinken -Name[pt]=Blinken -Name[pt_BR]=Blinken -Name[ro]=Blinken -Name[ru]=Blinken -Name[sk]=Blinken -Name[sl]=Blinken -Name[sv]=Blinken -Name[te]=బ్లింక్ఎ -Name[tr]=Blinken -Name[ug]=لىپىلدىغان -Name[uk]=Blinken -Name[x-test]=xxBlinkenxx -Name[zh_CN]=Blinken -Name[zh_TW]=記憶_BlinKen -GenericName=Memory Enhancement Game -GenericName[ast]=Xuegu p'ameyorar la memoria -GenericName[bg]=Игра за упражнение на паметта -GenericName[bs]=Igra za poboljšanje pamćenja -GenericName[ca]=Un joc per millorar la memòria -GenericName[ca@valencia]=Un Joc per Millorar la Memòria -GenericName[cs]=Hra k procvičování paměti -GenericName[da]=Spil til hukommelsestræning -GenericName[de]=Spiel zum Gedächtnistraining -GenericName[el]=Παιχνίδι βελτίωσης της μνήμης -GenericName[en_GB]=Memory Enhancement Game -GenericName[es]=Juego para mejorar la memoria -GenericName[et]=Mälu parandamise mäng -GenericName[eu]=Memoria hobetzeko jokoa -GenericName[fi]=Muistipeli -GenericName[fr]=Un jeu d'entraînement de la mémoire -GenericName[ga]=Cluiche Feabhsaithe Cuimhne -GenericName[gl]=Xogo para mellorar a memoria -GenericName[gu]=યાદશક્તિ વધારવાની રમત -GenericName[hne]=याददास्त बढ़ाय के एक खेल -GenericName[hr]=Igra za poboljšanje memorije -GenericName[hu]=Memóriatesztelő játék -GenericName[is]=Minnisþjálfunarleikur -GenericName[it]=Gioco per esercitare la memoria -GenericName[ja]=記憶力増強ゲーム -GenericName[kk]=Жаттау қабілетін жаттықтыру -GenericName[km]=ល្បែងបង្កើនសតិ -GenericName[ko]=기억력 향상 게임 -GenericName[lt]=Atminties gerinimo žaidimas -GenericName[lv]=Atmiņas uzlabošanas spēle -GenericName[mr]=स्मृती वाढविणारा खेळ -GenericName[nb]=Et hukommelsesspill -GenericName[nds]=Speel för't Verbetern vun't Behollen -GenericName[nl]=Geheugenoefenspel -GenericName[nn]=Hugsetreningsspel -GenericName[pa]=ਯਾਦਾਸ਼ਤ ਵਧਾਉਣ ਵਾਲੀ ਖੇਡ -GenericName[pl]=Gra na ćwiczenie pamięci -GenericName[pt]=Jogo de Estímulo da Memória -GenericName[pt_BR]=Jogo para desenvolvimento da memória -GenericName[ro]=Un joc de îmbunătățire a memoriei -GenericName[ru]=Игра для развития памяти -GenericName[sk]=Hra na zlepšenie pamäte -GenericName[sl]=Igra za izboljšanje spomina -GenericName[sv]=Spel för att förbättra minnet -GenericName[te]=జ్ఞాపకశక్తి మెరుగు పరచు ఆట -GenericName[tr]=Bellek Geliştirme Uygulaması -GenericName[ug]=ئەستە تۇتۇش قابىلىيىتىنى ئۆستۈرىدىغان ئويۇن -GenericName[uk]=Гра для розвитку пам'яті -GenericName[x-test]=xxMemory Enhancement Gamexx -GenericName[zh_CN]=记忆强化游戏 -GenericName[zh_TW]=加強記憶力的遊戲 -X-DocPath=blinken/index.html -Exec=blinken -Icon=blinken -Type=Application -Comment=A memory enhancement game -Comment[ast]=Un xuegu p'ameyorar la memoria -Comment[bg]=Игра за упражнение на паметта -Comment[bs]=Igra za bolje pamćenje -Comment[ca]=Un joc per millorar la memòria -Comment[ca@valencia]=Un joc per millorar la memòria -Comment[cs]=Hra k procvičování paměti -Comment[csb]=Gra wspierająca pamiãc -Comment[da]=Et spil til hukommelsestræning -Comment[de]=Ein Spiel zum Training Ihres Gedächtnisses -Comment[el]=Ένα παιχνίδι βελτίωσης της μνήμης -Comment[en_GB]=A memory enhancement game -Comment[eo]=Ludo por plibonigi sian memoron -Comment[es]=Un juego para mejorar la memoria -Comment[et]=Mälu parandamise mäng -Comment[eu]=Memoria hobetzeko jokoa -Comment[fa]=بازی تقویت حافظه -Comment[fi]=Muistipeli -Comment[fr]=Un jeu d'entraînement de la mémoire -Comment[ga]=Cluiche feabhsaithe cuimhne -Comment[gl]=Un programa para mellorar a memoria -Comment[gu]=યાદશક્તિ વધારવાની રમત -Comment[he]=משחק ישן לשיפור הזיכרון -Comment[hi]=याददाश्त बढ़ाने का एक खेल -Comment[hne]=याददास्त बढ़ाय के एक खेल -Comment[hr]=Igra za poboljšanje memorije -Comment[hu]=Memóriatesztelő játék -Comment[is]=Minnisþjálfunarleikur -Comment[it]=Un gioco per esercitare la memoria -Comment[ja]=記憶力増強ゲーム -Comment[kk]=Жаттау қабілетін жаттықтыру ойыны -Comment[km]=ល្បែងបង្កើនសតិ -Comment[ko]=기억력 향상 게임 -Comment[lt]=Atminties gerinimo žaidimas -Comment[lv]=Spēle atmiņas uzlabošanai -Comment[ml]=ഒരു ഓര്മ്മ വര്ദ്ധിപ്പിക്കല് കളി -Comment[mr]=स्मृती वाढविणारा खेळ -Comment[nb]=Et hukommelsesspill -Comment[nds]=En Speel för't Verbetern vun't Behollen -Comment[ne]=स्मृति बढाउने खेल -Comment[nl]=Een geheugenoefenspel -Comment[nn]=Eit hugsetreningsspel -Comment[pa]=ਯਾਦਾਸ਼ਤ ਵਧਾਉਣ ਵਾਲੀ ਖੇਡ -Comment[pl]=Znana gra na ćwiczenie pamięci -Comment[pt]=Um jogo antigo para melhorar a memória -Comment[pt_BR]=Um jogo de desenvolvimento da memória -Comment[ro]=Un joc de îmbunătățire a memoriei -Comment[ru]=Игра для развития памяти -Comment[sk]=Hra na zlepšenie pamäte -Comment[sl]=Igra za izboljšanje spomina -Comment[sv]=Ett spel för att förbättra minnet -Comment[te]=వొక జ్ఞాపకశక్తి మెరుగు పరచు ఆట -Comment[tr]=Bir bellek geliştirme uygulaması -Comment[ug]=ئەستە تۇتۇش قابىلىيىتىنى ئۆستۈرىدىغان بىر ئويۇن -Comment[uk]=Гра для розвитку пам'яті -Comment[x-test]=xxA memory enhancement gamexx -Comment[zh_CN]=记忆强化游戏 -Comment[zh_TW]=加強記憶力的遊戲 -Terminal=false -Categories=Qt;KDE;Education;Game;KidsGame; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/blinkengame.cpp new/blinken-15.04.0/src/blinkengame.cpp --- old/blinken-14.12.3/src/blinkengame.cpp 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/blinkengame.cpp 2015-02-28 10:37:33.000000000 +0100 @@ -14,14 +14,13 @@ #include <qtimer.h> #include <krandom.h> -#include <KDebug> #include "soundsplayer.h" blinkenGame::blinkenGame() : m_phase(starting) { m_soundsPlayer = new soundsPlayer; m_waitTimer = new QTimer(this); - connect(m_waitTimer, SIGNAL(timeout()), this, SLOT(waiting())); + connect(m_waitTimer, &QTimer::timeout, this, &blinkenGame::waiting); } blinkenGame::~blinkenGame() @@ -136,7 +135,7 @@ } else m_sequence.append(generateColor()); - connect(m_soundsPlayer, SIGNAL(ended()), this, SLOT(soundEnded())); + connect(m_soundsPlayer, &soundsPlayer::ended, this, &blinkenGame::soundEnded); m_nextColor = m_sequence.constBegin(); soundEnded(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/button.cpp new/blinken-15.04.0/src/button.cpp --- old/blinken-14.12.3/src/button.cpp 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/button.cpp 2015-02-28 10:37:33.000000000 +0100 @@ -11,15 +11,13 @@ #include <kconfig.h> #include <ksharedconfig.h> -#include <kshortcut.h> -#include <kstandarddirs.h> -#include <kdebug.h> -#include <kglobal.h> #include <kconfiggroup.h> +#include <QKeySequence> + button::button(blinkenGame::color c) : m_selected(false), m_color(c) { - KConfigGroup kc(KGlobal::config(), "General"); + KConfigGroup kc(KSharedConfig::openConfig(), "General"); QString cs = getColorString(); switch (c) @@ -55,14 +53,14 @@ m_key = key; m_selected = false; - KConfigGroup kc(KGlobal::config(), "General"); + KConfigGroup kc(KSharedConfig::openConfig(), "General"); kc.writeEntry(getColorString(), key); kc.sync(); } QString button::shortcut() const { - return KShortcut(m_key).toString(); + return QKeySequence(m_key).toString(); } int button::key() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/button.h new/blinken-15.04.0/src/button.h --- old/blinken-14.12.3/src/button.h 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/button.h 2015-02-28 10:37:33.000000000 +0100 @@ -10,12 +10,8 @@ #ifndef BUTTON_H #define BUTTON_H -#include <qobject.h> - #include "blinkengame.h" -class KAction; - class button { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/highscoredialog.cpp new/blinken-15.04.0/src/highscoredialog.cpp --- old/blinken-14.12.3/src/highscoredialog.cpp 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/highscoredialog.cpp 2015-02-28 10:37:33.000000000 +0100 @@ -9,15 +9,17 @@ #include "highscoredialog.h" +#include <qdialogbuttonbox.h> #include <qpainter.h> #include <qpixmap.h> #include <qtabbar.h> +#include <QTabWidget> +#include <QVBoxLayout> #include <kconfig.h> #include <kfontutils.h> -#include <klocale.h> -#include <kglobal.h> -#include <ktabwidget.h> +#include <klocalizedstring.h> +#include <ksharedconfig.h> #include "counter.h" #include "settings.h" @@ -121,10 +123,10 @@ /* myTabWidget */ -class myTabWidget : public KTabWidget +class myTabWidget : public QTabWidget { public: - myTabWidget(QWidget *parent) : KTabWidget(parent) {} + myTabWidget(QWidget *parent) : QTabWidget(parent) {} QSize tabBarSizeHint() const { @@ -134,14 +136,17 @@ /* highScoreDialog */ -highScoreDialog::highScoreDialog(QWidget *parent, QSvgRenderer *renderer) : KDialog(parent) +highScoreDialog::highScoreDialog(QWidget *parent, QSvgRenderer *renderer) : QDialog(parent) { - setCaption(i18nc("@title:window the highest scores for each level are shown", "Highscores")); - setButtons(Close); + setWindowTitle(i18nc("@title:window the highest scores for each level are shown", "Highscores")); + setLayout(new QVBoxLayout(this)); m_tw = new myTabWidget(this); - setMainWidget(m_tw); - + layout()->addWidget(m_tw); + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close); + connect(buttonBox, &QDialogButtonBox::rejected, this, &highScoreDialog::close); + layout()->addWidget(buttonBox); + highScoreManager hsm; m_tw -> addTab(new scoresWidget(0, hsm.scores(0), renderer), i18nc("@title:group High scores Level 1 tab title", "Level 1")); @@ -202,7 +207,7 @@ m_scores[level].insert(it, qMakePair(score, name)); m_scores[level].erase(--m_scores[level].end()); - KConfigGroup cfg(KGlobal::config(), QString("Level%1").arg(level + 1)); + KConfigGroup cfg(KSharedConfig::openConfig(), QString("Level%1").arg(level + 1)); int j; for (it = m_scores[level].begin(), j = 1; it != m_scores[level].end(); ++it, j++) { @@ -229,7 +234,7 @@ } for (int i = 1; i <= 3; i++) { - KConfigGroup cfg(KGlobal::config(), QString("Level%1").arg(i)); + KConfigGroup cfg(KSharedConfig::openConfig(), QString("Level%1").arg(i)); for (int j = 1; j <= 5; j++) { m_scores[i-1].append(qMakePair(cfg.readEntry(QString("Score%1").arg(j),QVariant(0)).toInt(),cfg.readEntry(QString("Name%1").arg(j),QString()))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/highscoredialog.h new/blinken-15.04.0/src/highscoredialog.h --- old/blinken-14.12.3/src/highscoredialog.h 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/highscoredialog.h 2015-02-28 10:37:33.000000000 +0100 @@ -10,16 +10,16 @@ #ifndef HIGHSCOREDIALOG_H #define HIGHSCOREDIALOG_H +#include <qdialog.h> + #include <qpair.h> #include <qlist.h> -#include <kdialog.h> - class QSvgRenderer; class myTabWidget; -class highScoreDialog : private KDialog +class highScoreDialog : private QDialog { public: highScoreDialog(QWidget *parent, QSvgRenderer *renderer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/main.cpp new/blinken-15.04.0/src/main.cpp --- old/blinken-14.12.3/src/main.cpp 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/main.cpp 2015-02-28 10:37:33.000000000 +0100 @@ -10,31 +10,48 @@ #include "blinken.h" #include <kaboutdata.h> -#include <kcmdlineargs.h> -#include <klocale.h> -#include <kstandarddirs.h> -#include <kapplication.h> +#include <klocalizedstring.h> +#include <KDBusService> +#include <kdelibs4configmigrator.h> + +#include <qapplication.h> +#include <qcommandlineparser.h> #include <QFontDatabase> #include <QFontInfo> +#include <QStandardPaths> int main(int argc, char *argv[]) { - KAboutData about("blinken", 0, ki18n("Blinken"), "0.3", ki18n("A memory enhancement game"), KAboutData::License_GPL, ki18n("© 2005-2007 Albert Astals Cid\n© 2005-2007 Danny Allen")); - about.addAuthor(ki18n("Albert Astals Cid"), ki18n("Coding"), "[email protected]"); - about.addAuthor(ki18n("Danny Allen"), ki18n("Design, Graphics and Sounds"), "[email protected]"); - about.addCredit(ki18n("Steve Jordi"), ki18n("GPL'ed his 'Steve' font so that we could use it"), "[email protected]"); - KCmdLineArgs::init(argc, argv, &about); - KApplication app; - app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); + KLocalizedString::setApplicationDomain("blinken"); + + QApplication app(argc, argv); + KAboutData about("blinken", i18n("Blinken"), "0.4", i18n("A memory enhancement game"), KAboutLicense::GPL, i18n("© 2005-2007 Albert Astals Cid\n© 2005-2007 Danny Allen")); + about.addAuthor(i18n("Albert Astals Cid"), i18n("Coding"), "[email protected]"); + about.addAuthor(i18n("Danny Allen"), i18n("Design, Graphics and Sounds"), "[email protected]"); + about.addCredit(i18n("Steve Jordi"), i18n("GPL'ed his 'Steve' font so that we could use it"), "[email protected]"); + + KAboutData::setApplicationData(about); + + Kdelibs4ConfigMigrator migrate(QStringLiteral("blinken")); + migrate.setConfigFiles(QStringList() << QStringLiteral("blinkenrc")); + migrate.migrate(); + + + QCommandLineParser parser; + about.setupCommandLine(&parser); + parser.process(app); + about.processCommandLine(&parser); + + app.setWindowIcon(QIcon::fromTheme(QLatin1String("blinken"))); QFont f("Steve", 12, QFont::Normal, true); // Works with Steve may need some tweaking to work with other fonts if (!QFontInfo(f).exactMatch()) { - QFontDatabase::addApplicationFont(KStandardDirs::locate("appdata", "fonts/steve.ttf")); + QFontDatabase::addApplicationFont(QStandardPaths::locate(QStandardPaths::DataLocation, "fonts/steve.ttf")); } - - app.setTopWidget(new blinken()); + KDBusService service; + new blinken(); return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/org.kde.blinken.desktop new/blinken-15.04.0/src/org.kde.blinken.desktop --- old/blinken-14.12.3/src/org.kde.blinken.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/blinken-15.04.0/src/org.kde.blinken.desktop 2015-02-28 10:37:33.000000000 +0100 @@ -0,0 +1,174 @@ +[Desktop Entry] +Name=Blinken +Name[ast]=Blinken +Name[bg]=Blinken +Name[bs]=Blinken +Name[ca]=Blinken +Name[ca@valencia]=Blinken +Name[cs]=Blinken +Name[csb]=Blinken +Name[da]=Blinken +Name[de]=Blinken +Name[el]=Blinken +Name[en_GB]=Blinken +Name[eo]=Blinken +Name[es]=Blinken +Name[et]=Blinken +Name[eu]=Blinken +Name[fi]=Blinken +Name[fr]=Blinken +Name[ga]=Blinken +Name[gl]=BlinKen +Name[gu]=બ્લિન્કેન +Name[he]=Blinken +Name[hi]=ब्लिंकन +Name[hne]=ब्लिंकन +Name[hr]=Blinken +Name[hu]=Blinken +Name[is]=Blinken +Name[it]=Blinken +Name[ja]=Blinken +Name[kk]=Blinken +Name[km]=Blinken +Name[ko]=Blinken +Name[lt]=Blinken +Name[lv]=Blinken +Name[ml]=ബ്ലിങ്കന് +Name[mr]=ब्लिंकन +Name[nb]=Blinken +Name[nds]=Blinken +Name[ne]=झिम्केको +Name[nl]=Blinken +Name[nn]=Blinken +Name[pa]=ਬਲੀਕਿਨ +Name[pl]=Blinken +Name[pt]=Blinken +Name[pt_BR]=Blinken +Name[ro]=Blinken +Name[ru]=Blinken +Name[sk]=Blinken +Name[sl]=Blinken +Name[sv]=Blinken +Name[te]=బ్లింక్ఎ +Name[tr]=Blinken +Name[ug]=لىپىلدىغان +Name[uk]=Blinken +Name[x-test]=xxBlinkenxx +Name[zh_CN]=Blinken +Name[zh_TW]=記憶_BlinKen +GenericName=Memory Enhancement Game +GenericName[ast]=Xuegu p'ameyorar la memoria +GenericName[bg]=Игра за упражнение на паметта +GenericName[bs]=Igra za poboljšanje pamćenja +GenericName[ca]=Un joc per millorar la memòria +GenericName[ca@valencia]=Un Joc per Millorar la Memòria +GenericName[cs]=Hra k procvičování paměti +GenericName[da]=Spil til hukommelsestræning +GenericName[de]=Spiel zum Gedächtnistraining +GenericName[el]=Παιχνίδι βελτίωσης της μνήμης +GenericName[en_GB]=Memory Enhancement Game +GenericName[es]=Juego para mejorar la memoria +GenericName[et]=Mälu parandamise mäng +GenericName[eu]=Memoria hobetzeko jokoa +GenericName[fi]=Muistipeli +GenericName[fr]=Un jeu d'entraînement de la mémoire +GenericName[ga]=Cluiche Feabhsaithe Cuimhne +GenericName[gl]=Xogo para mellorar a memoria +GenericName[gu]=યાદશક્તિ વધારવાની રમત +GenericName[hne]=याददास्त बढ़ाय के एक खेल +GenericName[hr]=Igra za poboljšanje memorije +GenericName[hu]=Memóriatesztelő játék +GenericName[is]=Minnisþjálfunarleikur +GenericName[it]=Gioco per esercitare la memoria +GenericName[ja]=記憶力増強ゲーム +GenericName[kk]=Жаттау қабілетін жаттықтыру +GenericName[km]=ល្បែងបង្កើនសតិ +GenericName[ko]=기억력 향상 게임 +GenericName[lt]=Atminties gerinimo žaidimas +GenericName[lv]=Atmiņas uzlabošanas spēle +GenericName[mr]=स्मृती वाढविणारा खेळ +GenericName[nb]=Et hukommelsesspill +GenericName[nds]=Speel för't Verbetern vun't Behollen +GenericName[nl]=Geheugenoefenspel +GenericName[nn]=Hugsetreningsspel +GenericName[pa]=ਯਾਦਾਸ਼ਤ ਵਧਾਉਣ ਵਾਲੀ ਖੇਡ +GenericName[pl]=Gra na ćwiczenie pamięci +GenericName[pt]=Jogo de Estímulo da Memória +GenericName[pt_BR]=Jogo para desenvolvimento da memória +GenericName[ro]=Un joc de îmbunătățire a memoriei +GenericName[ru]=Игра для развития памяти +GenericName[sk]=Hra na zlepšenie pamäte +GenericName[sl]=Igra za izboljšanje spomina +GenericName[sv]=Spel för att förbättra minnet +GenericName[te]=జ్ఞాపకశక్తి మెరుగు పరచు ఆట +GenericName[tr]=Bellek Geliştirme Uygulaması +GenericName[ug]=ئەستە تۇتۇش قابىلىيىتىنى ئۆستۈرىدىغان ئويۇن +GenericName[uk]=Гра для розвитку пам'яті +GenericName[x-test]=xxMemory Enhancement Gamexx +GenericName[zh_CN]=记忆强化游戏 +GenericName[zh_TW]=加強記憶力的遊戲 +X-DocPath=blinken/index.html +Exec=blinken +Icon=blinken +Type=Application +Comment=A memory enhancement game +Comment[ast]=Un xuegu p'ameyorar la memoria +Comment[bg]=Игра за упражнение на паметта +Comment[bs]=Igra za bolje pamćenje +Comment[ca]=Un joc per millorar la memòria +Comment[ca@valencia]=Un joc per millorar la memòria +Comment[cs]=Hra k procvičování paměti +Comment[csb]=Gra wspierająca pamiãc +Comment[da]=Et spil til hukommelsestræning +Comment[de]=Ein Spiel zum Training Ihres Gedächtnisses +Comment[el]=Ένα παιχνίδι βελτίωσης της μνήμης +Comment[en_GB]=A memory enhancement game +Comment[eo]=Ludo por plibonigi sian memoron +Comment[es]=Un juego para mejorar la memoria +Comment[et]=Mälu parandamise mäng +Comment[eu]=Memoria hobetzeko jokoa +Comment[fa]=بازی تقویت حافظه +Comment[fi]=Muistipeli +Comment[fr]=Un jeu d'entraînement de la mémoire +Comment[ga]=Cluiche feabhsaithe cuimhne +Comment[gl]=Un programa para mellorar a memoria +Comment[gu]=યાદશક્તિ વધારવાની રમત +Comment[he]=משחק ישן לשיפור הזיכרון +Comment[hi]=याददाश्त बढ़ाने का एक खेल +Comment[hne]=याददास्त बढ़ाय के एक खेल +Comment[hr]=Igra za poboljšanje memorije +Comment[hu]=Memóriatesztelő játék +Comment[is]=Minnisþjálfunarleikur +Comment[it]=Un gioco per esercitare la memoria +Comment[ja]=記憶力増強ゲーム +Comment[kk]=Жаттау қабілетін жаттықтыру ойыны +Comment[km]=ល្បែងបង្កើនសតិ +Comment[ko]=기억력 향상 게임 +Comment[lt]=Atminties gerinimo žaidimas +Comment[lv]=Spēle atmiņas uzlabošanai +Comment[ml]=ഒരു ഓര്മ്മ വര്ദ്ധിപ്പിക്കല് കളി +Comment[mr]=स्मृती वाढविणारा खेळ +Comment[nb]=Et hukommelsesspill +Comment[nds]=En Speel för't Verbetern vun't Behollen +Comment[ne]=स्मृति बढाउने खेल +Comment[nl]=Een geheugenoefenspel +Comment[nn]=Eit hugsetreningsspel +Comment[pa]=ਯਾਦਾਸ਼ਤ ਵਧਾਉਣ ਵਾਲੀ ਖੇਡ +Comment[pl]=Znana gra na ćwiczenie pamięci +Comment[pt]=Um jogo antigo para melhorar a memória +Comment[pt_BR]=Um jogo de desenvolvimento da memória +Comment[ro]=Un joc de îmbunătățire a memoriei +Comment[ru]=Игра для развития памяти +Comment[sk]=Hra na zlepšenie pamäte +Comment[sl]=Igra za izboljšanje spomina +Comment[sv]=Ett spel för att förbättra minnet +Comment[te]=వొక జ్ఞాపకశక్తి మెరుగు పరచు ఆట +Comment[tr]=Bir bellek geliştirme uygulaması +Comment[ug]=ئەستە تۇتۇش قابىلىيىتىنى ئۆستۈرىدىغان بىر ئويۇن +Comment[uk]=Гра для розвитку пам'яті +Comment[x-test]=xxA memory enhancement gamexx +Comment[zh_CN]=记忆强化游戏 +Comment[zh_TW]=加強記憶力的遊戲 +Terminal=false +Categories=Qt;KDE;Education;Game;KidsGame; +X-DBUS-ServiceName=org.kde.blinken diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/soundsplayer.cpp new/blinken-15.04.0/src/soundsplayer.cpp --- old/blinken-14.12.3/src/soundsplayer.cpp 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/soundsplayer.cpp 2015-02-28 10:37:33.000000000 +0100 @@ -9,28 +9,24 @@ #include "soundsplayer.h" -#include <klocale.h> -#include <kstandarddirs.h> -#include <kurl.h> - -#include <phonon/Path> - #include "settings.h" +#include <QStandardPaths> + soundsPlayer::soundsPlayer() : m_audioOutput(Phonon::GameCategory) { m_audioOutput.setVolume( 0.8f ); Phonon::createPath(&m_mediaObject, &m_audioOutput); - connect(&m_mediaObject, SIGNAL(finished()), this, SLOT(playEnded())); + connect(&m_mediaObject, &Phonon::MediaObject::finished, this, &soundsPlayer::playEnded); - m_allSound = KStandardDirs::locate("appdata","sounds/lose.wav"); - m_greenSound = KStandardDirs::locate("appdata","sounds/1.wav"); - m_redSound = KStandardDirs::locate("appdata","sounds/2.wav"); - m_blueSound = KStandardDirs::locate("appdata","sounds/3.wav"); - m_yellowSound = KStandardDirs::locate("appdata","sounds/4.wav"); + m_allSound = QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/lose.wav"); + m_greenSound = QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/1.wav"); + m_redSound = QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/2.wav"); + m_blueSound = QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/3.wav"); + m_yellowSound = QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/4.wav"); - connect(&m_warnTimer, SIGNAL(timeout()), this, SIGNAL(ended())); + connect(&m_warnTimer, &QTimer::timeout, this, &soundsPlayer::ended); m_warnTimer.setSingleShot(true); } @@ -70,7 +66,7 @@ } if (!soundFile.isEmpty()) { - m_mediaObject.setCurrentSource(soundFile); + m_mediaObject.setCurrentSource(QUrl::fromLocalFile(soundFile)); m_mediaObject.play(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-14.12.3/src/soundsplayer.h new/blinken-15.04.0/src/soundsplayer.h --- old/blinken-14.12.3/src/soundsplayer.h 2015-02-21 07:35:10.000000000 +0100 +++ new/blinken-15.04.0/src/soundsplayer.h 2015-02-28 10:37:33.000000000 +0100 @@ -13,7 +13,6 @@ #include <phonon/MediaObject> #include <phonon/audiooutput.h> -#include <QList> #include <QTimer> #include "blinkengame.h"
