gui fix + introducing boost::regexp for irc-nick-manipulation
This commit is contained in:
@@ -411,6 +411,10 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
|
|||||||
//raise actionLable above just inserted mypixmaplabel
|
//raise actionLable above just inserted mypixmaplabel
|
||||||
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) { actionLabelArray[i]->raise(); }
|
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) { actionLabelArray[i]->raise(); }
|
||||||
|
|
||||||
|
//fix for away string bug in righttabwidget on windows
|
||||||
|
tabWidget_Right->setTabText(0, " "+tabWidget_Right->tabText(0)+" ");
|
||||||
|
tabWidget_Right->setTabText(1, " "+tabWidget_Right->tabText(1)+" ");
|
||||||
|
|
||||||
|
|
||||||
//resize stop-button depending on translation
|
//resize stop-button depending on translation
|
||||||
QFontMetrics tempMetrics = this->fontMetrics();
|
QFontMetrics tempMetrics = this->fontMetrics();
|
||||||
|
|||||||
@@ -10,8 +10,9 @@
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
#include "myrighttabwidget.h"
|
#include "myrighttabwidget.h"
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
// using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
MyRightTabWidget::MyRightTabWidget(QGroupBox *parent)
|
MyRightTabWidget::MyRightTabWidget(QGroupBox *parent)
|
||||||
: QTabWidget(parent), myTabBar(0)
|
: QTabWidget(parent), myTabBar(0)
|
||||||
@@ -30,20 +31,22 @@ MyRightTabWidget::MyRightTabWidget(QGroupBox *parent)
|
|||||||
int paddingTop = 1;
|
int paddingTop = 1;
|
||||||
int paddingSide = 10;
|
int paddingSide = 10;
|
||||||
|
|
||||||
this->setTabText(0, " "+this->tabText(0)+" ");
|
// this->setTabText(0, " "+this->tabText(0)+" ");
|
||||||
this->setTabText(1, " "+this->tabText(1)+" ");
|
// this->setTabText(1, " "+this->tabText(1)+" ");
|
||||||
|
/*
|
||||||
QFontMetrics tempMetrics = this->fontMetrics();
|
QFontMetrics tempMetrics = this->fontMetrics();
|
||||||
int minimumTabWidth = tempMetrics.width(QString("W"+this->tabText(0)+"W"));
|
int minimumTabWidth = tempMetrics.width(QString("W"+this->tabText(0)+"W"));
|
||||||
if(minimumTabWidth < tempMetrics.width(QString("W"+this->tabText(1)+"W"))) minimumTabWidth = tempMetrics.width(QString("W"+this->tabText(1)+"W"));
|
if(minimumTabWidth < tempMetrics.width(QString("W"+this->tabText(1)+"W"))) minimumTabWidth = tempMetrics.width(QString("W"+this->tabText(1)+"W"));*/
|
||||||
|
|
||||||
QString minimumTabWidthString(" min-width:"+QString::number(minimumTabWidth,10)+"px;");
|
// QString minimumTabWidthString(" min-width:"+QString::number(minimumTabWidth,10)+"ex;");
|
||||||
|
QString minimumTabWidthString("");
|
||||||
|
|
||||||
#else
|
#else
|
||||||
QString font1String("font-family: \"Nimbus Sans L\";");
|
QString font1String("font-family: \"Nimbus Sans L\";");
|
||||||
int paddingTop = 0;
|
int paddingTop = 0;
|
||||||
int paddingSide = 10;
|
int paddingSide = 10;
|
||||||
|
|
||||||
|
|
||||||
QString minimumTabWidthString("");
|
QString minimumTabWidthString("");
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -27,6 +27,7 @@
|
|||||||
#include <net/serveracceptthread.h>
|
#include <net/serveracceptthread.h>
|
||||||
#include <net/ircthread.h>
|
#include <net/ircthread.h>
|
||||||
#include <core/avatarmanager.h>
|
#include <core/avatarmanager.h>
|
||||||
|
#include <boost/regex.hpp>
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
@@ -148,6 +149,14 @@ void Session::startInternetClient()
|
|||||||
|
|
||||||
if (myConfig->readConfigInt("UseIRCLobbyChat"))
|
if (myConfig->readConfigInt("UseIRCLobbyChat"))
|
||||||
{
|
{
|
||||||
|
//testing boost::regexp
|
||||||
|
// boost::regex pattern (" ",boost::regex_constants::icase|boost::regex_constants::perl);
|
||||||
|
// std::string stringa (myConfig->readConfigString("MyName"));
|
||||||
|
// std::string replace ("");
|
||||||
|
// std::string myNameNewString;
|
||||||
|
// myNameNewString = boost::regex_replace (stringa, pattern, replace);
|
||||||
|
//testing boost:;regexp
|
||||||
|
|
||||||
myIrcThread = new IrcThread(*myGui);
|
myIrcThread = new IrcThread(*myGui);
|
||||||
myIrcThread->Init(
|
myIrcThread->Init(
|
||||||
myConfig->readConfigString("IRCServerAddress"),
|
myConfig->readConfigString("IRCServerAddress"),
|
||||||
|
|||||||
Reference in New Issue
Block a user