android gui changes

This commit is contained in:
doitux
2012-05-22 02:01:05 +02:00
parent efe8b8484a
commit fccebbe3c2
7 changed files with 44 additions and 29 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 483 KiB

+1 -2
View File
@@ -96,8 +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
tabsDiag->setStyleSheet("QDialog { font: 26px; background-image: url(\""+myGameTableStyle->getTable()+"\"); 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;}");
tabs.frame->setStyleSheet("QObject { background-color: rgba(0, 0, 0, 100); }");
#endif #endif
tabs.label_chance->setMyStyle(myGameTableStyle); tabs.label_chance->setMyStyle(myGameTableStyle);
#else #else
+1 -1
View File
@@ -26,7 +26,7 @@ class MyLeftTabWidget : public QTabWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
MyLeftTabWidget(QGroupBox*); MyLeftTabWidget(QGroupBox*);
~MyLeftTabWidget(); ~MyLeftTabWidget();
+1 -1
View File
@@ -25,7 +25,7 @@ class MyRightTabWidget : public QTabWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
MyRightTabWidget(QGroupBox*); MyRightTabWidget(QGroupBox*);
~MyRightTabWidget(); ~MyRightTabWidget();
+8 -2
View File
@@ -4251,7 +4251,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>10</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@@ -4472,9 +4472,15 @@ p, li { white-space: pre-wrap; }
</item> </item>
<item row="0" column="3"> <item row="0" column="3">
<widget class="Slider" name="horizontalSlider_bet"> <widget class="Slider" name="horizontalSlider_bet">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>160</width> <width>168</width>
<height>60</height> <height>60</height>
</size> </size>
</property> </property>
+32 -23
View File
@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>424</height> <height>463</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@@ -77,17 +77,14 @@
</property> </property>
<item> <item>
<widget class="QGroupBox" name="groupBox_LeftToolBox"> <widget class="QGroupBox" name="groupBox_LeftToolBox">
<property name="minimumSize"> <property name="sizePolicy">
<size> <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<width>390</width> <horstretch>0</horstretch>
<height>350</height> <verstretch>0</verstretch>
</size> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="styleSheet">
<size> <string notr="true">QGroupBox { border: 0px; }</string>
<width>390</width>
<height>350</height>
</size>
</property> </property>
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
@@ -98,6 +95,12 @@
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="MyLeftTabWidget" name="tabWidget_Left"> <widget class="MyLeftTabWidget" name="tabWidget_Left">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
@@ -346,17 +349,14 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_RightToolBox"> <widget class="QGroupBox" name="groupBox_RightToolBox">
<property name="minimumSize"> <property name="sizePolicy">
<size> <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<width>390</width> <horstretch>0</horstretch>
<height>350</height> <verstretch>0</verstretch>
</size> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="styleSheet">
<size> <string notr="true">QGroupBox { border: 0px; }</string>
<width>390</width>
<height>350</height>
</size>
</property> </property>
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
@@ -373,6 +373,12 @@
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="MyRightTabWidget" name="tabWidget_Right"> <widget class="MyRightTabWidget" name="tabWidget_Right">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
@@ -538,10 +544,13 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>10</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@@ -719,7 +728,7 @@
<item> <item>
<widget class="Slider" name="horizontalSlider_speed"> <widget class="Slider" name="horizontalSlider_speed">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
+1
View File
@@ -538,5 +538,6 @@
<file>android-data/translations/pokerth_zhcn.qm</file> <file>android-data/translations/pokerth_zhcn.qm</file>
<file>android-data/misc/agpl.html</file> <file>android-data/misc/agpl.html</file>
<file>android-data/gfx/gui/table/default_800x480/android_tablestyle_800x480.xml</file> <file>android-data/gfx/gui/table/default_800x480/android_tablestyle_800x480.xml</file>
<file>android-data/gfx/gui/table/default_800x480/table_dark.png</file>
</qresource> </qresource>
</RCC> </RCC>