From b5eaa4aadceae65cca17e06c479d13e8dc04c40e Mon Sep 17 00:00:00 2001
From: Caio Carvalho <caiojcarvalho@gmail.com>
Date: Sun, 15 Jul 2018 17:40:01 -0300
Subject: [PATCH] Adding support for detecting linux_raid_member file system.

---
 src/config/configurepagefilesystemcolors.ui | 290 +++++++++++---------
 src/partitionmanager.kcfg                   |   2 +
 2 files changed, 155 insertions(+), 137 deletions(-)

diff --git a/src/config/configurepagefilesystemcolors.ui b/src/config/configurepagefilesystemcolors.ui
index c73b4d3..49e3251 100644
--- a/src/config/configurepagefilesystemcolors.ui
+++ b/src/config/configurepagefilesystemcolors.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>481</width>
+    <width>484</width>
     <height>457</height>
    </rect>
   </property>
@@ -22,7 +22,7 @@
      <property name="title">
       <string>File Systems</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
+     <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="textLabel">
         <property name="text">
@@ -94,7 +94,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="7">
+      <item row="0" column="8">
        <widget class="KColorButton" name="kcfg_fileSystemColorCodeExt4"/>
       </item>
       <item row="1" column="0">
@@ -156,6 +156,19 @@
        </spacer>
       </item>
       <item row="1" column="6">
+       <widget class="QLabel" name="textLabel_18">
+        <property name="text">
+         <string>Linux RAID:</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="2" column="0">
        <widget class="QLabel" name="textLabel_4">
         <property name="text">
          <string>Linux Swap:</string>
@@ -168,24 +181,8 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLinuxSwap"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="textLabel_32">
-        <property name="text">
-         <string>FAT12:</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="2" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeFat12"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLinuxSwap"/>
       </item>
       <item row="2" column="2">
        <spacer name="horizontalSpacer_21">
@@ -201,9 +198,9 @@
        </spacer>
       </item>
       <item row="2" column="3">
-       <widget class="QLabel" name="textLabel_6">
+       <widget class="QLabel" name="textLabel_32">
         <property name="text">
-         <string>FAT16:</string>
+         <string>FAT12:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -214,7 +211,7 @@
        </widget>
       </item>
       <item row="2" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeFat16"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeFat12"/>
       </item>
       <item row="2" column="5">
        <spacer name="horizontalSpacer_17">
@@ -230,9 +227,9 @@
        </spacer>
       </item>
       <item row="2" column="6">
-       <widget class="QLabel" name="textLabel_5">
+       <widget class="QLabel" name="textLabel_6">
         <property name="text">
-         <string>FAT32:</string>
+         <string>FAT16:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -242,10 +239,10 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeFat32"/>
-      </item>
       <item row="2" column="8">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeFat16"/>
+      </item>
+      <item row="2" column="9">
        <spacer name="horizontalSpacer_16">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -259,9 +256,9 @@
        </spacer>
       </item>
       <item row="3" column="0">
-       <widget class="QLabel" name="textLabel_10">
+       <widget class="QLabel" name="textLabel_5">
         <property name="text">
-         <string>HPFS:</string>
+         <string>FAT32:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -272,7 +269,7 @@
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeHpfs"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeFat32"/>
       </item>
       <item row="3" column="2">
        <spacer name="horizontalSpacer_6">
@@ -288,9 +285,9 @@
        </spacer>
       </item>
       <item row="3" column="3">
-       <widget class="QLabel" name="textLabel_7">
+       <widget class="QLabel" name="textLabel_10">
         <property name="text">
-         <string>ReiserFS:</string>
+         <string>HPFS:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -301,7 +298,7 @@
        </widget>
       </item>
       <item row="3" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeReiserFS"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeHpfs"/>
       </item>
       <item row="3" column="5">
        <spacer name="horizontalSpacer_5">
@@ -317,6 +314,22 @@
        </spacer>
       </item>
       <item row="3" column="6">
+       <widget class="QLabel" name="textLabel_7">
+        <property name="text">
+         <string>ReiserFS:</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="8">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeReiserFS"/>
+      </item>
+      <item row="4" column="0">
        <widget class="QLabel" name="textLabel_8">
         <property name="text">
          <string>Reiser4:</string>
@@ -329,24 +342,8 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeReiser4"/>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="textLabel_11">
-        <property name="text">
-         <string>JFS:</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="4" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeJfs"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeReiser4"/>
       </item>
       <item row="4" column="2">
        <spacer name="horizontalSpacer_8">
@@ -362,9 +359,9 @@
        </spacer>
       </item>
       <item row="4" column="3">
-       <widget class="QLabel" name="textLabel_12">
+       <widget class="QLabel" name="textLabel_11">
         <property name="text">
-         <string>HFS:</string>
+         <string>JFS:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -375,7 +372,7 @@
        </widget>
       </item>
       <item row="4" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeHfs"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeJfs"/>
       </item>
       <item row="4" column="5">
        <spacer name="horizontalSpacer_7">
@@ -391,6 +388,22 @@
        </spacer>
       </item>
       <item row="4" column="6">
+       <widget class="QLabel" name="textLabel_12">
+        <property name="text">
+         <string>HFS:</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="4" column="8">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeHfs"/>
+      </item>
+      <item row="5" column="0">
        <widget class="QLabel" name="textLabel_14">
         <property name="text">
          <string>HFS+:</string>
@@ -403,24 +416,8 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeHfsPlus"/>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="textLabel_15">
-        <property name="text">
-         <string>UFS:</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="5" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeUfs"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeHfsPlus"/>
       </item>
       <item row="5" column="2">
        <spacer name="horizontalSpacer_10">
@@ -436,9 +433,9 @@
        </spacer>
       </item>
       <item row="5" column="3">
