From de3cc9d8de48ffef505a53709390bd21d50e7cb3 Mon Sep 17 00:00:00 2001 From: doitux Date: Tue, 25 Dec 2012 01:14:32 +0100 Subject: [PATCH] android gui fix for applysettings when quit settingsdialog --- src/gui/qt/gametable/gametableimpl.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 9fc7c494..6ef1e1ac 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -683,11 +683,13 @@ void gameTableImpl::callSettingsDialog() void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) { +#ifndef GUI_800x480 //currently not for mobile guis because we just use the default style here //apply card deck style myCardDeckStyle->readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentCardDeckStyle").c_str())); checkActionLabelPosition(); //apply game table style myGameTableStyle->readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentGameTableStyle").c_str())); +#endif #ifdef GUI_800x480 //cardschancemonitor show/hide @@ -825,9 +827,10 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) } } } - +#ifndef GUI_800x480 //currently not for mobile guis because we just use the default style here refreshGameTableStyle(); - // qDebug() << "table: " << myGameTableStyle->getStyleDescription() << myGameTableStyle->getState(); +#endif + //qDebug() << "table: " << myGameTableStyle->getStyleDescription() << myGameTableStyle->getState(); if(this->isVisible() && myGameTableStyle->getState() != GT_STYLE_OK) myGameTableStyle->showErrorMessage(); //blind buttons refresh