From b83ddced49ee9c03e50169d528f928c398087560 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 Mar 2019 03:11:37 +0100 Subject: [PATCH 01/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 5d621cb..0e6c003 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -144,6 +144,7 @@

Funcionalidades:

Funcionalidades:

Caracteristici:

+

Возможности:

Funkcie:

Zmožnosti:

Могућности:

From f6e22288b9cd5dd792f771abfabb4cc7f74364ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 10 Mar 2019 22:29:30 +0000 Subject: [PATCH 02/78] Require Frameworks 5.56 as this is what KPMcore needs anyway. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ee8d7b..7e76b65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) # Dependencies set(QT_MIN_VERSION "5.10.0") -set(KF5_MIN_VERSION "5.31") +set(KF5_MIN_VERSION "5.56") set(KPMCORE_MIN_VERSION "3.80.0") set(CMAKE_USE_RELATIVE_PATHS OFF) From 8476f707ab54dc2d0ead3755554e626fed21b700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 16 Apr 2019 20:22:50 +0100 Subject: [PATCH 03/78] Bump version to 4.0 in preparation for future release. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e76b65..131f52a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,15 +21,15 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) # Dependencies set(QT_MIN_VERSION "5.10.0") set(KF5_MIN_VERSION "5.56") -set(KPMCORE_MIN_VERSION "3.80.0") +set(KPMCORE_MIN_VERSION "4.0.0") set(CMAKE_USE_RELATIVE_PATHS OFF) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install mkspecs files, Plugins and Imports to the Qt 5 install dir" FORCE) # Check KPMcore dependency when bumping -set(VERSION_MAJOR "3") -set(VERSION_MINOR "80") +set(VERSION_MAJOR "4") +set(VERSION_MINOR "0") set(VERSION_RELEASE "0") set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) add_definitions(-D'VERSION="${VERSION}"') #" From bfd12a1ba135d4eda37e52887262d34fc19a9d64 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Apr 2019 03:19:13 +0200 Subject: [PATCH 04/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 0e6c003..51e57d4 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -30,6 +30,7 @@ Gestor de Partições do KDE Gerenciador de Partições do KDE Gestionarul de partiții KDE + Диспетчер разделов от KDE KDE Správca partícií Upravljalnik razdelkov za KDE КДЕ‑ов менаџер партиција @@ -69,6 +70,7 @@ Editor de Partições Editor de Partições Redactor de partiții + Редактор разделов Editor partícií Urejevalnik razdelkov Уређивач партиција @@ -105,6 +107,7 @@

Zarządzanie partycjami KDE jest programem użytkowym mającym na celu pomoc przy zarządzaniu urządzeniami dyskowymi, partycjami i systemami plików na twoim komputerze. Umożliwia łatwe tworzenie, kopiowanie, przenoszenie, usuwanie i zamianę rozmiaru bez utraty danych, a także tworzenie i przywracanie kopii zapasowych partycji.

O Gestor de Partições do KDE é um utilitário que o ajuda a gerir os dispositivos dos discos, as suas partições e sistemas de ficheiros no seu computador. Permite-lhe facilmente criar, copiar, mover, apagar, dimensionar sem perder dados, salvaguardar e repor partições.

O Gerenciador de Partições do KDE é um utilitário que o ajuda a gerenciar os dispositivos de disco, suas partições e sistemas de arquivos no seu computador. Permite-lhe facilmente criar, copiar, mover, excluir, redimensionar sem perder dados, criar backup e restaurar partições.

+

Диспетчер разделов от KDE — утилита, позволяющая без лишних сложностей управлять дисковыми устройствами, разделами и файловыми системами на компьютере. Она способна создавать, копировать, перемещать, удалять разделы, менять их размеры без потери данных, создавать резервные копии разделов и восстанавливать из них.

KDE správca partícií je nástroj, ktorý vám má pomôcť spravovať diskové zariadenia, partície a súborové systémy na vašom počítači. Umožňuje vám jednoducho vytvoriť, kopírovať, presúvať, mazať a meniť veľkosť bez straty dám, zálohovať a obnovovať partície.

Upravljalnik razdelkov za KDE je pripomoček, ki vam omogoča upravljanje z diski, razdelki in datotečnimi sistemi na vašem računalniku. Z njim lahko enostavno ustvarite, kopirate, premaknete, izbrišete, varnostno kopirate in obnovite ter spreminjate velikost razdelkov brez izgube podatkov.

КДЕ‑ов менаџер партиција је алатка за управљање дисковима, партицијама и фајл системима на рачунару. Омогућава лако стварање, копирање, премештање и брисање партиција, промену величине без губитка података, прављење и враћање резерва партиција.

