Hello community, here is the log from the commit of package kfloppy for openSUSE:Factory checked in at 2016-05-29 03:08:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfloppy (Old) and /work/SRC/openSUSE:Factory/.kfloppy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfloppy" Changes: -------- --- /work/SRC/openSUSE:Factory/kfloppy/kfloppy.changes 2016-03-29 09:58:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kfloppy.new/kfloppy.changes 2016-05-29 03:08:40.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:26:13 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 06:03:23 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:39:41 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- kfloppy-15.12.3.tar.xz New: ---- kfloppy-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfloppy.spec ++++++ --- /var/tmp/diff_new_pack.Pwo4cl/_old 2016-05-29 03:08:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Pwo4cl/_new 2016-05-29 03:08:42.000000000 +0200 @@ -17,17 +17,24 @@ Name: kfloppy -Version: 15.12.3 +Version: 16.04.1 Release: 0 Summary: Floppy Formatter License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org Source0: kfloppy-%{version}.tar.xz -BuildRequires: libkde4-devel -BuildRequires: xz +BuildRequires: update-desktop-files +BuildRequires: extra-cmake-modules +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: ki18n-devel +BuildRequires: kio-devel +BuildRequires: kdoctools-devel +BuildRequires: kdelibs4support-devel +BuildRequires: kxmlgui-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description KDE Floppy Disk Utility @@ -36,14 +43,12 @@ %setup -q -n kfloppy-%{version} %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -cd build -%kde4_makeinstall -%suse_update_desktop_file KFloppy System Filesystem -%kde_post_install +%kf5_makeinstall -C build +%suse_update_desktop_file org.kde.kfloppy System Filesystem %post -p /sbin/ldconfig @@ -52,9 +57,9 @@ %files %defattr(-,root,root) %doc COPYING README TODO -%_kde4_bindir/kfloppy -%_kde4_applicationsdir/*.desktop -%_kde4_htmldir/en/kfloppy/ -%_kde4_iconsdir/hicolor/*/*/*.png +%_bindir/kfloppy +%_kf5_applicationsdir/*.desktop +%_kf5_htmldir/en/kfloppy/ +%_kf5_iconsdir/hicolor/*/*/*.png %changelog ++++++ kfloppy-15.12.3.tar.xz -> kfloppy-16.04.1.tar.xz ++++++ Files old/kfloppy-15.12.3/128-apps-kfloppy.png and new/kfloppy-16.04.1/128-apps-kfloppy.png differ Files old/kfloppy-15.12.3/16-apps-kfloppy.png and new/kfloppy-16.04.1/16-apps-kfloppy.png differ Files old/kfloppy-15.12.3/22-apps-kfloppy.png and new/kfloppy-16.04.1/22-apps-kfloppy.png differ Files old/kfloppy-15.12.3/32-apps-kfloppy.png and new/kfloppy-16.04.1/32-apps-kfloppy.png differ Files old/kfloppy-15.12.3/48-apps-kfloppy.png and new/kfloppy-16.04.1/48-apps-kfloppy.png differ Files old/kfloppy-15.12.3/64-apps-kfloppy.png and new/kfloppy-16.04.1/64-apps-kfloppy.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/CMakeLists.txt new/kfloppy-16.04.1/CMakeLists.txt --- old/kfloppy-15.12.3/CMakeLists.txt 2015-12-09 15:48:01.000000000 +0100 +++ new/kfloppy-16.04.1/CMakeLists.txt 2016-03-23 20:19:47.000000000 +0100 @@ -1,42 +1,55 @@ project(kfloppy) +cmake_minimum_required(VERSION 2.8.12) if(NOT UNIX) message(FATAL_ERROR "KFloppy is only supposed to be built on Unix platforms.") endif(NOT UNIX) +find_package(ECM REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - find_package(KDE4) - include(KDE4Defaults) - include_directories(${KDE4_INCLUDES}) + include(KDEInstallDirs) + include(KDECompilerSettings NO_POLICY_SCOPE) + include(KDECMakeSettings) + include(FeatureSummary) + include(ECMInstallIcons) - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) + find_package(Qt5 5.2.0 CONFIG REQUIRED Core DBus Widgets) + find_package(KF5 5.2.0 REQUIRED COMPONENTS I18n CoreAddons KIO DocTools KDELibs4Support XmlGui) - # 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} ) + add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) endif() set(kfloppy_SRCS main.cpp format.cpp floppy.cpp ) -kde4_add_executable(kfloppy ${kfloppy_SRCS}) +add_executable(kfloppy ${kfloppy_SRCS}) -target_link_libraries(kfloppy ${KDE4_KIO_LIBS} ) +target_link_libraries(kfloppy KF5::CoreAddons KF5::KIOWidgets KF5::I18n KF5::KDELibs4Support Qt5::DBus) install(TARGETS kfloppy ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS KFloppy.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( PROGRAMS org.kde.kfloppy.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) # The mimetypes used in this servicemenu (e.g. floppy_unmounted) don't exist anymore. # This needs to be done differently. #install( FILES floppy_format.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +ecm_install_icons(ICONS + 128-apps-kfloppy.png + 16-apps-kfloppy.png + 22-apps-kfloppy.png + 32-apps-kfloppy.png + 48-apps-kfloppy.png + 64-apps-kfloppy.png + DESTINATION ${ICON_INSTALL_DIR} + THEME hicolor +) add_subdirectory(doc) + +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/KFloppy.desktop new/kfloppy-16.04.1/KFloppy.desktop --- old/kfloppy-15.12.3/KFloppy.desktop 2015-12-09 15:48:01.000000000 +0100 +++ new/kfloppy-16.04.1/KFloppy.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,157 +0,0 @@ -[Desktop Entry] -GenericName=Floppy Formatter -GenericName[af]=Sagteskyf Formateerder -GenericName[ar]=مهئ الأقراص المرنة -GenericName[ast]=Formateador de disquettes -GenericName[bg]=Форматиране на дискети -GenericName[br]=Furmader pladennig -GenericName[bs]=Formatiranje disketa -GenericName[ca]=Formatador de disquets -GenericName[ca@valencia]=Formatador de disquets -GenericName[cs]=Formátovač disket -GenericName[cy]=Fformatio Disg Meddal -GenericName[da]=Disketteformatering -GenericName[de]=Diskettenformatierer -GenericName[el]=Εργαλείο διαμόρφωσης δισκέτας -GenericName[en_GB]=Floppy Formatter -GenericName[eo]=Formatilo por disketoj -GenericName[es]=Formateador de disquetes -GenericName[et]=Diskettide vormindamise utiliit -GenericName[eu]=Diskete-formateatzailea -GenericName[fa]=قالببندیکننده فلاپی -GenericName[fi]=Levykkeiden alustusohjelma -GenericName[fr]=Outil de formatage de disquettes -GenericName[ga]=Uirlis Fhormáidithe Dioscaí Flapacha -GenericName[gl]=Formatador de disquetes -GenericName[he]=מאתחל תקליטונים -GenericName[hne]=फ्लापी फार्मेटर -GenericName[hr]=Formatiranje disketa -GenericName[hu]=Hajlékonylemez-formázó -GenericName[ia]=Formattator de floppy -GenericName[id]=Pemformat Disket -GenericName[is]=Tól til að forsníða disklinga -GenericName[it]=Formattatore di dischetti -GenericName[ja]=フロッピーをフォーマット -GenericName[kk]=Иілгіш дискін пішімдеу -GenericName[km]=កម្មវិធីធ្វើទ្រង់ទ្រាយថាសទន់ -GenericName[ko]=플로피 포맷 도구 -GenericName[lt]=Diskelio formatavimas -GenericName[lv]=Diskešu formatētājs -GenericName[mk]=Форматирање на дискети -GenericName[mr]=फ्लॉपी फॉर्मेटर -GenericName[ms]=Pengformat Cakera Liut -GenericName[nb]=Diskettformaterer -GenericName[nds]=Diskettformaterer -GenericName[ne]=फ्लपी ढाँचाकर्ता -GenericName[nl]=Diskettes formatteren -GenericName[nn]=Diskettformatering -GenericName[oc]=Formataire de disquetas -GenericName[pa]=ਫਲਾਪੀ ਫਾਰਮੈਟਰ -GenericName[pl]=Program formatujący dyskietki -GenericName[pt]=Formatação de Disquetes -GenericName[pt_BR]=Formatador de disquete -GenericName[ro]=Formatator de dischete -GenericName[ru]=Форматирование дискет -GenericName[sk]=Formátovanie diskiet -GenericName[sl]=Formatiranje disket -GenericName[sq]=Formatuesi i Disketave -GenericName[sr]=Форматирање дискета -GenericName[sr@ijekavian]=Форматирање дискета -GenericName[sr@ijekavianlatin]=Formatiranje disketa -GenericName[sr@latin]=Formatiranje disketa -GenericName[sv]=Formatera disketter -GenericName[ta]=நெகிழ்வட்டு வடிவமைப்பான் -GenericName[tg]=Шаклбанднамоии Диски Нарм -GenericName[th]=เครื่องมือฟอร์แมตแผ่นฟลอปปี้้ -GenericName[tr]=Disket Biçimlendirici -GenericName[ug]=يۇمشاق دىسكا پىچقۇچ -GenericName[uk]=Відформатувати дискету -GenericName[uz]=Disketni formatlagich -GenericName[uz@cyrillic]=Дискетни форматлагич -GenericName[vi]=Trình Định Dạng Đĩa Mềm -GenericName[wa]=Usteye po-z abwesner des plaketes -GenericName[xh]=Floppy formata -GenericName[x-test]=xxFloppy Formatterxx -GenericName[zh_CN]=软盘格式化程序 -GenericName[zh_TW]=軟碟格式化程式 -Name=KFloppy -Name[af]=Kfloppie -Name[ar]=كفلوبي -Name[ast]=KFloppy -Name[bg]=KFloppy -Name[br]=KFloppy -Name[bs]=KFloppy -Name[ca]=KFloppy -Name[ca@valencia]=KFloppy -Name[cs]=KFloppy -Name[cy]=KFloppy -Name[da]=KFloppy -Name[de]=KFloppy -Name[el]=KFloppy -Name[en_GB]=KFloppy -Name[eo]=KDisketo -Name[es]=KFloppy -Name[et]=KFloppy -Name[eu]=KFloppy -Name[fi]=KFloppy -Name[fr]=KFloppy -Name[ga]=KFloppy -Name[gl]=KFloppy -Name[he]=KFloppy -Name[hne]=के-फ्लापी -Name[hr]=KFloppy -Name[hu]=KFloppy -Name[ia]=KFloppy -Name[id]=KFloppy -Name[is]=KFloppy -Name[it]=KFloppy -Name[ja]=KFloppy -Name[kk]=KFloppy -Name[km]=KFloppy -Name[ko]=KFloppy -Name[lt]=KFloppy -Name[lv]=KFloppy -Name[mk]=KFloppy -Name[mr]=के-फ्लॉपी -Name[ms]=KFloppy -Name[nb]=KFloppy -Name[nds]=KFloppy -Name[ne]=केडीई फ्लपी -Name[nl]=KFloppy -Name[nn]=KFloppy -Name[pa]=ਕੇ-ਫਲਾਪੀ -Name[pl]=Dyskietka -Name[pt]=KFloppy -Name[pt_BR]=KFloppy -Name[ro]=KFloppy -Name[ru]=KFloppy -Name[sk]=KFloppy -Name[sl]=KFloppy -Name[sq]=KFloppy -Name[sr]=К‑флопи -Name[sr@ijekavian]=К‑флопи -Name[sr@ijekavianlatin]=K‑flopi -Name[sr@latin]=K‑flopi -Name[sv]=Kfloppy -Name[ta]=கேநெகிழ்வட்டு -Name[tg]=KДиски Нарм -Name[th]=ฟอร์แมตฟลอปปี้-K -Name[tr]=KFloppy -Name[ug]=KFloppy -Name[uk]=KFloppy -Name[uz]=KFloppy -Name[uz@cyrillic]=KFloppy -Name[vi]=KFloppy -Name[wa]=KPlakete -Name[xh]=KFloppy -Name[x-test]=xxKFloppyxx -Name[zh_CN]=KFloppy -Name[zh_TW]=KDE 軟碟 -X-DocPath=kfloppy/index.html -Exec=kfloppy -caption %c -Icon=kfloppy -Type=Application -Terminal=false -X-KDE-StartupNotify=true -X-DBUS-StartupType=Multi -Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/doc/CMakeLists.txt new/kfloppy-16.04.1/doc/CMakeLists.txt --- old/kfloppy-15.12.3/doc/CMakeLists.txt 2015-12-09 15:48:01.000000000 +0100 +++ new/kfloppy-16.04.1/doc/CMakeLists.txt 2016-03-23 20:19:47.000000000 +0100 @@ -1,4 +1,4 @@ ########### install files ############### # # -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kfloppy) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kfloppy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/doc/index.docbook new/kfloppy-16.04.1/doc/index.docbook --- old/kfloppy-15.12.3/doc/index.docbook 2015-12-09 15:48:01.000000000 +0100 +++ new/kfloppy-16.04.1/doc/index.docbook 2016-03-23 20:19:47.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 "&kfloppy;"> <!ENTITY package "kdeutils"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> @@ -52,6 +52,13 @@ <contrib>Developer (Add &BSD; support)</contrib> </othercredit> +<othercredit role="developer"> +<firstname>Wolfgang</firstname> +<surname>Bauer</surname> +<affiliation><address><email>[email protected]</email></address></affiliation> +<contrib>Developer (Port to KF5)</contrib> +</othercredit> + <othercredit role="reviewer"> <firstname>Lauri</firstname> <surname>Watts</surname> @@ -62,8 +69,8 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2013-05-25</date> -<releaseinfo>4.9 (&kde; 4.11)</releaseinfo> +<date>2016-03-23</date> +<releaseinfo>5.0 (Applications 16.04)</releaseinfo> <copyright> <year>2000</year> @@ -365,46 +372,38 @@ <variablelist> <varlistentry> <term><command>kfloppy <option>--help</option></command></term> -<listitem><para>This lists the most basic options available at the command +<listitem><para>This lists the options available at the command line.</para> </listitem> </varlistentry> <varlistentry> -<term><command>kfloppy <option>--help-qt</option></command></term> -<listitem><para>This lists the options available for changing the way -&kfloppy; interacts with &Qt;.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><command>kfloppy <option>--help-kde</option></command></term> +<term><command>kfloppy <option>--author</option></command></term> <listitem> -<para>This lists the options available for changing the way &kfloppy; -interacts with &kde;.</para> +<para>Lists &kfloppy;'s author in the terminal window</para> </listitem> </varlistentry> <varlistentry> -<term><command>kfloppy <option>--help-all</option></command></term> +<term><command>kfloppy <option>--license</option></command></term> <listitem> -<para>This lists all of the command line options.</para> +<para>Shows license information for &kfloppy; in the terminal window</para> </listitem> </varlistentry> <varlistentry> -<term><command>kfloppy <option>--author</option></command></term> +<term><command>kfloppy <option>--version</option></command></term> <listitem> -<para>Lists &kfloppy;'s author in the terminal window</para> +<para>Lists version information for &kfloppy;. Also available +through <command>kfloppy <option>-v</option></command> </para> </listitem> </varlistentry> <varlistentry> -<term><command>kfloppy <option>--version</option></command></term> -<listitem> -<para>Lists version information for &Qt;, &kde;, and &kfloppy;. Also available -through <command>kfloppy <option>-V</option></command> </para> -</listitem> +<term><command>kfloppy <option><replaceable>device</replaceable></option></command></term> +<listitem><para>Device to format.</para> +<para>This will directly format the given device using the saved settings. +Only supported at the moment are /dev/fd0 and /dev/fd1.</para></listitem> </varlistentry> </variablelist> @@ -424,6 +423,9 @@ <para>&kfloppy; Formatter Program Copyright 2004, 2005 &Nicolas.Goutte; &Nicolas.Goutte.mail;</para> +<para>&kfloppy; Formatter Program Copyright 2015, 2016 Wolfgang Bauer +<email>[email protected]</email></para> + <para>Documentation Copyright 2000 by &Thad.McGinnis; &Thad.McGinnis.mail;.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/floppy.cpp new/kfloppy-16.04.1/floppy.cpp --- old/kfloppy-15.12.3/floppy.cpp 2015-12-09 15:48:01.000000000 +0100 +++ new/kfloppy-16.04.1/floppy.cpp 2016-03-23 20:19:47.000000000 +0100 @@ -4,6 +4,7 @@ Copyright (C) 1997 Bernd Johannes Wuebben <[email protected]> Copyright (C) 2004, 2005 Nicolas GOUTTE <[email protected]> + Copyright (C) 2015, 2016 Wolfgang Bauer <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,21 +38,22 @@ #include <QKeyEvent> #include <QCloseEvent> #include <QtDBus/QtDBus> -#include <kconfig.h> +#include <KConfig> #include <kmessagebox.h> #include <kdebug.h> #include <khelpmenu.h> -#include <kpushbutton.h> +#include <QPushButton> #include <kmenu.h> #include <kapplication.h> #include <qprogressbar.h> #include <klocale.h> #include <kcombobox.h> #include <klineedit.h> -#include <kurl.h> -#include <ktoolinvocation.h> -#include <kglobal.h> +#include <QUrl> +#include <khelpclient.h> +#include <KGuiItem> +#include <KStandardGuiItem> FloppyData::FloppyData(QWidget * parent) : KDialog( parent ), @@ -283,7 +285,7 @@ QVBoxLayout* v3 = new QVBoxLayout(); h1->addItem( v3 ); - formatbutton = new KPushButton( widget ); + formatbutton = new QPushButton( widget ); formatbutton->setText(i18n( "&Format") ); formatbutton->setAutoRepeat( false ); if (!numFileSystems) @@ -296,14 +298,16 @@ v3->addStretch( 1 ); //Setup the Help Menu - helpMenu = new KHelpMenu(this, KGlobal::mainComponent().aboutData(), false); + helpMenu = new KHelpMenu(this, KAboutData::applicationData(), false); - helpbutton = new KPushButton( KStandardGuiItem::help(), widget ); + helpbutton = new QPushButton( widget ); + KGuiItem::assign( helpbutton, KStandardGuiItem::help() ); helpbutton->setAutoRepeat( false ); helpbutton->setMenu(helpMenu->menu()); v3->addWidget( helpbutton ); - quitbutton = new KPushButton( KStandardGuiItem::quit(), widget ); + quitbutton = new QPushButton( widget ); + KGuiItem::assign( quitbutton, KStandardGuiItem::quit() ); quitbutton->setAutoRepeat( false ); connect(quitbutton,SIGNAL(clicked()),this,SLOT(quit())); v3->addWidget( quitbutton ); @@ -360,7 +364,7 @@ { switch(e->key()) { case Qt::Key_F1: - KToolInvocation::invokeHelp(); + KHelpClient::invokeHelp(); break; default: KDialog::keyPressEvent(e); @@ -418,8 +422,8 @@ QString newDevice = dev; - KUrl url( newDevice ); - if( url.isValid() && ( url.protocol() == QLatin1String( "media" ) || url.protocol() == QLatin1String( "system" ) ) ) { + QUrl url( newDevice ); + if( url.isValid() && ( url.scheme() == QLatin1String( "media" ) || url.scheme() == QLatin1String( "system" ) ) ) { QString name = url.fileName(); QDBusInterface mediamanager( QLatin1String( "org.kde.kded" ), QLatin1String( "/modules/mediamanager" ), QLatin1String( "org.kde.MediaManager" ) ); @@ -687,7 +691,7 @@ void FloppyData::writeSettings(){ - KConfigGroup config = KGlobal::config()->group("GeneralData"); + KConfigGroup config = KSharedConfig::openConfig()->group("GeneralData"); densityconfig = densityComboBox->currentText().trimmed(); filesystemconfig = filesystemComboBox->currentText().trimmed(); @@ -715,7 +719,7 @@ void FloppyData::readSettings(){ - KConfigGroup config = KGlobal::config()->group("GeneralData"); + KConfigGroup config = KSharedConfig::openConfig()->group("GeneralData"); verifyconfig = config.readEntry("Verify", 1); labelconfig = config.readEntry("CreateLabel",1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/floppy.h new/kfloppy-16.04.1/floppy.h --- old/kfloppy-15.12.3/floppy.h 2015-12-09 15:48:01.000000000 +0100 +++ new/kfloppy-16.04.1/floppy.h 2016-03-23 20:19:47.000000000 +0100 @@ -4,6 +4,7 @@ Copyright (C) 1997 Bernd Johannes Wuebben <[email protected]> Copyright (C) 2004, 2005 Nicolas GOUTTE <[email protected]> + Copyright (C) 2015, 2016 Wolfgang Bauer <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,7 +38,7 @@ class QGroupBox; class QProgressBar; -class KPushButton; +class QPushButton; class KHelpMenu; class KFAction; class KFActionQueue; @@ -104,10 +105,10 @@ QLineEdit* lineedit; QRadioButton* quick; QRadioButton* zerooutformat; - KPushButton* quitbutton; - KPushButton* helpbutton; + QPushButton* quitbutton; + QPushButton* helpbutton; QRadioButton* fullformat; - KPushButton* formatbutton; + QPushButton* formatbutton; QLabel* frame; QComboBox* deviceComboBox; QComboBox* filesystemComboBox; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/floppy_format.desktop new/kfloppy-16.04.1/floppy_format.desktop --- old/kfloppy-15.12.3/floppy_format.desktop 2015-12-09 15:48:01.000000000 +0100 +++ new/kfloppy-16.04.1/floppy_format.desktop 2016-03-23 20:19:47.000000000 +0100 @@ -3,7 +3,7 @@ Icon=kfloppy Name=Format Name[ar]=تهيئة -Name[ast]=Formatu +Name[ast]=Formatiar Name[bg]=Форматиране Name[br]=Furmadiñ Name[bs]=Formatiraj diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/format.cpp new/kfloppy-16.04.1/format.cpp --- old/kfloppy-15.12.3/format.cpp 2015-12-09 15:48:01.000000000 +0100 +++ new/kfloppy-16.04.1/format.cpp 2016-03-23 20:19:47.000000000 +0100 @@ -4,6 +4,7 @@ Copyright (C) 2002 Adriaan de Groot <[email protected]> Copyright (C) 2004, 2005 Nicolas GOUTTE <[email protected]> + Copyright (C) 2015, 2016 Wolfgang Bauer <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -45,7 +46,7 @@ extPath = path; } - return KGlobal::dirs()->findExe(e, extPath); + return KStandardDirs::findExe(e, extPath); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/format.h new/kfloppy-16.04.1/format.h --- old/kfloppy-15.12.3/format.h 2015-12-09 15:48:01.000000000 +0100 +++ new/kfloppy-16.04.1/format.h 2016-03-23 20:19:47.000000000 +0100 @@ -4,6 +4,7 @@ Copyright (C) 2002 Adriaan de Groot <[email protected]> Copyright (C) 2004, 2005 Nicolas GOUTTE <[email protected]> + Copyright (C) 2015, 2016 Wolfgang Bauer <[email protected]> This program is free software; you can redistribute it and/or modify Files old/kfloppy-15.12.3/hi128-app-kfloppy.png and new/kfloppy-16.04.1/hi128-app-kfloppy.png differ Files old/kfloppy-15.12.3/hi16-app-kfloppy.png and new/kfloppy-16.04.1/hi16-app-kfloppy.png differ Files old/kfloppy-15.12.3/hi22-app-kfloppy.png and new/kfloppy-16.04.1/hi22-app-kfloppy.png differ Files old/kfloppy-15.12.3/hi32-app-kfloppy.png and new/kfloppy-16.04.1/hi32-app-kfloppy.png differ Files old/kfloppy-15.12.3/hi48-app-kfloppy.png and new/kfloppy-16.04.1/hi48-app-kfloppy.png differ Files old/kfloppy-15.12.3/hi64-app-kfloppy.png and new/kfloppy-16.04.1/hi64-app-kfloppy.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/main.cpp new/kfloppy-16.04.1/main.cpp --- old/kfloppy-15.12.3/main.cpp 2015-12-09 15:48:01.000000000 +0100 +++ new/kfloppy-16.04.1/main.cpp 2016-03-23 20:19:47.000000000 +0100 @@ -4,6 +4,7 @@ Copyright (C) 1997 Bernd Johannes Wuebben <[email protected]> Copyright (C) 2004, 2005 Nicolas GOUTTE <[email protected]> + Copyright (C) 2015, 2016 Wolfgang Bauer <[email protected]> This program is free software; you can redistribute it and/or modify @@ -22,11 +23,12 @@ */ -#include <kdeversion.h> -#include <kapplication.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> -#include <klocale.h> +#include <Kdelibs4ConfigMigrator> +#include <KAboutData> +#include <QApplication> +#include <KLocalizedString> +#include <QCommandLineParser> +#include <QCommandLineOption> #include "floppy.h" @@ -35,41 +37,57 @@ int main( int argc, char *argv[] ) { - KAboutData aboutData("kfloppy", 0, - ki18n("KFloppy"), - "4.9", ki18n(description), KAboutData::License_GPL, - ki18n("(c) 1997, Bernd Johannes Wuebben\n" + QApplication app(argc, argv); +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + QGuiApplication::setFallbackSessionManagementEnabled(false); +#endif + + Kdelibs4ConfigMigrator migrator(QStringLiteral("kfloppy")); + migrator.setConfigFiles(QStringList() << QStringLiteral("kfloppyrc")); + migrator.migrate(); + + KLocalizedString::setApplicationDomain("kfloppy"); + + KAboutData aboutData(QStringLiteral("kfloppy"), + i18n("KFloppy"), + QStringLiteral("5.0"), i18n(description), KAboutLicense::GPL, + i18n("(c) 1997, Bernd Johannes Wuebben\n" "(c) 2001, Chris Howells\n" "(c) 2002, Adriaan de Groot\n" - "(c) 2004, 2005, Nicolas Goutte"), - ki18n("KFloppy helps you format floppies with the filesystem of your choice."), - "http://utils.kde.org/projects/kfloppy"; + "(c) 2004, 2005, Nicolas Goutte\n" + "(c) 2015, 2016, Wolfgang Bauer"), + i18n("KFloppy helps you format floppies with the filesystem of your choice."), + QStringLiteral("http://utils.kde.org/projects/kfloppy";) ); - aboutData.addAuthor(ki18n("Bernd Johannes Wuebben"), ki18n("Author and former maintainer"), "[email protected]"); - aboutData.addCredit(ki18n("Chris Howells"), ki18n("User interface re-design"), "[email protected]"); - aboutData.addCredit(ki18n("Adriaan de Groot"), ki18n("Add BSD support"), "[email protected]"); - aboutData.addCredit(ki18n("Nicolas Goutte"), ki18n("Make KFloppy work again for KDE 3.4"), "[email protected]"); + aboutData.addAuthor(i18n("Bernd Johannes Wuebben"), i18n("Author and former maintainer"), QStringLiteral("[email protected]")); + aboutData.addCredit(i18n("Chris Howells"), i18n("User interface re-design"), QStringLiteral("[email protected]")); + aboutData.addCredit(i18n("Adriaan de Groot"), i18n("Add BSD support"), QStringLiteral("[email protected]")); + aboutData.addCredit(i18n("Nicolas Goutte"), i18n("Make KFloppy work again for KDE 3.4"), QStringLiteral("[email protected]")); + aboutData.addCredit(i18n("Wolfgang Bauer"), i18n("Port KFloppy to KF5"), QStringLiteral("[email protected]")); + // necessary to make the "Translators" tab appear in the About dialog + aboutData.setTranslator( i18nc( "NAME OF TRANSLATORS", "Your names" ), i18nc( "EMAIL OF TRANSLATORS", "Your emails" ) ); + KAboutData::setApplicationData(aboutData); - KCmdLineArgs::init( argc, argv, &aboutData ); + QCommandLineParser parser; + parser.addVersionOption(); + parser.addHelpOption(); + aboutData.setupCommandLine(&parser); + + parser.addPositionalArgument(QStringLiteral("[device]"), i18n("Default device")); + parser.process(app); + aboutData.processCommandLine(&parser); - KCmdLineOptions options; - options.add("+[device]", ki18n("Default device")); - KCmdLineArgs::addCmdLineOptions( options ); - - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + const QStringList args = parser.positionalArguments(); QString device; - if (args->count()) { - device = args->arg(0); + if (args.count()) { + device = args.at(0); } - args->clear(); - - KApplication a; FloppyData* floppy = new FloppyData(); bool autoformat = floppy->setInitialDevice(device); floppy->show(); if (autoformat) - floppy->format(); - return a.exec(); + floppy->format(); + return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-15.12.3/org.kde.kfloppy.desktop new/kfloppy-16.04.1/org.kde.kfloppy.desktop --- old/kfloppy-15.12.3/org.kde.kfloppy.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kfloppy-16.04.1/org.kde.kfloppy.desktop 2016-03-23 20:19:47.000000000 +0100 @@ -0,0 +1,156 @@ +[Desktop Entry] +GenericName=Floppy Formatter +GenericName[af]=Sagteskyf Formateerder +GenericName[ar]=مهئ الأقراص المرنة +GenericName[ast]=Formateador de disquettes +GenericName[bg]=Форматиране на дискети +GenericName[br]=Furmader pladennig +GenericName[bs]=Formatiranje disketa +GenericName[ca]=Formatador de disquets +GenericName[ca@valencia]=Formatador de disquets +GenericName[cs]=Formátovač disket +GenericName[cy]=Fformatio Disg Meddal +GenericName[da]=Disketteformatering +GenericName[de]=Diskettenformatierer +GenericName[el]=Εργαλείο διαμόρφωσης δισκέτας +GenericName[en_GB]=Floppy Formatter +GenericName[eo]=Formatilo por disketoj +GenericName[es]=Formateador de disquetes +GenericName[et]=Diskettide vormindamise utiliit +GenericName[eu]=Diskete-formateatzailea +GenericName[fa]=قالببندیکننده فلاپی +GenericName[fi]=Levykkeiden alustusohjelma +GenericName[fr]=Outil de formatage de disquettes +GenericName[ga]=Uirlis Fhormáidithe Dioscaí Flapacha +GenericName[gl]=Formatador de disquetes +GenericName[he]=מאתחל תקליטונים +GenericName[hne]=फ्लापी फार्मेटर +GenericName[hr]=Formatiranje disketa +GenericName[hu]=Hajlékonylemez-formázó +GenericName[ia]=Formattator de floppy +GenericName[id]=Pemformat Disket +GenericName[is]=Tól til að forsníða disklinga +GenericName[it]=Formattatore di dischetti +GenericName[ja]=フロッピーをフォーマット +GenericName[kk]=Иілгіш дискін пішімдеу +GenericName[km]=កម្មវិធីធ្វើទ្រង់ទ្រាយថាសទន់ +GenericName[ko]=플로피 포맷 도구 +GenericName[lt]=Diskelio formatavimas +GenericName[lv]=Diskešu formatētājs +GenericName[mk]=Форматирање на дискети +GenericName[mr]=फ्लॉपी फॉर्मेटर +GenericName[ms]=Pengformat Cakera Liut +GenericName[nb]=Diskettformaterer +GenericName[nds]=Diskettformaterer +GenericName[ne]=फ्लपी ढाँचाकर्ता +GenericName[nl]=Diskettes formatteren +GenericName[nn]=Diskettformatering +GenericName[oc]=Formataire de disquetas +GenericName[pa]=ਫਲਾਪੀ ਫਾਰਮੈਟਰ +GenericName[pl]=Program formatujący dyskietki +GenericName[pt]=Formatação de Disquetes +GenericName[pt_BR]=Formatador de disquete +GenericName[ro]=Formatator de dischete +GenericName[ru]=Форматирование дискет +GenericName[sk]=Formátovanie diskiet +GenericName[sl]=Formatiranje disket +GenericName[sq]=Formatuesi i Disketave +GenericName[sr]=Форматирање дискета +GenericName[sr@ijekavian]=Форматирање дискета +GenericName[sr@ijekavianlatin]=Formatiranje disketa +GenericName[sr@latin]=Formatiranje disketa +GenericName[sv]=Formatera disketter +GenericName[ta]=நெகிழ்வட்டு வடிவமைப்பான் +GenericName[tg]=Шаклбанднамоии Диски Нарм +GenericName[th]=เครื่องมือฟอร์แมตแผ่นฟลอปปี้้ +GenericName[tr]=Disket Biçimlendirici +GenericName[ug]=يۇمشاق دىسكا پىچقۇچ +GenericName[uk]=Відформатувати дискету +GenericName[uz]=Disketni formatlagich +GenericName[uz@cyrillic]=Дискетни форматлагич +GenericName[vi]=Trình Định Dạng Đĩa Mềm +GenericName[wa]=Usteye po-z abwesner des plaketes +GenericName[xh]=Floppy formata +GenericName[x-test]=xxFloppy Formatterxx +GenericName[zh_CN]=软盘格式化程序 +GenericName[zh_TW]=軟碟格式化程式 +Name=KFloppy +Name[af]=Kfloppie +Name[ar]=كفلوبي +Name[ast]=KFloppy +Name[bg]=KFloppy +Name[br]=KFloppy +Name[bs]=KFloppy +Name[ca]=KFloppy +Name[ca@valencia]=KFloppy +Name[cs]=KFloppy +Name[cy]=KFloppy +Name[da]=KFloppy +Name[de]=KFloppy +Name[el]=KFloppy +Name[en_GB]=KFloppy +Name[eo]=KDisketo +Name[es]=KFloppy +Name[et]=KFloppy +Name[eu]=KFloppy +Name[fi]=KFloppy +Name[fr]=KFloppy +Name[ga]=KFloppy +Name[gl]=KFloppy +Name[he]=KFloppy +Name[hne]=के-फ्लापी +Name[hr]=KFloppy +Name[hu]=KFloppy +Name[ia]=KFloppy +Name[id]=KFloppy +Name[is]=KFloppy +Name[it]=KFloppy +Name[ja]=KFloppy +Name[kk]=KFloppy +Name[km]=KFloppy +Name[ko]=KFloppy +Name[lt]=KFloppy +Name[lv]=KFloppy +Name[mk]=KFloppy +Name[mr]=के-फ्लॉपी +Name[ms]=KFloppy +Name[nb]=KFloppy +Name[nds]=KFloppy +Name[ne]=केडीई फ्लपी +Name[nl]=KFloppy +Name[nn]=KFloppy +Name[pa]=ਕੇ-ਫਲਾਪੀ +Name[pl]=Dyskietka +Name[pt]=KFloppy +Name[pt_BR]=KFloppy +Name[ro]=KFloppy +Name[ru]=KFloppy +Name[sk]=KFloppy +Name[sl]=KFloppy +Name[sq]=KFloppy +Name[sr]=К‑флопи +Name[sr@ijekavian]=К‑флопи +Name[sr@ijekavianlatin]=K‑flopi +Name[sr@latin]=K‑flopi +Name[sv]=Kfloppy +Name[ta]=கேநெகிழ்வட்டு +Name[tg]=KДиски Нарм +Name[th]=ฟอร์แมตฟลอปปี้-K +Name[tr]=KFloppy +Name[ug]=KFloppy +Name[uk]=KFloppy +Name[uz]=KFloppy +Name[uz@cyrillic]=KFloppy +Name[vi]=KFloppy +Name[wa]=KPlakete +Name[xh]=KFloppy +Name[x-test]=xxKFloppyxx +Name[zh_CN]=KFloppy +Name[zh_TW]=KDE 軟碟 +X-DocPath=kfloppy/index.html +Exec=kfloppy -qwindowtitle %c +Icon=kfloppy +Type=Application +Terminal=false +X-KDE-StartupNotify=true +Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;
