diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-09-05 21:20:01 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-09-05 21:20:01 +0200 |
| commit | 58fb0de53cf6caebb5b8a979516d079f07ef2c69 (patch) | |
| tree | 6296fa49d5b21b0f51d5aa250e7e193e6034b0bc /src | |
| parent | Fixing Application::newMainWindow method (diff) | |
| download | rekonq-58fb0de53cf6caebb5b8a979516d079f07ef2c69.tar.xz | |
Simplified history actions reintroducing KStandard ones.
(we have text, icon, shortcuts && translations for free)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainwindow.cpp | 21 | ||||
| -rw-r--r-- | src/mainwindow.h | 2 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 80de0362..ef99044c 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -165,8 +165,8 @@ void MainWindow::setupToolbar() m_mainBar->setToolButtonStyle(Qt::ToolButtonIconOnly); m_mainBar->setIconDimensions(22); m_mainBar->setContextMenuPolicy(Qt::PreventContextMenu); - m_mainBar->addAction( actionByName("history_back") ); - m_mainBar->addAction( actionByName("history_forward") ); + m_mainBar->addAction( actionByName(KStandardAction::name(KStandardAction::Back)) ); + m_mainBar->addAction( actionByName(KStandardAction::name(KStandardAction::Forward)) ); m_mainBar->addSeparator(); m_mainBar->addAction( actionByName("stop_reload") ); m_mainBar->addAction( actionByName(KStandardAction::name(KStandardAction::Home)) ); @@ -315,18 +315,14 @@ void MainWindow::setupActions() connect(a, SIGNAL(triggered(bool)), this, SLOT(slotPrivateBrowsing(bool))); // ================ history related actions - m_historyBackAction = new KAction(KIcon("go-previous"), i18n("Back"), this); - connect(m_historyBackAction, SIGNAL(triggered(bool)), this, SLOT(slotOpenPrevious())); - actionCollection()->addAction(QLatin1String("history_back"), m_historyBackAction); + a = KStandardAction::back(this, SLOT(slotOpenPrevious()) , actionCollection()); m_historyBackMenu = new KMenu(this); - m_historyBackAction->setMenu(m_historyBackMenu); + a->setMenu(m_historyBackMenu); connect(m_historyBackMenu, SIGNAL(aboutToShow()), this, SLOT(slotAboutToShowBackMenu())); connect(m_historyBackMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotOpenActionUrl(QAction *))); - m_historyForwardAction = new KAction(KIcon("go-next"), i18n("Forward"), this); - connect(m_historyForwardAction, SIGNAL(triggered(bool)), this, SLOT(slotOpenNext())); - actionCollection()->addAction(QLatin1String("history_forward"), m_historyForwardAction); + KStandardAction::forward(this, SLOT(slotOpenNext()) , actionCollection()); // =================== Tab Actions a = new KAction(KIcon("tab-new"), i18n("New &Tab"), this); @@ -529,8 +525,11 @@ void MainWindow::slotPreferences() void MainWindow::slotUpdateActions() { - m_historyBackAction->setEnabled(currentTab()->history()->canGoBack()); - m_historyForwardAction->setEnabled(currentTab()->history()->canGoForward()); + QAction *historyBackAction = actionByName(KStandardAction::name(KStandardAction::Back)); + historyBackAction->setEnabled(currentTab()->history()->canGoBack()); + + QAction *historyForwardAction = actionByName(KStandardAction::name(KStandardAction::Forward)); + historyForwardAction->setEnabled(currentTab()->history()->canGoForward()); } diff --git a/src/mainwindow.h b/src/mainwindow.h index e4cfffc9..b97e8d25 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -147,8 +147,6 @@ private: SidePanel *m_sidePanel; KAction *m_stopReloadAction; - KAction *m_historyBackAction; - KAction *m_historyForwardAction; KMenu *m_historyBackMenu; KToolBar *m_bmBar; |