maybe final changes on mobile gui ;) just waiting for new cards ...
This commit is contained in:
@@ -113,7 +113,7 @@
|
||||
<PlayerCashTextColor value="FFFF00" />
|
||||
<PlayerBetTextColor value="FFFF00" />
|
||||
<PlayerNickTextColor value="F0F0F0" />
|
||||
<BoardBigTextColor value="669900" />
|
||||
<BoardBigTextColor value="448234" />
|
||||
<BoardSmallTextColor value="669900" />
|
||||
<SpeedTextColor value="99D500" />
|
||||
<VoteButtonBgColor value="1C7000" />
|
||||
|
||||
@@ -96,6 +96,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
|
||||
tabsDiag = new QDialog(this);
|
||||
tabs.setupUi(tabsDiag);
|
||||
#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;}");
|
||||
#endif
|
||||
tabs.label_chance->setMyStyle(myGameTableStyle);
|
||||
@@ -127,8 +128,6 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
|
||||
tabWidget_Right->removeTab(2);
|
||||
tabWidget_Right->setCurrentIndex(0);
|
||||
}
|
||||
|
||||
textLabel_handLabel->hide();
|
||||
#endif
|
||||
|
||||
// userWidgetsArray init
|
||||
@@ -858,15 +857,17 @@ void gameTableImpl::initGui(int speed)
|
||||
#ifndef GUI_800x480
|
||||
label_Pot->setText(PotString);
|
||||
#endif
|
||||
label_Sets->setText(BetsString+":");
|
||||
|
||||
label_handNumber->setText(HandString+":");
|
||||
label_gameNumber->setText(GameString+":");
|
||||
#ifdef GUI_800x480
|
||||
label_Total->setText(":"+TotalString);
|
||||
label_Sets->setText(BetsString);
|
||||
label_Total->setText(TotalString);
|
||||
tabs.groupBox_RightToolBox->setDisabled(FALSE);
|
||||
tabs.groupBox_LeftToolBox->setDisabled(FALSE);
|
||||
#else
|
||||
label_Total->setText(TotalString+":");
|
||||
label_Sets->setText(BetsString+":");
|
||||
groupBox_RightToolBox->setDisabled(FALSE);
|
||||
groupBox_LeftToolBox->setDisabled(FALSE);
|
||||
#endif
|
||||
|
||||
@@ -2922,10 +2922,16 @@ p, li { white-space: pre-wrap; }
|
||||
<item row="4" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_12">
|
||||
<property name="spacing">
|
||||
<number>-1</number>
|
||||
<number>10</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>10</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>10</number>
|
||||
</property>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_8">
|
||||
<spacer name="horizontalSpacer_7">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
@@ -2939,11 +2945,11 @@ p, li { white-space: pre-wrap; }
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_Sets">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>14</height>
|
||||
</size>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
@@ -2960,22 +2966,13 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<height>21</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<width>120</width>
|
||||
<height>21</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="indent">
|
||||
<number>4</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
@@ -2983,9 +2980,12 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Fixed</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>5</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@@ -2995,14 +2995,8 @@ p, li { white-space: pre-wrap; }
|
||||
<widget class="QLabel" name="textLabel_handLabel">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>120</width>
|
||||
<height>21</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>120</width>
|
||||
<height>21</height>
|
||||
<width>30</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
@@ -3015,9 +3009,12 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Fixed</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>5</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@@ -3033,13 +3030,7 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<height>21</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<width>120</width>
|
||||
<height>21</height>
|
||||
</size>
|
||||
</property>
|
||||
@@ -3050,22 +3041,19 @@ p, li { white-space: pre-wrap; }
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_Total">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>14</height>
|
||||
</size>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="indent">
|
||||
<number>4</number>
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_7">
|
||||
<spacer name="horizontalSpacer_8">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
|
||||
Reference in New Issue
Block a user