Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-05-18 14:31:14 +02:00
commit 719e6f6e85
2 changed files with 9 additions and 0 deletions

View file

@ -5806,3 +5806,10 @@ NLMISC_COMMAND(playedTime, "Display character played time", "")
CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
return true;
}
NLMISC_COMMAND(version, "Display client version", "")
{
ucstring msg = getDebugVersion();
CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
return true;
}

View file

@ -31,6 +31,8 @@ CMainWindow::CMainWindow():QMainWindow(), m_statusLabel(NULL)
{
setupUi(this);
setWindowFlags(windowFlags() & ~Qt::WindowMaximizeButtonHint);
// downloader
m_downloader = new CDownloader(this);