kdelibs

Merge lp://qastaging/~debfx/kdelibs/kaction-qt-keys into lp://qastaging/~kubuntu-packagers/kubuntu-packaging/kdelibs

  1. kaction-qt-keys
  2. Merge into kdelibs
Proposed by Felix Geyer
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~debfx/kdelibs/kaction-qt-keys
Merge into: lp://qastaging/~kubuntu-packagers/kubuntu-packaging/kdelibs
Diff against target: 350 lines
3 files modified
debian/changelog (+5/-1)
debian/patches/kubuntu_80_kaction_qt_keys.diff (+320/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp://qastaging/~debfx/kdelibs/kaction-qt-keys
Reviewer Review Type Date Requested Status
Jonathan Thomas Pending
Review via email: mp+13388@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Felix Geyer (debfx) wrote :

Add kubuntu_80_kaction_qt_keys.diff to allow more Qt::Keys to be used as KAction shortcuts.
Fixes bug #293213

lp://qastaging/~debfx/kdelibs/kaction-qt-keys updated
121. By Felix Geyer

Add kubuntu_80_kaction_qt_keys.diff to allow more Qt::Keys to be used as KAction shortcuts

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-14 21:41:50 +0000
+++ debian/changelog 2009-10-14 22:22:09 +0000
@@ -8,7 +8,11 @@
8 [ Jonathan Thomas ]8 [ Jonathan Thomas ]
9 * Fix kubuntu_77_kglobalsettings_progagation_change.diff to prevent FTBFS9 * Fix kubuntu_77_kglobalsettings_progagation_change.diff to prevent FTBFS
1010
11 -- Jonathan Thomas <echidnaman@kubuntu.org> Wed, 14 Oct 2009 13:10:34 -040011 [ Felix Geyer ]
12 * Add kubuntu_80_kaction_qt_keys.diff to allow more Qt::Keys to be used
13 as KAction shortcuts (LP: #293213)
14
15 -- Felix Geyer <debfx-pkg@fobos.de> Thu, 15 Oct 2009 00:00:10 +0200
1216
13kde4libs (4:4.3.2-0ubuntu5) karmic; urgency=low17kde4libs (4:4.3.2-0ubuntu5) karmic; urgency=low
1418
1519
=== added file 'debian/patches/kubuntu_80_kaction_qt_keys.diff'
--- debian/patches/kubuntu_80_kaction_qt_keys.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_80_kaction_qt_keys.diff 2009-10-14 22:22:09 +0000
@@ -0,0 +1,320 @@
1#
2# Ubuntu: https://bugs.launchpad.net/bugs/293213
3# Description: Allow more Qt::Keys to be used as KAction shortcuts
4#
5--- kde4libs-4.3.2.orig/kdeui/util/kkeyserver_x11.cpp
6+++ kde4libs-4.3.2/kdeui/util/kkeyserver_x11.cpp
7@@ -198,50 +198,153 @@
8 { '+', XK_KP_Add },
9 { Qt::Key_Return, XK_KP_Enter }
10
11-// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
12+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
13 // multimedia keys. They are included here as not every system has them.
14-#define XF86XK_Standby 0x1008FF10
15-#define XF86XK_AudioLowerVolume 0x1008FF11
16-#define XF86XK_AudioMute 0x1008FF12
17-#define XF86XK_AudioRaiseVolume 0x1008FF13
18-#define XF86XK_AudioPlay 0x1008FF14
19-#define XF86XK_AudioStop 0x1008FF15
20-#define XF86XK_AudioPrev 0x1008FF16
21-#define XF86XK_AudioNext 0x1008FF17
22-#define XF86XK_HomePage 0x1008FF18
23-#define XF86XK_Calculator 0x1008FF1D
24-#define XF86XK_Mail 0x1008FF19
25-#define XF86XK_Start 0x1008FF1A
26-#define XF86XK_Search 0x1008FF1B
27-#define XF86XK_AudioRecord 0x1008FF1C
28-#define XF86XK_Back 0x1008FF26
29-#define XF86XK_Forward 0x1008FF27
30-#define XF86XK_Stop 0x1008FF28
31-#define XF86XK_Refresh 0x1008FF29
32-#define XF86XK_Favorites 0x1008FF30
33-#define XF86XK_AudioPause 0x1008FF31
34-#define XF86XK_AudioMedia 0x1008FF32
35-#define XF86XK_MyComputer 0x1008FF33
36-#define XF86XK_OpenURL 0x1008FF38
37-#define XF86XK_Launch0 0x1008FF40
38-#define XF86XK_Launch1 0x1008FF41
39-#define XF86XK_Launch2 0x1008FF42
40-#define XF86XK_Launch3 0x1008FF43
41-#define XF86XK_Launch4 0x1008FF44
42-#define XF86XK_Launch5 0x1008FF45
43-#define XF86XK_Launch6 0x1008FF46
44-#define XF86XK_Launch7 0x1008FF47
45-#define XF86XK_Launch8 0x1008FF48
46-#define XF86XK_Launch9 0x1008FF49
47-#define XF86XK_LaunchA 0x1008FF4A
48-#define XF86XK_LaunchB 0x1008FF4B
49-#define XF86XK_LaunchC 0x1008FF4C
50-#define XF86XK_LaunchD 0x1008FF4D
51-#define XF86XK_LaunchE 0x1008FF4E
52-#define XF86XK_LaunchF 0x1008FF4F
53+#define XF86XK_MonBrightnessUp 0x1008FF02
54+#define XF86XK_MonBrightnessDown 0x1008FF03
55+#define XF86XK_KbdLightOnOff 0x1008FF04
56+#define XF86XK_KbdBrightnessUp 0x1008FF05
57+#define XF86XK_KbdBrightnessDown 0x1008FF06
58+#define XF86XK_Standby 0x1008FF10
59+#define XF86XK_AudioLowerVolume 0x1008FF11
60+#define XF86XK_AudioMute 0x1008FF12
61+#define XF86XK_AudioRaiseVolume 0x1008FF13
62+#define XF86XK_AudioPlay 0x1008FF14
63+#define XF86XK_AudioStop 0x1008FF15
64+#define XF86XK_AudioPrev 0x1008FF16
65+#define XF86XK_AudioNext 0x1008FF17
66+#define XF86XK_HomePage 0x1008FF18
67+#define XF86XK_Mail 0x1008FF19
68+#define XF86XK_Start 0x1008FF1A
69+#define XF86XK_Search 0x1008FF1B
70+#define XF86XK_AudioRecord 0x1008FF1C
71+#define XF86XK_Calculator 0x1008FF1D
72+#define XF86XK_Memo 0x1008FF1E
73+#define XF86XK_ToDoList 0x1008FF1F
74+#define XF86XK_Calendar 0x1008FF20
75+#define XF86XK_PowerDown 0x1008FF21
76+#define XF86XK_ContrastAdjust 0x1008FF22
77+#define XF86XK_Back 0x1008FF26
78+#define XF86XK_Forward 0x1008FF27
79+#define XF86XK_Stop 0x1008FF28
80+#define XF86XK_Refresh 0x1008FF29
81+#define XF86XK_PowerOff 0x1008FF2A
82+#define XF86XK_WakeUp 0x1008FF2B
83+#define XF86XK_Eject 0x1008FF2C
84+#define XF86XK_ScreenSaver 0x1008FF2D
85+#define XF86XK_WWW 0x1008FF2E
86+#define XF86XK_Sleep 0x1008FF2F
87+#define XF86XK_Favorites 0x1008FF30
88+#define XF86XK_AudioPause 0x1008FF31
89+#define XF86XK_AudioMedia 0x1008FF32
90+#define XF86XK_MyComputer 0x1008FF33
91+#define XF86XK_LightBulb 0x1008FF35
92+#define XF86XK_Shop 0x1008FF36
93+#define XF86XK_History 0x1008FF37
94+#define XF86XK_OpenURL 0x1008FF38
95+#define XF86XK_AddFavorite 0x1008FF39
96+#define XF86XK_HotLinks 0x1008FF3A
97+#define XF86XK_BrightnessAdjust 0x1008FF3B
98+#define XF86XK_Finance 0x1008FF3C
99+#define XF86XK_Community 0x1008FF3D
100+#define XF86XK_AudioRewind 0x1008FF3E
101+#define XF86XK_BackForward 0x1008FF3F
102+#define XF86XK_Launch0 0x1008FF40
103+#define XF86XK_Launch1 0x1008FF41
104+#define XF86XK_Launch2 0x1008FF42
105+#define XF86XK_Launch3 0x1008FF43
106+#define XF86XK_Launch4 0x1008FF44
107+#define XF86XK_Launch5 0x1008FF45
108+#define XF86XK_Launch6 0x1008FF46
109+#define XF86XK_Launch7 0x1008FF47
110+#define XF86XK_Launch8 0x1008FF48
111+#define XF86XK_Launch9 0x1008FF49
112+#define XF86XK_LaunchA 0x1008FF4A
113+#define XF86XK_LaunchB 0x1008FF4B
114+#define XF86XK_LaunchC 0x1008FF4C
115+#define XF86XK_LaunchD 0x1008FF4D
116+#define XF86XK_LaunchE 0x1008FF4E
117+#define XF86XK_LaunchF 0x1008FF4F
118+#define XF86XK_ApplicationLeft 0x1008FF50
119+#define XF86XK_ApplicationRight 0x1008FF51
120+#define XF86XK_Book 0x1008FF52
121+#define XF86XK_CD 0x1008FF53
122+#define XF86XK_Calculater 0x1008FF54
123+#define XF86XK_Clear 0x1008FF55
124+#define XF86XK_ClearGrab 0x1008FE21
125+#define XF86XK_Close 0x1008FF56
126+#define XF86XK_Copy 0x1008FF57
127+#define XF86XK_Cut 0x1008FF58
128+#define XF86XK_Display 0x1008FF59
129+#define XF86XK_DOS 0x1008FF5A
130+#define XF86XK_Documents 0x1008FF5B
131+#define XF86XK_Excel 0x1008FF5C
132+#define XF86XK_Explorer 0x1008FF5D
133+#define XF86XK_Game 0x1008FF5E
134+#define XF86XK_Go 0x1008FF5F
135+#define XF86XK_iTouch 0x1008FF60
136+#define XF86XK_LogOff 0x1008FF61
137+#define XF86XK_Market 0x1008FF62
138+#define XF86XK_Meeting 0x1008FF63
139+#define XF86XK_MenuKB 0x1008FF65
140+#define XF86XK_MenuPB 0x1008FF66
141+#define XF86XK_MySites 0x1008FF67
142+#define XF86XK_News 0x1008FF69
143+#define XF86XK_OfficeHome 0x1008FF6A
144+#define XF86XK_Option 0x1008FF6C
145+#define XF86XK_Paste 0x1008FF6D
146+#define XF86XK_Phone 0x1008FF6E
147+#define XF86XK_Reply 0x1008FF72
148+#define XF86XK_Reload 0x1008FF73
149+#define XF86XK_RotateWindows 0x1008FF74
150+#define XF86XK_RotationPB 0x1008FF75
151+#define XF86XK_RotationKB 0x1008FF76
152+#define XF86XK_Save 0x1008FF77
153+#define XF86XK_Send 0x1008FF7B
154+#define XF86XK_Spell 0x1008FF7C
155+#define XF86XK_SplitScreen 0x1008FF7D
156+#define XF86XK_Support 0x1008FF7E
157+#define XF86XK_TaskPane 0x1008FF7F
158+#define XF86XK_Terminal 0x1008FF80
159+#define XF86XK_Tools 0x1008FF81
160+#define XF86XK_Travel 0x1008FF82
161+#define XF86XK_Video 0x1008FF87
162+#define XF86XK_Word 0x1008FF89
163+#define XF86XK_Xfer 0x1008FF8A
164+#define XF86XK_ZoomIn 0x1008FF8B
165+#define XF86XK_ZoomOut 0x1008FF8C
166+#define XF86XK_Away 0x1008FF8D
167+#define XF86XK_Messenger 0x1008FF8E
168+#define XF86XK_WebCam 0x1008FF8F
169+#define XF86XK_MailForward 0x1008FF90
170+#define XF86XK_Pictures 0x1008FF91
171+#define XF86XK_Music 0x1008FF92
172+#define XF86XK_Battery 0x1008FF93
173+#define XF86XK_Bluetooth 0x1008FF94
174+#define XF86XK_WLAN 0x1008FF95
175+#define XF86XK_UWB 0x1008FF96
176+#define XF86XK_AudioForward 0x1008FF97
177+#define XF86XK_AudioRepeat 0x1008FF98
178+#define XF86XK_AudioRandomPlay 0x1008FF99
179+#define XF86XK_Subtitle 0x1008FF9A
180+#define XF86XK_AudioCycleTrack 0x1008FF9B
181+#define XF86XK_Time 0x1008FF9F
182+#define XF86XK_Select 0x1008FFA0
183+#define XF86XK_View 0x1008FFA1
184+#define XF86XK_TopMenu 0x1008FFA2
185+#define XF86XK_Suspend 0x1008FFA7
186+#define XF86XK_Hibernate 0x1008FFA8
187 // end of XF86keysyms.h
188 ,
189- { Qt::Key_Standby, XF86XK_Standby },
190+ { Qt::Key_Back, XF86XK_Back },
191+ { Qt::Key_Forward, XF86XK_Forward },
192+ { Qt::Key_Stop, XF86XK_Stop },
193+ { Qt::Key_Refresh, XF86XK_Refresh },
194+ { Qt::Key_Favorites, XF86XK_Favorites },
195+ { Qt::Key_LaunchMedia, XF86XK_AudioMedia },
196+ { Qt::Key_OpenUrl, XF86XK_OpenURL },
197+ { Qt::Key_HomePage, XF86XK_HomePage },
198+ { Qt::Key_Search, XF86XK_Search },
199 { Qt::Key_VolumeDown, XF86XK_AudioLowerVolume },
200 { Qt::Key_VolumeMute, XF86XK_AudioMute },
201 { Qt::Key_VolumeUp, XF86XK_AudioRaiseVolume },
202@@ -249,19 +352,107 @@
203 { Qt::Key_MediaStop, XF86XK_AudioStop },
204 { Qt::Key_MediaPrevious, XF86XK_AudioPrev },
205 { Qt::Key_MediaNext, XF86XK_AudioNext },
206- { Qt::Key_HomePage, XF86XK_HomePage },
207- { Qt::Key_LaunchMail, XF86XK_Mail },
208- { Qt::Key_Search, XF86XK_Search },
209 { Qt::Key_MediaRecord, XF86XK_AudioRecord },
210- { Qt::Key_LaunchMedia, XF86XK_AudioMedia },
211- { Qt::Key_Launch1, XF86XK_Calculator },
212- { Qt::Key_Back, XF86XK_Back },
213- { Qt::Key_Forward, XF86XK_Forward },
214- { Qt::Key_Stop, XF86XK_Stop },
215- { Qt::Key_Refresh, XF86XK_Refresh },
216- { Qt::Key_Favorites, XF86XK_Favorites },
217+ { Qt::Key_LaunchMail, XF86XK_Mail },
218 { Qt::Key_Launch0, XF86XK_MyComputer },
219- { Qt::Key_OpenUrl, XF86XK_OpenURL },
220+ { Qt::Key_Calculator, XF86XK_Calculator },
221+ { Qt::Key_Memo, XF86XK_Memo },
222+ { Qt::Key_ToDoList, XF86XK_ToDoList },
223+ { Qt::Key_Calendar, XF86XK_Calendar },
224+ { Qt::Key_PowerDown, XF86XK_PowerDown },
225+ { Qt::Key_ContrastAdjust, XF86XK_ContrastAdjust },
226+ { Qt::Key_Standby, XF86XK_Standby },
227+ { Qt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp },
228+ { Qt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown },
229+ { Qt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff },
230+ { Qt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp },
231+ { Qt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown },
232+ { Qt::Key_PowerOff, XF86XK_PowerOff },
233+ { Qt::Key_WakeUp, XF86XK_WakeUp },
234+ { Qt::Key_Eject, XF86XK_Eject },
235+ { Qt::Key_ScreenSaver, XF86XK_ScreenSaver },
236+ { Qt::Key_WWW, XF86XK_WWW },
237+ { Qt::Key_Sleep, XF86XK_Sleep },
238+ { Qt::Key_LightBulb, XF86XK_LightBulb },
239+ { Qt::Key_Shop, XF86XK_Shop },
240+ { Qt::Key_History, XF86XK_History },
241+ { Qt::Key_AddFavorite, XF86XK_AddFavorite },
242+ { Qt::Key_HotLinks, XF86XK_HotLinks },
243+ { Qt::Key_BrightnessAdjust, XF86XK_BrightnessAdjust },
244+ { Qt::Key_Finance, XF86XK_Finance },
245+ { Qt::Key_Community, XF86XK_Community },
246+ { Qt::Key_AudioRewind, XF86XK_AudioRewind },
247+ { Qt::Key_BackForward, XF86XK_BackForward },
248+ { Qt::Key_ApplicationLeft, XF86XK_ApplicationLeft },
249+ { Qt::Key_ApplicationRight, XF86XK_ApplicationRight },
250+ { Qt::Key_Book, XF86XK_Book },
251+ { Qt::Key_CD, XF86XK_CD },
252+ { Qt::Key_Calculator, XF86XK_Calculater },
253+ { Qt::Key_Clear, XF86XK_Clear },
254+ { Qt::Key_ClearGrab, XF86XK_ClearGrab },
255+ { Qt::Key_Close, XF86XK_Close },
256+ { Qt::Key_Copy, XF86XK_Copy },
257+ { Qt::Key_Cut, XF86XK_Cut },
258+ { Qt::Key_Display, XF86XK_Display },
259+ { Qt::Key_DOS, XF86XK_DOS },
260+ { Qt::Key_Documents, XF86XK_Documents },
261+ { Qt::Key_Excel, XF86XK_Excel },
262+ { Qt::Key_Explorer, XF86XK_Explorer },
263+ { Qt::Key_Game, XF86XK_Game },
264+ { Qt::Key_Go, XF86XK_Go },
265+ { Qt::Key_iTouch, XF86XK_iTouch },
266+ { Qt::Key_LogOff, XF86XK_LogOff },
267+ { Qt::Key_Market, XF86XK_Market },
268+ { Qt::Key_Meeting, XF86XK_Meeting },
269+ { Qt::Key_MenuKB, XF86XK_MenuKB },
270+ { Qt::Key_MenuPB, XF86XK_MenuPB },
271+ { Qt::Key_MySites, XF86XK_MySites },
272+ { Qt::Key_News, XF86XK_News },
273+ { Qt::Key_OfficeHome, XF86XK_OfficeHome },
274+ { Qt::Key_Option, XF86XK_Option },
275+ { Qt::Key_Paste, XF86XK_Paste },
276+ { Qt::Key_Phone, XF86XK_Phone },
277+ { Qt::Key_Reply, XF86XK_Reply },
278+ { Qt::Key_Reload, XF86XK_Reload },
279+ { Qt::Key_RotateWindows, XF86XK_RotateWindows },
280+ { Qt::Key_RotationPB, XF86XK_RotationPB },
281+ { Qt::Key_RotationKB, XF86XK_RotationKB },
282+ { Qt::Key_Save, XF86XK_Save },
283+ { Qt::Key_Send, XF86XK_Send },
284+ { Qt::Key_Spell, XF86XK_Spell },
285+ { Qt::Key_SplitScreen, XF86XK_SplitScreen },
286+ { Qt::Key_Support, XF86XK_Support },
287+ { Qt::Key_TaskPane, XF86XK_TaskPane },
288+ { Qt::Key_Terminal, XF86XK_Terminal },
289+ { Qt::Key_Tools, XF86XK_Tools },
290+ { Qt::Key_Travel, XF86XK_Travel },
291+ { Qt::Key_Video, XF86XK_Video },
292+ { Qt::Key_Word, XF86XK_Word },
293+ { Qt::Key_Xfer, XF86XK_Xfer },
294+ { Qt::Key_ZoomIn, XF86XK_ZoomIn },
295+ { Qt::Key_ZoomOut, XF86XK_ZoomOut },
296+ { Qt::Key_Away, XF86XK_Away },
297+ { Qt::Key_Messenger, XF86XK_Messenger },
298+ { Qt::Key_WebCam, XF86XK_WebCam },
299+ { Qt::Key_MailForward, XF86XK_MailForward },
300+ { Qt::Key_Pictures, XF86XK_Pictures },
301+ { Qt::Key_Music, XF86XK_Music },
302+ { Qt::Key_Battery, XF86XK_Battery },
303+ { Qt::Key_Bluetooth, XF86XK_Bluetooth },
304+ { Qt::Key_WLAN, XF86XK_WLAN },
305+ { Qt::Key_UWB, XF86XK_UWB },
306+ { Qt::Key_AudioForward, XF86XK_AudioForward },
307+ { Qt::Key_AudioRepeat, XF86XK_AudioRepeat },
308+ { Qt::Key_AudioRandomPlay, XF86XK_AudioRandomPlay },
309+ { Qt::Key_Subtitle, XF86XK_Subtitle },
310+ { Qt::Key_AudioCycleTrack, XF86XK_AudioCycleTrack },
311+ { Qt::Key_Time, XF86XK_Time },
312+ { Qt::Key_Select, XF86XK_Select },
313+ { Qt::Key_View, XF86XK_View },
314+ { Qt::Key_TopMenu, XF86XK_TopMenu },
315+ { Qt::Key_Bluetooth, XF86XK_Bluetooth },
316+ { Qt::Key_Suspend, XF86XK_Suspend },
317+ { Qt::Key_Hibernate, XF86XK_Hibernate },
318 { Qt::Key_Launch2, XF86XK_Launch0 },
319 { Qt::Key_Launch3, XF86XK_Launch1 },
320 { Qt::Key_Launch4, XF86XK_Launch2 },
0321
=== modified file 'debian/patches/series'
--- debian/patches/series 2009-10-14 21:35:10 +0000
+++ debian/patches/series 2009-10-14 22:22:09 +0000
@@ -33,3 +33,4 @@
33kubuntu_77_kglobalsettings_progagation_change.diff33kubuntu_77_kglobalsettings_progagation_change.diff
34kubuntu_78_kglobalsettings_memleak_and_crash.diff34kubuntu_78_kglobalsettings_memleak_and_crash.diff
35kubuntu_79_kstyle_fixes.diff35kubuntu_79_kstyle_fixes.diff
36kubuntu_80_kaction_qt_keys.diff

Subscribers

People subscribed via source and target branches

to all changes: