mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-06-15 01:15:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prevent the dragging of the last tab in a split view.

Browse Source 
BUG: 210871
REVIEW: 107640
FIXED-IN: 4.12
This commit is contained in:
Francesco Cecconi
2013-08-15 23:14:17 +02:00
parent ab5e15b1b7
commit 194a852d33
6 changed files with 73 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ViewContainer.cpp
View File

@@ -43,6 +43,7 @@
#include "ViewProperties.h"
#include "ViewContainerTabBar.h"
#include "ProfileList.h"
#include "ViewManager.h"
// TODO Perhaps move everything which is Konsole-specific into different files
@@ -254,15 +255,16 @@ QList<QWidget*> ViewContainer::widgetsForItem(ViewProperties* item) const
return _navigation.keys(item);
}
TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject* parent)
TabbedViewContainer::TabbedViewContainer(NavigationPosition position, ViewManager* connectedViewManager, QObject* parent)
: ViewContainer(position, parent)
, _connectedViewManager(connectedViewManager)
, _contextMenuTabIndex(0)
{
_containerWidget = new QWidget;
_stackWidget = new QStackedWidget();
// The tab bar
_tabBar = new ViewContainerTabBar(_containerWidget);
_tabBar = new ViewContainerTabBar(_containerWidget, this);
_tabBar->setSupportedMimeType(ViewProperties::mimeType());
connect(_tabBar, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int)));
@@ -272,8 +274,8 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject*
connect(_tabBar, SIGNAL(initiateDrag(int)), this, SLOT(startTabDrag(int)));
connect(_tabBar, SIGNAL(querySourceIndex(const QDropEvent*,int&)),
this, SLOT(querySourceIndex(const QDropEvent*,int&)));
connect(_tabBar, SIGNAL(moveViewRequest(int,const QDropEvent*,bool&)),
this, SLOT(onMoveViewRequest(int,const QDropEvent*,bool&)));
connect(_tabBar, SIGNAL(moveViewRequest(int,const QDropEvent*,bool&,TabbedViewContainer*)),
this, SLOT(onMoveViewRequest(int,const QDropEvent*,bool&,TabbedViewContainer*)));
connect(_tabBar, SIGNAL(contextMenu(int,QPoint)), this,
SLOT(openTabContextMenu(int,QPoint)));
@@ -529,10 +531,10 @@ void TabbedViewContainer::querySourceIndex(const QDropEvent* event, int& sourceI
sourceIndex = index;
}
void TabbedViewContainer::onMoveViewRequest(int index, const QDropEvent* event, bool& success)
void TabbedViewContainer::onMoveViewRequest(int index, const QDropEvent* event ,bool& success, TabbedViewContainer* sourceTabbedContainer)
{
const int droppedId = ViewProperties::decodeMimeData(event->mimeData());
emit moveViewRequest(index, droppedId, success);
emit moveViewRequest(index, droppedId, success, sourceTabbedContainer);
}
void TabbedViewContainer::tabDoubleClicked(int index)
@@ -703,6 +705,11 @@ void TabbedViewContainer::updateIcon(ViewProperties* item)
}
}
ViewManager* TabbedViewContainer::connectedViewManager()
{
return _connectedViewManager;
}
StackedViewContainer::StackedViewContainer(QObject* parent)
: ViewContainer(NavigationPositionTop, parent)
{