diff options
| -rw-r--r-- | src/mainwindow.cpp | 23 | ||||
| -rw-r--r-- | src/tabbar.cpp | 64 | ||||
| -rw-r--r-- | src/tabbar.h | 5 |
3 files changed, 50 insertions, 42 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e26b39bd..c1a1428a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -333,16 +333,15 @@ void MainWindow::setupActions() KStandardAction::forward(this, SLOT(slotOpenNext()) , actionCollection()); - // ============================== Tab Actions ==================================== + // ============================== General Tab Actions ==================================== a = new KAction(KIcon("tab-new"), i18n("New &Tab"), this); a->setShortcut(KShortcut(Qt::CTRL + Qt::Key_T)); actionCollection()->addAction(QLatin1String("new_tab"), a); connect(a, SIGNAL(triggered(bool)), m_view, SLOT(newTab())); - a = new KAction(KIcon("tab-close"), i18n("&Close Tab"), this); - a->setShortcut(KShortcut(Qt::CTRL + Qt::Key_W)); - actionCollection()->addAction(QLatin1String("close_tab"), a); - connect(a, SIGNAL(triggered(bool)), m_view, SLOT(slotCloseTab())); + a = new KAction(KIcon("view-refresh"), i18n("Reload All Tabs"), this); + actionCollection()->addAction( QLatin1String("reload_all_tabs"), a); + connect(a, SIGNAL(triggered(bool)), m_view, SLOT(slotReloadAllTabs()) ); a = new KAction(i18n("Show Next Tab"), this); a->setShortcuts(QApplication::isRightToLeft() ? KStandardShortcut::tabPrev() : KStandardShortcut::tabNext()); @@ -354,6 +353,12 @@ void MainWindow::setupActions() actionCollection()->addAction(QLatin1String("show_prev_tab"), a); connect(a, SIGNAL(triggered(bool)), m_view, SLOT(previousTab())); + // ============================== Indexed Tab Actions ==================================== + a = new KAction(KIcon("tab-close"), i18n("&Close Tab"), this); + a->setShortcut(KShortcut(Qt::CTRL + Qt::Key_W)); + actionCollection()->addAction(QLatin1String("close_tab"), a); + connect(a, SIGNAL(triggered(bool)), m_view, SLOT(slotCloseTab())); + a = new KAction(KIcon("tab-duplicate"), i18n("Clone Tab"), this); actionCollection()->addAction(QLatin1String("clone_tab"), a); connect(a, SIGNAL(triggered(bool)), m_view->tabBar(), SLOT(cloneTab()) ); @@ -365,14 +370,8 @@ void MainWindow::setupActions() a = new KAction(KIcon("view-refresh"), i18n("Reload Tab"), this); actionCollection()->addAction( QLatin1String("reload_tab"), a); connect(a, SIGNAL(triggered(bool)), m_view->tabBar(), SLOT(reloadTab()) ); - - a = new KAction(KIcon("view-refresh"), i18n("Reload All Tabs"), this); - actionCollection()->addAction( QLatin1String("reload_all_tabs"), a); - connect(a, SIGNAL(triggered(bool)), m_view, SLOT(slotReloadAllTabs()) ); - - // ------------------------------------------------------------------------------------------------------------ - // Bookmarks ToolBar Action + // ----------------------- Bookmarks ToolBar Action -------------------------------------- QAction *qa = m_bmBar->toggleViewAction(); qa->setText( i18n("Bookmarks Toolbar") ); qa->setIcon( KIcon("bookmark-toolbar") ); diff --git a/src/tabbar.cpp b/src/tabbar.cpp index 40c8dc1c..65a65f7e 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -75,8 +75,8 @@ TabBar::TabBar(MainView *parent) setContextMenuPolicy(Qt::CustomContextMenu); - connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, - SLOT(contextMenuRequested(const QPoint &))); + connect(this, SIGNAL(contextMenu(int, const QPoint &)), this, SLOT(slotContextMenuRequested(int, const QPoint &))); + connect(this, SIGNAL(emptyAreaContextMenu(const QPoint &)), this, SLOT(slotEmptyAreaContextMenu(const QPoint &))); QTimer::singleShot(0, this, SLOT(postLaunch())); } @@ -136,33 +136,6 @@ QSize TabBar::tabSizeHint(int index) const } -void TabBar::contextMenuRequested(const QPoint &position) -{ - KMenu menu; - MainWindow *mainWindow = Application::instance()->mainWindow(); - - menu.addAction(mainWindow->actionByName(QLatin1String("new_tab"))); - int index = tabAt(position); - if (-1 != index) - { - m_actualIndex = index; - - menu.addAction( mainWindow->actionByName("clone_tab") ); - menu.addSeparator(); - menu.addAction( mainWindow->actionByName("close_tab") ); - menu.addAction( mainWindow->actionByName("close_other_tabs") ); - menu.addSeparator(); - menu.addAction( mainWindow->actionByName("reload_tab") ); - } - else - { - menu.addSeparator(); - } - menu.addAction( mainWindow->actionByName("reload_all_tabs") ); - menu.exec(QCursor::pos()); -} - - void TabBar::cloneTab() { emit cloneTab(m_actualIndex); @@ -312,3 +285,36 @@ void TabBar::updateNewTabButton() m_addTabButton->move(newPosX, newPosY); } } + + +void TabBar::slotContextMenuRequested(int tab, const QPoint &pos) +{ + m_actualIndex = tab; + + KMenu menu; + MainWindow *mainWindow = Application::instance()->mainWindow(); + + menu.addAction(mainWindow->actionByName(QLatin1String("new_tab"))); + menu.addAction( mainWindow->actionByName("clone_tab") ); + menu.addSeparator(); + menu.addAction( mainWindow->actionByName("close_tab") ); + menu.addAction( mainWindow->actionByName("close_other_tabs") ); + menu.addSeparator(); + menu.addAction( mainWindow->actionByName("reload_tab") ); + menu.addAction( mainWindow->actionByName("reload_all_tabs") ); + + menu.exec(pos); +} + + +void TabBar::slotEmptyAreaContextMenu(const QPoint &pos) +{ + KMenu menu; + MainWindow *mainWindow = Application::instance()->mainWindow(); + + menu.addAction(mainWindow->actionByName(QLatin1String("new_tab"))); + menu.addSeparator(); + menu.addAction( mainWindow->actionByName("reload_all_tabs") ); + + menu.exec(pos); +} diff --git a/src/tabbar.h b/src/tabbar.h index 57b78628..f68528b8 100644 --- a/src/tabbar.h +++ b/src/tabbar.h @@ -86,9 +86,12 @@ private slots: void closeTab(); void closeOtherTabs(); void reloadTab(); - void contextMenuRequested(const QPoint &position); + void postLaunch(); + void slotContextMenuRequested(int, const QPoint &); + void slotEmptyAreaContextMenu(const QPoint &); + private: MainView *m_parent; QToolButton *m_addTabButton; |