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

some usability changes for mobile guis, e.g. bigger scrollbars etc. maybe the last ones before a alpha release???!!? ;)

Browse Source
This commit is contained in:
doitux
2012-06-18 00:09:56 +02:00
parent 7bc8c1b9f2
commit bbe9448426
8 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+10
View File
@@ -123,6 +123,14 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
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}");
//make the scrollbars touchable for mobile guis
this->setStyleSheet("QScrollBar:vertical { border: 1px solid grey; background: #f0f0f0; width: 55px; margin: 1px -1px 0px 0px; } QScrollBar::handle:vertical { border-radius: 4px; border: 3px solid grey; background: LightGrey ; min-height: 60px; } QScrollBar::add-line:vertical { background: none; } QScrollBar::sub-line:vertical { background: none; } QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical { background: none; } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
//remove game type in game description field to save space
label_gameType->hide();
label_typeIcon->hide();
label_typeText->hide();
#else
treeView_GameList->setColumnWidth(0,190);
treeView_GameList->setColumnWidth(1,65);
@@ -1355,7 +1363,9 @@ void gameLobbyDialogImpl::showGameDescription(bool show)
{
if(show) {
#ifndef GUI_800x480
label_gameType->show();
#endif
label_gameDesc2->show();
label_gameDesc3->show();
label_gameDesc4->show();
src/gui/qt/gametable/gametableimpl.cpp
+1
View File
@@ -4338,6 +4338,7 @@ void gameTableImpl::hide()
//clear log
#ifdef GUI_800x480
tabs.textBrowser_Log->clear();
tabsDiag->hide();
#else
textBrowser_Log->clear();
#endif
src/gui/qt/gui_800x480/aboutpokerth_800x480.ui
+2 -1
View File
@@ -45,7 +45,7 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">QObject {font-size: 26px; font-color: rgb(0, 0, 0)}</string>
<string notr="true">QObject {font: 26px rgb(0, 0, 0);}</string>
</property>
<property name="currentIndex">
<number>0</number>
@@ -187,6 +187,7 @@ p, li { white-space: pre-wrap; }
&lt;td style=&quot;border: none;&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;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;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;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui
+20 -7
View File
@@ -474,7 +474,7 @@
<item>
<widget class="QTreeWidget" name="treeWidget_connectedPlayers">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -482,7 +482,7 @@
<property name="minimumSize">
<size>
<width>221</width>
<height>0</height>
<height>100</height>
</size>
</property>
<property name="contextMenuPolicy">
@@ -513,7 +513,7 @@
<item>
<widget class="QScrollArea" name="scrollArea_gameInfos">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -521,7 +521,7 @@
<property name="minimumSize">
<size>
<width>252</width>
<height>208</height>
<height>201</height>
</size>
</property>
<property name="styleSheet">
@@ -536,7 +536,7 @@
<x>0</x>
<y>0</y>
<width>292</width>
<height>204</height>
<height>197</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
@@ -781,6 +781,19 @@
</property>
</widget>
</item>
<item row="7" 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>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
@@ -852,7 +865,7 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: 22px}</string>
<string notr="true">QObject {font: 26px}</string>
</property>
<property name="text">
<string>search for player ...</string>
@@ -997,7 +1010,7 @@ p, li { white-space: pre-wrap; }
<item row="1" column="0">
<widget class="QLineEdit" name="lineEdit_ChatInput">
<property name="styleSheet">
<string notr="true">QObject {font: 22px;}</string>
<string notr="true">QObject {font: 26px;}</string>
</property>
</widget>
</item>
src/gui/qt/gui_800x480/tabs_800x480.ui
+1 -1
View File
@@ -157,7 +157,7 @@
<item row="1" column="0">
<widget class="QLineEdit" name="lineEdit_ChatInput">
<property name="styleSheet">
<string notr="true">QObject {font: 20px;}</string>
<string notr="true">QObject {font: 28px;}</string>
</property>
</widget>
</item>
src/gui/qt/resources/pokerth_android.qrc
+1 -1
View File
@@ -540,7 +540,7 @@
<file>android-data/gfx/cards/default_800x480/49.png</file>
<file>android-data/gfx/cards/default_800x480/50.png</file>
<file>android-data/gfx/cards/default_800x480/51.png</file>
<file>android-data/gfx/cards/default_800x480/flipside.png</file>
<file>android-data/gfx/cards/default_800x480/defaultdeckstyle_800x480.xml</file>
<file>android-data/gfx/cards/default_800x480/flipside.png</file>
</qresource>
</RCC>
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+6 -1
View File
@@ -147,6 +147,11 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
connect( pushButton_saveLogAs, SIGNAL(clicked()), this, SLOT (saveLogFileAs()));
connect( treeWidget_logFiles, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), this, SLOT(showLogFilePreview()));
#ifdef GUI_800x480
//make the scrollbar touchable for mobile guis
comboBox_switchLanguage->setStyleSheet("QObject {font: 30px} QScrollBar:vertical { border: 1px solid grey; background: white; width: 60px; margin: 0px -1px 0px 0px; } QScrollBar::handle:vertical { border-radius: 3px; border: 2px solid grey; background: LightGrey ; min-height: 60px; } QScrollBar::add-line:vertical { background: none; } QScrollBar::sub-line:vertical { background: none; } QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical { background: none; } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
#endif
}
settingsDialogImpl::~settingsDialogImpl()
@@ -425,7 +430,7 @@ void settingsDialogImpl::prepareDialog()
tempStringList1 << default4cCardStyle.getStyleDescription() << default4cCardStyle.getStyleMaintainerName();
MyStyleListItem *default4cCardItem = new MyStyleListItem(tempStringList1, treeWidget_cardDeckStyles);
default4cCardItem->setData(0, 15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml");
default4cCardItem->setData(0, 16, POKERTH_DISTRIBUTED_STYLE);
default4cCardItem->setData(0, 16, POKERTH_DISTRIBUTED_STYLE);
default4cCardItem->setData(0, Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml");
}
#endif
src/gui/qt/styles/gametablestylereader.cpp
+17 -3
View File
@@ -1325,20 +1325,34 @@ void GameTableStyleReader::setTableBackground(gameTableImpl *gt)
void GameTableStyleReader::setChatLogStyle(QTextBrowser *tb)
{
#ifdef GUI_800x480
//make the scrollbar touchable for mobile guis
tb->setStyleSheet("QTextBrowser { "+ font1String +" font-size: "+ChatLogTextSize+"px; color: #"+ChatLogTextColor+"; background-color: #"+ChatLogBgColor+"; border:none; } QScrollBar:vertical { border: 1px solid #"+ChatLogScrollBarBorderColor+"; background: #"+ChatLogScrollBarBgColor+"; width: 60px; margin: 0px -1px 0px 0px; } QScrollBar::handle:vertical { border-radius: 4px; border: 3px solid #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; min-height: 60px; } QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical, QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical, QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
#else
tb->setStyleSheet("QTextBrowser { "+ font1String +" font-size: "+ChatLogTextSize+"px; color: #"+ChatLogTextColor+"; background-color: #"+ChatLogBgColor+"; border:none; } QScrollBar:vertical { border: 1px solid #"+ChatLogScrollBarBorderColor+"; background: #"+ChatLogScrollBarBgColor+"; width: 15px; margin: 17px -1px 17px 0px; } QScrollBar::handle:vertical { border-radius: 1px; border: 1px solid #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; min-height: 20px; } QScrollBar::add-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 1px; border-top-left-radius: 1px; border: 1px solid #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; height: 15px; subcontrol-position: bottom; subcontrol-origin: margin; } QScrollBar::sub-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 1px; border-bottom-left-radius: 1px; border-top-right-radius: 2px; border-top-left-radius: 2px; border: 1px solid #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; height: 15px; subcontrol-position: top; subcontrol-origin: margin; } QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical { border: 1px solid #"+ChatLogScrollBarArrowBorderColor+"; height: 3px; width: 3px; background: #"+ChatLogScrollBarArrowBgColor+"; } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
#endif
}
void GameTableStyleReader::setChatLogStyle(QPlainTextEdit* pte)
{
#ifdef GUI_800x480
//make the scrollbar touchable for mobile guis
pte->setStyleSheet("QPlainTextEdit { "+ font1String +" font-size: "+ChatLogTextSize+"px; color: #"+ChatLogTextColor+"; background-color: #"+ChatLogBgColor+"; border:none; } QScrollBar:vertical { border: 1px solid #"+ChatLogScrollBarBorderColor+"; background: #"+ChatLogScrollBarBgColor+"; width: 60px; margin: 0px -1px 0px 0px; } QScrollBar::handle:vertical { border-radius: 4px; border: 3px solid #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; min-height: 60px; } QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical, QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical, QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
#else
pte->setStyleSheet("QPlainTextEdit { "+ font1String +" font-size: "+ChatLogTextSize+"px; color: #"+ChatLogTextColor+"; background-color: #"+ChatLogBgColor+"; border:none; } QScrollBar:vertical { border: 1px solid #"+ChatLogScrollBarBorderColor+"; background: #"+ChatLogScrollBarBgColor+"; width: 15px; margin: 17px -1px 17px 0px; } QScrollBar::handle:vertical { border-radius: 1px; border: 1px solid #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; min-height: 20px; } QScrollBar::add-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 1px; border-top-left-radius: 1px; border: 1px solid #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; height: 15px; subcontrol-position: bottom; subcontrol-origin: margin; } QScrollBar::sub-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 1px; border-bottom-left-radius: 1px; border-top-right-radius: 2px; border-top-left-radius: 2px; border: 1px solid #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; height: 15px; subcontrol-position: top; subcontrol-origin: margin; } QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical { border: 1px solid #"+ChatLogScrollBarArrowBorderColor+"; height: 3px; width: 3px; background: #"+ChatLogScrollBarArrowBgColor+"; } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
#endif
}
void GameTableStyleReader::setChatInputStyle(QLineEdit *ci)
{
ci->setStyleSheet("QLineEdit { "+ font1String +" font-size: "+ChatLogTextSize+"px; color: #"+ChatLogTextColor+"; background-color: #"+ChatLogBgColor+"; border-top: 2px solid #"+TabWidgetBorderColor+"; }");
QString myFontSize;
#ifdef GUI_800x480
myFontSize="28";
#else
myFontSize=ChatLogTextSize;
#endif
ci->setStyleSheet("QLineEdit { "+ font1String +" font-size: "+myFontSize+"px; color: #"+ChatLogTextColor+"; background-color: #"+ChatLogBgColor+"; border-top: 2px solid #"+TabWidgetBorderColor+"; }");
}
void GameTableStyleReader::setCashLabelStyle(QLabel *cl)