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

android dialog changes

Browse Source
This commit is contained in:
doitux
2012-12-20 23:48:13 +01:00
parent a480dddd8c
commit 5b206ffe99
18 changed files with 630 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui
+9 -3
View File
@@ -304,6 +304,9 @@
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="styleSheet">
<string notr="true">QObject{font: 36px, }</string>
</property>
<property name="text">
<string> OK </string>
</property>
@@ -313,10 +316,13 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
@@ -332,7 +338,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<width>30</width>
<height>20</height>
</size>
</property>
src/gui/qt/gui_800x480/changecontentdialog_800x480.ui
+76 -58
View File
@@ -29,13 +29,72 @@
<string notr="true">QObject {font-size: 26px}</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>35</number>
<property name="leftMargin">
<number>30</number>
</property>
<property name="rightMargin">
<number>30</number>
</property>
<property name="bottomMargin">
<number>30</number>
</property>
<item row="0" column="1">
<widget class="QLabel" name="label_Message"/>
</item>
<item row="5" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="styleSheet">
<string notr="true">QObject { font: 36px;}</string>
</property>
<property name="text">
<string> OK </string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer_2">
<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 row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_lineLabel">
@@ -62,7 +121,7 @@
</item>
</layout>
</item>
<item row="2" column="1">
<item row="3" column="1">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>Save in configuration</string>
@@ -72,41 +131,15 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="styleSheet">
<string notr="true">QObject {font: bold 30px}</string>
</property>
<item row="4" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="2" column="0">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="2">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
@@ -116,39 +149,24 @@
<tabstops>
<tabstop>lineEdit</tabstop>
<tabstop>checkBox</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../resources/pokerth.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>changeContentDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
<x>655</x>
<y>361</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>changeContentDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
<x>584</x>
<y>386</y>
</hint>
</hints>
</connection>
src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui
+167 -158
View File
@@ -26,6 +26,9 @@
<string>Create Internet Game</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="bottomMargin">
<number>10</number>
</property>
<item row="1" column="0" colspan="3">
<layout class="QHBoxLayout">
<property name="spacing">
@@ -50,11 +53,24 @@
<item>
<widget class="QPushButton" name="pushButton_createGame">
<property name="styleSheet">
<string notr="true">QObject {font: bold 30px}</string>
<string notr="true">QObject {font: 36px}</string>
</property>
<property name="text">
<string>Create Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -74,6 +90,110 @@
<property name="verticalSpacing">
<number>7</number>
</property>
<item row="5" column="1">
<widget class="QGroupBox" name="groupBox_blinds">
<property name="title">
<string>Blinds</string>
</property>
<layout class="QGridLayout">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="1" column="1">
<widget class="QRadioButton" name="radioButton_useSavedBlindsSettings">
<property name="text">
<string>Use saved blinds settings</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="radioButton_changeBlindsSettings">
<property name="text">
<string>Change blinds settings ...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Game type:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_gameType">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>Standard</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/player_play.png</normaloff>:/gfx/player_play.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Registered players only</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/registered.png</normaloff>:/gfx/registered.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Invited players only</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/list_add_user.png</normaloff>:/gfx/list_add_user.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Ranking game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/cup.png</normaloff>:/gfx/cup.png</iconset>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
@@ -116,121 +236,7 @@
</item>
</layout>
</item>
<item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Game type:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_gameType">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>Standard</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/player_play.png</normaloff>:/gfx/player_play.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Registered players only</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/registered.png</normaloff>:/gfx/registered.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Invited players only</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/list_add_user.png</normaloff>:/gfx/list_add_user.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Ranking game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/cup.png</normaloff>:/gfx/cup.png</iconset>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="checkBox_Password">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Password:</string>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_Password">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0" colspan="2">
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
@@ -272,7 +278,7 @@
</item>
</layout>
</item>
<item row="5" column="0" colspan="2">
<item row="4" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_2">
@@ -323,7 +329,7 @@
</item>
</layout>
</item>
<item row="6" column="0">
<item row="5" column="0">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_6">
@@ -385,47 +391,50 @@
</item>
</layout>
</item>
<item row="6" column="1">
<widget class="QGroupBox" name="groupBox_blinds">
<property name="title">
<string>Blinds</string>
<item row="2" column="0" colspan="2">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<layout class="QGridLayout">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="1" column="1">
<widget class="QRadioButton" name="radioButton_useSavedBlindsSettings">
<property name="text">
<string>Use saved blinds settings</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="radioButton_changeBlindsSettings">
<property name="text">
<string>Change blinds settings ...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<property name="margin">
<number>0</number>
</property>
</widget>
<item>
<widget class="QCheckBox" name="checkBox_Password">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Password:</string>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_Password">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
@@ -441,7 +450,7 @@
<tabstop>pushButton_createGame</tabstop>
</tabstops>
<resources>
<include location="../resources/pokerth_android.qrc"/>
<include location="../resources/pokerth.qrc"/>
</resources>
<connections>
<connection>
src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui
+29 -2
View File
@@ -20,6 +20,18 @@
<string>Create Network Game</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>30</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>30</number>
</property>
<property name="bottomMargin">
<number>30</number>
</property>
<item row="0" column="1">
<spacer name="verticalSpacer_3">
<property name="orientation">
@@ -70,11 +82,24 @@
<item>
<widget class="QPushButton" name="pushButton_createGame">
<property name="styleSheet">
<string notr="true">QObject {font: bold 30px}</string>
<string notr="true">QObject {font: 36px}</string>
</property>
<property name="text">
<string>Create Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -282,7 +307,9 @@
<tabstop>spinBox_netDelayBetweenHands</tabstop>
<tabstop>pushButton_createGame</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../resources/pokerth.qrc"/>
</resources>
<connections>
<connection>
<sender>pushButton_createGame</sender>
src/gui/qt/gui_800x480/gametable_800x480.ui
+1 -1
View File
@@ -4561,7 +4561,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="maximumSize">
<size>
<width>235</width>
<width>300</width>
<height>60</height>
</size>
</property>
src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui
+5 -2
View File
@@ -131,6 +131,9 @@
</item>
<item>
<widget class="QPushButton" name="pushButton_login">
<property name="styleSheet">
<string notr="true">QObject{font: 36px, }</string>
</property>
<property name="text">
<string>Login</string>
</property>
@@ -140,8 +143,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoDefault">
src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui
+17 -2
View File
@@ -62,11 +62,24 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: bold 26px}</string>
<string notr="true">QObject {font: 36px}</string>
</property>
<property name="text">
<string>Connect</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -358,7 +371,9 @@ p, li { white-space: pre-wrap; }
<tabstop>pushButton_delete</tabstop>
<tabstop>pushButton_connect</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../resources/pokerth.qrc"/>
</resources>
<connections>
<connection>
<sender>pushButton_connect</sender>
src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui
+110 -92
View File
@@ -28,10 +28,72 @@
<property name="styleSheet">
<string notr="true">QObject {font: 26px}</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>25</number>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>30</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>30</number>
</property>
<property name="bottomMargin">
<number>30</number>
</property>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="horizontalSpacing">
<number>4</number>
</property>
<item row="2" column="0" rowspan="2">
<widget class="QListWidget" name="listWidget_blinds"/>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="pushButton_delete">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item row="2" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>121</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QSpinBox" name="spinBox_input">
<property name="prefix">
<string>$</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>20000</number>
</property>
<property name="value">
<number>5</number>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_add">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
@@ -105,66 +167,37 @@
</widget>
</item>
<item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="styleSheet">
<string notr="true">QObject {font: bold 30px}</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="horizontalSpacing">
<number>4</number>
</property>
<item row="2" column="0" rowspan="2">
<widget class="QListWidget" name="listWidget_blinds"/>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="pushButton_delete">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item row="2" column="1">
<spacer>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>121</height>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QSpinBox" name="spinBox_input">
<property name="prefix">
<string>$</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>20000</number>
</property>
<property name="value">
<number>5</number>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_add">
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Add</string>
<string> OK </string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
@@ -178,42 +211,11 @@
<tabstop>radioButton_alwaysRaiseAbout</tabstop>
<tabstop>spinBox_alwaysRaiseValue</tabstop>
<tabstop>radioButton_stayAtLastBlind</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../resources/pokerth.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>manualBlindsOrderDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>228</x>
<y>394</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>manualBlindsOrderDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>270</x>
<y>400</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>radioButton_alwaysRaiseAbout</sender>
<signal>toggled(bool)</signal>
@@ -221,12 +223,28 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>109</x>
<y>307</y>
<x>147</x>
<y>302</y>
</hint>
<hint type="destinationlabel">
<x>173</x>
<y>303</y>
<x>575</x>
<y>306</y>
</hint>
</hints>
</connection>
<connection>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>manualBlindsOrderDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>666</x>
<y>367</y>
</hint>
<hint type="destinationlabel">
<x>622</x>
<y>394</y>
</hint>
</hints>
</connection>
src/gui/qt/gui_800x480/mymessagedialog_800x480.ui
+1 -1
View File
@@ -92,7 +92,7 @@
<item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="styleSheet">
<string notr="true">QObject {font: 30px}</string>
<string notr="true">QObject {font: 36px}</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
src/gui/qt/gui_800x480/newgamedialog_800x480.ui
+35 -43
View File
@@ -32,6 +32,18 @@
<property name="spacing">
<number>16</number>
</property>
<property name="leftMargin">
<number>30</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>30</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
@@ -262,33 +274,27 @@
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<widget class="QPushButton" name="pushButton">
<property name="styleSheet">
<string notr="true">QObject {font: bold 30px}</string>
<string notr="true">QObject { font: 36px;}</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<property name="text">
<string> OK </string>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<property name="iconSize">
<size>
<width>100</width>
<height>20</height>
<width>32</width>
<height>32</height>
</size>
</property>
</spacer>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
@@ -312,37 +318,23 @@
<tabstop>spinBox_startCash</tabstop>
<tabstop>radioButton_changeBlindsSettings</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../resources/pokerth.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>newGameDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
<x>689</x>
<y>356</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>newGameDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
<x>588</x>
<y>377</y>
</hint>
</hints>
</connection>
src/gui/qt/gui_800x480/selectavatardialog_800x480.ui
+3 -3
View File
@@ -98,7 +98,7 @@
</size>
</property>
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/document-open-folder.png</normaloff>:/gfx/document-open-folder.png</iconset>
</property>
<property name="iconSize">
@@ -115,7 +115,7 @@
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="styleSheet">
<string notr="true">QObject {font: bold 26px}</string>
<string notr="true">QObject {font:36px}</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -136,7 +136,7 @@
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
<include location="../resources/pokerth_android.qrc"/>
<include location="../resources/pokerth.qrc"/>
</resources>
<connections>
<connection>
src/gui/qt/gui_800x480/settingsdialog_800x480.ui
+107 -211
View File
@@ -3495,44 +3495,6 @@ p, li { white-space: pre-wrap; }
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_27">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Store log files for:</string>
</property>
<property name="buddy">
<cstring>spinBox_logStoreDuration</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="spinBox_logStoreDuration">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> Day(s)</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>3650</number>
</property>
<property name="value">
<number>2</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_39">
<property name="sizePolicy">
@@ -3627,131 +3589,60 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_27">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Store log files for:</string>
</property>
<property name="buddy">
<cstring>spinBox_logStoreDuration</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="spinBox_logStoreDuration">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> Day(s)</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>3650</number>
</property>
<property name="value">
<number>2</number>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<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>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_11">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QTreeWidget" name="treeWidget_logFiles">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="indentation">
<number>5</number>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<column>
<property name="text">
<string>Log File</string>
</property>
</column>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_37">
<property name="text">
<string>Preview:</string>
</property>
</widget>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser_logPreview">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Sans'; font-size:18px; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_9">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="pushButton_exportLogHtml">
<property name="text">
<string>Export as HTML</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/text-html.png</normaloff>:/gfx/text-html.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_exportLogTxt">
<property name="text">
<string>Export as txt</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/text-plain.png</normaloff>:/gfx/text-plain.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_saveLogAs">
<property name="text">
<string>Save as ...</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/filesave.png</normaloff>:/gfx/filesave.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_deleteLog">
<property name="text">
<string>Delete</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/editdelete.png</normaloff>:/gfx/editdelete.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_9">
@@ -3894,15 +3785,25 @@ p, li { white-space: pre-wrap; }
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<widget class="QPushButton" name="pushButton">
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
<string notr="true">QObject{font: 32px;}</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<property name="text">
<string> OK </string>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
@@ -4033,11 +3934,6 @@ p, li { white-space: pre-wrap; }
<tabstop>comboBox_logInterval</tabstop>
<tabstop>lineEdit_logDir</tabstop>
<tabstop>pushButton_openLogDir</tabstop>
<tabstop>pushButton_exportLogHtml</tabstop>
<tabstop>pushButton_exportLogTxt</tabstop>
<tabstop>pushButton_saveLogAs</tabstop>
<tabstop>pushButton_deleteLog</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
<include location="../resources/pokerth.qrc"/>
@@ -4059,22 +3955,6 @@ p, li { white-space: pre-wrap; }
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>settingsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>595</x>
<y>520</y>
</hint>
<hint type="destinationlabel">
<x>599</x>
<y>497</y>
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider_soundVolume</sender>
<signal>valueChanged(int)</signal>
@@ -4082,12 +3962,12 @@ p, li { white-space: pre-wrap; }
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>765</x>
<y>92</y>
<x>786</x>
<y>63</y>
</hint>
<hint type="destinationlabel">
<x>322</x>
<y>92</y>
<x>362</x>
<y>63</y>
</hint>
</hints>
</connection>
@@ -4098,12 +3978,12 @@ p, li { white-space: pre-wrap; }
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>765</x>
<y>212</y>
<x>786</x>
<y>184</y>
</hint>
<hint type="destinationlabel">
<x>765</x>
<y>242</y>
<x>786</x>
<y>217</y>
</hint>
</hints>
</connection>
@@ -4114,12 +3994,12 @@ p, li { white-space: pre-wrap; }
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>763</x>
<y>212</y>
<x>784</x>
<y>168</y>
</hint>
<hint type="destinationlabel">
<x>763</x>
<y>236</y>
<x>784</x>
<y>188</y>
</hint>
</hints>
</connection>
@@ -4130,12 +4010,12 @@ p, li { white-space: pre-wrap; }
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>296</x>
<y>109</y>
<x>249</x>
<y>53</y>
</hint>
<hint type="destinationlabel">
<x>381</x>
<y>110</y>
<x>277</x>
<y>53</y>
</hint>
</hints>
</connection>
@@ -4146,12 +4026,12 @@ p, li { white-space: pre-wrap; }
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>309</x>
<y>108</y>
<x>249</x>
<y>53</y>
</hint>
<hint type="destinationlabel">
<x>747</x>
<y>103</y>
<x>306</x>
<y>79</y>
</hint>
</hints>
</connection>
@@ -4162,12 +4042,28 @@ p, li { white-space: pre-wrap; }
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>283</x>
<y>283</y>
<x>362</x>
<y>235</y>
</hint>
<hint type="destinationlabel">
<x>566</x>
<y>283</y>
<x>779</x>
<y>239</y>
</hint>
</hints>
</connection>
<connection>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>settingsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>685</x>
<y>390</y>
</hint>
<hint type="destinationlabel">
<x>578</x>
<y>396</y>
</hint>
</hints>
</connection>
src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui
+31 -3
View File
@@ -134,11 +134,24 @@
<item>
<widget class="QPushButton" name="pushButton_Kick">
<property name="styleSheet">
<string notr="true">QObject {font: 26px}</string>
<string notr="true">QObject {font: 36px}</string>
</property>
<property name="text">
<string>Kick Player</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/editdelete.png</normaloff>:/gfx/editdelete.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
@@ -157,11 +170,24 @@
<item>
<widget class="QPushButton" name="pushButton_startGame">
<property name="styleSheet">
<string notr="true">QObject {font: bold 30px}</string>
<string notr="true">QObject {font: 36px}</string>
</property>
<property name="text">
<string>Start Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -176,7 +202,9 @@
<tabstop>lineEdit_ChatInput</tabstop>
<tabstop>pushButton_startGame</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../resources/pokerth.qrc"/>
</resources>
<connections>
<connection>
<sender>pushButton_startGame</sender>
src/gui/qt/gui_800x480/tabs_800x480.ui
+1 -1
View File
@@ -39,7 +39,7 @@
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
<number>20</number>
</property>
<property name="spacing">
<number>0</number>
src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
+34 -1
View File
@@ -27,6 +27,7 @@ newGameDialogImpl::newGameDialogImpl(QMainWindow *parent, ConfigFile *c)
setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
#endif
setupUi(this);
this->installEventFilter(this);
myChangeCompleteBlindsDialog = new changeCompleteBlindsDialogImpl;
connect( radioButton_changeBlindsSettings, SIGNAL( clicked(bool) ), this, SLOT( callChangeBlindsDialog(bool) ) );
@@ -65,7 +66,7 @@ void newGameDialogImpl::exec()
myChangeCompleteBlindsDialog->spinBox_afterThisAlwaysRaiseValue->setValue(myConfig->readConfigInt("AfterMBAlwaysRaiseValue"));
myChangeCompleteBlindsDialog->radioButton_afterThisStayAtLastBlind->setChecked(myConfig->readConfigInt("AfterMBStayAtLastBlind"));
QDialog::exec();
QDialog::exec();
}
void newGameDialogImpl::callChangeBlindsDialog(bool show)
@@ -80,3 +81,35 @@ void newGameDialogImpl::callChangeBlindsDialog(bool show)
}
}
bool newGameDialogImpl::eventFilter(QObject *obj, QEvent *event)
{
QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
#ifdef ANDROID
//androi hack for crash bug (hopefully useless from necessitas beta2)
if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
if(spinBox_gameSpeed->hasFocus()) {
spinBox_gameSpeed->clearFocus();
}
if(spinBox_quantityPlayers->hasFocus()) {
spinBox_quantityPlayers->clearFocus();
}
if(spinBox_startCash->hasFocus()) {
spinBox_startCash->clearFocus();
}
event->ignore();
return false;
}
else if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Back) {
this->reject();
return true;
}
else {
// pass the event on to the parent class
return QDialog::eventFilter(obj, event);
}
#else
return QDialog::eventFilter(obj, event);
#endif
}
src/gui/qt/newlocalgamedialog/newgamedialogimpl.h
+2
View File
@@ -42,6 +42,8 @@ public:
return myChangeCompleteBlindsDialog;
}
bool eventFilter(QObject *obj, QEvent *event);
public slots:
void callChangeBlindsDialog(bool);
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
-1
View File
@@ -82,7 +82,6 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
comboBox_switchLanguage->addItem(QString(tr("Tamil")+" "+QString::fromUtf8("(தமிழ்)")),"ta");
comboBox_switchLanguage->addItem(QString(tr("Turkish")+" "+QString::fromUtf8("(Tϋrkçe)")),"tr");
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) );
connect( lineEdit_HumanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent1Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent2Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
src/pokerth.cpp
+2
View File
@@ -114,7 +114,9 @@ int main( int argc, char **argv )
p.setColor(QPalette::ButtonText, QColor::fromRgb(255,255,255));
p.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgb(100,100,100));
p.setColor(QPalette::WindowText, QColor::fromRgb(255,255,255));
p.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgb(100,100,100));
p.setColor(QPalette::Text, QColor::fromRgb(255,255,255));
p.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgb(100,100,100));
p.setColor(QPalette::Link, QColor::fromRgb(192,192,255));
p.setColor(QPalette::LinkVisited, QColor::fromRgb(192,192,255));
a.setPalette(p);