From d330c200bf63ea535ece9fa1476993c5a22c9747 Mon Sep 17 00:00:00 2001 From: skyjake Date: Tue, 19 Mar 2013 19:17:51 +0200 Subject: [PATCH] Shell|GUI: Permanent game status in status bar, adjusted margins --- doomsday/tools/shell/shell-gui/src/linkwindow.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/doomsday/tools/shell/shell-gui/src/linkwindow.cpp b/doomsday/tools/shell/shell-gui/src/linkwindow.cpp index 210971e935..307f8bbfcc 100644 --- a/doomsday/tools/shell/shell-gui/src/linkwindow.cpp +++ b/doomsday/tools/shell/shell-gui/src/linkwindow.cpp @@ -67,6 +67,7 @@ DENG2_PIMPL(LinkWindow) QStackedWidget *stack; StatusWidget *status; QtRootWidget *root; + QLabel *gameStatus; QLabel *timeCounter; QLabel *currentHost; QAction *stopAction; @@ -83,6 +84,7 @@ DENG2_PIMPL(LinkWindow) stack(0), status(0), root(0), + gameStatus(0), timeCounter(0), currentHost(0) { @@ -144,6 +146,7 @@ DENG2_PIMPL(LinkWindow) disconnectAction->setDisabled(true); #endif + gameStatus->clear(); status->linkDisconnected(); updateCurrentHost(); updateStyle(); @@ -175,7 +178,7 @@ DENG2_PIMPL(LinkWindow) if(!mapId.isEmpty()) msg += " " + mapId; if(!rules.isEmpty()) msg += " (" + rules + ")"; - self.statusBar()->showMessage(msg); + gameStatus->setText(statusText(msg)); } }; @@ -244,8 +247,13 @@ LinkWindow::LinkWindow(QWidget *parent) statusFont.setPointSize(font().pointSize() * 4 / 5); statusBar()->setFont(statusFont); #endif - d->timeCounter = new QLabel(statusText("0:00:00")); + d->gameStatus = new QLabel; + d->gameStatus->setContentsMargins(6, 0, 6, 0); d->currentHost = new QLabel; + d->currentHost->setContentsMargins(6, 0, 6, 0); + d->timeCounter = new QLabel(statusText("0:00:00")); + d->timeCounter->setContentsMargins(6, 0, 0, 0); + statusBar()->addPermanentWidget(d->gameStatus); statusBar()->addPermanentWidget(d->currentHost); statusBar()->addPermanentWidget(d->timeCounter);