From 0e28eaf4f4dbfe67b797dd6afd39e160b228e4b6 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Wed, 14 Mar 2012 21:25:10 -0500 Subject: [PATCH] Reorganize KControl menu tree. * Rename Peripherals -> Hardware. * Move former KInfoCenter items -> Hardware/Information. * Move Monitor & Display -> System Administration. --- admin | 2 +- applnk/kde-settings.menu | 13 ++++++-- kcontrol/displayconfig/displayconfig.desktop | 32 +++++++++++--------- kcontrol/iccconfig/iccconfig.desktop | 6 ++-- kcontrol/info/cdinfo.desktop | 2 +- kcontrol/info/devices.desktop | 2 +- kcontrol/info/dma.desktop | 2 +- kcontrol/info/interrupts.desktop | 2 +- kcontrol/info/ioports.desktop | 2 +- kcontrol/info/memory.desktop | 2 +- kcontrol/info/opengl.desktop | 4 +-- kcontrol/info/partitions.desktop | 2 +- kcontrol/info/pci.desktop | 2 +- kcontrol/info/processor.desktop | 2 +- kcontrol/info/scsi.desktop | 2 +- kcontrol/info/sound.desktop | 2 +- kcontrol/info/xserver.desktop | 2 +- kcontrol/nics/nic.desktop | 2 +- kcontrol/samba/smbstatus.desktop | 2 +- kcontrol/usbview/kcmusb.desktop | 2 +- kcontrol/view1394/kcmview1394.desktop | 2 +- 21 files changed, 50 insertions(+), 39 deletions(-) diff --git a/admin b/admin index eb886af35..1e5f9378a 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit eb886af35eccf31b370f56bd3d901e9804859e06 +Subproject commit 1e5f9378a47b7a809f3027ae8f39ef5062825756 diff --git a/applnk/kde-settings.menu b/applnk/kde-settings.menu index e32d722fa..73dbdbf25 100644 --- a/applnk/kde-settings.menu +++ b/applnk/kde-settings.menu @@ -46,12 +46,19 @@ - Peripherals - kde-settings-peripherals.directory + Hardware + kde-settings-hardware.directory - X-KDE-settings-peripherals + X-KDE-settings-peripherals X-KDE-settings-hardware + + Information + kde-settings-information.directory + + X-KDE-settings-information + + PowerControl diff --git a/kcontrol/displayconfig/displayconfig.desktop b/kcontrol/displayconfig/displayconfig.desktop index 653e2f002..9b13feb02 100644 --- a/kcontrol/displayconfig/displayconfig.desktop +++ b/kcontrol/displayconfig/displayconfig.desktop @@ -1,23 +1,25 @@ [Desktop Entry] -Exec=kcmshell displayconfig -Icon=background -Type=Application -DocPath=kcontrol/displayconfig/index.html - -X-KDE-Library=displayconfig -X-KDE-ParentApp=kcontrol -X-KDE-RootOnly=true -X-KDE-SubstituteUID=true - -Categories=Qt;KDE;X-KDE-settings-peripherals; +Categories=Qt;KDE;X-KDE-settings-system; Comment=Configure display Comment[en_US]=Configure display DocPath=kcontrol/displayconfig.html +Exec[$e]=kcmshell displayconfig GenericName= GenericName[en_US]= +Icon=background Keywords=monitor,resolution,display MimeType= -Name=Monitor and Display -Name[en_US]=Monitor and Display - -NoDisplay=false \ No newline at end of file +Name=Monitor & Display +Name[en_US]=Monitor & Display +NoDisplay=false +Path[$e]= +StartupNotify=true +Terminal=false +TerminalOptions= +Type=Application +X-DCOP-ServiceType= +X-KDE-Library=displayconfig +X-KDE-ParentApp=kcontrol +X-KDE-RootOnly=true +X-KDE-SubstituteUID=true +X-KDE-Username= diff --git a/kcontrol/iccconfig/iccconfig.desktop b/kcontrol/iccconfig/iccconfig.desktop index 97f1b5a9d..8d56f742a 100644 --- a/kcontrol/iccconfig/iccconfig.desktop +++ b/kcontrol/iccconfig/iccconfig.desktop @@ -9,7 +9,7 @@ X-KDE-ParentApp=kcontrol X-KDE-RootOnly=true X-KDE-SubstituteUID=true -Categories=Qt;KDE;X-KDE-settings-peripherals; +Categories=Qt;KDE;X-KDE-settings-hardware; Comment=Configure display ICC profile Comment[en_US]=Configure display ICC profile DocPath=kcontrol/iccconfig.html @@ -18,4 +18,6 @@ GenericName[en_US]= Keywords=ICC,display,color,profile MimeType= Name=ICC Color Profile -Name[en_US]=ICC Color Profile \ No newline at end of file +Name[en_US]=ICC Color Profile + +NoDisplay=false \ No newline at end of file diff --git a/kcontrol/info/cdinfo.desktop b/kcontrol/info/cdinfo.desktop index 17302d5b5..a3c14670e 100644 --- a/kcontrol/info/cdinfo.desktop +++ b/kcontrol/info/cdinfo.desktop @@ -163,4 +163,4 @@ Keywords[uk]=CD-ROM Information,CD-ROM,CD,CD Drive,Writer Capabilities,Інфо Keywords[vi]=Thông tin đĩa CD-ROM,CD-ROM,CD, ổ đĩa CD, Khả năng ổ ghi Keywords[wa]=Informåcion do CD-ROM,CD-ROM,CD,léjheu d' CD,Usteyes di scrijhaedje -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/info/devices.desktop b/kcontrol/info/devices.desktop index 5895b8c3a..70198d001 100644 --- a/kcontrol/info/devices.desktop +++ b/kcontrol/info/devices.desktop @@ -3,7 +3,7 @@ Exec=kcmshell devices Icon=kcmdevices Type=Application DocPath=kinfocenter/devices/index.html -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; X-KDE-Library=info diff --git a/kcontrol/info/dma.desktop b/kcontrol/info/dma.desktop index bb02419ca..f14b83b04 100644 --- a/kcontrol/info/dma.desktop +++ b/kcontrol/info/dma.desktop @@ -3,7 +3,7 @@ Exec=kcmshell dma Icon=kcmmemory Type=Application DocPath=kinfocenter/dma/index.html -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; X-KDE-Library=info diff --git a/kcontrol/info/interrupts.desktop b/kcontrol/info/interrupts.desktop index bdfb6e6e6..4f6ca30a6 100644 --- a/kcontrol/info/interrupts.desktop +++ b/kcontrol/info/interrupts.desktop @@ -3,7 +3,7 @@ Exec=kcmshell interrupts Icon=kcmmemory Type=Application DocPath=kinfocenter/interrupts/index.html -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; X-KDE-Library=info diff --git a/kcontrol/info/ioports.desktop b/kcontrol/info/ioports.desktop index 1a3505314..1860b9c11 100644 --- a/kcontrol/info/ioports.desktop +++ b/kcontrol/info/ioports.desktop @@ -3,7 +3,7 @@ Exec=kcmshell ioports Icon=kcmmemory Type=Application DocPath=kinfocenter/ioports/index.html -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; X-KDE-Library=info diff --git a/kcontrol/info/memory.desktop b/kcontrol/info/memory.desktop index e94646cfe..f31005dc3 100644 --- a/kcontrol/info/memory.desktop +++ b/kcontrol/info/memory.desktop @@ -245,5 +245,5 @@ Keywords[xh]=Inkumbulo,RAM,Inkumbulo yobume,Inkumbulo yomzimba,Inkumbulo yokwahl Keywords[zh_CN]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,内存,虚拟存储,物理存储,共享内存,交换,系统信息 Keywords[zh_TW]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,記憶體,虛擬記憶體,實體記憶體,共享記憶體,系統資訊 Keywords[zu]=Inkumbulo,RAM,Inkumbulo yamanga,Inkumbulo siqu,Inkumbulo yokwabelana,Shintshanisa,Ulwazi Lwesistimu -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop index 4451c5167..2c7065aec 100644 --- a/kcontrol/info/opengl.desktop +++ b/kcontrol/info/opengl.desktop @@ -8,7 +8,7 @@ DocPath=kinfocenter/opengl/index.html X-KDE-Library=info X-KDE-FactoryName=opengl -X-KDE-ParentApp=kinfocenter +X-KDE-ParentApp=kcontrol Name=OpenGL Name[bn]=ওপেন-জি-এল @@ -145,5 +145,5 @@ Keywords[wa]=OpenGL,DRI,GLX,3D,VideoCard,cåte videyo,Hardware Acceleration,Grap Keywords[zh_CN]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,显卡,硬件加速,图形,X 服务器,显示 Keywords[zh_TW]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,顯示卡,硬體加速,圖形,顯示 -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/info/partitions.desktop b/kcontrol/info/partitions.desktop index ec9fce463..6f9964ec4 100644 --- a/kcontrol/info/partitions.desktop +++ b/kcontrol/info/partitions.desktop @@ -243,5 +243,5 @@ Keywords[zh_CN]=Partitions,Harddrive,HD,System Information,分区,硬盘,系统 Keywords[zh_TW]=Partitions,Harddrive,HD,System Information,磁碟分割區,硬式磁碟機,硬碟,系統資訊 Keywords[zu]=Izahluko,Harddrive,HD,Ulwazi Lwesistimu -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/info/pci.desktop b/kcontrol/info/pci.desktop index d60a876ef..d2158391b 100644 --- a/kcontrol/info/pci.desktop +++ b/kcontrol/info/pci.desktop @@ -177,5 +177,5 @@ Keywords[xh]=PCI,PCI-Amacebo,PCI-Ibhasi,Ulwazi lwendlela Keywords[zh_CN]=PCI,PCI-Devices,PCI-Bus,System Information,PCI 设备,PCI 总线,系统信息 Keywords[zh_TW]=PCI,PCI-Devices,PCI-Bus,System Information,PCI 設備,PCI 匯流排,系統資訊 Keywords[zu]=PCI,Amathuluzi-PCI,Ibhasi-PCI,Ulwaz Lwesistimu -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/info/processor.desktop b/kcontrol/info/processor.desktop index c72f50e2c..93d579df5 100644 --- a/kcontrol/info/processor.desktop +++ b/kcontrol/info/processor.desktop @@ -246,5 +246,5 @@ Keywords[xh]=Umqhubekekisi,CPU,FPU,MHz,Inkcukacha Yendlela yokusebenza Keywords[zh_CN]=Processor,CPU,FPU,MHz,System Information,处理器,系统信息 Keywords[zh_TW]=Processor,CPU,FPU,MHz,System Information,處理器,中央處理器,浮點運算器,系統資訊 Keywords[zu]=Umqhubekisi,CPU,FPU,MHz,Ulwazi Lwesistimu -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/info/scsi.desktop b/kcontrol/info/scsi.desktop index 9b2aa65a8..01eb2c80b 100644 --- a/kcontrol/info/scsi.desktop +++ b/kcontrol/info/scsi.desktop @@ -174,5 +174,5 @@ Keywords[xh]=SCSI,SCSI-Ibhasi,Ulwazi lwendlela Keywords[zh_CN]=SCSI,SCSI-Bus,System Information,SCSI 总线,系统信息 Keywords[zh_TW]=SCSI,SCSI-Bus,System Information,系統資訊 Keywords[zu]=SCSI,Ibhasi-SCSI,Ulwazi Lwesistimu -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/info/sound.desktop b/kcontrol/info/sound.desktop index 4f8942871..7cf1e786a 100644 --- a/kcontrol/info/sound.desktop +++ b/kcontrol/info/sound.desktop @@ -240,5 +240,5 @@ Keywords[vi]=Âm thanh,âm,Bo mạch âm thanh,Midi,OSS,Thông tin Hệ thống Keywords[wa]=Son,Audiocåte son,MIDI,OSS,informåcion do sistinme Keywords[zh_CN]=Sound,Audio,Soundcard,MIDI,OSS,System Information,音频,音响,声卡,系统信息 Keywords[zh_TW]=Sound,Audio,Soundcard,Midi,OSS,系統資訊 -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/info/xserver.desktop b/kcontrol/info/xserver.desktop index e54b9e2a4..01284d839 100644 --- a/kcontrol/info/xserver.desktop +++ b/kcontrol/info/xserver.desktop @@ -224,4 +224,4 @@ Keywords[wa]=X,X-Server,XServer,sierveu X,XFree86,håynaedje,Display,cåte videy Keywords[zh_CN]=X,X-Server,XServer,XFree86,Display,VideoCard,System InformationX 服务器,显示器,显卡,系统信息 Keywords[zh_TW]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,X 伺服器,X伺服器,顯示器,顯示卡,系統資訊 -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/nics/nic.desktop b/kcontrol/nics/nic.desktop index b2ad111eb..13c1b4788 100644 --- a/kcontrol/nics/nic.desktop +++ b/kcontrol/nics/nic.desktop @@ -170,5 +170,5 @@ Comment[zh_CN]=网络接口信息 Comment[zh_TW]=網路界面資訊 Comment[zu]=Ulwazi lomxhumanisi woxhumano olusakazekile -Categories=Qt;KDE;X-KDE-settings-network; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/samba/smbstatus.desktop b/kcontrol/samba/smbstatus.desktop index 14b8425ed..e542097dc 100644 --- a/kcontrol/samba/smbstatus.desktop +++ b/kcontrol/samba/smbstatus.desktop @@ -7,7 +7,7 @@ DocPath=kinfocenter/samba/index.html X-KDE-Library=samba X-KDE-FactoryName=samba -X-KDE-ParentApp=kinfocenter +X-KDE-ParentApp=kcontrol Name=Samba Status Name[ar]=حالة Samba diff --git a/kcontrol/usbview/kcmusb.desktop b/kcontrol/usbview/kcmusb.desktop index 76729bb5d..c032167fa 100644 --- a/kcontrol/usbview/kcmusb.desktop +++ b/kcontrol/usbview/kcmusb.desktop @@ -237,4 +237,4 @@ Keywords[zh_CN]=USB,devices,viewer,control,设备,查看器,控制 Keywords[zh_TW]=USB,devices,viewer,control,裝置,檢視器,控制 Keywords[zu]=USB,amathukuzi ananjongo,umbukisi,lawula -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information; diff --git a/kcontrol/view1394/kcmview1394.desktop b/kcontrol/view1394/kcmview1394.desktop index fb1b7ad79..18f98e60a 100644 --- a/kcontrol/view1394/kcmview1394.desktop +++ b/kcontrol/view1394/kcmview1394.desktop @@ -216,5 +216,5 @@ Keywords[wa]=1394,IEEE 1394,Firewire,éndjins,håyneu,contrôle,corwaitaedje Keywords[zh_CN]=1394,Firewire,devices,viewer,control,设备,查看器,控制,火线 Keywords[zh_TW]=1394,Firewire,devices,viewer,control,裝置,檢視器,控制 -Categories=Qt;KDE;X-KDE-settings-hardware; +Categories=Qt;KDE;X-KDE-settings-information;