sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qt 4.5.1 startwindow font-lenght fixes. localized cash value bugfix

Browse Source
This commit is contained in:
doitux
2009-05-24 13:30:10 +00:00
parent 97246d347e
commit 492939cccf
5 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
INSTALL
+1 -1
View File
@@ -4,7 +4,7 @@ Requirements
To compile PokerTH you need following libs:
Linux:
- Qt version >= 4.4.3 --> http://trolltech.com/
- Qt version >= 4.4.3, 4.5.1 recommended --> http://qtsoftware.com/
- zlib version 1.2.3 --> http://www.zlib.net/
- libcurl version >= 7.16 --> http://curl.haxx.se/
- gnutls (e.g. version 2.2.2) --> http://www.gnu.org/software/gnutls/
src/gui/qt/gametable/gametableimpl.cpp
+2 -11
View File
@@ -1454,11 +1454,7 @@ void gameTableImpl::provideMyActions(int mode) {
//if value changed on bet/raise button --> uncheck to prevent unwanted actions
QString lastBetValueString = lastPushButtonBetRaiseString.simplified();
int index = lastBetValueString.indexOf("$");
lastBetValueString.remove(0, index+1);
bool ok;
int lastBetValue = lastBetValueString.toInt(&ok,10);
int lastBetValue = lastPushButtonBetRaiseString.simplified().remove(QRegExp("[^0-9]")).toInt();
if(lastBetValue < horizontalSlider_bet->minimum() && pushButton_BetRaise->isChecked()) {
@@ -1628,12 +1624,7 @@ int gameTableImpl::getMyCallAmount() {
int gameTableImpl::getBetRaisePushButtonValue() {
QString betValueString = pushButton_BetRaise->text().simplified().remove(QRegExp("[^0-9]"));
int index = betValueString.indexOf("$");
betValueString.remove(0, index+1);
bool ok;
int betValue = betValueString.toInt(&ok,10);
int betValue = pushButton_BetRaise->text().simplified().remove(QRegExp("[^0-9]")).toInt();
return betValue;
}
src/gui/qt/gametable/mymenubar.cpp
+4 -2
View File
@@ -3,8 +3,10 @@
MyMenuBar::MyMenuBar(QMainWindow* parent)
: QMenuBar(parent)
{
this->setAttribute(Qt::WA_TranslucentBackground);
this->setStyleSheet("QMenuBar { border-width: 0px; border-style: none;} ");
#if (QT_VERSION >= 0x040501)
this->setAttribute(Qt::WA_TranslucentBackground);
this->setStyleSheet("QMenuBar { border-width: 0px; border-style: none;} ");
#endif
}
void MyMenuBar::paintEvent(QPaintEvent *e) {
src/gui/qt/startwindow.ui
+20 -8
View File
@@ -58,7 +58,7 @@
<item row="0" column="0">
<widget class="QPushButton" name="pushButtonStart_Local_Game">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -66,6 +66,9 @@
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string>QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px;}</string>
</property>
<property name="text">
<string>&amp;1 Start Local Game</string>
</property>
@@ -75,7 +78,7 @@
</property>
<property name="iconSize">
<size>
<width>32</width>
<width>37</width>
<height>32</height>
</size>
</property>
@@ -84,7 +87,7 @@
<item row="1" column="0">
<widget class="QPushButton" name="pushButtonInternet_Game">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -92,6 +95,9 @@
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string>QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px;}</string>
</property>
<property name="text">
<string>&amp;2 Internet Game</string>
</property>
@@ -101,7 +107,7 @@
</property>
<property name="iconSize">
<size>
<width>32</width>
<width>37</width>
<height>32</height>
</size>
</property>
@@ -110,7 +116,7 @@
<item row="2" column="0">
<widget class="QPushButton" name="pushButton_Create_Network_Game">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -118,6 +124,9 @@
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string>QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px;}</string>
</property>
<property name="text">
<string>&amp;3 Create Network Game</string>
</property>
@@ -127,7 +136,7 @@
</property>
<property name="iconSize">
<size>
<width>32</width>
<width>37</width>
<height>32</height>
</size>
</property>
@@ -136,7 +145,7 @@
<item row="3" column="0">
<widget class="QPushButton" name="pushButton_Join_Network_Game">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -144,6 +153,9 @@
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string>QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px;}</string>
</property>
<property name="text">
<string>&amp;4 Join Network Game</string>
</property>
@@ -153,7 +165,7 @@
</property>
<property name="iconSize">
<size>
<width>32</width>
<width>37</width>
<height>32</height>
</size>
</property>
src/gui/qt/startwindow/startwindowimpl.cpp
-6
View File
@@ -78,12 +78,6 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
pushButtonStart_Local_Game->setStyleSheet("QPushButton { font-weight: 900; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; text-align: left;}");
pushButtonInternet_Game->setStyleSheet("QPushButton { font-weight: 900; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; text-align: left; }");
pushButton_Create_Network_Game->setStyleSheet("QPushButton { font-weight: 900; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; text-align: left; }");
pushButton_Join_Network_Game->setStyleSheet("QPushButton { font-weight: 900; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; text-align: left; }");
// Dialogs
myNewGameDialog = new newGameDialogImpl(this, myConfig);
mySelectAvatarDialog = new selectAvatarDialogImpl(this, myConfig);