Some more tweaks

--HG--
branch : qt5
hg/feature/qt5
kaetemi 10 years ago
parent 44bb0e85c2
commit 65d842a7ff

@ -1,31 +1,18 @@
/* // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
// Copyright (C) 2010 Winch Gate Property Limited
Copyright (C) 2015 by authors //
Author: Jan Boon <jan.boon@kaetemi.be> // This program is free software: you can redistribute it and/or modify
All rights reserved. // it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
Redistribution and use in source and binary forms, with or without // License, or (at your option) any later version.
modification, are permitted provided that the following conditions are met: //
// This program is distributed in the hope that it will be useful,
* Redistributions of source code must retain the above copyright notice, this // but WITHOUT ANY WARRANTY; without even the implied warranty of
list of conditions and the following disclaimer. // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
* Redistributions in binary form must reproduce the above copyright notice, //
this list of conditions and the following disclaimer in the documentation // You should have received a copy of the GNU Affero General Public License
and/or other materials provided with the distribution. // along with this program. If not, see <http://www.gnu.org/licenses/>.
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.
*/
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
#include <nelqt/displayer/service_displayer.h> #include <nelqt/displayer/service_displayer.h>
@ -139,8 +126,18 @@ void CServiceDisplayer::commandExecute(const std::string &cmd) // DT
void CServiceDisplayer::setTitleBar(const std::string &titleBar) 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<std::string>::CAccessor access(&m_SetTitleBar); NLMISC::CSynchronized<std::string>::CAccessor access(&m_SetTitleBar);
access.value() = titleBar; access.value() = wn;
m_DoSetTitleBar = true; m_DoSetTitleBar = true;
} }

@ -86,7 +86,7 @@ QWidget *CServiceWindow::addLabel()
QWidget *CServiceWindow::addButton() QWidget *CServiceWindow::addButton()
{ {
QPushButton *button = new QPushButton(this); QPushButton *button = new QPushButton(this);
button->setFont(m_Font); // button->setFont(m_Font);
connect(button, SIGNAL(clicked()), this, SLOT(buttonCallback())); connect(button, SIGNAL(clicked()), this, SLOT(buttonCallback()));
m_LabelHBox->addWidget(button); m_LabelHBox->addWidget(button);
return button; return button;

Loading…
Cancel
Save