X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4de8cf43e62e23b766d9d457e060670401ce6128..1b192c67f9735cd724c4958e7ba32a7b549770b6:/src/dolphintabbar.cpp diff --git a/src/dolphintabbar.cpp b/src/dolphintabbar.cpp index c72168431..67a61b031 100644 --- a/src/dolphintabbar.cpp +++ b/src/dolphintabbar.cpp @@ -1,34 +1,22 @@ -/*************************************************************************** - * Copyright (C) 2014 by Emmanuel Pescosta * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2014 Emmanuel Pescosta + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphintabbar.h" -#include -#include #include -#include -#include -#include + +#include +#include +#include +#include DolphinTabBar::DolphinTabBar(QWidget* parent) : QTabBar(parent), - m_autoActivationIndex(-1) + m_autoActivationIndex(-1), + m_tabToBeClosedOnMiddleMouseButtonRelease(-1) { setAcceptDrops(true); setSelectionBehaviorOnRemove(QTabBar::SelectPreviousTab); @@ -38,8 +26,8 @@ DolphinTabBar::DolphinTabBar(QWidget* parent) : m_autoActivationTimer = new QTimer(this); m_autoActivationTimer->setSingleShot(true); m_autoActivationTimer->setInterval(800); - connect(m_autoActivationTimer, SIGNAL(timeout()), - this, SLOT(slotAutoActivationTimeout())); + connect(m_autoActivationTimer, &QTimer::timeout, + this, &DolphinTabBar::slotAutoActivationTimeout); } void DolphinTabBar::dragEnterEvent(QDragEnterEvent* event) @@ -47,7 +35,7 @@ void DolphinTabBar::dragEnterEvent(QDragEnterEvent* event) const QMimeData* mimeData = event->mimeData(); const int index = tabAt(event->pos()); - if (KUrl::List::canDecode(mimeData)) { + if (mimeData->hasUrls()) { event->acceptProposedAction(); updateAutoActivationTimer(index); } @@ -67,7 +55,7 @@ void DolphinTabBar::dragMoveEvent(QDragMoveEvent* event) const QMimeData* mimeData = event->mimeData(); const int index = tabAt(event->pos()); - if (KUrl::List::canDecode(mimeData)) { + if (mimeData->hasUrls()) { updateAutoActivationTimer(index); } @@ -82,8 +70,8 @@ void DolphinTabBar::dropEvent(QDropEvent* event) const QMimeData* mimeData = event->mimeData(); const int index = tabAt(event->pos()); - if (index >= 0 && KUrl::List::canDecode(mimeData)) { - emit tabDropEvent(index, event); + if (index >= 0 && mimeData->hasUrls()) { + Q_EMIT tabDropEvent(index, event); } QTabBar::dropEvent(event); @@ -94,14 +82,27 @@ void DolphinTabBar::mousePressEvent(QMouseEvent* event) const int index = tabAt(event->pos()); if (index >= 0 && event->button() == Qt::MiddleButton) { - // Mouse middle click on a tab closes this tab. - emit tabCloseRequested(index); + m_tabToBeClosedOnMiddleMouseButtonRelease = index; return; } QTabBar::mousePressEvent(event); } +void DolphinTabBar::mouseReleaseEvent(QMouseEvent *event) +{ + const int index = tabAt(event->pos()); + + if (index >= 0 && index == m_tabToBeClosedOnMiddleMouseButtonRelease + && event->button() == Qt::MiddleButton) { + // Mouse middle click on a tab closes this tab. + Q_EMIT tabCloseRequested(index); + return; + } + + QTabBar::mouseReleaseEvent(event); +} + void DolphinTabBar::mouseDoubleClickEvent(QMouseEvent* event) { const int index = tabAt(event->pos()); @@ -109,7 +110,7 @@ void DolphinTabBar::mouseDoubleClickEvent(QMouseEvent* event) if (index < 0) { // Double click on the empty tabbar area opens a new activated tab // with the url from the current tab. - emit openNewActivatedTab(currentIndex()); + Q_EMIT openNewActivatedTab(currentIndex()); return; } @@ -122,28 +123,28 @@ void DolphinTabBar::contextMenuEvent(QContextMenuEvent* event) if (index >= 0) { // Tab context menu - KMenu menu(this); + QMenu menu(this); - QAction* newTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@action:inmenu", "New Tab")); - QAction* detachTabAction = menu.addAction(QIcon::fromTheme("tab-detach"), i18nc("@action:inmenu", "Detach Tab")); - QAction* closeOtherTabsAction = menu.addAction(QIcon::fromTheme("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs")); - QAction* closeTabAction = menu.addAction(QIcon::fromTheme("tab-close"), i18nc("@action:inmenu", "Close Tab")); + QAction* newTabAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-new")), i18nc("@action:inmenu", "New Tab")); + QAction* detachTabAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-detach")), i18nc("@action:inmenu", "Detach Tab")); + QAction* closeOtherTabsAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-close-other")), i18nc("@action:inmenu", "Close Other Tabs")); + QAction* closeTabAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-close")), i18nc("@action:inmenu", "Close Tab")); QAction* selectedAction = menu.exec(event->globalPos()); if (selectedAction == newTabAction) { - emit openNewActivatedTab(index); + Q_EMIT openNewActivatedTab(index); } else if (selectedAction == detachTabAction) { - emit tabDetachRequested(index); + Q_EMIT tabDetachRequested(index); } else if (selectedAction == closeOtherTabsAction) { const int tabCount = count(); for (int i = 0; i < index; i++) { - emit tabCloseRequested(0); + Q_EMIT tabCloseRequested(0); } for (int i = index + 1; i < tabCount; i++) { - emit tabCloseRequested(1); + Q_EMIT tabCloseRequested(1); } } else if (selectedAction == closeTabAction) { - emit tabCloseRequested(index); + Q_EMIT tabCloseRequested(index); } return;