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

gui adjustments for new mobile gui card deck

Browse Source
This commit is contained in:
doitux
2012-06-12 23:38:01 +02:00
parent 2eb0c0c19a
commit 5b28aeef89
5 changed files with 84 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gametable/myactionbutton.cpp
+2
View File
@@ -45,7 +45,9 @@ void MyActionButton::paintEvent(QPaintEvent * event)
if(objectName()==("pushButton_AllIn")) { if(objectName()==("pushButton_AllIn")) {
painter.drawText(6,6,15,15,Qt::AlignLeft,fKeyText); painter.drawText(6,6,15,15,Qt::AlignLeft,fKeyText);
} else if(objectName()==("pushButton_showMyCards")) { } else if(objectName()==("pushButton_showMyCards")) {
#ifndef GUI_800x480
painter.drawText(6,6,15,15,Qt::AlignLeft,QString("F5")); painter.drawText(6,6,15,15,Qt::AlignLeft,QString("F5"));
#endif
} else { } else {
painter.drawText(8,15,15,15,Qt::AlignLeft,fKeyText); painter.drawText(8,15,15,15,Qt::AlignLeft,fKeyText);
} }
src/gui/qt/gui_800x480/gametable_800x480.ui
+11 -11
View File
@@ -335,7 +335,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>57</x> <x>57</x>
<y>68</y> <y>78</y>
<width>100</width> <width>100</width>
<height>40</height> <height>40</height>
</rect> </rect>
@@ -683,7 +683,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>57</x> <x>57</x>
<y>56</y> <y>66</y>
<width>100</width> <width>100</width>
<height>40</height> <height>40</height>
</rect> </rect>
@@ -1077,7 +1077,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>57</x> <x>57</x>
<y>68</y> <y>78</y>
<width>100</width> <width>100</width>
<height>40</height> <height>40</height>
</rect> </rect>
@@ -1412,7 +1412,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>57</x> <x>57</x>
<y>68</y> <y>78</y>
<width>100</width> <width>100</width>
<height>40</height> <height>40</height>
</rect> </rect>
@@ -1747,7 +1747,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>57</x> <x>57</x>
<y>68</y> <y>78</y>
<width>100</width> <width>100</width>
<height>40</height> <height>40</height>
</rect> </rect>
@@ -2166,7 +2166,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>57</x> <x>57</x>
<y>68</y> <y>78</y>
<width>100</width> <width>100</width>
<height>40</height> <height>40</height>
</rect> </rect>
@@ -2514,7 +2514,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>57</x> <x>57</x>
<y>56</y> <y>66</y>
<width>100</width> <width>100</width>
<height>40</height> <height>40</height>
</rect> </rect>
@@ -3385,7 +3385,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>57</x> <x>57</x>
<y>56</y> <y>66</y>
<width>100</width> <width>100</width>
<height>40</height> <height>40</height>
</rect> </rect>
@@ -3723,7 +3723,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>57</x> <x>57</x>
<y>56</y> <y>66</y>
<width>100</width> <width>100</width>
<height>40</height> <height>40</height>
</rect> </rect>
@@ -3773,7 +3773,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>58</x> <x>58</x>
<y>47</y> <y>73</y>
<width>100</width> <width>100</width>
<height>60</height> <height>60</height>
</rect> </rect>
@@ -4083,7 +4083,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>57</x> <x>57</x>
<y>56</y> <y>66</y>
<width>100</width> <width>100</width>
<height>40</height> <height>40</height>
</rect> </rect>
src/gui/qt/resources/pokerth_android.qrc
+54 -53
View File
@@ -317,59 +317,6 @@
<file>android-data/gfx/gui/misc/actionpics/action_fold.png</file> <file>android-data/gfx/gui/misc/actionpics/action_fold.png</file>
<file>android-data/gfx/gui/misc/actionpics/action_raise.png</file> <file>android-data/gfx/gui/misc/actionpics/action_raise.png</file>
<file>android-data/gfx/gui/misc/actionpics/action_winner.png</file> <file>android-data/gfx/gui/misc/actionpics/action_winner.png</file>
<file>android-data/gfx/cards/default/0.png</file>
<file>android-data/gfx/cards/default/1.png</file>
<file>android-data/gfx/cards/default/2.png</file>
<file>android-data/gfx/cards/default/3.png</file>
<file>android-data/gfx/cards/default/4.png</file>
<file>android-data/gfx/cards/default/5.png</file>
<file>android-data/gfx/cards/default/6.png</file>
<file>android-data/gfx/cards/default/7.png</file>
<file>android-data/gfx/cards/default/8.png</file>
<file>android-data/gfx/cards/default/9.png</file>
<file>android-data/gfx/cards/default/10.png</file>
<file>android-data/gfx/cards/default/11.png</file>
<file>android-data/gfx/cards/default/12.png</file>
<file>android-data/gfx/cards/default/13.png</file>
<file>android-data/gfx/cards/default/14.png</file>
<file>android-data/gfx/cards/default/15.png</file>
<file>android-data/gfx/cards/default/16.png</file>
<file>android-data/gfx/cards/default/17.png</file>
<file>android-data/gfx/cards/default/18.png</file>
<file>android-data/gfx/cards/default/19.png</file>
<file>android-data/gfx/cards/default/20.png</file>
<file>android-data/gfx/cards/default/21.png</file>
<file>android-data/gfx/cards/default/22.png</file>
<file>android-data/gfx/cards/default/23.png</file>
<file>android-data/gfx/cards/default/24.png</file>
<file>android-data/gfx/cards/default/25.png</file>
<file>android-data/gfx/cards/default/26.png</file>
<file>android-data/gfx/cards/default/27.png</file>
<file>android-data/gfx/cards/default/28.png</file>
<file>android-data/gfx/cards/default/29.png</file>
<file>android-data/gfx/cards/default/30.png</file>
<file>android-data/gfx/cards/default/31.png</file>
<file>android-data/gfx/cards/default/32.png</file>
<file>android-data/gfx/cards/default/33.png</file>
<file>android-data/gfx/cards/default/34.png</file>
<file>android-data/gfx/cards/default/35.png</file>
<file>android-data/gfx/cards/default/36.png</file>
<file>android-data/gfx/cards/default/37.png</file>
<file>android-data/gfx/cards/default/38.png</file>
<file>android-data/gfx/cards/default/39.png</file>
<file>android-data/gfx/cards/default/40.png</file>
<file>android-data/gfx/cards/default/41.png</file>
<file>android-data/gfx/cards/default/42.png</file>
<file>android-data/gfx/cards/default/43.png</file>
<file>android-data/gfx/cards/default/44.png</file>
<file>android-data/gfx/cards/default/45.png</file>
<file>android-data/gfx/cards/default/46.png</file>
<file>android-data/gfx/cards/default/47.png</file>
<file>android-data/gfx/cards/default/48.png</file>
<file>android-data/gfx/cards/default/49.png</file>
<file>android-data/gfx/cards/default/50.png</file>
<file>android-data/gfx/cards/default/51.png</file>
<file>android-data/gfx/cards/default/defaultdeckstyle.xml</file>
<file>android-data/gfx/cards/default/flipside_tux.png</file> <file>android-data/gfx/cards/default/flipside_tux.png</file>
<file>android-data/gfx/cards/default/flipside.png</file> <file>android-data/gfx/cards/default/flipside.png</file>
<file>android-data/gfx/cards/default/preview.png</file> <file>android-data/gfx/cards/default/preview.png</file>
@@ -541,5 +488,59 @@
<file>android-data/gfx/gui/table/default_800x480/playerSeatInactiveTop.png</file> <file>android-data/gfx/gui/table/default_800x480/playerSeatInactiveTop.png</file>
<file>android-data/gfx/gui/table/default_800x480/playerSeatActiveBottom.png</file> <file>android-data/gfx/gui/table/default_800x480/playerSeatActiveBottom.png</file>
<file>android-data/gfx/gui/table/default_800x480/playerSeatActiveTop.png</file> <file>android-data/gfx/gui/table/default_800x480/playerSeatActiveTop.png</file>
<file>android-data/gfx/cards/default_800x480/0.png</file>
<file>android-data/gfx/cards/default_800x480/1.png</file>
<file>android-data/gfx/cards/default_800x480/2.png</file>
<file>android-data/gfx/cards/default_800x480/3.png</file>
<file>android-data/gfx/cards/default_800x480/4.png</file>
<file>android-data/gfx/cards/default_800x480/5.png</file>
<file>android-data/gfx/cards/default_800x480/6.png</file>
<file>android-data/gfx/cards/default_800x480/7.png</file>
<file>android-data/gfx/cards/default_800x480/8.png</file>
<file>android-data/gfx/cards/default_800x480/9.png</file>
<file>android-data/gfx/cards/default_800x480/10.png</file>
<file>android-data/gfx/cards/default_800x480/11.png</file>
<file>android-data/gfx/cards/default_800x480/12.png</file>
<file>android-data/gfx/cards/default_800x480/13.png</file>
<file>android-data/gfx/cards/default_800x480/14.png</file>
<file>android-data/gfx/cards/default_800x480/15.png</file>
<file>android-data/gfx/cards/default_800x480/16.png</file>
<file>android-data/gfx/cards/default_800x480/17.png</file>
<file>android-data/gfx/cards/default_800x480/18.png</file>
<file>android-data/gfx/cards/default_800x480/19.png</file>
<file>android-data/gfx/cards/default_800x480/20.png</file>
<file>android-data/gfx/cards/default_800x480/21.png</file>
<file>android-data/gfx/cards/default_800x480/22.png</file>
<file>android-data/gfx/cards/default_800x480/23.png</file>
<file>android-data/gfx/cards/default_800x480/24.png</file>
<file>android-data/gfx/cards/default_800x480/25.png</file>
<file>android-data/gfx/cards/default_800x480/26.png</file>
<file>android-data/gfx/cards/default_800x480/27.png</file>
<file>android-data/gfx/cards/default_800x480/28.png</file>
<file>android-data/gfx/cards/default_800x480/29.png</file>
<file>android-data/gfx/cards/default_800x480/30.png</file>
<file>android-data/gfx/cards/default_800x480/31.png</file>
<file>android-data/gfx/cards/default_800x480/32.png</file>
<file>android-data/gfx/cards/default_800x480/33.png</file>
<file>android-data/gfx/cards/default_800x480/34.png</file>
<file>android-data/gfx/cards/default_800x480/35.png</file>
<file>android-data/gfx/cards/default_800x480/36.png</file>
<file>android-data/gfx/cards/default_800x480/37.png</file>
<file>android-data/gfx/cards/default_800x480/38.png</file>
<file>android-data/gfx/cards/default_800x480/39.png</file>
<file>android-data/gfx/cards/default_800x480/40.png</file>
<file>android-data/gfx/cards/default_800x480/41.png</file>
<file>android-data/gfx/cards/default_800x480/42.png</file>
<file>android-data/gfx/cards/default_800x480/43.png</file>
<file>android-data/gfx/cards/default_800x480/44.png</file>
<file>android-data/gfx/cards/default_800x480/45.png</file>
<file>android-data/gfx/cards/default_800x480/46.png</file>
<file>android-data/gfx/cards/default_800x480/47.png</file>
<file>android-data/gfx/cards/default_800x480/48.png</file>
<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>
</qresource> </qresource>
</RCC> </RCC>
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+15 -1
View File
@@ -391,6 +391,20 @@ void settingsDialogImpl::prepareDialog()
showCurrentGameTableStylePreview(); showCurrentGameTableStylePreview();
//CARDS //CARDS
#ifdef GUI_800x480
// define PokerTH default GameTableStyle for Maemo
treeWidget_cardDeckStyles->clear();
CardDeckStyleReader defaultCardStyle(myConfig, this);
defaultCardStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default_800x480/defaultdeckstyle_800x480.xml");
if(defaultCardStyle.getLoadedSuccessfull()) {
QStringList tempStringList1;
tempStringList1 << defaultCardStyle.getStyleDescription() << defaultCardStyle.getStyleMaintainerName();
MyStyleListItem *defaultCardItem = new MyStyleListItem(tempStringList1, treeWidget_cardDeckStyles);
defaultCardItem->setData(0, 15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default_800x480/defaultdeckstyle_800x480.xml");
defaultCardItem->setData(0, 16, POKERTH_DISTRIBUTED_STYLE);
defaultCardItem->setData(0, Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default_800x480/defaultdeckstyle_800x480.xml");
}
#else
//define PokerTH default CardDeck //define PokerTH default CardDeck
treeWidget_cardDeckStyles->clear(); treeWidget_cardDeckStyles->clear();
CardDeckStyleReader defaultCardStyle(myConfig, this); CardDeckStyleReader defaultCardStyle(myConfig, this);
@@ -414,7 +428,7 @@ void settingsDialogImpl::prepareDialog()
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"); default4cCardItem->setData(0, Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml");
} }
#endif
//load secondary card styles into list (if fallback no entry) //load secondary card styles into list (if fallback no entry)
myCardDeckStylesList = myConfig->readConfigStringList("CardDeckStylesList"); myCardDeckStylesList = myConfig->readConfigStringList("CardDeckStylesList");
list<std::string>::iterator it2; list<std::string>::iterator it2;
src/gui/qt/styles/carddeckstylereader.cpp
+2 -2
View File
@@ -39,8 +39,8 @@ void CardDeckStyleReader::readStyleFile(QString file)
{ {
#ifdef ANDROID #ifdef ANDROID
//on Android we use just the defaul style packed with the binary via qrc //on Android we use just the defaul style packed with the binary via qrc
currentFileName = ":/android//android-data/gfx/cards/default/defaultdeckstyle.xml"; currentFileName = ":/android/android-data/gfx/cards/default_800x480/defaultdeckstyle_800x480.xml";
currentDir = ":/android/android-data/gfx/cards/default/"; currentDir = ":/android/android-data/gfx/cards/default_800x480/";
#else #else
//if style file failed --> default style fallback //if style file failed --> default style fallback
if(QFile(file).exists()) { if(QFile(file).exists()) {