Hello community, here is the log from the commit of package kdf for openSUSE:Factory checked in at 2018-08-24 17:07:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdf (Old) and /work/SRC/openSUSE:Factory/.kdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdf" Fri Aug 24 17:07:30 2018 rev:87 rq:630217 version:18.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdf/kdf.changes 2018-07-19 22:51:48.842597984 +0200 +++ /work/SRC/openSUSE:Factory/.kdf.new/kdf.changes 2018-08-24 17:07:35.734320194 +0200 @@ -1,0 +2,24 @@ +Thu Aug 16 22:03:50 UTC 2018 - christo...@krop.fr + +- Update to 18.08.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.08.0.php +- Changes since 18.07.80: + * None + +------------------------------------------------------------------- +Thu Jul 26 13:00:40 UTC 2018 - lbeltr...@kde.org + +- Update to 18.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.07.80.php +- Changes since 18.04.3: + * Not necessary to generate moc file + * Remove extra ; + * Warning-- + * Do not duplicate work of KAboutData::setupCommandLine() + * Add simple appdata file for KDiskFree + +------------------------------------------------------------------- Old: ---- kdf-18.04.3.tar.xz New: ---- kdf-18.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdf.spec ++++++ --- /var/tmp/diff_new_pack.qhzCrn/_old 2018-08-24 17:07:36.182320727 +0200 +++ /var/tmp/diff_new_pack.qhzCrn/_new 2018-08-24 17:07:36.182320727 +0200 @@ -19,11 +19,11 @@ %bcond_without lang Name: kdf -Version: 18.04.3 +Version: 18.08.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) -%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Disk Usage Viewer License: GPL-2.0+ Group: System/Monitoring @@ -97,6 +97,7 @@ %{_kf5_plugindir}/libkcm_kdf.so %{_kf5_servicesdir}/kcmdf.desktop %{_kf5_kxmlguidir}/kdf/ +%{_kf5_appstreamdir}/org.kde.kdf.appdata.xml %files -n kwikdisk %defattr(-,root,root) ++++++ kdf-18.04.3.tar.xz -> kdf-18.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/CMakeLists.txt new/kdf-18.08.0/CMakeLists.txt --- old/kdf-18.04.3/CMakeLists.txt 2018-07-10 02:08:00.000000000 +0200 +++ new/kdf-18.08.0/CMakeLists.txt 2018-08-10 02:07:24.000000000 +0200 @@ -4,8 +4,8 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "18") -set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "3") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "0") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") if(NOT UNIX) @@ -57,6 +57,13 @@ XmlGui ) +add_definitions(-DQT_NO_CAST_FROM_ASCII) +add_definitions(-DQT_NO_CAST_TO_ASCII) +add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) +add_definitions(-DQT_USE_QSTRINGBUILDER) +#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) + add_subdirectory(desktop) add_subdirectory(doc) add_subdirectory(pics) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/desktop/CMakeLists.txt new/kdf-18.08.0/desktop/CMakeLists.txt --- old/kdf-18.04.3/desktop/CMakeLists.txt 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/desktop/CMakeLists.txt 2018-08-06 22:43:47.000000000 +0200 @@ -4,3 +4,4 @@ install( PROGRAMS org.kde.kdf.desktop org.kde.kwikdisk.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install( FILES kdfui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdf) install( FILES kcmdf.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) +install(FILES org.kde.kdf.appdata.xml DESTINATION ${CMAKE_INSTALL_METAINFODIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/desktop/org.kde.kdf.appdata.xml new/kdf-18.08.0/desktop/org.kde.kdf.appdata.xml --- old/kdf-18.04.3/desktop/org.kde.kdf.appdata.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kdf-18.08.0/desktop/org.kde.kdf.appdata.xml 2018-08-06 22:43:47.000000000 +0200 @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="utf-8"?> +<component type="desktop-application"> + <id>org.kde.kdf</id> + <metadata_license>FSFAP</metadata_license> + <project_license>GPL-2.0+</project_license> + <name>KDiskFree</name> + <name xml:lang="ast">KDiskFree</name> + <name xml:lang="ca">KDiskFree</name> + <name xml:lang="ca-valencia">KDiskFree</name> + <name xml:lang="cs">KDiskFree</name> + <name xml:lang="de">KDiskFree</name> + <name xml:lang="en-GB">KDiskFree</name> + <name xml:lang="es">KDiskFree</name> + <name xml:lang="fi">KDiskFree</name> + <name xml:lang="fr">KDiskFree</name> + <name xml:lang="gl">KDiskFree</name> + <name xml:lang="ia">KDiskFree</name> + <name xml:lang="it">KDiskFree</name> + <name xml:lang="nl">KDiskFree</name> + <name xml:lang="nn">KDiskFree</name> + <name xml:lang="pl">KDiskFree</name> + <name xml:lang="pt">KDiskFree</name> + <name xml:lang="pt-BR">KDiskFree</name> + <name xml:lang="sk">KDiskFree</name> + <name xml:lang="sv">Kdiskfree</name> + <name xml:lang="uk">KDiskFree</name> + <name xml:lang="x-test">xxKDiskFreexx</name> + <name xml:lang="zh-CN">KDiskFree</name> + <summary>View Disk Usage</summary> + <summary xml:lang="ca">Veure l'ús de disc</summary> + <summary xml:lang="ca-valencia">Veure l'ús de disc</summary> + <summary xml:lang="cs">Zobrazení využití disku</summary> + <summary xml:lang="de">Festplattenbelegung anzeigen</summary> + <summary xml:lang="en-GB">View Disk Usage</summary> + <summary xml:lang="es">Visor de uso del disco</summary> + <summary xml:lang="fi">Näytä levynkäyttö</summary> + <summary xml:lang="fr">Visualiser l'occupation du disque</summary> + <summary xml:lang="gl">Visor do uso dos discos</summary> + <summary xml:lang="ia">Vide uso de disco</summary> + <summary xml:lang="it">Visualizza l'utilizzo del disco</summary> + <summary xml:lang="nl">Schijfgebruik bekijken</summary> + <summary xml:lang="nn">Vis diskbruk</summary> + <summary xml:lang="pl">Informacja o wolnym miejscu na dyskach</summary> + <summary xml:lang="pt">Visualização do Uso do Disco</summary> + <summary xml:lang="pt-BR">Mostra a utilização do disco</summary> + <summary xml:lang="sk">Zobraziť využitie disku</summary> + <summary xml:lang="sv">Visa hårddiskanvändning</summary> + <summary xml:lang="uk">Перегляд використання диска</summary> + <summary xml:lang="x-test">xxView Disk Usagexx</summary> + <summary xml:lang="zh-CN">查看磁盘使用状况</summary> + <description> + <p> + KDiskFree displays the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager. + </p> + <p xml:lang="ca">El KDiskFree mostra els dispositius de fitxers disponibles (particions de disc dur, disquets i unitats de CD, etc.) juntament amb informació de la seva capacitat, espai lliure, tipus i punt de muntatge. També permet muntar i desmuntar les unitats i veure-les en un gestor de fitxers.</p> + <p xml:lang="ca-valencia">El KDiskFree mostra els dispositius de fitxers disponibles (particions de disc dur, disquets i unitats de CD, etc.) juntament amb informació de la seua capacitat, espai lliure, tipus i punt de muntatge. També permet muntar i desmuntar les unitats i veure-les en un gestor de fitxers.</p> + <p xml:lang="de">KDiskFree zeigt die verfügbaren Plattenbereiche an (Partitionen auf Festplatten, Disketten, CD-Laufwerke, USB-Sticks usw.). Zu jedem Bereich wird die Gesamtgröße, der freie Bereich, das Dateisystem und der Ort des Einhängens ins Dateisystem (Einhängepunkt) angezeigt. Mit KDiskFree können auch (sofern die Berechtigung vorhanden ist) Laufwerke ein- bzw. ausgehängt und die Dateiverwaltung mit der Anzeige für dieses Laufwerk geöffnet werden.</p> + <p xml:lang="en-GB">KDiskFree displays the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager.</p> + <p xml:lang="es">KDiskFree muestra los dispositivos de archivos disponibles (particiones de disco duro, disquetes, unidades de CD, etc.), junto a información sobre su capacidad, espacio libre, tipo y punto de montaje. También le permite montar y desmontar dispositivos, así como abrirlos en un gestor de archivos.</p> + <p xml:lang="fi">KDiskFree näyttää saatavilla olevat tiedostolaitteet (kiintolevyosiot, levyke- ja CD-asemat jne.) tietoineen: kapasiteetti, vapaa tila, tyyppi ja liitospiste. Se antaa myös liittää ja irrottaa asemia ja katsoa niitä tiedostonhallinnassa.</p> + <p xml:lang="fr">KDiskFree affiche les systèmes de fichiers disponibles (partitions du disque dur, lecteurs disquettes/CD/DVD, etc.) ainsi que des informations sur leur capacité, l'espace disponible, leur type et leur point de montage. L'outil vous permet également de monter, de libérer et d'afficher les lecteurs dans un gestionnaire de fichiers.</p> + <p xml:lang="gl">KDiskFree mostra os dispositivos de ficheiros dispoñíbeis (particións de discos duros, lectores de disquetes e CD, etc.) xunto con información sobre a súa capacidade, espazo libre, tipo e punto de montaxe. Tamén permite montar e desmontar lectores e velos no xestor de ficheiros.</p> + <p xml:lang="it">KDiskFree mostra i dispositivi file disponibili (partizioni dei dischi fissi, unità a dischetti e lettori CD, eccetera) insieme ad informazioni sulla loro capacità, sullo spazio libero, sul tipo e sul punto di montaggio. Permette anche di montare e di smontare le unità e di visualizzarle in un gestore di file.</p> + <p xml:lang="nl">KDiskFree toont de beschikbare apparaten voor bestandsopslag (vaste-schijfpartities, diskette- en -stations, USB-sticks, cd-station, etc.), met informatie over hun capaciteit, vrije ruimte, type en aankoppelpunt. Het geeft u ook de mogelijkheid om schijven aan- en af te koppelen en ze in een bestandsbeheerder te bekijken.</p> + <p xml:lang="nn">KDiskFree viser lagringseiningar – for eksempel harddiskpartisjonar, diskettar og CD-plater – med informasjon om kapasitet, plassbruk, type og monteringspunkt. Det kan òg montera og avmontera einingar og opna dei i filhandsamaren.</p> + <p xml:lang="pl">KDiskFree wyświetla dostępne urządzenia plikowe (partycje dysków twardych, dyskietki i napędy CD, itp.) wraz z informacją o ich pojemności, wolnej przestrzeni, rodzaju i punkcie podpięcia. Umożliwia podpinanie i odpinanie napędów, a także przeglądanie ich w przeglądarce plików.</p> + <p xml:lang="pt">O KDiskFree mostra os dispositivos de ficheiros disponíveis (partições de discos rígidos, unidades de disquetes e CD's, etc.) em conjunto com informações sobre a sua capacidade, espaço livre, tipo e ponto de montagem. Também lhe permite montar e desmontar as unidades e vê-las num gestor de ficheiros.</p> + <p xml:lang="pt-BR">O KDiskFree mostra os dispositivos de arquivos disponíveis (partições de discos rígidos, unidades de disquetes e CDs, dispositivos USB, etc.) juntamente com informações sobre sua capacidade, espaço livre, tipo e ponto de montagem. Também permite a montagem e desmontagem de unidades e visualizá-las em um gerenciador de arquivos.</p> + <p xml:lang="sv">Kdiskfree visar tillgängliga filenheter (hårddiskpartitioner, diskett- och cd-enheter, etc.) tillsammans med information om deras kapacitet, ledigt utrymme, typ och monteringsplats. Det låter dig också montera och avmontera enheter och visa dem i en filhanterare.</p> + <p xml:lang="uk">KDiskFree показує список доступних файлових пристроїв (розділів жорсткого диска, пристроїв читання гнучких дисків, компакт-дисків, флеш-карток USB тощо), а також інформацію щодо їх місткості, вільного місця, типу і точки монтування. Ця програма також надає вам можливість монтувати, демонтувати пристрої і переглядати їх вміст у програмі для роботи з файлами.</p> + <p xml:lang="x-test">xxKDiskFree displays the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager.xx</p> + <p xml:lang="zh-CN">KDiskFree 显示所有的文件设备 (硬盘分区，软盘和 CD 驱动器等) 及他们的容量，可用空间，类型和挂载点。它也允许您挂载及卸载驱动器，以及在文件管理器中查看它们。</p> + </description> + <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=kdf</url> + <url type="donation">https://www.kde.org/community/donations/</url> + <url type="help">https://docs.kde.org/?application=kdf</url> + <url type="homepage">https://utils.kde.org/projects/kdf/</url> + <screenshots> + <screenshot type="default"> + <image>https://www.kde.org/images/screenshots/kdiskfree.png</image> + </screenshot> + </screenshots> + <project_group>KDE</project_group> + <provides> + <binary>kdf</binary> + </provides> + <launchable type="desktop-id">org.kde.kdf.desktop</launchable> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/desktop/org.kde.kdf.desktop new/kdf-18.08.0/desktop/org.kde.kdf.desktop --- old/kdf-18.04.3/desktop/org.kde.kdf.desktop 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/desktop/org.kde.kdf.desktop 2018-08-06 22:43:47.000000000 +0200 @@ -161,6 +161,7 @@ Comment[nn]=Viser informasjon om harddiskar og andre lagringseiningar Comment[pl]=Wyświetla informacje o dyskach twardych i innych urządzeniach do przechowywania danych Comment[pt]=Mostrar informações sobre os discos rígidos e outros dispositivos de armazenamento +Comment[pt_BR]=Mostra informações sobre os discos rígidos e outros dispositivos de armazenamento Comment[sk]=Zobrazí informácie o pevných diskoch a iných úložných zariadeniach Comment[sl]=Pokaže podrobnosti o trdih diskih in drugih shranjevalnih napravah Comment[sr]=Приказ података о хард‑диску и другим складишним уређајима diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/desktop/org.kde.kwikdisk.desktop new/kdf-18.08.0/desktop/org.kde.kwikdisk.desktop --- old/kdf-18.04.3/desktop/org.kde.kwikdisk.desktop 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/desktop/org.kde.kwikdisk.desktop 2018-08-06 22:43:47.000000000 +0200 @@ -163,6 +163,7 @@ Comment[nn]=Panelikon for montering av avmontering av diskar Comment[pl]=Ikona na panelu do podpinania i odpinania dysków Comment[pt]=Ícone do painel para montar e desmontar os discos +Comment[pt_BR]=Ícone do painel para montar e desmontar os discos Comment[sk]=Ikona panelu na pripojenie a odpojenie diskov Comment[sl]=Ikona za pult, s katero lahko priklopite/odklopite diske Comment[sr]=Панелска иконица за монтирање и демонтирање дискова diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/po/da/kdf.po new/kdf-18.08.0/po/da/kdf.po --- old/kdf-18.04.3/po/da/kdf.po 2018-07-10 02:07:59.000000000 +0200 +++ new/kdf-18.08.0/po/da/kdf.po 2018-08-10 02:07:24.000000000 +0200 @@ -2,7 +2,7 @@ # Danish translation of kdf # Copyright (C). # -# Erik Kjær Pedersen <e...@binghamton.edu>, 1999,2002,2003, 2004. +# Erik Kjær Pedersen <e...@binghamton.edu>, 1999, 2002, 2003, 2004. # Martin Schlander <mschlan...@opensuse.org>, 2008, 2009, 2016. msgid "" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/po/id/kdf.po new/kdf-18.08.0/po/id/kdf.po --- old/kdf-18.04.3/po/id/kdf.po 2018-07-10 02:08:00.000000000 +0200 +++ new/kdf-18.08.0/po/id/kdf.po 2018-08-10 02:07:24.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:17+0100\n" -"PO-Revision-Date: 2018-04-16 08:17+0700\n" +"PO-Revision-Date: 2018-06-30 00:46+0700\n" "Last-Translator: Wantoyo <wanto...@gmail.com>\n" "Language-Team: Indonesian <kde-i18n-...@kde.org>\n" "Language: id\n" @@ -72,7 +72,7 @@ #, kde-format msgctxt "Update action" msgid "&Update" -msgstr "Perbahar&ui" +msgstr "&Update" #: src/kdf.cpp:76 #, kde-format @@ -201,7 +201,7 @@ #, kde-format msgctxt "Disk percentage" msgid "%1%" -msgstr "" +msgstr "%1%" #: src/kdfwidget.cpp:72 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/po/ru/docs/kcontrol/blockdevices/index.docbook new/kdf-18.08.0/po/ru/docs/kcontrol/blockdevices/index.docbook --- old/kdf-18.04.3/po/ru/docs/kcontrol/blockdevices/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ new/kdf-18.08.0/po/ru/docs/kcontrol/blockdevices/index.docbook 2018-08-10 02:07:24.000000000 +0200 @@ -0,0 +1,167 @@ +<?xml version="1.0" ?> +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ +<!ENTITY % addindex "IGNORE"> +<!ENTITY % Russian "INCLUDE" +> <!-- change language only here --> +]> + +<article id="block-devices" lang="&language;"> +<title +>Блочные устройства</title> + +<articleinfo> + +<authorgroup> +<author +><firstname +>Mike</firstname +> <surname +>McBride</surname +> </author> +<othercredit role="translator" +><firstname +>Ольга</firstname +><surname +>Миронова</surname +><affiliation +><address +><email +>om...@basealt.ru</email +></address +></affiliation +><contrib +>Перевод на русский язык</contrib +></othercredit +><othercredit role="translator" +><firstname +></firstname +><surname +></surname +><affiliation +><address +><email +>olegbata...@mail.ru</email +></address +></affiliation +><contrib +></contrib +></othercredit +><othercredit role="reviewer" +><firstname +>Александр</firstname +><surname +>Яворский</surname +><contrib +>Рецензирование</contrib +></othercredit +> +</authorgroup> + +<date +>2016-04-14</date> +<releaseinfo +>Приложения 16.04</releaseinfo> + +<keywordset> +<keyword +>KDE</keyword> +<keyword +>KControl</keyword> +<keyword +>блочные устройства</keyword> +<keyword +>дисковое пространство</keyword> +</keywordset> +</articleinfo> + +<sect1> +<title +>Устройства хранения данных</title> + +<para +>В окне этого модуля настройки показаны доступные файловые устройства и информация о каждом из них. Здесь также можно управлять точками монтирования, подключать и отключать устройства. </para> + +<para +>Обычно в этой вкладке отображается следующая информация: </para> + +<itemizedlist> +<listitem +><para +>значок, обозначающий тип носителя;</para +></listitem> +<listitem +><para +>имя устройства;</para +></listitem> +<listitem +><para +>тип файловой системы;</para +></listitem> +<listitem +><para +>общий размер;</para +></listitem> +<listitem +><para +>точка монтирования;</para +></listitem> +<listitem +><para +>свободное место на диске;</para +></listitem> +<listitem +><para +>процент заполнения пространства, в числовом и графическом отображении.</para +></listitem> +</itemizedlist> + +<para +>Щелчок <mousebutton +>левой</mousebutton +> кнопкой мыши по заголовку столбца сортирует список устройств по этому критерию. Второй щелчок <mousebutton +>левой</mousebutton +> кнопкой мыши изменяет порядок сортировки на обратный. </para> + +<para +>Щелчок <mousebutton +>правой</mousebutton +> кнопкой мыши по строке списка открывает контекстное меню. Если выделенное устройство не подключено, для выбора будет доступен пункт <guimenuitem +>Подключить устройство</guimenuitem +>. Если устройство подключено, его можно отключить, выбрав пункт <guimenuitem +>Отключить устройство</guimenuitem +>. Пункт <guimenuitem +>Открыть в диспетчере файлов</guimenuitem +> открывает новое окно, в котором будут показаны файлы, содержащиеся на устройстве. </para> + +<para +>Задать подходящие команды подключения и отключения, а также настроить то, как диспетчер файлов должен открываться из контекстного меню, можно в приложении для определения свободного дискового пространства &kdiskfree;. </para> + +<sect2> +<title +>Автор раздела</title> + +<para +>Этот раздел составлен на основе документации по <application +>kdf</application +>, написанной Jonathan Singer <email +>jsin...@leeta.net</email +>.</para> + +<para +>Переработка для KDE 2.0: Mike McBride <email +>mpmcbri...@yahoo.com</email +>.</para> +<para +>Ольга Миронова<email +>om...@basealt.ru</email +></para +><para +>Oleg Batalov<email +>olegbata...@mail.ru</email +></para +> + +</sect2> +</sect1> +</article> + Binary files old/kdf-18.04.3/po/uk/docs/kdf/kdf.png and new/kdf-18.08.0/po/uk/docs/kdf/kdf.png differ Binary files old/kdf-18.04.3/po/uk/docs/kdf/kdf_config.png and new/kdf-18.08.0/po/uk/docs/kdf/kdf_config.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/po/zh_CN/kdf.po new/kdf-18.08.0/po/zh_CN/kdf.po --- old/kdf-18.04.3/po/zh_CN/kdf.po 2018-07-10 02:08:00.000000000 +0200 +++ new/kdf-18.08.0/po/zh_CN/kdf.po 2018-08-10 02:07:24.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:17+0100\n" -"PO-Revision-Date: 2018-07-03 17:42\n" +"PO-Revision-Date: 2018-07-24 08:49\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/po/zh_TW/kdf.po new/kdf-18.08.0/po/zh_TW/kdf.po --- old/kdf-18.04.3/po/zh_TW/kdf.po 2018-07-10 02:08:00.000000000 +0200 +++ new/kdf-18.08.0/po/zh_TW/kdf.po 2018-08-10 02:07:24.000000000 +0200 @@ -409,48 +409,3 @@ #, kde-format msgid "Mount Commands" msgstr "裝載命令" - -#~ msgid "A test application" -#~ msgstr "一個測試程式。" - -#~ msgid "" -#~ "<h3>Hardware Information</h3><br /> All the information modules return " -#~ "information about a certain aspect of your computer hardware or your " -#~ "operating system. Not all modules are available on all hardware " -#~ "architectures and/or operating systems." -#~ msgstr "" -#~ "<h3>硬體資訊</h3><br /> 所有模組會回報有關於您的電腦或作業系統的資訊。\n" -#~ "並非每一個模組都能夠運作在所有的架構、系統上。" - -#~ msgid "Form" -#~ msgstr "表單" - -#~ msgid "Update frequency [seconds]. The value 0 disables update" -#~ msgstr "更新頻率[秒]。設為 0 則不更新顯示" - -#~ msgid "Mount command:" -#~ msgstr "裝載命令：" - -#~ msgid "Unmount command:" -#~ msgstr "卸載命令：" - -#~ msgid "" -#~ "This filename is not valid: %1\n" -#~ "It must end with \"_mount\" or \"_unmount\"." -#~ msgstr "" -#~ "不合法的檔名: %1\n" -#~ "必須以“_mount”或“_umount”結尾。" - -#~ msgid "%1 (%2) %3 on %4" -#~ msgstr "%1 (%2) %3 於 %4" - -#~ msgctxt "Storage device icon" -#~ msgid "Icon" -#~ msgstr "圖示" - -#~ msgctxt "Item on the device information column is visible" -#~ msgid "visible" -#~ msgstr "可見" - -#~ msgid "Get Unmount Command" -#~ msgstr "取得卸載命令" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/disklist.h new/kdf-18.08.0/src/disklist.h --- old/kdf-18.04.3/src/disklist.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/disklist.h 2018-08-06 22:43:47.000000000 +0200 @@ -62,14 +62,14 @@ Q_OBJECT public: - DiskList( QObject *parent=0 ); + explicit DiskList( QObject *parent=nullptr ); ~DiskList(); int readFSTAB(); int readDF(); int find(DiskEntry* disk); DiskEntry* at(uint index) { return disks->at(index); } - uint count() { return disks->count(); } + uint count() const { return disks->count(); } void deleteAllMountedAt(const QString &mountpoint); void setUpdatesDisabled(bool disable); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/disks.h new/kdf-18.08.0/src/disks.h --- old/kdf-18.04.3/src/disks.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/disks.h 2018-08-06 22:43:47.000000000 +0200 @@ -34,8 +34,8 @@ Q_OBJECT public: - explicit DiskEntry(QObject *parent=0, const char *name=0); - explicit DiskEntry(const QString & deviceName, QObject *parent=0, const char *name=0); + explicit DiskEntry(QObject *parent=nullptr, const char *name=nullptr); + explicit DiskEntry(const QString & deviceName, QObject *parent=nullptr, const char *name=nullptr); ~DiskEntry(); QString lastSysError() {return sysStringErrOut; } QString deviceName() const { return device; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/kcmdf.cpp new/kdf-18.08.0/src/kcmdf.cpp --- old/kdf-18.04.3/src/kcmdf.cpp 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/kcmdf.cpp 2018-08-06 22:43:47.000000000 +0200 @@ -60,5 +60,3 @@ } } -#include "kcmdf.moc" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/kcmdf.h new/kdf-18.08.0/src/kcmdf.h --- old/kdf-18.04.3/src/kcmdf.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/kcmdf.h 2018-08-06 22:43:47.000000000 +0200 @@ -36,10 +36,10 @@ Q_OBJECT public: - explicit KDiskFreeWidget( QWidget *parent = 0 ); - ~KDiskFreeWidget(); + explicit KDiskFreeWidget( QWidget *parent = nullptr ); + ~KDiskFreeWidget() override; - QString quickHelp() const; + QString quickHelp() const override; private: KDFWidget *mKdf; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/kdf.cpp new/kdf-18.08.0/src/kdf.cpp --- old/kdf-18.04.3/src/kdf.cpp 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/kdf.cpp 2018-08-06 22:43:47.000000000 +0200 @@ -38,7 +38,7 @@ /***************************************************************/ KDFTopLevel::KDFTopLevel(QWidget *) - : KXmlGuiWindow(0) + : KXmlGuiWindow(nullptr) { kdf = new KDFWidget(this,false); Q_CHECK_PTR(kdf); @@ -90,8 +90,6 @@ QCommandLineParser parser; parser.setApplicationDescription(aboutData.shortDescription()); - parser.addHelpOption(); - parser.addVersionOption(); aboutData.setupCommandLine(&parser); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/kdf.h new/kdf-18.08.0/src/kdf.h --- old/kdf-18.04.3/src/kdf.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/kdf.h 2018-08-06 22:43:47.000000000 +0200 @@ -32,11 +32,11 @@ Q_OBJECT public: - KDFTopLevel(QWidget *parent=0); - ~KDFTopLevel() { } + explicit KDFTopLevel(QWidget *parent= nullptr); + ~KDFTopLevel() override { } protected: - void closeEvent(QCloseEvent *event); + void closeEvent(QCloseEvent *event) override; protected: KDFWidget* kdf; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/kdfconfig.h new/kdf-18.08.0/src/kdfconfig.h --- old/kdf-18.04.3/src/kdfconfig.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/kdfconfig.h 2018-08-06 22:43:47.000000000 +0200 @@ -45,8 +45,8 @@ Q_OBJECT public: - explicit KDFConfigWidget( QWidget *parent=0, bool init=false); - ~KDFConfigWidget(); + explicit KDFConfigWidget( QWidget *parent=nullptr, bool init=false); + ~KDFConfigWidget() override; public Q_SLOTS: void loadSettings( void ); @@ -60,7 +60,7 @@ void toggleListText( QTreeWidgetItem *item, int column ); protected: - void closeEvent( QCloseEvent * ); + void closeEvent( QCloseEvent * ) override; private: CStdOption mStd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/kdfitemdelegate.h new/kdf-18.08.0/src/kdfitemdelegate.h --- old/kdf-18.04.3/src/kdfitemdelegate.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/kdfitemdelegate.h 2018-08-06 22:43:47.000000000 +0200 @@ -30,11 +30,11 @@ Q_OBJECT public: - KDFItemDelegate(QObject * parent = 0): QStyledItemDelegate(parent) {}; - ~KDFItemDelegate() {}; + explicit KDFItemDelegate(QObject * parent = nullptr): QStyledItemDelegate(parent) {} + ~KDFItemDelegate() override {} void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/kdfsortproxymodel.h new/kdf-18.08.0/src/kdfsortproxymodel.h --- old/kdf-18.04.3/src/kdfsortproxymodel.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/kdfsortproxymodel.h 2018-08-06 22:43:47.000000000 +0200 @@ -28,11 +28,11 @@ Q_OBJECT public: - KDFSortFilterProxyModel(QObject * parent = 0): - QSortFilterProxyModel(parent){}; + explicit KDFSortFilterProxyModel(QObject * parent = nullptr): + QSortFilterProxyModel(parent){} protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const; + bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/kdfwidget.h new/kdf-18.08.0/src/kdfwidget.h --- old/kdf-18.04.3/src/kdfwidget.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/kdfwidget.h 2018-08-06 22:43:47.000000000 +0200 @@ -62,8 +62,8 @@ Q_OBJECT public: - explicit KDFWidget( QWidget *parent=0, bool init=false); - ~KDFWidget( ); + explicit KDFWidget( QWidget *parent=nullptr, bool init=false); + ~KDFWidget( ) override; enum ColumnNumber{ IconCol = 0, @@ -91,8 +91,8 @@ void invokeHelp( void ); protected: - void timerEvent( QTimerEvent * ); - void closeEvent( QCloseEvent * ); + void timerEvent( QTimerEvent * ) override; + void closeEvent( QCloseEvent * ) override; private: void makeColumns( void ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/kwikdisk.cpp new/kdf-18.08.0/src/kwikdisk.cpp --- old/kdf-18.04.3/src/kwikdisk.cpp 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/kwikdisk.cpp 2018-08-06 22:43:47.000000000 +0200 @@ -342,8 +342,6 @@ QCommandLineParser parser; parser.setApplicationDescription(aboutData.shortDescription()); - parser.addHelpOption(); - parser.addVersionOption(); aboutData.setupCommandLine(&parser); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/kwikdisk.h new/kdf-18.08.0/src/kwikdisk.h --- old/kdf-18.04.3/src/kwikdisk.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/kwikdisk.h 2018-08-06 22:43:47.000000000 +0200 @@ -59,7 +59,7 @@ void clearDeviceActions(); private: - void timerEvent(QTimerEvent *); + void timerEvent(QTimerEvent *) override; void enterEvent(QEvent *); void leaveEvent(QEvent *); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/mntconfig.h new/kdf-18.08.0/src/mntconfig.h --- old/kdf-18.04.3/src/mntconfig.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/mntconfig.h 2018-08-06 22:43:47.000000000 +0200 @@ -43,8 +43,8 @@ UmountCommandCol = 4 }; - explicit MntConfigWidget( QWidget *parent=0, bool init=false ); - ~MntConfigWidget(); + explicit MntConfigWidget( QWidget *parent=nullptr, bool init=false ); + ~MntConfigWidget() override; public Q_SLOTS: void loadSettings( void ); @@ -67,7 +67,7 @@ DiskEntry * selectedDisk( QTreeWidgetItem * ); protected: - void closeEvent( QCloseEvent * ); + void closeEvent( QCloseEvent * ) override; private: DiskList mDiskList; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/optiondialog.cpp new/kdf-18.08.0/src/optiondialog.cpp --- old/kdf-18.04.3/src/optiondialog.cpp 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/optiondialog.cpp 2018-08-06 22:43:47.000000000 +0200 @@ -48,12 +48,12 @@ } -COptionDialog::~COptionDialog( void ) +COptionDialog::~COptionDialog() { } -void COptionDialog::slotOk( void ) +void COptionDialog::slotOk() { if( dataChanged ) slotApply(); @@ -61,7 +61,7 @@ } -void COptionDialog::slotApply( void ) +void COptionDialog::slotApply() { mConf->applySettings(); mMnt->applySettings(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/optiondialog.h new/kdf-18.08.0/src/optiondialog.h --- old/kdf-18.04.3/src/optiondialog.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/optiondialog.h 2018-08-06 22:43:47.000000000 +0200 @@ -32,17 +32,17 @@ Q_OBJECT public: - explicit COptionDialog( QWidget *parent=0 ); - ~COptionDialog( void ); + explicit COptionDialog( QWidget *parent=nullptr ); + ~COptionDialog(); protected Q_SLOTS: - void slotOk( void ); - void slotApply( void ); + void slotOk(); + void slotApply(); void slotChanged(); void slotHelp(); Q_SIGNALS: - void valueChanged( void ); + void valueChanged(); private: KDFConfigWidget *mConf; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/stdoption.cpp new/kdf-18.08.0/src/stdoption.cpp --- old/kdf-18.04.3/src/stdoption.cpp 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/stdoption.cpp 2018-08-06 22:43:47.000000000 +0200 @@ -35,18 +35,18 @@ QString CStdOption::mDefaultFileManager = QLatin1String( "dolphin %m" ); int CStdOption::mDefaultUpdateFrequency = 60; -CStdOption::CStdOption( void ) +CStdOption::CStdOption() { setDefault(); } -CStdOption::~CStdOption( void ) +CStdOption::~CStdOption() { } -void CStdOption::updateConfiguration( void ) +void CStdOption::updateConfiguration() { KConfigGroup config(KSharedConfig::openConfig(), "KDFConfig"); mFileManager = config.readPathEntry( @@ -60,7 +60,7 @@ } -void CStdOption::writeConfiguration( void ) +void CStdOption::writeConfiguration() { KConfigGroup config(KSharedConfig::openConfig(), "KDFConfig"); config.writeEntry( "UpdateFrequency", mUpdateFrequency ); @@ -71,7 +71,7 @@ } -void CStdOption::writeDefaultFileManager( void ) +void CStdOption::writeDefaultFileManager() { KConfigGroup config(KSharedConfig::openConfig(), "KDFConfig"); config.writePathEntry( "FileManagerCommand", mDefaultFileManager ); @@ -80,31 +80,31 @@ -QString CStdOption::fileManager( void ) +QString CStdOption::fileManager() const { return( mFileManager ); } -int CStdOption::updateFrequency( void ) +int CStdOption::updateFrequency() const { return( mUpdateFrequency ); } -bool CStdOption::popupIfFull( void ) +bool CStdOption::popupIfFull() const { return( mPopupIfFull ); } -bool CStdOption::openFileManager( void ) +bool CStdOption::openFileManager() const { return( mOpenFileManagerOnMount ); } -void CStdOption::setDefault( void ) +void CStdOption::setDefault() { mFileManager = mDefaultFileManager; mUpdateFrequency = mDefaultUpdateFrequency; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-18.04.3/src/stdoption.h new/kdf-18.08.0/src/stdoption.h --- old/kdf-18.04.3/src/stdoption.h 2018-07-07 11:24:38.000000000 +0200 +++ new/kdf-18.08.0/src/stdoption.h 2018-08-06 22:43:47.000000000 +0200 @@ -35,20 +35,20 @@ class KDFPRIVATE_EXPORT CStdOption { public: - CStdOption( void ); - ~CStdOption( void ); + CStdOption(); + ~CStdOption(); - void updateConfiguration( void ); - void writeConfiguration( void ); - void writeDefaultFileManager( void ); + void updateConfiguration(); + void writeConfiguration(); + void writeDefaultFileManager(); - QString fileManager( void ); + QString fileManager() const; - int updateFrequency( void ); - bool popupIfFull( void ); - bool openFileManager( void ); + int updateFrequency() const; + bool popupIfFull() const; + bool openFileManager() const; - void setDefault( void ); + void setDefault( ); void setFileManager( const QString &fileManager ); void setUpdateFrequency( int frequency ); void setPopupIfFull( bool popupIfFull );
