From 97246d347e21a9bd3aa729a9a0b5f1f52d02547e Mon Sep 17 00:00:00 2001 From: doitux Date: Thu, 21 May 2009 22:40:16 +0000 Subject: [PATCH] auto activate new styles after adding; new toolbox background for better readable speed string --- data/gfx/gui/table/danuxi1/toolboxbg.png | Bin 685 -> 724 bytes data/gfx/gui/table/default/toolboxbg.png | Bin 685 -> 724 bytes src/gui/qt/gametable/gametableimpl.cpp | 2 +- .../qt/settingsdialog/settingsdialogimpl.cpp | 52 ++++++++++-------- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/data/gfx/gui/table/danuxi1/toolboxbg.png b/data/gfx/gui/table/danuxi1/toolboxbg.png index 4ea75de80c7629338394b1f845127b4b72d3962c..ee75e0ed0355bddd944e35d3ef57de61763b7b1d 100644 GIT binary patch delta 237 zcmVj5)TZ=PUv8fXe?_hNklz$529Ir0}@W@hTwTAiw6z$mWOR^6(m{qUhW+XjYpsb1&( zW*`PIwsW;E)pK>Q2MlkT^Jf5jdz@_m?Cu2t_#u;V0Wgz50T7Y#E|ZV}5d#2%0FxmB zfRi2pfl>g100;sg2!J2}f&d5tAPB(!d@R*nb+82t?`5twI{?+TRG-y*^<)ni)}?xz n{v52;sXE#QhH>3r3Ad^*JAx7A;#UMh00000NkvXXu0mjfrz2ok literal 685 zcmeAS@N?(olHy`uVBq!ia0y~yU}OQZ_i?ZR$;*0$Yk?GFage(c!@6@aFM%AkByV>Y zhW{YAVDIwDKoQOYkH}&M25w;xW@MN(M*=9wUgGKN%6^kso`*ro$^DiCP)N4KHKN2h zKQ}iuuY|$5C^fMpHASI3vm`?yBqLS9-P1SVeTr%x0|OI_r;B4q#jUs347m;kh`1h{ zEWc5p@c(a-z(V##kgCfl!yUDg0=I|K|0xS*!42}#ejN~yW(hRneT$^F; zJ;;JJ6zX{oC9*BBx+dAWTKB=1Z(FOvy-R0`Tii?!czg9TH_JMn=2*o(Envc7@O1Ta JS?83{1OWC6iemr( diff --git a/data/gfx/gui/table/default/toolboxbg.png b/data/gfx/gui/table/default/toolboxbg.png index 4ea75de80c7629338394b1f845127b4b72d3962c..0bd5df1c8798fedc1d2d2cd0b1e879510f1697e1 100644 GIT binary patch delta 237 zcmVj5(OL}77&h+Xe?_hNklz$529Ir0}@W@hTwTAiw6z$mWOR^6(m{qUhW+XjYpsb1&( zW*`PIwsW;E)pK>Q2MlkT^Jf5jdz@_m?Cu2t_#u;V0Wgz50T7Y#E|ZV}5d#2%0FxmB zfRi2pfl>g100;sg2!J2}f&d5tAPB(!d@R*nb+82t?`5twI{?+TRG-y*^<)ni)}?xz n{v52;sXE#QhH>3r3Ad^*JAx7A;#UMh00000NkvXXu0mjfR7+mf literal 685 zcmeAS@N?(olHy`uVBq!ia0y~yU}OQZ_i?ZR$;*0$Yk?GFage(c!@6@aFM%AkByV>Y zhW{YAVDIwDKoQOYkH}&M25w;xW@MN(M*=9wUgGKN%6^kso`*ro$^DiCP)N4KHKN2h zKQ}iuuY|$5C^fMpHASI3vm`?yBqLS9-P1SVeTr%x0|OI_r;B4q#jUs347m;kh`1h{ zEWc5p@c(a-z(V##kgCfl!yUDg0=I|K|0xS*!42}#ejN~yW(hRneT$^F; zJ;;JJ6zX{oC9*BBx+dAWTKB=1Z(FOvy-R0`Tii?!czg9TH_JMn=2*o(Envc7@O1Ta JS?83{1OWC6iemr( diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 21ed4d75..66c34040 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -659,7 +659,7 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) { //blind buttons refresh if(myStartWindow->getSession()->getCurrentGame()) { refreshButton(); - refreshGroupbox(); + refreshGroupbox(); provideMyActions(); } diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 1d77842b..5560aae5 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -944,18 +944,18 @@ void settingsDialogImpl::setSelectedGameTableStyleActivated() void settingsDialogImpl::addGameTableStyle() { - QDir dir(QString::fromUtf8(myConfig->readConfigString("LastGameTableStyleDir").c_str())); - QString dirString; - - if(dir.exists()) dirString = dir.absolutePath(); - else dirString = QDir::home().absolutePath(); - + QDir dir(QString::fromUtf8(myConfig->readConfigString("LastGameTableStyleDir").c_str())); + QString dirString; + + if(dir.exists()) dirString = dir.absolutePath(); + else dirString = QDir::home().absolutePath(); + QString fileName = QFileDialog::getOpenFileName(this, tr("Please select your game table style"), - dirString, - tr("PokerTH game table styles (*.xml)")); - - if (!fileName.isEmpty()) { - + dirString, + tr("PokerTH game table styles (*.xml)")); + + if (!fileName.isEmpty()) { + int i; bool fileNameAlreadyFound(FALSE); for(i=0; i < listWidget_gameTableStyles->count(); i++) { @@ -963,29 +963,31 @@ void settingsDialogImpl::addGameTableStyle() if(item->data(15).toString() == fileName) fileNameAlreadyFound = TRUE; } - + if(fileNameAlreadyFound) { QMessageBox::warning(this, tr("Game Table Style Error"), tr("Selected game table style file is already in the list. \nPlease select another one to add!"), QMessageBox::Ok); } else { - GameTableStyleReader newStyle(myConfig, this); + GameTableStyleReader newStyle(myConfig, this); newStyle.readStyleFile(fileName); - if(!newStyle.getFallBack() && newStyle.getLoadedSuccessfull()) { + if(!newStyle.getFallBack() && newStyle.getLoadedSuccessfull()) { QListWidgetItem *newItem = new QListWidgetItem(newStyle.getStyleDescription()); newItem->setData(15,fileName); newItem->setData(Qt::ToolTipRole,fileName); listWidget_gameTableStyles->addItem(newItem); + listWidget_gameTableStyles->setCurrentItem(newItem); + pushButton_activateGameTableStyle->click(); } else { QMessageBox::warning(this, tr("Game Table Style File Error"), - tr("Could not load game table style file correctly. \nStyle will not be placed into list!"), + tr("Could not load game table style file correctly. \nStyle will not be placed into list!"), QMessageBox::Ok); } } - //save current filepath - myConfig->writeConfigString("LastGameTableStyleDir",QFileInfo(fileName).absolutePath().toUtf8().constData()); + //save current filepath + myConfig->writeConfigString("LastGameTableStyleDir",QFileInfo(fileName).absolutePath().toUtf8().constData()); } } @@ -1047,17 +1049,17 @@ void settingsDialogImpl::setSelectedCardDeckStyleActivated() void settingsDialogImpl::addCardDeckStyle() { - QDir dir(QString::fromUtf8(myConfig->readConfigString("LastCardDeckStyleDir").c_str())); - QString dirString; + QDir dir(QString::fromUtf8(myConfig->readConfigString("LastCardDeckStyleDir").c_str())); + QString dirString; - if(dir.exists()) dirString = dir.absolutePath(); - else dirString = QDir::home().absolutePath(); + if(dir.exists()) dirString = dir.absolutePath(); + else dirString = QDir::home().absolutePath(); QString fileName = QFileDialog::getOpenFileName(this, tr("Please select your card deck style"), dirString, tr("PokerTH card deck styles (*.xml)")); - if (!fileName.isEmpty()) { + if (!fileName.isEmpty()) { int i; bool fileNameAlreadyFound(FALSE); @@ -1073,13 +1075,15 @@ void settingsDialogImpl::addCardDeckStyle() QMessageBox::Ok); } else { - CardDeckStyleReader newStyle(myConfig, this); + CardDeckStyleReader newStyle(myConfig, this); newStyle.readStyleFile(fileName); - if(!newStyle.getFallBack() && newStyle.getLoadedSuccessfull()) { + if(!newStyle.getFallBack() && newStyle.getLoadedSuccessfull()) { QListWidgetItem *newItem = new QListWidgetItem(newStyle.getStyleDescription()); newItem->setData(15,fileName); newItem->setData(Qt::ToolTipRole,fileName); listWidget_cardDeckStyles->addItem(newItem); + listWidget_cardDeckStyles->setCurrentItem(newItem); + pushButton_activateCardDeckStyle->click(); } else { QMessageBox::warning(this, tr("Card Deck Style File Error"),