Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kcontrol: improve categorization

Browse source 
* move ksplash KCM module to kcontrol sub-directory, ksplash it
  build always and there is no reason to keep it out of the
  kcontrol directory holding all major KCM modules

* merge some sub-category modules into other major categories
  almost the same way it is done in KDE5 as it makes much more
  sense and users do not have to go to in-and-out of
  sub-categories to configure the overall desktop appearance
  - application-appearance -> desktop-appearance
  - window-behaviour -> workspace-behavior
  - workspace-appearance-and-behavior -> workspace-behaviour
This commit is contained in:
Ivailo Monev 2015-01-16 23:12:19 +00:00
parent 0564b83ddb
commit e2ab69e6bf
26 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcontrol/CMakeLists.txt
View file

@ -30,6 +30,7 @@ add_subdirectory( colors )
add_subdirectory( krdb ) add_subdirectory( krdb )
add_subdirectory( style ) add_subdirectory( style )
add_subdirectory( desktoptheme ) add_subdirectory( desktoptheme )
add_subdirectory( splash )
add_subdirectory( standard_actions ) add_subdirectory( standard_actions )
add_subdirectory( keys ) add_subdirectory( keys )
add_subdirectory( workspaceoptions ) add_subdirectory( workspaceoptions )

2
kcontrol/colors/colors.desktop
View file

@ -8,7 +8,7 @@ X-DocPath=kcontrol/colors/index.html
X-KDE-Library=kcm_colors X-KDE-Library=kcm_colors
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=application-appearance X-KDE-System-Settings-Parent-Category=desktop-appearance
X-KDE-Weight=60 X-KDE-Weight=60
Name=Colors Name=Colors

4
kcontrol/emoticons/emoticons.desktop
View file

@ -7,8 +7,8 @@ X-DocPath=kcontrol/emoticons/index.html
X-KDE-ServiceTypes=KCModule X-KDE-ServiceTypes=KCModule
X-KDE-Library=kcm_emoticons X-KDE-Library=kcm_emoticons
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=application-appearance X-KDE-System-Settings-Parent-Category=desktop-appearance
X-KDE-Weight=110 X-KDE-Weight=210
Name=Emoticons Name=Emoticons
Name[af]=Emotikons Name[af]=Emotikons

4
kcontrol/fonts/fonts.desktop
View file

@ -8,8 +8,8 @@ X-DocPath=kcontrol/fonts/index.html
X-KDE-Library=kcm_fonts X-KDE-Library=kcm_fonts
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=application-appearance X-KDE-System-Settings-Parent-Category=desktop-appearance
X-KDE-Weight=80 X-KDE-Weight=180
Name=Fonts Name=Fonts
Name[af]=Skriftipes Name[af]=Skriftipes

4
kcontrol/icons/icons.desktop
View file

@ -8,8 +8,8 @@ X-DocPath=kcontrol/icons/index.html
X-KDE-Library=kcm_icons X-KDE-Library=kcm_icons
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=application-appearance X-KDE-System-Settings-Parent-Category=desktop-appearance
X-KDE-Weight=70 X-KDE-Weight=110
Name=Icons Name=Icons
Name[af]=Ikone Name[af]=Ikone

1
kcontrol/input/cursortheme.desktop
View file

@ -7,6 +7,7 @@ X-KDE-ServiceTypes=KCModule
X-KDE-Library=kcm_cursortheme X-KDE-Library=kcm_cursortheme
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=desktop-appearance X-KDE-System-Settings-Parent-Category=desktop-appearance
X-KDE-Weight=120
X-DocPath=kcontrol/cursortheme/index.html X-DocPath=kcontrol/cursortheme/index.html
Name=Cursor Theme Name=Cursor Theme

0
ksplash/kcm/CMakeLists.txt → kcontrol/splash/CMakeLists.txt
View file

0
ksplash/kcm/Messages.sh → kcontrol/splash/Messages.sh
View file

0
ksplash/kcm/installer.cpp → kcontrol/splash/installer.cpp
View file

0
ksplash/kcm/installer.h → kcontrol/splash/installer.h
View file

0
ksplash/kcm/ksplash.knsrc → kcontrol/splash/ksplash.knsrc
View file

2
ksplash/kcm/ksplashthememgr.desktop → kcontrol/splash/ksplashthememgr.desktop
View file

