~ubuntu-branches/ubuntu/precise/konsole/precise-proposed

« back to all changes in this revision

Viewing changes to src/ViewSplitter.cpp

Committer: Package Import Robot
Author(s): Jonathan Riddell
Date: 2011-12-16 13:14:43 UTC
mto: This revision was merged to the branch mainline in revision 8.
Revision ID: package-import@ubuntu.com-20111216131443-rhdplbmmuxntat3k

Tags: upstream-4.7.90

Import upstream version 4.7.90

files added:
data/color-schemes/Solarized.colorscheme

doc/developer/MAINTAINER.README

doc/manual/README

tests/GLASS.utf8

tests/UTF-8-demo.txt

tests/nfd_unicode.py

tests/unicode.txt

files removed:
src/ProfileListWidget.cpp

src/ProfileListWidget.h

files modified:
CMakeLists.txt

README

data/color-schemes/CMakeLists.txt

data/color-schemes/GreenOnBlack.colorscheme

data/keyboard-layouts/default.keytab

data/profiles/Shell.profile

desktop/konsole.notifyrc

desktop/konsolehere.desktop

desktop/konsolepart.desktop

desktop/konsoleui.rc

desktop/partui.rc

desktop/quick-access-konsole.desktop

desktop/sessionui.rc

desktop/terminalemulator.desktop

doc/manual/index.cache.bz2

doc/manual/index.docbook

doc/user/README.fonts

doc/user/README.keyboard

doc/user/README.linux.console

src/Application.cpp

src/Application.h

src/BlockArray.cpp

src/BlockArray.h

src/BookmarkHandler.cpp

src/BookmarkHandler.h

src/CMakeLists.txt

src/Character.h

src/CharacterColor.h

src/ColorScheme.cpp

src/ColorScheme.h

src/ColorSchemeEditor.cpp

src/ColorSchemeEditor.h

src/ColorSchemeEditor.ui

src/CopyInputDialog.cpp

src/CopyInputDialog.h

src/EditProfileDialog.cpp

src/EditProfileDialog.h

src/EditProfileDialog.ui

src/Emulation.cpp

src/Emulation.h

src/Filter.cpp

src/Filter.h

src/History.cpp

src/History.h

src/HistorySizeDialog.cpp

src/HistorySizeDialog.h

src/IncrementalSearchBar.cpp

src/IncrementalSearchBar.h

src/KeyBindingEditor.cpp

src/KeyBindingEditor.h

src/KeyboardTranslator.cpp

src/KeyboardTranslator.h

src/MainWindow.cpp

src/MainWindow.h

src/ManageProfilesDialog.cpp

src/ManageProfilesDialog.h

src/ManageProfilesDialog.ui

src/Part.cpp

src/Part.h

src/ProcessInfo.cpp

src/ProcessInfo.h

src/Profile.cpp

src/Profile.h

src/ProfileList.cpp

src/ProfileList.h

src/Pty.cpp

src/Pty.h

src/RenameTabsDialog.cpp

src/RenameTabsDialog.h

src/Screen.cpp

src/Screen.h

src/ScreenWindow.cpp

src/ScreenWindow.h

src/Session.cpp

src/Session.h

src/SessionController.cpp

src/SessionController.h

src/SessionManager.cpp

src/SessionManager.h

src/ShellCommand.cpp

src/ShellCommand.h

src/TabTitleFormatAction.cpp

src/TabTitleFormatAction.h

src/TerminalCharacterDecoder.cpp

src/TerminalCharacterDecoder.h

src/TerminalDisplay.cpp

src/TerminalDisplay.h

src/ViewContainer.cpp

src/ViewContainer.h

src/ViewManager.cpp

src/ViewManager.h

src/ViewProperties.cpp

src/ViewProperties.h

src/ViewSplitter.cpp

src/ViewSplitter.h

src/Vt102Emulation.cpp

src/Vt102Emulation.h

