Hello community, here is the log from the commit of package ktimer for openSUSE:Factory checked in at 2015-05-11 18:31:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktimer (Old) and /work/SRC/openSUSE:Factory/.ktimer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktimer" Changes: -------- --- /work/SRC/openSUSE:Factory/ktimer/ktimer.changes 2015-03-05 18:17:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktimer.new/ktimer.changes 2015-05-11 18:31:32.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Apr 11 13:22:44 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 18:19:27 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:49:44 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- ktimer-14.12.3.tar.xz New: ---- ktimer-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktimer.spec ++++++ --- /var/tmp/diff_new_pack.UCRS3V/_old 2015-05-11 18:31:33.000000000 +0200 +++ /var/tmp/diff_new_pack.UCRS3V/_new 2015-05-11 18:31:33.000000000 +0200 @@ -17,17 +17,28 @@ Name: ktimer -Version: 14.12.3 +Version: 15.04.0 Release: 0 Summary: Countdown Launcher License: GPL-2.0+ Group: Productivity/Other Url: http://www.kde.org Source0: ktimer-%{version}.tar.xz -BuildRequires: libkde4-devel -BuildRequires: xz +BuildRequires: extra-cmake-modules +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: kdoctools-devel +BuildRequires: ki18n-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kxmlgui-devel +BuildRequires: kio-devel +BuildRequires: kiconthemes-devel +BuildRequires: knotifications-devel +BuildRequires: update-desktop-files +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Countdown launching tool for KDE @@ -36,14 +47,12 @@ %setup -q -n ktimer-%{version} %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -cd build -%kde4_makeinstall -%suse_update_desktop_file ktimer Utility TimeUtility -%kde_post_install +%kf5_makeinstall -C build +%suse_update_desktop_file org.kde.ktimer Utility TimeUtility %post -p /sbin/ldconfig @@ -52,9 +61,10 @@ %files %defattr(-,root,root) %doc COPYING -%_kde4_bindir/ktimer -%_kde4_htmldir/en/ktimer/ -%_kde4_applicationsdir/ktimer.desktop -%_kde4_iconsdir/hicolor/*/*/*.png +%_kf5_bindir/ktimer +%_kf5_htmldir/en/ktimer/ +%_kf5_applicationsdir/org.kde.ktimer.desktop +%_kf5_iconsdir/hicolor/*/*/*.png +%_kf5_htmldir/en/ktimer/ %changelog ++++++ ktimer-14.12.3.tar.xz -> ktimer-15.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktimer-14.12.3/CMakeLists.txt new/ktimer-15.04.0/CMakeLists.txt --- old/ktimer-14.12.3/CMakeLists.txt 2014-09-14 14:47:38.000000000 +0200 +++ new/ktimer-15.04.0/CMakeLists.txt 2015-03-27 07:56:53.000000000 +0100 @@ -1,38 +1,53 @@ project(ktimer) -if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - find_package(KDE4) - include( KDE4Defaults ) - include_directories(${KDE4_INCLUDES}) - - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) - - # If definitions like -D_GNU_SOURCE are needed for these checks they - # should be added to _KDE4_PLATFORM_DEFINITIONS when it is originally - # defined outside this file. Here we include these definitions in - # CMAKE_REQUIRED_DEFINITIONS so they will be included in the build of - # checks below. - set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} ) -endif() +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +set (QT_MIN_VERSION "5.2.0") + +find_package (ECM 1.3.0 REQUIRED NO_MODULE) +set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + +add_definitions(-DTRANSLATION_DOMAIN="ktimer") + +include(KDEInstallDirs) +include(KDECompilerSettings) +include(KDECMakeSettings) +include(ECMInstallIcons) + +find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS + Core + Widgets +) + +find_package(KF5 REQUIRED COMPONENTS + DocTools + I18n + WidgetsAddons + XmlGui + KIO + IconThemes + DBusAddons + Notifications +) + set(ktimer_SRCS main.cpp ktimer.cpp ) -kde4_add_ui_files(ktimer_SRCS prefwidget.ui ) +ki18n_wrap_ui(ktimer_SRCS prefwidget.ui ) -kde4_add_app_icon(ktimer_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-ktimer.png") +#kde4_add_app_icon(ktimer_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-ktimer.png") -kde4_add_executable(ktimer ${ktimer_SRCS}) +add_executable(ktimer ${ktimer_SRCS}) -target_link_libraries(ktimer ${KDE4_KIO_LIBS}) +target_link_libraries(ktimer KF5::KIOCore KF5::I18n KF5::XmlGui KF5::KIOWidgets KF5::IconThemes KF5::Notifications KF5::DBusAddons) install(TARGETS ktimer ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS ktimer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( PROGRAMS org.kde.ktimer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +ecm_install_icons( ICONS hi128-apps-ktimer.png hi16-apps-ktimer.png hi32-apps-ktimer.png hi48-apps-ktimer.png DESTINATION ${ICON_INSTALL_DIR} ) 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/ktimer-14.12.3/doc/CMakeLists.txt new/ktimer-15.04.0/doc/CMakeLists.txt --- old/ktimer-14.12.3/doc/CMakeLists.txt 2014-09-14 14:47:38.000000000 +0200 +++ new/ktimer-15.04.0/doc/CMakeLists.txt 2015-03-27 07:56:53.000000000 +0100 @@ -1,4 +1,4 @@ ########### install files ############### # # -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ktimer) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ktimer) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktimer-14.12.3/doc/index.docbook new/ktimer-15.04.0/doc/index.docbook --- old/ktimer-14.12.3/doc/index.docbook 2014-09-14 14:47:38.000000000 +0200 +++ new/ktimer-15.04.0/doc/index.docbook 2015-03-27 07:56:53.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&ktimer;"> <!ENTITY package "kdeutils"> <!ENTITY A.L.Spehr "<personname><firstname>A. L.</firstname><surname>Spehr</surname></personname>"> Files old/ktimer-14.12.3/hi128-app-ktimer.png and new/ktimer-15.04.0/hi128-app-ktimer.png differ Files old/ktimer-14.12.3/hi128-apps-ktimer.png and new/ktimer-15.04.0/hi128-apps-ktimer.png differ Files old/ktimer-14.12.3/hi16-app-ktimer.png and new/ktimer-15.04.0/hi16-app-ktimer.png differ Files old/ktimer-14.12.3/hi16-apps-ktimer.png and new/ktimer-15.04.0/hi16-apps-ktimer.png differ Files old/ktimer-14.12.3/hi32-app-ktimer.png and new/ktimer-15.04.0/hi32-app-ktimer.png differ Files old/ktimer-14.12.3/hi32-apps-ktimer.png and new/ktimer-15.04.0/hi32-apps-ktimer.png differ Files old/ktimer-14.12.3/hi48-app-ktimer.png and new/ktimer-15.04.0/hi48-app-ktimer.png differ Files old/ktimer-14.12.3/hi48-apps-ktimer.png and new/ktimer-15.04.0/hi48-apps-ktimer.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktimer-14.12.3/ktimer.cpp new/ktimer-15.04.0/ktimer.cpp --- old/ktimer-14.12.3/ktimer.cpp 2014-09-14 14:47:38.000000000 +0200 +++ new/ktimer-15.04.0/ktimer.cpp 2015-03-27 07:56:53.000000000 +0100 @@ -20,17 +20,18 @@ #include <QProcess> #include <QTimer> - +#include <KConfigGroup> #include <klineedit.h> #include <kiconloader.h> -#include <kapplication.h> -#include <kfiledialog.h> -#include <kglobal.h> #include <ktoolinvocation.h> #include <kstandardguiitem.h> -#include <kaction.h> +#include <QAction> #include <kstandardaction.h> #include "kstatusnotifieritem.h" +#include <KToolInvocation> +#include <KHelpClient> +#include <KGuiItem> +#include <KSharedConfig> class KTimerJobItem : public QTreeWidgetItem { public: @@ -66,16 +67,16 @@ setText( 0, m_job->formatTime(m_job->value()) ); if( m_error ) - setIcon( 0, KIcon( QLatin1String( "process-stop" )) ); + setIcon( 0, QIcon::fromTheme( QLatin1String( "process-stop" )) ); else setIcon( 0, QPixmap() ); setText( 1, m_job->formatTime(m_job->delay()) ); switch( m_job->state() ) { - case KTimerJob::Stopped: setIcon( 2, KIcon( QLatin1String( "media-playback-stop" )) ); break; - case KTimerJob::Paused: setIcon( 2, KIcon( QLatin1String( "media-playback-pause" )) ); break; - case KTimerJob::Started: setIcon( 2, KIcon( QLatin1String( "arrow-right" )) ); break; + case KTimerJob::Stopped: setIcon( 2, QIcon::fromTheme( QLatin1String( "media-playback-stop" )) ); break; + case KTimerJob::Paused: setIcon( 2, QIcon::fromTheme( QLatin1String( "media-playback-pause" )) ); break; + case KTimerJob::Started: setIcon( 2, QIcon::fromTheme( QLatin1String( "arrow-right" )) ); break; } setText( 3, m_job->command() ); @@ -103,9 +104,9 @@ setupUi(this); // set icons - m_stop->setIcon( KIcon( QLatin1String( "media-playback-stop" )) ); - m_pause->setIcon( KIcon( QLatin1String( "media-playback-pause" )) ); - m_start->setIcon( KIcon( QLatin1String( "arrow-right" )) ); + m_stop->setIcon( QIcon::fromTheme( QLatin1String( "media-playback-stop" )) ); + m_pause->setIcon( QIcon::fromTheme( QLatin1String( "media-playback-pause" )) ); + m_start->setIcon( QIcon::fromTheme( QLatin1String( "arrow-right" )) ); // create tray icon KStatusNotifierItem *tray = new KStatusNotifierItem(this); @@ -113,19 +114,18 @@ tray->setCategory(KStatusNotifierItem::ApplicationStatus); tray->setStatus(KStatusNotifierItem::Active); // set help button gui item - m_help->setGuiItem(KStandardGuiItem::help()); + KGuiItem::assign(m_help,KStandardGuiItem::help()); // Exit - KAction *exit = KStandardAction::quit(this, SLOT(exit()), this); + QAction *exit = KStandardAction::quit(this, SLOT(exit()), this); addAction(exit); // connect - connect( m_add, SIGNAL(clicked()), SLOT(add()) ); - connect( m_remove, SIGNAL(clicked()), SLOT(remove()) ); - connect( m_help, SIGNAL(clicked()), SLOT(help()) ); - connect( m_list, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), - SLOT(currentChanged(QTreeWidgetItem*,QTreeWidgetItem*)) ); - loadJobs( KGlobal::config().data() ); + connect(m_add, &QPushButton::clicked, this, &KTimerPref::add); + connect(m_remove, &QPushButton::clicked, this, &KTimerPref::remove); + connect(m_help, &QPushButton::clicked, this, &KTimerPref::help); + connect(m_list, &QTreeWidget::currentItemChanged, this, &KTimerPref::currentChanged); + loadJobs( KSharedConfig::openConfig().data() ); show(); } @@ -137,7 +137,7 @@ } void KTimerPref::saveAllJobs() { - saveJobs( KGlobal::config().data() ); + saveJobs( KSharedConfig::openConfig().data() ); } @@ -146,16 +146,11 @@ KTimerJob *job = new KTimerJob; KTimerJobItem *item = new KTimerJobItem( job, m_list ); - connect( job, SIGNAL(delayChanged(KTimerJob*,uint)), - SLOT(jobChanged(KTimerJob*)) ); - connect( job, SIGNAL(valueChanged(KTimerJob*,uint)), - SLOT(jobChanged(KTimerJob*)) ); - connect( job, SIGNAL(stateChanged(KTimerJob*,States)), - SLOT(jobChanged(KTimerJob*)) ); - connect( job, SIGNAL(commandChanged(KTimerJob*,QString)), - SLOT(jobChanged(KTimerJob*)) ); - connect( job, SIGNAL(finished(KTimerJob*,bool)), - SLOT(jobFinished(KTimerJob*,bool)) ); + connect(job, &KTimerJob::delayChanged, this, &KTimerPref::jobChanged); + connect(job, &KTimerJob::valueChanged, this, &KTimerPref::jobChanged); + connect(job, &KTimerJob::stateChanged, this, &KTimerPref::jobChanged); + connect(job, &KTimerJob::commandChanged, this, &KTimerPref::jobChanged); + connect(job, &KTimerJob::finished, this, &KTimerPref::jobFinished); job->setUser( item ); @@ -176,7 +171,7 @@ void KTimerPref::help() { - KToolInvocation::invokeHelp(); + KHelpClient::invokeHelp(); } // note, don't use old, but added it so we can connect to the new one @@ -211,25 +206,18 @@ connect( m_commandLine->lineEdit(), SIGNAL(textChanged(QString)), job, SLOT(setCommand(QString)) ); - connect( m_delayH, SIGNAL(valueChanged(int)), - SLOT(delayChanged()) ); - connect( m_delayM, SIGNAL(valueChanged(int)), - SLOT(delayChanged()) ); - connect( m_delay, SIGNAL(valueChanged(int)), - SLOT(delayChanged()) ); - connect( m_loop, SIGNAL(toggled(bool)), - job, SLOT(setLoop(bool)) ); - connect( m_one, SIGNAL(toggled(bool)), - job, SLOT(setOneInstance(bool)) ); - connect( m_stop, SIGNAL(clicked()), - job, SLOT(stop()) ); - connect( m_pause, SIGNAL(clicked()), - job, SLOT(pause()) ); - connect( m_start, SIGNAL(clicked()), - job, SLOT(start()) ); + connect(m_delayH, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KTimerPref::delayChanged); + connect(m_delayM, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KTimerPref::delayChanged); + connect(m_delay, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KTimerPref::delayChanged); + connect(m_loop, &QCheckBox::toggled, job, &KTimerJob::setLoop); + connect(m_one, &QCheckBox::toggled, job, &KTimerJob::setOneInstance); + connect(m_stop, &QToolButton::clicked, job, &KTimerJob::stop); + connect(m_pause, &QToolButton::clicked, job, &KTimerJob::pause); + connect(m_start, &QToolButton::clicked, job, &KTimerJob::start); connect( m_slider, SIGNAL(valueChanged(int)), job, SLOT(setValue(int)) ); + m_commandLine->lineEdit()->setText( job->command() ); m_loop->setChecked( job->loop() ); m_one->setChecked( job->oneInstance() ); @@ -317,16 +305,11 @@ KTimerJob *job = new KTimerJob; KTimerJobItem *item = new KTimerJobItem( job, m_list ); - connect( job, SIGNAL(delayChanged(KTimerJob*,uint)), - SLOT(jobChanged(KTimerJob*)) ); - connect( job, SIGNAL(valueChanged(KTimerJob*,uint)), - SLOT(jobChanged(KTimerJob*)) ); - connect( job, SIGNAL(stateChanged(KTimerJob*,States)), - SLOT(jobChanged(KTimerJob*)) ); - connect( job, SIGNAL(commandChanged(KTimerJob*,QString)), - SLOT(jobChanged(KTimerJob*)) ); - connect( job, SIGNAL(finished(KTimerJob*,bool)), - SLOT(jobFinished(KTimerJob*,bool)) ); + connect(job, &KTimerJob::delayChanged, this, &KTimerPref::jobChanged); + connect(job, &KTimerJob::valueChanged, this, &KTimerPref::jobChanged); + connect(job, &KTimerJob::stateChanged, this, &KTimerPref::jobChanged); + connect(job, &KTimerJob::commandChanged, this, &KTimerPref::jobChanged); + connect(job, &KTimerJob::finished, this, &KTimerPref::jobFinished); job->load( cfg, QString( QLatin1String( "Job%1" ) ).arg(n) ); @@ -368,7 +351,7 @@ d->user = 0; d->timer = new QTimer( this ); - connect( d->timer, SIGNAL(timeout()), SLOT(timeout()) ); + connect(d->timer, &QTimer::timeout, this, &KTimerJob::timeout); } @@ -606,8 +589,7 @@ if( !d->oneInstance || d->processes.isEmpty() ) { QProcess *proc = new QProcess; d->processes.append( proc ); - connect( proc, SIGNAL(finished(int,QProcess::ExitStatus)), - SLOT(processExited(int,QProcess::ExitStatus)) ); + connect(proc, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &KTimerJob::processExited); if (!d->command.simplified ().isEmpty()) { proc->start(d->command); emit fired( this ); @@ -621,4 +603,4 @@ } } } -#include "ktimer.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktimer-14.12.3/ktimer.desktop new/ktimer-15.04.0/ktimer.desktop --- old/ktimer-14.12.3/ktimer.desktop 2014-09-14 14:47:38.000000000 +0200 +++ new/ktimer-15.04.0/ktimer.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,145 +0,0 @@ -[Desktop Entry] -GenericName=Countdown Launcher -GenericName[ar]=مطلق العدّ التنازلى -GenericName[ast]=Llanzador de cuenta atrás -GenericName[bg]=Хронометър -GenericName[bs]=Pokretač odbrojavanja -GenericName[ca]=Llançador amb compte enrere -GenericName[ca@valencia]=Llançador amb compte arrere -GenericName[cs]=Stopky -GenericName[cy]=Cychwynydd Cyfrif yn Ôl -GenericName[da]=Nedtællingsstarter -GenericName[de]=Startet den Zähler -GenericName[el]=Αντίστροφη μέτρηση για την ενεργοποίηση λογισμικού -GenericName[en_GB]=Countdown Launcher -GenericName[es]=Lanzador de cuenta atrás -GenericName[et]=Ajaarvestuse käivitaja -GenericName[eu]=Atzekoz aurrerako zenbaketaren jaurtitzailea -GenericName[fa]=راهانداز شمارش معکوس -GenericName[fi]=Lähtölaskenta -GenericName[fr]=Lanceur de compte à rebours -GenericName[ga]=Tosaitheoir Comhairimh Síos -GenericName[gl]=Iniciador en conta-atrás -GenericName[hne]=उलटी गिनती चालू करइया -GenericName[hr]=Pokretač odbrojavanja -GenericName[hu]=Visszaszámláló -GenericName[ia]=Lanceator de computo a retro -GenericName[id]=Peluncur dengan Hitungan Waktu -GenericName[is]=Niðurteljari -GenericName[it]=Conto alla rovescia -GenericName[ja]=タイマー -GenericName[kk]=Кері санақ -GenericName[km]=កម្មវិធីចាប់ផ្ដើមការរាប់ថយក្រោយ -GenericName[ko]=카운트다운 실행기 -GenericName[lt]=Laiko skaičiuoklė -GenericName[lv]=Laika atskaites palaidējs -GenericName[mr]=काउंटडाउन प्रक्षेपक -GenericName[nb]=Nedtellingstarter -GenericName[nds]=Teller starten -GenericName[ne]=काउन्टडाउन सुरुआतकर्ता -GenericName[nl]=Afteller -GenericName[nn]=Nedteljing -GenericName[pa]=ਪੁੱਠੀ ਗਿਣਤੀ ਸ਼ੁਰੂਆਤੀ ਲਾਂਚਰ -GenericName[pl]=Odliczanie -GenericName[pt]=Contagem Decrescente -GenericName[pt_BR]=Lançador de contagem regressiva -GenericName[ro]=Cronometru -GenericName[ru]=Обратный отсчёт -GenericName[sk]=Odpočítavané spúšťanie -GenericName[sl]=Zaganjalnik odštevanja -GenericName[sq]=Nisës i Numërimit Mbrapsht -GenericName[sr]=Покретач одбројавања -GenericName[sr@ijekavian]=Покретач одбројавања -GenericName[sr@ijekavianlatin]=Pokretač odbrojavanja -GenericName[sr@latin]=Pokretač odbrojavanja -GenericName[sv]=Nerräknande startprogram -GenericName[ta]= குறிப்பு எடுப்பான் நேரக்குறைப்பான் -GenericName[th]=ตัวเรียกใช้งานแบบนับถอยหลัง -GenericName[tr]=Gerisayım Çalıştırıcı -GenericName[ug]=تەتۈر سانىغۇچنى ئجرا قىلغۇچ -GenericName[uk]=Таймер -GenericName[wa]=Usteye di munutreye -GenericName[x-test]=xxCountdown Launcherxx -GenericName[zh_CN]=倒计时执行器 -GenericName[zh_TW]=倒數發射計時 -Exec=ktimer -Icon=ktimer -Type=Application -Terminal=false -Name=KTimer -Name[af]=Ktimer -Name[ar]=KTimer -Name[ast]=KTimer -Name[bg]=KTimer -Name[br]=KTimer -Name[bs]=KTimer -Name[ca]=KTimer -Name[ca@valencia]=KTimer -Name[cs]=KTimer -Name[cy]=KTimer -Name[da]=KTimer -Name[de]=KTimer -Name[el]=KTimer -Name[en_GB]=KTimer -Name[eo]=KTimer -Name[es]=KTimer -Name[et]=KTimer -Name[eu]=KTimer -Name[fi]=KTimer -Name[fr]=KTimer -Name[ga]=KTimer -Name[gl]=KTimer -Name[he]=KTimer -Name[hne]=के-टाइमर -Name[hr]=KTimer -Name[hu]=KTimer -Name[ia]=KTimer -Name[id]=KTimer -Name[is]=KTimer -Name[it]=KTimer -Name[ja]=KTimer -Name[kk]=KTimer -Name[km]=KTimer -Name[ko]=KTimer -Name[lt]=KTimer -Name[lv]=KTimer -Name[mk]=KTimer -Name[mr]=के-टाइमर -Name[ms]=KTimer -Name[nb]=KTimer -Name[nds]=KTimer -Name[ne]=केडीई समय सूचक -Name[nl]=KTimer -Name[nn]=KTimer -Name[pa]=KTimer -Name[pl]=Czasomierz -Name[pt]=KTimer -Name[pt_BR]=KTimer -Name[ro]=KTimer -Name[ru]=KTimer -Name[sk]=KTimer -Name[sl]=KTimer -Name[sq]=KTimer -Name[sr]=К‑одбројавач -Name[sr@ijekavian]=К‑одбројавач -Name[sr@ijekavianlatin]=K‑odbrojavač -Name[sr@latin]=K‑odbrojavač -Name[sv]=Ktimer -Name[ta]= Kநேரம் காட்டி -Name[tg]=KВақтсанҷ -Name[th]=ตั้งเวลาทำงาน-K -Name[tr]=KTimer -Name[ug]=KTimer -Name[uk]=KTimer -Name[uz]=KTimer -Name[uz@cyrillic]=KTimer -Name[vi]=KTimer -Name[wa]=KTimer -Name[xh]=Umjongi Wexesha -Name[x-test]=xxKTimerxx -Name[zh_CN]=KTimer -Name[zh_TW]=KDE 計時器 -X-KDE-StartupNotify=true -X-DBUS-StartupType=Multi -Categories=Qt;KDE;Utility; -X-DocPath=ktimer/index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktimer-14.12.3/main.cpp new/ktimer-15.04.0/main.cpp --- old/ktimer-14.12.3/main.cpp 2014-09-14 14:47:38.000000000 +0200 +++ new/ktimer-15.04.0/main.cpp 2015-03-27 07:56:53.000000000 +0100 @@ -16,11 +16,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kapplication.h> -#include <klocale.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> + +#include <KAboutData> +#include <QApplication> +#include <KLocalizedString> +#include <QCommandLineParser> +#include <kdelibs4configmigrator.h> +#include <KDBusService> #include "ktimer.h" static const char description[] = @@ -30,18 +33,29 @@ int main( int argc, char **argv ) { - KAboutData aboutData( "ktimer", 0, ki18n("KTimer"), - version, ki18n(description), KAboutData::License_GPL, - ki18n("(c) 2001, Stefan Schimanski"), KLocalizedString(), + QApplication app(argc, argv); + Kdelibs4ConfigMigrator migrate(QStringLiteral("ktimer")); + migrate.setConfigFiles(QStringList() << QStringLiteral("ktimerrc")); + migrate.migrate(); + + KAboutData aboutData( "ktimer", i18n("KTimer"), + version, i18n(description), KAboutLicense::GPL, + i18n("(c) 2001, Stefan Schimanski"), "http://utils.kde.org/projects/ktimer";); - aboutData.addAuthor(ki18n("Stefan Schimanski"),KLocalizedString(), "[email protected]"); - KCmdLineArgs::init( argc, argv, &aboutData ); + aboutData.addAuthor(i18n("Stefan Schimanski"),QString(), "[email protected]"); + QCommandLineParser parser; + KAboutData::setApplicationData(aboutData); + parser.addVersionOption(); + parser.addHelpOption(); + aboutData.setupCommandLine(&parser); + parser.process(app); + aboutData.processCommandLine(&parser); - KApplication app; app.setQuitOnLastWindowClosed( false ); + KDBusService service; KTimerPref *timer = new KTimerPref; - app.setTopWidget( timer ); + timer->show(); return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktimer-14.12.3/org.kde.ktimer.desktop new/ktimer-15.04.0/org.kde.ktimer.desktop --- old/ktimer-14.12.3/org.kde.ktimer.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/ktimer-15.04.0/org.kde.ktimer.desktop 2015-03-27 07:56:53.000000000 +0100 @@ -0,0 +1,146 @@ +[Desktop Entry] +GenericName=Countdown Launcher +GenericName[ar]=مطلق العدّ التنازلى +GenericName[ast]=Llanzador de cuenta atrás +GenericName[bg]=Хронометър +GenericName[bs]=Pokretač odbrojavanja +GenericName[ca]=Llançador amb compte enrere +GenericName[ca@valencia]=Llançador amb compte arrere +GenericName[cs]=Stopky +GenericName[cy]=Cychwynydd Cyfrif yn Ôl +GenericName[da]=Nedtællingsstarter +GenericName[de]=Startet den Zähler +GenericName[el]=Αντίστροφη μέτρηση για την ενεργοποίηση λογισμικού +GenericName[en_GB]=Countdown Launcher +GenericName[es]=Lanzador de cuenta atrás +GenericName[et]=Ajaarvestuse käivitaja +GenericName[eu]=Atzekoz aurrerako zenbaketaren jaurtitzailea +GenericName[fa]=راهانداز شمارش معکوس +GenericName[fi]=Lähtölaskenta +GenericName[fr]=Lanceur de compte à rebours +GenericName[ga]=Tosaitheoir Comhairimh Síos +GenericName[gl]=Iniciador en conta-atrás +GenericName[hne]=उलटी गिनती चालू करइया +GenericName[hr]=Pokretač odbrojavanja +GenericName[hu]=Visszaszámláló +GenericName[ia]=Lanceator de computo a retro +GenericName[id]=Peluncur dengan Hitungan Waktu +GenericName[is]=Niðurteljari +GenericName[it]=Conto alla rovescia +GenericName[ja]=タイマー +GenericName[kk]=Кері санақ +GenericName[km]=កម្មវិធីចាប់ផ្ដើមការរាប់ថយក្រោយ +GenericName[ko]=카운트다운 실행기 +GenericName[lt]=Laiko skaičiuoklė +GenericName[lv]=Laika atskaites palaidējs +GenericName[mr]=काउंटडाउन प्रक्षेपक +GenericName[nb]=Nedtellingstarter +GenericName[nds]=Teller starten +GenericName[ne]=काउन्टडाउन सुरुआतकर्ता +GenericName[nl]=Afteller +GenericName[nn]=Nedteljing +GenericName[pa]=ਪੁੱਠੀ ਗਿਣਤੀ ਸ਼ੁਰੂਆਤੀ ਲਾਂਚਰ +GenericName[pl]=Odliczanie +GenericName[pt]=Contagem Decrescente +GenericName[pt_BR]=Lançador de contagem regressiva +GenericName[ro]=Cronometru +GenericName[ru]=Обратный отсчёт +GenericName[sk]=Odpočítavané spúšťanie +GenericName[sl]=Zaganjalnik odštevanja +GenericName[sq]=Nisës i Numërimit Mbrapsht +GenericName[sr]=Покретач одбројавања +GenericName[sr@ijekavian]=Покретач одбројавања +GenericName[sr@ijekavianlatin]=Pokretač odbrojavanja +GenericName[sr@latin]=Pokretač odbrojavanja +GenericName[sv]=Nerräknande startprogram +GenericName[ta]= குறிப்பு எடுப்பான் நேரக்குறைப்பான் +GenericName[th]=ตัวเรียกใช้งานแบบนับถอยหลัง +GenericName[tr]=Gerisayım Çalıştırıcı +GenericName[ug]=تەتۈر سانىغۇچنى ئجرا قىلغۇچ +GenericName[uk]=Таймер +GenericName[wa]=Usteye di munutreye +GenericName[x-test]=xxCountdown Launcherxx +GenericName[zh_CN]=倒计时执行器 +GenericName[zh_TW]=倒數發射計時 +Exec=ktimer +Icon=ktimer +Type=Application +Terminal=false +Name=KTimer +Name[af]=Ktimer +Name[ar]=KTimer +Name[ast]=KTimer +Name[bg]=KTimer +Name[br]=KTimer +Name[bs]=KTimer +Name[ca]=KTimer +Name[ca@valencia]=KTimer +Name[cs]=KTimer +Name[cy]=KTimer +Name[da]=KTimer +Name[de]=KTimer +Name[el]=KTimer +Name[en_GB]=KTimer +Name[eo]=KTimer +Name[es]=KTimer +Name[et]=KTimer +Name[eu]=KTimer +Name[fi]=KTimer +Name[fr]=KTimer +Name[ga]=KTimer +Name[gl]=KTimer +Name[he]=KTimer +Name[hne]=के-टाइमर +Name[hr]=KTimer +Name[hu]=KTimer +Name[ia]=KTimer +Name[id]=KTimer +Name[is]=KTimer +Name[it]=KTimer +Name[ja]=KTimer +Name[kk]=KTimer +Name[km]=KTimer +Name[ko]=KTimer +Name[lt]=KTimer +Name[lv]=KTimer +Name[mk]=KTimer +Name[mr]=के-टाइमर +Name[ms]=KTimer +Name[nb]=KTimer +Name[nds]=KTimer +Name[ne]=केडीई समय सूचक +Name[nl]=KTimer +Name[nn]=KTimer +Name[pa]=KTimer +Name[pl]=Czasomierz +Name[pt]=KTimer +Name[pt_BR]=KTimer +Name[ro]=KTimer +Name[ru]=KTimer +Name[sk]=KTimer +Name[sl]=KTimer +Name[sq]=KTimer +Name[sr]=К‑одбројавач +Name[sr@ijekavian]=К‑одбројавач +Name[sr@ijekavianlatin]=K‑odbrojavač +Name[sr@latin]=K‑odbrojavač +Name[sv]=Ktimer +Name[ta]= Kநேரம் காட்டி +Name[tg]=KВақтсанҷ +Name[th]=ตั้งเวลาทำงาน-K +Name[tr]=KTimer +Name[ug]=KTimer +Name[uk]=KTimer +Name[uz]=KTimer +Name[uz@cyrillic]=KTimer +Name[vi]=KTimer +Name[wa]=KTimer +Name[xh]=Umjongi Wexesha +Name[x-test]=xxKTimerxx +Name[zh_CN]=KTimer +Name[zh_TW]=KDE 計時器 +StartupNotify=true +X-DBUS-StartupType=Multi +Categories=Qt;KDE;Utility; +X-DocPath=ktimer/index.html +X-DBUS-ServiceName=org.kde.ktimer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktimer-14.12.3/prefwidget.ui new/ktimer-15.04.0/prefwidget.ui --- old/ktimer-14.12.3/prefwidget.ui 2014-09-14 14:47:38.000000000 +0200 +++ new/ktimer-15.04.0/prefwidget.ui 2015-03-27 07:56:53.000000000 +0100 @@ -54,7 +54,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="KPushButton" name="m_add"> + <widget class="QPushButton" name="m_add"> <property name="toolTip"> <string>Add a new task</string> </property> @@ -67,7 +67,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="KPushButton" name="m_remove"> + <widget class="QPushButton" name="m_remove"> <property name="toolTip"> <string>Remove a task</string> </property> @@ -179,7 +179,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="KPushButton" name="m_help"> + <widget class="QPushButton" name="m_help"> <property name="toolTip"> <string>Detailed help documentation</string> </property> @@ -356,11 +356,6 @@ <header>kurlrequester.h</header> <container>1</container> </customwidget> - <customwidget> - <class>KPushButton</class> - <extends>QPushButton</extends> - <header>kpushbutton.h</header> - </customwidget> </customwidgets> <tabstops> <tabstop>m_list</tabstop>