@ -10,7 +10,7 @@ X-KDE-Library=kcm_ksplashthemes
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=desktop-appearance X-KDE-System-Settings-Parent-Category=desktop-appearance
X-KDE-Weight=100 X-KDE-Weight=200
Name=Splash Screen Name=Splash Screen
Name[af]=Spat Skerm Name[af]=Spat Skerm

0
ksplash/kcm/main.cpp → kcontrol/splash/main.cpp
View file

0
ksplash/kcm/pics/CMakeLists.txt → kcontrol/splash/pics/CMakeLists.txt
View file

0
ksplash/kcm/pics/hi128-app-ksplash.png → kcontrol/splash/pics/hi128-app-ksplash.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
ksplash/kcm/pics/hi16-app-ksplash.png → kcontrol/splash/pics/hi16-app-ksplash.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1,021 B

After

Width:  |  Height:  |  Size: 1,021 B

0
ksplash/kcm/pics/hi22-app-ksplash.png → kcontrol/splash/pics/hi22-app-ksplash.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
ksplash/kcm/pics/hi32-app-ksplash.png → kcontrol/splash/pics/hi32-app-ksplash.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

0
ksplash/kcm/pics/hi48-app-ksplash.png → kcontrol/splash/pics/hi48-app-ksplash.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

0
ksplash/kcm/pics/hi64-app-ksplash.png → kcontrol/splash/pics/hi64-app-ksplash.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

2
kcontrol/style/style.desktop
View file

@ -9,7 +9,7 @@ X-KDE-Library=kcm_style
X-KDE-Init-Symbol=kcminit_style X-KDE-Init-Symbol=kcminit_style
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=application-appearance X-KDE-System-Settings-Parent-Category=desktop-appearance
X-KDE-Weight=50 X-KDE-Weight=50
Name=Style Name=Style

1
ksplash/CMakeLists.txt
View file

@ -1,6 +1,5 @@
add_subdirectory( ksplashx ) add_subdirectory( ksplashx )
add_subdirectory( elarun ) add_subdirectory( elarun )
add_subdirectory( none ) add_subdirectory( none )
add_subdirectory( kcm )
add_subdirectory( ksplashqml ) add_subdirectory( ksplashqml )
add_subdirectory( default ) add_subdirectory( default )

2
kwin/kcmkwin/kwincompositing/kwincompositing.desktop
View file

@ -8,7 +8,7 @@ X-DocPath=kcontrol/kwincompositing/index.html
X-KDE-Library=kcm_kwincompositing X-KDE-Library=kcm_kwincompositing
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=workspace-appearance-and-behavior X-KDE-System-Settings-Parent-Category=workspace-behavior
X-KDE-Weight=50 X-KDE-Weight=50
Name=Desktop Effects Name=Desktop Effects

4
kwin/kcmkwin/kwinoptions/kwinoptions.desktop
View file

@ -9,8 +9,8 @@ X-KDE-Library=kcm_kwinoptions
X-KDE-PluginKeyword=kwinoptions X-KDE-PluginKeyword=kwinoptions
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=window-behaviour X-KDE-System-Settings-Parent-Category=workspace-behavior
X-KDE-Weight=90 X-KDE-Weight=120
Name=Window Behavior Name=Window Behavior
Name[af]=Venstergedrag Name[af]=Venstergedrag

4
kwin/kcmkwin/kwinrules/kwinrules.desktop
View file

@ -8,8 +8,8 @@ X-DocPath=kcontrol/windowspecific/index.html
X-KDE-Library=kcm_kwinrules X-KDE-Library=kcm_kwinrules
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=window-behaviour X-KDE-System-Settings-Parent-Category=workspace-behavior
X-KDE-Weight=120 X-KDE-Weight=130
Name=Window Rules Name=Window Rules
Name[ar]=قواعد النوافذ Name[ar]=قواعد النوافذ

4
kwin/kcmkwin/kwintabbox/kwintabbox.desktop
View file

@ -7,8 +7,8 @@ X-DocPath=kcontrol/kwintabbox/index.html
X-KDE-Library=kcm_kwintabbox X-KDE-Library=kcm_kwintabbox
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=window-behaviour X-KDE-System-Settings-Parent-Category=workspace-behavior
X-KDE-Weight=60 X-KDE-Weight=110
Name=Task Switcher Name=Task Switcher
Name[ar]=مبدّل المهام Name[ar]=مبدّل المهام