src/WarningBox.cpp

src/WarningBox.h

src/XKB.cpp

src/ZModemDialog.cpp

src/ZModemDialog.h

src/fontembedder.cpp

src/konsole_wcwidth.cpp

src/konsole_wcwidth.h

src/main.cpp

src/tests/DBusTest.cpp

src/tests/DBusTest.h

src/tests/PartTest.cpp

src/tests/ProfileTest.cpp

src/tests/ProfileTest.h

Show diffs side-by-side

added added

removed removed

src/ViewSplitter.cpp

This file is part of the Konsole Terminal.

This program is free software; you can redistribute it and/or modify

#include <QtGui/QKeyEvent>

// KDE

#include "kdebug.h"

#include <KDebug>

// Konsole

#include "ViewContainer.h"

ViewSplitter* ViewSplitter::activeSplitter()

{

QWidget* widget = focusWidget() ? focusWidget() : this;

ViewSplitter* splitter = 0;

while ( !splitter && widget )

void ViewSplitter::registerContainer( ViewContainer* container )

{

_containers << container;

connect( container , SIGNAL(destroyed(ViewContainer*)) , this , SLOT( containerDestroyed(ViewContainer*) ) );

connect( container , SIGNAL(empty(ViewContainer*)) , this , SLOT( containerEmpty(ViewContainer*) ) );

connect( container , SIGNAL(destroyed(ViewContainer*)) , this , SLOT(containerDestroyed(ViewContainer*)) );

connect( container , SIGNAL(empty(ViewContainer*)) , this , SLOT(containerEmpty(ViewContainer*)) );

}

void ViewSplitter::unregisterContainer( ViewContainer* container )

140

Qt::Orientation containerOrientation )

141

{

142

ViewSplitter* splitter = activeSplitter();

143

144

if ( splitter->count() < 2 ||

145

containerOrientation == splitter->orientation() ||

146

!_recursiveSplitting )

150

151

if ( splitter->orientation() != containerOrientation )

152

splitter->setOrientation( containerOrientation );

153

154

splitter->updateSizes();

155

}

156

else

160

161

ViewContainer* oldContainer = splitter->activeContainer();

162

int oldContainerIndex = splitter->indexOf(oldContainer->containerWidget());

163

164

splitter->unregisterContainer(oldContainer);

165

166

newSplitter->registerContainer(oldContainer);

167

newSplitter->registerContainer(container);

168

169

newSplitter->addWidget(oldContainer->containerWidget());

170

newSplitter->addWidget(container->containerWidget());

171

newSplitter->setOrientation(containerOrientation);

180

void ViewSplitter::containerEmpty(ViewContainer* /*object*/)

181

{

182

QListIterator<ViewContainer*> containerIter(_containers);

183

184

int children = 0;

185

while (containerIter.hasNext())

186

{

194

void ViewSplitter::containerDestroyed(ViewContainer* object)

195

{

196

Q_ASSERT( _containers.contains(object) );

197

198

_containers.removeAll(object);

199

200

if ( count() == 0 )

238

void ViewSplitter::setActiveContainer(ViewContainer* container)

239

{

240

QWidget* activeView = container->activeView();

241

242

if ( activeView )

243

activeView->setFocus( Qt::OtherFocusReason );

244

}

248

if ( QWidget* focusW = focusWidget() )

249

{

250

ViewContainer* focusContainer = 0;

251

252

while ( focusW != 0 )

253

{

254

QListIterator<ViewContainer*> containerIter(_containers);

255

while (containerIter.hasNext())

256

{

257

ViewContainer* nextContainer = containerIter.next();

258

259

if (nextContainer->containerWidget() == focusW)

260

{

261

focusContainer = nextContainer;

268

if ( focusContainer )

269

return focusContainer;

270

}

271

272

QList<ViewSplitter*> splitters = findChildren<ViewSplitter*>();

273

274

if (splitters.count() > 0)

Older »