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

Next Android GUI changes

Browse Source
This commit is contained in:
doitux
2012-05-09 23:13:41 +00:00
parent 19f96b751b
commit 718c1fb3f3
10 changed files with 419 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+3 -1
View File
@@ -212,7 +212,9 @@ void gameLobbyDialogImpl::exec()
registeredUserMode(); registeredUserMode();
} }
#ifdef ANDROID
this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
#endif
QDialog::exec(); QDialog::exec();
waitStartGameMsgBoxTimer->stop(); waitStartGameMsgBoxTimer->stop();
src/gui/qt/gametable/gametableimpl.cpp
+5 -3
View File
@@ -3164,8 +3164,6 @@ void gameTableImpl::keyPressEvent ( QKeyEvent * event )
#endif #endif
//TESTING UNIT
// if (event->key() == Qt::Key_M) { showShowMyCardsButton(); }
} }
void gameTableImpl::changePlayingMode() void gameTableImpl::changePlayingMode()
@@ -3220,7 +3218,11 @@ bool gameTableImpl::eventFilter(QObject *obj, QEvent *event)
if (/*obj == lineEdit_ChatInput && lineEdit_ChatInput->text() != "" && */event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Tab) { if (/*obj == lineEdit_ChatInput && lineEdit_ChatInput->text() != "" && */event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Tab) {
myChat->nickAutoCompletition(); myChat->nickAutoCompletition();
return true; return true;
} else if (event->type() == QEvent::Close) { // CURRENTLY not possible in Android :( --> } else if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Back) {
// event->ignore();
// closeGameTable();
// return true;
} else if (event->type() == QEvent::Close) {
event->ignore(); event->ignore();
closeGameTable(); closeGameTable();
return true; return true;
src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui
+1 -7
View File
@@ -16,12 +16,6 @@
<height>380</height> <height>380</height>
</size> </size>
</property> </property>
<property name="maximumSize">
<size>
<width>800</width>
<height>382</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Internet Game Lobby</string> <string>Internet Game Lobby</string>
</property> </property>
@@ -439,7 +433,7 @@ p, li { white-space: pre-wrap; }
<enum>Qt::CustomContextMenu</enum> <enum>Qt::CustomContextMenu</enum>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true">QObject { font: 20px; }</string>
</property> </property>
<property name="horizontalScrollBarPolicy"> <property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum> <enum>Qt::ScrollBarAlwaysOff</enum>
src/gui/qt/gui_800x480/newgamedialog_800x480.ui
+144 -188
View File
@@ -7,19 +7,19 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>350</height> <height>424</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>800</width> <width>800</width>
<height>350</height> <height>424</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>800</width>
<height>350</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -28,160 +28,158 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QObject {font: 20px}</string> <string notr="true">QObject {font: 20px}</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item row="1" column="1"> <property name="margin">
<widget class="QGroupBox" name="groupBox"> <number>30</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Number of players:</string>
</property>
<property name="buddy">
<cstring>spinBox_quantityPlayers</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_quantityPlayers">
<property name="minimum">
<number>2</number>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Start Cash:</string>
</property>
<property name="buddy">
<cstring>spinBox_startCash</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_startCash">
<property name="buttonSymbols">
<enum>QAbstractSpinBox::UpDownArrows</enum>
</property>
<property name="prefix">
<string>$</string>
</property>
<property name="minimum">
<number>1000</number>
</property>
<property name="maximum">
<number>1000000</number>
</property>
<property name="singleStep">
<number>50</number>
</property>
<property name="value">
<number>2000</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string/> <string>Blinds</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0"> <property name="topMargin">
<widget class="QLabel" name="label"> <number>1</number>
<property name="text"> </property>
<string>Number of players:</string> <property name="rightMargin">
</property> <number>9</number>
<property name="buddy"> </property>
<cstring>spinBox_quantityPlayers</cstring> <property name="bottomMargin">
</property> <number>1</number>
</widget> </property>
</item> <property name="horizontalSpacing">
<item row="0" column="1" colspan="2"> <number>0</number>
<widget class="QSpinBox" name="spinBox_quantityPlayers"> </property>
<property name="minimum">
<number>2</number>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_2"> <widget class="QRadioButton" name="radioButton_changeBlindsSettings">
<property name="text"> <property name="text">
<string>Start Cash:</string> <string>Change blinds settings ...</string>
</property>
<property name="buddy">
<cstring>spinBox_startCash</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2"> <item row="0" column="0">
<widget class="QSpinBox" name="spinBox_startCash"> <widget class="QRadioButton" name="radioButton_useSavedBlindsSettings">
<property name="prefix">
<string>$</string>
</property>
<property name="minimum">
<number>1000</number>
</property>
<property name="maximum">
<number>1000000</number>
</property>
<property name="singleStep">
<number>50</number>
</property>
<property name="value">
<number>2000</number>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Blinds</string>
</property>
<layout class="QGridLayout">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0">
<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="1" column="0">
<widget class="QRadioButton" name="radioButton_changeBlindsSettings">
<property name="text">
<string>Change blinds settings ...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Game Speed:</string> <string>Use saved blinds settings</string>
</property> </property>
<property name="buddy"> <property name="checked">
<cstring>spinBox_gameSpeed</cstring> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2">
<widget class="QSpinBox" name="spinBox_gameSpeed">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>11</number>
</property>
<property name="value">
<number>4</number>
</property>
</widget>
</item>
<item row="3" 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>
<item row="5" column="0">
<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="1" column="0">
<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>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2"> <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Game Speed:</string>
</property>
<property name="buddy">
<cstring>spinBox_gameSpeed</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_gameSpeed">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>11</number>
</property>
<property name="value">
<number>4</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<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>
<item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string> <string notr="true">QObject {font: bold 20px}</string>
@@ -194,54 +192,12 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<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 row="1" column="2">
<spacer name="horizontalSpacer_2">
<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 row="0" column="1">
<spacer name="verticalSpacer_4">
<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> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>spinBox_quantityPlayers</tabstop> <tabstop>spinBox_quantityPlayers</tabstop>
<tabstop>spinBox_startCash</tabstop> <tabstop>spinBox_startCash</tabstop>
<tabstop>radioButton_useSavedBlindsSettings</tabstop>
<tabstop>radioButton_changeBlindsSettings</tabstop> <tabstop>radioButton_changeBlindsSettings</tabstop>
<tabstop>spinBox_gameSpeed</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
src/gui/qt/gui_800x480/settingsdialog_800x480.ui
+111 -493
View File
File diff suppressed because it is too large Load Diff
src/gui/qt/gui_800x480/startwindow_800x480.ui
+135 -92
View File
@@ -65,32 +65,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="2">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>63</width>
<height>20</height>
</size>
</property>
</spacer>
</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>95</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1"> <item row="1" column="1">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
@@ -134,7 +108,7 @@
<string>&amp;1 Start Local Game</string> <string>&amp;1 Start Local Game</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/swbuttonlocalgame.png</normaloff>:/gfx/swbuttonlocalgame.png</iconset> <normaloff>:/gfx/swbuttonlocalgame.png</normaloff>:/gfx/swbuttonlocalgame.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@@ -145,47 +119,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButtonInternet_Game">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>350</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>350</width>
<height>80</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>&amp;2 Internet Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/swbuttoninternetgame.png</normaloff>:/gfx/swbuttoninternetgame.png</iconset>
</property>
<property name="iconSize">
<size>
<width>37</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="pushButton_Create_Network_Game"> <widget class="QPushButton" name="pushButton_Create_Network_Game">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -216,7 +149,7 @@
<string>&amp;3 Create Network Game</string> <string>&amp;3 Create Network Game</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/swbuttoncreatenetworkgame.png</normaloff>:/gfx/swbuttoncreatenetworkgame.png</iconset> <normaloff>:/gfx/swbuttoncreatenetworkgame.png</normaloff>:/gfx/swbuttoncreatenetworkgame.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@@ -227,6 +160,47 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButtonInternet_Game">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>350</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>350</width>
<height>80</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>&amp;2 Internet Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/swbuttoninternetgame.png</normaloff>:/gfx/swbuttoninternetgame.png</iconset>
</property>
<property name="iconSize">
<size>
<width>37</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="pushButton_Join_Network_Game"> <widget class="QPushButton" name="pushButton_Join_Network_Game">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -238,14 +212,11 @@
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text"> <property name="text">
<string>&amp;4 Join Network Game</string> <string>&amp;4 Join Network Game</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/swbuttonjoinnetworkgame.png</normaloff>:/gfx/swbuttonjoinnetworkgame.png</iconset> <normaloff>:/gfx/swbuttonjoinnetworkgame.png</normaloff>:/gfx/swbuttonjoinnetworkgame.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@@ -256,8 +227,92 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QPushButton" name="pushButton_configure">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>80</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>Configure PokerTH</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/preferences-desktop.png</normaloff>:/gfx/preferences-desktop.png</iconset>
</property>
<property name="iconSize">
<size>
<width>37</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_about">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>About PokerTH</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/ktip.png</normaloff>:/gfx/ktip.png</iconset>
</property>
<property name="iconSize">
<size>
<width>37</width>
<height>32</height>
</size>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="1" column="2">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>63</width>
<height>20</height>
</size>
</property>
</spacer>
</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>95</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
@@ -298,7 +353,7 @@
</widget> </widget>
<action name="actionStart_Local_Game"> <action name="actionStart_Local_Game">
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/swbuttonlocalgame.png</normaloff>:/gfx/swbuttonlocalgame.png</iconset> <normaloff>:/gfx/swbuttonlocalgame.png</normaloff>:/gfx/swbuttonlocalgame.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -310,7 +365,7 @@
</action> </action>
<action name="actionInternet_Game"> <action name="actionInternet_Game">
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/swbuttoninternetgame.png</normaloff>:/gfx/swbuttoninternetgame.png</iconset> <normaloff>:/gfx/swbuttoninternetgame.png</normaloff>:/gfx/swbuttoninternetgame.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -324,31 +379,19 @@
<property name="text"> <property name="text">
<string>About PokerTH</string> <string>About PokerTH</string>
</property> </property>
<property name="font">
<font>
<pointsize>15</pointsize>
</font>
</property>
</action> </action>
<action name="actionConfigure_PokerTH"> <action name="actionConfigure_PokerTH">
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/systemsettings.png</normaloff>:/gfx/systemsettings.png</iconset> <normaloff>:/gfx/systemsettings.png</normaloff>:/gfx/systemsettings.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Configure PokerTH ...</string> <string>Configure PokerTH ...</string>
</property> </property>
<property name="font">
<font>
<pointsize>15</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
</action> </action>
<action name="actionQuit"> <action name="actionQuit">
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/application_exit.png</normaloff>:/gfx/application_exit.png</iconset> <normaloff>:/gfx/application_exit.png</normaloff>:/gfx/application_exit.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -363,7 +406,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/swbuttonjoinnetworkgame.png</normaloff>:/gfx/swbuttonjoinnetworkgame.png</iconset> <normaloff>:/gfx/swbuttonjoinnetworkgame.png</normaloff>:/gfx/swbuttonjoinnetworkgame.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -372,7 +415,7 @@
</action> </action>
<action name="actionCreate_Network_Game"> <action name="actionCreate_Network_Game">
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/swbuttoncreatenetworkgame.png</normaloff>:/gfx/swbuttoncreatenetworkgame.png</iconset> <normaloff>:/gfx/swbuttoncreatenetworkgame.png</normaloff>:/gfx/swbuttoncreatenetworkgame.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -381,7 +424,7 @@
</action> </action>
</widget> </widget>
<resources> <resources>
<include location="../resources/pokerth_android.qrc"/> <include location="../resources/pokerth.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
+1 -2
View File
@@ -29,7 +29,6 @@ newGameDialogImpl::newGameDialogImpl(QMainWindow *parent, ConfigFile *c)
setupUi(this); setupUi(this);
myChangeCompleteBlindsDialog = new changeCompleteBlindsDialogImpl; myChangeCompleteBlindsDialog = new changeCompleteBlindsDialogImpl;
connect( radioButton_changeBlindsSettings, SIGNAL( clicked(bool) ), this, SLOT( callChangeBlindsDialog(bool) ) ); connect( radioButton_changeBlindsSettings, SIGNAL( clicked(bool) ), this, SLOT( callChangeBlindsDialog(bool) ) );
} }
@@ -66,7 +65,7 @@ void newGameDialogImpl::exec()
myChangeCompleteBlindsDialog->spinBox_afterThisAlwaysRaiseValue->setValue(myConfig->readConfigInt("AfterMBAlwaysRaiseValue")); myChangeCompleteBlindsDialog->spinBox_afterThisAlwaysRaiseValue->setValue(myConfig->readConfigInt("AfterMBAlwaysRaiseValue"));
myChangeCompleteBlindsDialog->radioButton_afterThisStayAtLastBlind->setChecked(myConfig->readConfigInt("AfterMBStayAtLastBlind")); myChangeCompleteBlindsDialog->radioButton_afterThisStayAtLastBlind->setChecked(myConfig->readConfigInt("AfterMBStayAtLastBlind"));
QDialog::exec(); QDialog::exec();
} }
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
-3
View File
@@ -530,9 +530,6 @@ void settingsDialogImpl::exec(bool in_game)
calledIngame = in_game; calledIngame = in_game;
prepareDialog(); prepareDialog();
QDialog::exec(); QDialog::exec();
#ifdef ANDROID
this->showFullScreen();
#endif
} }
void settingsDialogImpl::isAccepted() void settingsDialogImpl::isAccepted()
src/gui/qt/startwindow/startwindowimpl.cpp
+17 -11
View File
@@ -75,17 +75,23 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
#ifdef GUI_800x480 #ifdef GUI_800x480
#ifdef ANDROID #ifdef ANDROID
this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { font-size:20px; color: #F0F0F0; }"); this->menubar->hide();
centralwidget->setStyleSheet(".QWidget { background-image: url(:/android/android-data/gfx/gui/misc/startwindowbg_800x480.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); centralwidget->setStyleSheet(".QWidget { background-image: url(:/android/android-data/gfx/gui/misc/startwindowbg_800x480.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
this->showFullScreen(); this->showFullScreen();
#else #else
this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }"); // this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }");
this->menubar->hide();
centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg_800x480.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg_800x480.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
#endif #endif
pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
pushButton_about->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
pushButton_configure->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
connect( pushButton_about, SIGNAL( clicked() ), this, SLOT( callAboutPokerthDialog() ) );
connect( pushButton_configure, SIGNAL( clicked() ), this, SLOT( callSettingsDialogFromStartwindow() ) );
#else #else
this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:12px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }"); this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:12px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }");
@@ -95,6 +101,10 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}");
pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}");
pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}");
connect( actionAbout_PokerTH, SIGNAL( triggered() ), this, SLOT( callAboutPokerthDialog() ) );
connect( actionConfigure_PokerTH, SIGNAL( triggered() ), this, SLOT( callSettingsDialogFromStartwindow() ) );
#endif #endif
@@ -124,11 +134,7 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
connect( actionCreate_Network_Game, SIGNAL( triggered() ), this, SLOT( callCreateNetworkGameDialog() ) ); connect( actionCreate_Network_Game, SIGNAL( triggered() ), this, SLOT( callCreateNetworkGameDialog() ) );
connect( pushButton_Create_Network_Game, SIGNAL( clicked() ), this, SLOT( callCreateNetworkGameDialog() ) ); connect( pushButton_Create_Network_Game, SIGNAL( clicked() ), this, SLOT( callCreateNetworkGameDialog() ) );
connect( actionJoin_Network_Game, SIGNAL( triggered() ), this, SLOT( callJoinNetworkGameDialog() ) ); connect( actionJoin_Network_Game, SIGNAL( triggered() ), this, SLOT( callJoinNetworkGameDialog() ) );
connect( pushButton_Join_Network_Game, SIGNAL( clicked() ), this, SLOT( callJoinNetworkGameDialog() ) ); connect( pushButton_Join_Network_Game, SIGNAL( clicked() ), this, SLOT( callJoinNetworkGameDialog() ) );
connect( actionAbout_PokerTH, SIGNAL( triggered() ), this, SLOT( callAboutPokerthDialog() ) );
connect( actionConfigure_PokerTH, SIGNAL( triggered() ), this, SLOT( callSettingsDialogFromStartwindow() ) );
connect(this, SIGNAL(signalShowClientDialog()), this, SLOT(showClientDialog())); connect(this, SIGNAL(signalShowClientDialog()), this, SLOT(showClientDialog()));
src/pokerth.cpp
+2 -2
View File
@@ -88,10 +88,10 @@ int main( int argc, char **argv )
//create defaultconfig //create defaultconfig
ConfigFile *myConfig = new ConfigFile(argv[0], false); ConfigFile *myConfig = new ConfigFile(argv[0], false);
Log *myLog = new Log(myConfig); Log *myLog = new Log(myConfig);
#ifndef ANDROID //#ifndef ANDROID
// set PlastiqueStyle even for mac-version to prevent artefacts on styled widgets // set PlastiqueStyle even for mac-version to prevent artefacts on styled widgets
a.setStyle(new QPlastiqueStyle); a.setStyle(new QPlastiqueStyle);
#endif //#endif
QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
//set QApplication default font //set QApplication default font