From 3c9d85d8428149c51ec12d6bd561863d6a161c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sat, 7 Apr 2018 19:05:05 +0100
Subject: [PATCH] Use enums instead of ints when choosing filesystem color in
 KConfig.

---
 src/config/configurepagefilesystemcolors.ui | 170 ++++++++++----------
 src/partitionmanager.kcfg                   | 101 ++++++++----
 src/util/guihelpers.cpp                     |   6 +-
 3 files changed, 155 insertions(+), 122 deletions(-)

diff --git a/src/config/configurepagefilesystemcolors.ui b/src/config/configurepagefilesystemcolors.ui
index 5b2f267..c73b4d3 100644
--- a/src/config/configurepagefilesystemcolors.ui
+++ b/src/config/configurepagefilesystemcolors.ui
@@ -37,7 +37,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode2"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeExt2"/>
       </item>
       <item row="0" column="2">
        <spacer name="horizontalSpacer">
@@ -66,7 +66,7 @@
        </widget>
       </item>
       <item row="0" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode3"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeExt3"/>
       </item>
       <item row="0" column="5">
        <spacer name="horizontalSpacer_2">
@@ -95,7 +95,7 @@
        </widget>
       </item>
       <item row="0" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode4"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeExt4"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="textLabel_21">
@@ -111,7 +111,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode17"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeBtrfs"/>
       </item>
       <item row="1" column="2">
        <spacer name="horizontalSpacer_15">
@@ -140,7 +140,7 @@
        </widget>
       </item>
       <item row="1" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode8"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeNtfs"/>
       </item>
       <item row="1" column="5">
        <spacer name="horizontalSpacer_3">
@@ -169,7 +169,7 @@
        </widget>
       </item>
       <item row="1" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode5"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLinuxSwap"/>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="textLabel_32">
@@ -185,7 +185,7 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode29"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeFat12"/>
       </item>
       <item row="2" column="2">
        <spacer name="horizontalSpacer_21">
@@ -214,7 +214,7 @@
        </widget>
       </item>
       <item row="2" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode6"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeFat16"/>
       </item>
       <item row="2" column="5">
        <spacer name="horizontalSpacer_17">
@@ -243,7 +243,7 @@
        </widget>
       </item>
       <item row="2" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode7"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeFat32"/>
       </item>
       <item row="2" column="8">
        <spacer name="horizontalSpacer_16">
@@ -258,10 +258,10 @@
         </property>
        </spacer>
       </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="textLabel_25">
+      <item row="3" column="0">
+       <widget class="QLabel" name="textLabel_10">
         <property name="text">
-         <string>ZFS:</string>
+         <string>HPFS:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -271,6 +271,22 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="1">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeHpfs"/>
+      </item>
+      <item row="3" column="2">
+       <spacer name="horizontalSpacer_6">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>28</width>
+          <height>17</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="3" column="3">
        <widget class="QLabel" name="textLabel_7">
         <property name="text">
@@ -285,7 +301,7 @@
        </widget>
       </item>
       <item row="3" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode9"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeReiserFS"/>
       </item>
       <item row="3" column="5">
        <spacer name="horizontalSpacer_5">
@@ -314,36 +330,7 @@
        </widget>
       </item>
       <item row="3" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode10"/>
-      </item>
-      <item row="3" column="2">
-       <spacer name="horizontalSpacer_6">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>28</width>
-          <height>17</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="textLabel_10">
-        <property name="text">
-         <string>HPFS:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode18"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeReiser4"/>
       </item>
       <item row="4" column="0">
        <widget class="QLabel" name="textLabel_11">
@@ -359,7 +346,7 @@
        </widget>
       </item>
       <item row="4" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode12"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeJfs"/>
       </item>
       <item row="4" column="2">
        <spacer name="horizontalSpacer_8">
@@ -388,7 +375,7 @@
        </widget>
       </item>
       <item row="4" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode13"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeHfs"/>
       </item>
       <item row="4" column="5">
        <spacer name="horizontalSpacer_7">
@@ -417,7 +404,7 @@
        </widget>
       </item>
       <item row="4" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode14"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeHfsPlus"/>
       </item>
       <item row="5" column="0">
        <widget class="QLabel" name="textLabel_15">
@@ -433,7 +420,7 @@
        </widget>
       </item>
       <item row="5" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode15"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeUfs"/>
       </item>
       <item row="5" column="2">
        <spacer name="horizontalSpacer_10">
@@ -462,7 +449,7 @@
        </widget>
       </item>
       <item row="5" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode11"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeXfs"/>
       </item>
       <item row="5" column="5">
        <spacer name="horizontalSpacer_9">
@@ -491,36 +478,23 @@
        </widget>
       </item>
       <item row="5" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode20"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeOcfs2"/>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="textLabel_25">
