diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 78900e4a..371de4da 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -411,6 +411,10 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) //raise actionLable above just inserted mypixmaplabel for (i=0; iraise(); } + //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 QFontMetrics tempMetrics = this->fontMetrics(); diff --git a/src/gui/qt/mainwindow/myrighttabwidget.cpp b/src/gui/qt/mainwindow/myrighttabwidget.cpp index f36142a3..297ed0f1 100644 --- a/src/gui/qt/mainwindow/myrighttabwidget.cpp +++ b/src/gui/qt/mainwindow/myrighttabwidget.cpp @@ -10,8 +10,9 @@ // // #include "myrighttabwidget.h" +#include -// using namespace std; +using namespace std; MyRightTabWidget::MyRightTabWidget(QGroupBox *parent) : QTabWidget(parent), myTabBar(0) @@ -30,20 +31,22 @@ MyRightTabWidget::MyRightTabWidget(QGroupBox *parent) int paddingTop = 1; int paddingSide = 10; - this->setTabText(0, " "+this->tabText(0)+" "); - this->setTabText(1, " "+this->tabText(1)+" "); - +// this->setTabText(0, " "+this->tabText(0)+" "); +// this->setTabText(1, " "+this->tabText(1)+" "); +/* QFontMetrics tempMetrics = this->fontMetrics(); 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 QString font1String("font-family: \"Nimbus Sans L\";"); int paddingTop = 0; int paddingSide = 10; + QString minimumTabWidthString(""); #endif diff --git a/src/session.cpp b/src/session.cpp index a6149086..88b9d314 100755 --- a/src/session.cpp +++ b/src/session.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -148,6 +149,14 @@ void Session::startInternetClient() 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->Init( myConfig->readConfigString("IRCServerAddress"),