diff --git a/src/gui/qt/gametable/myactionbutton.cpp b/src/gui/qt/gametable/myactionbutton.cpp index e49dff0b..13704552 100644 --- a/src/gui/qt/gametable/myactionbutton.cpp +++ b/src/gui/qt/gametable/myactionbutton.cpp @@ -45,7 +45,9 @@ void MyActionButton::paintEvent(QPaintEvent * event) if(objectName()==("pushButton_AllIn")) { painter.drawText(6,6,15,15,Qt::AlignLeft,fKeyText); } else if(objectName()==("pushButton_showMyCards")) { +#ifndef GUI_800x480 painter.drawText(6,6,15,15,Qt::AlignLeft,QString("F5")); +#endif } else { painter.drawText(8,15,15,15,Qt::AlignLeft,fKeyText); } diff --git a/src/gui/qt/gui_800x480/gametable_800x480.ui b/src/gui/qt/gui_800x480/gametable_800x480.ui index 15f97600..30834d42 100644 --- a/src/gui/qt/gui_800x480/gametable_800x480.ui +++ b/src/gui/qt/gui_800x480/gametable_800x480.ui @@ -335,7 +335,7 @@ 57 - 68 + 78 100 40 @@ -683,7 +683,7 @@ p, li { white-space: pre-wrap; } 57 - 56 + 66 100 40 @@ -1077,7 +1077,7 @@ p, li { white-space: pre-wrap; } 57 - 68 + 78 100 40 @@ -1412,7 +1412,7 @@ p, li { white-space: pre-wrap; } 57 - 68 + 78 100 40 @@ -1747,7 +1747,7 @@ p, li { white-space: pre-wrap; } 57 - 68 + 78 100 40 @@ -2166,7 +2166,7 @@ p, li { white-space: pre-wrap; } 57 - 68 + 78 100 40 @@ -2514,7 +2514,7 @@ p, li { white-space: pre-wrap; } 57 - 56 + 66 100 40 @@ -3385,7 +3385,7 @@ p, li { white-space: pre-wrap; } 57 - 56 + 66 100 40 @@ -3723,7 +3723,7 @@ p, li { white-space: pre-wrap; } 57 - 56 + 66 100 40 @@ -3773,7 +3773,7 @@ p, li { white-space: pre-wrap; } 58 - 47 + 73 100 60 @@ -4083,7 +4083,7 @@ p, li { white-space: pre-wrap; } 57 - 56 + 66 100 40 diff --git a/src/gui/qt/resources/pokerth_android.qrc b/src/gui/qt/resources/pokerth_android.qrc index 25c2e96c..fd0d781f 100644 --- a/src/gui/qt/resources/pokerth_android.qrc +++ b/src/gui/qt/resources/pokerth_android.qrc @@ -317,59 +317,6 @@ android-data/gfx/gui/misc/actionpics/action_fold.png android-data/gfx/gui/misc/actionpics/action_raise.png android-data/gfx/gui/misc/actionpics/action_winner.png - android-data/gfx/cards/default/0.png - android-data/gfx/cards/default/1.png - android-data/gfx/cards/default/2.png - android-data/gfx/cards/default/3.png - android-data/gfx/cards/default/4.png - android-data/gfx/cards/default/5.png - android-data/gfx/cards/default/6.png - android-data/gfx/cards/default/7.png - android-data/gfx/cards/default/8.png - android-data/gfx/cards/default/9.png - android-data/gfx/cards/default/10.png - android-data/gfx/cards/default/11.png - android-data/gfx/cards/default/12.png - android-data/gfx/cards/default/13.png - android-data/gfx/cards/default/14.png - android-data/gfx/cards/default/15.png - android-data/gfx/cards/default/16.png - android-data/gfx/cards/default/17.png - android-data/gfx/cards/default/18.png - android-data/gfx/cards/default/19.png - android-data/gfx/cards/default/20.png - android-data/gfx/cards/default/21.png - android-data/gfx/cards/default/22.png - android-data/gfx/cards/default/23.png - android-data/gfx/cards/default/24.png - android-data/gfx/cards/default/25.png - android-data/gfx/cards/default/26.png - android-data/gfx/cards/default/27.png - android-data/gfx/cards/default/28.png - android-data/gfx/cards/default/29.png - android-data/gfx/cards/default/30.png - android-data/gfx/cards/default/31.png - android-data/gfx/cards/default/32.png - android-data/gfx/cards/default/33.png - android-data/gfx/cards/default/34.png - android-data/gfx/cards/default/35.png - android-data/gfx/cards/default/36.png - android-data/gfx/cards/default/37.png - android-data/gfx/cards/default/38.png - android-data/gfx/cards/default/39.png - android-data/gfx/cards/default/40.png - android-data/gfx/cards/default/41.png - android-data/gfx/cards/default/42.png - android-data/gfx/cards/default/43.png - android-data/gfx/cards/default/44.png - android-data/gfx/cards/default/45.png - android-data/gfx/cards/default/46.png - android-data/gfx/cards/default/47.png - android-data/gfx/cards/default/48.png - android-data/gfx/cards/default/49.png - android-data/gfx/cards/default/50.png - android-data/gfx/cards/default/51.png - android-data/gfx/cards/default/defaultdeckstyle.xml android-data/gfx/cards/default/flipside_tux.png android-data/gfx/cards/default/flipside.png android-data/gfx/cards/default/preview.png @@ -541,5 +488,59 @@ android-data/gfx/gui/table/default_800x480/playerSeatInactiveTop.png android-data/gfx/gui/table/default_800x480/playerSeatActiveBottom.png android-data/gfx/gui/table/default_800x480/playerSeatActiveTop.png + android-data/gfx/cards/default_800x480/0.png + android-data/gfx/cards/default_800x480/1.png + android-data/gfx/cards/default_800x480/2.png + android-data/gfx/cards/default_800x480/3.png + android-data/gfx/cards/default_800x480/4.png + android-data/gfx/cards/default_800x480/5.png + android-data/gfx/cards/default_800x480/6.png + android-data/gfx/cards/default_800x480/7.png + android-data/gfx/cards/default_800x480/8.png + android-data/gfx/cards/default_800x480/9.png + android-data/gfx/cards/default_800x480/10.png + android-data/gfx/cards/default_800x480/11.png + android-data/gfx/cards/default_800x480/12.png + android-data/gfx/cards/default_800x480/13.png + android-data/gfx/cards/default_800x480/14.png + android-data/gfx/cards/default_800x480/15.png + android-data/gfx/cards/default_800x480/16.png + android-data/gfx/cards/default_800x480/17.png + android-data/gfx/cards/default_800x480/18.png + android-data/gfx/cards/default_800x480/19.png + android-data/gfx/cards/default_800x480/20.png + android-data/gfx/cards/default_800x480/21.png + android-data/gfx/cards/default_800x480/22.png + android-data/gfx/cards/default_800x480/23.png + android-data/gfx/cards/default_800x480/24.png + android-data/gfx/cards/default_800x480/25.png + android-data/gfx/cards/default_800x480/26.png + android-data/gfx/cards/default_800x480/27.png + android-data/gfx/cards/default_800x480/28.png + android-data/gfx/cards/default_800x480/29.png + android-data/gfx/cards/default_800x480/30.png + android-data/gfx/cards/default_800x480/31.png + android-data/gfx/cards/default_800x480/32.png + android-data/gfx/cards/default_800x480/33.png + android-data/gfx/cards/default_800x480/34.png + android-data/gfx/cards/default_800x480/35.png + android-data/gfx/cards/default_800x480/36.png + android-data/gfx/cards/default_800x480/37.png + android-data/gfx/cards/default_800x480/38.png + android-data/gfx/cards/default_800x480/39.png + android-data/gfx/cards/default_800x480/40.png + android-data/gfx/cards/default_800x480/41.png + android-data/gfx/cards/default_800x480/42.png + android-data/gfx/cards/default_800x480/43.png + android-data/gfx/cards/default_800x480/44.png + android-data/gfx/cards/default_800x480/45.png + android-data/gfx/cards/default_800x480/46.png + android-data/gfx/cards/default_800x480/47.png + android-data/gfx/cards/default_800x480/48.png + android-data/gfx/cards/default_800x480/49.png + android-data/gfx/cards/default_800x480/50.png + android-data/gfx/cards/default_800x480/51.png + android-data/gfx/cards/default_800x480/flipside.png + android-data/gfx/cards/default_800x480/defaultdeckstyle_800x480.xml diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index ff112869..9ad1ed17 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -391,6 +391,20 @@ void settingsDialogImpl::prepareDialog() showCurrentGameTableStylePreview(); //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 treeWidget_cardDeckStyles->clear(); CardDeckStyleReader defaultCardStyle(myConfig, this); @@ -414,7 +428,7 @@ void settingsDialogImpl::prepareDialog() 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 //load secondary card styles into list (if fallback no entry) myCardDeckStylesList = myConfig->readConfigStringList("CardDeckStylesList"); list::iterator it2; diff --git a/src/gui/qt/styles/carddeckstylereader.cpp b/src/gui/qt/styles/carddeckstylereader.cpp index 896d47f3..f9c45da1 100644 --- a/src/gui/qt/styles/carddeckstylereader.cpp +++ b/src/gui/qt/styles/carddeckstylereader.cpp @@ -39,8 +39,8 @@ void CardDeckStyleReader::readStyleFile(QString file) { #ifdef ANDROID //on Android we use just the defaul style packed with the binary via qrc - currentFileName = ":/android//android-data/gfx/cards/default/defaultdeckstyle.xml"; - currentDir = ":/android/android-data/gfx/cards/default/"; + currentFileName = ":/android/android-data/gfx/cards/default_800x480/defaultdeckstyle_800x480.xml"; + currentDir = ":/android/android-data/gfx/cards/default_800x480/"; #else //if style file failed --> default style fallback if(QFile(file).exists()) {