+        <property name="text">
+         <string>ZFS:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="6" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode21"/>
-      </item>
-      <item row="6" column="3">
-       <widget class="QLabel" name="textLabel_26">
-        <property name="text">
-         <string>exFAT:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode22"/>
-      </item>
-      <item row="6" column="6">
-       <widget class="QLabel" name="textLabel_27">
-        <property name="text">
-         <string>NILFS2:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode23"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeZfs"/>
       </item>
       <item row="6" column="2">
        <spacer name="horizontalSpacer_13">
@@ -535,6 +509,19 @@
         </property>
        </spacer>
       </item>
+      <item row="6" column="3">
+       <widget class="QLabel" name="textLabel_26">
+        <property name="text">
+         <string>exFAT:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="4">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeExfat"/>
+      </item>
       <item row="6" column="5">
        <spacer name="horizontalSpacer_14">
         <property name="orientation">
@@ -548,6 +535,19 @@
         </property>
        </spacer>
       </item>
+      <item row="6" column="6">
+       <widget class="QLabel" name="textLabel_27">
+        <property name="text">
+         <string>NILFS2:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="7">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeNilfs2"/>
+      </item>
       <item row="7" column="0">
        <widget class="QLabel" name="textLabel_28">
         <property name="text">
@@ -562,7 +562,7 @@
        </widget>
       </item>
       <item row="7" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode24"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLvm2_PV"/>
       </item>
       <item row="7" column="2">
        <spacer name="horizontalSpacer_22">
@@ -591,7 +591,7 @@
        </widget>
       </item>
       <item row="7" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode25"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeF2fs"/>
       </item>
       <item row="7" column="5">
        <spacer name="horizontalSpacer_18">
@@ -620,7 +620,7 @@
        </widget>
       </item>
       <item row="7" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode26"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeUdf"/>
       </item>
       <item row="8" column="0">
        <widget class="QLabel" name="textLabel_31">
@@ -636,7 +636,7 @@
        </widget>
       </item>
       <item row="8" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode27"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeIso9660"/>
       </item>
       <item row="8" column="2">
        <spacer name="horizontalSpacer_19">
@@ -665,7 +665,7 @@
        </widget>
       </item>
       <item row="8" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode19"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLuks"/>
       </item>
       <item row="8" column="5">
        <spacer name="horizontalSpacer_20">
@@ -694,7 +694,7 @@
        </widget>
       </item>
       <item row="8" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode28"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLuks2"/>
       </item>
       <item row="10" column="0" colspan="8">
        <widget class="Line" name="line">
@@ -717,7 +717,7 @@
        </widget>
       </item>
       <item row="11" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode1"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeExtended"/>
       </item>
       <item row="11" column="2">
        <spacer name="horizontalSpacer_12">
@@ -746,7 +746,7 @@
        </widget>
       </item>
       <item row="11" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode16"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeUnformatted"/>
       </item>
       <item row="11" column="5">
        <spacer name="horizontalSpacer_11">
@@ -775,7 +775,7 @@
        </widget>
       </item>
       <item row="11" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode0"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeUnknown"/>
       </item>
      </layout>
     </widget>
diff --git a/src/partitionmanager.kcfg b/src/partitionmanager.kcfg
index f8b26c7..6513c27 100644
--- a/src/partitionmanager.kcfg
+++ b/src/partitionmanager.kcfg
@@ -54,40 +54,73 @@
 			<label context="@label">Align partitions per default</label>
 			<default>true</default>
 		</entry>
-		<entry key="fileSystemColorCode$(colorNumber)" type="Color">
+		<entry key="fileSystemColorCode$(FileSystem)" type="Color">
 			<label context="@label">File system colors</label>
