Add basic support for F2FS.
Bump version to 2.0.50 Bug: 359795
This commit is contained in:
parent
ceedb558a8
commit
6d76d92f23
|
@ -24,7 +24,7 @@ set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install mkspecs files, Plugins a
|
||||||
set(QT_MIN_VERSION "5.4.1")
|
set(QT_MIN_VERSION "5.4.1")
|
||||||
set(VERSION_MAJOR "2")
|
set(VERSION_MAJOR "2")
|
||||||
set(VERSION_MINOR "0")
|
set(VERSION_MINOR "0")
|
||||||
set(VERSION_RELEASE "2")
|
set(VERSION_RELEASE "50")
|
||||||
set(VERSION_SUFFIX "")
|
set(VERSION_SUFFIX "")
|
||||||
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}${VERSION_SUFFIX})
|
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}${VERSION_SUFFIX})
|
||||||
add_definitions(-D'VERSION="${VERSION}"') #"
|
add_definitions(-D'VERSION="${VERSION}"') #"
|
||||||
|
@ -73,7 +73,7 @@ add_definitions(
|
||||||
)
|
)
|
||||||
|
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
find_package(KPMcore 2.0.0 CONFIG REQUIRED)
|
find_package(KPMcore 2.0.50 REQUIRED)
|
||||||
pkg_check_modules(BLKID REQUIRED blkid)
|
pkg_check_modules(BLKID REQUIRED blkid)
|
||||||
|
|
||||||
include_directories(${Qt5Core_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} ${KPMCORE_INCLUDE_DIR} lib/ src/)
|
include_directories(${Qt5Core_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} ${KPMCORE_INCLUDE_DIR} lib/ src/)
|
||||||
|
|
|
@ -632,6 +632,22 @@
|
||||||
<item row="7" column="1">
|
<item row="7" column="1">
|
||||||
<widget class="KColorButton" name="kcfg_fileSystemColorCode24"/>
|
<widget class="KColorButton" name="kcfg_fileSystemColorCode24"/>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="7" column="3">
|
||||||
|
<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="4">
|
||||||
|
<widget class="KColorButton" name="kcfg_fileSystemColorCode25"/>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -60,8 +60,8 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="fileSystemColorCode$(colorNumber)" type="Color">
|
<entry key="fileSystemColorCode$(colorNumber)" type="Color">
|
||||||
<label context="@label">File system colors</label>
|
<label context="@label">File system colors</label>
|
||||||
<parameter name="colorNumber" type="UInt" max="24"/>
|
<parameter name="colorNumber" type="UInt" max="25"/>
|
||||||
<!-- numbers correspond to the enum in fs/filesystem.h -->
|
<!-- numbers correspond to the enum in kpmcore/fs/filesystem.h -->
|
||||||
<default param="0">220,205,175</default> <!-- unknown -->
|
<default param="0">220,205,175</default> <!-- unknown -->
|
||||||
<default param="1">187,249,207</default> <!-- extended -->
|
<default param="1">187,249,207</default> <!-- extended -->
|
||||||
<default param="2">102,121,150</default> <!-- ext2 -->
|
<default param="2">102,121,150</default> <!-- ext2 -->
|
||||||
|
@ -87,6 +87,7 @@
|
||||||
<default param="22">250,230,255</default> <!-- exfat -->
|
<default param="22">250,230,255</default> <!-- exfat -->
|
||||||
<default param="23">242,155,104</default> <!-- nilfs2 -->
|
<default param="23">242,155,104</default> <!-- nilfs2 -->
|
||||||
<default param="24">160,210,180</default> <!-- lvm2 pv -->
|
<default param="24">160,210,180</default> <!-- lvm2 pv -->
|
||||||
|
<default param="25">255,170,0</default> <!-- f2fs -->
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="showMenuBar" type="Bool">
|
<entry key="showMenuBar" type="Bool">
|
||||||
<label context="@label">Show the application's menu bar</label>
|
<label context="@label">Show the application's menu bar</label>
|
||||||
|
|
Loading…
Reference in New Issue