From d4b0e25abb54ed24bf3d88769952aaae07c2ebbb Mon Sep 17 00:00:00 2001 From: Thorvald Natvig Date: Thu, 8 May 2008 15:51:41 +0000 Subject: [PATCH] Drop the splitter and make the log and playermodel dock widgets. git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1135 05730e5d-ab1b-0410-a4ac-84af385074fa --- src/mumble/LookConfig.cpp | 13 ---- src/mumble/LookConfig.ui | 17 +---- src/mumble/MainWindow.cpp | 14 +--- src/mumble/MainWindow.ui | 132 ++++++++++++++++++++++++++++---------- src/mumble/Settings.cpp | 3 - src/mumble/Settings.h | 1 - 6 files changed, 100 insertions(+), 80 deletions(-) diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp index 3e4d51360..53d22be0b 100644 --- a/src/mumble/LookConfig.cpp +++ b/src/mumble/LookConfig.cpp @@ -88,7 +88,6 @@ void LookConfig::load(const Settings &r) { } } qleCSS->setText(r.qsSkin); - loadCheckBox(qcbHorizontal, r.bHorizontal); loadComboBox(qcbExpand, r.ceExpand); loadCheckBox(qcbPlayersTop, r.bPlayerTop); loadCheckBox(qcbAutoUpdate, r.bUpdateCheck); @@ -109,7 +108,6 @@ void LookConfig::save() const { s.qsSkin = QString(); else s.qsSkin = qleCSS->text(); - s.bHorizontal = qcbHorizontal->isChecked(); s.ceExpand=static_cast(qcbExpand->currentIndex()); s.bPlayerTop=qcbPlayersTop->isChecked(); s.bUpdateCheck=qcbAutoUpdate->isChecked(); @@ -131,21 +129,10 @@ void LookConfig::accept() const { g.mw->qteLog->document()->setDefaultStyleSheet(sheet); } } - - if (s.bHorizontal) { - g.mw->qsSplit->setOrientation(Qt::Horizontal); - g.mw->qsSplit->addWidget(g.mw->qteLog); - g.mw->qsSplit->addWidget(g.mw->qtvPlayers); - } else { - g.mw->qsSplit->setOrientation(Qt::Vertical); - g.mw->qsSplit->addWidget(g.mw->qtvPlayers); - g.mw->qsSplit->addWidget(g.mw->qteLog); - } } bool LookConfig::expert(bool b) { qcbExpand->setVisible(b); - qcbHorizontal->setVisible(b); qcbPlayersTop->setVisible(b); qcbStyle->setVisible(b); qliStyle->setVisible(b); diff --git a/src/mumble/LookConfig.ui b/src/mumble/LookConfig.ui index 404dc0dc2..6f0778aa9 100644 --- a/src/mumble/LookConfig.ui +++ b/src/mumble/LookConfig.ui @@ -106,20 +106,7 @@ - - - - Use horizontal or vertical splitter for the main window - - - <b>This sets whether the split in the main window is horizontal (side by side) or vertical (above and below).</b> - - - Use Horizontal Splitter - - - - + List players above subchannels (requires restart). @@ -156,7 +143,7 @@ Qt::Vertical - + 0 0 diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 439e94af7..837b7fb33 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -188,21 +188,10 @@ void MainWindow::setupGui() { connect(gsUnlink, SIGNAL(down()), qaAudioUnlink, SLOT(trigger())); connect(gsMinimal, SIGNAL(down()), qaConfigMinimal, SLOT(trigger())); - if (g.s.bHorizontal) { - qsSplit->setOrientation(Qt::Horizontal); - qsSplit->addWidget(qteLog); - qsSplit->addWidget(qtvPlayers); - } else { - qsSplit->setOrientation(Qt::Vertical); - qsSplit->addWidget(qtvPlayers); - qsSplit->addWidget(qteLog); - } - - setCentralWidget(qsSplit); + centralWidget()->hide(); restoreGeometry(g.s.qbaMainWindowGeometry); restoreState(g.s.qbaMainWindowState); - qsSplit->restoreState(g.s.qbaSplitterState); qtvPlayers->header()->restoreState(g.s.qbaHeaderState); setupView(); @@ -237,7 +226,6 @@ void MainWindow::closeEvent(QCloseEvent *e) { g.s.qbaMainWindowGeometry = saveGeometry(); g.s.qbaMainWindowState = saveState(); if (! g.s.bMinimalView) { - g.s.qbaSplitterState = qsSplit->saveState(); g.s.qbaHeaderState = qtvPlayers->header()->saveState(); } QMainWindow::closeEvent(e); diff --git a/src/mumble/MainWindow.ui b/src/mumble/MainWindow.ui index 9e6cd4ebe..fe87a2040 100644 --- a/src/mumble/MainWindow.ui +++ b/src/mumble/MainWindow.ui @@ -5,50 +5,30 @@ 0 0 - 542 - 348 + 671 + 435 - - - Qt::Horizontal + + QMainWindow::AllowNestedDocks|QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks|QMainWindow::VerticalTabs + + + + + 76 + 29 + 648 + 549 + - - - This shows all recent activity. Connecting to servers, errors and information messages all show up here.<br />To configure exactly which messages show up here, use the <b>Settings</b> command from the menu. - - - false - - - - - Qt::CustomContextMenu - - - true - - - true - - - 10 - - - false - - - true - - 0 0 - 542 - 22 + 671 + 29 @@ -114,6 +94,88 @@ + + + Log + + + + 0 + 29 + 333 + 406 + + + + QDockWidget::DockWidgetMovable + + + 1 + + + + + 30 + -40 + 228 + 319 + + + + This shows all recent activity. Connecting to servers, errors and information messages all show up here.<br />To configure exactly which messages show up here, use the <b>Settings</b> command from the menu. + + + false + + + + + + Players and Channels + + + + 339 + 29 + 332 + 406 + + + + QDockWidget::DockWidgetMovable + + + 2 + + + + + 120 + -10 + 228 + 319 + + + + Qt::CustomContextMenu + + + true + + + true + + + 10 + + + false + + + true + + + &Quit Mumble diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index 60e42b468..1caafc893 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -65,7 +65,6 @@ Settings::Settings() { #endif bFirstTime = true; - bHorizontal = true; ceExpand = ChannelsWithPlayers; bMinimalView = false; @@ -247,7 +246,6 @@ void Settings::load() { SAVELOAD(qsLanguage, "ui/language"); SAVELOAD(qsStyle, "ui/style"); SAVELOAD(qsSkin, "ui/skin"); - SAVELOAD(bHorizontal, "ui/horizontal"); LOADENUM(ceExpand, "ui/expand"); SAVELOAD(bMinimalView, "ui/minimalview"); SAVELOAD(bPlayerTop, "ui/playertop"); @@ -366,7 +364,6 @@ void Settings::save() { SAVELOAD(qsLanguage, "ui/language"); SAVELOAD(qsStyle, "ui/style"); SAVELOAD(qsSkin, "ui/skin"); - SAVELOAD(bHorizontal, "ui/horizontal"); SAVELOAD(ceExpand, "ui/expand"); SAVELOAD(bMinimalView, "ui/minimalview"); SAVELOAD(bPlayerTop, "ui/playertop"); diff --git a/src/mumble/Settings.h b/src/mumble/Settings.h index 5a3dca8dc..75d904697 100644 --- a/src/mumble/Settings.h +++ b/src/mumble/Settings.h @@ -107,7 +107,6 @@ struct Settings { QString qsLanguage; QString qsStyle; QString qsSkin; - bool bHorizontal; bool bFirstTime; QByteArray qbaMainWindowGeometry, qbaMainWindowState, qbaSplitterState, qbaHeaderState; ChannelExpand ceExpand;