Git commit 552671532c199a53fa6525709d9ae634e6724d7e by Burkhard L=C3=BCck. Committed on 31/05/2013 at 21:09. Pushed by lueck into branch 'master'. Fix shortcuts conflict F5 refreshSwitch/hideCursor Changed shortcut for hideCursor to F6 and for staysOnTop to F7 REVIEW:110753 M +2 -2 kmag.cpp http://commits.kde.org/kmag/552671532c199a53fa6525709d9ae634e6724d7e diff --git a/kmag.cpp b/kmag.cpp index 3e4304e..5fcf5e6 100644 --- a/kmag.cpp +++ b/kmag.cpp @@ -212,7 +212,7 @@ void KmagApp::initActions() m_hideCursor =3D new KToggleAction(KIcon(QLatin1String( "hidemouse" )), = i18n("Hide Mouse &Cursor"), this); actionCollection()->addAction(QLatin1String( "hidecursor" ), m_hideCurso= r); connect(m_hideCursor, SIGNAL(triggered(bool)), SLOT(slotToggleHideCursor= ())); - m_hideCursor->setShortcut(Qt::Key_F5); + m_hideCursor->setShortcut(Qt::Key_F6); #ifdef havesetCheckedStatef m_hideCursor->setCheckedState(KGuiItem(i18n("Show Mouse &Cursor"))); #endif @@ -222,7 +222,7 @@ void KmagApp::initActions() m_staysOnTop =3D new KToggleAction(KIcon(QLatin1String( "go-top" )), i18= n("Stays On Top"), this); actionCollection()->addAction(QLatin1String( "staysontop" ), m_staysOnTo= p); connect(m_staysOnTop, SIGNAL(triggered(bool)), SLOT(slotStaysOnTop())); - m_staysOnTop->setShortcut(Qt::Key_F6); + m_staysOnTop->setShortcut(Qt::Key_F7); m_staysOnTop->setToolTip(i18n("The KMagnifier Window stays on top of oth= er windows.")); = m_pZoomIn =3D actionCollection()->addAction(KStandardAction::ZoomIn, thi= s, SLOT(zoomIn()));