From 65d842a7ffffcb7c03e4e78a420a94fc268ea0c1 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 10 Jul 2015 19:38:15 +0200 Subject: [PATCH] Some more tweaks --HG-- branch : qt5 --- .../nelqt/src/displayer/service_displayer.cpp | 55 +++++++++---------- code/nelqt/src/displayer/service_window.cpp | 2 +- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/code/nelqt/src/displayer/service_displayer.cpp b/code/nelqt/src/displayer/service_displayer.cpp index 31af8f664..852ba44d0 100644 --- a/code/nelqt/src/displayer/service_displayer.cpp +++ b/code/nelqt/src/displayer/service_displayer.cpp @@ -1,31 +1,18 @@ -/* - -Copyright (C) 2015 by authors -Author: Jan Boon -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ +// NeL - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include #include @@ -139,8 +126,18 @@ void CServiceDisplayer::commandExecute(const std::string &cmd) // DT void CServiceDisplayer::setTitleBar(const std::string &titleBar) { + string wn; + if (!titleBar.empty()) + { + wn += titleBar; + wn += ": "; + } + wn += "Nel Service Console (compiled " __DATE__ " " __TIME__ " in " + nlMode + " mode)"; + + nldebug("SERVICE: Set title bar to '%s'", wn.c_str()); + NLMISC::CSynchronized::CAccessor access(&m_SetTitleBar); - access.value() = titleBar; + access.value() = wn; m_DoSetTitleBar = true; } diff --git a/code/nelqt/src/displayer/service_window.cpp b/code/nelqt/src/displayer/service_window.cpp index e013cfb21..cc6047bd2 100644 --- a/code/nelqt/src/displayer/service_window.cpp +++ b/code/nelqt/src/displayer/service_window.cpp @@ -86,7 +86,7 @@ QWidget *CServiceWindow::addLabel() QWidget *CServiceWindow::addButton() { QPushButton *button = new QPushButton(this); - button->setFont(m_Font); + // button->setFont(m_Font); connect(button, SIGNAL(clicked()), this, SLOT(buttonCallback())); m_LabelHBox->addWidget(button); return button;