@@ -181,6 +184,7 @@
  • Obsługa wielu systemów plików, uwzględniając przy tym ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS i więcej
  • Suporta um grande conjunto de sistemas de ficheiros, incluindo o ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS entre outros
  • Suporte a um grande conjunto de sistemas de arquivos, incluindo o ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS, entre outros
    • +
  • Поддержка большого числа файловых систем, в том числе ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS и других.
  • Podporuje veľký počet súborových systémov, vrátane ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS a viac
  • Podpira številne datotečne sisteme vključno z ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS in XFS
  • Подржава велики број фајл система, укључујући екст‑2/3/4, бтрфс, рајзер, НТФС, ФАТ‑16/32, ЈФС, ИксФС, и друге.
    • @@ -216,6 +220,7 @@
  • Wykorzystywanie już dostępnych programów zewnętrznych do wykonywania swojej pracy
  • Tira partido dos programas externos já existentes para terminar a sua tarefa
  • Utiliza os programas externos já existentes para terminar a sua tarefa
    • +
  • Полагается на доступные внешние программы для выполнения задач.
  • Používa už existujúce dostupné externé programy na vykonanie svojej práce
  • Za izvedbo poslov uporablja že obstoječe zunanje programe
  • Користи разне већ постојеће спољашње програма да обави посао.
    • From 0403d5cf4ad718f4ea66185a1343f5bcb41a7496 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Apr 2019 06:06:30 +0200 Subject: [PATCH 05/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index 83b2929..a28bbba 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -37,7 +37,7 @@ Name[pl]=Zarządzanie partycjami Name[pt]=Gestor de Partições do KDE Name[pt_BR]=Gerenciador de partições do KDE Name[ro]=Gestionarul de partiții KDE -Name[ru]=Диспетчер разделов для KDE +Name[ru]=Диспетчер разделов от KDE Name[sk]=KDE Správca partícií Name[sl]=Upravljalnik razdelkov za KDE Name[sr]=КДЕ‑ов менаџер партиција @@ -181,6 +181,7 @@ Keywords[nn]=partisjon;disk; Keywords[pl]=partycja;dysk; Keywords[pt]=partição;disco; Keywords[pt_BR]=partição;disco; +Keywords[ru]=раздел;диск; Keywords[sl]=razdelek;particija;disk; Keywords[sr]=partition;disk;партиција;диск; Keywords[sr@ijekavian]=partition;disk;партиција;диск; From a5652e604eeda2912b3ad7021c1b1c6133d19041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 1 May 2019 00:35:15 +0100 Subject: [PATCH 06/78] Update copyright year in about dialog. --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 02f8c26..9308d5b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -47,7 +47,7 @@ int Q_DECL_IMPORT main(int argc, char* argv[]) QStringLiteral(VERSION), xi18nc("@title", "Manage your disks, partitions and file systems"), KAboutLicense::GPL_V3, - xi18nc("@info:credit", "© 2008-2013 Volker Lanz\n© 2012-2018 Andrius Štikonas")); + xi18nc("@info:credit", "© 2008-2013 Volker Lanz\n© 2012-2019 Andrius Štikonas")); aboutData.setOrganizationDomain(QByteArray("kde.org")); aboutData.setProductName(QByteArray("partitionmanager")); From 7297efe2da7e56b01c936207f59a2e17e4c1ff40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 2 May 2019 22:39:23 +0100 Subject: [PATCH 07/78] Sort dependencies in CMakeLists alphabetically. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 131f52a..d826fcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,8 +65,8 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED IconThemes JobWidgets KIO - XmlGui WidgetsAddons + XmlGui OPTIONAL_COMPONENTS DocTools ) From a558641bf6dacefa2ffdd26a91ee00aebe68006a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 3 May 2019 05:51:44 +0200 Subject: [PATCH 08/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index a28bbba..011c95d 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -182,6 +182,7 @@ Keywords[pl]=partycja;dysk; Keywords[pt]=partição;disco; Keywords[pt_BR]=partição;disco; Keywords[ru]=раздел;диск; +Keywords[sk]=partícia;disk; Keywords[sl]=razdelek;particija;disk; Keywords[sr]=partition;disk;партиција;диск; Keywords[sr@ijekavian]=partition;disk;партиција;диск; From 7c8e8f18e5be8667172a5889fed5bf687d238322 Mon Sep 17 00:00:00 2001 From: Shubham Jangra Date: Sat, 8 Jun 2019 01:04:22 +0530 Subject: [PATCH 09/78] Add Minix Filesystem Summary: {F6878459} Reviewers: #kde_partition_manager, stikonas, cjlcarvalho Reviewed By: #kde_partition_manager, stikonas, cjlcarvalho Subscribers: #kde_partition_manager Tags: #kde_partition_manager Differential Revision: https://phabricator.kde.org/D21653 --- src/config/configurepagefilesystemcolors.ui | 1319 ++++++++++--------- src/partitionmanager.kcfg | 12 +- 2 files changed, 678 insertions(+), 653 deletions(-) diff --git a/src/config/configurepagefilesystemcolors.ui b/src/config/configurepagefilesystemcolors.ui index 3a9987f..aa8d047 100644 --- a/src/config/configurepagefilesystemcolors.ui +++ b/src/config/configurepagefilesystemcolors.ui @@ -7,7 +7,7 @@ 0 0 484 - 464 + 528 @@ -23,10 +23,13 @@ File Systems - - + + + + + - HFS: + ReiserFS: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -36,17 +39,11 @@ - - + + - - - - - - - - + + Qt::Horizontal @@ -71,170 +68,6 @@ - - - - HPFS: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - - - Qt::Horizontal - - - - 43 - 17 - - - - - - - - ReiserFS: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - JFS: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - - - - - - - - - ext2: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - - - Qt::Horizontal - - - - 43 - 17 - - - - - - - - - - - F2FS: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - Linux RAID: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - ext4: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Qt::Horizontal - - - - 28 - 17 - - - - @@ -248,324 +81,11 @@ - - - - Qt::Horizontal - - - - 28 - 17 - - - - - - - - - - - - - - Qt::Horizontal - - - - 43 - 17 - - - - - - - - - - - Qt::Horizontal - - - - 37 - 18 - - - - - - - - - - - Qt::Horizontal - - - - 43 - 17 - - - - - - - - Qt::Horizontal - - - - 28 - 17 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - exFAT: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - ext3: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - BitLocker: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - Qt::Horizontal - - - - 43 - 17 - - - - - - - - Qt::Horizontal - - - - 21 - 21 - - - - - - - - HFS+: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - Qt::Horizontal - - - - 43 - 17 - - - - - - - - - - - LUKS: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - XFS: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - - - UDF: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 28 - 17 - - - - - - - - NTFS: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - unknown: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - - - APFS: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - Qt::Horizontal - - - - 43 - 17 - - - - - - - - NILFS2: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + @@ -580,14 +100,66 @@ - - + + - - + + + + XFS: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + - - + + + + + + + + + + NILFS2: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 28 + 17 + + + + + + Qt::Horizontal @@ -599,6 +171,241 @@ + + + + FAT16: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + extended: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + LUKS2: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + + unformatted: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + + + + + UDF: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + ZFS: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 28 + 17 + + + + + + + + Qt::Horizontal + + + + 43 + 17 + + + + + + + + ext4: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + + HPFS: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + + Qt::Horizontal + + + + 37 + 18 + + + + + + + + Qt::Horizontal + + + + 43 + 17 + + + + + + + + Qt::Horizontal + + + + 43 + 17 + + + + + + + + + + + JFS: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + ext3: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + Qt::Horizontal + + + + 28 + 17 + + + + @@ -612,10 +419,29 @@ - - + + + + + + + + + + Qt::Horizontal + + + + 43 + 17 + + + + + + - unformatted: + Btrfs: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -625,6 +451,73 @@ + + + + + + + Qt::Horizontal + + + + 28 + 17 + + + + + + + + Qt::Horizontal + + + + 43 + 17 + + + + + + + + ext2: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + + + + + F2FS: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + @@ -638,14 +531,124 @@ - - + + + + Qt::Horizontal + + + + 43 + 17 + + + - - + + + + exFAT: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + - - + + + + + + + NTFS: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + Qt::Horizontal + + + + 28 + 17 + + + + + + + + LUKS: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Linux Swap: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + Qt::Horizontal + + + + 43 + 17 + + + + + + + + + + + + + + + @@ -673,10 +676,10 @@ - - + + - extended: + HFS: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -686,141 +689,8 @@ - - - - LUKS2: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - Linux Swap: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - - - ZFS: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - - - Qt::Horizontal - - - - 28 - 17 - - - - - - - - - - - Qt::Horizontal - - - - 43 - 17 - - - - - - - - FAT32: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - - - Qt::Horizontal - - - - 28 - 17 - - - - - - - - FAT16: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - Qt::Horizontal - - - - - - - Btrfs: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - + + @@ -835,8 +705,161 @@ - - + + + + + + + APFS: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + FAT32: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + + + + + Qt::Horizontal + + + + 43 + 17 + + + + + + + + Linux RAID: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + BitLocker: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + Qt::Horizontal + + + + 21 + 21 + + + + + + + + + + + HFS+: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + Qt::Horizontal + + + + 28 + 17 + + + + + + + + unknown: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + Minix: + + + + + + + Qt::Horizontal + + + + 43 + 17 + + + + + + + + Qt::Horizontal + + diff --git a/src/partitionmanager.kcfg b/src/partitionmanager.kcfg index be98304..2d48ef3 100644 --- a/src/partitionmanager.kcfg +++ b/src/partitionmanager.kcfg @@ -89,9 +89,10 @@ Iso9660 Luks2 Fat12 - LinuxRaidMember - BitLocker - Apfs + LinuxRaidMember + BitLocker + Apfs + Minix 220,205,175 @@ -125,8 +126,9 @@ 223,39,104 204,179,255 255,100,100 - 110,20,50 - 255,155,174 + 110,20,50 + 255,155,174 + 0,170,255 From eca2be8f0ec784f883293c4ffd3242a50868af3a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Aug 2019 02:57:27 +0200 Subject: [PATCH 10/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 51e57d4..a93dc8d 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -16,6 +16,7 @@ KDE Partition Manager Gestor de particiones de KDE KDE partitsioonide haldur + KDE Partizio Kudeatzailea KDE:n osionhallinta Gestionnaire de partitions de KDE Xestor de particións de KDE @@ -56,6 +57,7 @@ Partition Editor Editor de particiones Partitsiooniredaktor + Partizio editorea Osionhallinta Éditeur de partitions Editor de particións @@ -95,6 +97,7 @@

    KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.

    El gestor de particiones de KDE es una utilidad que le ayuda a gestionar los dispositivos de disco duro, las particiones y el sistema de archivos de su equipo. Le permite crear, copiar, mover, borrar, cambiar el tamaño sin perder datos, hacer copia de seguridad y restaurar particiones.

    KDE partitsioonide haldur on tööriist, mis aitab hallata kettaseadmeid, partitsioone ja failisüsteeme sinu arvutis. See võimaldab vähese vaevaga partitsioone luua, kopeerida, liigutada, kustutada, muuta suurust andmeid kaotamata, varundada ja taastada.

    +

    KDE Partizio Kudeatzailea zure ordenagailuko disko-gailuak, partizioak eta fitxategi-sistemak kudeatzen laguntzeko baliagarritasun programa bat da. Era errazean partizioak sortu, kopiatu, mugitu, ezabatu, daturik galdu gabe neurria aldatu, babes-kopia egin eta lehengoratzen uzten dizu.

    KDE:n osionhallinta on apuohjelma, joka auttaa hallitsemaan tietokoneen levyjä, osioita ja tiedostojärjestelmiä. Sillä voi luoda, kopioida, siirtää, poistaa, muuttaa kokoa menettämättä tietoja, varmuuskopioida ja palauttaa osioita.

    Le gestionnaire de partitions de KDE est un utilitaire qui vous aide à gérer les disques, partitions et systèmes de fichiers de votre ordinateur. Il vous permet de créer, copier, déplacer, supprimer, redimensionner sans perte, sauvegarder et rétablir des partitions facilement.

    O xestor de particións de KDE é unha ferramenta que lle permite xestionar os seus dispositivos de almacenamento, as particións e os sistemas de ficheiros do seu computador. A ferramenta permite crear, copiar, mover, eliminar, cambiar de tamaño sen perder datos, facer copias de seguranza e restaurar particións, todo de maneira sinxela.

    @@ -133,6 +136,7 @@

    Features:

    Funciones:

    Omadused:

    +

    Eginbideak:

    Ominaisuudet:

    Fonctionnalités :

    Funcionalidades:

    @@ -172,6 +176,7 @@
  • Supports a large number of file systems, including Ext2/3/4, Btrfs, ReiserFS, NTFS, FAT16/32, JFS, XFS and more
  • Permite un gran número de sistemas de archivos, como ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS y XFS, entre otros
  • Paljude failisüsteemide toetus, sealhulgas ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS ja veel paljud
    • +
  • Fitxategi-sistema kopuru handirako euskarria dauka, tartean ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS eta gehiago
  • Tukee monia tiedostojärjestelmiä kuten ext2/3/4, Btrfs, ReiserFS, NTFS, FAT16/32, JFS, XFS ja muita
  • Prend en charge un grand nombre de systèmes de fichiers, notamment ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS et d'autres
  • Compatíbel cun gran número de sistemas de ficheiros, entre eles ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS, e máis.
    • @@ -208,6 +213,7 @@
  • Makes use of already available external programs to get its job done
  • Utiliza varios programas externos que deben estar disponibles para realizar el trabajo
  • Saadaolevate väliste programmide kasutamine vajalike tegevuste sooritamiseks
    • +
  • Bere lana burutzeko dagoeneko erabilgarri dauden kanpoko programak erabiltzen ditu
  • Hoitaa hommansa hyödyntäen valmiita ulkoisia ohjelmia
  • Utilise des programmes externes existants pour faire le travail
  • Usa programas externos para realizar as tarefas.
    • From 36a38057fa663a97834ebd70fa128a52166b31c2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Aug 2019 05:20:27 +0200 Subject: [PATCH 11/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index 011c95d..9c0db76 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -14,6 +14,7 @@ Name[el]=Διαχειριστής κατατμήσεων του KDE Name[en_GB]=KDE Partition Manager Name[es]=Gestor de particiones de KDE Name[et]=KDE partitsioonihaldur +Name[eu]=KDE Partizio Kudeatzailea Name[fi]=KDE:n osionhallinta Name[fr]=Gestionnaire de partitions de KDE Name[ga]=Bainisteoir Deighiltí KDE @@ -66,6 +67,7 @@ GenericName[el]=Διαχειριστής κατατμήσεων GenericName[en_GB]=Partition Editor GenericName[es]=Editor de particiones GenericName[et]=Partitsioonihaldur +GenericName[eu]=Partizio editorea GenericName[fi]=Osionhallinta GenericName[fr]=Éditeur de partitions GenericName[ga]=Eagarthóir Deighiltí @@ -117,6 +119,7 @@ Comment[el]=Διαχείριση δίσκων, κατατμήσεων και σ Comment[en_GB]=Manage disks, partitions and file systems Comment[es]=Gestionar discos, particiones y sistemas de archivos Comment[et]=Ketaste, partitsioonide ja failisüsteemide haldamine +Comment[eu]=kudeatu diskoak, partizioak eta fitxategi-sistemak Comment[fi]=Hallitse levyjä, osioita ja tiedostojärjestelmiä Comment[fr]=Gère les disques, partitions et systèmes de fichiers Comment[ga]=Bainistigh dioscaí, deighiltí agus córais comhad @@ -169,6 +172,7 @@ Keywords[de]=partition;disk;festplatte Keywords[el]=κατάτμηση;δίσκος; Keywords[en_GB]=partition;disk; Keywords[es]=partición;disco; +Keywords[eu]=partizioa;diskoa; Keywords[fi]=osio;levy; Keywords[fr]=partition;disque; Keywords[gl]=partition;disk;partición;disco; From a8cc4a448db0b5b56dc5f943eb4b82f29c0ff2bf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 Sep 2019 02:45:08 +0200 Subject: [PATCH 12/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index a93dc8d..f304df1 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -102,7 +102,7 @@

    Le gestionnaire de partitions de KDE est un utilitaire qui vous aide à gérer les disques, partitions et systèmes de fichiers de votre ordinateur. Il vous permet de créer, copier, déplacer, supprimer, redimensionner sans perte, sauvegarder et rétablir des partitions facilement.

    O xestor de particións de KDE é unha ferramenta que lle permite xestionar os seus dispositivos de almacenamento, as particións e os sistemas de ficheiros do seu computador. A ferramenta permite crear, copiar, mover, eliminar, cambiar de tamaño sen perder datos, facer copias de seguranza e restaurar particións, todo de maneira sinxela.

    A KDE partíciókezelő egy segédprogram, mely segít Önnek lemezek, partíciók és fájlrendszerek kezelésében. Lehetővé teszi partíciók létrehozását, másolását, mozgatását, törlését, adatvesztés nélküli átméretezését, biztonsági mentését és visszaállítását.

    -

    KDE Partition Manager adalah sebuah program utilitas untuk membantu Anda mengelola perangkat disk, partisi dan sistem file di komputer Anda. Hal ini memungkinkan Anda untuk mudah menciptakan, menyalin, memindah, menghapus, mengubah-ukuran tanpa kehilangan data, mencadang dan memulihkan partisi.

    +

    KDE Partition Manager adalah sebuah program utilitas untuk membantu Anda mengelola perangkat disk, partisi dan sistem file di komputer Anda. Hal ini memungkinkan Anda untuk mudah menciptakan, menyalin, memindah, menghapus, mengubah-ukuran tanpa kehilangan data, mencadang dan mengembalikan partisi.

    Il gestore delle partizioni di KDE è un programma che ti aiuta a gestire i dischi, le partizioni e i filesystem sul tuo computer. Ti consente di creare, copiare, spostare, eliminare, ridimensionare senza perdere dati, effettuare copie di sicurezza e ripristinare partizioni con grande semplicità.

    KDE 파티션 관리자는 컴퓨터의 디스크 장치, 파티션, 파일 시스템을 관리하는 도구입니다. 파티션 작업, 무손실 크기 조정, 백업과 복원이 가능합니다.

    KDE Skaidinių tvarkyklė yra programa padedanti tvarkyti jūsų kompiuterio diskų įrenginius, skaidinius ir failų sistemas. Ji leidžia lengvai kurti, kopijuoti, perkelti, trinti ir keisti dydį neprarandant duomenų, kurti atsargines skaidinių kopijas.

    From a0ce2ecbbe40d8b87e65b0847863879f5d601381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caio=20Jord=C3=A3o=20Carvalho?= Date: Wed, 18 Sep 2019 00:03:19 +0000 Subject: [PATCH 13/78] Including credits to Caio in aboutData --- src/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 9308d5b..c1712ba 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,9 +56,11 @@ int Q_DECL_IMPORT main(int argc, char* argv[]) aboutData.addCredit(xi18nc("@info:credit", "Teo Mrnjavac"), i18nc("@info:credit", "Former Calamares maintainer"), QStringLiteral("teo@kde.org")); aboutData.addCredit(xi18nc("@info:credit", "Chantara Tith"), i18nc("@info:credit", "LVM support"), QStringLiteral("tith.chantara@gmail.com")); aboutData.addCredit(xi18nc("@info:credit", "Pali Rohár"), i18nc("@info:credit", "UDF support"), QStringLiteral("pali.rohar@gmail.com")); + aboutData.addCredit(i18n("Hugo Pereira Da Costa"), xi18nc("@info:credit", "Partition Widget Design"), QStringLiteral("hugo@oxygen-icons.org")); + aboutData.addCredit(xi18nc("@info:credit", "Caio Jordão Carvalho"), i18nc("@info:credit", "Improved SMART support"), QStringLiteral("caiojcarvalho@gmail.com")); + aboutData.setHomepage(QStringLiteral("https://www.kde.org/applications/system/kdepartitionmanager")); - aboutData.addCredit(i18n("Hugo Pereira Da Costa"), xi18nc("@info:credit", "Partition Widget Design"), QStringLiteral("hugo@oxygen-icons.org")); KAboutData::setApplicationData(aboutData); app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); KCrash::initialize(); From 68d8c34535cbbeb31a6488b6616c4ad284e0bc20 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Fri, 27 Sep 2019 14:23:59 -0600 Subject: [PATCH 14/78] Use non-pixmap colorful icons from the icon theme in settings window's sidebar Summary: This patch changes the icons in the settings' window's sidebar to be all colorful, in conformance with T10165 specifically, and the new #consistency goal more generally. It also cleans up the code a tiny bit by using built-in constructor functionality to set icons from the icon theme rather than leaving the icon blank in the constructor and then setting it later. Test Plan: Before: {F7449955} After: {F7449956} Reviewers: #vdg, #kde_partition_manager, stikonas, ndavis Reviewed By: #vdg, #kde_partition_manager, stikonas, ndavis Maniphest Tasks: T10165 Differential Revision: https://phabricator.kde.org/D24272 --- src/config/configureoptionsdialog.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/config/configureoptionsdialog.cpp b/src/config/configureoptionsdialog.cpp index ddc4f6b..6c31f74 100644 --- a/src/config/configureoptionsdialog.cpp +++ b/src/config/configureoptionsdialog.cpp @@ -51,19 +51,14 @@ ConfigureOptionsDialog::ConfigureOptionsDialog(QWidget* parent, const OperationS { setFaceType(List); - KPageWidgetItem* item = nullptr; - - item = addPage(&generalPageWidget(), xi18nc("@title:tab general application settings", "General"), QString(), i18n("General Settings")); - item->setIcon(QIcon::fromTheme(QStringLiteral("partitionmanager")).pixmap(IconSize(KIconLoader::Desktop))); + addPage(&generalPageWidget(), xi18nc("@title:tab general application settings", "General"), QStringLiteral("partitionmanager"), i18n("General Settings")); connect(&generalPageWidget().comboDefaultFileSystem(), qOverload(&QComboBox::activated), this, &ConfigureOptionsDialog::onComboDefaultFileSystemActivated); connect(generalPageWidget().radioButton, &QRadioButton::toggled, this, &ConfigureOptionsDialog::onShredSourceActivated); - item = addPage(&fileSystemColorsPageWidget(), xi18nc("@title:tab", "File System Colors"), QString(), i18n("File System Color Settings")); - item->setIcon(QIcon::fromTheme(QStringLiteral("format-fill-color")).pixmap(IconSize(KIconLoader::Desktop))); + addPage(&fileSystemColorsPageWidget(), xi18nc("@title:tab", "File System Colors"), QStringLiteral("preferences-desktop-color"), i18n("File System Color Settings")); - item = addPage(&advancedPageWidget(), xi18nc("@title:tab advanced application settings", "Advanced"), QString(), i18n("Advanced Settings")); - item->setIcon(QIcon::fromTheme(QStringLiteral("configure")).pixmap(IconSize(KIconLoader::Desktop))); + addPage(&advancedPageWidget(), xi18nc("@title:tab advanced application settings", "Advanced"), QStringLiteral("preferences-other"), i18n("Advanced Settings")); connect(&advancedPageWidget().comboBackend(), qOverload(&QComboBox::activated), this, &ConfigureOptionsDialog::onComboDefaultFileSystemActivated); From dd0df390dad3abb11828640005dce687014f0ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Fri, 27 Sep 2019 23:09:05 +0100 Subject: [PATCH 15/78] Port away from deprecated QTreeWidget::setFirstItemColumnSpanned. --- src/gui/partitionmanagerwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp index 4bdb11d..7c6252e 100644 --- a/src/gui/partitionmanagerwidget.cpp +++ b/src/gui/partitionmanagerwidget.cpp @@ -279,7 +279,7 @@ void PartitionManagerWidget::updatePartitions() } } - treePartitions().setFirstItemColumnSpanned(deviceItem, true); + deviceItem->setFirstColumnSpanned(true); deviceItem->setExpanded(true); deviceItem->setFlags(Qt::ItemIsEnabled); From 910de2a772a3dceb834091a687d4e977b89387e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 5 Oct 2019 11:21:14 +0100 Subject: [PATCH 16/78] Merge partition manager toolbars into one. BUG: 412376 --- src/gui/partitionmanagerui.rc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/gui/partitionmanagerui.rc b/src/gui/partitionmanagerui.rc index dc6c8bc..7984102 100644 --- a/src/gui/partitionmanagerui.rc +++ b/src/gui/partitionmanagerui.rc @@ -1,21 +1,13 @@ - - Edit Toolbar + + Partition Manager Toolbar - - - - Partition Toolbar - - - - Device Toolbar From 6ab0d56bbcc8316a66c6fb8abe2f63500413825e Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 25 Nov 2019 22:31:17 +0200 Subject: [PATCH 17/78] Fix link: ui.html -> menus.html --- doc/referencemanual.docbook | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/referencemanual.docbook b/doc/referencemanual.docbook index d2da79d..64f6142 100644 --- a/doc/referencemanual.docbook +++ b/doc/referencemanual.docbook @@ -510,8 +510,8 @@ The Settings and Help Menu - &partman; has the common &kde; Settings and - Help menu described in + &partman; has the common &kde; Settings and + Help menu described in the &kde; Fundamentals with an additional submenu Panels Shown, where you can toggle the display of the Devices, Pending Operations, Information From 551b53ea9cd97543393e74f7e01b688935a37e15 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 8 Dec 2019 05:22:17 +0100 Subject: [PATCH 18/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index 9c0db76..3ed569f 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -172,6 +172,7 @@ Keywords[de]=partition;disk;festplatte Keywords[el]=κατάτμηση;δίσκος; Keywords[en_GB]=partition;disk; Keywords[es]=partición;disco; +Keywords[et]=partitsioon;ketas; Keywords[eu]=partizioa;diskoa; Keywords[fi]=osio;levy; Keywords[fr]=partition;disque; From dcc665cc2776acf0f42a0bf6a03bd741ed555b0a Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 9 Dec 2019 18:33:04 +0200 Subject: [PATCH 19/78] Fix minor EBN issues --- src/config/advancedpagewidget.h | 2 +- src/config/filesystemcolorspagewidget.h | 2 +- src/config/generalpagewidget.h | 2 +- src/gui/applyprogressdetailswidget.h | 2 +- src/gui/applyprogressdialogwidget.h | 2 +- src/gui/createpartitiontablewidget.h | 2 +- src/gui/createvolumegroupdialog.cpp | 2 +- src/gui/devicepropswidget.h | 2 +- src/gui/filesystemsupportdialog.h | 2 +- src/gui/filesystemsupportdialogwidget.h | 2 +- src/gui/formattedspinbox.h | 2 +- src/gui/infopane.h | 2 +- src/gui/listdevices.h | 2 +- src/gui/listoperations.h | 2 +- src/gui/listphysicalvolumes.h | 2 +- src/gui/partitionmanagerwidget.h | 2 +- src/gui/partpropswidget.h | 2 +- src/gui/parttablewidget.h | 2 +- src/gui/resizevolumegroupdialog.cpp | 2 +- src/gui/scanprogressdialog.h | 2 +- src/gui/sizedetailswidget.h | 2 +- src/gui/smartdialogwidget.h | 2 +- src/gui/treelog.h | 2 +- src/gui/volumegroupwidget.h | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/config/advancedpagewidget.h b/src/config/advancedpagewidget.h index 621efa0..1dfe490 100644 --- a/src/config/advancedpagewidget.h +++ b/src/config/advancedpagewidget.h @@ -32,7 +32,7 @@ class QComboBox; class AdvancedPageWidget : public QWidget, public Ui::ConfigurePageAdvanced { public: - AdvancedPageWidget(QWidget* parent); + explicit AdvancedPageWidget(QWidget* parent); public: QComboBox& comboBackend() { diff --git a/src/config/filesystemcolorspagewidget.h b/src/config/filesystemcolorspagewidget.h index fd23c92..2db752e 100644 --- a/src/config/filesystemcolorspagewidget.h +++ b/src/config/filesystemcolorspagewidget.h @@ -26,7 +26,7 @@ class FileSystemColorsPageWidget : public QWidget, public Ui::ConfigurePageFileSystemColors { public: - FileSystemColorsPageWidget(QWidget* parent); + explicit FileSystemColorsPageWidget(QWidget* parent); }; #endif diff --git a/src/config/generalpagewidget.h b/src/config/generalpagewidget.h index 52de33e..89c59af 100644 --- a/src/config/generalpagewidget.h +++ b/src/config/generalpagewidget.h @@ -31,7 +31,7 @@ class QString; class GeneralPageWidget : public QWidget, public Ui::ConfigurePageGeneral { public: - GeneralPageWidget(QWidget* parent); + explicit GeneralPageWidget(QWidget* parent); public: QComboBox& comboDefaultFileSystem() { diff --git a/src/gui/applyprogressdetailswidget.h b/src/gui/applyprogressdetailswidget.h index d1a8f70..68b34b2 100644 --- a/src/gui/applyprogressdetailswidget.h +++ b/src/gui/applyprogressdetailswidget.h @@ -27,7 +27,7 @@ class ApplyProgressDetailsWidget : public QWidget, public Ui::ApplyProgressDetailsWidgetBase { public: - ApplyProgressDetailsWidget(QWidget* parent) : QWidget(parent) { + explicit ApplyProgressDetailsWidget(QWidget* parent) : QWidget(parent) { setupUi(this); } diff --git a/src/gui/applyprogressdialogwidget.h b/src/gui/applyprogressdialogwidget.h index 9961f34..170ecb6 100644 --- a/src/gui/applyprogressdialogwidget.h +++ b/src/gui/applyprogressdialogwidget.h @@ -27,7 +27,7 @@ class ApplyProgressDialogWidget : public QWidget, public Ui::ApplyProgressDialogWidgetBase { public: - ApplyProgressDialogWidget(QWidget* parent); + explicit ApplyProgressDialogWidget(QWidget* parent); public: QTreeWidget& treeTasks() { diff --git a/src/gui/createpartitiontablewidget.h b/src/gui/createpartitiontablewidget.h index 6ff0973..f637c30 100644 --- a/src/gui/createpartitiontablewidget.h +++ b/src/gui/createpartitiontablewidget.h @@ -28,7 +28,7 @@ class CreatePartitionTableWidget : public QWidget, public Ui::CreatePartitionTableWidgetBase { public: - CreatePartitionTableWidget(QWidget* parent); + explicit CreatePartitionTableWidget(QWidget* parent); public: QRadioButton& radioMSDOS() { diff --git a/src/gui/createvolumegroupdialog.cpp b/src/gui/createvolumegroupdialog.cpp index b4c0ed2..602e9c0 100644 --- a/src/gui/createvolumegroupdialog.cpp +++ b/src/gui/createvolumegroupdialog.cpp @@ -71,7 +71,7 @@ void CreateVolumeGroupDialog::setupDialog() if (toBeDeleted) continue; - if (!p.isLuks() && p.vgName() == QString() && !LvmDevice::s_DirtyPVs.contains(p.partition())) + if (!p.isLuks() && p.vgName().isEmpty() && !LvmDevice::s_DirtyPVs.contains(p.partition())) dialogWidget().listPV().addPartition(*p.partition(), false); } diff --git a/src/gui/devicepropswidget.h b/src/gui/devicepropswidget.h index 5dc8f44..e29baa8 100644 --- a/src/gui/devicepropswidget.h +++ b/src/gui/devicepropswidget.h @@ -29,7 +29,7 @@ class PartTableWidget; class DevicePropsWidget : public QWidget, public Ui::DevicePropsWidgetBase { public: - DevicePropsWidget(QWidget* parent); + explicit DevicePropsWidget(QWidget* parent); public: PartTableWidget& partTableWidget() { diff --git a/src/gui/filesystemsupportdialog.h b/src/gui/filesystemsupportdialog.h index 8a6c0fd..e93601f 100644 --- a/src/gui/filesystemsupportdialog.h +++ b/src/gui/filesystemsupportdialog.h @@ -38,7 +38,7 @@ class FileSystemSupportDialog : public QDialog Q_DISABLE_COPY(FileSystemSupportDialog) public: - FileSystemSupportDialog(QWidget* parent); + explicit FileSystemSupportDialog(QWidget* parent); ~FileSystemSupportDialog(); public: diff --git a/src/gui/filesystemsupportdialogwidget.h b/src/gui/filesystemsupportdialogwidget.h index 302776d..23739f2 100644 --- a/src/gui/filesystemsupportdialogwidget.h +++ b/src/gui/filesystemsupportdialogwidget.h @@ -24,7 +24,7 @@ class FileSystemSupportDialogWidget : public QWidget, public Ui::FileSystemSupportDialogWidgetBase { public: - FileSystemSupportDialogWidget(QWidget* parent); + explicit FileSystemSupportDialogWidget(QWidget* parent); public: QTreeWidget& tree() { diff --git a/src/gui/formattedspinbox.h b/src/gui/formattedspinbox.h index c8996e9..2c34dea 100644 --- a/src/gui/formattedspinbox.h +++ b/src/gui/formattedspinbox.h @@ -24,7 +24,7 @@ class FormattedSpinBox : public QDoubleSpinBox { public: - FormattedSpinBox(QWidget* parent = nullptr) : QDoubleSpinBox(parent) {} + explicit FormattedSpinBox(QWidget* parent = nullptr) : QDoubleSpinBox(parent) {} public: QString textFromValue(double value) const override; diff --git a/src/gui/infopane.h b/src/gui/infopane.h index c6101a6..b582755 100644 --- a/src/gui/infopane.h +++ b/src/gui/infopane.h @@ -39,7 +39,7 @@ class InfoPane : public QWidget Q_DISABLE_COPY(InfoPane) public: - InfoPane(QWidget* parent = nullptr); + explicit InfoPane(QWidget* parent = nullptr); public: void showPartition(Qt::DockWidgetArea area, const Partition& p); diff --git a/src/gui/listdevices.h b/src/gui/listdevices.h index 6aee317..7b444fc 100644 --- a/src/gui/listdevices.h +++ b/src/gui/listdevices.h @@ -38,7 +38,7 @@ class ListDevices : public QWidget, public Ui::ListDevicesBase Q_DISABLE_COPY(ListDevices) public: - ListDevices(QWidget* parent = nullptr); + explicit ListDevices(QWidget* parent = nullptr); Q_SIGNALS: void selectionChanged(const QString& device_node); diff --git a/src/gui/listoperations.h b/src/gui/listoperations.h index 9e63642..5c0a1fe 100644 --- a/src/gui/listoperations.h +++ b/src/gui/listoperations.h @@ -38,7 +38,7 @@ class ListOperations : public QWidget, public Ui::ListOperationsBase Q_DISABLE_COPY(ListOperations) public: - ListOperations(QWidget* parent = nullptr); + explicit ListOperations(QWidget* parent = nullptr); public: void setActionCollection(KActionCollection* coll) { diff --git a/src/gui/listphysicalvolumes.h b/src/gui/listphysicalvolumes.h index 7060c75..18c4f79 100644 --- a/src/gui/listphysicalvolumes.h +++ b/src/gui/listphysicalvolumes.h @@ -46,7 +46,7 @@ class ListPhysicalVolumes : public QWidget, public Ui::ListPhysicalVolumesBase Q_DISABLE_COPY(ListPhysicalVolumes) public: - ListPhysicalVolumes(QWidget* parent = nullptr); + explicit ListPhysicalVolumes(QWidget* parent = nullptr); void addPartition(const Partition& p, bool checked); diff --git a/src/gui/partitionmanagerwidget.h b/src/gui/partitionmanagerwidget.h index ec5c841..2a59ab1 100644 --- a/src/gui/partitionmanagerwidget.h +++ b/src/gui/partitionmanagerwidget.h @@ -45,7 +45,7 @@ class PartitionManagerWidget : public QWidget, Ui::PartitionManagerWidgetBase Q_DISABLE_COPY(PartitionManagerWidget) public: - PartitionManagerWidget(QWidget* parent = nullptr); + explicit PartitionManagerWidget(QWidget* parent = nullptr); virtual ~PartitionManagerWidget(); Q_SIGNALS: diff --git a/src/gui/partpropswidget.h b/src/gui/partpropswidget.h index d9e6869..e450a35 100644 --- a/src/gui/partpropswidget.h +++ b/src/gui/partpropswidget.h @@ -30,7 +30,7 @@ class PartPropsWidget : public QWidget, public Ui::PartPropsWidgetBase { public: - PartPropsWidget(QWidget* parent) : QWidget(parent) { + explicit PartPropsWidget(QWidget* parent) : QWidget(parent) { setupUi(this); m_PartWidget->setFileSystemColorCode(GuiHelpers::fileSystemColorCodesFromSettings()); diff --git a/src/gui/parttablewidget.h b/src/gui/parttablewidget.h index 4e4061c..5f5481c 100644 --- a/src/gui/parttablewidget.h +++ b/src/gui/parttablewidget.h @@ -38,7 +38,7 @@ class PartTableWidget : public PartWidgetBase Q_DISABLE_COPY(PartTableWidget) public: - PartTableWidget(QWidget* parent); + explicit PartTableWidget(QWidget* parent); qint32 borderWidth() const override { return 0; /**< @return border width */ } diff --git a/src/gui/resizevolumegroupdialog.cpp b/src/gui/resizevolumegroupdialog.cpp index 9acfc28..965554c 100644 --- a/src/gui/resizevolumegroupdialog.cpp +++ b/src/gui/resizevolumegroupdialog.cpp @@ -73,7 +73,7 @@ void ResizeVolumeGroupDialog::setupDialog() continue; if (p.vgName() == device()->name()) dialogWidget().listPV().addPartition(*p.partition(), true); - else if (p.vgName() == QString() && !LvmDevice::s_DirtyPVs.contains(p.partition())) // TODO: Remove LVM PVs in current VG + else if (p.vgName().isEmpty() && !LvmDevice::s_DirtyPVs.contains(p.partition())) // TODO: Remove LVM PVs in current VG dialogWidget().listPV().addPartition(*p.partition(), false); } diff --git a/src/gui/scanprogressdialog.h b/src/gui/scanprogressdialog.h index 94e3261..b158ffa 100644 --- a/src/gui/scanprogressdialog.h +++ b/src/gui/scanprogressdialog.h @@ -23,7 +23,7 @@ class ScanProgressDialog : public QProgressDialog { public: - ScanProgressDialog(QWidget* parent); + explicit ScanProgressDialog(QWidget* parent); void setProgress(int p) { setValue(p); diff --git a/src/gui/sizedetailswidget.h b/src/gui/sizedetailswidget.h index 98ba813..c3af339 100644 --- a/src/gui/sizedetailswidget.h +++ b/src/gui/sizedetailswidget.h @@ -29,7 +29,7 @@ class SizeDetailsWidget : public QWidget, public Ui::SizeDetailsWidgetBase { public: - SizeDetailsWidget(QWidget* parent); + explicit SizeDetailsWidget(QWidget* parent); public: QDoubleSpinBox& spinFirstSector() { diff --git a/src/gui/smartdialogwidget.h b/src/gui/smartdialogwidget.h index 3da6ec2..2f0e2b8 100644 --- a/src/gui/smartdialogwidget.h +++ b/src/gui/smartdialogwidget.h @@ -30,7 +30,7 @@ class QPoint; class SmartDialogWidget : public QWidget, public Ui::SmartDialogWidgetBase { public: - SmartDialogWidget(QWidget* parent); + explicit SmartDialogWidget(QWidget* parent); ~SmartDialogWidget(); public: diff --git a/src/gui/treelog.h b/src/gui/treelog.h index a60ac1a..4f7db0e 100644 --- a/src/gui/treelog.h +++ b/src/gui/treelog.h @@ -35,7 +35,7 @@ class TreeLog: public QWidget, public Ui::TreeLogBase Q_DISABLE_COPY(TreeLog) public: - TreeLog(QWidget* parent = nullptr); + explicit TreeLog(QWidget* parent = nullptr); ~TreeLog(); public: diff --git a/src/gui/volumegroupwidget.h b/src/gui/volumegroupwidget.h index 7263d13..7166793 100644 --- a/src/gui/volumegroupwidget.h +++ b/src/gui/volumegroupwidget.h @@ -26,7 +26,7 @@ class VolumeGroupWidget : public QWidget, public Ui::VolumeGroupWidgetBase { public: - VolumeGroupWidget(QWidget* parent) : + explicit VolumeGroupWidget(QWidget* parent) : QWidget(parent), Ui::VolumeGroupWidgetBase() { setupUi(this); From 702c4ffd274df7dcf71378ec67a95f5b32b7a43d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Jan 2020 05:46:17 +0100 Subject: [PATCH 20/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index 3ed569f..286ebda 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -181,7 +181,7 @@ Keywords[id]=partisi;disk; Keywords[it]=partizione;disco; Keywords[ko]=partition;disk;파티션;디스크; Keywords[lt]=skaidinys;diskas; -Keywords[nl]=partitie;schijf +Keywords[nl]=partitie;schijf; Keywords[nn]=partisjon;disk; Keywords[pl]=partycja;dysk; Keywords[pt]=partição;disco; From 386a6888d56ef4afec31efbb6adc0069db1cfcbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 1 Feb 2020 15:22:54 +0000 Subject: [PATCH 21/78] Bump version to 4.1.0. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d826fcd..29f5d2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) # Dependencies set(QT_MIN_VERSION "5.10.0") set(KF5_MIN_VERSION "5.56") -set(KPMCORE_MIN_VERSION "4.0.0") +set(KPMCORE_MIN_VERSION "4.1.0") set(CMAKE_USE_RELATIVE_PATHS OFF) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) @@ -29,7 +29,7 @@ set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install mkspecs files, Plugins a # Check KPMcore dependency when bumping set(VERSION_MAJOR "4") -set(VERSION_MINOR "0") +set(VERSION_MINOR "1") set(VERSION_RELEASE "0") set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) add_definitions(-D'VERSION="${VERSION}"') #" From c85809b372a663d8b08a8bdbddc82d427f855058 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 6 Feb 2020 02:48:49 +0100 Subject: [PATCH 22/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index f304df1..910cc52 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -107,6 +107,7 @@

    KDE 파티션 관리자는 컴퓨터의 디스크 장치, 파티션, 파일 시스템을 관리하는 도구입니다. 파티션 작업, 무손실 크기 조정, 백업과 복원이 가능합니다.

    KDE Skaidinių tvarkyklė yra programa padedanti tvarkyti jūsų kompiuterio diskų įrenginius, skaidinius ir failų sistemas. Ji leidžia lengvai kurti, kopijuoti, perkelti, trinti ir keisti dydį neprarandant duomenų, kurti atsargines skaidinių kopijas.

    KDE Partitiebeheerder is een hulpprogramma om u helpen bij het beheer van de schijven, partities en bestandssystemen op uw computer. Het stelt u in staat gemakkelijk partities te maken, te kopiëren, te verplaatsen, te verwijderen, hun grootte te wijzigen zonder verlies van gegevens en hiervan een reservekopie te maken of hier vanaf te herstellen.

    +

    ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ ਸਹੂਲਤ ਦਾ ਪਰੋਗਰਾਮ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਡਿਸਕ ਡਿਵਾਈਸ, ਪਾਰਟੀਸ਼ਨ ਅਤੇ ਫਾਇਲ ਸਿਸਟਮਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰਨ ਲਈ ਮਦਦ ਕਰਦਾ ਹੈ। ਇਹ ਤੁਹਾਨੂੰ ਪਾਰਟੀਸ਼ਨ ਬਣਾਉਣ, ਕਾਪੀ ਕਰਨ, ਹਟਾਉਣ, ਬਿਨਾਂ ਡਾਟਾ ਗੁਆਏ ਆਕਾਰ ਬਦਲਣ, ਬੈਕ ਤੇ ਬਹਾਲ ਕਰਨ ਦੇ ਸਮਰੱਥ ਕਰਦਾ ਹੈ।

    Zarządzanie partycjami KDE jest programem użytkowym mającym na celu pomoc przy zarządzaniu urządzeniami dyskowymi, partycjami i systemami plików na twoim komputerze. Umożliwia łatwe tworzenie, kopiowanie, przenoszenie, usuwanie i zamianę rozmiaru bez utraty danych, a także tworzenie i przywracanie kopii zapasowych partycji.

    O Gestor de Partições do KDE é um utilitário que o ajuda a gerir os dispositivos dos discos, as suas partições e sistemas de ficheiros no seu computador. Permite-lhe facilmente criar, copiar, mover, apagar, dimensionar sem perder dados, salvaguardar e repor partições.

    O Gerenciador de Partições do KDE é um utilitário que o ajuda a gerenciar os dispositivos de disco, suas partições e sistemas de arquivos no seu computador. Permite-lhe facilmente criar, copiar, mover, excluir, redimensionar sem perder dados, criar backup e restaurar partições.

    @@ -186,6 +187,7 @@
  • EXT2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS 등 파일 시스템 지원
  • Palaiko daug failų sistemų, tarp jų ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS ir kitos
  • Ondersteunt een groot aantal bestandssystemen, inclusief ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS en meer
    • +
  • ਵੱਡੀ ਗਿਣਤੀ ਦੇ ਫਾਇਲ ਸਿਸਟਮਾਂ ਲਈ ਸਹਾਇਕ ਹੈ, ਜਿਸ ਵਿੱਚ ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS ਅਤੇ ਕਈ ਹੋਰ।
  • Obsługa wielu systemów plików, uwzględniając przy tym ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS i więcej
  • Suporta um grande conjunto de sistemas de ficheiros, incluindo o ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS entre outros
  • Suporte a um grande conjunto de sistemas de arquivos, incluindo o ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS, entre outros
    • @@ -223,6 +225,7 @@
  • 외부 프로그램을 사용한 작업 관리
  • Užduotims atlikti naudoja išorinius įrankius
  • Maakt gebruik van al beschikbare externe programma's om deze taken uit te voeren
    • +
  • ਪੱਕਾ ਕਰੋ ਕਿ ਇਹ ਕੰਮ ਕਰਨ ਲਈ ਹੋਰ ਬਾਹਰੀ ਪਰੋਗਰਾਮ ਉਪਲਬਧ ਹਨ
  • Wykorzystywanie już dostępnych programów zewnętrznych do wykonywania swojej pracy
  • Tira partido dos programas externos já existentes para terminar a sua tarefa
  • Utiliza os programas externos já existentes para terminar a sua tarefa
    • From 72cdc794df40f22b135f31204a7afd1d488739a5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 6 Feb 2020 05:38:22 +0100 Subject: [PATCH 23/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index 286ebda..fc2cd01 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -183,6 +183,7 @@ Keywords[ko]=partition;disk;파티션;디스크; Keywords[lt]=skaidinys;diskas; Keywords[nl]=partitie;schijf; Keywords[nn]=partisjon;disk; +Keywords[pa]=ਪਾਰਟੀਸ਼ਨ;ਡਿਸਕ; Keywords[pl]=partycja;dysk; Keywords[pt]=partição;disco; Keywords[pt_BR]=partição;disco; From ae711eb12b46642d3bf4e3d784fb49f92f155705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 15 Mar 2020 23:16:09 +0000 Subject: [PATCH 24/78] Port away from deprecated IconSize method. --- src/gui/mainwindow.cpp | 50 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 0ee9603..c20465a 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -202,7 +202,7 @@ void MainWindow::setupActions() undoOperation->setToolTip(xi18nc("@info:tooltip", "Undo the last operation")); undoOperation->setStatusTip(xi18nc("@info:status", "Remove the last operation from the list.")); actionCollection()->setDefaultShortcut(undoOperation, QKeySequence(Qt::CTRL + Qt::Key_Z)); - undoOperation->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")).pixmap(IconSize(KIconLoader::Toolbar))); + undoOperation->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* clearAllOperations = actionCollection()->addAction(QStringLiteral("clearAllOperations")); connect(clearAllOperations, &QAction::triggered, this, &MainWindow::onClearAllOperations); @@ -210,7 +210,7 @@ void MainWindow::setupActions() clearAllOperations->setText(xi18nc("@action:inmenu clear the list of operations", "Clear")); clearAllOperations->setToolTip(xi18nc("@info:tooltip", "Clear all operations")); clearAllOperations->setStatusTip(xi18nc("@info:status", "Empty the list of pending operations.")); - clearAllOperations->setIcon(QIcon::fromTheme(QStringLiteral("dialog-cancel")).pixmap(IconSize(KIconLoader::Toolbar))); + clearAllOperations->setIcon(QIcon::fromTheme(QStringLiteral("dialog-cancel")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* applyAllOperations = actionCollection()->addAction(QStringLiteral("applyAllOperations")); connect(applyAllOperations, &QAction::triggered, this, &MainWindow::onApplyAllOperations); @@ -218,7 +218,7 @@ void MainWindow::setupActions() applyAllOperations->setText(xi18nc("@action:inmenu apply all operations", "Apply")); applyAllOperations->setToolTip(xi18nc("@info:tooltip", "Apply all operations")); applyAllOperations->setStatusTip(xi18nc("@info:status", "Apply the pending operations in the list.")); - applyAllOperations->setIcon(QIcon::fromTheme(QStringLiteral("dialog-ok-apply")).pixmap(IconSize(KIconLoader::Toolbar))); + applyAllOperations->setIcon(QIcon::fromTheme(QStringLiteral("dialog-ok-apply")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); // Device actions QAction* createNewPartitionTable = actionCollection()->addAction(QStringLiteral("createNewPartitionTable")); @@ -228,7 +228,7 @@ void MainWindow::setupActions() createNewPartitionTable->setToolTip(xi18nc("@info:tooltip", "Create a new partition table")); createNewPartitionTable->setStatusTip(xi18nc("@info:status", "Create a new and empty partition table on a device.")); actionCollection()->setDefaultShortcut(createNewPartitionTable, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_N)); - createNewPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear")).pixmap(IconSize(KIconLoader::Toolbar))); + createNewPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* exportPartitionTable = actionCollection()->addAction(QStringLiteral("exportPartitionTable")); connect(exportPartitionTable, &QAction::triggered, this, &MainWindow::onExportPartitionTable); @@ -236,7 +236,7 @@ void MainWindow::setupActions() exportPartitionTable->setText(xi18nc("@action:inmenu", "Export Partition Table")); exportPartitionTable->setToolTip(xi18nc("@info:tooltip", "Export a partition table")); exportPartitionTable->setStatusTip(xi18nc("@info:status", "Export the device's partition table to a text file.")); - exportPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("document-export")).pixmap(IconSize(KIconLoader::Toolbar))); + exportPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("document-export")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* importPartitionTable = actionCollection()->addAction(QStringLiteral("importPartitionTable")); connect(importPartitionTable, &QAction::triggered, this, &MainWindow::onImportPartitionTable); @@ -244,7 +244,7 @@ void MainWindow::setupActions() importPartitionTable->setText(xi18nc("@action:inmenu", "Import Partition Table")); importPartitionTable->setToolTip(xi18nc("@info:tooltip", "Import a partition table")); importPartitionTable->setStatusTip(xi18nc("@info:status", "Import a partition table from a text file.")); - importPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("document-import")).pixmap(IconSize(KIconLoader::Toolbar))); + importPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("document-import")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* removeVolumeGroup = actionCollection()->addAction(QStringLiteral("removeVolumeGroup")); connect(removeVolumeGroup, &QAction::triggered, this, &MainWindow::onRemoveVolumeGroup); @@ -254,7 +254,7 @@ void MainWindow::setupActions() removeVolumeGroup->setToolTip(i18nc("@info:tooltip", "Remove selected Volume Group")); removeVolumeGroup->setStatusTip(i18nc("@info:status", "Remove selected Volume Group.")); //actionCollection()->setDefaultShortcut(removeVolumeGroup, QKeySequence(/*SHORTCUT KEY HERE*/)); - removeVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")).pixmap(IconSize(KIconLoader::Toolbar))); + removeVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* resizeVolumeGroup = actionCollection()->addAction(QStringLiteral("resizeVolumeGroup")); connect(resizeVolumeGroup, &QAction::triggered, this, &MainWindow::onResizeVolumeGroup); @@ -264,7 +264,7 @@ void MainWindow::setupActions() resizeVolumeGroup->setToolTip(i18nc("@info:tooltip", "Resize selected Volume Group")); resizeVolumeGroup->setStatusTip(i18nc("@info:status", "Extend or reduce selected Volume Group.")); //actionCollection()->setDefaultShortcut(resizeVolumeGroup, QKeySequence(/*SHORTCUT KEY HERE*/)); - resizeVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right-double")).pixmap(IconSize(KIconLoader::Toolbar))); + resizeVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right-double")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* deactivateVolumeGroup = actionCollection()->addAction(QStringLiteral("deactivateVolumeGroup")); connect(deactivateVolumeGroup, &QAction::triggered, this, &MainWindow::onDeactivateVolumeGroup); @@ -273,7 +273,7 @@ void MainWindow::setupActions() deactivateVolumeGroup->setText(i18nc("@action:inmenu", "Deactivate Volume Group")); deactivateVolumeGroup->setToolTip(i18nc("@info:tooltip", "Deactivate selected Volume Group")); deactivateVolumeGroup->setStatusTip(i18nc("@info:status", "Deactivate selected Volume Group before unplugging removable devices.")); - deactivateVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("media-eject")).pixmap(IconSize(KIconLoader::Toolbar))); + deactivateVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("media-eject")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* smartStatusDevice = actionCollection()->addAction(QStringLiteral("smartStatusDevice")); connect(smartStatusDevice, &QAction::triggered, this, &MainWindow::onSmartStatusDevice); @@ -288,7 +288,7 @@ void MainWindow::setupActions() propertiesDevice->setText(xi18nc("@action:inmenu", "Properties")); propertiesDevice->setToolTip(xi18nc("@info:tooltip", "Show device properties dialog")); propertiesDevice->setStatusTip(xi18nc("@info:status", "View and modify device properties")); - propertiesDevice->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")).pixmap(IconSize(KIconLoader::Toolbar))); + propertiesDevice->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); // Partition actions QAction* newPartition = actionCollection()->addAction(QStringLiteral("newPartition")); @@ -298,7 +298,7 @@ void MainWindow::setupActions() newPartition->setToolTip(xi18nc("@info:tooltip", "New partition")); newPartition->setStatusTip(xi18nc("@info:status", "Create a new partition.")); actionCollection()->setDefaultShortcut(newPartition, QKeySequence(Qt::CTRL + Qt::Key_N)); - newPartition->setIcon(QIcon::fromTheme(QStringLiteral("document-new")).pixmap(IconSize(KIconLoader::Toolbar))); + newPartition->setIcon(QIcon::fromTheme(QStringLiteral("document-new")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* resizePartition = actionCollection()->addAction(QStringLiteral("resizePartition")); connect(resizePartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onResizePartition); @@ -307,7 +307,7 @@ void MainWindow::setupActions() resizePartition->setToolTip(xi18nc("@info:tooltip", "Resize or move partition")); resizePartition->setStatusTip(xi18nc("@info:status", "Shrink, grow or move an existing partition.")); actionCollection()->setDefaultShortcut(resizePartition, QKeySequence(Qt::CTRL + Qt::Key_R)); - resizePartition->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right-double")).pixmap(IconSize(KIconLoader::Toolbar))); + resizePartition->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right-double")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* deletePartition = actionCollection()->addAction(QStringLiteral("deletePartition")); connect(deletePartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onDeletePartition); @@ -316,7 +316,7 @@ void MainWindow::setupActions() deletePartition->setToolTip(xi18nc("@info:tooltip", "Delete partition")); deletePartition->setStatusTip(xi18nc("@info:status", "Delete a partition.")); actionCollection()->setDefaultShortcut(deletePartition, QKeySequence::Delete); - deletePartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")).pixmap(IconSize(KIconLoader::Toolbar))); + deletePartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* shredPartition = actionCollection()->addAction(QStringLiteral("shredPartition")); connect(shredPartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onShredPartition); @@ -325,7 +325,7 @@ void MainWindow::setupActions() shredPartition->setToolTip(xi18nc("@info:tooltip", "Shred partition")); shredPartition->setStatusTip(xi18nc("@info:status", "Shred a partition so that its contents cannot be restored.")); actionCollection()->setDefaultShortcut(shredPartition, QKeySequence(Qt::SHIFT + Qt::Key_Delete)); - shredPartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete-shred")).pixmap(IconSize(KIconLoader::Toolbar))); + shredPartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete-shred")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* copyPartition = actionCollection()->addAction(QStringLiteral("copyPartition")); connect(copyPartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onCopyPartition); @@ -334,7 +334,7 @@ void MainWindow::setupActions() copyPartition->setToolTip(xi18nc("@info:tooltip", "Copy partition")); copyPartition->setStatusTip(xi18nc("@info:status", "Copy an existing partition.")); actionCollection()->setDefaultShortcut(copyPartition, QKeySequence(Qt::CTRL + Qt::Key_C)); - copyPartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")).pixmap(IconSize(KIconLoader::Toolbar))); + copyPartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* pastePartition = actionCollection()->addAction(QStringLiteral("pastePartition")); connect(pastePartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onPastePartition); @@ -343,7 +343,7 @@ void MainWindow::setupActions() pastePartition->setToolTip(xi18nc("@info:tooltip", "Paste partition")); pastePartition->setStatusTip(xi18nc("@info:status", "Paste a copied partition.")); actionCollection()->setDefaultShortcut(pastePartition, QKeySequence(Qt::CTRL + Qt::Key_V)); - pastePartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-paste")).pixmap(IconSize(KIconLoader::Toolbar))); + pastePartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-paste")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* editMountPoint = actionCollection()->addAction(QStringLiteral("editMountPoint")); connect(editMountPoint, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onEditMountPoint); @@ -372,7 +372,7 @@ void MainWindow::setupActions() checkPartition->setText(xi18nc("@action:inmenu", "Check")); checkPartition->setToolTip(xi18nc("@info:tooltip", "Check partition")); checkPartition->setStatusTip(xi18nc("@info:status", "Check a filesystem on a partition for errors.")); - checkPartition->setIcon(QIcon::fromTheme(QStringLiteral("flag")).pixmap(IconSize(KIconLoader::Toolbar))); + checkPartition->setIcon(QIcon::fromTheme(QStringLiteral("flag")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* propertiesPartition = actionCollection()->addAction(QStringLiteral("propertiesPartition")); connect(propertiesPartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onPropertiesPartition); @@ -380,7 +380,7 @@ void MainWindow::setupActions() propertiesPartition->setText(xi18nc("@action:inmenu", "Properties")); propertiesPartition->setToolTip(xi18nc("@info:tooltip", "Show partition properties dialog")); propertiesPartition->setStatusTip(xi18nc("@info:status", "View and modify partition properties (label, partition flags, etc.)")); - propertiesPartition->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")).pixmap(IconSize(KIconLoader::Toolbar))); + propertiesPartition->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* backup = actionCollection()->addAction(QStringLiteral("backupPartition")); connect(backup, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onBackupPartition); @@ -388,7 +388,7 @@ void MainWindow::setupActions() backup->setText(xi18nc("@action:inmenu", "Backup")); backup->setToolTip(xi18nc("@info:tooltip", "Backup partition")); backup->setStatusTip(xi18nc("@info:status", "Backup a partition to an image file.")); - backup->setIcon(QIcon::fromTheme(QStringLiteral("document-export")).pixmap(IconSize(KIconLoader::Toolbar))); + backup->setIcon(QIcon::fromTheme(QStringLiteral("document-export")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* restore = actionCollection()->addAction(QStringLiteral("restorePartition")); connect(restore, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onRestorePartition); @@ -396,7 +396,7 @@ void MainWindow::setupActions() restore->setText(xi18nc("@action:inmenu", "Restore")); restore->setToolTip(xi18nc("@info:tooltip", "Restore partition")); restore->setStatusTip(xi18nc("@info:status", "Restore a partition from an image file.")); - restore->setIcon(QIcon::fromTheme(QStringLiteral("document-import")).pixmap(IconSize(KIconLoader::Toolbar))); + restore->setIcon(QIcon::fromTheme(QStringLiteral("document-import")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); // Tools actions QAction* createVolumeGroup = actionCollection()->addAction(QStringLiteral("createVolumeGroup")); @@ -406,7 +406,7 @@ void MainWindow::setupActions() createVolumeGroup->setToolTip(i18nc("@info:tooltip", "Create a new LVM Volume Group")); createVolumeGroup->setStatusTip(i18nc("@info:status", "Create a new LVM Volume Group as a device.")); actionCollection()->setDefaultShortcut(createVolumeGroup, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_L)); - createVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("document-new")).pixmap(IconSize(KIconLoader::Toolbar))); + createVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("document-new")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* fileSystemSupport = actionCollection()->addAction(QStringLiteral("fileSystemSupport")); connect(fileSystemSupport, &QAction::triggered, this, &MainWindow::onFileSystemSupport); @@ -420,7 +420,7 @@ void MainWindow::setupActions() refreshDevices->setToolTip(xi18nc("@info:tooltip", "Refresh all devices")); refreshDevices->setStatusTip(xi18nc("@info:status", "Renew the devices list.")); actionCollection()->setDefaultShortcut(refreshDevices, Qt::Key_F5); - refreshDevices->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")).pixmap(IconSize(KIconLoader::Toolbar))); + refreshDevices->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); // Settings Actions actionCollection()->addAction(QStringLiteral("toggleDockDevices"), dockDevices().toggleViewAction()); @@ -436,14 +436,14 @@ void MainWindow::setupActions() clearLog->setText(xi18nc("@action:inmenu", "Clear Log")); clearLog->setToolTip(xi18nc("@info:tooltip", "Clear the log output")); clearLog->setStatusTip(xi18nc("@info:status", "Clear the log output panel.")); - clearLog->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-list")).pixmap(IconSize(KIconLoader::Toolbar))); + clearLog->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-list")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); QAction* saveLog = actionCollection()->addAction(QStringLiteral("saveLog")); connect(saveLog, &QAction::triggered, &treeLog(), &TreeLog::onSaveLog); saveLog->setText(xi18nc("@action:inmenu", "Save Log")); saveLog->setToolTip(xi18nc("@info:tooltip", "Save the log output")); saveLog->setStatusTip(xi18nc("@info:status", "Save the log output to a file.")); - saveLog->setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(IconSize(KIconLoader::Toolbar))); + saveLog->setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); // Help Actions QAction* aboutKPMcore = actionCollection()->addAction(QStringLiteral("aboutKPMcore")); @@ -451,7 +451,7 @@ void MainWindow::setupActions() aboutKPMcore->setText(xi18nc("@action:inmenu", "About KPMcore Library")); aboutKPMcore->setToolTip(xi18nc("@info:tooltip", "Show About KPMcore dialog")); aboutKPMcore->setStatusTip(xi18nc("@info:status", "Show About KPMcore dialog.")); - aboutKPMcore->setIcon(QIcon::fromTheme(QStringLiteral("partitionmanager")).pixmap(IconSize(KIconLoader::Toolbar))); + aboutKPMcore->setIcon(QIcon::fromTheme(QStringLiteral("partitionmanager")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); } void MainWindow::setupConnections() From 4106ed78fd078ef81963a169be680badb9c9dc90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 22 Mar 2020 01:09:50 +0000 Subject: [PATCH 25/78] Port away from deprecated IconSize method in the remaining dialogs. --- src/gui/applyprogressdialog.cpp | 14 +++++++------- src/gui/devicepropsdialog.cpp | 4 ++-- src/gui/filesystemsupportdialog.cpp | 4 ++-- src/gui/listdevices.cpp | 2 +- src/gui/listoperations.cpp | 2 +- src/gui/partitionmanagerwidget.cpp | 4 ++-- src/gui/smartdialog.cpp | 4 ++-- src/gui/treelog.cpp | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/gui/applyprogressdialog.cpp b/src/gui/applyprogressdialog.cpp index 4d30dd4..a3f7412 100644 --- a/src/gui/applyprogressdialog.cpp +++ b/src/gui/applyprogressdialog.cpp @@ -93,13 +93,13 @@ ApplyProgressDialog::ApplyProgressDialog(QWidget* parent, OperationRunner& orunn cancelButton = dialogButtonBox->addButton(QDialogButtonBox::Cancel); detailsButton = new QPushButton; detailsButton->setText(xi18nc("@action:button", "&Details") + QStringLiteral(" >>")); - detailsButton->setIcon(QIcon::fromTheme(QStringLiteral("help-about")).pixmap(IconSize(KIconLoader::Toolbar))); + detailsButton->setIcon(QIcon::fromTheme(QStringLiteral("help-about")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); dialogButtonBox->addButton(detailsButton, QDialogButtonBox::ActionRole); mainLayout->addWidget(dialogButtonBox); dialogWidget().treeTasks().setColumnWidth(0, width() * 8 / 10); - detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme(QStringLiteral("document-open")).pixmap(IconSize(KIconLoader::Toolbar))); - detailsWidget().buttonSave().setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(IconSize(KIconLoader::Toolbar))); + detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme(QStringLiteral("document-open")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + detailsWidget().buttonSave().setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); setupConnections(); @@ -297,7 +297,7 @@ void ApplyProgressDialog::onJobStarted(Job* job, Operation* op) QTreeWidgetItem* child = new QTreeWidgetItem(); child->setText(0, job->description()); - child->setIcon(0, QIcon::fromTheme(job->statusIcon()).pixmap(IconSize(KIconLoader::Small))); + child->setIcon(0, QIcon::fromTheme(job->statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); child->setText(1, QTime(0, 0).toString(timeFormat())); item->addChild(child); dialogWidget().treeTasks().scrollToBottom(); @@ -309,7 +309,7 @@ void ApplyProgressDialog::onJobStarted(Job* job, Operation* op) void ApplyProgressDialog::onJobFinished(Job* job, Operation* op) { if (currentJobItem()) - currentJobItem()->setIcon(0, QIcon::fromTheme(job->statusIcon()).pixmap(IconSize(KIconLoader::Small))); + currentJobItem()->setIcon(0, QIcon::fromTheme(job->statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); setCurrentJobItem(nullptr); @@ -324,7 +324,7 @@ void ApplyProgressDialog::onOpFinished(int num, Operation* op) { if (currentOpItem()) { currentOpItem()->setText(0, opDesc(num, *op)); - currentOpItem()->setIcon(0, QIcon::fromTheme(op->statusIcon()).pixmap(IconSize(KIconLoader::Small))); + currentOpItem()->setIcon(0, QIcon::fromTheme(op->statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); } setCurrentOpItem(nullptr); @@ -357,7 +357,7 @@ QString ApplyProgressDialog::opDesc(int num, const Operation& op) const void ApplyProgressDialog::addTaskOutput(int num, const Operation& op) { QTreeWidgetItem* item = new QTreeWidgetItem(); - item->setIcon(0, QIcon::fromTheme(op.statusIcon()).pixmap(IconSize(KIconLoader::Small))); + item->setIcon(0, QIcon::fromTheme(op.statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); item->setText(0, opDesc(num, op)); item->setText(1, QTime(0, 0).toString(timeFormat())); diff --git a/src/gui/devicepropsdialog.cpp b/src/gui/devicepropsdialog.cpp index 883d11b..8f42dea 100644 --- a/src/gui/devicepropsdialog.cpp +++ b/src/gui/devicepropsdialog.cpp @@ -116,10 +116,10 @@ void DevicePropsDialog::setupDialog() if (device().smartStatus().isValid()) { if (device().smartStatus().status()) { dialogWidget().smartStatusText().setText(xi18nc("@label SMART disk status", "good")); - dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(IconSize(KIconLoader::Small))); + dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); } else { dialogWidget().smartStatusText().setText(xi18nc("@label SMART disk status", "BAD")); - dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(IconSize(KIconLoader::Small))); + dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); } } else { dialogWidget().smartStatusText().setText(xi18nc("@label", "(unknown)")); diff --git a/src/gui/filesystemsupportdialog.cpp b/src/gui/filesystemsupportdialog.cpp index 487b534..eeabe1e 100644 --- a/src/gui/filesystemsupportdialog.cpp +++ b/src/gui/filesystemsupportdialog.cpp @@ -66,8 +66,8 @@ QSize FileSystemSupportDialog::sizeHint() const void FileSystemSupportDialog::setupDialog() { - QIcon yes = QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(IconSize(KIconLoader::Toolbar)); - QIcon no = QIcon::fromTheme(QStringLiteral("dialog-error")).pixmap(IconSize(KIconLoader::Toolbar)); + QIcon yes = QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar)); + QIcon no = QIcon::fromTheme(QStringLiteral("dialog-error")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar)); dialogWidget().tree().clear(); diff --git a/src/gui/listdevices.cpp b/src/gui/listdevices.cpp index c068f0d..a2ed8c4 100644 --- a/src/gui/listdevices.cpp +++ b/src/gui/listdevices.cpp @@ -29,7 +29,7 @@ class ListDeviceWidgetItem : public QListWidgetItem { public: ListDeviceWidgetItem(const Device& d) : - QListWidgetItem(QIcon::fromTheme(d.iconName()).pixmap(IconSize(KIconLoader::Desktop)), d.prettyName()), + QListWidgetItem(QIcon::fromTheme(d.iconName()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Desktop)), d.prettyName()), deviceNode(d.deviceNode()) { setToolTip(d.prettyName()); setSizeHint(QSize(0, 32)); diff --git a/src/gui/listoperations.cpp b/src/gui/listoperations.cpp index 77362ed..bea6dca 100644 --- a/src/gui/listoperations.cpp +++ b/src/gui/listoperations.cpp @@ -41,7 +41,7 @@ void ListOperations::updateOperations(const OperationStack::Operations& ops) listOperations().clear(); for (const auto &op : ops) { - QListWidgetItem* item = new QListWidgetItem(QIcon::fromTheme(op->iconName()).pixmap(IconSize(KIconLoader::Small)), op->description()); + QListWidgetItem* item = new QListWidgetItem(QIcon::fromTheme(op->iconName()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small)), op->description()); item->setToolTip(op->description()); listOperations().addItem(item); } diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp index 7c6252e..dbf0135 100644 --- a/src/gui/partitionmanagerwidget.cpp +++ b/src/gui/partitionmanagerwidget.cpp @@ -217,7 +217,7 @@ static QTreeWidgetItem* createTreeWidgetItem(const Partition& p) item->setText(i, p.mountPoint()); if (p.isMounted()) - item->setIcon(i, QIcon::fromTheme(QStringLiteral("object-locked")).pixmap(IconSize(KIconLoader::Panel))); + item->setIcon(i, QIcon::fromTheme(QStringLiteral("object-locked")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Panel))); i++; item->setText(i++, p.fileSystem().label()); @@ -258,7 +258,7 @@ void PartitionManagerWidget::updatePartitions() deviceItem->setFont(0, font); deviceItem->setText(0, selectedDevice()->prettyName()); - deviceItem->setIcon(0, QIcon::fromTheme(selectedDevice()->iconName()).pixmap(IconSize(KIconLoader::Desktop))); + deviceItem->setIcon(0, QIcon::fromTheme(selectedDevice()->iconName()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Desktop))); deviceItem->setSizeHint(0, QSize(0, 32)); diff --git a/src/gui/smartdialog.cpp b/src/gui/smartdialog.cpp index 78c6c64..d4a48e0 100644 --- a/src/gui/smartdialog.cpp +++ b/src/gui/smartdialog.cpp @@ -89,10 +89,10 @@ void SmartDialog::setupDialog() if (device().smartStatus().isValid()) { if (device().smartStatus().status()) { dialogWidget().statusText().setText(xi18nc("@label SMART disk status", "good")); - dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(IconSize(KIconLoader::Small))); + dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); } else { dialogWidget().statusText().setText(xi18nc("@label SMART disk status", "BAD")); - dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(IconSize(KIconLoader::Small))); + dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); } dialogWidget().modelName().setText(device().smartStatus().modelName()); diff --git a/src/gui/treelog.cpp b/src/gui/treelog.cpp index 9cd0f6d..e0e593b 100644 --- a/src/gui/treelog.cpp +++ b/src/gui/treelog.cpp @@ -153,7 +153,7 @@ void TreeLog::onNewLogMessage(Log::Level logLevel, const QString& s) if (static_cast(logLevel) >= Config::minLogLevel()) { QTreeWidgetItem* item = new QTreeWidgetItem(); - item->setIcon(0, QIcon::fromTheme(icons[static_cast(logLevel)]).pixmap(IconSize(KIconLoader::Small))); + item->setIcon(0, QIcon::fromTheme(icons[static_cast(logLevel)]).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); item->setText(1, QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd hh:mm:ss"))); item->setText(2, s); From 50f0827df64a6f949a2c62051b1d1ba9fcadc1c0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 25 Mar 2020 06:42:37 +0100 Subject: [PATCH 26/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index fc2cd01..a25188e 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -39,7 +39,7 @@ Name[pt]=Gestor de Partições do KDE Name[pt_BR]=Gerenciador de partições do KDE Name[ro]=Gestionarul de partiții KDE Name[ru]=Диспетчер разделов от KDE -Name[sk]=KDE Správca partícií +Name[sk]=Správca oddielov pre KDE Name[sl]=Upravljalnik razdelkov za KDE Name[sr]=КДЕ‑ов менаџер партиција Name[sr@ijekavian]=КДЕ‑ов менаџер партиција @@ -91,7 +91,7 @@ GenericName[pt]=Editor de Partições GenericName[pt_BR]=Editor de partições GenericName[ro]=Editor de partiții GenericName[ru]=Редактор разделов -GenericName[sk]=Editor partícií +GenericName[sk]=Editor oddielov GenericName[sl]=Urejevalnik razdelkov GenericName[sr]=Уређивач партиција GenericName[sr@ijekavian]=Уређивач партиција @@ -144,7 +144,7 @@ Comment[pt]=Faz a gestão de discos, partições e sistemas de ficheiros Comment[pt_BR]=Gerencia discos, partições e sistemas de arquivos Comment[ro]=Gestionează discurile, partițiile și sistemele de fișiere Comment[ru]=Управление дисками, разделами и файловыми системами -Comment[sk]=Spravuje disky, partície a súborové systémy +Comment[sk]=Spravuje disky, oddiely a súborové systémy Comment[sl]=Upravljajte z diski, razdelki in datotečnimi sistemi Comment[sr]=Управљајте дисковима, партицијама и фајл системима Comment[sr@ijekavian]=Управљајте дисковима, партицијама и фајл системима @@ -188,7 +188,7 @@ Keywords[pl]=partycja;dysk; Keywords[pt]=partição;disco; Keywords[pt_BR]=partição;disco; Keywords[ru]=раздел;диск; -Keywords[sk]=partícia;disk; +Keywords[sk]=oddiel;partícia;disk; Keywords[sl]=razdelek;particija;disk; Keywords[sr]=partition;disk;партиција;диск; Keywords[sr@ijekavian]=partition;disk;партиција;диск; From d0bfbd2d4bd4b4c7df81bab394c74a9b75eb272d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 28 May 2020 21:18:52 +0100 Subject: [PATCH 27/78] Allow selecting properties using keyboard and mouse. Properties in Dialog and Partition properties dialogs should now be selectable. BUG: 422192 --- src/gui/devicepropswidgetbase.ui | 21 +++++++++++++++++++++ src/gui/partpropswidgetbase.ui | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/gui/devicepropswidgetbase.ui b/src/gui/devicepropswidgetbase.ui index 7a6b322..acfed02 100644 --- a/src/gui/devicepropswidgetbase.ui +++ b/src/gui/devicepropswidgetbase.ui @@ -67,6 +67,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -122,6 +125,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -139,6 +145,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -163,6 +172,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -180,6 +192,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -211,6 +226,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -249,6 +267,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + diff --git a/src/gui/partpropswidgetbase.ui b/src/gui/partpropswidgetbase.ui index b056b91..cc1b2fa 100644 --- a/src/gui/partpropswidgetbase.ui +++ b/src/gui/partpropswidgetbase.ui @@ -7,7 +7,7 @@ 0 0 506 - 600 + 669 @@ -375,6 +375,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -382,6 +385,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse +     From 2c7306dc9842c6ef4dbe40d4637c1ddf2a701c90 Mon Sep 17 00:00:00 2001 From: Thiago Sueto Date: Sun, 14 Jun 2020 08:57:03 +0000 Subject: [PATCH 28/78] Update org.kde.partitionmanager.appdata.xml --- src/org.kde.partitionmanager.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 910cc52..a676e02 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -44,7 +44,7 @@ xxKDE Partition Managerxx KDE 分区管理器 KDE 磁碟分割區管理員 - Partition Editor + Manage disk devices, partitions and file systems on your computer محرّر أقسام Editor de particiones Uređivač particija From 55e95e719a1610b4b1f2fd0acc286fd3750bdebd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 15 Jun 2020 02:23:22 +0200 Subject: [PATCH 29/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 40 ------------------------ 1 file changed, 40 deletions(-) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index a676e02..0399d88 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -45,46 +45,6 @@ KDE 分区管理器 KDE 磁碟分割區管理員 Manage disk devices, partitions and file systems on your computer - محرّر أقسام - Editor de particiones - Uređivač particija - Editor de particions - Editor de particions - Editor diskových oddílů - Partitioneringsprogram - Partition-Editor - Διαχειριστής κατατμήσεων - Partition Editor - Editor de particiones - Partitsiooniredaktor - Partizio editorea - Osionhallinta - Éditeur de partitions - Editor de particións - Partíciószerkesztő - Pengedit Partisi - Editor delle partizioni - 파티션 편집기 - Skaidinių tvarkyklė - Partitiebewerker - ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ - Zarządzanie partycjami - Editor de Partições - Editor de Partições - Redactor de partiții - Редактор разделов - Editor partícií - Urejevalnik razdelkov - Уређивач партиција - Uređivač particija - Уређивач партиција - Uređivač particija - Partitionseditor - Disk Bölümü Düzenleyici - Редактор розділів диска - xxPartition Editorxx - 分区编辑器 - 磁碟分割區編輯器

    KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.

    «مدير كدي للأقسام» هو أداة تساعدك على إدارة أجهزة الأقراص، والأقسام وأنظمة الملفّات في حاسوبك. ويتيح لك الإنشاء، والنّسخ، والنّقل، والحذف، والتّحجيم دون فقدات البيانات، والنّسخ الاحتياطيّ واسترجاع الأقسام بسهولة.

    From d05914c50bc1843cc53845ba611ac5dd48ef3456 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 16 Jun 2020 02:27:47 +0200 Subject: [PATCH 30/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 0399d88..4401c0b 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -45,6 +45,12 @@ KDE 分区管理器 KDE 磁碟分割區管理員 Manage disk devices, partitions and file systems on your computer + Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador + Schijfapparaten, partities en bestandssystemen op uw computer beheren + Faz a gestão de dispositivos, partições e sistemas de ficheiros dos discos no seu computador + Hantera diskenheter, partitioner och filsystem på datorn + Керування дисковими пристроями, розділами та файловими системами вашого комп'ютера + xxManage disk devices, partitions and file systems on your computerxx

    KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.

    «مدير كدي للأقسام» هو أداة تساعدك على إدارة أجهزة الأقراص، والأقسام وأنظمة الملفّات في حاسوبك. ويتيح لك الإنشاء، والنّسخ، والنّقل، والحذف، والتّحجيم دون فقدات البيانات، والنّسخ الاحتياطيّ واسترجاع الأقسام بسهولة.

    From 589221012e144a1e7ebcfb14da733c53b7190f13 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 17 Jun 2020 02:13:02 +0200 Subject: [PATCH 31/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 4401c0b..b847d40 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -46,8 +46,10 @@ KDE 磁碟分割區管理員 Manage disk devices, partitions and file systems on your computer Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador + Gestisci dispositivi a disco, partizioni e file system sul tuo computer Schijfapparaten, partities en bestandssystemen op uw computer beheren Faz a gestão de dispositivos, partições e sistemas de ficheiros dos discos no seu computador + Gerencie dispositivos de disco, partições e sistemas de arquivos no seu computador Hantera diskenheter, partitioner och filsystem på datorn Керування дисковими пристроями, розділами та файловими системами вашого комп'ютера xxManage disk devices, partitions and file systems on your computerxx From 510f1f80af394645031cfd6ae18e858fd75ecdfc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 17 Jun 2020 11:42:03 +0200 Subject: [PATCH 32/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index b847d40..9bd1f9e 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -41,7 +41,6 @@ KDE:s partitionshanterare KDE Disk Bölüm Yöneticisi Редактор розділів для KDE - xxKDE Partition Managerxx KDE 分区管理器 KDE 磁碟分割區管理員 Manage disk devices, partitions and file systems on your computer @@ -52,7 +51,6 @@ Gerencie dispositivos de disco, partições e sistemas de arquivos no seu computador Hantera diskenheter, partitioner och filsystem på datorn Керування дисковими пристроями, розділами та файловими системами вашого комп'ютера - xxManage disk devices, partitions and file systems on your computerxx

    KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.

    «مدير كدي للأقسام» هو أداة تساعدك على إدارة أجهزة الأقراص، والأقسام وأنظمة الملفّات في حاسوبك. ويتيح لك الإنشاء، والنّسخ، والنّقل، والحذف، والتّحجيم دون فقدات البيانات، والنّسخ الاحتياطيّ واسترجاع الأقسام بسهولة.

    @@ -89,7 +87,6 @@

    KDE Partition Manager är ett verktyg för att hjälpa till att hantera diskenheter, partitioner och filsystem på datorn. Det låter dig enkelt skapa, kopiera, flytta, ta bort, ändra storlek utan dataförlust, säkerhetskopiera och återställa partitioner.

    KDE Disk Bölümü Düzenleyici; bilgisayarınızdaki disk aygıtlarını, bölümlerinizi ve dosya sistemlerinizi yönetmenize yardımcı olan bir programdır. Kolaylıkla disk bölümü oluşturmanızı, kopyalamanızı, taşımanızı, silmenizi, veri kaybetmeden yeniden boyutlandırmanızı, yedeklemenizi ve yedekten geri yüklemenizi sağlar.

    Редактор розділів KDE — допоміжна програма, яку призначено для полегшення керування дисковими пристроями, розділами та файловими системами на комп’ютері. За її допомогою ви зможете без проблем створювати, копіювати, пересувати, вилучати та змінювати розміри розділів без втрати даних, створювати резервні копії розділів та відновлювати дані з цих резервних копій.

    -

    xxKDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.xx

    KDE 分区管理器是一个帮助您管理就计算机上的磁盘设备，分区，文件系统的工具程序。它可以帮助您简单地创建，复制，移动，删除，无损调整大小，备份和恢复分区。

    KDE 磁碟分割區管理員是一個可以協助您管理您電腦上的磁碟裝置、分割區以及檔案系統的工具。它讓您可以很容易地建立、複製、移動、刪除、不遺失資料的調整大小、備份與恢復分割區。

    Features:

    @@ -130,7 +127,6 @@

    Funktioner:

    Özellikler:

    Можливості:

    -

    xxFeatures:xx

    功能：

    功能：

      @@ -169,7 +165,6 @@
    • Stöder ett stort antal filsystem, inklusive ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS med flera
    • Ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS ve daha birçok sayıda dosya sistemi destekler
    • Підтримка широкого набору файлових систем, зокрема ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS тощо.
      • -
    • xxSupports a large number of file systems, including ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS and morexx
    • 支持许多文件系统，包括 ext2/3/4，btrfs，reiserfs，NTFS，FAT16/32,JFS，XFS 和更多
    • 支援大量的檔案系統，包含了 ext2/3/4、btrfs、reiserfs、NTFS、FAT16/32、JFS、XFS 以及更多
    • Makes use of already available external programs to get its job done
      • @@ -207,7 +202,6 @@
    • Drar nytta av redan tillgängliga externa program för att få jobbet gjort
    • İşlemlerin yapılabilmesi için zaten mevcut olan harici programlardan yararlanır
    • Використання доступних зовнішніх інструментів для виконання завдань.
      • -
    • xxMakes use of already available external programs to get its job donexx
    • 使用已有的外部程序完成任务
    • 利用已有的外部程式來完成其工作
    From 0183d07911c9878b301f06d41d3637d0da1cde5a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 17 Jun 2020 14:16:35 +0200 Subject: [PATCH 33/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index a25188e..577c379 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -50,7 +50,6 @@ Name[th]=เครื่องมือจัดการพาร์ทิช Name[tr]=KDE Partition Manager Name[ug]=KDE دىسكا رايونى باشقۇرغۇ Name[uk]=Керування розділами диска KDE -Name[x-test]=xxKDE Partition Managerxx Name[zh_CN]=KDE 分区管理器 Name[zh_TW]=KDE 磁碟分割區管理員 GenericName=Partition Editor @@ -102,7 +101,6 @@ GenericName[th]=แก้ไขพาร์ทิชัน GenericName[tr]=Disk Bölümü Düzenleyici GenericName[ug]=دىسكا رايونى تەھرىرلىگۈچ GenericName[uk]=Редактор розділів диска -GenericName[x-test]=xxPartition Editorxx GenericName[zh_CN]=分区编辑器 GenericName[zh_TW]=磁碟分割區編輯器 Comment=Manage disks, partitions and file systems @@ -155,7 +153,6 @@ Comment[th]=จัดการดิสก์, พาร์ทิชัน แ Comment[tr]=Diskleri, disk bölümlerini ve dosya sistemlerini yönet Comment[ug]=دىسكىلارنى، دىسكا رايونلىرىنى ۋە ھۆججەت سىستېمىسىنى باشقۇرۇش پروگراممىسى Comment[uk]=Керуйте дисками, розділами та файловими системами -Comment[x-test]=xxManage disks, partitions and file systemsxx Comment[zh_CN]=管理磁盘、分区和文件系统 Comment[zh_TW]=管理磁碟、分割區與檔案系統 Exec=partitionmanager @@ -197,6 +194,5 @@ Keywords[sr@latin]=partition;disk;particija;disk; Keywords[sv]=partition;disk; Keywords[tr]=bölümleme;disk; Keywords[uk]=розділ;диск; -Keywords[x-test]=xxpartitionxx;xxdiskxx; Keywords[zh_CN]=partition;disk;分区;磁盘; Keywords[zh_TW]=partition;disk;分割區;磁碟;硬碟 From e248cfcf1653b9ddec13bb54b769b1d5cf65f7f9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 18 Jun 2020 02:29:23 +0200 Subject: [PATCH 34/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 9bd1f9e..8d2231a 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -41,16 +41,19 @@ KDE:s partitionshanterare KDE Disk Bölüm Yöneticisi Редактор розділів для KDE + xxKDE Partition Managerxx KDE 分区管理器 KDE 磁碟分割區管理員 Manage disk devices, partitions and file systems on your computer Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador + Spravujte disky, oddíly a souborové systémy ve vašem počítači Gestisci dispositivi a disco, partizioni e file system sul tuo computer Schijfapparaten, partities en bestandssystemen op uw computer beheren Faz a gestão de dispositivos, partições e sistemas de ficheiros dos discos no seu computador Gerencie dispositivos de disco, partições e sistemas de arquivos no seu computador Hantera diskenheter, partitioner och filsystem på datorn Керування дисковими пристроями, розділами та файловими системами вашого комп'ютера + xxManage disk devices, partitions and file systems on your computerxx

    KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.

    «مدير كدي للأقسام» هو أداة تساعدك على إدارة أجهزة الأقراص، والأقسام وأنظمة الملفّات في حاسوبك. ويتيح لك الإنشاء، والنّسخ، والنّقل، والحذف، والتّحجيم دون فقدات البيانات، والنّسخ الاحتياطيّ واسترجاع الأقسام بسهولة.

    @@ -87,6 +90,7 @@

    KDE Partition Manager är ett verktyg för att hjälpa till att hantera diskenheter, partitioner och filsystem på datorn. Det låter dig enkelt skapa, kopiera, flytta, ta bort, ändra storlek utan dataförlust, säkerhetskopiera och återställa partitioner.

    KDE Disk Bölümü Düzenleyici; bilgisayarınızdaki disk aygıtlarını, bölümlerinizi ve dosya sistemlerinizi yönetmenize yardımcı olan bir programdır. Kolaylıkla disk bölümü oluşturmanızı, kopyalamanızı, taşımanızı, silmenizi, veri kaybetmeden yeniden boyutlandırmanızı, yedeklemenizi ve yedekten geri yüklemenizi sağlar.

    Редактор розділів KDE — допоміжна програма, яку призначено для полегшення керування дисковими пристроями, розділами та файловими системами на комп’ютері. За її допомогою ви зможете без проблем створювати, копіювати, пересувати, вилучати та змінювати розміри розділів без втрати даних, створювати резервні копії розділів та відновлювати дані з цих резервних копій.

    +

    xxKDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.xx

    KDE 分区管理器是一个帮助您管理就计算机上的磁盘设备，分区，文件系统的工具程序。它可以帮助您简单地创建，复制，移动，删除，无损调整大小，备份和恢复分区。

    KDE 磁碟分割區管理員是一個可以協助您管理您電腦上的磁碟裝置、分割區以及檔案系統的工具。它讓您可以很容易地建立、複製、移動、刪除、不遺失資料的調整大小、備份與恢復分割區。

    Features:

    @@ -127,6 +131,7 @@

    Funktioner:

    Özellikler:

    Можливості:

    +

    xxFeatures:xx

    功能：

    功能：

      @@ -165,6 +170,7 @@
    • Stöder ett stort antal filsystem, inklusive ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS med flera
    • Ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS ve daha birçok sayıda dosya sistemi destekler
    • Підтримка широкого набору файлових систем, зокрема ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS тощо.
      • +
    • xxSupports a large number of file systems, including ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS and morexx
    • 支持许多文件系统，包括 ext2/3/4，btrfs，reiserfs，NTFS，FAT16/32,JFS，XFS 和更多
    • 支援大量的檔案系統，包含了 ext2/3/4、btrfs、reiserfs、NTFS、FAT16/32、JFS、XFS 以及更多
    • Makes use of already available external programs to get its job done
      • @@ -202,6 +208,7 @@
    • Drar nytta av redan tillgängliga externa program för att få jobbet gjort
    • İşlemlerin yapılabilmesi için zaten mevcut olan harici programlardan yararlanır
    • Використання доступних зовнішніх інструментів для виконання завдань.
      • +
    • xxMakes use of already available external programs to get its job donexx
    • 使用已有的外部程序完成任务
    • 利用已有的外部程式來完成其工作
    From a88f49c59b2f40699129715767f2c71f887bf7f0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 18 Jun 2020 05:49:14 +0200 Subject: [PATCH 35/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index 577c379..a25188e 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -50,6 +50,7 @@ Name[th]=เครื่องมือจัดการพาร์ทิช Name[tr]=KDE Partition Manager Name[ug]=KDE دىسكا رايونى باشقۇرغۇ Name[uk]=Керування розділами диска KDE +Name[x-test]=xxKDE Partition Managerxx Name[zh_CN]=KDE 分区管理器 Name[zh_TW]=KDE 磁碟分割區管理員 GenericName=Partition Editor @@ -101,6 +102,7 @@ GenericName[th]=แก้ไขพาร์ทิชัน GenericName[tr]=Disk Bölümü Düzenleyici GenericName[ug]=دىسكا رايونى تەھرىرلىگۈچ GenericName[uk]=Редактор розділів диска +GenericName[x-test]=xxPartition Editorxx GenericName[zh_CN]=分区编辑器 GenericName[zh_TW]=磁碟分割區編輯器 Comment=Manage disks, partitions and file systems @@ -153,6 +155,7 @@ Comment[th]=จัดการดิสก์, พาร์ทิชัน แ Comment[tr]=Diskleri, disk bölümlerini ve dosya sistemlerini yönet Comment[ug]=دىسكىلارنى، دىسكا رايونلىرىنى ۋە ھۆججەت سىستېمىسىنى باشقۇرۇش پروگراممىسى Comment[uk]=Керуйте дисками, розділами та файловими системами +Comment[x-test]=xxManage disks, partitions and file systemsxx Comment[zh_CN]=管理磁盘、分区和文件系统 Comment[zh_TW]=管理磁碟、分割區與檔案系統 Exec=partitionmanager @@ -194,5 +197,6 @@ Keywords[sr@latin]=partition;disk;particija;disk; Keywords[sv]=partition;disk; Keywords[tr]=bölümleme;disk; Keywords[uk]=розділ;диск; +Keywords[x-test]=xxpartitionxx;xxdiskxx; Keywords[zh_CN]=partition;disk;分区;磁盘; Keywords[zh_TW]=partition;disk;分割區;磁碟;硬碟 From 77354e459905a0ff86604eb719fd0f64bf8893a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 22 Jun 2020 10:36:20 +0100 Subject: [PATCH 36/78] Fix a link in About dialog. Bug: 423338 --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index c1712ba..81449bf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -59,7 +59,7 @@ int Q_DECL_IMPORT main(int argc, char* argv[]) aboutData.addCredit(i18n("Hugo Pereira Da Costa"), xi18nc("@info:credit", "Partition Widget Design"), QStringLiteral("hugo@oxygen-icons.org")); aboutData.addCredit(xi18nc("@info:credit", "Caio Jordão Carvalho"), i18nc("@info:credit", "Improved SMART support"), QStringLiteral("caiojcarvalho@gmail.com")); - aboutData.setHomepage(QStringLiteral("https://www.kde.org/applications/system/kdepartitionmanager")); + aboutData.setHomepage(QStringLiteral("https://www.kde.org/applications/system/partitionmanager")); KAboutData::setApplicationData(aboutData); app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); From e793602823d35705123092dccb8c166cc99cf1b9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 24 Jun 2020 02:19:18 +0200 Subject: [PATCH 37/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 8d2231a..bca08fe 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -47,6 +47,7 @@ Manage disk devices, partitions and file systems on your computer Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador Spravujte disky, oddíly a souborové systémy ve vašem počítači + Gérez vos disques, partitions et systèmes de fichiers de votre ordinateur Gestisci dispositivi a disco, partizioni e file system sul tuo computer Schijfapparaten, partities en bestandssystemen op uw computer beheren Faz a gestão de dispositivos, partições e sistemas de ficheiros dos discos no seu computador From e3ba1be1838808b219c43481683566e96038bd3c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 27 Jun 2020 02:21:32 +0200 Subject: [PATCH 38/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index bca08fe..33cdab8 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -47,6 +47,8 @@ Manage disk devices, partitions and file systems on your computer Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador Spravujte disky, oddíly a souborové systémy ve vašem počítači + Gestión de discos, particiones y sistema de archivos de su equipo + Kudeatu zure sistemako disko gailuak, partizioak eta fitxategi-sistemak Gérez vos disques, partitions et systèmes de fichiers de votre ordinateur Gestisci dispositivi a disco, partizioni e file system sul tuo computer Schijfapparaten, partities en bestandssystemen op uw computer beheren @@ -107,7 +109,7 @@

    Features:

    Funciones:

    Omadused:

    -

    Eginbideak:

    +

    Ezaugarriak:

    Ominaisuudet:

    Fonctionnalités :

    Funcionalidades:

    From ce1d5b5258579cabfd3554ab98ee201956a334b4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 Jun 2020 02:23:27 +0200 Subject: [PATCH 39/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 33cdab8..bebc32e 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -47,6 +47,7 @@ Manage disk devices, partitions and file systems on your computer Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador Spravujte disky, oddíly a souborové systémy ve vašem počítači + Manage disk devices, partitions and file systems on your computer Gestión de discos, particiones y sistema de archivos de su equipo Kudeatu zure sistemako disko gailuak, partizioak eta fitxategi-sistemak Gérez vos disques, partitions et systèmes de fichiers de votre ordinateur From 17591321d297f4b65a80ef188bd5fa4d474604d5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 1 Jul 2020 02:23:11 +0200 Subject: [PATCH 40/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index bebc32e..b1444b2 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -50,6 +50,7 @@ Manage disk devices, partitions and file systems on your computer Gestión de discos, particiones y sistema de archivos de su equipo Kudeatu zure sistemako disko gailuak, partizioak eta fitxategi-sistemak + Hallitse tietokoneen levyjä, osioita ja tiedostojärjestelmiä Gérez vos disques, partitions et systèmes de fichiers de votre ordinateur Gestisci dispositivi a disco, partizioni e file system sul tuo computer Schijfapparaten, partities en bestandssystemen op uw computer beheren From 2ad0b3cf1a1c084bf012662f9917f61b0207bf97 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 Jul 2020 02:21:04 +0200 Subject: [PATCH 41/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index b1444b2..490f66a 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -53,6 +53,7 @@ Hallitse tietokoneen levyjä, osioita ja tiedostojärjestelmiä Gérez vos disques, partitions et systèmes de fichiers de votre ordinateur Gestisci dispositivi a disco, partizioni e file system sul tuo computer + 컴퓨터의 디스크 장치, 파티션, 파일 시스템 관리 Schijfapparaten, partities en bestandssystemen op uw computer beheren Faz a gestão de dispositivos, partições e sistemas de ficheiros dos discos no seu computador Gerencie dispositivos de disco, partições e sistemas de arquivos no seu computador From 56c8a84c751b6d90bb420291be9808ab74d5c5e6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 Jul 2020 02:16:00 +0200 Subject: [PATCH 42/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 490f66a..8110312 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -60,6 +60,7 @@ Hantera diskenheter, partitioner och filsystem på datorn Керування дисковими пристроями, розділами та файловими системами вашого комп'ютера xxManage disk devices, partitions and file systems on your computerxx + 管理电脑上的磁盘设备、分区和文件系统

    KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.

    «مدير كدي للأقسام» هو أداة تساعدك على إدارة أجهزة الأقراص، والأقسام وأنظمة الملفّات في حاسوبك. ويتيح لك الإنشاء، والنّسخ، والنّقل، والحذف، والتّحجيم دون فقدات البيانات، والنّسخ الاحتياطيّ واسترجاع الأقسام بسهولة.

    From 4a77a319e31a11bd4b440807937ab4fd1ce12265 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Jul 2020 02:24:23 +0200 Subject: [PATCH 43/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 8110312..cec7d78 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -57,6 +57,7 @@ Schijfapparaten, partities en bestandssystemen op uw computer beheren Faz a gestão de dispositivos, partições e sistemas de ficheiros dos discos no seu computador Gerencie dispositivos de disco, partições e sistemas de arquivos no seu computador + Upravlja diskovne naprave, razdelke diskov in datotečne sisteme na vašem računalniku Hantera diskenheter, partitioner och filsystem på datorn Керування дисковими пристроями, розділами та файловими системами вашого комп'ютера xxManage disk devices, partitions and file systems on your computerxx @@ -89,7 +90,7 @@

    O Gerenciador de Partições do KDE é um utilitário que o ajuda a gerenciar os dispositivos de disco, suas partições e sistemas de arquivos no seu computador. Permite-lhe facilmente criar, copiar, mover, excluir, redimensionar sem perder dados, criar backup e restaurar partições.

    Диспетчер разделов от KDE — утилита, позволяющая без лишних сложностей управлять дисковыми устройствами, разделами и файловыми системами на компьютере. Она способна создавать, копировать, перемещать, удалять разделы, менять их размеры без потери данных, создавать резервные копии разделов и восстанавливать из них.

    KDE správca partícií je nástroj, ktorý vám má pomôcť spravovať diskové zariadenia, partície a súborové systémy na vašom počítači. Umožňuje vám jednoducho vytvoriť, kopírovať, presúvať, mazať a meniť veľkosť bez straty dám, zálohovať a obnovovať partície.

    -

    Upravljalnik razdelkov za KDE je pripomoček, ki vam omogoča upravljanje z diski, razdelki in datotečnimi sistemi na vašem računalniku. Z njim lahko enostavno ustvarite, kopirate, premaknete, izbrišete, varnostno kopirate in obnovite ter spreminjate velikost razdelkov brez izgube podatkov.

    +

    Upravljalnik razdelkov za KDE je pripomoček, ki vam omogoča upravljanje z diski, razdelki in datotečnimi sistemi na vašem računalniku. Z njim lahko enostavno ustvarite, kopirate, premaknete, izbrišete, varnostno kopirate in obnovite ter spreminjate velikost razdelkov brez izgube podatkov.

    КДЕ‑ов менаџер партиција је алатка за управљање дисковима, партицијама и фајл системима на рачунару. Омогућава лако стварање, копирање, премештање и брисање партиција, промену величине без губитка података, прављење и враћање резерва партиција.

    KDE‑ov menadžer particija je alatka za upravljanje diskovima, particijama i fajl sistemima na računaru. Omogućava lako stvaranje, kopiranje, premeštanje i brisanje particija, promenu veličine bez gubitka podataka, pravljenje i vraćanje rezerva particija.

    КДЕ‑ов менаџер партиција је алатка за управљање дисковима, партицијама и фајл системима на рачунару. Омогућава лако стварање, копирање, премештање и брисање партиција, промену величине без губитка података, прављење и враћање резерва партиција.

    From 72c72d2cab5bb7782ee55634fe7803cf8f56e2c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 11 Jul 2020 16:02:19 +0100 Subject: [PATCH 44/78] Fix URL for reporting bugs. --- src/org.kde.partitionmanager.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index cec7d78..3ec2fbb 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -222,7 +222,7 @@     https://www.kde.org/applications/system/kdepartitionmanager/ - https://bugs.kde.org/enter_bug.cgi?format=guided&product=kdepartitionmanager + https://bugs.kde.org/enter_bug.cgi?format=guided&product=partitionmanager https://docs.kde.org/?application=partitionmanager From d8431d51094caacde630e75eafcb649b9344511f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 Jul 2020 02:23:41 +0200 Subject: [PATCH 45/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 3ec2fbb..11c3497 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -57,6 +57,7 @@ Schijfapparaten, partities en bestandssystemen op uw computer beheren Faz a gestão de dispositivos, partições e sistemas de ficheiros dos discos no seu computador Gerencie dispositivos de disco, partições e sistemas de arquivos no seu computador + Spravujte diskové zariadenia, oddiely a súborové systémy v počítači Upravlja diskovne naprave, razdelke diskov in datotečne sisteme na vašem računalniku Hantera diskenheter, partitioner och filsystem på datorn Керування дисковими пристроями, розділами та файловими системами вашого комп'ютера From 5e8adae33d3e6481324b10c915ed245769399ce8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Jul 2020 02:31:35 +0200 Subject: [PATCH 46/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 11c3497..e085e3b 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -46,6 +46,7 @@ KDE 磁碟分割區管理員 Manage disk devices, partitions and file systems on your computer Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador + Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador Spravujte disky, oddíly a souborové systémy ve vašem počítači Manage disk devices, partitions and file systems on your computer Gestión de discos, particiones y sistema de archivos de su equipo @@ -57,6 +58,7 @@ Schijfapparaten, partities en bestandssystemen op uw computer beheren Faz a gestão de dispositivos, partições e sistemas de ficheiros dos discos no seu computador Gerencie dispositivos de disco, partições e sistemas de arquivos no seu computador + Управление дисковыми устройствами, разделами и файловыми системами Spravujte diskové zariadenia, oddiely a súborové systémy v počítači Upravlja diskovne naprave, razdelke diskov in datotečne sisteme na vašem računalniku Hantera diskenheter, partitioner och filsystem på datorn From aec80851bbc2212a7afcba174740752e09112332 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Jul 2020 02:36:25 +0200 Subject: [PATCH 47/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index e085e3b..a60eec6 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -48,6 +48,7 @@ Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador Spravujte disky, oddíly a souborové systémy ve vašem počítači + Håndtér diskenheder, partitioner og filsystemer på din computer Manage disk devices, partitions and file systems on your computer Gestión de discos, particiones y sistema de archivos de su equipo Kudeatu zure sistemako disko gailuak, partizioak eta fitxategi-sistemak From 289966f66b016a03d437c9e51cb3741017be2d90 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 31 Jul 2020 02:25:28 +0200 Subject: [PATCH 48/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index a60eec6..0d6c61b 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -70,8 +70,8 @@

    KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.

    «مدير كدي للأقسام» هو أداة تساعدك على إدارة أجهزة الأقراص، والأقسام وأنظمة الملفّات في حاسوبك. ويتيح لك الإنشاء، والنّسخ، والنّقل، والحذف، والتّحجيم دون فقدات البيانات، والنّسخ الاحتياطيّ واسترجاع الأقسام بسهولة.

    El xestor de particiones de KDE ye una utilidá p'ayudate a xestionar los preseos d'almacenamientu, particiones y sistemes de ficheros del ordenador. Permítete crear, copiar, mover, desaniciar, redimensionar ensin perder datos, facer copies de seguranza y restaurar particiones fácilmente

    -

    El gestor de particions del KDE és un programa d'utilitats que us ajuda a gestionar els dispositius de disc, les particions i els sistemes de fitxers de l'ordinador. Us permet crear, moure, eliminar, redimensionar sense perdre dades, fer còpies de seguretat i restaurar particions fàcilment.

    -

    El gestor de particions del KDE és un programa d'utilitats que vos ajuda a gestionar els dispositius de disc, les particions i els sistemes de fitxers de l'ordinador. Vos permet crear, moure, eliminar, redimensionar sense perdre dades, fer còpies de seguretat i restaurar particions fàcilment.

    +

    El gestor de particions del KDE és un programa d'utilitats que us ajuda a gestionar els dispositius de disc, les particions i els sistemes de fitxers de l'ordinador. Permet crear, moure, eliminar, redimensionar sense perdre dades, fer còpies de seguretat i restaurar particions fàcilment.

    +

    El gestor de particions del KDE és un programa d'utilitats que vos ajuda a gestionar els dispositius de disc, les particions i els sistemes de fitxers de l'ordinador. Permet crear, moure, eliminar, redimensionar sense perdre dades, fer còpies de seguretat i restaurar particions fàcilment.

    KDE Partition Manager er et værktøj til at hjælpe dig med at håndtere dine diskenheder og filsystemerne på din computer. Den lader dig nemt oprette, kopiere, flytte, slette, ændre størrelse uden at miste data, tage backup og gendanne partitioner.

    KDE-Partitionsverwaltung ist ein Dienstprogramm zur Verwaltung der Festplattengeräte, Partitionen und Dateisystemen auf Ihrem Rechner. Damit können Sie Partitionen einfach erstellen, kopieren, verschieben, deren Größe ohne Datenverlust verändern und Partitionen sichern und wieder herstellen.

    Ο διαχειριστής κατατμήσεων του KDE είναι ένα εργαλείο που σας βοηθά να διαχειριστείτε τους δίσκους, τις κατατμήσεις και τα συστήματα αρχείων του υπολογιστή σας. Σας επιτρέπει να δημιουργείτε,αντιγράφετε, μετακινείτε, διαγράφετε, να αλλάζετε το μέγεθος χωρίς να χάνετε δεδομένα, να κρατάτε αντίγραφα ασφαλείας και να επαναφέρετε κατατμήσεις εύκολα.

    @@ -188,8 +188,8 @@
  • Makes use of already available external programs to get its job done
  • يستخدم البرامج الخارجيّة المتوفّرة لإنهاء عمله
  • Fai usu de programes esternos que yá tean disponibles pa facer el trabayu
    • -
  • Fa ús de programes externs ja disponibles per fer la seva feina
    • -
  • Fa ús de programes externs ja disponibles per fer la seua faena
    • +
  • Fa ús de programes externs ja disponibles per a fer la seva feina
    • +
  • Fa ús de programes externs ja disponibles per a fer la seua faena
  • Gør brug af allerede tilgængelige eksterne programmer til at udføre arbejdet
  • Verwendet bereits vorhandene externe Programme, um die Aufgaben zu erfüllen
  • Χρησιμοποιεί τα ήδη διαθέσιμα εξωτερικά προγράμματα για να κάνει τη δουλειά του
    • From c3c5fd88371b5af4583801066956a5c73537529d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 10 Sep 2020 01:23:37 +0100 Subject: [PATCH 49/78] Move KMessageBox outside if statement. --- src/gui/editmountpointdialog.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/editmountpointdialog.cpp b/src/gui/editmountpointdialog.cpp index c6d07d2..da2f50d 100644 --- a/src/gui/editmountpointdialog.cpp +++ b/src/gui/editmountpointdialog.cpp @@ -64,13 +64,14 @@ EditMountPointDialog::~EditMountPointDialog() void EditMountPointDialog::accept_(MountPointAction action) { - if (KMessageBox::warningContinueCancel(this, + const auto dialogResult = KMessageBox::warningContinueCancel(this, xi18nc("@info", "Are you sure you want to save the changes you made to the system table file /etc/fstab?" "This will overwrite the existing file on your hard drive now. This can not be undone."), xi18nc("@title:window", "Really save changes?"), KGuiItem(xi18nc("@action:button", "Save changes"), QStringLiteral("arrow-right")), KStandardGuiItem::cancel(), - QStringLiteral("reallyWriteMountPoints")) == KMessageBox::Cancel) + QStringLiteral("reallyWriteMountPoints")); + if (dialogResult == KMessageBox::Cancel) return; if(action == MountPointAction::Remove) widget().removeMountPoint(); From 0b77294e3de9bc195faaf39c0e2a55c9b3048893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 12 Sep 2020 23:21:18 +0100 Subject: [PATCH 50/78] Port away from KRun to KIO::OpenUrlJob Also bump minimum KF5 version to 5.71 --- CMakeLists.txt | 2 +- src/gui/applyprogressdialog.cpp | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29f5d2d..16dd89e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) # Dependencies set(QT_MIN_VERSION "5.10.0") -set(KF5_MIN_VERSION "5.56") +set(KF5_MIN_VERSION "5.71") set(KPMCORE_MIN_VERSION "4.1.0") set(CMAKE_USE_RELATIVE_PATHS OFF) diff --git a/src/gui/applyprogressdialog.cpp b/src/gui/applyprogressdialog.cpp index a3f7412..2650933 100644 --- a/src/gui/applyprogressdialog.cpp +++ b/src/gui/applyprogressdialog.cpp @@ -43,8 +43,8 @@ #include #include -#include #include +#include #include #include #include @@ -440,8 +440,6 @@ void ApplyProgressDialog::browserReport() { QTemporaryFile file; - // Make sure the temp file is created somewhere another user can read it: KRun::runUrl() will open - // the file as the logged in user, not as the user running our application. file.setFileTemplate(QStringLiteral("/tmp/") + QCoreApplication::applicationName() + QStringLiteral("-XXXXXX.html")); file.setAutoRemove(false); @@ -454,11 +452,10 @@ void ApplyProgressDialog::browserReport() << report().toHtml() << html.footer(); - // set the temp file's permission for everyone to read it. - file.setPermissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ReadGroup | QFile::ReadOther); + file.setPermissions(QFile::ReadOwner | QFile::WriteOwner); - if (!KRun::runUrl(QUrl::fromLocalFile(file.fileName()), QStringLiteral("text/html"), this, KRun::RunFlags())) - KMessageBox::sorry(this, xi18nc("@info", "The configured external browser could not be run. Please check your settings."), xi18nc("@title:window", "Could Not Launch Browser.")); + auto *job = new KIO::OpenUrlJob(QUrl::fromLocalFile(file.fileName()), QStringLiteral("text/html"), this); + job->start(); } else KMessageBox::sorry(this, xi18nc("@info", "Could not create temporary file %1 for writing.", file.fileName()), i18nc("@title:window", "Could Not Launch Browser.")); } From 89dcf7855c8d57f418a7a70c2edbcbef247a9a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 14 Sep 2020 00:42:35 +0100 Subject: [PATCH 51/78] Fix an infinite loop in remove mount point function. --- src/gui/editmountpointdialogwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/editmountpointdialogwidget.cpp b/src/gui/editmountpointdialogwidget.cpp index 768aef4..73f6f2f 100644 --- a/src/gui/editmountpointdialogwidget.cpp +++ b/src/gui/editmountpointdialogwidget.cpp @@ -174,7 +174,7 @@ void EditMountPointDialogWidget::buttonSelectClicked(bool) void EditMountPointDialogWidget::removeMountPoint() { - for (auto it = fstabEntries().begin(); it != fstabEntries().end(); ) { + for (auto it = fstabEntries().begin(); it != fstabEntries().end(); ++it) { if (editPath().count() <= 1 && ( (it->fsSpec().contains(partition().deviceNode()) && !partition().deviceNode().isEmpty() ) || (it->fsSpec().contains(partition().fileSystem().uuid()) && !partition().fileSystem().uuid().isEmpty() ) || From 62e330b0f9e2bc710e770c9e4ce0a9b1d3961cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 14 Sep 2020 00:46:02 +0100 Subject: [PATCH 52/78] Remove an extra pair of brackets. --- src/gui/editmountpointdialogwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/editmountpointdialogwidget.cpp b/src/gui/editmountpointdialogwidget.cpp index 73f6f2f..d02364d 100644 --- a/src/gui/editmountpointdialogwidget.cpp +++ b/src/gui/editmountpointdialogwidget.cpp @@ -185,7 +185,7 @@ void EditMountPointDialogWidget::removeMountPoint() fstabEntries().erase(it); partition().setMountPoint(QString()); } - else if (editPath().count() > 1 && ((&*it == currentEntry))) + else if (editPath().count() > 1 && (&*it == currentEntry)) { fstabEntries().erase(it); editPath().removeItem(editPath().currentIndex()); From 49edfe66abc0ff28067dae1064644a5790daf809 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 14 Sep 2020 02:34:05 +0200 Subject: [PATCH 53/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 0d6c61b..67f252a 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -49,6 +49,7 @@ Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador Spravujte disky, oddíly a souborové systémy ve vašem počítači Håndtér diskenheder, partitioner og filsystemer på din computer + Διαχειρίζεται συσκευές δίσκων, κατατμήσεις και συστήματα αρχείων στον υπολογιστή σας Manage disk devices, partitions and file systems on your computer Gestión de discos, particiones y sistema de archivos de su equipo Kudeatu zure sistemako disko gailuak, partizioak eta fitxategi-sistemak @@ -59,6 +60,7 @@ Schijfapparaten, partities en bestandssystemen op uw computer beheren Faz a gestão de dispositivos, partições e sistemas de ficheiros dos discos no seu computador Gerencie dispositivos de disco, partições e sistemas de arquivos no seu computador + Gestionează discuri, partiții și sisteme de fișiere din calculator Управление дисковыми устройствами, разделами и файловыми системами Spravujte diskové zariadenia, oddiely a súborové systémy v počítači Upravlja diskovne naprave, razdelke diskov in datotečne sisteme na vašem računalniku @@ -92,6 +94,7 @@

    Zarządzanie partycjami KDE jest programem użytkowym mającym na celu pomoc przy zarządzaniu urządzeniami dyskowymi, partycjami i systemami plików na twoim komputerze. Umożliwia łatwe tworzenie, kopiowanie, przenoszenie, usuwanie i zamianę rozmiaru bez utraty danych, a także tworzenie i przywracanie kopii zapasowych partycji.

    O Gestor de Partições do KDE é um utilitário que o ajuda a gerir os dispositivos dos discos, as suas partições e sistemas de ficheiros no seu computador. Permite-lhe facilmente criar, copiar, mover, apagar, dimensionar sem perder dados, salvaguardar e repor partições.

    O Gerenciador de Partições do KDE é um utilitário que o ajuda a gerenciar os dispositivos de disco, suas partições e sistemas de arquivos no seu computador. Permite-lhe facilmente criar, copiar, mover, excluir, redimensionar sem perder dados, criar backup e restaurar partições.

    +

    Gestionarul de partiții KDE este un utilitar ce vă ajută să gestionați discuri, partiții și sisteme de fișiere din calculator. Acesta vă permite cu ușurință să creați, copiați, mutați, ștergeți, redimensionați fără pierderea datelor, faceți copii de rezervă și restabiliți partiții.

    Диспетчер разделов от KDE — утилита, позволяющая без лишних сложностей управлять дисковыми устройствами, разделами и файловыми системами на компьютере. Она способна создавать, копировать, перемещать, удалять разделы, менять их размеры без потери данных, создавать резервные копии разделов и восстанавливать из них.

    KDE správca partícií je nástroj, ktorý vám má pomôcť spravovať diskové zariadenia, partície a súborové systémy na vašom počítači. Umožňuje vám jednoducho vytvoriť, kopírovať, presúvať, mazať a meniť veľkosť bez straty dám, zálohovať a obnovovať partície.

    Upravljalnik razdelkov za KDE je pripomoček, ki vam omogoča upravljanje z diski, razdelki in datotečnimi sistemi na vašem računalniku. Z njim lahko enostavno ustvarite, kopirate, premaknete, izbrišete, varnostno kopirate in obnovite ter spreminjate velikost razdelkov brez izgube podatkov.

    @@ -172,6 +175,7 @@
  • Obsługa wielu systemów plików, uwzględniając przy tym ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS i więcej
  • Suporta um grande conjunto de sistemas de ficheiros, incluindo o ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS entre outros
  • Suporte a um grande conjunto de sistemas de arquivos, incluindo o ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS, entre outros
    • +
  • Susține un număr mare de sisteme de fișiere, inclusiv ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS și altele
  • Поддержка большого числа файловых систем, в том числе ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS и других.
  • Podporuje veľký počet súborových systémov, vrátane ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS a viac
  • Podpira številne datotečne sisteme vključno z ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS in XFS
    • @@ -210,6 +214,7 @@
  • Wykorzystywanie już dostępnych programów zewnętrznych do wykonywania swojej pracy
  • Tira partido dos programas externos já existentes para terminar a sua tarefa
  • Utiliza os programas externos já existentes para terminar a sua tarefa
    • +
  • Folosește programele externe disponibile pentru a-și face meseria
  • Полагается на доступные внешние программы для выполнения задач.
  • Používa už existujúce dostupné externé programy na vykonanie svojej práce
  • Za izvedbo poslov uporablja že obstoječe zunanje programe
    • From fff8a8ccb4a98cc7768a03e19c8a6cd99b81455a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 14 Sep 2020 06:15:50 +0200 Subject: [PATCH 54/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index a25188e..90c5ae4 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -187,6 +187,7 @@ Keywords[pa]=ਪਾਰਟੀਸ਼ਨ;ਡਿਸਕ; Keywords[pl]=partycja;dysk; Keywords[pt]=partição;disco; Keywords[pt_BR]=partição;disco; +Keywords[ro]=partiție;disc; Keywords[ru]=раздел;диск; Keywords[sk]=oddiel;partícia;disk; Keywords[sl]=razdelek;particija;disk; From 51f4a2da046af79245805f1e304993a345571588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 15 Sep 2020 02:26:38 +0100 Subject: [PATCH 55/78] Compile partitionmanager with Q_NO_KEYWORDS. --- CMakeLists.txt | 1 + src/config/configureoptionsdialog.cpp | 2 +- src/gui/listdevices.cpp | 4 ++-- src/gui/mainwindow.cpp | 2 +- src/gui/partitionmanagerwidget.cpp | 16 ++++++++-------- src/gui/parttablewidget.cpp | 4 ++-- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16dd89e..d5ec376 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,7 @@ add_definitions( -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_USE_FAST_OPERATOR_PLUS -DQT_DISABLE_DEPRECATED_BEFORE=0x050900 + -DQ_NO_KEYWORDS ) find_package(KPMcore ${KPMCORE_MIN_VERSION} REQUIRED) diff --git a/src/config/configureoptionsdialog.cpp b/src/config/configureoptionsdialog.cpp index 6c31f74..fa98d72 100644 --- a/src/config/configureoptionsdialog.cpp +++ b/src/config/configureoptionsdialog.cpp @@ -96,7 +96,7 @@ void ConfigureOptionsDialog::updateSettings() } if (changed) - emit KConfigDialog::settingsChanged(i18n("General Settings")); + Q_EMIT KConfigDialog::settingsChanged(i18n("General Settings")); } bool ConfigureOptionsDialog::hasChanged() diff --git a/src/gui/listdevices.cpp b/src/gui/listdevices.cpp index a2ed8c4..600868d 100644 --- a/src/gui/listdevices.cpp +++ b/src/gui/listdevices.cpp @@ -63,7 +63,7 @@ void ListDevices::on_m_ListDevices_itemSelectionChanged() ListDeviceWidgetItem* item = dynamic_cast(listDevices().selectedItems()[0]); if (item != nullptr) - emit selectionChanged(item->deviceNode); + Q_EMIT selectionChanged(item->deviceNode); } } @@ -72,7 +72,7 @@ void ListDevices::on_m_ListDevices_itemDoubleClicked(QListWidgetItem* list_item) ListDeviceWidgetItem* item = dynamic_cast(list_item); if (item != nullptr) - emit deviceDoubleClicked(item->deviceNode); + Q_EMIT deviceDoubleClicked(item->deviceNode); } bool ListDevices::setSelectedDevice(const QString& device_node) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index c20465a..a721271 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1192,7 +1192,7 @@ void MainWindow::onSettingsChanged() PartitionAlignment::setSectorAlignment(Config::sectorAlignment()); - emit settingsChanged(); + Q_EMIT settingsChanged(); } void MainWindow::onConfigureOptions() diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp index dbf0135..d23b046 100644 --- a/src/gui/partitionmanagerwidget.cpp +++ b/src/gui/partitionmanagerwidget.cpp @@ -166,7 +166,7 @@ void PartitionManagerWidget::setSelectedPartition(const Partition* p) { if (p == nullptr) { treePartitions().setCurrentItem(nullptr); - emit selectedPartitionChanged(nullptr); + Q_EMIT selectedPartitionChanged(nullptr); updatePartitions(); } else partTableWidget().setActivePartition(p); @@ -299,10 +299,10 @@ void PartitionManagerWidget::on_m_TreePartitions_itemDoubleClicked(QTreeWidgetIt { if (item == treePartitions().topLevelItem(0)) { if (selectedDevice() != nullptr) - emit deviceDoubleClicked(selectedDevice()); + Q_EMIT deviceDoubleClicked(selectedDevice()); } else { if (selectedPartition() != nullptr) - emit partitionDoubleClicked(selectedPartition()); + Q_EMIT partitionDoubleClicked(selectedPartition()); } } @@ -315,7 +315,7 @@ void PartitionManagerWidget::on_m_PartTableWidget_itemSelectionChanged(PartWidge { if (item == nullptr) { treePartitions().setCurrentItem(nullptr); - emit selectedPartitionChanged(nullptr); + Q_EMIT selectedPartitionChanged(nullptr); return; } @@ -336,23 +336,23 @@ void PartitionManagerWidget::on_m_PartTableWidget_itemSelectionChanged(PartWidge } } - emit selectedPartitionChanged(p); + Q_EMIT selectedPartitionChanged(p); } void PartitionManagerWidget::on_m_PartTableWidget_customContextMenuRequested(const QPoint& pos) { - emit contextMenuRequested(partTableWidget().mapToGlobal(pos)); + Q_EMIT contextMenuRequested(partTableWidget().mapToGlobal(pos)); } void PartitionManagerWidget::on_m_PartTableWidget_itemDoubleClicked() { if (selectedPartition()) - emit partitionDoubleClicked(selectedPartition()); + Q_EMIT partitionDoubleClicked(selectedPartition()); } void PartitionManagerWidget::on_m_TreePartitions_customContextMenuRequested(const QPoint& pos) { - emit contextMenuRequested(treePartitions().viewport()->mapToGlobal(pos)); + Q_EMIT contextMenuRequested(treePartitions().viewport()->mapToGlobal(pos)); } void PartitionManagerWidget::onPropertiesPartition() diff --git a/src/gui/parttablewidget.cpp b/src/gui/parttablewidget.cpp index e5e9eeb..83dcc92 100644 --- a/src/gui/parttablewidget.cpp +++ b/src/gui/parttablewidget.cpp @@ -103,7 +103,7 @@ void PartTableWidget::setActiveWidget(PartWidget* p) if (p != nullptr) p->setActive(true); - emit itemSelectionChanged(p); + Q_EMIT itemSelectionChanged(p); update(); } @@ -175,5 +175,5 @@ void PartTableWidget::mouseDoubleClickEvent(QMouseEvent* event) const PartWidget* child = static_cast(childAt(event->pos())); if (child != nullptr) - emit itemDoubleClicked(child); + Q_EMIT itemDoubleClicked(child); } From 26bc8be472e1eb8b0973f77427b0b01a370a3703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 15 Sep 2020 02:37:22 +0100 Subject: [PATCH 56/78] Fix a typo. --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5ec376..b96683c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,10 +80,9 @@ add_definitions( -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_CAST_TO_BYTEARRAY - -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_USE_FAST_OPERATOR_PLUS -DQT_DISABLE_DEPRECATED_BEFORE=0x050900 - -DQ_NO_KEYWORDS + -DQT_NO_KEYWORDS ) find_package(KPMcore ${KPMCORE_MIN_VERSION} REQUIRED) From 6ab1e3aa13605b27d807d334d6446585ed1df41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 15 Sep 2020 22:33:05 +0100 Subject: [PATCH 57/78] Port away from deprecated QTime::elapsed. --- src/gui/applyprogressdialog.cpp | 2 +- src/gui/applyprogressdialog.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/applyprogressdialog.cpp b/src/gui/applyprogressdialog.cpp index 2650933..75bca24 100644 --- a/src/gui/applyprogressdialog.cpp +++ b/src/gui/applyprogressdialog.cpp @@ -72,7 +72,7 @@ ApplyProgressDialog::ApplyProgressDialog(QWidget* parent, OperationRunner& orunn m_Report(nullptr), m_SavedParentTitle(mainWindow(this)->windowTitle()), m_Timer(this), - m_Time(), + m_ElapsedTimer(), m_CurrentOpItem(nullptr), m_CurrentJobItem(nullptr), m_LastReportUpdate(0) diff --git a/src/gui/applyprogressdialog.h b/src/gui/applyprogressdialog.h index b838bb0..df4b1d6 100644 --- a/src/gui/applyprogressdialog.h +++ b/src/gui/applyprogressdialog.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include class OperationRunner; @@ -124,8 +124,8 @@ protected: void allOpsDone(const QString& msg); - QTime& time() { - return m_Time; + QElapsedTimer& time() { + return m_ElapsedTimer; } QTimer& timer() { @@ -171,7 +171,7 @@ private: Report* m_Report; QString m_SavedParentTitle; QTimer m_Timer; - QTime m_Time; + QElapsedTimer m_ElapsedTimer; QTreeWidgetItem* m_CurrentOpItem; QTreeWidgetItem* m_CurrentJobItem; int m_LastReportUpdate; From ad48c72af85a201e0891803bfc1d1812bc3f6205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 16 Sep 2020 00:35:12 +0100 Subject: [PATCH 58/78] Switch to SPDX license headers. --- src/config/advancedpagewidget.cpp | 23 +++++------------- src/config/advancedpagewidget.h | 23 +++++------------- src/config/configureoptionsdialog.cpp | 23 +++++------------- src/config/configureoptionsdialog.h | 23 +++++------------- src/config/filesystemcolorspagewidget.cpp | 21 ++++------------ src/config/filesystemcolorspagewidget.h | 22 +++++------------ src/config/generalpagewidget.cpp | 23 +++++------------- src/config/generalpagewidget.h | 25 +++++++------------ src/gui/applyprogressdetailswidget.cpp | 21 ++++------------ src/gui/applyprogressdetailswidget.h | 21 ++++------------ src/gui/applyprogressdialog.cpp | 23 +++++------------- src/gui/applyprogressdialog.h | 23 +++++------------- src/gui/applyprogressdialogwidget.cpp | 22 +++++------------ src/gui/applyprogressdialogwidget.h | 23 ++++++------------ src/gui/createpartitiontabledialog.cpp | 25 +++++++------------ src/gui/createpartitiontabledialog.h | 23 +++++------------- src/gui/createpartitiontablewidget.cpp | 23 +++++------------- src/gui/createpartitiontablewidget.h | 23 ++++++------------ src/gui/createvolumegroupdialog.cpp | 25 +++++++------------ src/gui/createvolumegroupdialog.h | 24 +++++++------------ src/gui/devicepropsdialog.cpp | 23 +++++------------- src/gui/devicepropsdialog.h | 23 +++++------------- src/gui/devicepropswidget.cpp | 21 ++++------------ src/gui/devicepropswidget.h | 23 ++++++------------ src/gui/editmountoptionsdialog.cpp | 23 +++++------------- src/gui/editmountoptionsdialog.h | 23 +++++------------- src/gui/editmountoptionsdialogwidget.cpp | 21 ++++------------ src/gui/editmountoptionsdialogwidget.h | 21 ++++------------ src/gui/editmountpointdialog.cpp | 26 +++++++------------- src/gui/editmountpointdialog.h | 24 ++++++------------- src/gui/editmountpointdialogwidget.cpp | 24 ++++++------------- src/gui/editmountpointdialogwidget.h | 23 ++++++------------ src/gui/filesystemsupportdialog.cpp | 23 +++++------------- src/gui/filesystemsupportdialog.h | 23 ++++++------------ src/gui/filesystemsupportdialogwidget.cpp | 21 ++++------------ src/gui/filesystemsupportdialogwidget.h | 23 ++++++------------ src/gui/formattedspinbox.cpp | 23 +++++------------- src/gui/formattedspinbox.h | 21 ++++------------ src/gui/infopane.cpp | 25 +++++++------------ src/gui/infopane.h | 23 ++++++------------ src/gui/insertdialog.cpp | 23 +++++------------- src/gui/insertdialog.h | 22 +++++------------ src/gui/listdevices.cpp | 23 +++++------------- src/gui/listdevices.h | 23 ++++++------------ src/gui/listoperations.cpp | 23 +++++------------- src/gui/listoperations.h | 24 +++++++------------ src/gui/listphysicalvolumes.cpp | 23 +++++------------- src/gui/listphysicalvolumes.h | 23 ++++++------------ src/gui/mainwindow.cpp | 29 +++++++++-------------- src/gui/mainwindow.h | 25 +++++++------------ src/gui/newdialog.cpp | 27 +++++++-------------- src/gui/newdialog.h | 23 ++++++------------ src/gui/partitionmanagerwidget.cpp | 27 +++++++-------------- src/gui/partitionmanagerwidget.h | 25 +++++++------------ src/gui/partpropsdialog.cpp | 25 +++++++------------ src/gui/partpropsdialog.h | 23 +++++------------- src/gui/partpropswidget.h | 24 +++++++------------ src/gui/parttablewidget.cpp | 23 +++++------------- src/gui/parttablewidget.h | 24 +++++++------------ src/gui/resizedialog.cpp | 24 ++++++------------- src/gui/resizedialog.h | 22 +++++------------ src/gui/resizevolumegroupdialog.cpp | 25 +++++++------------ src/gui/resizevolumegroupdialog.h | 22 +++++------------ src/gui/scanprogressdialog.cpp | 23 +++++------------- src/gui/scanprogressdialog.h | 23 ++++++------------ src/gui/sizedetailswidget.cpp | 22 +++++------------ src/gui/sizedetailswidget.h | 23 ++++++------------ src/gui/sizedialogbase.cpp | 26 +++++++------------- src/gui/sizedialogbase.h | 25 +++++++------------ src/gui/sizedialogwidget.cpp | 21 ++++------------ src/gui/sizedialogwidget.h | 24 ++++++------------- src/gui/smartdialog.cpp | 23 +++++------------- src/gui/smartdialog.h | 23 +++++------------- src/gui/smartdialogwidget.cpp | 22 +++++------------ src/gui/smartdialogwidget.h | 23 ++++++------------ src/gui/treelog.cpp | 23 +++++------------- src/gui/treelog.h | 23 ++++++------------ src/gui/volumegroupdialog.cpp | 24 ++++++------------- src/gui/volumegroupdialog.h | 23 +++++------------- src/gui/volumegroupwidget.cpp | 21 ++++------------ src/gui/volumegroupwidget.h | 23 ++++++------------ src/main.cpp | 24 ++++++------------- src/util/guihelpers.cpp | 23 +++++------------- src/util/guihelpers.h | 23 +++++------------- 84 files changed, 556 insertions(+), 1397 deletions(-) diff --git a/src/config/advancedpagewidget.cpp b/src/config/advancedpagewidget.cpp index 57ccbf8..b6d7fc3 100644 --- a/src/config/advancedpagewidget.cpp +++ b/src/config/advancedpagewidget.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "config/advancedpagewidget.h" diff --git a/src/config/advancedpagewidget.h b/src/config/advancedpagewidget.h index 1dfe490..711a176 100644 --- a/src/config/advancedpagewidget.h +++ b/src/config/advancedpagewidget.h @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(ADVANCEDPAGEWIDGET_H) diff --git a/src/config/configureoptionsdialog.cpp b/src/config/configureoptionsdialog.cpp index fa98d72..c8cf51c 100644 --- a/src/config/configureoptionsdialog.cpp +++ b/src/config/configureoptionsdialog.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "config/configureoptionsdialog.h" #include "config/generalpagewidget.h" diff --git a/src/config/configureoptionsdialog.h b/src/config/configureoptionsdialog.h index 718445d..52f5842 100644 --- a/src/config/configureoptionsdialog.h +++ b/src/config/configureoptionsdialog.h @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(CONFIGUREOPTIONSDIALOG_H) diff --git a/src/config/filesystemcolorspagewidget.cpp b/src/config/filesystemcolorspagewidget.cpp index f9b5800..c59221f 100644 --- a/src/config/filesystemcolorspagewidget.cpp +++ b/src/config/filesystemcolorspagewidget.cpp @@ -1,19 +1,8 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "config/filesystemcolorspagewidget.h" diff --git a/src/config/filesystemcolorspagewidget.h b/src/config/filesystemcolorspagewidget.h index 2db752e..80ba551 100644 --- a/src/config/filesystemcolorspagewidget.h +++ b/src/config/filesystemcolorspagewidget.h @@ -1,19 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + + SPDX-License-Identifier: GPL-3.0-or-later +*/ + #if !defined(FILESYSTEMCOLORSPAGEWIDGET_H) diff --git a/src/config/generalpagewidget.cpp b/src/config/generalpagewidget.cpp index c596313..d1beb2c 100644 --- a/src/config/generalpagewidget.cpp +++ b/src/config/generalpagewidget.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "config/generalpagewidget.h" diff --git a/src/config/generalpagewidget.h b/src/config/generalpagewidget.h index 89c59af..812e10a 100644 --- a/src/config/generalpagewidget.h +++ b/src/config/generalpagewidget.h @@ -1,20 +1,11 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ + #if !defined(GENERALPAGEWIDGET_H) diff --git a/src/gui/applyprogressdetailswidget.cpp b/src/gui/applyprogressdetailswidget.cpp index c83d5aa..6c20314 100644 --- a/src/gui/applyprogressdetailswidget.cpp +++ b/src/gui/applyprogressdetailswidget.cpp @@ -1,18 +1,7 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/applyprogressdetailswidget.h" diff --git a/src/gui/applyprogressdetailswidget.h b/src/gui/applyprogressdetailswidget.h index 68b34b2..2b20851 100644 --- a/src/gui/applyprogressdetailswidget.h +++ b/src/gui/applyprogressdetailswidget.h @@ -1,19 +1,8 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(APPLYPROGRESSDETAILSWIDGET_H) diff --git a/src/gui/applyprogressdialog.cpp b/src/gui/applyprogressdialog.cpp index 75bca24..e825852 100644 --- a/src/gui/applyprogressdialog.cpp +++ b/src/gui/applyprogressdialog.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/applyprogressdialog.h" diff --git a/src/gui/applyprogressdialog.h b/src/gui/applyprogressdialog.h index df4b1d6..570bcbc 100644 --- a/src/gui/applyprogressdialog.h +++ b/src/gui/applyprogressdialog.h @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008, 2012 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #ifndef APPLYPROGRESSDIALOG_H #define APPLYPROGRESSDIALOG_H diff --git a/src/gui/applyprogressdialogwidget.cpp b/src/gui/applyprogressdialogwidget.cpp index 4a834b9..dfef594 100644 --- a/src/gui/applyprogressdialogwidget.cpp +++ b/src/gui/applyprogressdialogwidget.cpp @@ -1,19 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/applyprogressdialogwidget.h" diff --git a/src/gui/applyprogressdialogwidget.h b/src/gui/applyprogressdialogwidget.h index 170ecb6..88cb504 100644 --- a/src/gui/applyprogressdialogwidget.h +++ b/src/gui/applyprogressdialogwidget.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2008 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2016-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(APPLYPROGRESSDIALOGWIDGET_H) diff --git a/src/gui/createpartitiontabledialog.cpp b/src/gui/createpartitiontabledialog.cpp index e5be1bd..a345c54 100644 --- a/src/gui/createpartitiontabledialog.cpp +++ b/src/gui/createpartitiontabledialog.cpp @@ -1,20 +1,11 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2016 Andrius Štikonas + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/createpartitiontabledialog.h" #include "gui/createpartitiontablewidget.h" diff --git a/src/gui/createpartitiontabledialog.h b/src/gui/createpartitiontabledialog.h index 508ae88..2eecfed 100644 --- a/src/gui/createpartitiontabledialog.h +++ b/src/gui/createpartitiontabledialog.h @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(CREATEPARTITIONTABLEDIALOG_H) diff --git a/src/gui/createpartitiontablewidget.cpp b/src/gui/createpartitiontablewidget.cpp index ceb07fa..a2c38ad 100644 --- a/src/gui/createpartitiontablewidget.cpp +++ b/src/gui/createpartitiontablewidget.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2016 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/createpartitiontablewidget.h" diff --git a/src/gui/createpartitiontablewidget.h b/src/gui/createpartitiontablewidget.h index f637c30..9d8e168 100644 --- a/src/gui/createpartitiontablewidget.h +++ b/src/gui/createpartitiontablewidget.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2016 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(CREATEPARTITIONTABLEWIDGET_H) diff --git a/src/gui/createvolumegroupdialog.cpp b/src/gui/createvolumegroupdialog.cpp index 602e9c0..8801213 100644 --- a/src/gui/createvolumegroupdialog.cpp +++ b/src/gui/createvolumegroupdialog.cpp @@ -1,20 +1,11 @@ -/************************************************************************* - * Copyright (C) 2016 by Chantara Tith * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2016 Andrius Štikonas + SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/createvolumegroupdialog.h" #include "gui/volumegroupwidget.h" diff --git a/src/gui/createvolumegroupdialog.h b/src/gui/createvolumegroupdialog.h index 4dcf2dc..8710e59 100644 --- a/src/gui/createvolumegroupdialog.h +++ b/src/gui/createvolumegroupdialog.h @@ -1,19 +1,11 @@ -/************************************************************************* - * Copyright (C) 2016 by Chantara Tith * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2017 Andrius Štikonas + SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho + + SPDX-License-Identifier: GPL-3.0-or-later +*/ + #ifndef CREATEVOLUMEGROUPDIALOG_H #define CREATEVOLUMEGROUPDIALOG_H diff --git a/src/gui/devicepropsdialog.cpp b/src/gui/devicepropsdialog.cpp index 8f42dea..c950a77 100644 --- a/src/gui/devicepropsdialog.cpp +++ b/src/gui/devicepropsdialog.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008, 2009 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/devicepropsdialog.h" #include "gui/devicepropswidget.h" diff --git a/src/gui/devicepropsdialog.h b/src/gui/devicepropsdialog.h index 36c7304..2621ace 100644 --- a/src/gui/devicepropsdialog.h +++ b/src/gui/devicepropsdialog.h @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008, 2009 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(DEVICEPROPSDIALOG_H) diff --git a/src/gui/devicepropswidget.cpp b/src/gui/devicepropswidget.cpp index 8df0d93..25f1f0c 100644 --- a/src/gui/devicepropswidget.cpp +++ b/src/gui/devicepropswidget.cpp @@ -1,19 +1,8 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/devicepropswidget.h" diff --git a/src/gui/devicepropswidget.h b/src/gui/devicepropswidget.h index e29baa8..f39ae0b 100644 --- a/src/gui/devicepropswidget.h +++ b/src/gui/devicepropswidget.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(DEVICEPROPSWIDGET_H) diff --git a/src/gui/editmountoptionsdialog.cpp b/src/gui/editmountoptionsdialog.cpp index eecc137..5cf3a43 100644 --- a/src/gui/editmountoptionsdialog.cpp +++ b/src/gui/editmountoptionsdialog.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2009, 2010 by Volker Lanz * - * Copyright (C) 2017 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/editmountoptionsdialog.h" #include "gui/editmountoptionsdialogwidget.h" diff --git a/src/gui/editmountoptionsdialog.h b/src/gui/editmountoptionsdialog.h index 65b1217..deaa9d4 100644 --- a/src/gui/editmountoptionsdialog.h +++ b/src/gui/editmountoptionsdialog.h @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2009, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(EDITMOUNTOPTIONSDIALOG_H) diff --git a/src/gui/editmountoptionsdialogwidget.cpp b/src/gui/editmountoptionsdialogwidget.cpp index 4047078..4eda4e8 100644 --- a/src/gui/editmountoptionsdialogwidget.cpp +++ b/src/gui/editmountoptionsdialogwidget.cpp @@ -1,19 +1,8 @@ -/************************************************************************* - * Copyright (C) 2009, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/editmountoptionsdialogwidget.h" diff --git a/src/gui/editmountoptionsdialogwidget.h b/src/gui/editmountoptionsdialogwidget.h index d3b3b08..01d2f0c 100644 --- a/src/gui/editmountoptionsdialogwidget.h +++ b/src/gui/editmountoptionsdialogwidget.h @@ -1,19 +1,8 @@ -/************************************************************************* - * Copyright (C) 2009, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(EDITMOUNTOPTIONSDIALOGWIDGET_H) diff --git a/src/gui/editmountpointdialog.cpp b/src/gui/editmountpointdialog.cpp index da2f50d..8c7df5d 100644 --- a/src/gui/editmountpointdialog.cpp +++ b/src/gui/editmountpointdialog.cpp @@ -1,21 +1,11 @@ -/************************************************************************* - * Copyright (C) 2009, 2010 by Volker Lanz * - * Copyright (C) 2015 by Teo Mrnjavac * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + SPDX-FileCopyrightText: 2015 Teo Mrnjavac + SPDX-FileCopyrightText: 2018 Abhijeet Sharma + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/editmountpointdialog.h" #include "gui/editmountpointdialogwidget.h" diff --git a/src/gui/editmountpointdialog.h b/src/gui/editmountpointdialog.h index e1905ad..614e703 100644 --- a/src/gui/editmountpointdialog.h +++ b/src/gui/editmountpointdialog.h @@ -1,20 +1,10 @@ -/************************************************************************* - * Copyright (C) 2009, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2018 Abhijeet Sharma + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(EDITMOUNTPOINTDIALOG_H) diff --git a/src/gui/editmountpointdialogwidget.cpp b/src/gui/editmountpointdialogwidget.cpp index d02364d..9b5dd9b 100644 --- a/src/gui/editmountpointdialogwidget.cpp +++ b/src/gui/editmountpointdialogwidget.cpp @@ -1,20 +1,10 @@ -/************************************************************************* - * Copyright (C) 2009, 2010 by Volker Lanz * - * Copyright (C) 2016, 2017 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + SPDX-FileCopyrightText: 2018 Abhijeet Sharma + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/editmountpointdialogwidget.h" #include "gui/editmountoptionsdialog.h" diff --git a/src/gui/editmountpointdialogwidget.h b/src/gui/editmountpointdialogwidget.h index e248b21..0a0ad34 100644 --- a/src/gui/editmountpointdialogwidget.h +++ b/src/gui/editmountpointdialogwidget.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2009, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2018 Abhijeet Sharma + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(EDITMOUNTPOINTDIALOGWIDGET_H) diff --git a/src/gui/filesystemsupportdialog.cpp b/src/gui/filesystemsupportdialog.cpp index eeabe1e..d381774 100644 --- a/src/gui/filesystemsupportdialog.cpp +++ b/src/gui/filesystemsupportdialog.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/filesystemsupportdialog.h" #include "gui/filesystemsupportdialogwidget.h" diff --git a/src/gui/filesystemsupportdialog.h b/src/gui/filesystemsupportdialog.h index e93601f..f162175 100644 --- a/src/gui/filesystemsupportdialog.h +++ b/src/gui/filesystemsupportdialog.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2015-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(FILESYSTEMSUPPORTDIALOG_H) diff --git a/src/gui/filesystemsupportdialogwidget.cpp b/src/gui/filesystemsupportdialogwidget.cpp index e9243a5..69d597c 100644 --- a/src/gui/filesystemsupportdialogwidget.cpp +++ b/src/gui/filesystemsupportdialogwidget.cpp @@ -1,19 +1,8 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/filesystemsupportdialogwidget.h" diff --git a/src/gui/filesystemsupportdialogwidget.h b/src/gui/filesystemsupportdialogwidget.h index 23739f2..3a3c3a0 100644 --- a/src/gui/filesystemsupportdialogwidget.h +++ b/src/gui/filesystemsupportdialogwidget.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(FILESYSTEMSUPPORTDIALOGWIDGET_H) diff --git a/src/gui/formattedspinbox.cpp b/src/gui/formattedspinbox.cpp index 529d5cd..b0ac62b 100644 --- a/src/gui/formattedspinbox.cpp +++ b/src/gui/formattedspinbox.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/formattedspinbox.h" diff --git a/src/gui/formattedspinbox.h b/src/gui/formattedspinbox.h index 2c34dea..e2761ce 100644 --- a/src/gui/formattedspinbox.h +++ b/src/gui/formattedspinbox.h @@ -1,19 +1,8 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(FORMATTEDSPINBOX_H) diff --git a/src/gui/infopane.cpp b/src/gui/infopane.cpp index 71160c3..d4a46dc 100644 --- a/src/gui/infopane.cpp +++ b/src/gui/infopane.cpp @@ -1,20 +1,11 @@ -/************************************************************************* - * Copyright (C) 2008 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/infopane.h" diff --git a/src/gui/infopane.h b/src/gui/infopane.h index b582755..4b59a4b 100644 --- a/src/gui/infopane.h +++ b/src/gui/infopane.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2008 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010-2011 Volker Lanz + SPDX-FileCopyrightText: 2016-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(INFOPANE_H) diff --git a/src/gui/insertdialog.cpp b/src/gui/insertdialog.cpp index 3cd3da4..f6fb70a 100644 --- a/src/gui/insertdialog.cpp +++ b/src/gui/insertdialog.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2016 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/insertdialog.h" #include "gui/sizedialogwidget.h" diff --git a/src/gui/insertdialog.h b/src/gui/insertdialog.h index 89697f9..1616add 100644 --- a/src/gui/insertdialog.h +++ b/src/gui/insertdialog.h @@ -1,19 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(INSERTDIALOG_H) diff --git a/src/gui/listdevices.cpp b/src/gui/listdevices.cpp index 600868d..b850f8c 100644 --- a/src/gui/listdevices.cpp +++ b/src/gui/listdevices.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008-2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2009-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/listdevices.h" diff --git a/src/gui/listdevices.h b/src/gui/listdevices.h index 7b444fc..89d68ac 100644 --- a/src/gui/listdevices.h +++ b/src/gui/listdevices.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2008-2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2009-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(LISTDEVICES_H) diff --git a/src/gui/listoperations.cpp b/src/gui/listoperations.cpp index bea6dca..4b91a4a 100644 --- a/src/gui/listoperations.cpp +++ b/src/gui/listoperations.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008, 2009 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2009-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/listoperations.h" diff --git a/src/gui/listoperations.h b/src/gui/listoperations.h index 5c0a1fe..4e33c76 100644 --- a/src/gui/listoperations.h +++ b/src/gui/listoperations.h @@ -1,19 +1,11 @@ -/************************************************************************* - * Copyright (C) 2008, 2009 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2009-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ + #if !defined(LISTOPERATIONS_H) diff --git a/src/gui/listphysicalvolumes.cpp b/src/gui/listphysicalvolumes.cpp index 8b4d8bb..c049566 100644 --- a/src/gui/listphysicalvolumes.cpp +++ b/src/gui/listphysicalvolumes.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2016 by Chantara Tith * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2016 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/listphysicalvolumes.h" diff --git a/src/gui/listphysicalvolumes.h b/src/gui/listphysicalvolumes.h index 18c4f79..95f334e 100644 --- a/src/gui/listphysicalvolumes.h +++ b/src/gui/listphysicalvolumes.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2016 by Chantara Tith * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(LISTPHYSICALVOLUMES_H) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index a721271..a5c2127 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1,21 +1,14 @@ -/************************************************************************* - * Copyright (C) 2008, 2009, 2010, 2012 by Volker Lanz * - * Copyright (C) 2015 by Teo Mrnjavac * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2012 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + SPDX-FileCopyrightText: 2015 Teo Mrnjavac + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho + SPDX-FileCopyrightText: 2018 René J.V. Bertin + SPDX-FileCopyrightText: 2018 Huzaifa Faruqui + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/mainwindow.h" #include "gui/infopane.h" diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 9fc5f19..fcaa63f 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -1,20 +1,11 @@ -/************************************************************************* - * Copyright (C) 2008, 2009, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2012 Volker Lanz + SPDX-FileCopyrightText: 2014-2019 Andrius Štikonas + SPDX-FileCopyrightText: 2015 Teo Mrnjavac + SPDX-FileCopyrightText: 2016 Chantara Tith + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(MAINWINDOW_H) diff --git a/src/gui/newdialog.cpp b/src/gui/newdialog.cpp index f1686e3..e1205a9 100644 --- a/src/gui/newdialog.cpp +++ b/src/gui/newdialog.cpp @@ -1,21 +1,12 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * Copyright (C) 2016 by Teo Mrnjavac * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2012 Volker Lanz + SPDX-FileCopyrightText: 2013-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2015 Teo Mrnjavac + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/newdialog.h" #include "gui/sizedialogwidget.h" diff --git a/src/gui/newdialog.h b/src/gui/newdialog.h index dadd311..2c2298d 100644 --- a/src/gui/newdialog.h +++ b/src/gui/newdialog.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2012 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2016 Chantara Tith + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(NEWDIALOG_H) diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp index d23b046..7f4cca2 100644 --- a/src/gui/partitionmanagerwidget.cpp +++ b/src/gui/partitionmanagerwidget.cpp @@ -1,21 +1,12 @@ -/************************************************************************* - * Copyright (C) 2008-2010 by Volker Lanz * - * Copyright (C) 2015 by Teo Mrnjavac * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2012 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2018 Abhijeet Sharma + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/partitionmanagerwidget.h" #include "gui/partpropsdialog.h" diff --git a/src/gui/partitionmanagerwidget.h b/src/gui/partitionmanagerwidget.h index 2a59ab1..c1abc3f 100644 --- a/src/gui/partitionmanagerwidget.h +++ b/src/gui/partitionmanagerwidget.h @@ -1,20 +1,11 @@ -/************************************************************************* - * Copyright (C) 2008-2010 by Volker Lanz * - * Copyright (C) 2015 by Teo Mrnjavac * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2009-2011 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(PARTITIONMANAGERWIDGET_H) diff --git a/src/gui/partpropsdialog.cpp b/src/gui/partpropsdialog.cpp index e586fe1..9a59598 100644 --- a/src/gui/partpropsdialog.cpp +++ b/src/gui/partpropsdialog.cpp @@ -1,20 +1,11 @@ -/************************************************************************* - * Copyright (C) 2008, 2009 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2014 Yuri Chornoivan + SPDX-FileCopyrightText: 2018 Abhijeet Sharma + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/partpropsdialog.h" #include "gui/partpropswidget.h" diff --git a/src/gui/partpropsdialog.h b/src/gui/partpropsdialog.h index 6c178f6..e17092d 100644 --- a/src/gui/partpropsdialog.h +++ b/src/gui/partpropsdialog.h @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(PARTPROPSDIALOG_H) diff --git a/src/gui/partpropswidget.h b/src/gui/partpropswidget.h index e450a35..32ca7fb 100644 --- a/src/gui/partpropswidget.h +++ b/src/gui/partpropswidget.h @@ -1,19 +1,11 @@ -/************************************************************************* - * Copyright (C) 2008, 2009 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2018 Abhijeet Sharma + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(PARTPROPSWIDGET_H) diff --git a/src/gui/parttablewidget.cpp b/src/gui/parttablewidget.cpp index 83dcc92..0b1e90f 100644 --- a/src/gui/parttablewidget.cpp +++ b/src/gui/parttablewidget.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/parttablewidget.h" #include "util/guihelpers.h" diff --git a/src/gui/parttablewidget.h b/src/gui/parttablewidget.h index 5f5481c..280da00 100644 --- a/src/gui/parttablewidget.h +++ b/src/gui/parttablewidget.h @@ -1,19 +1,11 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2010 Hugo Pereira Da Costa + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(PARTTABLEWIDGET_H) diff --git a/src/gui/resizedialog.cpp b/src/gui/resizedialog.cpp index 3921e11..bedc562 100644 --- a/src/gui/resizedialog.cpp +++ b/src/gui/resizedialog.cpp @@ -1,20 +1,10 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2016 Chantara Tith + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/resizedialog.h" #include "gui/sizedialogwidget.h" diff --git a/src/gui/resizedialog.h b/src/gui/resizedialog.h index d538dcf..8d26c67 100644 --- a/src/gui/resizedialog.h +++ b/src/gui/resizedialog.h @@ -1,19 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008, 2010, 2012 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(RESIZEDIALOG_H) diff --git a/src/gui/resizevolumegroupdialog.cpp b/src/gui/resizevolumegroupdialog.cpp index 965554c..50c8e7a 100644 --- a/src/gui/resizevolumegroupdialog.cpp +++ b/src/gui/resizevolumegroupdialog.cpp @@ -1,20 +1,11 @@ -/************************************************************************* - * Copyright (C) 2016 by Chantara Tith * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2016-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/resizevolumegroupdialog.h" #include "gui/volumegroupwidget.h" diff --git a/src/gui/resizevolumegroupdialog.h b/src/gui/resizevolumegroupdialog.h index 986ffc8..2255c77 100644 --- a/src/gui/resizevolumegroupdialog.h +++ b/src/gui/resizevolumegroupdialog.h @@ -1,19 +1,9 @@ -/************************************************************************* - * Copyright (C) 2016 by Chantara Tith * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2016-2018 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #ifndef RESIZEVOLUMEGROUPDIALOG_H #define RESIZEVOLUMEGROUPDIALOG_H diff --git a/src/gui/scanprogressdialog.cpp b/src/gui/scanprogressdialog.cpp index b14049e..3cd1fb4 100644 --- a/src/gui/scanprogressdialog.cpp +++ b/src/gui/scanprogressdialog.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/scanprogressdialog.h" diff --git a/src/gui/scanprogressdialog.h b/src/gui/scanprogressdialog.h index b158ffa..a6d53ca 100644 --- a/src/gui/scanprogressdialog.h +++ b/src/gui/scanprogressdialog.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #ifndef SCANPROGRESSDIALOG_H #define SCANPROGRESSDIALOG_H diff --git a/src/gui/sizedetailswidget.cpp b/src/gui/sizedetailswidget.cpp index 71d7670..ba22718 100644 --- a/src/gui/sizedetailswidget.cpp +++ b/src/gui/sizedetailswidget.cpp @@ -1,19 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/sizedetailswidget.h" diff --git a/src/gui/sizedetailswidget.h b/src/gui/sizedetailswidget.h index c3af339..a0d4c70 100644 --- a/src/gui/sizedetailswidget.h +++ b/src/gui/sizedetailswidget.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(SIZEDETAILSWIDGET_H) diff --git a/src/gui/sizedialogbase.cpp b/src/gui/sizedialogbase.cpp index 7116756..25a75e5 100644 --- a/src/gui/sizedialogbase.cpp +++ b/src/gui/sizedialogbase.cpp @@ -1,21 +1,11 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * Copyright (C) 2016 by Teo Mrnjavac * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2016 Teo Mrnjavac + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/sizedialogbase.h" #include "gui/sizedetailswidget.h" diff --git a/src/gui/sizedialogbase.h b/src/gui/sizedialogbase.h index 83d86d8..2d49e08 100644 --- a/src/gui/sizedialogbase.h +++ b/src/gui/sizedialogbase.h @@ -1,20 +1,11 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2008 Laurent Montel + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ + #if !defined(SIZEDIALOGBASE_H) #define SIZEDIALOGBASE_H diff --git a/src/gui/sizedialogwidget.cpp b/src/gui/sizedialogwidget.cpp index 816b4de..f14d621 100644 --- a/src/gui/sizedialogwidget.cpp +++ b/src/gui/sizedialogwidget.cpp @@ -1,18 +1,7 @@ -/************************************************************************* - * Copyright (C) 2008 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008 Volker Lanz + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/sizedialogwidget.h" diff --git a/src/gui/sizedialogwidget.h b/src/gui/sizedialogwidget.h index 94f0c55..007108d 100644 --- a/src/gui/sizedialogwidget.h +++ b/src/gui/sizedialogwidget.h @@ -1,20 +1,10 @@ -/************************************************************************* - * Copyright (C) 2008, 2010 by Volker Lanz * - * Copyright (C) 2016 by Teo Mrnjavac * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2016 Teo Mrnjavac + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(SIZEDIALOGWIDGET_H) diff --git a/src/gui/smartdialog.cpp b/src/gui/smartdialog.cpp index d4a48e0..2100f15 100644 --- a/src/gui/smartdialog.cpp +++ b/src/gui/smartdialog.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/smartdialog.h" #include "gui/smartdialogwidget.h" diff --git a/src/gui/smartdialog.h b/src/gui/smartdialog.h index f6416a2..e8854e5 100644 --- a/src/gui/smartdialog.h +++ b/src/gui/smartdialog.h @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(SMARTDIALOG_H) diff --git a/src/gui/smartdialogwidget.cpp b/src/gui/smartdialogwidget.cpp index 5ee3f53..3f73772 100644 --- a/src/gui/smartdialogwidget.cpp +++ b/src/gui/smartdialogwidget.cpp @@ -1,19 +1,9 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/smartdialogwidget.h" diff --git a/src/gui/smartdialogwidget.h b/src/gui/smartdialogwidget.h index 2f0e2b8..87dbc49 100644 --- a/src/gui/smartdialogwidget.h +++ b/src/gui/smartdialogwidget.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2010 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(SMARTDIALOGWIDGET_H) diff --git a/src/gui/treelog.cpp b/src/gui/treelog.cpp index e0e593b..c7cfc5c 100644 --- a/src/gui/treelog.cpp +++ b/src/gui/treelog.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008, 2009 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2009-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/treelog.h" #include "gui/partitionmanagerwidget.h" diff --git a/src/gui/treelog.h b/src/gui/treelog.h index 4f7db0e..bc03f59 100644 --- a/src/gui/treelog.h +++ b/src/gui/treelog.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2008, 2009 by Volker Lanz * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2009-2010 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(TREELOG_H) diff --git a/src/gui/volumegroupdialog.cpp b/src/gui/volumegroupdialog.cpp index 681851f..aafc75f 100644 --- a/src/gui/volumegroupdialog.cpp +++ b/src/gui/volumegroupdialog.cpp @@ -1,20 +1,10 @@ -/************************************************************************* - * Copyright (C) 2016 by Chantara Tith * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2016-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2018 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/volumegroupdialog.h" #include "gui/volumegroupwidget.h" diff --git a/src/gui/volumegroupdialog.h b/src/gui/volumegroupdialog.h index b5ff3eb..0262678 100644 --- a/src/gui/volumegroupdialog.h +++ b/src/gui/volumegroupdialog.h @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2016 by Chantara Tith * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2016-2017 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(VOLUMEGROUPDIALOG_H) diff --git a/src/gui/volumegroupwidget.cpp b/src/gui/volumegroupwidget.cpp index d0d7dde..38dc558 100644 --- a/src/gui/volumegroupwidget.cpp +++ b/src/gui/volumegroupwidget.cpp @@ -1,18 +1,7 @@ -/************************************************************************* - * Copyright (C) 2016 by Chantara Tith * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2016 Chantara Tith + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/volumegroupwidget.h" diff --git a/src/gui/volumegroupwidget.h b/src/gui/volumegroupwidget.h index 7166793..4614e78 100644 --- a/src/gui/volumegroupwidget.h +++ b/src/gui/volumegroupwidget.h @@ -1,19 +1,10 @@ -/************************************************************************* - * Copyright (C) 2016 by Chantara Tith * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2016 Chantara Tith + SPDX-FileCopyrightText: 2016-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Yuri Chornoivan + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #if !defined(VOLUMEGROUPWIDGET_H) diff --git a/src/main.cpp b/src/main.cpp index 81449bf..52c5d3f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,20 +1,10 @@ -/************************************************************************* - * Copyright (C) 2008,2011 by Volker Lanz * - * Copyright (C) 2014-2018 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008,2011 Volker Lanz + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + SPDX-FileCopyrightText: 2019 Caio Jordão Carvalho + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "gui/mainwindow.h" diff --git a/src/util/guihelpers.cpp b/src/util/guihelpers.cpp index 49a537a..066ff84 100644 --- a/src/util/guihelpers.cpp +++ b/src/util/guihelpers.cpp @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008-2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008-2010 Volker Lanz + SPDX-FileCopyrightText: 2015-2018 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #include "util/guihelpers.h" #include "config.h" diff --git a/src/util/guihelpers.h b/src/util/guihelpers.h index 5313045..790da54 100644 --- a/src/util/guihelpers.h +++ b/src/util/guihelpers.h @@ -1,20 +1,9 @@ -/************************************************************************* - * Copyright (C) 2008 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * 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 the Free Software Foundation; either version 3 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see .* - *************************************************************************/ +/* + SPDX-FileCopyrightText: 2008 Volker Lanz + SPDX-FileCopyrightText: 2015-2018 Andrius Štikonas + + SPDX-License-Identifier: GPL-3.0-or-later +*/ #ifndef GUIHELPERS_H #define GUIHELPERS_H From 6e7c62775b8a67e4c5c11a7b0748e789a266a8f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 16 Sep 2020 00:53:30 +0100 Subject: [PATCH 59/78] Move GPLv3 license to LICENSES folder. --- COPYING.md | 675 ---------------------------------- LICENSES/GPL-3.0-or-later.txt | 0 2 files changed, 675 deletions(-) delete mode 100644 COPYING.md create mode 100644 LICENSES/GPL-3.0-or-later.txt diff --git a/COPYING.md b/COPYING.md deleted file mode 100644 index 2fb2e74..0000000 --- a/COPYING.md +++ /dev/null @@ -1,675 +0,0 @@ -### GNU GENERAL PUBLIC LICENSE - -Version 3, 29 June 2007 - -Copyright (C) 2007 Free Software Foundation, Inc. - - -Everyone is permitted to copy and distribute verbatim copies of this -license document, but changing it is not allowed. - -### Preamble - -The GNU General Public License is a free, copyleft license for -software and other kinds of works. - -The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom -to share and change all versions of a program--to make sure it remains -free software for all its users. We, the Free Software Foundation, use -the GNU General Public License for most of our software; it applies -also to any other work released this way by its authors. You can apply -it to your programs, too. - -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you -have certain responsibilities if you distribute copies of the -software, or if you modify it: responsibilities to respect the freedom -of others. - -For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - -Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - -Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the -manufacturer can do so. This is fundamentally incompatible with the -aim of protecting users' freedom to change the software. The -systematic pattern of such abuse occurs in the area of products for -individuals to use, which is precisely where it is most unacceptable. -Therefore, we have designed this version of the GPL to prohibit the -practice for those products. If such problems arise substantially in -other domains, we stand ready to extend this provision to those -domains in future versions of the GPL, as needed to protect the -freedom of users. - -Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish -to avoid the special danger that patents applied to a free program -could make it effectively proprietary. To prevent this, the GPL -assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and -modification follow. - -### TERMS AND CONDITIONS - -#### 0. Definitions. - -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds -of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of -an exact copy. The resulting work is called a "modified version" of -the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based -on the Program. - -To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user -through a computer network, with no transfer of a copy, is not -conveying. - -An interactive user interface displays "Appropriate Legal Notices" to -the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - -#### 1. Source Code. - -The "source code" for a work means the preferred form of the work for -making modifications to it. "Object code" means any non-source form of -a work. - -A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can -regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same -work. - -#### 2. Basic Permissions. - -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not convey, -without conditions so long as your license otherwise remains in force. -You may convey covered works to others for the sole purpose of having -them make modifications exclusively for you, or provide you with -facilities for running those works, provided that you comply with the -terms of this License in conveying all material for which you do not -control copyright. Those thus making or running the covered works for -you must do so exclusively on your behalf, under your direction and -control, on terms that prohibit them from making any copies of your -copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the -conditions stated below. Sublicensing is not allowed; section 10 makes -it unnecessary. - -#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such -circumvention is effected by exercising rights under this License with -respect to the covered work, and you disclaim any intention to limit -operation or modification of the work as a means of enforcing, against -the work's users, your or third parties' legal rights to forbid -circumvention of technological measures. - -#### 4. Conveying Verbatim Copies. - -You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - -#### 5. Conveying Modified Source Versions. - -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these -conditions: - -- a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. -- b) The work must carry prominent notices stating that it is - released under this License and any conditions added under - section 7. This requirement modifies the requirement in section 4 - to "keep intact all notices". -- c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. -- d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - -#### 6. Conveying Non-Source Forms. - -You may convey a covered work in object code form under the terms of -sections 4 and 5, provided that you also convey the machine-readable -Corresponding Source under the terms of this License, in one of these -ways: - -- a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. -- b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the Corresponding - Source from a network server at no charge. -- c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. -- d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. -- e) Convey the object code using peer-to-peer transmission, - provided you inform other peers where the object code and - Corresponding Source of the work are being offered to the general - public at no charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, -family, or household purposes, or (2) anything designed or sold for -incorporation into a dwelling. In determining whether a product is a -consumer product, doubtful cases shall be resolved in favor of -coverage. For a particular product received by a particular user, -"normally used" refers to a typical or common use of that class of -product, regardless of the status of the particular user or of the way -in which the particular user actually uses, or expects or is expected -to use, the product. A product is a consumer product regardless of -whether the product has substantial commercial, industrial or -non-consumer uses, unless such uses represent the only significant -mode of use of the product. - -"Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to -install and execute modified versions of a covered work in that User -Product from a modified version of its Corresponding Source. The -information must suffice to ensure that the continued functioning of -the modified object code is in no case prevented or interfered with -solely because modification has been made. - -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - -The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or -updates for a work that has been modified or installed by the -recipient, or for the User Product in which it has been modified or -installed. Access to a network may be denied when the modification -itself materially and adversely affects the operation of the network -or violates the rules and protocols for communication across the -network. - -Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - -#### 7. Additional Terms. - -"Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders -of that material) supplement the terms of this License with terms: - -- a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or -- b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or -- c) Prohibiting misrepresentation of the origin of that material, - or requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or -- d) Limiting the use for publicity purposes of names of licensors - or authors of the material; or -- e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or -- f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions - of it) with contractual assumptions of liability to the recipient, - for any liability that these contractual assumptions directly - impose on those licensors and authors. - -All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; the -above requirements apply either way. - -#### 8. Termination. - -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - -However, if you cease all violation of this License, then your license -from a particular copyright holder is reinstated (a) provisionally, -unless and until the copyright holder explicitly and finally -terminates your license, and (b) permanently, if the copyright holder -fails to notify you of the violation by some reasonable means prior to -60 days after the cessation. - -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - -#### 9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or run -a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - -#### 10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - -An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - -#### 11. Patents. - -A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - -A contributor's "essential patent claims" are all patent claims owned -or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - -If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - -A patent license is "discriminatory" if it does not include within the -scope of its coverage, prohibits the exercise of, or is conditioned on -the non-exercise of one or more of the rights that are specifically -granted under this License. You may not convey a covered work if you -are a party to an arrangement with a third party that is in the -business of distributing software, under which you make payment to the -third party based on the extent of your activity of conveying the -work, and under which the third party grants, to any of the parties -who would receive the covered work from you, a discriminatory patent -license (a) in connection with copies of the covered work conveyed by -you (or copies made from those copies), or (b) primarily for and in -connection with specific products or compilations that contain the -covered work, unless you entered into that arrangement, or that patent -license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - -#### 12. No Surrender of Others' Freedom. - -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under -this License and any other pertinent obligations, then as a -consequence you may not convey it at all. For example, if you agree to -terms that obligate you to collect a royalty for further conveying -from those to whom you convey the Program, the only way you could -satisfy both those terms and this License would be to refrain entirely -from conveying the Program. - -#### 13. Use with the GNU Affero General Public License. - -Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - -#### 14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions -of the GNU General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in -detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies that a certain numbered version of the GNU General Public -License "or any later version" applies to it, you have the option of -following the terms and conditions either of that numbered version or -of any later version published by the Free Software Foundation. If the -Program does not specify a version number of the GNU General Public -License, you may choose any version ever published by the Free -Software Foundation. - -If the Program specifies that a proxy can decide which future versions -of the GNU General Public License can be used, that proxy's public -statement of acceptance of a version permanently authorizes you to -choose that version for the Program. - -Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - -#### 15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE -DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR -CORRECTION. - -#### 16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR -CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES -ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT -NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR -LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM -TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER -PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -#### 17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -### How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these -terms. - -To do so, attach the following notices to the program. It is safest to -attach them to the start of each source file to most effectively state -the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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 - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper -mail. - -If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands \`show w' and \`show c' should show the -appropriate parts of the General Public License. Of course, your -program's commands might be different; for a GUI interface, you would -use an "about box". - -You should also get your employer (if you work as a programmer) or -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. For more information on this, and how to apply and follow -the GNU GPL, see . - -The GNU General Public License does not permit incorporating your -program into proprietary programs. If your program is a subroutine -library, you may consider it more useful to permit linking proprietary -applications with the library. If this is what you want to do, use the -GNU Lesser General Public License instead of this License. But first, -please read . diff --git a/LICENSES/GPL-3.0-or-later.txt b/LICENSES/GPL-3.0-or-later.txt new file mode 100644 index 0000000..e69de29 From 063da467f3de759256436d2a3795daec93efe1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 16 Sep 2020 01:03:48 +0100 Subject: [PATCH 60/78] Add SPDX metadata to CMakeLists.txt files. --- CMakeLists.txt | 19 ++++--------------- doc/CMakeLists.txt | 5 +++++ icons/CMakeLists.txt | 5 +++++ src/CMakeLists.txt | 18 +++--------------- src/config/CMakeLists.txt | 4 ++++ src/gui/CMakeLists.txt | 7 +++++++ src/util/CMakeLists.txt | 5 +++++ 7 files changed, 33 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b96683c..e0ea095 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,7 @@ -# Copyright (C) 2008 by Volker Lanz -# Copyright (C) 2014-2019 by Andrius Štikonas -# -# 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 the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2008 Volker Lanz +# SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas + +# SPDX-License-Identifier: GPL-3.0-or-later project(partitionmanager) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 5180d7c..4d6dc85 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1 +1,6 @@ +# SPDX-FileCopyrightText: 2008 Volker Lanz +# SPDX-FileCopyrightText: 2015 Andrius Štikonas + +# SPDX-License-Identifier: GPL-3.0-or-later + kdoctools_create_handbook( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR partitionmanager ) diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 689a8c2..dfe2ce5 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -1 +1,6 @@ +# SPDX-FileCopyrightText: 2009 Volker Lanz +# SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + +# SPDX-License-Identifier: GPL-3.0-or-later + ecm_install_icons(ICONS sc-apps-partitionmanager.svg DESTINATION ${KDE_INSTALL_ICONDIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 01a14f8..939d29e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,19 +1,7 @@ -# Copyright (C) 2008, 2012 by Volker Lanz -# -# 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 the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2008 Volker Lanz +# SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas -############################################ +# SPDX-License-Identifier: GPL-3.0-or-later include(config/CMakeLists.txt) include(gui/CMakeLists.txt) diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt index e0f57ca..87b1ae2 100644 --- a/src/config/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2015 Chris Campbell + +# SPDX-License-Identifier: GPL-3.0-or-later + set(CONFIG_SRC config/advancedpagewidget.cpp config/configureoptionsdialog.cpp diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 02705f4..c122bf0 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,3 +1,10 @@ +# SPDX-FileCopyrightText: 2015 Andrius Štikonas +# SPDX-FileCopyrightText: 2015 Chris Campbell +# SPDX-FileCopyrightText: 2015 Teo Mrnjavac +# SPDX-FileCopyrightText: 2016 Chantara Tith + +# SPDX-License-Identifier: GPL-3.0-or-later + set(GUI_SRC gui/applyprogressdetailswidget.cpp gui/applyprogressdialog.cpp diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index d85d3b4..878ae7f 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -1,3 +1,8 @@ +# SPDX-FileCopyrightText: 2015 Andrius Štikonas +# SPDX-FileCopyrightText: 2015 Chris Campbell + +# SPDX-License-Identifier: GPL-3.0-or-later + set(UTIL_SRC util/guihelpers.cpp ) From 8d91fdab0b70ea309375bebc22575d66f6844aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 17 Sep 2020 01:49:35 +0100 Subject: [PATCH 61/78] Add copyright info to Messages.sh --- src/Messages.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Messages.sh b/src/Messages.sh index 3ac31cc..79fbefb 100644 --- a/src/Messages.sh +++ b/src/Messages.sh @@ -1,4 +1,9 @@ #! /usr/bin/env bash + +# SPDX-FileCopyrightText: 2008 Laurent Montel + +# SPDX-License-Identifier: GPL-3.0-or-later + $EXTRACTRC `find -name \*.rc` >> rc.cpp || exit 11 $EXTRACTRC `find -name \*.ui` >> rc.cpp || exit 12 $EXTRACTRC `find -name \*.kcfg` >> rc.cpp || exit 12 From a973be655386e3cf3bbafc57d550485ca4ee731f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 19 Sep 2020 11:01:01 +0100 Subject: [PATCH 62/78] Use MIT license for Messages.sh. --- LICENSES/MIT.txt | 19 +++++++++++++++++++ src/Messages.sh | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 LICENSES/MIT.txt diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 0000000..204b93d --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,19 @@ +MIT License Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS +OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/Messages.sh b/src/Messages.sh index 79fbefb..6fddf48 100644 --- a/src/Messages.sh +++ b/src/Messages.sh @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2008 Laurent Montel -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: MIT $EXTRACTRC `find -name \*.rc` >> rc.cpp || exit 11 $EXTRACTRC `find -name \*.ui` >> rc.cpp || exit 12 From f023bb6674ffe03559a048af43f18605bf3ac448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 19 Sep 2020 23:59:26 +0100 Subject: [PATCH 63/78] Add gitignore file. --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e133fa7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: 2020 Andrius Štikonas +# SPDX-License-Identifier: MIT + +build +.kdev4/ +partitionmanager.kdev4 From e08815f4a931dacce7c6ef91c1384e2bf3975752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 22 Sep 2020 20:53:37 +0100 Subject: [PATCH 64/78] GPL-3.0-or-later.txt file was empty. --- LICENSES/GPL-3.0-or-later.txt | 674 ++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) diff --git a/LICENSES/GPL-3.0-or-later.txt b/LICENSES/GPL-3.0-or-later.txt index e69de29..94a9ed0 100644 --- a/LICENSES/GPL-3.0-or-later.txt +++ b/LICENSES/GPL-3.0-or-later.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 32313190d6f316e9a26da1e80c256954b37c5d54 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 25 Sep 2020 02:30:47 +0200 Subject: [PATCH 65/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 67f252a..8e86fc9 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -6,6 +6,7 @@ KDE Partition Manager مدير كدي للأقسام Xestor de particiones de KDE + KDE Bölmələr Meneceri KDE‑ov menadžer particija Gestor de particions del KDE Gestor de particions del KDE @@ -45,6 +46,7 @@ KDE 分区管理器 KDE 磁碟分割區管理員 Manage disk devices, partitions and file systems on your computer + Kompyuterinizdəki disk qurğularının, bölmələrin və fayl sistemlərinin idarə edilməsi Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador Spravujte disky, oddíly a souborové systémy ve vašem počítači @@ -72,6 +74,7 @@

    KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.

    «مدير كدي للأقسام» هو أداة تساعدك على إدارة أجهزة الأقراص، والأقسام وأنظمة الملفّات في حاسوبك. ويتيح لك الإنشاء، والنّسخ، والنّقل، والحذف، والتّحجيم دون فقدات البيانات، والنّسخ الاحتياطيّ واسترجاع الأقسام بسهولة.

    El xestor de particiones de KDE ye una utilidá p'ayudate a xestionar los preseos d'almacenamientu, particiones y sistemes de ficheros del ordenador. Permítete crear, copiar, mover, desaniciar, redimensionar ensin perder datos, facer copies de seguranza y restaurar particiones fácilmente

    +

    KDE Bölmələr Meneceri, kompüterinizdəki disk qurğularını, bölmələrini və fayl sistemlərini idarə etməyə kömək edən bir yardımçı proqramıdır. Məlumatlarınızı itirmədən asanlıqla yaratmaq, kopyalamaq, köçürmək, silmək, ölçüsünü dəyişdirmək, bölmələri bərpa etmək imkanı verir.

    El gestor de particions del KDE és un programa d'utilitats que us ajuda a gestionar els dispositius de disc, les particions i els sistemes de fitxers de l'ordinador. Permet crear, moure, eliminar, redimensionar sense perdre dades, fer còpies de seguretat i restaurar particions fàcilment.

    El gestor de particions del KDE és un programa d'utilitats que vos ajuda a gestionar els dispositius de disc, les particions i els sistemes de fitxers de l'ordinador. Permet crear, moure, eliminar, redimensionar sense perdre dades, fer còpies de seguretat i restaurar particions fàcilment.

    KDE Partition Manager er et værktøj til at hjælpe dig med at håndtere dine diskenheder og filsystemerne på din computer. Den lader dig nemt oprette, kopiere, flytte, slette, ændre størrelse uden at miste data, tage backup og gendanne partitioner.

    @@ -111,6 +114,7 @@

    Features:

    الميزات:

    Carauterístiques:

    +

    İmkanlar:

    Svojstva:

    Característiques:

    Característiques:

    @@ -153,6 +157,7 @@
  • Supports a large number of file systems, including ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS and more
  • يدعم عددًا كبيرًا من أنظمة الملفّات، منها ext2/3/4، وbtrfs، وreiserfs، وNTFS، وFAT16/32، وJFS، وXFS وغيرها
  • Sofita un númberu grande de sistemes de ficheros, incluyendo ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS y más
    • +
  • Böyük ölçülü fayl sistemlərini, həmçinin ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS və bir çoxlarını dəstəkləyir
  • Accepta un gran nombre de sistemes de fitxers, incloent-hi ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS i més
  • Accepta un gran nombre de sistemes de fitxers, incloent-hi ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS i més
  • Understøtter et større antal filsystemer, derunder ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS og andre
    • @@ -192,6 +197,7 @@
  • Makes use of already available external programs to get its job done
  • يستخدم البرامج الخارجيّة المتوفّرة لإنهاء عمله
  • Fai usu de programes esternos que yá tean disponibles pa facer el trabayu
    • +
  • Öz işini başa çatdırmaq üçün artıq mövcud olan xarici proqramlardan istifadə edir
  • Fa ús de programes externs ja disponibles per a fer la seva feina
  • Fa ús de programes externs ja disponibles per a fer la seua faena
  • Gør brug af allerede tilgængelige eksterne programmer til at udføre arbejdet
    • From 6d6a361e8b077e24248ee84f8e29d2b257de5a3b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 25 Sep 2020 06:30:55 +0200 Subject: [PATCH 66/78] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.partitionmanager.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index 90c5ae4..db54d94 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -3,6 +3,7 @@ Type=Application Name=KDE Partition Manager Name[ar]=مدير أقسام كدي Name[ast]=Xestor de particiones de KDE +Name[az]=KDE Bölmələr Meneceri Name[bg]=Управление на дялове за KDE Name[bs]=KDE‑ov menadžer particija Name[ca]=Gestor de particions del KDE @@ -56,6 +57,7 @@ Name[zh_TW]=KDE 磁碟分割區管理員 GenericName=Partition Editor GenericName[ar]=محرّر أقسام GenericName[ast]=Editor de particiones +GenericName[az]=Bölmələr Redaktoru GenericName[bg]=Редактор на дялове GenericName[bs]=Uređivač particija GenericName[ca]=Editor de particions @@ -108,6 +110,7 @@ GenericName[zh_TW]=磁碟分割區編輯器 Comment=Manage disks, partitions and file systems Comment[ar]=أدِر الأقراص، والأقسام وأنظمة الملفّات Comment[ast]=Xestiona discos, particiones y sistemes de ficheros +Comment[az]=Disklər, bölmələr, və fayl sistemləri idarə edilməsi Comment[bg]=Управлява размерите на дискове, дялове и операционни системи Comment[bs]=Upravljajte diskovima, particijama i datotečnim sistemima Comment[ca]=Gestioneu discos, particions i sistemes de fitxers @@ -164,6 +167,7 @@ Categories=System;Filesystem;KDE;Qt; X-KDE-StartupNotify=true Keywords=partition;disk; Keywords[ast]=partición;particionar;discu; +Keywords[az]=partition;disk;bölmə; Keywords[ca]=partició;disc; Keywords[ca@valencia]=partició;disc; Keywords[cs]=oddíl;disk; From 159ad053b2661395db289f058ec79d8332027d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 29 Sep 2020 00:07:37 +0100 Subject: [PATCH 67/78] Remove .arcconfig. --- .arcconfig | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .arcconfig diff --git a/.arcconfig b/.arcconfig deleted file mode 100644 index 0b1191c..0000000 --- a/.arcconfig +++ /dev/null @@ -1,4 +0,0 @@ -{ - "phabricator.uri" : "https://phabricator.kde.org/", - "project.name" : "KDE Partition Manager" -} From 30d5671950d17bb2bc5dccda3346ac53196b534d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 29 Sep 2020 17:54:53 +0100 Subject: [PATCH 68/78] Port away from IconThemes. --- CMakeLists.txt | 1 - src/CMakeLists.txt | 1 - src/config/configureoptionsdialog.cpp | 1 - src/gui/applyprogressdialog.cpp | 15 ++++---- src/gui/devicepropsdialog.cpp | 6 ++-- src/gui/filesystemsupportdialog.cpp | 5 ++- src/gui/listdevices.cpp | 5 +-- src/gui/listoperations.cpp | 4 +-- src/gui/mainwindow.cpp | 51 +++++++++++++-------------- src/gui/partitionmanagerwidget.cpp | 5 ++- src/gui/smartdialog.cpp | 5 ++- src/gui/treelog.cpp | 3 +- 12 files changed, 44 insertions(+), 58 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0ea095..2e9b6ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED Crash DBusAddons I18n - IconThemes JobWidgets KIO WidgetsAddons diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 939d29e..5ef4502 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,7 +34,6 @@ target_link_libraries(partitionmanager ${BLKID_LIBRARIES} KF5::Crash KF5::DBusAddons KF5::I18n - KF5::IconThemes KF5::JobWidgets KF5::KIOWidgets KF5::WidgetsAddons diff --git a/src/config/configureoptionsdialog.cpp b/src/config/configureoptionsdialog.cpp index c8cf51c..c0768f0 100644 --- a/src/config/configureoptionsdialog.cpp +++ b/src/config/configureoptionsdialog.cpp @@ -22,7 +22,6 @@ #include "ui_configurepagefilesystemcolors.h" -#include #include #include diff --git a/src/gui/applyprogressdialog.cpp b/src/gui/applyprogressdialog.cpp index e825852..12e7269 100644 --- a/src/gui/applyprogressdialog.cpp +++ b/src/gui/applyprogressdialog.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -82,13 +81,13 @@ ApplyProgressDialog::ApplyProgressDialog(QWidget* parent, OperationRunner& orunn cancelButton = dialogButtonBox->addButton(QDialogButtonBox::Cancel); detailsButton = new QPushButton; detailsButton->setText(xi18nc("@action:button", "&Details") + QStringLiteral(" >>")); - detailsButton->setIcon(QIcon::fromTheme(QStringLiteral("help-about")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + detailsButton->setIcon(QIcon::fromTheme(QStringLiteral("help-about"))); dialogButtonBox->addButton(detailsButton, QDialogButtonBox::ActionRole); mainLayout->addWidget(dialogButtonBox); dialogWidget().treeTasks().setColumnWidth(0, width() * 8 / 10); - detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme(QStringLiteral("document-open")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); - detailsWidget().buttonSave().setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme(QStringLiteral("document-open"))); + detailsWidget().buttonSave().setIcon(QIcon::fromTheme(QStringLiteral("document-save"))); setupConnections(); @@ -286,7 +285,7 @@ void ApplyProgressDialog::onJobStarted(Job* job, Operation* op) QTreeWidgetItem* child = new QTreeWidgetItem(); child->setText(0, job->description()); - child->setIcon(0, QIcon::fromTheme(job->statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); + child->setIcon(0, QIcon::fromTheme(job->statusIcon())); child->setText(1, QTime(0, 0).toString(timeFormat())); item->addChild(child); dialogWidget().treeTasks().scrollToBottom(); @@ -298,7 +297,7 @@ void ApplyProgressDialog::onJobStarted(Job* job, Operation* op) void ApplyProgressDialog::onJobFinished(Job* job, Operation* op) { if (currentJobItem()) - currentJobItem()->setIcon(0, QIcon::fromTheme(job->statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); + currentJobItem()->setIcon(0, QIcon::fromTheme(job->statusIcon())); setCurrentJobItem(nullptr); @@ -313,7 +312,7 @@ void ApplyProgressDialog::onOpFinished(int num, Operation* op) { if (currentOpItem()) { currentOpItem()->setText(0, opDesc(num, *op)); - currentOpItem()->setIcon(0, QIcon::fromTheme(op->statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); + currentOpItem()->setIcon(0, QIcon::fromTheme(op->statusIcon())); } setCurrentOpItem(nullptr); @@ -346,7 +345,7 @@ QString ApplyProgressDialog::opDesc(int num, const Operation& op) const void ApplyProgressDialog::addTaskOutput(int num, const Operation& op) { QTreeWidgetItem* item = new QTreeWidgetItem(); - item->setIcon(0, QIcon::fromTheme(op.statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); + item->setIcon(0, QIcon::fromTheme(op.statusIcon())); item->setText(0, opDesc(num, op)); item->setText(1, QTime(0, 0).toString(timeFormat())); diff --git a/src/gui/devicepropsdialog.cpp b/src/gui/devicepropsdialog.cpp index c950a77..c0e79cf 100644 --- a/src/gui/devicepropsdialog.cpp +++ b/src/gui/devicepropsdialog.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -105,10 +104,11 @@ void DevicePropsDialog::setupDialog() if (device().smartStatus().isValid()) { if (device().smartStatus().status()) { dialogWidget().smartStatusText().setText(xi18nc("@label SMART disk status", "good")); - dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); + dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(16, 16)); + } else { dialogWidget().smartStatusText().setText(xi18nc("@label SMART disk status", "BAD")); - dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); + dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(16, 16)); } } else { dialogWidget().smartStatusText().setText(xi18nc("@label", "(unknown)")); diff --git a/src/gui/filesystemsupportdialog.cpp b/src/gui/filesystemsupportdialog.cpp index d381774..5afeca7 100644 --- a/src/gui/filesystemsupportdialog.cpp +++ b/src/gui/filesystemsupportdialog.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include @@ -55,8 +54,8 @@ QSize FileSystemSupportDialog::sizeHint() const void FileSystemSupportDialog::setupDialog() { - QIcon yes = QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar)); - QIcon no = QIcon::fromTheme(QStringLiteral("dialog-error")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar)); + QIcon yes = QIcon::fromTheme(QStringLiteral("dialog-ok")); + QIcon no = QIcon::fromTheme(QStringLiteral("dialog-error")); dialogWidget().tree().clear(); diff --git a/src/gui/listdevices.cpp b/src/gui/listdevices.cpp index b850f8c..ea45472 100644 --- a/src/gui/listdevices.cpp +++ b/src/gui/listdevices.cpp @@ -12,14 +12,11 @@ #include #include -#include - class ListDeviceWidgetItem : public QListWidgetItem { public: ListDeviceWidgetItem(const Device& d) : - QListWidgetItem(QIcon::fromTheme(d.iconName()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Desktop)), d.prettyName()), - deviceNode(d.deviceNode()) { + QListWidgetItem(QIcon::fromTheme(d.iconName()), d.prettyName()), deviceNode(d.deviceNode()) { setToolTip(d.prettyName()); setSizeHint(QSize(0, 32)); } diff --git a/src/gui/listoperations.cpp b/src/gui/listoperations.cpp index 4b91a4a..42bce29 100644 --- a/src/gui/listoperations.cpp +++ b/src/gui/listoperations.cpp @@ -12,8 +12,6 @@ #include #include -#include - /** Creates a new ListOperations instance. @param parent the parent widget */ @@ -30,7 +28,7 @@ void ListOperations::updateOperations(const OperationStack::Operations& ops) listOperations().clear(); for (const auto &op : ops) { - QListWidgetItem* item = new QListWidgetItem(QIcon::fromTheme(op->iconName()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small)), op->description()); + QListWidgetItem* item = new QListWidgetItem(QIcon::fromTheme(op->iconName()), op->description()); item->setToolTip(op->description()); listOperations().addItem(item); } diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index a5c2127..d784b7b 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -73,7 +73,6 @@ #include #include #include -#include #include #include #include @@ -195,7 +194,7 @@ void MainWindow::setupActions() undoOperation->setToolTip(xi18nc("@info:tooltip", "Undo the last operation")); undoOperation->setStatusTip(xi18nc("@info:status", "Remove the last operation from the list.")); actionCollection()->setDefaultShortcut(undoOperation, QKeySequence(Qt::CTRL + Qt::Key_Z)); - undoOperation->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + undoOperation->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo"))); QAction* clearAllOperations = actionCollection()->addAction(QStringLiteral("clearAllOperations")); connect(clearAllOperations, &QAction::triggered, this, &MainWindow::onClearAllOperations); @@ -203,7 +202,7 @@ void MainWindow::setupActions() clearAllOperations->setText(xi18nc("@action:inmenu clear the list of operations", "Clear")); clearAllOperations->setToolTip(xi18nc("@info:tooltip", "Clear all operations")); clearAllOperations->setStatusTip(xi18nc("@info:status", "Empty the list of pending operations.")); - clearAllOperations->setIcon(QIcon::fromTheme(QStringLiteral("dialog-cancel")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + clearAllOperations->setIcon(QIcon::fromTheme(QStringLiteral("dialog-cancel"))); QAction* applyAllOperations = actionCollection()->addAction(QStringLiteral("applyAllOperations")); connect(applyAllOperations, &QAction::triggered, this, &MainWindow::onApplyAllOperations); @@ -211,7 +210,7 @@ void MainWindow::setupActions() applyAllOperations->setText(xi18nc("@action:inmenu apply all operations", "Apply")); applyAllOperations->setToolTip(xi18nc("@info:tooltip", "Apply all operations")); applyAllOperations->setStatusTip(xi18nc("@info:status", "Apply the pending operations in the list.")); - applyAllOperations->setIcon(QIcon::fromTheme(QStringLiteral("dialog-ok-apply")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + applyAllOperations->setIcon(QIcon::fromTheme(QStringLiteral("dialog-ok-apply"))); // Device actions QAction* createNewPartitionTable = actionCollection()->addAction(QStringLiteral("createNewPartitionTable")); @@ -221,7 +220,7 @@ void MainWindow::setupActions() createNewPartitionTable->setToolTip(xi18nc("@info:tooltip", "Create a new partition table")); createNewPartitionTable->setStatusTip(xi18nc("@info:status", "Create a new and empty partition table on a device.")); actionCollection()->setDefaultShortcut(createNewPartitionTable, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_N)); - createNewPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + createNewPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear"))); QAction* exportPartitionTable = actionCollection()->addAction(QStringLiteral("exportPartitionTable")); connect(exportPartitionTable, &QAction::triggered, this, &MainWindow::onExportPartitionTable); @@ -229,7 +228,7 @@ void MainWindow::setupActions() exportPartitionTable->setText(xi18nc("@action:inmenu", "Export Partition Table")); exportPartitionTable->setToolTip(xi18nc("@info:tooltip", "Export a partition table")); exportPartitionTable->setStatusTip(xi18nc("@info:status", "Export the device's partition table to a text file.")); - exportPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("document-export")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + exportPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("document-export"))); QAction* importPartitionTable = actionCollection()->addAction(QStringLiteral("importPartitionTable")); connect(importPartitionTable, &QAction::triggered, this, &MainWindow::onImportPartitionTable); @@ -237,7 +236,7 @@ void MainWindow::setupActions() importPartitionTable->setText(xi18nc("@action:inmenu", "Import Partition Table")); importPartitionTable->setToolTip(xi18nc("@info:tooltip", "Import a partition table")); importPartitionTable->setStatusTip(xi18nc("@info:status", "Import a partition table from a text file.")); - importPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("document-import")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + importPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("document-import"))); QAction* removeVolumeGroup = actionCollection()->addAction(QStringLiteral("removeVolumeGroup")); connect(removeVolumeGroup, &QAction::triggered, this, &MainWindow::onRemoveVolumeGroup); @@ -247,7 +246,7 @@ void MainWindow::setupActions() removeVolumeGroup->setToolTip(i18nc("@info:tooltip", "Remove selected Volume Group")); removeVolumeGroup->setStatusTip(i18nc("@info:status", "Remove selected Volume Group.")); //actionCollection()->setDefaultShortcut(removeVolumeGroup, QKeySequence(/*SHORTCUT KEY HERE*/)); - removeVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + removeVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete"))); QAction* resizeVolumeGroup = actionCollection()->addAction(QStringLiteral("resizeVolumeGroup")); connect(resizeVolumeGroup, &QAction::triggered, this, &MainWindow::onResizeVolumeGroup); @@ -257,7 +256,7 @@ void MainWindow::setupActions() resizeVolumeGroup->setToolTip(i18nc("@info:tooltip", "Resize selected Volume Group")); resizeVolumeGroup->setStatusTip(i18nc("@info:status", "Extend or reduce selected Volume Group.")); //actionCollection()->setDefaultShortcut(resizeVolumeGroup, QKeySequence(/*SHORTCUT KEY HERE*/)); - resizeVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right-double")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + resizeVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right-double"))); QAction* deactivateVolumeGroup = actionCollection()->addAction(QStringLiteral("deactivateVolumeGroup")); connect(deactivateVolumeGroup, &QAction::triggered, this, &MainWindow::onDeactivateVolumeGroup); @@ -266,7 +265,7 @@ void MainWindow::setupActions() deactivateVolumeGroup->setText(i18nc("@action:inmenu", "Deactivate Volume Group")); deactivateVolumeGroup->setToolTip(i18nc("@info:tooltip", "Deactivate selected Volume Group")); deactivateVolumeGroup->setStatusTip(i18nc("@info:status", "Deactivate selected Volume Group before unplugging removable devices.")); - deactivateVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("media-eject")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + deactivateVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("media-eject"))); QAction* smartStatusDevice = actionCollection()->addAction(QStringLiteral("smartStatusDevice")); connect(smartStatusDevice, &QAction::triggered, this, &MainWindow::onSmartStatusDevice); @@ -281,7 +280,7 @@ void MainWindow::setupActions() propertiesDevice->setText(xi18nc("@action:inmenu", "Properties")); propertiesDevice->setToolTip(xi18nc("@info:tooltip", "Show device properties dialog")); propertiesDevice->setStatusTip(xi18nc("@info:status", "View and modify device properties")); - propertiesDevice->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + propertiesDevice->setIcon(QIcon::fromTheme(QStringLiteral("document-properties"))); // Partition actions QAction* newPartition = actionCollection()->addAction(QStringLiteral("newPartition")); @@ -291,7 +290,7 @@ void MainWindow::setupActions() newPartition->setToolTip(xi18nc("@info:tooltip", "New partition")); newPartition->setStatusTip(xi18nc("@info:status", "Create a new partition.")); actionCollection()->setDefaultShortcut(newPartition, QKeySequence(Qt::CTRL + Qt::Key_N)); - newPartition->setIcon(QIcon::fromTheme(QStringLiteral("document-new")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + newPartition->setIcon(QIcon::fromTheme(QStringLiteral("document-new"))); QAction* resizePartition = actionCollection()->addAction(QStringLiteral("resizePartition")); connect(resizePartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onResizePartition); @@ -300,7 +299,7 @@ void MainWindow::setupActions() resizePartition->setToolTip(xi18nc("@info:tooltip", "Resize or move partition")); resizePartition->setStatusTip(xi18nc("@info:status", "Shrink, grow or move an existing partition.")); actionCollection()->setDefaultShortcut(resizePartition, QKeySequence(Qt::CTRL + Qt::Key_R)); - resizePartition->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right-double")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + resizePartition->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right-double"))); QAction* deletePartition = actionCollection()->addAction(QStringLiteral("deletePartition")); connect(deletePartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onDeletePartition); @@ -309,7 +308,7 @@ void MainWindow::setupActions() deletePartition->setToolTip(xi18nc("@info:tooltip", "Delete partition")); deletePartition->setStatusTip(xi18nc("@info:status", "Delete a partition.")); actionCollection()->setDefaultShortcut(deletePartition, QKeySequence::Delete); - deletePartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + deletePartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete"))); QAction* shredPartition = actionCollection()->addAction(QStringLiteral("shredPartition")); connect(shredPartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onShredPartition); @@ -318,7 +317,7 @@ void MainWindow::setupActions() shredPartition->setToolTip(xi18nc("@info:tooltip", "Shred partition")); shredPartition->setStatusTip(xi18nc("@info:status", "Shred a partition so that its contents cannot be restored.")); actionCollection()->setDefaultShortcut(shredPartition, QKeySequence(Qt::SHIFT + Qt::Key_Delete)); - shredPartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete-shred")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + shredPartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete-shred"))); QAction* copyPartition = actionCollection()->addAction(QStringLiteral("copyPartition")); connect(copyPartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onCopyPartition); @@ -327,7 +326,7 @@ void MainWindow::setupActions() copyPartition->setToolTip(xi18nc("@info:tooltip", "Copy partition")); copyPartition->setStatusTip(xi18nc("@info:status", "Copy an existing partition.")); actionCollection()->setDefaultShortcut(copyPartition, QKeySequence(Qt::CTRL + Qt::Key_C)); - copyPartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + copyPartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy"))); QAction* pastePartition = actionCollection()->addAction(QStringLiteral("pastePartition")); connect(pastePartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onPastePartition); @@ -336,7 +335,7 @@ void MainWindow::setupActions() pastePartition->setToolTip(xi18nc("@info:tooltip", "Paste partition")); pastePartition->setStatusTip(xi18nc("@info:status", "Paste a copied partition.")); actionCollection()->setDefaultShortcut(pastePartition, QKeySequence(Qt::CTRL + Qt::Key_V)); - pastePartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-paste")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + pastePartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-paste"))); QAction* editMountPoint = actionCollection()->addAction(QStringLiteral("editMountPoint")); connect(editMountPoint, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onEditMountPoint); @@ -365,7 +364,7 @@ void MainWindow::setupActions() checkPartition->setText(xi18nc("@action:inmenu", "Check")); checkPartition->setToolTip(xi18nc("@info:tooltip", "Check partition")); checkPartition->setStatusTip(xi18nc("@info:status", "Check a filesystem on a partition for errors.")); - checkPartition->setIcon(QIcon::fromTheme(QStringLiteral("flag")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + checkPartition->setIcon(QIcon::fromTheme(QStringLiteral("flag"))); QAction* propertiesPartition = actionCollection()->addAction(QStringLiteral("propertiesPartition")); connect(propertiesPartition, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onPropertiesPartition); @@ -373,7 +372,7 @@ void MainWindow::setupActions() propertiesPartition->setText(xi18nc("@action:inmenu", "Properties")); propertiesPartition->setToolTip(xi18nc("@info:tooltip", "Show partition properties dialog")); propertiesPartition->setStatusTip(xi18nc("@info:status", "View and modify partition properties (label, partition flags, etc.)")); - propertiesPartition->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + propertiesPartition->setIcon(QIcon::fromTheme(QStringLiteral("document-properties"))); QAction* backup = actionCollection()->addAction(QStringLiteral("backupPartition")); connect(backup, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onBackupPartition); @@ -381,7 +380,7 @@ void MainWindow::setupActions() backup->setText(xi18nc("@action:inmenu", "Backup")); backup->setToolTip(xi18nc("@info:tooltip", "Backup partition")); backup->setStatusTip(xi18nc("@info:status", "Backup a partition to an image file.")); - backup->setIcon(QIcon::fromTheme(QStringLiteral("document-export")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + backup->setIcon(QIcon::fromTheme(QStringLiteral("document-export"))); QAction* restore = actionCollection()->addAction(QStringLiteral("restorePartition")); connect(restore, &QAction::triggered, &pmWidget(), &PartitionManagerWidget::onRestorePartition); @@ -389,7 +388,7 @@ void MainWindow::setupActions() restore->setText(xi18nc("@action:inmenu", "Restore")); restore->setToolTip(xi18nc("@info:tooltip", "Restore partition")); restore->setStatusTip(xi18nc("@info:status", "Restore a partition from an image file.")); - restore->setIcon(QIcon::fromTheme(QStringLiteral("document-import")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + restore->setIcon(QIcon::fromTheme(QStringLiteral("document-import"))); // Tools actions QAction* createVolumeGroup = actionCollection()->addAction(QStringLiteral("createVolumeGroup")); @@ -399,7 +398,7 @@ void MainWindow::setupActions() createVolumeGroup->setToolTip(i18nc("@info:tooltip", "Create a new LVM Volume Group")); createVolumeGroup->setStatusTip(i18nc("@info:status", "Create a new LVM Volume Group as a device.")); actionCollection()->setDefaultShortcut(createVolumeGroup, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_L)); - createVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("document-new")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + createVolumeGroup->setIcon(QIcon::fromTheme(QStringLiteral("document-new"))); QAction* fileSystemSupport = actionCollection()->addAction(QStringLiteral("fileSystemSupport")); connect(fileSystemSupport, &QAction::triggered, this, &MainWindow::onFileSystemSupport); @@ -413,7 +412,7 @@ void MainWindow::setupActions() refreshDevices->setToolTip(xi18nc("@info:tooltip", "Refresh all devices")); refreshDevices->setStatusTip(xi18nc("@info:status", "Renew the devices list.")); actionCollection()->setDefaultShortcut(refreshDevices, Qt::Key_F5); - refreshDevices->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + refreshDevices->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh"))); // Settings Actions actionCollection()->addAction(QStringLiteral("toggleDockDevices"), dockDevices().toggleViewAction()); @@ -429,14 +428,14 @@ void MainWindow::setupActions() clearLog->setText(xi18nc("@action:inmenu", "Clear Log")); clearLog->setToolTip(xi18nc("@info:tooltip", "Clear the log output")); clearLog->setStatusTip(xi18nc("@info:status", "Clear the log output panel.")); - clearLog->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-list")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + clearLog->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-list"))); QAction* saveLog = actionCollection()->addAction(QStringLiteral("saveLog")); connect(saveLog, &QAction::triggered, &treeLog(), &TreeLog::onSaveLog); saveLog->setText(xi18nc("@action:inmenu", "Save Log")); saveLog->setToolTip(xi18nc("@info:tooltip", "Save the log output")); saveLog->setStatusTip(xi18nc("@info:status", "Save the log output to a file.")); - saveLog->setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + saveLog->setIcon(QIcon::fromTheme(QStringLiteral("document-save"))); // Help Actions QAction* aboutKPMcore = actionCollection()->addAction(QStringLiteral("aboutKPMcore")); @@ -444,7 +443,7 @@ void MainWindow::setupActions() aboutKPMcore->setText(xi18nc("@action:inmenu", "About KPMcore Library")); aboutKPMcore->setToolTip(xi18nc("@info:tooltip", "Show About KPMcore dialog")); aboutKPMcore->setStatusTip(xi18nc("@info:status", "Show About KPMcore dialog.")); - aboutKPMcore->setIcon(QIcon::fromTheme(QStringLiteral("partitionmanager")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + aboutKPMcore->setIcon(QIcon::fromTheme(QStringLiteral("partitionmanager"))); } void MainWindow::setupConnections() diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp index 7f4cca2..d7a0c1e 100644 --- a/src/gui/partitionmanagerwidget.cpp +++ b/src/gui/partitionmanagerwidget.cpp @@ -48,7 +48,6 @@ #include #include -#include #include #include @@ -208,7 +207,7 @@ static QTreeWidgetItem* createTreeWidgetItem(const Partition& p) item->setText(i, p.mountPoint()); if (p.isMounted()) - item->setIcon(i, QIcon::fromTheme(QStringLiteral("object-locked")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Panel))); + item->setIcon(i, QIcon::fromTheme(QStringLiteral("object-locked"))); i++; item->setText(i++, p.fileSystem().label()); @@ -249,7 +248,7 @@ void PartitionManagerWidget::updatePartitions() deviceItem->setFont(0, font); deviceItem->setText(0, selectedDevice()->prettyName()); - deviceItem->setIcon(0, QIcon::fromTheme(selectedDevice()->iconName()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Desktop))); + deviceItem->setIcon(0, QIcon::fromTheme(selectedDevice()->iconName())); deviceItem->setSizeHint(0, QSize(0, 32)); diff --git a/src/gui/smartdialog.cpp b/src/gui/smartdialog.cpp index 2100f15..2e1cee9 100644 --- a/src/gui/smartdialog.cpp +++ b/src/gui/smartdialog.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -78,10 +77,10 @@ void SmartDialog::setupDialog() if (device().smartStatus().isValid()) { if (device().smartStatus().status()) { dialogWidget().statusText().setText(xi18nc("@label SMART disk status", "good")); - dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); + dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(16, 16)); } else { dialogWidget().statusText().setText(xi18nc("@label SMART disk status", "BAD")); - dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); + dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(16, 16)); } dialogWidget().modelName().setText(device().smartStatus().modelName()); diff --git a/src/gui/treelog.cpp b/src/gui/treelog.cpp index c7cfc5c..11422fe 100644 --- a/src/gui/treelog.cpp +++ b/src/gui/treelog.cpp @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -142,7 +141,7 @@ void TreeLog::onNewLogMessage(Log::Level logLevel, const QString& s) if (static_cast(logLevel) >= Config::minLogLevel()) { QTreeWidgetItem* item = new QTreeWidgetItem(); - item->setIcon(0, QIcon::fromTheme(icons[static_cast(logLevel)]).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); + item->setIcon(0, QIcon::fromTheme(icons[static_cast(logLevel)])); item->setText(1, QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd hh:mm:ss"))); item->setText(2, s); From 2d2af2158af0e77e4d25c174187b42e30525d768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 29 Sep 2020 22:15:28 +0100 Subject: [PATCH 69/78] Use QStyle:Pixelmetric::PM_SmallIconSize, instead of hardcoded 16x16. --- src/gui/devicepropsdialog.cpp | 7 +++++-- src/gui/smartdialog.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/gui/devicepropsdialog.cpp b/src/gui/devicepropsdialog.cpp index c0e79cf..221545b 100644 --- a/src/gui/devicepropsdialog.cpp +++ b/src/gui/devicepropsdialog.cpp @@ -25,6 +25,7 @@ #include #include #include +#include /** Creates a new DevicePropsDialog @param parent pointer to the parent widget @@ -104,11 +105,13 @@ void DevicePropsDialog::setupDialog() if (device().smartStatus().isValid()) { if (device().smartStatus().status()) { dialogWidget().smartStatusText().setText(xi18nc("@label SMART disk status", "good")); - dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(16, 16)); + dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")) + .pixmap(QApplication::style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize))); } else { dialogWidget().smartStatusText().setText(xi18nc("@label SMART disk status", "BAD")); - dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(16, 16)); + dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")) + .pixmap(QApplication::style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize))); } } else { dialogWidget().smartStatusText().setText(xi18nc("@label", "(unknown)")); diff --git a/src/gui/smartdialog.cpp b/src/gui/smartdialog.cpp index 2e1cee9..bc82f37 100644 --- a/src/gui/smartdialog.cpp +++ b/src/gui/smartdialog.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -77,10 +78,12 @@ void SmartDialog::setupDialog() if (device().smartStatus().isValid()) { if (device().smartStatus().status()) { dialogWidget().statusText().setText(xi18nc("@label SMART disk status", "good")); - dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(16, 16)); + dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")) + .pixmap(QApplication::style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize))); } else { dialogWidget().statusText().setText(xi18nc("@label SMART disk status", "BAD")); - dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(16, 16)); + dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")) + .pixmap(QApplication::style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize))); } dialogWidget().modelName().setText(device().smartStatus().modelName()); From 7a03de8f05a5971fc8ba0d920ec8d5c255ce39c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 1 Oct 2020 02:34:14 +0200 Subject: [PATCH 70/78] GIT_SILENT made messages (after extraction) --- src/org.kde.partitionmanager.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml index 8e86fc9..0301fbc 100644 --- a/src/org.kde.partitionmanager.appdata.xml +++ b/src/org.kde.partitionmanager.appdata.xml @@ -51,6 +51,7 @@ Gestiona dispositius de disc, particions i sistemes de fitxers de l'ordinador Spravujte disky, oddíly a souborové systémy ve vašem počítači Håndtér diskenheder, partitioner og filsystemer på din computer + Verwaltung von Festplatten, Partitionen und Dateisystemen auf Ihrem Rechner Διαχειρίζεται συσκευές δίσκων, κατατμήσεις και συστήματα αρχείων στον υπολογιστή σας Manage disk devices, partitions and file systems on your computer Gestión de discos, particiones y sistema de archivos de su equipo From 6fc116a034c51cd28c5129a59a08142b60828946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Fri, 2 Oct 2020 00:05:12 +0100 Subject: [PATCH 71/78] Bump version to 4.2.0 in preparation for future release. --- CMakeLists.txt | 4 ++-- src/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e9b6ca..4fbf6dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) # Dependencies set(QT_MIN_VERSION "5.10.0") set(KF5_MIN_VERSION "5.71") -set(KPMCORE_MIN_VERSION "4.1.0") +set(KPMCORE_MIN_VERSION "4.2.0") set(CMAKE_USE_RELATIVE_PATHS OFF) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) @@ -18,7 +18,7 @@ set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install mkspecs files, Plugins a # Check KPMcore dependency when bumping set(VERSION_MAJOR "4") -set(VERSION_MINOR "1") +set(VERSION_MINOR "2") set(VERSION_RELEASE "0") set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) add_definitions(-D'VERSION="${VERSION}"') #" diff --git a/src/main.cpp b/src/main.cpp index 52c5d3f..886b521 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -37,7 +37,7 @@ int Q_DECL_IMPORT main(int argc, char* argv[]) QStringLiteral(VERSION), xi18nc("@title", "Manage your disks, partitions and file systems"), KAboutLicense::GPL_V3, - xi18nc("@info:credit", "© 2008-2013 Volker Lanz\n© 2012-2019 Andrius Štikonas")); + xi18nc("@info:credit", "© 2008-2013 Volker Lanz\n© 2012-2020 Andrius Štikonas")); aboutData.setOrganizationDomain(QByteArray("kde.org")); aboutData.setProductName(QByteArray("partitionmanager")); From 71305e4ca6036a9390648c352b78d5bb1da1810f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Fri, 2 Oct 2020 00:55:24 +0100 Subject: [PATCH 72/78] Add copyright information to ui files. --- src/config/configurepageadvanced.ui | 6 ++++++ src/config/configurepagefilesystemcolors.ui | 7 +++++++ src/config/configurepagegeneral.ui | 5 +++++ src/gui/applyprogressdetailswidgetbase.ui | 5 +++++ src/gui/applyprogressdialogwidgetbase.ui | 5 +++++ src/gui/createpartitiontablewidgetbase.ui | 4 ++++ src/gui/devicepropswidgetbase.ui | 5 +++++ src/gui/editmountoptionsdialogwidgetbase.ui | 5 +++++ src/gui/editmountpointdialogwidgetbase.ui | 6 ++++++ src/gui/filesystemsupportdialogwidgetbase.ui | 5 +++++ src/gui/listdevicesbase.ui | 4 ++++ src/gui/listoperationsbase.ui | 4 ++++ src/gui/listphysicalvolumesbase.ui | 4 ++++ src/gui/mainwindowbase.ui | 4 ++++ src/gui/partitionmanagerwidgetbase.ui | 6 ++++++ src/gui/partpropswidgetbase.ui | 6 ++++++ src/gui/sizedetailswidgetbase.ui | 4 ++++ src/gui/sizedialogwidgetbase.ui | 7 +++++++ src/gui/smartdialogwidgetbase.ui | 5 +++++ src/gui/treelogbase.ui | 5 +++++ src/gui/volumegroupwidgetbase.ui | 4 ++++ 21 files changed, 106 insertions(+) diff --git a/src/config/configurepageadvanced.ui b/src/config/configurepageadvanced.ui index 96b5e5a..b5ea959 100644 --- a/src/config/configurepageadvanced.ui +++ b/src/config/configurepageadvanced.ui @@ -1,5 +1,11 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2010-2014 Andrius Štikonas <andrius@stikonas.eu> +SPDX-FileCopyrightText: 2018 Shubham Jangra <aryan100jangid@gmail.com> +SPDX-License-Identifier: GPL-3.0-or-later + ConfigurePageAdvanced diff --git a/src/config/configurepagefilesystemcolors.ui b/src/config/configurepagefilesystemcolors.ui index aa8d047..2cab04e 100644 --- a/src/config/configurepagefilesystemcolors.ui +++ b/src/config/configurepagefilesystemcolors.ui @@ -1,5 +1,12 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2012-2019 Andrius Štikonas <andrius@stikonas.eu> +SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho <caiojcarvalho@gmail.com> +SPDX-FileCopyrightText: 2018 Shubham Jangra <aryan100jangid@gmail.com> +SPDX-License-Identifier: GPL-3.0-or-later + ConfigurePageFileSystemColors diff --git a/src/config/configurepagegeneral.ui b/src/config/configurepagegeneral.ui index fe1e37d..d1779f5 100644 --- a/src/config/configurepagegeneral.ui +++ b/src/config/configurepagegeneral.ui @@ -1,5 +1,10 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2014 Andrius Štikonas <andrius@stikonas.eu> +SPDX-License-Identifier: GPL-3.0-or-later + ConfigurePageGeneral diff --git a/src/gui/applyprogressdetailswidgetbase.ui b/src/gui/applyprogressdetailswidgetbase.ui index 51bc628..cd6aab1 100644 --- a/src/gui/applyprogressdetailswidgetbase.ui +++ b/src/gui/applyprogressdetailswidgetbase.ui @@ -1,5 +1,10 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2014 Andrius Štikonas <andrius@stikonas.eu> +SPDX-License-Identifier: GPL-3.0-or-later + ApplyProgressDetailsWidgetBase diff --git a/src/gui/applyprogressdialogwidgetbase.ui b/src/gui/applyprogressdialogwidgetbase.ui index 8ec5b2e..bd5375f 100644 --- a/src/gui/applyprogressdialogwidgetbase.ui +++ b/src/gui/applyprogressdialogwidgetbase.ui @@ -1,5 +1,10 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2016 Andrius Štikonas <andrius@stikonas.eu> +SPDX-License-Identifier: GPL-3.0-or-later + ApplyProgressDialogWidgetBase diff --git a/src/gui/createpartitiontablewidgetbase.ui b/src/gui/createpartitiontablewidgetbase.ui index 3176be2..e01bb96 100644 --- a/src/gui/createpartitiontablewidgetbase.ui +++ b/src/gui/createpartitiontablewidgetbase.ui @@ -1,5 +1,9 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-License-Identifier: GPL-3.0-or-later + CreatePartitionTableWidgetBase diff --git a/src/gui/devicepropswidgetbase.ui b/src/gui/devicepropswidgetbase.ui index acfed02..c7ac4cd 100644 --- a/src/gui/devicepropswidgetbase.ui +++ b/src/gui/devicepropswidgetbase.ui @@ -1,5 +1,10 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas <andrius@stikonas.eu> +SPDX-License-Identifier: GPL-3.0-or-later + DevicePropsWidgetBase diff --git a/src/gui/editmountoptionsdialogwidgetbase.ui b/src/gui/editmountoptionsdialogwidgetbase.ui index 37625d5..d134142 100644 --- a/src/gui/editmountoptionsdialogwidgetbase.ui +++ b/src/gui/editmountoptionsdialogwidgetbase.ui @@ -1,5 +1,10 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2016 Andrius Štikonas <andrius@stikonas.eu> +SPDX-License-Identifier: GPL-3.0-or-later + EditMountOptionsDialogWidgetBase diff --git a/src/gui/editmountpointdialogwidgetbase.ui b/src/gui/editmountpointdialogwidgetbase.ui index 0d95b5e..5edf525 100644 --- a/src/gui/editmountpointdialogwidgetbase.ui +++ b/src/gui/editmountpointdialogwidgetbase.ui @@ -1,5 +1,11 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2014 Andrius Štikonas <andrius@stikonas.eu> +SPDX-FileCopyrightText: 2018 Abhijeet Sharma <sharma.abhijeet2096@gmail.com> +SPDX-License-Identifier: GPL-3.0-or-later + EditMountPointDialogWidgetBase diff --git a/src/gui/filesystemsupportdialogwidgetbase.ui b/src/gui/filesystemsupportdialogwidgetbase.ui index 014a945..e0f1f07 100644 --- a/src/gui/filesystemsupportdialogwidgetbase.ui +++ b/src/gui/filesystemsupportdialogwidgetbase.ui @@ -1,5 +1,10 @@ + +SPDX-FileCopyrightText: 2008-2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2014 Andrius Štikonas <andrius@stikonas.eu> +SPDX-License-Identifier: GPL-3.0-or-later + FileSystemSupportDialogWidgetBase diff --git a/src/gui/listdevicesbase.ui b/src/gui/listdevicesbase.ui index ae018ae..c3adee5 100644 --- a/src/gui/listdevicesbase.ui +++ b/src/gui/listdevicesbase.ui @@ -1,4 +1,8 @@ + +SPDX-FileCopyrightText: 2009-2011 Volker Lanz <vl@fidra.de> +SPDX-License-Identifier: GPL-3.0-or-later + ListDevicesBase diff --git a/src/gui/listoperationsbase.ui b/src/gui/listoperationsbase.ui index c5984bf..0eefe6e 100644 --- a/src/gui/listoperationsbase.ui +++ b/src/gui/listoperationsbase.ui @@ -1,5 +1,9 @@ + +SPDX-FileCopyrightText: 2009-2011 Volker Lanz <vl@fidra.de> +SPDX-License-Identifier: GPL-3.0-or-later + ListOperationsBase diff --git a/src/gui/listphysicalvolumesbase.ui b/src/gui/listphysicalvolumesbase.ui index 2d77321..905dda0 100644 --- a/src/gui/listphysicalvolumesbase.ui +++ b/src/gui/listphysicalvolumesbase.ui @@ -1,5 +1,9 @@ + +SPDX-FileCopyrightText: 2016 Chantara Tith <tith.chantara@gmail.com> +SPDX-License-Identifier: GPL-3.0-or-later + ListPhysicalVolumesBase diff --git a/src/gui/mainwindowbase.ui b/src/gui/mainwindowbase.ui index 992d129..a5cf231 100644 --- a/src/gui/mainwindowbase.ui +++ b/src/gui/mainwindowbase.ui @@ -1,5 +1,9 @@ + +SPDX-FileCopyrightText: 2008-2011 Volker Lanz <vl@fidra.de> +SPDX-License-Identifier: GPL-3.0-or-later + MainWindowBase diff --git a/src/gui/partitionmanagerwidgetbase.ui b/src/gui/partitionmanagerwidgetbase.ui index 08d363f..b3233cd 100644 --- a/src/gui/partitionmanagerwidgetbase.ui +++ b/src/gui/partitionmanagerwidgetbase.ui @@ -1,5 +1,11 @@ + +SPDX-FileCopyrightText: 2009-2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2010 Hugo Pereira Da Costa <hugo@oxygen-icons.org> +SPDX-FileCopyrightText: 2018 Andrius Štikonas <andrius@stikonas.eu> +SPDX-License-Identifier: GPL-3.0-or-later + PartitionManagerWidgetBase diff --git a/src/gui/partpropswidgetbase.ui b/src/gui/partpropswidgetbase.ui index cc1b2fa..e4d35c0 100644 --- a/src/gui/partpropswidgetbase.ui +++ b/src/gui/partpropswidgetbase.ui @@ -1,5 +1,11 @@ + +SPDX-FileCopyrightText: 2008-2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2013-2020 Andrius Štikonas <andrius@stikonas.eu> +SPDX-FileCopyrightText: 2018 Abhijeet Sharma <sharma.abhijeet2096@gmail.com> +SPDX-License-Identifier: GPL-3.0-or-later + PartPropsWidgetBase diff --git a/src/gui/sizedetailswidgetbase.ui b/src/gui/sizedetailswidgetbase.ui index 490504c..9e7f6c8 100644 --- a/src/gui/sizedetailswidgetbase.ui +++ b/src/gui/sizedetailswidgetbase.ui @@ -1,5 +1,9 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-License-Identifier: GPL-3.0-or-later + SizeDetailsWidgetBase diff --git a/src/gui/sizedialogwidgetbase.ui b/src/gui/sizedialogwidgetbase.ui index 8a77219..715adbe 100644 --- a/src/gui/sizedialogwidgetbase.ui +++ b/src/gui/sizedialogwidgetbase.ui @@ -1,5 +1,12 @@ + +SPDX-FileCopyrightText: 2008-2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2013-2016 Andrius Štikonas <andrius@stikonas.eu> +SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac <teo@kde.org> +SPDX-FileCopyrightText: 2016 Chantara Tith <tith.chantara@gmail.com> +SPDX-License-Identifier: GPL-3.0-or-later + SizeDialogWidgetBase diff --git a/src/gui/smartdialogwidgetbase.ui b/src/gui/smartdialogwidgetbase.ui index 2f09795..735cf8e 100644 --- a/src/gui/smartdialogwidgetbase.ui +++ b/src/gui/smartdialogwidgetbase.ui @@ -1,5 +1,10 @@ + +SPDX-FileCopyrightText: 2010 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2018 Varun Patel <varun-patel@live.com> +SPDX-License-Identifier: GPL-3.0-or-later + SmartDialogWidgetBase diff --git a/src/gui/treelogbase.ui b/src/gui/treelogbase.ui index c34c105..26f727d 100644 --- a/src/gui/treelogbase.ui +++ b/src/gui/treelogbase.ui @@ -1,5 +1,10 @@ + +SPDX-FileCopyrightText: 2009-2011 Volker Lanz <vl@fidra.de> +SPDX-FileCopyrightText: 2011 Albert Astals Cid <aacid@kde.org> +SPDX-License-Identifier: GPL-3.0-or-later + TreeLogBase diff --git a/src/gui/volumegroupwidgetbase.ui b/src/gui/volumegroupwidgetbase.ui index 7edae3c..a1e1def 100644 --- a/src/gui/volumegroupwidgetbase.ui +++ b/src/gui/volumegroupwidgetbase.ui @@ -1,5 +1,9 @@ + +SPDX-FileCopyrightText: 2016 Chantara Tith <tith.chantara@gmail.com> +SPDX-License-Identifier: GPL-3.0-or-later + VolumeGroupWidgetBase From 47b3d5f6fa720e8d63c68577ebe6b4b6cb8875cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Fri, 2 Oct 2020 01:29:31 +0100 Subject: [PATCH 73/78] REUSE: add copyright info to more files. --- .reuse/dep5 | 19 + LICENSES/CC-BY-4.0.txt | 324 ++++++++++++++++ LICENSES/GFDL-1.3-or-later.txt | 451 +++++++++++++++++++++++ README.md | 6 + src/org.kde.partitionmanager.appdata.xml | 5 + src/partitionmanager.kcfg | 7 + 6 files changed, 812 insertions(+) create mode 100644 .reuse/dep5 create mode 100644 LICENSES/CC-BY-4.0.txt create mode 100644 LICENSES/GFDL-1.3-or-later.txt diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..66c16a1 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,19 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: KDE Partition Manager +Source: https://invent.kde.org/system/partitionmanager + +### TRANSLATIONS +Files: po/*.po +License: GPL-3.0-or-later +Copyright: 2020 KDE translators + +### Documentation +Files: doc/*.docbook +License: GFDL-1.3-or-later +Copyright: 2008-2016 KDE Burkhard Lück +Copyright: 2008 Volker Lanz + +### Screenshots +Files: doc/*.png +License: GFDL-1.3-or-later +Copyright: 2016 KDE Burkhard Lück diff --git a/LICENSES/CC-BY-4.0.txt b/LICENSES/CC-BY-4.0.txt new file mode 100644 index 0000000..3f92dfc --- /dev/null +++ b/LICENSES/CC-BY-4.0.txt @@ -0,0 +1,324 @@ +Creative Commons Attribution 4.0 International Creative Commons Corporation +("Creative Commons") is not a law firm and does not provide legal services +or legal advice. Distribution of Creative Commons public licenses does not +create a lawyer-client or other relationship. Creative Commons makes its licenses +and related information available on an "as-is" basis. Creative Commons gives +no warranties regarding its licenses, any material licensed under their terms +and conditions, or any related information. Creative Commons disclaims all +liability for damages resulting from their use to the fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and conditions +that creators and other rights holders may use to share original works of +authorship and other material subject to copyright and certain other rights +specified in the public license below. The following considerations are for +informational purposes only, are not exhaustive, and do not form part of our +licenses. + +Considerations for licensors: Our public licenses are intended for use by +those authorized to give the public permission to use material in ways otherwise +restricted by copyright and certain other rights. Our licenses are irrevocable. +Licensors should read and understand the terms and conditions of the license +they choose before applying it. Licensors should also secure all rights necessary +before applying our licenses so that the public can reuse the material as +expected. Licensors should clearly mark any material not subject to the license. +This includes other CC-licensed material, or material used under an exception +or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors + +Considerations for the public: By using one of our public licenses, a licensor +grants the public permission to use the licensed material under specified +terms and conditions. If the licensor's permission is not necessary for any +reason–for example, because of any applicable exception or limitation to copyright–then +that use is not regulated by the license. Our licenses grant only permissions +under copyright and certain other rights that a licensor has authority to +grant. Use of the licensed material may still be restricted for other reasons, +including because others have copyright or other rights in the material. A +licensor may make special requests, such as asking that all changes be marked +or described. Although not required by our licenses, you are encouraged to +respect those requests where reasonable. More considerations for the public +: wiki.creativecommons.org/Considerations_for_licensees Creative Commons Attribution +4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to +be bound by the terms and conditions of this Creative Commons Attribution +4.0 International Public License ("Public License"). To the extent this Public +License may be interpreted as a contract, You are granted the Licensed Rights +in consideration of Your acceptance of these terms and conditions, and the +Licensor grants You such rights in consideration of benefits the Licensor +receives from making the Licensed Material available under these terms and +conditions. + +Section 1 – Definitions. + +a. Adapted Material means material subject to Copyright and Similar Rights +that is derived from or based upon the Licensed Material and in which the +Licensed Material is translated, altered, arranged, transformed, or otherwise +modified in a manner requiring permission under the Copyright and Similar +Rights held by the Licensor. For purposes of this Public License, where the +Licensed Material is a musical work, performance, or sound recording, Adapted +Material is always produced where the Licensed Material is synched in timed +relation with a moving image. + +b. Adapter's License means the license You apply to Your Copyright and Similar +Rights in Your contributions to Adapted Material in accordance with the terms +and conditions of this Public License. + +c. Copyright and Similar Rights means copyright and/or similar rights closely +related to copyright including, without limitation, performance, broadcast, +sound recording, and Sui Generis Database Rights, without regard to how the +rights are labeled or categorized. For purposes of this Public License, the +rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + +d. Effective Technological Measures means those measures that, in the absence +of proper authority, may not be circumvented under laws fulfilling obligations +under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, +and/or similar international agreements. + +e. Exceptions and Limitations means fair use, fair dealing, and/or any other +exception or limitation to Copyright and Similar Rights that applies to Your +use of the Licensed Material. + +f. Licensed Material means the artistic or literary work, database, or other +material to which the Licensor applied this Public License. + +g. Licensed Rights means the rights granted to You subject to the terms and +conditions of this Public License, which are limited to all Copyright and +Similar Rights that apply to Your use of the Licensed Material and that the +Licensor has authority to license. + +h. Licensor means the individual(s) or entity(ies) granting rights under this +Public License. + +i. Share means to provide material to the public by any means or process that +requires permission under the Licensed Rights, such as reproduction, public +display, public performance, distribution, dissemination, communication, or +importation, and to make material available to the public including in ways +that members of the public may access the material from a place and at a time +individually chosen by them. + +j. Sui Generis Database Rights means rights other than copyright resulting +from Directive 96/9/EC of the European Parliament and of the Council of 11 +March 1996 on the legal protection of databases, as amended and/or succeeded, +as well as other essentially equivalent rights anywhere in the world. + +k. You means the individual or entity exercising the Licensed Rights under +this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + a. License grant. + +1. Subject to the terms and conditions of this Public License, the Licensor +hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, +irrevocable license to exercise the Licensed Rights in the Licensed Material +to: + + A. reproduce and Share the Licensed Material, in whole or in part; and + + B. produce, reproduce, and Share Adapted Material. + +2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions +and Limitations apply to Your use, this Public License does not apply, and +You do not need to comply with its terms and conditions. + + 3. Term. The term of this Public License is specified in Section 6(a). + +4. Media and formats; technical modifications allowed. The Licensor authorizes +You to exercise the Licensed Rights in all media and formats whether now known +or hereafter created, and to make technical modifications necessary to do +so. The Licensor waives and/or agrees not to assert any right or authority +to forbid You from making technical modifications necessary to exercise the +Licensed Rights, including technical modifications necessary to circumvent +Effective Technological Measures. For purposes of this Public License, simply +making modifications authorized by this Section 2(a)(4) never produces Adapted +Material. + + 5. Downstream recipients. + +A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed +Material automatically receives an offer from the Licensor to exercise the +Licensed Rights under the terms and conditions of this Public License. + +B. No downstream restrictions. You may not offer or impose any additional +or different terms or conditions on, or apply any Effective Technological +Measures to, the Licensed Material if doing so restricts exercise of the Licensed +Rights by any recipient of the Licensed Material. + +6. No endorsement. Nothing in this Public License constitutes or may be construed +as permission to assert or imply that You are, or that Your use of the Licensed +Material is, connected with, or sponsored, endorsed, or granted official status +by, the Licensor or others designated to receive attribution as provided in +Section 3(a)(1)(A)(i). + + b. Other rights. + +1. Moral rights, such as the right of integrity, are not licensed under this +Public License, nor are publicity, privacy, and/or other similar personality +rights; however, to the extent possible, the Licensor waives and/or agrees +not to assert any such rights held by the Licensor to the limited extent necessary +to allow You to exercise the Licensed Rights, but not otherwise. + +2. Patent and trademark rights are not licensed under this Public License. + +3. To the extent possible, the Licensor waives any right to collect royalties +from You for the exercise of the Licensed Rights, whether directly or through +a collecting society under any voluntary or waivable statutory or compulsory +licensing scheme. In all other cases the Licensor expressly reserves any right +to collect such royalties. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following +conditions. + + a. Attribution. + +1. If You Share the Licensed Material (including in modified form), You must: + +A. retain the following if it is supplied by the Licensor with the Licensed +Material: + +i. identification of the creator(s) of the Licensed Material and any others +designated to receive attribution, in any reasonable manner requested by the +Licensor (including by pseudonym if designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of warranties; + +v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + +B. indicate if You modified the Licensed Material and retain an indication +of any previous modifications; and + +C. indicate the Licensed Material is licensed under this Public License, and +include the text of, or the URI or hyperlink to, this Public License. + +2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner +based on the medium, means, and context in which You Share the Licensed Material. +For example, it may be reasonable to satisfy the conditions by providing a +URI or hyperlink to a resource that includes the required information. + +3. If requested by the Licensor, You must remove any of the information required +by Section 3(a)(1)(A) to the extent reasonably practicable. + +4. If You Share Adapted Material You produce, the Adapter's License You apply +must not prevent recipients of the Adapted Material from complying with this +Public License. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to +Your use of the Licensed Material: + +a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, +reuse, reproduce, and Share all or a substantial portion of the contents of +the database; + +b. if You include all or a substantial portion of the database contents in +a database in which You have Sui Generis Database Rights, then the database +in which You have Sui Generis Database Rights (but not its individual contents) +is Adapted Material; and + +c. You must comply with the conditions in Section 3(a) if You Share all or +a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not replace +Your obligations under this Public License where the Licensed Rights include +other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + +a. Unless otherwise separately undertaken by the Licensor, to the extent possible, +the Licensor offers the Licensed Material as-is and as-available, and makes +no representations or warranties of any kind concerning the Licensed Material, +whether express, implied, statutory, or other. This includes, without limitation, +warranties of title, merchantability, fitness for a particular purpose, non-infringement, +absence of latent or other defects, accuracy, or the presence or absence of +errors, whether or not known or discoverable. Where disclaimers of warranties +are not allowed in full or in part, this disclaimer may not apply to You. + +b. To the extent possible, in no event will the Licensor be liable to You +on any legal theory (including, without limitation, negligence) or otherwise +for any direct, special, indirect, incidental, consequential, punitive, exemplary, +or other losses, costs, expenses, or damages arising out of this Public License +or use of the Licensed Material, even if the Licensor has been advised of +the possibility of such losses, costs, expenses, or damages. Where a limitation +of liability is not allowed in full or in part, this limitation may not apply +to You. + +c. The disclaimer of warranties and limitation of liability provided above +shall be interpreted in a manner that, to the extent possible, most closely +approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + +a. This Public License applies for the term of the Copyright and Similar Rights +licensed here. However, if You fail to comply with this Public License, then +Your rights under this Public License terminate automatically. + +b. Where Your right to use the Licensed Material has terminated under Section +6(a), it reinstates: + +1. automatically as of the date the violation is cured, provided it is cured +within 30 days of Your discovery of the violation; or + + 2. upon express reinstatement by the Licensor. + +c. For the avoidance of doubt, this Section 6(b) does not affect any right +the Licensor may have to seek remedies for Your violations of this Public +License. + +d. For the avoidance of doubt, the Licensor may also offer the Licensed Material +under separate terms or conditions or stop distributing the Licensed Material +at any time; however, doing so will not terminate this Public License. + + e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + +a. The Licensor shall not be bound by any additional or different terms or +conditions communicated by You unless expressly agreed. + +b. Any arrangements, understandings, or agreements regarding the Licensed +Material not stated herein are separate from and independent of the terms +and conditions of this Public License. + +Section 8 – Interpretation. + +a. For the avoidance of doubt, this Public License does not, and shall not +be interpreted to, reduce, limit, restrict, or impose conditions on any use +of the Licensed Material that could lawfully be made without permission under +this Public License. + +b. To the extent possible, if any provision of this Public License is deemed +unenforceable, it shall be automatically reformed to the minimum extent necessary +to make it enforceable. If the provision cannot be reformed, it shall be severed +from this Public License without affecting the enforceability of the remaining +terms and conditions. + +c. No term or condition of this Public License will be waived and no failure +to comply consented to unless expressly agreed to by the Licensor. + +d. Nothing in this Public License constitutes or may be interpreted as a limitation +upon, or waiver of, any privileges and immunities that apply to the Licensor +or You, including from the legal processes of any jurisdiction or authority. + +Creative Commons is not a party to its public licenses. Notwithstanding, Creative +Commons may elect to apply one of its public licenses to material it publishes +and in those instances will be considered the "Licensor." The text of the +Creative Commons public licenses is dedicated to the public domain under the +CC0 Public Domain Dedication. Except for the limited purpose of indicating +that material is shared under a Creative Commons public license or as otherwise +permitted by the Creative Commons policies published at creativecommons.org/policies, +Creative Commons does not authorize the use of the trademark "Creative Commons" +or any other trademark or logo of Creative Commons without its prior written +consent including, without limitation, in connection with any unauthorized +modifications to any of its public licenses or any other arrangements, understandings, +or agreements concerning use of licensed material. For the avoidance of doubt, +this paragraph does not form part of the public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/LICENSES/GFDL-1.3-or-later.txt b/LICENSES/GFDL-1.3-or-later.txt new file mode 100644 index 0000000..bf128be --- /dev/null +++ b/LICENSES/GFDL-1.3-or-later.txt @@ -0,0 +1,451 @@ + + GNU Free Documentation License + Version 1.3, 3 November 2008 + + + Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document "free" in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The "Document", below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as "you". You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall +subject (or to related matters) and contains nothing that could fall +directly within that overall subject. (Thus, if the Document is in +part a textbook of mathematics, a Secondary Section may not explain +any mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML, PostScript or PDF designed for human modification. Examples of +transparent image formats include PNG, XCF and JPG. Opaque formats +include proprietary formats that can be read and edited only by +proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML, PostScript or PDF produced by some word +processors for output purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +The "publisher" means any person or entity that distributes copies of +the Document to the public. + +A section "Entitled XYZ" means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as "Acknowledgements", +"Dedications", "Endorsements", or "History".) To "Preserve the Title" +of such a section when you modify the Document means that it remains a +section "Entitled XYZ" according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no +other conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to +give them a chance to provide you with an updated version of the +Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. +O. Preserve any Warranty Disclaimers. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled "History" +in the various original documents, forming one section Entitled +"History"; likewise combine any sections Entitled "Acknowledgements", +and any sections Entitled "Dedications". You must delete all sections +Entitled "Endorsements". + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other +documents released under this License, and replace the individual +copies of this License in the various documents with a single copy +that is included in the collection, provided that you follow the rules +of this License for verbatim copying of each of the documents in all +other respects. + +You may extract a single document from such a collection, and +distribute it individually under this License, provided you insert a +copy of this License into the extracted document, and follow this +License in all other respects regarding verbatim copying of that +document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an "aggregate" if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled "Acknowledgements", +"Dedications", or "History", the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, receipt of a copy of some or all of the same material does +not give you any rights to use it. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions of the +GNU Free Documentation License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in +detail to address new problems or concerns. See +https://www.gnu.org/licenses/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +11. RELICENSING + +"Massive Multiauthor Collaboration Site" (or "MMC Site") means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +"Massive Multiauthor Collaboration" (or "MMC") contained in the site +means any set of copyrightable works thus published on the MMC site. + +"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +"Incorporate" means to publish or republish a Document, in whole or in +part, as part of another Document. + +An MMC is "eligible for relicensing" if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole or +in part into the MMC, (1) had no cover texts or invariant sections, and +(2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. diff --git a/README.md b/README.md index 14fd184..29a1614 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + + # KDE Partition Manager + org.kde.partitionmanager.desktop CC0-1.0 diff --git a/src/partitionmanager.kcfg b/src/partitionmanager.kcfg index 2d48ef3..97d6367 100644 --- a/src/partitionmanager.kcfg +++ b/src/partitionmanager.kcfg @@ -1,5 +1,12 @@ + From 65619e679ec4da887bb0a5af3c08494cd614d83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 3 Oct 2020 13:50:32 +0100 Subject: [PATCH 74/78] Fix location of author tag in ui file. --- src/gui/listdevicesbase.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/listdevicesbase.ui b/src/gui/listdevicesbase.ui index c3adee5..894840a 100644 --- a/src/gui/listdevicesbase.ui +++ b/src/gui/listdevicesbase.ui @@ -1,9 +1,9 @@ + SPDX-FileCopyrightText: 2009-2011 Volker Lanz <vl@fidra.de> SPDX-License-Identifier: GPL-3.0-or-later - ListDevicesBase From 3e39aaea60f3a81a5469af7b6987dff59a85fa41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 3 Oct 2020 15:37:30 +0100 Subject: [PATCH 75/78] Also exclude Luks2 filesystem from drop down menu in PartPropsDialog. Luks1 was already excluded. --- src/gui/partpropsdialog.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/gui/partpropsdialog.cpp b/src/gui/partpropsdialog.cpp index 9a59598..ef199c6 100644 --- a/src/gui/partpropsdialog.cpp +++ b/src/gui/partpropsdialog.cpp @@ -212,7 +212,7 @@ void PartPropsDialog::updateHideAndShow() // when do we show the uuid? const bool showUuid = partition().state() != Partition::State::New && // not for new partitions - !(fs == nullptr || fs->supportGetUUID() == FileSystem::cmdSupportNone); // not if the FS doesn't support it + !(fs == nullptr || fs->supportGetUUID() == FileSystem::cmdSupportNone); // not if the FS doesn't support it dialogWidget().showUuid(showUuid); @@ -220,19 +220,19 @@ void PartPropsDialog::updateHideAndShow() // when do we show available and used capacity? const bool showAvailableAndUsed = - partition().state() != Partition::State::New && // not for new partitions - !partition().roles().has(PartitionRole::Extended) && // neither for extended - !partition().roles().has(PartitionRole::Unallocated) && // or for unallocated - newFileSystemType() != FileSystem::Type::Unformatted; // and not for unformatted file systems + partition().state() != Partition::State::New && // not for new partitions + !partition().roles().has(PartitionRole::Extended) && // neither for extended + !partition().roles().has(PartitionRole::Unallocated) && // or for unallocated + newFileSystemType() != FileSystem::Type::Unformatted; // and not for unformatted file systems dialogWidget().showAvailable(showAvailableAndUsed); dialogWidget().showUsed(showAvailableAndUsed); // when do we show the file system combo box? const bool showFileSystem = - !partition().roles().has(PartitionRole::Extended) && // not for extended, they have no file system - !partition().roles().has(PartitionRole::Unallocated) && // and not for unallocated: no choice there - // do now show file system comboBox for open luks volumes. + !partition().roles().has(PartitionRole::Extended) && // not for extended, they have no file system + !partition().roles().has(PartitionRole::Unallocated) && // and not for unallocated: no choice there + // do not show file system comboBox for open luks volumes. !(partition().roles().has(PartitionRole::Luks) && partition().fileSystem().type() != FileSystem::Type::Luks); dialogWidget().showFileSystem(showFileSystem); @@ -241,14 +241,14 @@ void PartPropsDialog::updateHideAndShow() showFileSystem && // only if we also show the file system partition().fileSystem().supportCreate() != FileSystem::cmdSupportNone && // and support creating this file system partition().fileSystem().type() != FileSystem::Type::Unknown && // and not for unknown file systems - partition().state() != Partition::State::New && // or new partitions + partition().state() != Partition::State::New && // or new partitions !partition().roles().has(PartitionRole::Luks); // or encrypted filesystems dialogWidget().showCheckRecreate(showCheckRecreate); // when do we show the list of partition flags? const bool showListFlags = - partition().state() != Partition::State::New && // not for new partitions + partition().state() != Partition::State::New && // not for new partitions !partition().roles().has(PartitionRole::Unallocated); // and not for unallocated space dialogWidget().showListFlags(showListFlags); @@ -290,6 +290,8 @@ void PartPropsDialog::setupFileSystemComboBox() // If the partition isn't encrypted, skip the luks FS if (fs->type() == FileSystem::Type::Luks && partition().fileSystem().type() != FileSystem::Type::Luks) continue; + if (fs->type() == FileSystem::Type::Luks2 && partition().fileSystem().type() != FileSystem::Type::Luks2) + continue; if (partition().fileSystem().type() == fs->type() || (fs->supportCreate() != FileSystem::cmdSupportNone && partition().capacity() >= fs->minCapacity() && partition().capacity() <= fs->maxCapacity())) { QString name = fs->name(); From 380485aa8ed9e66271eaec7260d8d5cc0215d1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 3 Oct 2020 20:41:01 +0100 Subject: [PATCH 76/78] Remove outdated changelog. It hasn't been updated in 10 years. --- CHANGELOG.md | 300 --------------------------------------------------- 1 file changed, 300 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 7e05fa9..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,300 +0,0 @@ -1.0.60 (1.1alpha1, 2010-xx-xx) -============================== - -Features added since the last feature release include: ------------------------------------------------------- - -* Mount point management - -* Support for new "sector based" alignment (vs. the traditional cylinder based - alignment) required for compatibility with newer disks (where the phyisical - sector size is 4096 bytes) - -* SMART status reports - -* Support new file systems: BTRFS, HPFS, LUKS, OCFS2 and ZFS - -* Support GPT partition tables. - -* Support for setting volume labels on FAT16 and FAT32 file systems - -* Export and import a partition table in a human readable and editable format - similar, but for technical reasons not identical, to sfdisk's. - -* Support for backend plugins that do the heavy lifting. The first (and for now - only) implementation is libparted-based. - -* New operation: Shredding (i.e., securely deleting) a partition - -* A configuration dialog including settings for: - - * File system colors - - * The default file system for new partitions - - * Applying operations as non-root - - * Setting the log level for the log output dock. - - * The backend plugin to use - - * How to shred: Overwrite with zeros (faster) or random data (slower, but - more secure) - -* Allow editing start and end sectors in size dialogs in a new "advanced" - dialog section. - -* Instantly align partition start and end in size dialogs if partition - alignment is on. - -* Show a progress dialog when scanning for devices. - -* A device properties dialog. - - -Additional changes: -------------------- - -* Allow the Information dock widget to be docked at the top of bottom - -* The partition list view now has more information available in additional - columns. The user can sort the columns and turn individual columns on and off. - -* Use the icon suggested by KDE's Solid backend in the Devices list. - -* Always select the first device on program start. - -* Use KDE's KIO for file transfer where possible. - -* Performance improvements in the dialog to change a partition's size. - -* The KPart and KCM have been removed. - -* Allow hiding/showing the menu bar. - -* Add a context menu to the log output with entries to save or clear the log. - -* GUI support for devices with more than 2^31 sectors. - -* Format sector and size values according to KDE settings for number formatting - in New Partition, Resize and Insert dialogs. - -* Allow fractional sizes in New Partition, Resize and Insert dialogs. - - -1.0.2 (2010-04-23) -================== - -* Copy a file system's UUID to the copied file system when creating a file - system from another one. - -* Implement a workaround for a libparted bug that makes it sometimes fail to - commit changes to the OS in versions earlier than 2.2. - -* Update the partition's file system and re-check for constraints if the - partition's role is changed in the "Create New Partition" dialog. This fixes - a bug where the user was not able to grow an extended partition if he'd - previously selected a file system that cannot grow beyond a certain size. - -* Always use the correct icons in modified ok/cancel buttons in dialogs and - message boxes - -* Fix a crash when operations to create, resize and delete an extended - partitions where incorrectly merged into one (bug 232092) - - -1.0.1 (2010-01-09) -================== - -* Fix a bug that made it impossible to activate or deactivate a swap file - system. - -* Correctly handle linux swap even with newer parted versions. - -* Ask for an administrator's password on startup so that non-KDE users can run - the application from their launcher. - -* Use the "blkid" command as an alternative to "vol_id" if the latter is - unavailable. - -* Do not crash when using the Oxygen style under KDE SC 4.4. - -* Do not crash when the user clicks in the partition widget with newer - g++ versions. - -* Sort devices by name after scanning. - -* Don't disable updates for the partition widget while applying operations. - This leads to corrupted graphics unter Qt4.6. - -* Work around a LibParted segmentation fault when the Linux Device Mapper is - used and /dev/mapper has non-existing entries. - -* The above also works around a LibParted problem when the BIOS has a floppy - drive configured but none is actually present. - -* Set item height in the partition and devices lists to 32 pixel to make them - look less condensed. - -1.0.0 (2009-08-17) -================== - -None. - -1.0.0-RC1 (2009-08-03) -====================== - -* Correctly handle ext4 file systems even with patched parted 1.8.8 (and - hopefully 1.8.9 too). Patch by Fatih Asici . (bug - #195243) - -* Clear the partition flags for a copied partition in the preview. (bug - #202346) - -* Write the new start sector to the partition's boot sector if an NTFS file - system was moved or copied. (bug #202329) - - -1.0.0-BETA3 (2009-06-04) -======================== - -* Set the default file system in the New-Partition-dialog, don't just rely on - it being the first one in the list. - -* Sort items in file system combo boxes case-insensitively. - -* Fix a bug where the total free space available could get smaller and smaller - when moving an existing partition in a dialog. - -* Fix a bug that the progress information wasn't set as window title for the - top level application window. - -* Speed up copying file systems (and thus moving, resizing and copying). - -* Add some basic timing output to the detailed report for copying file systems. - -* Find a file system's mount point even if it is identified by label in fstab. - -* Add support for reading file system labels from FAT16 and FAT32. - -* Fix a bug where the volume label for a linuxswap file system was lost when - resizing it. - -* Make sure all interesting information shown in labels anywhere in the - application is user-selectable with the mouse. - -* Display the UUID for most file systems that support it. - -* Always show the current file system in the partition properties dialog's file - system combo box, even if it cannot be created, is too big or too small. - - -1.0.0-BETA2 (2009-04-30) -======================== - -* Add an application icon contributed by David Miller. - -* Allow setting the file system label in the dialog when creating a new partition. - -* Add a context menu to operation list. - -* Use a shell script to run partition manager as a child of hal-lock. This - should in theory (and according to the hal-lock manpage) avoid notifications - for new devices, but doesn't seem to work that well. - -* Fix a bug that would keep the user from deleting a newly created logical - partition because the application thought there were higher-numbered - partitions still mounted. - -* Add a kcm for KDE Partition Manager. If this is built and installed or not - can be (like it already is the case with the KPart) configured via cmake. - - -1.0.0-BETA1 (2009-01-13) -======================== - -* Fix a potential crash when merging a New Operation and a Create File System - Operation. - -* Set extended partitions as busy as long as logical partitions inside them - are mounted. - -* Don't silently succeed when unmounting a partition that cannot in fact be - unmounted because it has no mount points. - -* Prevent creating a new partition table on a device with mounted partitions. - -* Add tooltips to partition widgets. - -* Don't show cd/dvd readers or writers as devices even if libparted reports - them. - -* Add support for ext4. - -* Fix calculation of reserved/free blocks for ext2/3/4. - -* Output reason why a mount or unmount might have failed. - -* Fix minimum width for extended partitions in the partition table widget. - -* Fix a bug where a partition table just created would not disappear when the - operation to create it was undone. - -* Don't allow creating partitions smaller than the device's cylinder size. - -* Fix an error that could lead to some space (a few megabytes) between two - partitions being wasted. - - -1.0.0-ALPHA2 (2008-09-24) -========================= - -* Add and install a .desktop file. - -* Don't allow the user to close the main window while operations are being - applied. - -* Handle activating and deactivating swap. Also, swap does have labels. - -* Don't try to print a mount point in the partition properties dialog if there - is none. - -* Show partition table type name and used/max primary partitions in the info - pane. - -* All disk label types but msdos are read only for now, until the support - situation for them improves. - -* Set default value for maximum number of primaries from 255 to 4. - -* Actually set the correct disk label type before applying the operation to - create a new disk label. - -* Don't update the partition table widget while operations are being applied. - This fixes a race condition that would potentially crash the application when - applying operations. - -* Update devices in the GUI after creating a new disk label or undoing - operations. - -* Set the operation state of all operations to StateNone when temporarily - undoing them right before starting the thread to apply them. This fixes a - crash when an operation fails and the remaining ones are undone twice. - -* Update bug report address and homepage in the aboutdata. - -* Unblock SIGCHLD in main so Kubuntu's kdesudo can run the application as root. - -* If udevadm settle fails, try to call udevsettle to better support older - systems. - -* Fix the minimum size calculations for partition widgets. - -* Add some doxygen documentation. - - -1.0.0-ALPHA1 (2008-09-18) -========================= - -* First public release - From 3cc0fc684816780f6f644929d9d40f9c7f83e1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 3 Oct 2020 21:03:36 +0100 Subject: [PATCH 77/78] Add SPDX copyright info to icon. --- LICENSES/LGPL-3.0-or-later.txt | 165 +++++++++++++++++++++++++++++ icons/sc-apps-partitionmanager.svg | 5 +- 2 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 LICENSES/LGPL-3.0-or-later.txt diff --git a/LICENSES/LGPL-3.0-or-later.txt b/LICENSES/LGPL-3.0-or-later.txt new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/LICENSES/LGPL-3.0-or-later.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/icons/sc-apps-partitionmanager.svg b/icons/sc-apps-partitionmanager.svg index d72aaaa..b9842e9 100644 --- a/icons/sc-apps-partitionmanager.svg +++ b/icons/sc-apps-partitionmanager.svg @@ -1,6 +1,9 @@ - + Date: Sun, 4 Oct 2020 01:04:59 +0100 Subject: [PATCH 78/78] REUSE: SPDX copyright statements for more misc files. --- .reuse/dep5 | 15 ++++++++++++++- src/config.kcfgc | 3 +++ src/gui/partitionmanagerui.rc | 7 +++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.reuse/dep5 b/.reuse/dep5 index 66c16a1..4a808dd 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -2,11 +2,24 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: KDE Partition Manager Source: https://invent.kde.org/system/partitionmanager -### TRANSLATIONS +### Translations Files: po/*.po License: GPL-3.0-or-later Copyright: 2020 KDE translators +# .desktop file +FILES: src/org.kde.partitionmanager.desktop +License: GPL-3.0-or-later +Copyright: 2008 Volker Lanz +Copyright: 2017 Andrius Štikonas +Copyright: 2020 KDE translators + +### DBus interface +Files: src/org.kde.partitionmanager.xml +License: MIT +Copyright: 2010 Volker Lanz +Copyright: 2017 Andrius Štikonas + ### Documentation Files: doc/*.docbook License: GFDL-1.3-or-later diff --git a/src/config.kcfgc b/src/config.kcfgc index 064746e..7e65788 100644 --- a/src/config.kcfgc +++ b/src/config.kcfgc @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2008-2010 Volker Lanz +# SPDX-FileCopyrightText: 2015 Andrius Štikonas +# SPDX-License-Identifier: GPL-3.0-or-later File=partitionmanager.kcfg ClassName=Config Singleton=true diff --git a/src/gui/partitionmanagerui.rc b/src/gui/partitionmanagerui.rc index 7984102..93fea04 100644 --- a/src/gui/partitionmanagerui.rc +++ b/src/gui/partitionmanagerui.rc @@ -1,5 +1,12 @@ + Partition Manager Toolbar