Merge lp:~dyams/unity-2d/Alt-F10-Menu into lp:unity-2d

Proposed by Lohith D Shivamurthy
Status: Merged
Approved by: Gerry Boland
Approved revision: 869
Merged at revision: 871
Proposed branch: lp:~dyams/unity-2d/Alt-F10-Menu
Merge into: lp:unity-2d
Diff against target: 47 lines (+10/-4)
3 files modified
panel/app/panelmanager.cpp (+3/-3)
panel/app/panelmanager.h (+1/-1)
tests/manual-tests/panel.txt (+6/-0)
To merge this branch: bzr merge lp:~dyams/unity-2d/Alt-F10-Menu
Reviewer Review Type Date Requested Status
Gerry Boland Pending
Review via email: mp+90268@code.launchpad.net

Description of the change

[panel] Shortcut key F10 is changed to Alt-F10 for menus

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'panel/app/panelmanager.cpp'
--- panel/app/panelmanager.cpp 2011-11-24 08:45:18 +0000
+++ panel/app/panelmanager.cpp 2012-01-26 14:38:24 +0000
@@ -127,8 +127,8 @@
127127
128 /* A F10 keypress opens the first menu of the visible application or of the first128 /* A F10 keypress opens the first menu of the visible application or of the first
129 indicator on the panel */129 indicator on the panel */
130 Hotkey* F10 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F10, Qt::NoModifier);130 Hotkey* F10 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F10, Qt::AltModifier);
131 connect(F10, SIGNAL(released()), SLOT(onF10Pressed()));131 connect(F10, SIGNAL(released()), SLOT(onAltF10Pressed()));
132}132}
133133
134PanelManager::~PanelManager()134PanelManager::~PanelManager()
@@ -223,7 +223,7 @@
223 }223 }
224}224}
225225
226void PanelManager::onF10Pressed()226void PanelManager::onAltF10Pressed()
227{227{
228 QDesktopWidget* desktop = QApplication::desktop();228 QDesktopWidget* desktop = QApplication::desktop();
229 int screen = desktop->screenNumber(QCursor::pos());229 int screen = desktop->screenNumber(QCursor::pos());
230230
=== modified file 'panel/app/panelmanager.h'
--- panel/app/panelmanager.h 2011-11-18 10:15:49 +0000
+++ panel/app/panelmanager.h 2012-01-26 14:38:24 +0000
@@ -45,7 +45,7 @@
4545
46private Q_SLOTS:46private Q_SLOTS:
47 void onScreenCountChanged(int newCount);47 void onScreenCountChanged(int newCount);
48 void onF10Pressed();48 void onAltF10Pressed();
49};49};
5050
51#endif // PanelManager_H51#endif // PanelManager_H
5252
=== modified file 'tests/manual-tests/panel.txt'
--- tests/manual-tests/panel.txt 2011-12-07 15:01:18 +0000
+++ tests/manual-tests/panel.txt 2012-01-26 14:38:24 +0000
@@ -0,0 +1,6 @@
1----
2 * Hit Alt-F10.
3
4--> Panel main menu should be activated. The shortcut key F10 is changed to Alt-F10 now (lp:878492)
5
6----

Subscribers

People subscribed via source and target branches