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

maybe final changes on mobile gui ;) just waiting for new cards ...

Browse Source
This commit is contained in:
doitux
2012-06-05 19:55:23 +02:00
parent 439b05e5f2
commit 490b8b77f6
3 changed files with 38 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/gfx/gui/table/default_800x480/android_tablestyle_800x480.xml
+1 -1
View File
@@ -113,7 +113,7 @@
<PlayerCashTextColor value="FFFF00" /> <PlayerCashTextColor value="FFFF00" />
<PlayerBetTextColor value="FFFF00" /> <PlayerBetTextColor value="FFFF00" />
<PlayerNickTextColor value="F0F0F0" /> <PlayerNickTextColor value="F0F0F0" />
<BoardBigTextColor value="669900" /> <BoardBigTextColor value="448234" />
<BoardSmallTextColor value="669900" /> <BoardSmallTextColor value="669900" />
<SpeedTextColor value="99D500" /> <SpeedTextColor value="99D500" />
<VoteButtonBgColor value="1C7000" /> <VoteButtonBgColor value="1C7000" />
src/gui/qt/gametable/gametableimpl.cpp
+5 -4
View File
@@ -96,6 +96,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
tabsDiag = new QDialog(this); tabsDiag = new QDialog(this);
tabs.setupUi(tabsDiag); tabs.setupUi(tabsDiag);
#ifdef ANDROID #ifdef ANDROID
textLabel_handLabel->hide();
tabsDiag->setStyleSheet("QObject { font: 26px; } QDialog { background-image: url(:/android/android-data/gfx/gui/table/default_800x480/table_dark.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); tabsDiag->setStyleSheet("QObject { font: 26px; } QDialog { background-image: url(:/android/android-data/gfx/gui/table/default_800x480/table_dark.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
#endif #endif
tabs.label_chance->setMyStyle(myGameTableStyle); tabs.label_chance->setMyStyle(myGameTableStyle);
@@ -127,8 +128,6 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
tabWidget_Right->removeTab(2); tabWidget_Right->removeTab(2);
tabWidget_Right->setCurrentIndex(0); tabWidget_Right->setCurrentIndex(0);
} }
textLabel_handLabel->hide();
#endif #endif
// userWidgetsArray init // userWidgetsArray init
@@ -858,15 +857,17 @@ void gameTableImpl::initGui(int speed)
#ifndef GUI_800x480 #ifndef GUI_800x480
label_Pot->setText(PotString); label_Pot->setText(PotString);
#endif #endif
label_Sets->setText(BetsString+":");
label_handNumber->setText(HandString+":"); label_handNumber->setText(HandString+":");
label_gameNumber->setText(GameString+":"); label_gameNumber->setText(GameString+":");
#ifdef GUI_800x480 #ifdef GUI_800x480
label_Total->setText(":"+TotalString); label_Sets->setText(BetsString);
label_Total->setText(TotalString);
tabs.groupBox_RightToolBox->setDisabled(FALSE); tabs.groupBox_RightToolBox->setDisabled(FALSE);
tabs.groupBox_LeftToolBox->setDisabled(FALSE); tabs.groupBox_LeftToolBox->setDisabled(FALSE);
#else #else
label_Total->setText(TotalString+":"); label_Total->setText(TotalString+":");
label_Sets->setText(BetsString+":");
groupBox_RightToolBox->setDisabled(FALSE); groupBox_RightToolBox->setDisabled(FALSE);
groupBox_LeftToolBox->setDisabled(FALSE); groupBox_LeftToolBox->setDisabled(FALSE);
#endif #endif
src/gui/qt/gui_800x480/gametable_800x480.ui
+32 -44
View File
@@ -2922,10 +2922,16 @@ p, li { white-space: pre-wrap; }
<item row="4" column="1"> <item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_12"> <layout class="QHBoxLayout" name="horizontalLayout_12">
<property name="spacing"> <property name="spacing">
<number>-1</number> <number>10</number>
</property>
<property name="leftMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property> </property>
<item> <item>
<spacer name="horizontalSpacer_8"> <spacer name="horizontalSpacer_7">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -2939,11 +2945,11 @@ p, li { white-space: pre-wrap; }
</item> </item>
<item> <item>
<widget class="QLabel" name="label_Sets"> <widget class="QLabel" name="label_Sets">
<property name="minimumSize"> <property name="sizePolicy">
<size> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<width>50</width> <horstretch>0</horstretch>
<height>14</height> <verstretch>0</verstretch>
</size> </sizepolicy>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -2960,22 +2966,13 @@ p, li { white-space: pre-wrap; }
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>120</width>
<height>21</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>21</height> <height>21</height>
</size> </size>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
<property name="indent">
<number>4</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@@ -2983,9 +2980,12 @@ p, li { white-space: pre-wrap; }
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>5</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@@ -2995,14 +2995,8 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="textLabel_handLabel"> <widget class="QLabel" name="textLabel_handLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>120</width> <width>30</width>
<height>21</height> <height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>21</height>
</size> </size>
</property> </property>
<property name="alignment"> <property name="alignment">
@@ -3015,9 +3009,12 @@ p, li { white-space: pre-wrap; }
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>5</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@@ -3033,13 +3030,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>120</width>
<height>21</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>21</height> <height>21</height>
</size> </size>
</property> </property>
@@ -3050,22 +3041,19 @@ p, li { white-space: pre-wrap; }
</item> </item>
<item> <item>
<widget class="QLabel" name="label_Total"> <widget class="QLabel" name="label_Total">
<property name="minimumSize"> <property name="sizePolicy">
<size> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<width>50</width> <horstretch>0</horstretch>
<height>14</height> <verstretch>0</verstretch>
</size> </sizepolicy>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="indent">
<number>4</number>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_7"> <spacer name="horizontalSpacer_8">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>