mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-03 20:26:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow the tab bar position to be specified in the profile editing dialog. Other tweaks to the profile editing dialog.

Browse Source 
svn path=/trunk/KDE/kdebase/apps/konsole/; revision=667497
This commit is contained in:
Robert Knight
2007-05-22 23:38:16 +00:00
parent 0ef9ea5f41
commit 2739625dce
8 changed files with 330 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ViewManager.cpp
View File

@@ -302,7 +302,7 @@ void ViewManager::splitView(Qt::Orientation orientation)
// container and create a new view for that session in a new container
QListIterator<QWidget*> existingViewIter(_viewSplitter->activeContainer()->views());
ViewContainer* container = createContainer();
ViewContainer* container = 0;
while (existingViewIter.hasNext())
{
@@ -313,6 +313,11 @@ void ViewManager::splitView(Qt::Orientation orientation)
_sessionMap[display] = session;
// create a container using settings from the first
// session in the previous container
if ( !container )
container = createContainer(session->profileKey());
container->addView(display,properties);
session->addView( display );
}
@@ -387,7 +392,8 @@ void ViewManager::createView(Session* session)
// create the default container
if (_viewSplitter->containers().count() == 0)
{
_viewSplitter->addContainer( createContainer() , Qt::Vertical );
_viewSplitter->addContainer( createContainer(session->profileKey()) ,
Qt::Vertical );
emit splitViewToggle(false);
}
@@ -426,9 +432,19 @@ void ViewManager::createView(Session* session)
}
}
ViewContainer* ViewManager::createContainer()
ViewContainer* ViewManager::createContainer(const QString& profileKey)
{
ViewContainer* container = new TabbedViewContainerV2(ViewContainer::NavigationPositionBottom,_viewSplitter);
const Profile* info = SessionManager::instance()->profile(profileKey);
Q_ASSERT( info );
const int tabPosition = info->property(Profile::TabBarPosition).value<int>();
ViewContainer::NavigationPosition position = ( tabPosition == Profile::TabBarTop ) ?
ViewContainer::NavigationPositionTop :
ViewContainer::NavigationPositionBottom;
ViewContainer* container = new TabbedViewContainerV2(position,_viewSplitter);
// connect signals and slots
connect( container , SIGNAL(viewAdded(QWidget*,ViewProperties*)) , _containerSignalMapper ,
@@ -508,6 +524,8 @@ void ViewManager::applyProfile(TerminalDisplay* view , const QString& profileKey
// tab bar visibility
ViewContainer* container = _viewSplitter->activeContainer();
int tabBarMode = info->property(Profile::TabBarMode).value<int>();
int tabBarPosition = info->property(Profile::TabBarPosition).value<int>();
if ( tabBarMode == Profile::AlwaysHideTabBar )
container->setNavigationDisplayMode(ViewContainer::AlwaysHideNavigation);
else if ( tabBarMode == Profile::AlwaysShowTabBar )
@@ -515,6 +533,11 @@ void ViewManager::applyProfile(TerminalDisplay* view , const QString& profileKey
else if ( tabBarMode == Profile::ShowTabBarAsNeeded )
container->setNavigationDisplayMode(ViewContainer::ShowNavigationAsNeeded);
if ( tabBarPosition == Profile::TabBarTop )
container->setNavigationPosition(ViewContainer::NavigationPositionTop);
else if ( tabBarPosition == Profile::TabBarBottom )
container->setNavigationPosition(ViewContainer::NavigationPositionBottom);
// load colour scheme
view->setColorTable(colorScheme->colorTable());
view->setOpacity(colorScheme->opacity());