-       <widget class="QLabel" name="textLabel_22">
+       <widget class="QLabel" name="textLabel_15">
         <property name="text">
-         <string>XFS:</string>
+         <string>UFS:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -449,7 +446,7 @@
        </widget>
       </item>
       <item row="5" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeXfs"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeUfs"/>
       </item>
       <item row="5" column="5">
        <spacer name="horizontalSpacer_9">
@@ -465,6 +462,22 @@
        </spacer>
       </item>
       <item row="5" column="6">
+       <widget class="QLabel" name="textLabel_22">
+        <property name="text">
+         <string>XFS:</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="5" column="8">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeXfs"/>
+      </item>
+      <item row="6" column="0">
        <widget class="QLabel" name="textLabel_24">
         <property name="text">
          <string>OCFS2:</string>
@@ -477,24 +490,8 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="7">
-       <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_fileSystemColorCodeZfs"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeOcfs2"/>
       </item>
       <item row="6" column="2">
        <spacer name="horizontalSpacer_13">
@@ -510,17 +507,20 @@
        </spacer>
       </item>
       <item row="6" column="3">
-       <widget class="QLabel" name="textLabel_26">
+       <widget class="QLabel" name="textLabel_25">
         <property name="text">
-         <string>exFAT:</string>
+         <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="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeExfat"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeZfs"/>
       </item>
       <item row="6" column="5">
        <spacer name="horizontalSpacer_14">
@@ -536,6 +536,19 @@
        </spacer>
       </item>
       <item row="6" column="6">
+       <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="8">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeExfat"/>
+      </item>
+      <item row="7" column="0">
        <widget class="QLabel" name="textLabel_27">
         <property name="text">
          <string>NILFS2:</string>
@@ -545,24 +558,8 @@
         </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">
-         <string>LVM2 PV:</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="7" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLvm2_PV"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeNilfs2"/>
       </item>
       <item row="7" column="2">
        <spacer name="horizontalSpacer_22">
@@ -578,9 +575,9 @@
        </spacer>
       </item>
       <item row="7" column="3">
-       <widget class="QLabel" name="textLabel_29">
+       <widget class="QLabel" name="textLabel_28">
         <property name="text">
-         <string>F2FS:</string>
+         <string>LVM2 PV:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -591,7 +588,7 @@
        </widget>
       </item>
       <item row="7" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeF2fs"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLvm2_PV"/>
       </item>
       <item row="7" column="5">
        <spacer name="horizontalSpacer_18">
@@ -607,6 +604,22 @@
        </spacer>
       </item>
       <item row="7" column="6">
+       <widget class="QLabel" name="textLabel_29">
+        <property name="text">
+         <string>F2FS:</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="7" column="8">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeF2fs"/>
+      </item>
+      <item row="8" column="0">
        <widget class="QLabel" name="textLabel_30">
         <property name="text">
          <string>UDF:</string>
@@ -619,24 +632,8 @@
         </property>
        </widget>
       </item>
-      <item row="7" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeUdf"/>
-      </item>
-      <item row="8" column="0">
-       <widget class="QLabel" name="textLabel_31">
-        <property name="text">
-         <string>ISO 9660:</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="8" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeIso9660"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeUdf"/>
       </item>
       <item row="8" column="2">
        <spacer name="horizontalSpacer_19">
@@ -652,9 +649,9 @@
        </spacer>
       </item>
       <item row="8" column="3">
-       <widget class="QLabel" name="textLabel_20">
+       <widget class="QLabel" name="textLabel_31">
         <property name="text">
-         <string>LUKS:</string>
+         <string>ISO 9660:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -665,7 +662,7 @@
        </widget>
       </item>
       <item row="8" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLuks"/>
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeIso9660"/>
       </item>
       <item row="8" column="5">
        <spacer name="horizontalSpacer_20">
@@ -681,6 +678,22 @@
        </spacer>
       </item>
       <item row="8" column="6">
+       <widget class="QLabel" name="textLabel_20">
+        <property name="text">
+         <string>LUKS:</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="8" column="8">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLuks"/>
+      </item>
+      <item row="9" column="0">
        <widget class="QLabel" name="textLabel_33">
         <property name="text">
          <string>LUKS2:</string>
@@ -693,10 +706,10 @@
         </property>
        </widget>
       </item>
-      <item row="8" column="7">
+      <item row="9" column="1">
        <widget class="KColorButton" name="kcfg_fileSystemColorCodeLuks2"/>
       </item>
-      <item row="10" column="0" colspan="8">
+      <item row="10" column="0" colspan="9">
        <widget class="Line" name="line">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -774,9 +787,12 @@
         </property>
        </widget>
       </item>
-      <item row="11" column="7">
+      <item row="11" column="8">
        <widget class="KColorButton" name="kcfg_fileSystemColorCodeUnknown"/>
       </item>
+      <item row="1" column="8">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCodeLinuxRaidMember"/>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/partitionmanager.kcfg b/src/partitionmanager.kcfg
index 8c858fc..7b4eb86 100644
--- a/src/partitionmanager.kcfg
+++ b/src/partitionmanager.kcfg
@@ -89,6 +89,7 @@
 					<value>Iso9660</value>
 					<value>Luks2</value>
 					<value>Fat12</value>
+                                        <value>LinuxRaidMember</value>
 				</values>
 			</parameter>
 			<default param="Unknown">220,205,175</default>
@@ -121,6 +122,7 @@
 			<default param="Iso9660">177,82,69</default>
 			<default param="Luks2">223,39,104</default>
 			<default param="Fat12">204,179,255</default>
+                        <default param="LinuxRaidMember">255,100,100</default>
 		</entry>
 		<entry key="showMenuBar" type="Bool">
 			<label context="@label">Show the application's menu bar</label>