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

some more gui tweaks for android

Browse Source
This commit is contained in:
doitux
2013-12-22 11:23:59 +01:00
parent 2005c2f9de
commit 4739be12f8
4 changed files with 146 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gui_800x480/tabs_800x480.ui
+141 -16
View File
@@ -29,7 +29,16 @@
<bool>true</bool>
</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>0</number>
</property>
<property name="spacing">
@@ -47,7 +56,16 @@
<enum>QFrame::Plain</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<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>0</number>
</property>
<property name="spacing">
@@ -81,7 +99,16 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="_2">
<property name="margin">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<item row="0" column="0">
@@ -103,7 +130,16 @@
<string>Hands</string>
</attribute>
<layout class="QGridLayout" name="_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>0</number>
</property>
<property name="spacing">
@@ -123,7 +159,16 @@
<string>Chat</string>
</attribute>
<layout class="QGridLayout" name="_4">
<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>0</number>
</property>
<property name="spacing">
@@ -159,15 +204,24 @@
<string>Kick</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_100">
<property name="leftMargin">
<number>5</number>
</property>
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>5</number>
</property>
<property name="horizontalSpacing">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>6</number>
</property>
<property name="margin">
<number>5</number>
</property>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
@@ -312,12 +366,21 @@
<string>Player info</string>
</attribute>
<layout class="QGridLayout" name="gridLayout4">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>3</number>
</property>
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QPlainTextEdit" name="textEdit_tipInput">
<property name="focusPolicy">
@@ -357,15 +420,24 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="_5">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<property name="horizontalSpacing">
<number>1</number>
</property>
<property name="verticalSpacing">
<number>2</number>
</property>
<property name="margin">
<number>4</number>
</property>
<item row="0" column="0">
<widget class="MyRightTabWidget" name="tabWidget_Right">
<property name="sizePolicy">
@@ -385,7 +457,16 @@
<string>Log</string>
</attribute>
<layout class="QGridLayout" name="_6">
<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>0</number>
</property>
<property name="spacing">
@@ -555,7 +636,16 @@
<property name="spacing">
<number>6</number>
</property>
<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>0</number>
</property>
<item>
@@ -580,6 +670,41 @@
</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">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_settings">
<property name="minimumSize">
<size>
<width>60</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>60</width>
<height>60</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QPushButton { border:none; background-image: url(&quot;:/gfx/systemsettings.png&quot;); background-repeat: no-repeat; background-position: center center;}</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
src/gui/qt/resources/pokerth_android.qrc
+2 -1
View File
@@ -366,7 +366,6 @@
<file>android-data/gfx/gui/misc/welcomepokerth10_mobile.png</file>
<file>android-data/gfx/gui/misc/windowicon.png</file>
<file>android-data/fonts/DejaVuSans-Bold.ttf</file>
<file>android-data/fonts/n019003l.pfb</file>
<file>android-data/gfx/avatars/default/misc/00a0b3d26a67841239b8883183b7a8f0.png</file>
<file>android-data/gfx/avatars/default/misc/0f2ca195ebaec613ffc8626185415b18.png</file>
<file>android-data/gfx/avatars/default/misc/2b0fca47b50e2cc4f910eba9ffa858a9.png</file>
@@ -556,7 +555,9 @@
<file>android-data/translations/pokerth_sv.qm</file>
<file>android-data/translations/pokerth_ta.qm</file>
<file>android-data/translations/pokerth_tr.qm</file>
<file>android-data/translations/pokerth_vi.qm</file>
<file>android-data/translations/pokerth_zhcn.qm</file>
<file>android-data/misc/third_party_libs.txt</file>
</qresource>
<qresource prefix="/emotes">
<file>emotes/face-angel.png</file>
src/gui/qt/resources/systemsettings.png
Regular → Executable
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

src/gui/qt/startwindow/startwindowimpl.cpp
+3 -2
View File
@@ -97,7 +97,9 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
#ifdef GUI_800x480
#ifdef ANDROID
this->menubar->hide();
this->setMenuBar(0);
// this->menubar->clear();
// this->menubar->hide();
//check if custom background picture for the resolution is there. Otherwise create it!
QString UserDataDir = QString::fromUtf8(myConfig->readConfigString("UserDataDir").c_str());
@@ -655,7 +657,6 @@ void startWindowImpl::showNetworkStartDialog()
myStartNetworkGameDialog->exec();
if (myStartNetworkGameDialog->result() == QDialog::Accepted ) {
this->hide();
//some gui modifications
myGuiInterface->getMyW()->networkGameModification();