packages: kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff - merge...
shadzik
shadzik at pld-linux.org
Thu Feb 18 00:34:40 CET 2010
Author: shadzik Date: Wed Feb 17 23:34:40 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
packages/kde4-kdebase-workspace:
kde4-kdebase-workspace-branch.diff (1.16 -> 1.17)
---- Diffs:
================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.16 packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.17
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.16 Fri Dec 18 13:02:43 2009
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff Thu Feb 18 00:34:35 2010
@@ -1,1151 +1,4190 @@
---- workspace/kcontrol/input/logitechmouse.cpp (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/input/logitechmouse.cpp (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -38,6 +38,7 @@
-
- LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, QWidget* parent, const char* name )
- : LogitechMouseBase( parent )
-+ , m_resolution( 0 )
- {
- if ( !name )
- setObjectName( "LogitechMouse" );
-@@ -110,7 +111,8 @@
-
- LogitechMouse::~LogitechMouse()
- {
-- usb_close( m_usbDeviceHandle );
-+ if ( m_usbDeviceHandle )
-+ usb_close( m_usbDeviceHandle );
- }
-
- void LogitechMouse::initCordlessStatusReporting()
-@@ -125,7 +127,10 @@
- {
- QByteArray status(8, '\0');
-
-- int result = usb_control_msg( m_usbDeviceHandle,
-+ int result = -1;
-+
-+ if ( m_usbDeviceHandle )
-+ result = usb_control_msg( m_usbDeviceHandle,
- USB_TYPE_VENDOR | USB_ENDPOINT_IN,0x09,
- (0x0003 | m_useSecondChannel),
- (0x0000 | m_useSecondChannel),
-@@ -135,6 +140,7 @@
-
- if (0 > result) {
- // We probably have a permission problem
-+ m_channel = 0;
- channelSelector->setEnabled( false );
- batteryBox->setEnabled( false );
- cordlessNameLabel->hide();
-@@ -246,7 +252,10 @@
- {
- char resolution;
-
-- int result = usb_control_msg( m_usbDeviceHandle,
-+ int result = -1;
-+
-+ if ( m_usbDeviceHandle )
-+ result = usb_control_msg( m_usbDeviceHandle,
- USB_TYPE_VENDOR | USB_ENDPOINT_IN,
- 0x01,
- 0x000E,
---- workspace/kcontrol/randr/randrconfig.cpp (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/randr/randrconfig.cpp (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -101,7 +101,6 @@
- foreach(RandROutput *output, outputs)
- {
- o = new OutputGraphicsItem(output);
-- o->setParent(m_scene);
- m_scene->addItem(o);
-
- connect(o, SIGNAL(itemChanged(OutputGraphicsItem*)),
---- workspace/kcontrol/keys/keys.desktop (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/keys.desktop (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -76,7 +76,7 @@
- Name[tg]=Глобальные комбинации клавиш
- Name[th]=ปุ่มพิมพ์ลัดใช้งานส่วนรวม
- Name[tr]=Genel Klavye Kısayolları
--Name[uk]=Глобальні клавіатурні скорочення
-+Name[uk]=Загальні клавіатурні скорочення
- Name[wa]=Rascourtis globås del taprece
- Name[x-test]=xxGlobal Keyboard Shortcutsxx
- Name[zh_CN]=全局键盘快捷键
---- workspace/kcontrol/keys/schemes/mac4.kksrc (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/schemes/mac4.kksrc (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -100,6 +100,7 @@
-
- [kwin][Global Shortcuts]
- Desktop Screenshot to Clipboard=Ctrl+Shift+3
-+Kill Window=Ctrl+Alt+Esc
- Mouse Emulation=none
- Switch One Desktop Down=none
- Switch One Desktop Up=none
-@@ -123,10 +124,43 @@
- Switch to Desktop 9=Ctrl+F9
- Switch to Next Desktop=none
- Switch to Previous Desktop=none
-+Toggle Window Raise/Lower=Ctrl+E
- Walk Through Desktop List (Reverse)=none
- Walk Through Desktop List=none
- Walk Through Desktops (Reverse)=Alt+Shift+Tab
- Walk Through Desktops=Alt+Tab
-+Walk Through Windows (Reverse)=Ctrl+Shift+Tab
-+Walk Through Windows=Ctrl+Tab
-+Window Close=Alt+F4
-+Window Lower=none
-+Window Maximize Horizontal=none
-+Window Maximize Vertical=none
-+Window Maximize=none
-+Window Minimize=none
-+Window Move=none
-+Window Operations Menu=Alt+F3
-+Window Raise=none
-+Window Resize=none
-+Window Screenshot to Clipboard=Ctrl+Shift+4
-+Window Shade=none
-+Window to Desktop 10=none
-+Window to Desktop 11=none
-+Window to Desktop 12=none
-+Window to Desktop 13=none
-+Window to Desktop 14=none
-+Window to Desktop 15=none
-+Window to Desktop 16=none
-+Window to Desktop 1=none
-+Window to Desktop 2=none
-+Window to Desktop 3=none
-+Window to Desktop 4=none
-+Window to Desktop 5=none
-+Window to Desktop 6=none
-+Window to Desktop 7=none
-+Window to Desktop 8=none
-+Window to Desktop 9=none
-+Window to Next Desktop=none
-+Window to Previous Desktop=none
-
- [kxkb][Global Shortcuts]
- Switch to Next Keyboard Layout=Ctrl+Alt+K
---- workspace/kcontrol/keys/schemes/old_kde3.kksrc (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/schemes/old_kde3.kksrc (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -1,44 +1,10 @@
-
- [Global Shortcuts]
- Halt Computer=none
--Kill Metadow=Ctrl+Alt+Esc
- Popup Launch Menu=Alt+F1
- Reboot Computer=none
--Show Metadow List=Alt+F5
-+Show Window List=Alt+F5
- Toggle Showing Desktop=Ctrl+Alt+D
--Toggle Metadow Raise/Lower=none
--Walk Through Metadows=Alt+Tab
--Walk Through Metadows (Reverse)=Alt+Shift+Tab
--Metadow Close=Alt+F4
--Metadow Lower=none
--Metadow Maximize Horizontal=none
--Metadow Maximize=none
--Metadow Maximize Vertical=none
--Metadow Minimize=none
--Metadow Move=none
--Metadow Operations Menu=Alt+F3
--Metadow Raise=none
--Metadow Resize=none
--Metadow Screenshot=Alt+Print
--Metadow Shade=none
--Metadow to Desktop 10=none
--Metadow to Desktop 11=none
--Metadow to Desktop 12=none
--Metadow to Desktop 13=none
--Metadow to Desktop 14=none
--Metadow to Desktop 15=none
--Metadow to Desktop 16=none
--Metadow to Desktop 1=none
--Metadow to Desktop 2=none
--Metadow to Desktop 3=none
--Metadow to Desktop 4=none
--Metadow to Desktop 5=none
--Metadow to Desktop 6=none
--Metadow to Desktop 7=none
--Metadow to Desktop 8=none
--Metadow to Desktop 9=none
--Metadow to Next Desktop=none
--Metadow to Previous Desktop=none
-
- [Shortcuts]
- AddBookmark=Ctrl+B
-@@ -46,8 +12,8 @@
- Close=Ctrl+W
- Copy=Ctrl+C; Ctrl+Insert
- Cut=Ctrl+X; Shift+Del
--DelWordBack=Ctrl+Backspace
--DelWordForward=Ctrl+Delete
-+DeleteWordBack=Ctrl+Backspace
-+DeleteWordForward=Ctrl+Del
- Deselect=Ctrl+Shift+A
- End=Ctrl+End
- Find=Ctrl+F
---- workspace/kcontrol/keys/schemes/old_unix3.kksrc (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/schemes/old_unix3.kksrc (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -1,44 +1,10 @@
-
- [Global Shortcuts]
- Halt Computer=none
--Kill Metadow=Alt+F9
- Popup Launch Menu=Alt+F1
- Reboot Computer=none
--Show Metadow List=none
-+Show Window List=none
- Toggle Showing Desktop=Ctrl+Alt+D
--Toggle Metadow Raise/Lower=none
--Walk Through Metadows=Alt+F11
--Walk Through Metadows (Reverse)=Alt+Shift+Tab
--Metadow Close=none
--Metadow Minimize=Alt+F4
--Metadow Lower=none
--Metadow Maximize=Alt+Shift+F3
--Metadow Maximize Horizontal=none
--Metadow Maximize Vertical=none
--Metadow Move=Alt+F5
--Metadow Operations Menu=none
--Metadow Raise=none
--Metadow Resize=Alt+F6
--Metadow Screenshot=none
--Metadow Shade=none
--Metadow to Desktop 1=none
--Metadow to Desktop 10=none
--Metadow to Desktop 11=none
--Metadow to Desktop 12=none
--Metadow to Desktop 13=none
--Metadow to Desktop 14=none
--Metadow to Desktop 15=none
--Metadow to Desktop 16=none
--Metadow to Desktop 2=none
--Metadow to Desktop 3=none
--Metadow to Desktop 4=none
--Metadow to Desktop 5=none
--Metadow to Desktop 6=none
--Metadow to Desktop 7=none
--Metadow to Desktop 8=none
--Metadow to Desktop 9=none
--Metadow to Next Desktop=none
--Metadow to Previous Desktop=none
-
- [Shortcuts]
- AddBookmark=Ctrl+B
-@@ -46,8 +12,8 @@
- Close=Ctrl+W
- Copy=Ctrl+C
- Cut=Ctrl+X
--DelWordBack=Ctrl+Backspace
--DelWordForward=Ctrl+Delete
-+DeleteWordBack=Ctrl+Backspace
-+DeleteWordForward=Ctrl+Del
- Deselect=Ctrl+Shift+A
- End=Ctrl+End
- Find=Ctrl+S
---- workspace/kcontrol/keys/schemes/old_wm3.kksrc (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/schemes/old_wm3.kksrc (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -1,44 +1,10 @@
-
- [Global Shortcuts]
- Halt Computer=none
--Kill Metadow=Ctrl+Alt+Esc
- Popup Launch Menu=Alt+F1
- Reboot Computer=none
--Show Metadow List=Alt+F5
-+Show Window List=Alt+F5
- Toggle Showing Desktop=Ctrl+Alt+D
--Toggle Metadow Raise/Lower=none
--Walk Through Metadows=Alt+Tab
--Walk Through Metadows (Reverse)=Alt+Shift+Tab
--Metadow Close=Alt+Esc
--Metadow Minimize=none
--Metadow Lower=none
--Metadow Maximize=none
--Metadow Maximize Horizontal=none
--Metadow Maximize Vertical=none
--Metadow Move=none
--Metadow Operations Menu=Alt+F3
--Metadow Raise=none
--Metadow Resize=none
--Metadow Screenshot=Alt+Print
--Metadow Shade=none
--Metadow to Desktop 1=Ctrl+Alt+1
--Metadow to Desktop 10=Ctrl+Alt+Shift+1
--Metadow to Desktop 11=Ctrl+Alt+Shift+2
--Metadow to Desktop 12=Ctrl+Alt+Shift+3
--Metadow to Desktop 13=Ctrl+Alt+Shift+4
--Metadow to Desktop 14=Ctrl+Alt+Shift+5
--Metadow to Desktop 15=Ctrl+Alt+Shift+6
--Metadow to Desktop 16=Ctrl+Alt+Shift+7
--Metadow to Desktop 2=Ctrl+Alt+2
--Metadow to Desktop 3=Ctrl+Alt+3
--Metadow to Desktop 4=Ctrl+Alt+4
--Metadow to Desktop 5=Ctrl+Alt+5
--Metadow to Desktop 6=Ctrl+Alt+6
--Metadow to Desktop 7=Ctrl+Alt+7
--Metadow to Desktop 8=Ctrl+Alt+8
--Metadow to Desktop 9=Ctrl+Alt+9
--Metadow to Next Desktop=none
--Metadow to Previous Desktop=none
-
- [Shortcuts]
- AddBookmark=Ctrl+B
-@@ -46,8 +12,8 @@
- Close=Ctrl+W
- Copy=Ctrl+C; Ctrl+Insert
- Cut=Ctrl+X; Shift+Del
--DelWordBack=Ctrl+Backspace
--DelWordForward=Ctrl+Delete
-+DeleteWordBack=Ctrl+Backspace
-+DeleteWordForward=Ctrl+Del
- Deselect=Ctrl+Shift+A
- End=Ctrl+End
- Find=Ctrl+F
---- workspace/kcontrol/keys/schemes/old_kde4.kksrc (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/schemes/old_kde4.kksrc (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -1,44 +1,10 @@
-
- [Global Shortcuts]
- Halt Computer=none
--Kill Metadow=Win+Ctrl+Del
- Popup Launch Menu=Meta+Menu
- Reboot Computer=none
--Show Metadow List=Win+0
-+Show Window List=Meta+0
- Toggle Showing Desktop=Meta+Ctrl+D
--Toggle Metadow Raise/Lower=none
--Walk Through Metadows=Alt+Tab
--Walk Through Metadows (Reverse)=Alt+Shift+Tab
--Metadow Close=Alt+Esc; Alt+F4
--Metadow Minimize=Win+-
--Metadow Lower=none
--Metadow Maximize=Win++
--Metadow Maximize Horizontal=Win+=
--Metadow Maximize Vertical=Win+|
--Metadow Move=none
--Metadow Operations Menu=Alt+Menu
--Metadow Raise=none
--Metadow Resize=none
--Metadow Screenshot=Alt+Print
--Metadow Shade=Win+_
--Metadow to Desktop 1=Win+Alt+F1
--Metadow to Desktop 10=Win+Alt+F10
--Metadow to Desktop 11=none
--Metadow to Desktop 12=none
--Metadow to Desktop 13=none
--Metadow to Desktop 14=none
--Metadow to Desktop 15=none
--Metadow to Desktop 16=none
--Metadow to Desktop 2=Win+Alt+F2
--Metadow to Desktop 3=Win+Alt+F3
--Metadow to Desktop 4=Win+Alt+F4
--Metadow to Desktop 5=Win+Alt+F5
--Metadow to Desktop 6=Win+Alt+F6
--Metadow to Desktop 7=Win+Alt+F7
--Metadow to Desktop 8=Win+Alt+F8
--Metadow to Desktop 9=Win+Alt+F9
--Metadow to Next Desktop=none
--Metadow to Previous Desktop=none
-
- [Shortcuts]
- AddBookmark=Ctrl+B
-@@ -46,8 +12,8 @@
- Close=Ctrl+Esc; Ctrl+W
- Copy=Ctrl+C; Ctrl+Insert
- Cut=Ctrl+X; Shift+Del
--DelWordBack=Ctrl+Backspace
--DelWordForward=Ctrl+Delete
-+DeleteWordBack=Ctrl+Backspace
-+DeleteWordForward=Ctrl+Del
- Deselect=Ctrl+Shift+A
- End=Ctrl+End
- Find=Ctrl+F
---- workspace/kcontrol/keys/schemes/kde3.kksrc (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/schemes/kde3.kksrc (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -95,6 +95,7 @@
-
- [kwin][Global Shortcuts]
- Desktop Screenshot to Clipboard=Ctrl+Print
-+Kill Window=Ctrl+Alt+Esc
- Mouse Emulation=Alt+F12
- Switch One Desktop Down=none
- Switch One Desktop Up=none
-@@ -118,10 +119,43 @@
- Switch to Desktop 9=Ctrl+F9
- Switch to Next Desktop=none
- Switch to Previous Desktop=none
-+Toggle Window Raise/Lower=none
- Walk Through Desktop List (Reverse)=Ctrl+Shift+Tab
- Walk Through Desktop List=Ctrl+Tab
- Walk Through Desktops (Reverse)=none
- Walk Through Desktops=none
-+Walk Through Windows (Reverse)=Alt+Shift+Tab
-+Walk Through Windows=Alt+Tab
-+Window Close=Alt+F4
-+Window Lower=none
-+Window Maximize Horizontal=none
-+Window Maximize Vertical=none
-+Window Maximize=none
-+Window Minimize=none
-+Window Move=none
-+Window Operations Menu=Alt+F3
-+Window Raise=none
-+Window Resize=none
-+Window Screenshot to Clipboard=Alt+Print
-+Window Shade=none
-+Window to Desktop 10=none
-+Window to Desktop 11=none
-+Window to Desktop 12=none
-+Window to Desktop 13=none
-+Window to Desktop 14=none
-+Window to Desktop 15=none
-+Window to Desktop 16=none
-+Window to Desktop 1=none
-+Window to Desktop 2=none
-+Window to Desktop 3=none
-+Window to Desktop 4=none
-+Window to Desktop 5=none
-+Window to Desktop 6=none
-+Window to Desktop 7=none
-+Window to Desktop 8=none
-+Window to Desktop 9=none
-+Window to Next Desktop=none
-+Window to Previous Desktop=none
-
- [kxkb][Global Shortcuts]
- Switch to Next Keyboard Layout=Ctrl+Alt+K
---- workspace/kcontrol/keys/schemes/unix3.kksrc (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/schemes/unix3.kksrc (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -100,6 +100,7 @@
-
- [kwin][Global Shortcuts]
- Desktop Screenshot to Clipboard=none
-+Kill Window=Alt+F9
- Mouse Emulation=Alt+F12
- Switch One Desktop Down=none
- Switch One Desktop Up=none
-@@ -123,10 +124,43 @@
- Switch to Desktop 9=Ctrl+F9
- Switch to Next Desktop=none
- Switch to Previous Desktop=none
-+Toggle Window Raise/Lower=none
- Walk Through Desktop List (Reverse)=Ctrl+Shift+Tab
- Walk Through Desktop List=none
- Walk Through Desktops (Reverse)=none
- Walk Through Desktops=Ctrl+Tab
-+Walk Through Windows (Reverse)=Alt+Shift+Tab
-+Walk Through Windows=Alt+F11
-+Window Close=none
-+Window Lower=none
-+Window Maximize Horizontal=none
-+Window Maximize Vertical=none
-+Window Maximize=Alt+Shift+F3
-+Window Minimize=Alt+F4
-+Window Move=Alt+F5
-+Window Operations Menu=none
-+Window Raise=none
-+Window Resize=Alt+F6
-+Window Screenshot to Clipboard=none
-+Window Shade=none
-+Window to Desktop 10=none
-+Window to Desktop 11=none
-+Window to Desktop 12=none
-+Window to Desktop 13=none
-+Window to Desktop 14=none
-+Window to Desktop 15=none
-+Window to Desktop 16=none
-+Window to Desktop 1=none
-+Window to Desktop 2=none
-+Window to Desktop 3=none
-+Window to Desktop 4=none
-+Window to Desktop 5=none
-+Window to Desktop 6=none
-+Window to Desktop 7=none
-+Window to Desktop 8=none
-+Window to Desktop 9=none
-+Window to Next Desktop=none
-+Window to Previous Desktop=none
-
- [kxkb][Global Shortcuts]
- Switch to Next Keyboard Layout=Ctrl+Alt+K
---- workspace/kcontrol/keys/schemes/wm3.kksrc (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/schemes/wm3.kksrc (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -95,6 +95,7 @@
-
- [kwin][Global Shortcuts]
- Desktop Screenshot to Clipboard=Ctrl+Print
-+Kill Window=Ctrl+Alt+Esc
- Mouse Emulation=Alt+F12
- Switch One Desktop Down=none
- Switch One Desktop Up=none
-@@ -118,10 +119,43 @@
- Switch to Desktop 9=Alt+9
- Switch to Next Desktop=none
- Switch to Previous Desktop=none
-+Toggle Window Raise/Lower=none
- Walk Through Desktop List (Reverse)=Ctrl+Shift+Tab
- Walk Through Desktop List=Ctrl+Tab
- Walk Through Desktops (Reverse)=none
- Walk Through Desktops=none
-+Walk Through Windows (Reverse)=Alt+Shift+Tab
-+Walk Through Windows=Alt+Tab
-+Window Close=Alt+Esc
-+Window Lower=none
-+Window Maximize Horizontal=none
-+Window Maximize Vertical=none
-+Window Maximize=none
-+Window Minimize=none
-+Window Move=none
-+Window Operations Menu=Alt+F3
-+Window Raise=none
-+Window Resize=none
-+Window Screenshot to Clipboard=Alt+Print
-+Window Shade=none
-+Window to Desktop 10=Ctrl+Alt+Shift+1
-+Window to Desktop 11=Ctrl+Alt+Shift+2
-+Window to Desktop 12=Ctrl+Alt+Shift+3
-+Window to Desktop 13=Ctrl+Alt+Shift+4
-+Window to Desktop 14=Ctrl+Alt+Shift+5
-+Window to Desktop 15=Ctrl+Alt+Shift+6
-+Window to Desktop 16=Ctrl+Alt+Shift+7
-+Window to Desktop 1=Ctrl+Alt+1
-+Window to Desktop 2=Ctrl+Alt+2
-+Window to Desktop 3=Ctrl+Alt+3
-+Window to Desktop 4=Ctrl+Alt+4
-+Window to Desktop 5=Ctrl+Alt+5
-+Window to Desktop 6=Ctrl+Alt+6
-+Window to Desktop 7=Ctrl+Alt+7
-+Window to Desktop 8=Ctrl+Alt+8
-+Window to Desktop 9=Ctrl+Alt+9
-+Window to Next Desktop=none
-+Window to Previous Desktop=none
-
- [kxkb][Global Shortcuts]
- Switch to Next Keyboard Layout=Ctrl+Alt+K
---- workspace/kcontrol/keys/schemes/kde4.kksrc (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/schemes/kde4.kksrc (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -95,6 +95,7 @@
-
- [kwin][Global Shortcuts]
- Desktop Screenshot to Clipboard=Meta+Print
-+Kill Window=Meta+Ctrl+Del
- Mouse Emulation=none
- Switch One Desktop Down=none
- Switch One Desktop Up=none
-@@ -118,10 +119,43 @@
- Switch to Desktop 9=Meta+F9
- Switch to Next Desktop=none
- Switch to Previous Desktop=none
-+Toggle Window Raise/Lower=none
- Walk Through Desktop List (Reverse)=none
- Walk Through Desktop List=none
- Walk Through Desktops (Reverse)=Meta+Shift+Tab
- Walk Through Desktops=Meta+Tab
-+Walk Through Windows (Reverse)=Alt+Shift+Tab
-+Walk Through Windows=Alt+Tab
-+Window Close=Alt+Esc; Alt+F4
-+Window Lower=none
-+Window Maximize Horizontal=Meta+=
-+Window Maximize Vertical=Meta+|
-+Window Maximize=Meta++
-+Window Minimize=Meta+-
-+Window Move=none
-+Window Operations Menu=Alt+Menu
-+Window Raise=none
-+Window Resize=none
-+Window Screenshot to Clipboard=Alt+Print
-+Window Shade=Meta+_
-+Window to Desktop 10=Meta+Alt+F10
-+Window to Desktop 11=none
-+Window to Desktop 12=none
-+Window to Desktop 13=none
-+Window to Desktop 14=none
-+Window to Desktop 15=none
-+Window to Desktop 16=none
-+Window to Desktop 1=Meta+Alt+F1
-+Window to Desktop 2=Meta+Alt+F2
-+Window to Desktop 3=Meta+Alt+F3
-+Window to Desktop 4=Meta+Alt+F4
-+Window to Desktop 5=Meta+Alt+F5
-+Window to Desktop 6=Meta+Alt+F6
-+Window to Desktop 7=Meta+Alt+F7
-+Window to Desktop 8=Meta+Alt+F8
-+Window to Desktop 9=Meta+Alt+F9
-+Window to Next Desktop=none
-+Window to Previous Desktop=none
-
- [kxkb][Global Shortcuts]
- Switch to Next Keyboard Layout=Meta+Ctrl+K
---- workspace/kcontrol/keys/schemes/old_win3.kksrc (.../tags/KDE/4.3.4/kdebase) (wersja 1063411)
-+++ workspace/kcontrol/keys/schemes/old_win3.kksrc (.../branches/KDE/4.3/kdebase) (wersja 1063411)
-@@ -1,44 +1,10 @@
-
- [Global Shortcuts]
- Halt Computer=none
--Kill Metadow=none
- Popup Launch Menu=Ctrl+Esc
- Reboot Computer=none
--Show Metadow List=none
-+Show Window List=none
- Toggle Showing Desktop=Ctrl+Alt+D
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff?r1=1.16&r2=1.17&f=u
More information about the pld-cvs-commit
mailing list