-			<parameter name="colorNumber" type="UInt" max="29"/>
-			<!-- numbers correspond to the enum in kpmcore/fs/filesystem.h -->
-			<default param="0">220,205,175</default> <!-- unknown -->
-			<default param="1">187,249,207</default> <!-- extended -->
-			<default param="2">102,121,150</default> <!-- ext2 -->
-			<default param="3">122,145,180</default> <!-- ext3 -->
-			<default param="4">143,170,210</default> <!-- ext4 -->
-			<default param="5">155,155,130</default> <!-- swap -->
-			<default param="6">204,179,215</default> <!-- fat16 -->
-			<default param="7">229,201,240</default> <!-- fat32 -->
-			<default param="8">244,214,255</default> <!-- ntfs -->
-			<default param="9">216,220,135</default> <!-- reiser-->
-			<default param="10">251,255,157</default> <!-- reiser4 -->
-			<default param="11">200,255,254</default> <!-- xfs -->
-			<default param="12">137,200,198</default> <!-- jfs -->
-			<default param="13">210,136,142</default> <!-- hfs -->
-			<default param="14">240,165,171</default> <!-- hfs+ -->
-			<default param="15">151,220,134</default> <!-- ufs -->
-			<default param="16">220,205,175</default> <!-- unformatted -->
-			<default param="17">173,205,255</default> <!-- btrfs -->
-			<default param="18">176,155,185</default> <!-- hpfs -->
-			<default param="19">170,30,77</default> <!-- luks -->
-			<default param="20">96,140,85</default> <!-- ocfs2 -->
-			<default param="21">33,137,108</default> <!-- zfs -->
-			<default param="22">250,230,255</default> <!-- exfat -->
-			<default param="23">242,155,104</default> <!-- nilfs2 -->
-			<default param="24">160,210,180</default> <!-- lvm2 pv -->
-			<default param="25">255,170,0</default> <!-- f2fs -->
-			<default param="26">170,120,255</default> <!-- udf -->
-                        <default param="27">177,82,69</default> <!-- iso9660 -->
-                        <default param="28">223,39,104</default> <!-- luks2 -->
-                        <default param="29">204,179,255</default> <!-- fat12 -->
+			<parameter name="FileSystem" type="Enum">
+				<!-- values correspond to the enum in kpmcore/fs/filesystem.h -->
+				<values>
+					<value>Unknown</value>
+					<value>Extended</value>
+					<value>Ext2</value>
+					<value>Ext3</value>
+					<value>Ext4</value>
+					<value>LinuxSwap</value>
+					<value>Fat16</value>
+					<value>Fat32</value>
+					<value>Ntfs</value>
+					<value>ReiserFS</value>
+					<value>Reiser4</value>
+					<value>Xfs</value>
+					<value>Jfs</value>
+					<value>Hfs</value>
+					<value>HfsPlus</value>
+					<value>Ufs</value>
+					<value>Unformatted</value>
+					<value>Btrfs</value>
+					<value>Hpfs</value>
+					<value>Luks</value>
+					<value>Ocfs2</value>
+					<value>Zfs</value>
+					<value>Exfat</value>
+					<value>Nilfs2</value>
+					<value>Lvm2_PV</value>
+					<value>F2fs</value>
+					<value>Udf</value>
+					<value>Iso9660</value>
+					<value>Luks2</value>
+					<value>Fat12</value>
+				</values>
+			</parameter>
+			<default param="Unknown">220,205,175</default>
+			<default param="Extended">187,249,207</default>
+			<default param="Ext2">102,121,150</default>
+			<default param="Ext3">122,145,180</default>
+			<default param="Ext4">143,170,210</default>
+			<default param="LinuxSwap">155,155,130</default>
+			<default param="Fat16">204,179,215</default>
+			<default param="Fat32">229,201,240</default>
+			<default param="Ntfs">244,214,255</default>
+			<default param="ReiserFS">216,220,135</default>
+			<default param="Reiser4">251,255,157</default>
+			<default param="Xfs">200,255,254</default>
+			<default param="Jfs">137,200,198</default>
+			<default param="Hfs">210,136,142</default>
+			<default param="HfsPlus">240,165,171</default>
+			<default param="Ufs">151,220,134</default>
+			<default param="Unformatted">220,205,175</default>
+			<default param="Btrfs">173,205,255</default>
+			<default param="Hpfs">176,155,185</default>
+			<default param="Luks">170,30,77</default>
+			<default param="Ocfs2">96,140,85</default>
+			<default param="Zfs">33,137,108</default>
+			<default param="Exfat">250,230,255</default>
+			<default param="Nilfs2">242,155,104</default>
+			<default param="Lvm2_PV">160,210,180</default>
+			<default param="F2fs">255,170,0</default>
+			<default param="Udf">170,120,255</default>
+			<default param="Iso9660">177,82,69</default>
+			<default param="Luks2">223,39,104</default>
+			<default param="Fat12">204,179,255</default>
 		</entry>
 		<entry key="showMenuBar" type="Bool">
 			<label context="@label">Show the application's menu bar</label>
@@ -97,7 +130,7 @@
 			<label context="@label">Backend plugin</label>
 		</entry>
 		<entry key="defaultFileSystem" type="Int">
-			<default>FileSystem::Ext4</default>
+			<default>FileSystem::Type::Ext4</default>
 		</entry>
 		<entry key="preferredUnit" type="Int">
 			<label context="@label">Preferred unit:</label>
diff --git a/src/util/guihelpers.cpp b/src/util/guihelpers.cpp
index 0f8dbeb..54048b5 100644
--- a/src/util/guihelpers.cpp
+++ b/src/util/guihelpers.cpp
@@ -119,10 +119,10 @@ FileSystem::Type defaultFileSystem()
 std::vector<QColor> fileSystemColorCodesFromSettings()
 {
     std::vector<QColor> cc;
-    cc.reserve(FileSystem::__lastType);
-    for (int i = 0; i < FileSystem::__lastType; ++i)
+    cc.reserve(Config::EnumFileSystem::type::COUNT);
+    for (int i = 0; i < Config::EnumFileSystem::type::COUNT; ++i)
     {
-        cc[ i ] = Config::fileSystemColorCode( i );
+        cc[i] = Config::fileSystemColorCode(i);
     }
     return cc;
 }