Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

Fixed closing tabs from TabsMenu by middle-click

Browse Source
This commit is contained in:
S. Razi Alavizadeh 2013-08-21 17:08:37 +04:30
parent f098f1e1d1
commit 1ebc952ae0
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/lib/webview/tabwidget.cpp
View File

@ -98,12 +98,15 @@ void MenuTabs::mouseReleaseEvent(QMouseEvent* event)
{ {
if (event->button() == Qt::MiddleButton) { if (event->button() == Qt::MiddleButton) {
QAction* action = actionAt(event->pos()); QAction* action = actionAt(event->pos());
if (action) { if (action && action->isEnabled()) {
emit closeTab(action->data().toInt()); WebTab* tab = qobject_cast<WebTab*>(qvariant_cast<QWidget*>(action->data()));
if (tab) {
emit closeTab(tab->tabIndex());
action->setEnabled(false); action->setEnabled(false);
event->accept(); event->accept();
} }
} }
}
QMenu::mouseReleaseEvent(event); QMenu::mouseReleaseEvent(event);
} }
@ -149,7 +152,6 @@ TabWidget::TabWidget(QupZilla* mainClass, QWidget* parent)
connect(m_buttonAddTab, SIGNAL(clicked()), p_QupZilla, SLOT(addTab())); connect(m_buttonAddTab, SIGNAL(clicked()), p_QupZilla, SLOT(addTab()));
connect(m_menuTabs, SIGNAL(aboutToShow()), this, SLOT(aboutToShowClosedTabsMenu())); connect(m_menuTabs, SIGNAL(aboutToShow()), this, SLOT(aboutToShowClosedTabsMenu()));
connect(m_menuTabs, SIGNAL(closeTab(int)), this, SLOT(closeTab(int)));
loadSettings(); loadSettings();
} }
@ -169,6 +171,13 @@ void TabWidget::loadSettings()
settings.endGroup(); settings.endGroup();
m_tabBar->loadSettings(); m_tabBar->loadSettings();
if (m_closedInsteadOpened) {
disconnect(m_menuTabs, SIGNAL(closeTab(int)), this, SLOT(closeTab(int)));
}
else {
connect(m_menuTabs, SIGNAL(closeTab(int)), this, SLOT(closeTab(int)));
}
} }
void TabWidget::resizeEvent(QResizeEvent* e) void TabWidget::resizeEvent(QResizeEvent* e)
@ -259,7 +268,7 @@ void TabWidget::aboutToShowTabsMenu()
} }
action->setText(title); action->setText(title);
} }
action->setData(i); action->setData(QVariant::fromValue(qobject_cast<QWidget*>(tab)));
connect(action, SIGNAL(triggered()), this, SLOT(actionChangeIndex())); connect(action, SIGNAL(triggered()), this, SLOT(actionChangeIndex()));
m_menuTabs->addAction(action); m_menuTabs->addAction(action);
@ -271,7 +280,10 @@ void TabWidget::aboutToShowTabsMenu()
void TabWidget::actionChangeIndex() void TabWidget::actionChangeIndex()
{ {
if (QAction* action = qobject_cast<QAction*>(sender())) { if (QAction* action = qobject_cast<QAction*>(sender())) {
setCurrentIndex(action->data().toInt()); WebTab* tab = qobject_cast<WebTab*>(qvariant_cast<QWidget*>(action->data()));
if (tab) {
setCurrentIndex(tab->tabIndex());
}
} }
} }
@ -458,6 +470,11 @@ void TabWidget::closeTab(int index, bool force)
webTab->disconnectObjects(); webTab->disconnectObjects();
webTab->deleteLater(); webTab->deleteLater();
if (!m_closedInsteadOpened && m_menuTabs->isVisible()) {
QAction* labelAction = m_menuTabs->actions().last();
labelAction->setText(tr("Currently you have %1 opened tabs").arg(count() - 1));
}
} }
void TabWidget::currentTabChanged(int index) void TabWidget::currentTabChanged(int index)