Hello community, here is the log from the commit of package ktouch for openSUSE:Factory checked in at 2014-05-22 06:50:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktouch (Old) and /work/SRC/openSUSE:Factory/.ktouch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktouch" Changes: -------- --- /work/SRC/openSUSE:Factory/ktouch/ktouch.changes 2014-04-18 12:35:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktouch.new/ktouch.changes 2014-05-22 06:50:50.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:47:36 UTC 2014 - [email protected] + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- ktouch-4.13.0.tar.xz New: ---- ktouch-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktouch.spec ++++++ --- /var/tmp/diff_new_pack.cx8AW3/_old 2014-05-22 06:50:51.000000000 +0200 +++ /var/tmp/diff_new_pack.cx8AW3/_new 2014-05-22 06:50:51.000000000 +0200 @@ -17,7 +17,7 @@ Name: ktouch -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Touch Typing Tutor License: GPL-2.0+ ++++++ ktouch-4.13.0.tar.xz -> ktouch-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.13.0/README new/ktouch-4.13.1/README --- old/ktouch-4.13.0/README 2014-03-17 10:00:14.000000000 +0100 +++ new/ktouch-4.13.1/README 2014-04-28 15:40:19.000000000 +0200 @@ -28,4 +28,6 @@ To run KTouch, additional libraries have to installed. * KDE-runtime >= 4.10.0 * kqtquickcharts >= 4.12.0 (git://anongit.kde.org/kqtquickcharts) + * kde-workspace >= 4.10.0 (optional, for keyboard layout configuration + from within the application) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.13.0/src/mainwindow.cpp new/ktouch-4.13.1/src/mainwindow.cpp --- old/ktouch-4.13.0/src/mainwindow.cpp 2014-03-17 10:00:14.000000000 +0100 +++ new/ktouch-4.13.1/src/mainwindow.cpp 2014-04-28 15:40:19.000000000 +0200 @@ -53,6 +53,8 @@ #else #endif +const QString keyboardKCMName = "kcm_keyboard"; + MainWindow::MainWindow(QWidget* parent): KMainWindow(parent), m_view(new QDeclarativeView(this)), @@ -173,7 +175,7 @@ QPointer<KCMultiDialog> kcm = new KCMultiDialog(this); kcm->setWindowTitle(i18n("Configure Keyboard")); - kcm->addModule("kcm_keyboard"); + kcm->addModule(keyboardKCMName); kcm->exec(); delete kcm; @@ -199,9 +201,12 @@ #ifdef KTOUCH_BUILD_WITH_X11 - KAction* configureKeyboardAction = new KAction(i18n("Configure Keyboard..."), this); - m_menu->addAction(configureKeyboardAction); - connect(configureKeyboardAction, SIGNAL(triggered()), SLOT(configureKeyboard())); + if (testKCMAvailibility(keyboardKCMName)) + { + KAction* configureKeyboardAction = new KAction(i18n("Configure Keyboard..."), this); + m_menu->addAction(configureKeyboardAction); + connect(configureKeyboardAction, SIGNAL(triggered()), SLOT(configureKeyboard())); + } #else m_menu->addMenu(m_keyboardLayoutMenu); #endif @@ -220,3 +225,15 @@ m_view->setResizeMode(QDeclarativeView::SizeRootObjectToView); m_view->setSource(QUrl::fromLocalFile(KGlobal::dirs()->findResource("appdata", "qml/main.qml"))); } + +bool MainWindow::testKCMAvailibility(const QString& name) +{ + KService::Ptr service = KService::serviceByStorageId(name + ".desktop"); + + if (!service) + { + return false; + } + + return service->hasServiceType("KCModule") && !service->noDisplay(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.13.0/src/mainwindow.h new/ktouch-4.13.1/src/mainwindow.h --- old/ktouch-4.13.0/src/mainwindow.h 2014-03-17 10:00:14.000000000 +0100 +++ new/ktouch-4.13.1/src/mainwindow.h 2014-04-28 15:40:19.000000000 +0200 @@ -61,6 +61,7 @@ void setFullscreen(bool fullscreen); private: void init(); + bool testKCMAvailibility(const QString& name); QDeclarativeView* m_view; KActionCollection* m_actionCollection; QMenu* m_menu; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
