From 6b370cb68bb78e89ae95049a23de11487af73123 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 22 Apr 2024 04:28:56 +0300 Subject: [PATCH] generic: adjust to Katie changes Signed-off-by: Ivailo Monev --- dolphin/src/dolphinmainwindow.cpp | 18 ++++++----- dolphin/src/dolphinremoveaction.cpp | 2 +- .../src/views/dolphinviewactionhandler.cpp | 4 +-- kate/part/view/kateview.cpp | 32 ++++++++----------- kate/src/app/katemainwindow.cpp | 5 +-- kmenuedit/kmenuedit.cpp | 2 +- .../processui/ksysguardprocesslist.cpp | 2 +- 7 files changed, 29 insertions(+), 36 deletions(-) diff --git a/dolphin/src/dolphinmainwindow.cpp b/dolphin/src/dolphinmainwindow.cpp index 064d2898..d09b01b3 100644 --- a/dolphin/src/dolphinmainwindow.cpp +++ b/dolphin/src/dolphinmainwindow.cpp @@ -1374,27 +1374,29 @@ void DolphinMainWindow::setupActions() KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); // not in menu actions - QList nextTabKeys; - nextTabKeys.append(KStandardShortcut::tabNext().primary()); - nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab)); + const QKeySequence nextTabKeys = QKeySequence( + KStandardShortcut::tabNext().primary(), + Qt::CTRL | Qt::Key_Tab + ); - QList prevTabKeys; - prevTabKeys.append(KStandardShortcut::tabPrev().primary()); - prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab)); + const QKeySequence prevTabKeys = QKeySequence( + KStandardShortcut::tabPrev().primary(), + Qt::CTRL | Qt::SHIFT | Qt::Key_Tab + ); KAction* activateNextTab = actionCollection()->addAction("activate_next_tab"); activateNextTab->setIconText(i18nc("@action:inmenu", "Next Tab")); activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab")); activateNextTab->setEnabled(false); connect(activateNextTab, SIGNAL(triggered()), SLOT(activateNextTab())); - activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys); + activateNextTab->setShortcut(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys); KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab"); activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab")); activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab")); activatePrevTab->setEnabled(false); connect(activatePrevTab, SIGNAL(triggered()), SLOT(activatePrevTab())); - activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys); + activatePrevTab->setShortcut(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys); // for context menu KAction* openInNewTab = actionCollection()->addAction("open_in_new_tab"); diff --git a/dolphin/src/dolphinremoveaction.cpp b/dolphin/src/dolphinremoveaction.cpp index 7d7c2f04..d00a2f35 100644 --- a/dolphin/src/dolphinremoveaction.cpp +++ b/dolphin/src/dolphinremoveaction.cpp @@ -55,7 +55,7 @@ void DolphinRemoveAction::update() if (m_action) { setIcon(m_action->icon()); - setShortcuts(m_action->shortcuts()); + setShortcut(m_action->shortcut()); setEnabled(m_action->isEnabled()); } } diff --git a/dolphin/src/views/dolphinviewactionhandler.cpp b/dolphin/src/views/dolphinviewactionhandler.cpp index 93da4848..2164a2b1 100644 --- a/dolphin/src/views/dolphinviewactionhandler.cpp +++ b/dolphin/src/views/dolphinviewactionhandler.cpp @@ -135,7 +135,7 @@ void DolphinViewActionHandler::createActions() // Well, it's the File menu in dolphinmainwindow and the Edit menu in dolphinpart... :) propertiesAction->setText( i18nc("@action:inmenu File", "Properties") ); propertiesAction->setIcon(KIcon("document-properties")); - propertiesAction->setShortcuts(QList() << Qt::ALT + Qt::Key_Return << Qt::ALT + Qt::Key_Enter); + propertiesAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Return, Qt::ALT + Qt::Key_Enter)); connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties())); // View menu @@ -205,7 +205,7 @@ void DolphinViewActionHandler::createActions() KToggleAction* showHiddenFiles = m_actionCollection->add("show_hidden_files"); showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files")); - showHiddenFiles->setShortcuts(QList() << Qt::ALT + Qt::Key_Period << Qt::Key_F8); + showHiddenFiles->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Period, Qt::Key_F8)); connect(showHiddenFiles, SIGNAL(triggered(bool)), this, SLOT(toggleShowHiddenFiles(bool))); KAction* adjustViewProps = m_actionCollection->addAction("view_properties"); diff --git a/kate/part/view/kateview.cpp b/kate/part/view/kateview.cpp index df30e435..864eb1dc 100644 --- a/kate/part/view/kateview.cpp +++ b/kate/part/view/kateview.cpp @@ -450,7 +450,7 @@ void KateView::setupActions() a = ac->addAction( "file_reload" ); a->setIcon(KIcon("view-refresh")); a->setText(i18n("Reloa&d")); - a->setShortcuts(KStandardShortcut::reload()); + a->setShortcut(KStandardShortcut::reload()); a->setWhatsThis(i18n("Reload the current document from disk.")); connect(a, SIGNAL(triggered(bool)), SLOT(reloadFile())); @@ -695,7 +695,7 @@ void KateView::setupEditActions() KAction* a = ac->addAction("word_left"); a->setText(i18n("Move Word Left")); - a->setShortcuts(KStandardShortcut::backwardWord()); + a->setShortcut(KStandardShortcut::backwardWord()); connect(a, SIGNAL(triggered(bool)), SLOT(wordLeft())); m_editActions << a; @@ -713,7 +713,7 @@ void KateView::setupEditActions() a = ac->addAction("word_right"); a->setText(i18n("Move Word Right")); - a->setShortcuts(KStandardShortcut::forwardWord()); + a->setShortcut(KStandardShortcut::forwardWord()); connect(a, SIGNAL(triggered(bool)), SLOT(wordRight())); m_editActions << a; @@ -731,13 +731,13 @@ void KateView::setupEditActions() a = ac->addAction("beginning_of_line"); a->setText(i18n("Move to Beginning of Line")); - a->setShortcuts(KStandardShortcut::beginningOfLine()); + a->setShortcut(KStandardShortcut::beginningOfLine()); connect(a, SIGNAL(triggered(bool)), SLOT(home())); m_editActions << a; a = ac->addAction("beginning_of_document"); a->setText(i18n("Move to Beginning of Document")); - a->setShortcuts(KStandardShortcut::begin()); + a->setShortcut(KStandardShortcut::begin()); connect(a, SIGNAL(triggered(bool)), SLOT(top())); m_editActions << a; @@ -756,13 +756,13 @@ void KateView::setupEditActions() a = ac->addAction("end_of_line"); a->setText(i18n("Move to End of Line")); - a->setShortcuts(KStandardShortcut::endOfLine()); + a->setShortcut(KStandardShortcut::endOfLine()); connect(a, SIGNAL(triggered(bool)), SLOT(end())); m_editActions << a; a = ac->addAction("end_of_document"); a->setText(i18n("Move to End of Document")); - a->setShortcuts(KStandardShortcut::end()); + a->setShortcut(KStandardShortcut::end()); connect(a, SIGNAL(triggered(bool)), SLOT(bottom())); m_editActions << a; @@ -835,7 +835,7 @@ void KateView::setupEditActions() a = ac->addAction("scroll_page_up"); a->setText(i18n("Scroll Page Up")); - a->setShortcuts(KStandardShortcut::prior()); + a->setShortcut(KStandardShortcut::prior()); connect(a, SIGNAL(triggered(bool)), SLOT(pageUp())); m_editActions << a; @@ -860,7 +860,7 @@ void KateView::setupEditActions() a = ac->addAction("scroll_page_down"); a->setText(i18n("Scroll Page Down")); - a->setShortcuts(KStandardShortcut::next()); + a->setShortcut(KStandardShortcut::next()); connect(a, SIGNAL(triggered(bool)), SLOT(pageDown())); m_editActions << a; @@ -912,13 +912,13 @@ void KateView::setupEditActions() a = ac->addAction("delete_word_left"); a->setText(i18n("Delete Word Left")); - a->setShortcuts(KStandardShortcut::deleteWordBack()); + a->setShortcut(KStandardShortcut::deleteWordBack()); connect(a, SIGNAL(triggered(bool)), SLOT(deleteWordLeft())); m_editActions << a; a = ac->addAction("delete_word_right"); a->setText(i18n("Delete Word Right")); - a->setShortcuts(KStandardShortcut::deleteWordForward()); + a->setShortcut(KStandardShortcut::deleteWordForward()); connect(a, SIGNAL(triggered(bool)), SLOT(deleteWordRight())); m_editActions << a; @@ -930,10 +930,7 @@ void KateView::setupEditActions() a = ac->addAction("backspace"); a->setText(i18n("Backspace")); - QList scuts; - scuts << QKeySequence(Qt::Key_Backspace) - << QKeySequence(Qt::SHIFT + Qt::Key_Backspace); - a->setShortcuts(scuts); + a->setShortcut(QKeySequence(Qt::Key_Backspace, Qt::SHIFT + Qt::Key_Backspace)); connect(a, SIGNAL(triggered(bool)), SLOT(backspace())); m_editActions << a; @@ -945,10 +942,7 @@ void KateView::setupEditActions() a = ac->addAction("smart_newline"); a->setText(i18n("Insert Smart Newline")); a->setWhatsThis(i18n("Insert newline including leading characters of the current line which are not letters or numbers.")); - scuts.clear(); - scuts << QKeySequence(Qt::SHIFT + Qt::Key_Return) - << QKeySequence(Qt::SHIFT + Qt::Key_Enter); - a->setShortcuts(scuts); + a->setShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Return, Qt::SHIFT + Qt::Key_Enter)); connect(a, SIGNAL(triggered(bool)), SLOT(smartNewline())); m_editActions << a; diff --git a/kate/src/app/katemainwindow.cpp b/kate/src/app/katemainwindow.cpp index b7275ee8..8a93c767 100644 --- a/kate/src/app/katemainwindow.cpp +++ b/kate/src/app/katemainwindow.cpp @@ -317,10 +317,7 @@ void KateMainWindow::setupActions() a = actionCollection()->addAction( "view_quick_open" ); a->setIcon( KIcon("fork") ); a->setText( i18n("&Quick Open") ); - QList scuts; - scuts << QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_O) - << QKeySequence(Qt::CTRL + Qt::Key_Tab); - a->setShortcuts(scuts); + a->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_O, Qt::CTRL + Qt::Key_Tab)); connect( a, SIGNAL(triggered()), this, SLOT(slotQuickOpen()) ); a->setWhatsThis(i18n("Open a form to quick open documents.")); diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index 0b8a91de..336ba387 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/kmenuedit/kmenuedit.cpp @@ -80,7 +80,7 @@ void KMenuEdit::setupActions() action = actionCollection()->addAction(NEW_ITEM_ACTION_NAME); action->setIcon(KIcon("document-new")) ; action->setText(i18n("New &Item...")); - action->setShortcuts(KStandardShortcut::openNew()); + action->setShortcut(KStandardShortcut::openNew()); action = actionCollection()->addAction(NEW_SEPARATOR_ACTION_NAME); action->setIcon(KIcon("menu_new_sep")); action->setText(i18n("New S&eparator")); diff --git a/libs/ksysguard/processui/ksysguardprocesslist.cpp b/libs/ksysguard/processui/ksysguardprocesslist.cpp index e7f2f45c..a8c5f561 100644 --- a/libs/ksysguard/processui/ksysguardprocesslist.cpp +++ b/libs/ksysguard/processui/ksysguardprocesslist.cpp @@ -177,7 +177,7 @@ struct KSysGuardProcessListPrivate { //Set up '/' as a shortcut to jump to the quick search text widget jumpToSearchFilter = new KAction(i18n("Focus on Quick Search"), q); - jumpToSearchFilter->setShortcuts(QList() << QKeySequence::Find << '/'); + jumpToSearchFilter->setShortcut(QKeySequence(QKeySequence::Find, Qt::Key_Slash)); } ~KSysGuardProcessListPrivate() { delete mUi; mUi = NULL; }