Add LUKS2 and FAT12 to file system color configuration dialog.

This commit is contained in:
Andrius Štikonas 2017-12-24 20:42:33 +00:00
parent 7c1ff3cc19
commit 4b97201539
2 changed files with 157 additions and 58 deletions

View File

@ -23,35 +23,6 @@
<string>File Systems</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="3">
<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="1" column="4">
<widget class="KColorButton" name="kcfg_fileSystemColorCode19"/>
</item>
<item row="2" column="6">
<widget class="QLabel" name="textLabel_9">
<property name="text">
<string>ntfs:</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="0" column="0">
<widget class="QLabel" name="textLabel">
<property name="text">
@ -129,7 +100,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel_21">
<property name="text">
<string>btrfs:</string>
<string>Btrfs:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -155,6 +126,22 @@
</property>
</spacer>
</item>
<item row="1" column="3">
<widget class="QLabel" name="textLabel_9">
<property name="text">
<string>NTFS:</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="1" column="4">
<widget class="KColorButton" name="kcfg_fileSystemColorCode8"/>
</item>
<item row="1" column="5">
<spacer name="horizontalSpacer_3">
<property name="orientation">
@ -171,7 +158,7 @@
<item row="1" column="6">
<widget class="QLabel" name="textLabel_4">
<property name="text">
<string>linuxswap:</string>
<string>Linux Swap:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -185,9 +172,9 @@
<widget class="KColorButton" name="kcfg_fileSystemColorCode5"/>
</item>
<item row="2" column="0">
<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>
@ -198,10 +185,10 @@
</widget>
</item>
<item row="2" column="1">
<widget class="KColorButton" name="kcfg_fileSystemColorCode6"/>
<widget class="KColorButton" name="kcfg_fileSystemColorCode29"/>
</item>
<item row="2" column="2">
<spacer name="horizontalSpacer_4">
<spacer name="horizontalSpacer_21">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@ -214,9 +201,9 @@
</spacer>
</item>
<item row="2" column="3">
<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>
@ -227,9 +214,38 @@
</widget>
</item>
<item row="2" column="4">
<widget class="KColorButton" name="kcfg_fileSystemColorCode7"/>
<widget class="KColorButton" name="kcfg_fileSystemColorCode6"/>
</item>
<item row="2" column="5">
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>43</width>
<height>17</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="6">
<widget class="QLabel" name="textLabel_5">
<property name="text">
<string>FAT32:</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="7">
<widget class="KColorButton" name="kcfg_fileSystemColorCode7"/>
</item>
<item row="2" column="8">
<spacer name="horizontalSpacer_16">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -245,7 +261,7 @@
<item row="6" column="0">
<widget class="QLabel" name="textLabel_25">
<property name="text">
<string>zfs:</string>
<string>ZFS:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -255,13 +271,10 @@
</property>
</widget>
</item>
<item row="2" column="7">
<widget class="KColorButton" name="kcfg_fileSystemColorCode8"/>
</item>
<item row="3" column="3">
<widget class="QLabel" name="textLabel_7">
<property name="text">
<string>reiserfs:</string>
<string>ReiserFS:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -290,7 +303,7 @@
<item row="3" column="6">
<widget class="QLabel" name="textLabel_8">
<property name="text">
<string>reiser4:</string>
<string>Reiser4:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -319,7 +332,7 @@
<item row="3" column="0">
<widget class="QLabel" name="textLabel_10">
<property name="text">
<string>hpfs:</string>
<string>HPFS:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -335,7 +348,7 @@
<item row="4" column="0">
<widget class="QLabel" name="textLabel_11">
<property name="text">
<string>jfs</string>
<string>JFS:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -364,7 +377,7 @@
<item row="4" column="3">
<widget class="QLabel" name="textLabel_12">
<property name="text">
<string>hfs:</string>
<string>HFS:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -393,7 +406,7 @@
<item row="4" column="6">
<widget class="QLabel" name="textLabel_14">
<property name="text">
<string>hfsplus:</string>
<string>HFS+:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -409,7 +422,7 @@
<item row="5" column="0">
<widget class="QLabel" name="textLabel_15">
<property name="text">
<string>ufs:</string>
<string>UFS:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -438,7 +451,7 @@
<item row="5" column="3">
<widget class="QLabel" name="textLabel_22">
<property name="text">
<string>xfs:</string>
<string>XFS:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -467,7 +480,7 @@
<item row="5" column="6">
<widget class="QLabel" name="textLabel_24">
<property name="text">
<string>ocfs2:</string>
<string>OCFS2:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -486,7 +499,7 @@
<item row="6" column="3">
<widget class="QLabel" name="textLabel_26">
<property name="text">
<string>exfat:</string>
<string>exFAT:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -499,7 +512,7 @@
<item row="6" column="6">
<widget class="QLabel" name="textLabel_27">
<property name="text">
<string>nilfs2:</string>
<string>NILFS2:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -538,7 +551,7 @@
<item row="7" column="0">
<widget class="QLabel" name="textLabel_28">
<property name="text">
<string>lvm2 pv:</string>
<string>LVM2 PV:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -551,10 +564,23 @@
<item row="7" column="1">
<widget class="KColorButton" name="kcfg_fileSystemColorCode24"/>
</item>
<item row="7" column="2">
<spacer name="horizontalSpacer_22">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>43</width>
<height>17</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="3">
<widget class="QLabel" name="textLabel_29">
<property name="text">
<string>f2fs:</string>
<string>F2FS:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -567,10 +593,23 @@
<item row="7" column="4">
<widget class="KColorButton" name="kcfg_fileSystemColorCode25"/>
</item>
<item row="7" column="5">
<spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>43</width>
<height>17</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="6">
<widget class="QLabel" name="textLabel_30">
<property name="text">
<string>udf:</string>
<string>UDF:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -599,6 +638,64 @@
<item row="8" column="1">
<widget class="KColorButton" name="kcfg_fileSystemColorCode27"/>
</item>
<item row="8" column="2">
<spacer name="horizontalSpacer_19">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>43</width>
<height>17</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="3">
<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="4">
<widget class="KColorButton" name="kcfg_fileSystemColorCode19"/>
</item>
<item row="8" column="5">
<spacer name="horizontalSpacer_20">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>43</width>
<height>17</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="6">
<widget class="QLabel" name="textLabel_33">
<property name="text">
<string>LUKS2:</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="7">
<widget class="KColorButton" name="kcfg_fileSystemColorCode28"/>
</item>
<item row="10" column="0" colspan="8">
<widget class="Line" name="line">
<property name="orientation">
@ -689,7 +786,7 @@
<customwidget>
<class>KColorButton</class>
<extends>QPushButton</extends>
<header>KColorButton</header>
<header>kcolorbutton.h</header>
</customwidget>
</customwidgets>
<resources/>

View File

@ -60,7 +60,7 @@
</entry>
<entry key="fileSystemColorCode$(colorNumber)" type="Color">
<label context="@label">File system colors</label>
<parameter name="colorNumber" type="UInt" max="27"/>
<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 -->
@ -90,6 +90,8 @@
<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 -->
</entry>
<entry key="showMenuBar" type="Bool">
<label context="@label">Show the application's menu bar</label>