From d076291973e89d146efe8e87c41460fcc140ab7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Fri, 8 Sep 2017 11:43:18 +0100
Subject: [PATCH] Add support for detecting ISO9660 file systems.

---
 src/config/configurepagefilesystemcolors.ui | 178 +++++++++++---------
 src/partitionmanager.kcfg                   |   3 +-
 2 files changed, 99 insertions(+), 82 deletions(-)

diff --git a/src/config/configurepagefilesystemcolors.ui b/src/config/configurepagefilesystemcolors.ui
index 850fbb2..7303390 100644
--- a/src/config/configurepagefilesystemcolors.ui
+++ b/src/config/configurepagefilesystemcolors.ui
@@ -483,87 +483,6 @@
       <item row="6" column="1">
        <widget class="KColorButton" name="kcfg_fileSystemColorCode21"/>
       </item>
-      <item row="9" column="0">
-       <widget class="QLabel" name="textLabel_13">
-        <property name="text">
-         <string>extended:</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="9" column="1">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode1"/>
-      </item>
-      <item row="9" column="2">
-       <spacer name="horizontalSpacer_12">
-        <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="9" column="3">
-       <widget class="QLabel" name="textLabel_17">
-        <property name="text">
-         <string>unformatted:</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="9" column="4">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode16"/>
-      </item>
-      <item row="9" column="5">
-       <spacer name="horizontalSpacer_11">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>21</width>
-          <height>21</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="9" column="6">
-       <widget class="QLabel" name="textLabel_16">
-        <property name="text">
-         <string>unknown:</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="9" column="7">
-       <widget class="KColorButton" name="kcfg_fileSystemColorCode0"/>
-      </item>
-      <item row="8" column="0" colspan="8">
-       <widget class="Line" name="line">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
       <item row="6" column="3">
        <widget class="QLabel" name="textLabel_26">
         <property name="text">
@@ -664,6 +583,103 @@
       <item row="7" column="7">
        <widget class="KColorButton" name="kcfg_fileSystemColorCode26"/>
       </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_fileSystemColorCode27"/>
+      </item>
+      <item row="10" column="0" colspan="8">
+       <widget class="Line" name="line">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="11" column="0">
+       <widget class="QLabel" name="textLabel_13">
+        <property name="text">
+         <string>extended:</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="11" column="1">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCode1"/>
+      </item>
+      <item row="11" column="2">
+       <spacer name="horizontalSpacer_12">
+        <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="11" column="3">
+       <widget class="QLabel" name="textLabel_17">
+        <property name="text">
+         <string>unformatted:</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="11" column="4">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCode16"/>
+      </item>
+      <item row="11" column="5">
+       <spacer name="horizontalSpacer_11">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>21</width>
+          <height>21</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="11" column="6">
+       <widget class="QLabel" name="textLabel_16">
+        <property name="text">
+         <string>unknown:</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="11" column="7">
+       <widget class="KColorButton" name="kcfg_fileSystemColorCode0"/>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/partitionmanager.kcfg b/src/partitionmanager.kcfg
index 97d9764..c59d073 100644
--- a/src/partitionmanager.kcfg
+++ b/src/partitionmanager.kcfg
@@ -60,7 +60,7 @@
 		</entry>
 		<entry key="fileSystemColorCode$(colorNumber)" type="Color">
 			<label context="@label">File system colors</label>
-			<parameter name="colorNumber" type="UInt" max="26"/>
+			<parameter name="colorNumber" type="UInt" max="27"/>
 			<!-- 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 -->
@@ -89,6 +89,7 @@
 			<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 -->
 		</entry>
 		<entry key="showMenuBar" type="Bool">
 			<label context="@label">Show the application's menu bar</label>