kdelibs

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

Subscribers

People subscribed via source and target branches

to all changes: