From a2df2e1ebe90a329f7ae0825793de4da53ea0877 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Wed, 15 Feb 2017 16:14:44 +0100 Subject: Tab shortcuts Config location is displayed in about window --- src/widgets/webviewtabbar.cpp | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'src/widgets/webviewtabbar.cpp') diff --git a/src/widgets/webviewtabbar.cpp b/src/widgets/webviewtabbar.cpp index c091e56..db44bc9 100644 --- a/src/widgets/webviewtabbar.cpp +++ b/src/widgets/webviewtabbar.cpp @@ -19,13 +19,44 @@ ******************************************************************************/ #include "webviewtabbar.h" +#include "settings.h" +#include WebViewTabBar::WebViewTabBar(QWidget *parent) : QTabBar(parent) { + setElideMode(Qt::ElideRight); setTabsClosable(true); + setMovable(true); connect(this, SIGNAL(tabCloseRequested(int)), this, SLOT(handleTabClose(int))); connect(this, SIGNAL(currentChanged(int)), this, SLOT(handleCurrentChanged(int))); + connect(this, SIGNAL(tabMoved(int,int)), this, SLOT(updateVectorArrangement(int,int))); + + Settings settings; + if(settings.contains("shortcuts/tabClose")) { + QAction *tabCloseAction = new QAction(this); + tabCloseAction->setShortcut(QKeySequence::fromString(settings.value("shortcuts/tabClose").toString())); + connect(tabCloseAction, &QAction::triggered, [this]() { + this->handleTabClose(currentIndex()); + }); + addAction(tabCloseAction); + } + if(settings.contains("shortcuts/tabLeft")) { + QAction *tabLeftAction = new QAction(this); + tabLeftAction->setShortcut(QKeySequence::fromString(settings.value("shortcuts/tabLeft").toString())); + connect(tabLeftAction, &QAction::triggered, [this]() { + this->setCurrentIndex(currentIndex()-1); + }); + addAction(tabLeftAction); + } + if(settings.contains("shortcuts/tabRight")) { + QAction *tabRightAction = new QAction(this); + tabRightAction->setShortcut(QKeySequence::fromString(settings.value("shortcuts/tabRight").toString())); + connect(tabRightAction, &QAction::triggered, [this]() { + this->setCurrentIndex(currentIndex()+1); + }); + addAction(tabRightAction); + } } WebViewTabBar::~WebViewTabBar() @@ -83,6 +114,7 @@ void WebViewTabBar::handleCurrentChanged(int index) void WebViewTabBar::handleTabClose(int index) { + qDebug("removing tab %i", index); removeTab(index); m_views.at(index)->deleteLater(); m_views.remove(index); @@ -93,3 +125,8 @@ void WebViewTabBar::updateTabText(WebView *view, const QString &text) int index = m_views.indexOf(view); setTabText(index, text); } + +void WebViewTabBar::updateVectorArrangement(int from, int to) +{ + m_views.move(from, to); +} -- cgit v1.2.1