Bump version to 4.0 in preparation for future release.

Note, this is not enough for flags to work. We need to run a job to set flags.

CCBUG: 400331

CMakeLists.txt

@@ -20,16 +20,16 @@ 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(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_MAJOR "4")
-set(VERSION_MINOR "80")
+set(VERSION_MINOR "0")
 set(VERSION_RELEASE "0")
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE})
 add_definitions(-D'VERSION="${VERSION}"') #"

README.md

@@ -43,7 +43,7 @@ your OS' package management app.
 
 ### Ubuntu
 
-```
+```bash
 sudo apt install partitionmanager
 ```
 
@@ -51,35 +51,35 @@ sudo apt install partitionmanager
 
 As the `root` user:
 
-```
+```bash
 apt install partitionmanager
 ```
 
 ### CentOS, Fedora, RHEL
 
-```
+```bash
 sudo yum install kde-partitionmanager
 ```
 
 ### OpenSUSE
-```
+```bash
 sudo zypper install partitionmanager
 ```
 
 ### ArchLinux
 
 1. Enable the community repository on `/etc/pacman.conf`:
-    ```
+    ```ini
     [community]
     Include = /etc/pacman.d/mirrorlist
     ```
 1. Install the `partitionmanager` xz package:
-    ```
+    ```bash
-    # pacman -Sy partitionmanager
+    pacman -Sy partitionmanager
     ```
 
 ### Gentoo
-```
+```bash
 sudo emerge partitionmanager
 ```
 

src/gui/mainwindow.cpp

@@ -1010,7 +1010,7 @@ void MainWindow::onImportPartitionTable()
             qint32 num = rePartition.captured(1).toInt();
             qint64 firstSector = rePartition.captured(2).toLongLong();
             qint64 lastSector = rePartition.captured(3).toLongLong();
-            QLatin1String fsName = QLatin1String(rePartition.captured(4).toLatin1());
+            QString fsName = rePartition.captured(4);
             QString roleNames = rePartition.captured(5);
             QString volumeLabel = rePartition.captured(6).replace(QStringLiteral("\""), QString());
             QStringList flags = rePartition.captured(7).replace(QStringLiteral("\""), QString()).split(QStringLiteral(","));
@@ -1064,7 +1064,7 @@ void MainWindow::onImportPartitionTable()
             if (fs->supportSetLabel() != FileSystem::cmdSupportNone && !volumeLabel.isEmpty())
                 fs->setLabel(volumeLabel);
 
-            Partition* p = new Partition(parent, device, role, fs, firstSector, lastSector, QString(), PartitionTable::FlagNone, QString(), false, PartitionTable::FlagNone, Partition::State::New);
+            Partition* p = new Partition(parent, device, role, fs, firstSector, lastSector, QString(), PartitionTable::flagsFromList(flags), QString(), false, PartitionTable::flagsFromList(flags), Partition::State::New);
 
             operationStack().push(new NewOperation(device, p));
         } else

src/gui/mainwindow.h

@@ -70,8 +70,8 @@ protected:
 
     void enableActions();
 
-    void closeEvent(QCloseEvent*);
+    void closeEvent(QCloseEvent*) override;
-    void changeEvent(QEvent* event);
+    void changeEvent(QEvent* event) override;
 
     void setSavedSelectedDeviceNode(const QString& s) {
         m_SavedSelectedDeviceNode = s;

src/gui/smartdialogwidget.cpp

@@ -34,7 +34,7 @@ class SmartAttrDelegate : public QStyledItemDelegate
 public:
     SmartAttrDelegate() : QStyledItemDelegate() {}
 
-    virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+    virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 };
 
 void SmartAttrDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const

src/org.kde.partitionmanager.appdata.xml

@@ -144,6 +144,7 @@
     <p xml:lang="pt">Funcionalidades:</p>
     <p xml:lang="pt-BR">Funcionalidades:</p>
     <p xml:lang="ro">Caracteristici:</p>
+    <p xml:lang="ru">Возможности:</p>
     <p xml:lang="sk">Funkcie:</p>
     <p xml:lang="sl">Zmožnosti:</p>
     <p xml:lang="sr">Могућности:</p>

src/org.kde.partitionmanager.desktop

@@ -160,7 +160,7 @@ Icon=partitionmanager
 Categories=System;Filesystem;KDE;Qt;
 X-KDE-StartupNotify=true
 Keywords=partition;disk;
-Keywords[ast]=partición;discu;
+Keywords[ast]=partición;particionar;discu;
 Keywords[ca]=partició;disc;
 Keywords[ca@valencia]=partició;disc;
 Keywords[cs]=oddíl;disk;

src/partitionmanager.kcfg

@@ -138,18 +138,18 @@
 		<entry key="defaultFileSystem" type="Int">
 			<default>static_cast&lt;int&gt;(FileSystem::Type::Ext4)</default>
 		</entry>
-		<entry key="preferredUnit" type="Int">
+		<entry key="preferredUnit" type="Enum">
 			<label context="@label">Preferred unit:</label>
 			<choices>
-				<choice name="Byte">Capacity::Byte</choice>
+				<choice name="Byte"/>
-				<choice name="KiB">Capacity::KiB</choice>
+				<choice name="KiB"/>
-				<choice name="MiB">Capacity::MiB</choice>
+				<choice name="MiB"/>
-				<choice name="GiB">Capacity::GiB</choice>
+				<choice name="GiB"/>
-				<choice name="TiB">Capacity::TiB</choice>
+				<choice name="TiB"/>
-				<choice name="PiB">Capacity::PiB</choice>
+				<choice name="PiB"/>
-				<choice name="EiB">Capacity::EiB</choice>
+				<choice name="EiB"/>
 			</choices>
-			<default>Capacity::MiB</default>
+			<default>MiB</default>
 		</entry>
 		<entry key="shredSource" type="Enum">
 			<choices>