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

further android gui enhancements

Browse Source
This commit is contained in:
doitux
2012-05-23 00:16:07 +02:00
parent 694afb6a4f
commit db359fe80b
8 changed files with 387 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+28 -4
View File
@@ -114,16 +114,22 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P"); headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P");
myGameListModel->setHorizontalHeaderLabels(headerList); myGameListModel->setHorizontalHeaderLabels(headerList);
#ifdef GUI_800x480
treeView_GameList->setColumnWidth(0,220);
treeView_GameList->setColumnWidth(1,65);
treeView_GameList->setColumnWidth(2,90);
treeView_GameList->setColumnWidth(3,30);
treeView_GameList->setColumnWidth(4,30);
treeView_GameList->setStyleSheet("QTreeView {background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 22px}");
treeView_GameList->header()->setStyleSheet("QObject {font: bold 18px}");
#else
treeView_GameList->setColumnWidth(0,190); treeView_GameList->setColumnWidth(0,190);
treeView_GameList->setColumnWidth(1,65); treeView_GameList->setColumnWidth(1,65);
treeView_GameList->setColumnWidth(2,65); treeView_GameList->setColumnWidth(2,65);
treeView_GameList->setColumnWidth(3,40); treeView_GameList->setColumnWidth(3,40);
treeView_GameList->setColumnWidth(4,40); treeView_GameList->setColumnWidth(4,40);
#ifdef GUI_800x480
treeView_GameList->setStyleSheet("QTreeView {background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 20px}");
treeView_GameList->header()->setStyleSheet("QObject {font: bold 18px}");
#else
treeView_GameList->setStyleSheet("QTreeView {background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat;}"); treeView_GameList->setStyleSheet("QTreeView {background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat;}");
#endif #endif
treeView_GameList->setAutoFillBackground(TRUE); treeView_GameList->setAutoFillBackground(TRUE);
@@ -404,11 +410,20 @@ void gameLobbyDialogImpl::refresh(int actionID)
QStringList headerList; QStringList headerList;
headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P"); headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P");
myGameListModel->setHorizontalHeaderLabels(headerList); myGameListModel->setHorizontalHeaderLabels(headerList);
#ifdef GUI_800x480
treeView_GameList->setColumnWidth(0,220);
treeView_GameList->setColumnWidth(1,65);
treeView_GameList->setColumnWidth(2,90);
treeView_GameList->setColumnWidth(3,30);
treeView_GameList->setColumnWidth(4,30);
#else
treeView_GameList->setColumnWidth(0,190); treeView_GameList->setColumnWidth(0,190);
treeView_GameList->setColumnWidth(1,65); treeView_GameList->setColumnWidth(1,65);
treeView_GameList->setColumnWidth(2,65); treeView_GameList->setColumnWidth(2,65);
treeView_GameList->setColumnWidth(3,40); treeView_GameList->setColumnWidth(3,40);
treeView_GameList->setColumnWidth(4,40); treeView_GameList->setColumnWidth(4,40);
#endif
QStringList headerList2; QStringList headerList2;
headerList2 << tr("Available Players"); headerList2 << tr("Available Players");
@@ -797,11 +812,20 @@ void gameLobbyDialogImpl::clearDialog()
QStringList headerList; QStringList headerList;
headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P"); headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P");
myGameListModel->setHorizontalHeaderLabels(headerList); myGameListModel->setHorizontalHeaderLabels(headerList);
#ifdef GUI_800x480
treeView_GameList->setColumnWidth(0,220);
treeView_GameList->setColumnWidth(1,65);
treeView_GameList->setColumnWidth(2,90);
treeView_GameList->setColumnWidth(3,30);
treeView_GameList->setColumnWidth(4,30);
#else
treeView_GameList->setColumnWidth(0,190); treeView_GameList->setColumnWidth(0,190);
treeView_GameList->setColumnWidth(1,65); treeView_GameList->setColumnWidth(1,65);
treeView_GameList->setColumnWidth(2,65); treeView_GameList->setColumnWidth(2,65);
treeView_GameList->setColumnWidth(3,40); treeView_GameList->setColumnWidth(3,40);
treeView_GameList->setColumnWidth(4,40); treeView_GameList->setColumnWidth(4,40);
#endif
pushButton_CreateGame->clearFocus(); pushButton_CreateGame->clearFocus();
lineEdit_ChatInput->setFocus(); lineEdit_ChatInput->setFocus();
src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui
+2 -8
View File
@@ -7,19 +7,13 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>400</height> <height>424</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>800</width> <width>800</width>
<height>400</height> <height>424</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>800</width>
<height>400</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui
+18 -6
View File
@@ -473,6 +473,12 @@
</property> </property>
<item> <item>
<widget class="QTreeWidget" name="treeWidget_connectedPlayers"> <widget class="QTreeWidget" name="treeWidget_connectedPlayers">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>221</width> <width>221</width>
@@ -506,10 +512,16 @@
</item> </item>
<item> <item>
<widget class="QScrollArea" name="scrollArea_gameInfos"> <widget class="QScrollArea" name="scrollArea_gameInfos">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>252</width> <width>252</width>
<height>210</height> <height>208</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@@ -524,7 +536,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>292</width> <width>292</width>
<height>206</height> <height>204</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
@@ -840,7 +852,7 @@
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QObject {font: 14 px}</string> <string notr="true">QObject {font: 22px}</string>
</property> </property>
<property name="text"> <property name="text">
<string>search for player ...</string> <string>search for player ...</string>
@@ -871,7 +883,7 @@
<enum>Qt::CustomContextMenu</enum> <enum>Qt::CustomContextMenu</enum>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QObject {font: 14 px}</string> <string notr="true">QObject {font: 16px;}</string>
</property> </property>
<property name="editTriggers"> <property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set> <set>QAbstractItemView::NoEditTriggers</set>
@@ -971,7 +983,7 @@
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QObject {font: 14px}</string> <string notr="true">QObject {font: 18px;}</string>
</property> </property>
<property name="html"> <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; <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;
@@ -985,7 +997,7 @@ p, li { white-space: pre-wrap; }
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLineEdit" name="lineEdit_ChatInput"> <widget class="QLineEdit" name="lineEdit_ChatInput">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QObject {font: 14 px}</string> <string notr="true">QObject {font: 22px;}</string>
</property> </property>
</widget> </widget>
</item> </item>
src/gui/qt/gui_800x480/newgamedialog_800x480.ui
+110 -10
View File
@@ -29,10 +29,59 @@
<string notr="true">QObject {font: 26px}</string> <string notr="true">QObject {font: 26px}</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="margin"> <property name="spacing">
<number>30</number> <number>16</number>
</property> </property>
<item> <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_4">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>54</width>
<height>297</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>500</width>
<height>300</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
@@ -65,7 +114,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
@@ -101,7 +150,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="2" column="0">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Blinds</string> <string>Blinds</string>
@@ -139,7 +188,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
@@ -166,15 +215,35 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>0</width>
<height>40</height> <height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@@ -182,7 +251,7 @@
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QObject {font: 30px}</string> <string notr="true">QObject {font: bold 30px}</string>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@@ -192,6 +261,37 @@
</property> </property>
</widget> </widget>
</item> </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>100</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>497</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
src/gui/qt/gui_800x480/settingsdialog_800x480.ui
+60 -6
View File
@@ -23,7 +23,13 @@
<string notr="true">QObject {font: 18px}</string> <string notr="true">QObject {font: 18px}</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <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> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@@ -1328,7 +1334,19 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
<widget class="QWidget" name="page_4"> <widget class="QWidget" name="page_4">
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<property name="margin"> <property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number> <number>4</number>
</property> </property>
<item> <item>
@@ -3668,7 +3686,14 @@ p, li { white-space: pre-wrap; }
</sizepolicy> </sizepolicy>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QObject {color: rgb(255, 255, 255);}</string> <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:'Nimbus Sans L'; 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;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -3851,13 +3876,24 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="Line" name="line"> <layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> <property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item> </item>
<item row="2" column="0"> <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>
@@ -3870,6 +3906,24 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
src/gui/qt/gui_800x480/tabs_800x480.ui
+5 -1
View File
@@ -155,7 +155,11 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLineEdit" name="lineEdit_ChatInput"/> <widget class="QLineEdit" name="lineEdit_ChatInput">
<property name="styleSheet">
<string notr="true">QObject {font: 20px;}</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
src/gui/qt/styles/gametablestylereader.cpp
+3 -3
View File
@@ -1364,7 +1364,7 @@ void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)
// default // default
case 0: case 0:
#ifdef GUI_800x480 #ifdef GUI_800x480
bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+"; font-size: 20px} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900; font-size: 20px}"); bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+"; font-size: 26px} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900; font-size: 26px}");
#else #else
bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+";} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900;}"); bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+";} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900;}");
#endif #endif
@@ -1372,7 +1372,7 @@ void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)
// blink // blink
case 1: case 1:
#ifdef GUI_800x480 #ifdef GUI_800x480
bb->setStyleSheet("QPushButton { background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+"; font-size: 20px}"); bb->setStyleSheet("QPushButton { background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+"; font-size: 26px}");
#else #else
bb->setStyleSheet("QPushButton { background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+";}"); bb->setStyleSheet("QPushButton { background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+";}");
#endif #endif
@@ -1383,7 +1383,7 @@ void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)
void GameTableStyleReader::setSpeedStringStyle(QLabel *l) void GameTableStyleReader::setSpeedStringStyle(QLabel *l)
{ {
#ifdef GUI_800x480 #ifdef GUI_800x480
l->setStyleSheet("QLabel { color: #"+SpeedTextColor+"; font-size: 20px}"); l->setStyleSheet("QLabel { color: #"+SpeedTextColor+"; font-size: 24px}");
#else #else
l->setStyleSheet("QLabel { color: #"+SpeedTextColor+";}"); l->setStyleSheet("QLabel { color: #"+SpeedTextColor+";}");
#endif #endif