diff --git a/app/arkui.rc b/app/arkui.rc --- a/app/arkui.rc +++ b/app/arkui.rc @@ -1,17 +1,24 @@ - + - + + &Archive + + + + + + Main Toolbar - - + + diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -162,11 +162,13 @@ void MainWindow::setupActions() { - m_newAction = KStandardAction::openNew(this, SLOT(newArchive()), actionCollection()); - m_openAction = KStandardAction::open(this, SLOT(openArchive()), actionCollection()); - KStandardAction::quit(this, SLOT(quit()), actionCollection()); + m_newAction = actionCollection()->addAction(KStandardAction::New, QStringLiteral("ark_file_new"), this, SLOT(newArchive())); + m_openAction = actionCollection()->addAction(KStandardAction::Open, QStringLiteral("ark_file_open"), this, SLOT(openArchive())); + actionCollection()->addAction(KStandardAction::Quit, QStringLiteral("ark_quit"), this, SLOT(quit())); + + m_recentFilesAction = KStandardAction::openRecent(this, SLOT(openUrl(QUrl)), Q_NULLPTR); + actionCollection()->addAction(QStringLiteral("ark_file_open_recent"), m_recentFilesAction); - m_recentFilesAction = KStandardAction::openRecent(this, SLOT(openUrl(QUrl)), actionCollection()); m_recentFilesAction->setToolBarMode(KRecentFilesAction::MenuMode); m_recentFilesAction->setToolButtonPopupMode(QToolButton::DelayedPopup); m_recentFilesAction->setIconText(i18nc("action, to open an archive", "Open")); diff --git a/part/ark_part.rc b/part/ark_part.rc --- a/part/ark_part.rc +++ b/part/ark_part.rc @@ -1,9 +1,9 @@ - + - - &File - + + &Archive + &Action diff --git a/part/part.h b/part/part.h --- a/part/part.h +++ b/part/part.h @@ -131,7 +131,6 @@ QAction *m_addFilesAction; QAction *m_addDirAction; QAction *m_deleteFilesAction; - QAction *m_saveAsAction; KToggleAction *m_showInfoPanelAction; InfoPanel *m_infoPanel; QSplitter *m_splitter; diff --git a/part/part.cpp b/part/part.cpp --- a/part/part.cpp +++ b/part/part.cpp @@ -286,7 +286,7 @@ connect(m_showInfoPanelAction, &QAction::triggered, this, &Part::slotToggleInfoPanel); - m_saveAsAction = KStandardAction::saveAs(this, SLOT(slotSaveAs()), actionCollection()); + actionCollection()->addAction(KStandardAction::SaveAs, QStringLiteral("ark_file_save_as"), this, SLOT(slotSaveAs())); m_openFileAction = actionCollection()->addAction(QStringLiteral("openfile")); m_openFileAction->setText(i18nc("open a file with external program", "&Open File"));