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

Next steps for android gui changes

Browse Source
This commit is contained in:
doitux
2012-05-10 23:21:57 +02:00
parent 2b9642d5a5
commit 09dac64e8c
7 changed files with 194 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui
+28 -59
View File
@@ -10,13 +10,13 @@
<height>424</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>800</width>
<height>424</height>
</size>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<property name="minimumSize">
<size>
<width>800</width>
<height>424</height>
@@ -62,7 +62,7 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
<string notr="true">QObject {font: bold 26px}</string>
</property>
<property name="text">
<string>Connect</string>
@@ -72,30 +72,27 @@
</layout>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string/>
<widget class="QFrame" name="frame">
<property name="styleSheet">
<string notr="true">QObject {font: 26px}</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="verticalSpacing">
<number>6</number>
</property>
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_4">
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
</property>
<property name="text">
<string>Profile Name:</string>
</property>
<property name="buddy">
<cstring>lineEdit_profileName</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_profileName">
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
<property name="inputMethodHints">
<set>Qt::ImhFormattedNumbersOnly|Qt::ImhNoPredictiveText</set>
</property>
<property name="text">
<string>myServerProfile1</string>
@@ -108,42 +105,27 @@
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
</property>
<property name="text">
<string>IP Address / Domain Name:</string>
</property>
<property name="buddy">
<cstring>lineEdit_ipAddress</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_ipAddress">
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
<property name="inputMethodHints">
<set>Qt::ImhNoPredictiveText</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
</property>
<property name="text">
<string>Port:</string>
</property>
<property name="buddy">
<cstring>spinBox_port</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_port">
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
</property>
<property name="minimum">
<number>80</number>
</property>
@@ -167,9 +149,6 @@
</property>
<item>
<widget class="QCheckBox" name="checkBox_ipv6">
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
</property>
<property name="text">
<string>Use IPv6</string>
</property>
@@ -216,9 +195,6 @@ p, li { white-space: pre-wrap; }
</property>
<item>
<widget class="QCheckBox" name="checkBox_sctp">
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
</property>
<property name="text">
<string>Use SCTP</string>
</property>
@@ -258,13 +234,22 @@ p, li { white-space: pre-wrap; }
<item row="4" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
<string notr="true"/>
</property>
<property name="title">
<string>Server Profiles</string>
</property>
<layout class="QGridLayout" name="gridLayout3">
<property name="margin">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
@@ -391,21 +376,5 @@ p, li { white-space: pre-wrap; }
</hint>
</hints>
</connection>
<connection>
<sender>treeWidget</sender>
<signal>itemDoubleClicked(QTreeWidgetItem*,int)</signal>
<receiver>pushButton_connect</receiver>
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
<x>113</x>
<y>206</y>
</hint>
<hint type="destinationlabel">
<x>394</x>
<y>427</y>
</hint>
</hints>
</connection>
</connections>
</ui>
src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui
+11 -8
View File
@@ -10,13 +10,13 @@
<height>424</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>800</width>
<height>424</height>
</size>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<property name="minimumSize">
<size>
<width>800</width>
<height>424</height>
@@ -26,9 +26,12 @@
<string>Manual Blinds Order</string>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
<string notr="true">QObject {font: 26px}</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>25</number>
</property>
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
@@ -104,7 +107,7 @@
<item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
<string notr="true">QObject {font: bold 30px}</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
src/gui/qt/gui_800x480/mymessagedialog_800x480.ui
+20 -11
View File
@@ -7,30 +7,39 @@
<x>0</x>
<y>0</y>
<width>800</width>
<height>250</height>
<height>424</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>800</width>
<height>250</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>800</width>
<height>250</height>
<height>424</height>
</size>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
<string notr="true">QObject {font: 26px}</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>70</number>
</property>
<property name="topMargin">
<number>9</number>
<number>70</number>
</property>
<property name="rightMargin">
<number>70</number>
</property>
<property name="bottomMargin">
<number>60</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_icon">
@@ -77,7 +86,7 @@
<item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
<string notr="true">QObject {font: 30px}</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
src/gui/qt/gui_800x480/newgamedialog_800x480.ui
+2 -2
View File
@@ -26,7 +26,7 @@
<string>Start Local Game</string>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
<string notr="true">QObject {font: 26px}</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
@@ -182,7 +182,7 @@
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
<string notr="true">QObject {font: 30px}</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
src/gui/qt/gui_800x480/selectavatardialog_800x480.ui
+30 -24
View File
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -22,19 +22,16 @@
<height>424</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>800</width>
<height>424</height>
</size>
</property>
<property name="windowTitle">
<string>Please select an avatar</string>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: 18px}</string>
<string notr="true">QObject {font: 26px}</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>20</number>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
@@ -47,6 +44,9 @@
<bool>true</bool>
</property>
<layout class="QGridLayout">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QComboBox" name="comboBox_avatarViewCategorie">
<item>
@@ -78,39 +78,44 @@
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>2</number>
<layout class="QGridLayout" name="gridLayout">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLineEdit" name="lineEdit">
<property name="inputMethodHints">
<set>Qt::ImhNoPredictiveText</set>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_OpenAvatarFile">
<property name="minimumSize">
<size>
<width>27</width>
<height>26</height>
<width>37</width>
<height>37</height>
</size>
</property>
<property name="maximumSize">
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/document-open-folder.png</normaloff>:/gfx/document-open-folder.png</iconset>
</property>
<property name="iconSize">
<size>
<width>27</width>
<width>26</width>
<height>26</height>
</size>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLineEdit" name="lineEdit"/>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
<string notr="true">QObject {font: bold 26px}</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -128,10 +133,11 @@
<tabstop>listWidget</tabstop>
<tabstop>groupBox_2</tabstop>
<tabstop>lineEdit</tabstop>
<tabstop>pushButton_OpenAvatarFile</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../resources/pokerth.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui
+83 -88
View File
@@ -10,13 +10,13 @@
<height>424</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>800</width>
<height>424</height>
</size>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<property name="minimumSize">
<size>
<width>800</width>
<height>424</height>
@@ -28,45 +28,81 @@
<property name="styleSheet">
<string notr="true">QObject {font: 18px}</string>
</property>
<layout class="QGridLayout">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QTreeWidget" name="treeWidget">
<property name="minimumSize">
<size>
<width>390</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>390</width>
<height>16777215</height>
</size>
</property>
<column>
<property name="text">
<string>Connected Players</string>
</property>
</column>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTreeWidget" name="treeWidget">
<property name="maximumSize">
<size>
<width>390</width>
<height>16777215</height>
</size>
</property>
<column>
<property name="text">
<string>Connected Players</string>
</property>
</column>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_fillUpWithComputerOpponents">
<property name="styleSheet">
<string notr="true">QObject {font: 26px}</string>
</property>
<property name="text">
<string>Fill up with computer opponents</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="maximumSize">
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<property name="title">
<string>Chat</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>7</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QTextBrowser" name="textBrowser_ChatDisplay"/>
</item>
<item row="1" column="0">
<widget class="QLineEdit" name="lineEdit_ChatInput">
<property name="styleSheet">
<string notr="true">QObject {font: 26px}</string>
</property>
<property name="inputMethodHints">
<set>Qt::ImhNoPredictiveText</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkBox_fillUpWithComputerOpponents">
<property name="text">
<string>Fill up with computer opponents</string>
</property>
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="styleSheet">
<string notr="true">QObject {font: 18px}</string>
</property>
<property name="text">
<string>Maximum number of players:</string>
</property>
@@ -74,6 +110,9 @@
</item>
<item>
<widget class="QLabel" name="label_maxPlayerNumber">
<property name="styleSheet">
<string notr="true">QObject {font: 18px}</string>
</property>
<property name="text">
<string>0</string>
</property>
@@ -94,21 +133,14 @@
</item>
<item>
<widget class="QPushButton" name="pushButton_Kick">
<property name="styleSheet">
<string notr="true">QObject {font: 26px}</string>
</property>
<property name="text">
<string>Kick Player</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation">
@@ -125,7 +157,7 @@
<item>
<widget class="QPushButton" name="pushButton_startGame">
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
<string notr="true">QObject {font: bold 30px}</string>
</property>
<property name="text">
<string>Start Game</string>
@@ -134,43 +166,6 @@
</item>
</layout>
</item>
<item row="0" column="1" rowspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<property name="title">
<string>Chat</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>7</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QTextBrowser" name="textBrowser_ChatDisplay">
<property name="styleSheet">
<string notr="true">QObject {color: rgb(255, 255, 255);}</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLineEdit" name="lineEdit_ChatInput"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<tabstops>
src/gui/qt/gui_800x480/tabs_800x480.ui
+20 -85
View File
@@ -10,13 +10,13 @@
<height>424</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>800</width>
<height>424</height>
</size>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<property name="minimumSize">
<size>
<width>800</width>
<height>424</height>
@@ -26,12 +26,21 @@
<string>Start Local Game</string>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: 20px}</string>
<string notr="true">QObject {font: 26px}</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>15</number>
</property>
<property name="spacing">
<number>0</number>
</property>
@@ -40,24 +49,14 @@
<property name="spacing">
<number>0</number>
</property>
<item>
<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>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="spacing">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox_LeftToolBox">
<property name="minimumSize">
@@ -533,70 +532,6 @@
</property>
<item>
<widget class="QLabel" name="label_speedString">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>240</red>
<green>240</green>
<blue>240</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>240</red>
<green>240</green>
<blue>240</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>240</red>
<green>240</green>
<blue>240</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>240</red>
<green>240</green>
<blue>240</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>128</red>
<green>128</green>
<blue>128</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>199</red>
<green>199</green>
<blue>199</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="text">
<string>Speed:</string>
</property>