Audio on/off changes, android gui fixes, android crash bugfix (1st step in internetlogindialog)

This commit is contained in:
doitux
2012-12-20 09:11:57 +01:00
parent 51ad6c5580
commit 31c3771d59
16 changed files with 156 additions and 64 deletions
@@ -50,7 +50,7 @@
<item>
<widget class="QPushButton" name="pushButton_createGame">
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
<string notr="true">QObject {font: bold 30px}</string>
</property>
<property name="text">
<string>Create Game</string>
@@ -159,7 +159,7 @@
<string>Registered players only</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/registered.png</normaloff>:/gfx/registered.png</iconset>
</property>
</item>
@@ -168,7 +168,7 @@
<string>Invited players only</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/list_add_user.png</normaloff>:/gfx/list_add_user.png</iconset>
</property>
</item>
@@ -177,7 +177,7 @@
<string>Ranking game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/cup.png</normaloff>:/gfx/cup.png</iconset>
</property>
</item>
@@ -441,7 +441,7 @@
<tabstop>pushButton_createGame</tabstop>
</tabstops>
<resources>
<include location="../resources/pokerth.qrc"/>
<include location="../resources/pokerth_android.qrc"/>
</resources>
<connections>
<connection>
@@ -255,6 +255,19 @@
</property>
</widget>
</item>
<item row="5" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
@@ -265,6 +278,8 @@
<tabstop>spinBox_startCash</tabstop>
<tabstop>radioButton_useSavedBlindsSettings</tabstop>
<tabstop>radioButton_changeBlindsSettings</tabstop>
<tabstop>spinBox_netTimeOutPlayerAction</tabstop>
<tabstop>spinBox_netDelayBetweenHands</tabstop>
<tabstop>pushButton_createGame</tabstop>
</tabstops>
<resources/>
@@ -58,6 +58,9 @@
<property name="text">
<string>Username:</string>
</property>
<property name="buddy">
<cstring>lineEdit_username</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
@@ -72,6 +75,9 @@
<property name="text">
<string>Password:</string>
</property>
<property name="buddy">
<cstring>lineEdit_password</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
@@ -131,6 +137,9 @@
<property name="text">
<string>Login</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -185,7 +185,7 @@
</layout>
</item>
<item row="2" column="0" rowspan="2" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<layout class="QHBoxLayout" name="horizontalLayout_animation">
<item>
<widget class="QLabel" name="label_animation">
<property name="text">
@@ -233,6 +233,19 @@
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>