start skinning implementation (config not ready!!!)
This commit is contained in:
@@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<PokerTH>
|
||||||
|
<CardDeck>
|
||||||
|
<StyleDescription value="default card deck" />
|
||||||
|
<PreviewPicture value="preview.png" />
|
||||||
|
</CardDeck>
|
||||||
|
</PokerTH>
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<PokerTH>
|
||||||
|
<TableStyle>
|
||||||
|
<StyleDescription value="default table style" />
|
||||||
|
<IfFixedWindowSize value="0" />
|
||||||
|
<FixedWindowWidth value="1024" />
|
||||||
|
<FixedWindowHeight value="600" />
|
||||||
|
<MinimumWindowWidth value="1024" />
|
||||||
|
<MinimumWindowHeight value="600" />
|
||||||
|
<MaximumWindowWidth value="1980" />
|
||||||
|
<MaximumWindowHeight value="1200" />
|
||||||
|
<ActionAllIn value="action_allin.png" />
|
||||||
|
<ActionRaise value="action_raise.png" />
|
||||||
|
<ActionBet value="action_bet.png" />
|
||||||
|
<ActionCall value="action_call.png" />
|
||||||
|
<ActionCheck value="action_check.png" />
|
||||||
|
<ActionFold value="action_fold.png" />
|
||||||
|
<ActionSet value="action_set.png" />
|
||||||
|
<ActionWinner value="action_winner.png" />
|
||||||
|
<BigBlindPuck value="bigblindPuck.png" />
|
||||||
|
<SmallBlindPuck value="smallblindPuck.png" />
|
||||||
|
<DealerPuck value="dealerPuck.png" />
|
||||||
|
<DefaultAvatar value="genereticAvatar.png" />
|
||||||
|
<CardHolderFlop value="cardholder_flop.png" />
|
||||||
|
<CardHolderTurn value="cardholder_turn.png" />
|
||||||
|
<CardHolderRiver value="cardholder_river.png" />
|
||||||
|
<FoldButtonDefault value="playeraction_red.png" />
|
||||||
|
<FoldButtonHover value="playeraction_red_hover.png" />
|
||||||
|
<FoldButtonChecked value="playeraction_red_checked.png" />
|
||||||
|
<FoldButtonCheckedHover value="playeraction_red_checked_hover.png" />
|
||||||
|
<CheckCallButtonDefault value="playeraction_blue.png" />
|
||||||
|
<CheckCallButtonHover value="playeraction_blue_hover.png" />
|
||||||
|
<CheckCallButtonChecked value="playeraction_blue_checked.png" />
|
||||||
|
<CheckCallButtonCheckedHover value="playeraction_blue_checked_hover.png" />
|
||||||
|
<BetRaiseButtonDefault value="playeraction_green.png" />
|
||||||
|
<BetRaiseButtonHover value="playeraction_green_hover.png" />
|
||||||
|
<BetRaiseButtonChecked value="playeraction_green_checked.png" />
|
||||||
|
<BetRaiseButtonCheckedHover value="playeraction_green_checked_hover.png" />
|
||||||
|
<AllInButtonDefault value="playeraction_orange.png" />
|
||||||
|
<AllInButtonHover value="playeraction_organge_hover.png" />
|
||||||
|
<AllInButtonChecked value="playeraction_orange_checked.png" />
|
||||||
|
<AllInButtonCheckedHover value="playeraction_orange_checked_hover.png" />
|
||||||
|
<PlayerSeatInActive value="playerSeatInactive.png" />
|
||||||
|
<PlayerSeatActive value="playerSeatActive.png" />
|
||||||
|
<Table value="table.png" />
|
||||||
|
</TableStyle>
|
||||||
|
</PokerTH>
|
||||||
@@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
|
|||||||
myQtToolsInterface = CreateQtToolsWrapper();
|
myQtToolsInterface = CreateQtToolsWrapper();
|
||||||
|
|
||||||
// !!!! Revisionsnummer der Configdefaults !!!!!
|
// !!!! Revisionsnummer der Configdefaults !!!!!
|
||||||
configRev = 60;
|
configRev = 61;
|
||||||
|
|
||||||
//standard defaults
|
//standard defaults
|
||||||
logOnOffDefault = "1";
|
logOnOffDefault = "1";
|
||||||
@@ -102,7 +102,12 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
|
|||||||
mkdir(dataDir.c_str());
|
mkdir(dataDir.c_str());
|
||||||
mkdir(cacheDir.c_str());
|
mkdir(cacheDir.c_str());
|
||||||
|
|
||||||
|
////define GameTableStyle
|
||||||
|
defaultGameTableStyle = myQtToolsInterface->getDataPathStdString(myArgv0)+"gfx\\gui\\table\\default\\defaulttablestyle.xml";
|
||||||
|
gameTableStyleList.push_back(defaultGameTableStyle);
|
||||||
|
////define CardDeck
|
||||||
|
defaultCardDeck = myQtToolsInterface->getDataPathStdString(myArgv0)+"gfx\\cards\\default\\defaultcarddeck.xml";
|
||||||
|
cardDeckList.push_back(defaultCardDeck);
|
||||||
#else
|
#else
|
||||||
//define app-dir
|
//define app-dir
|
||||||
const char *homePath = getenv("HOME");
|
const char *homePath = getenv("HOME");
|
||||||
@@ -125,6 +130,12 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
|
|||||||
mkdir(cacheDir.c_str(), MODUS);
|
mkdir(cacheDir.c_str(), MODUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
////define GameTableStyle
|
||||||
|
defaultGameTableStyle = myQtToolsInterface->getDataPathStdString(myArgv0)+"gfx/gui/table/default/defaulttablestyle.xml";
|
||||||
|
gameTableStyleList.push_back(defaultGameTableStyle);
|
||||||
|
////define CardDeck
|
||||||
|
defaultCardDeck = myQtToolsInterface->getDataPathStdString(myArgv0)+"gfx/cards/default/defaultcarddeck.xml";
|
||||||
|
cardDeckList.push_back(defaultCardDeck);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ostringstream tempIntToString;
|
ostringstream tempIntToString;
|
||||||
@@ -147,6 +158,10 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
|
|||||||
configList.push_back(ConfigInfo("FlipsideTux", CONFIG_TYPE_INT, "1"));
|
configList.push_back(ConfigInfo("FlipsideTux", CONFIG_TYPE_INT, "1"));
|
||||||
configList.push_back(ConfigInfo("FlipsideOwn", CONFIG_TYPE_INT, "0"));
|
configList.push_back(ConfigInfo("FlipsideOwn", CONFIG_TYPE_INT, "0"));
|
||||||
configList.push_back(ConfigInfo("FlipsideOwnFile", CONFIG_TYPE_STRING, ""));
|
configList.push_back(ConfigInfo("FlipsideOwnFile", CONFIG_TYPE_STRING, ""));
|
||||||
|
configList.push_back(ConfigInfo("GameTableStylesList", CONFIG_TYPE_STRING_LIST, "GameTableStyles", gameTableStyleList));
|
||||||
|
configList.push_back(ConfigInfo("CurrentGameTableStyle", CONFIG_TYPE_STRING, defaultGameTableStyle));
|
||||||
|
configList.push_back(ConfigInfo("CardDecksList", CONFIG_TYPE_STRING_LIST, "CardDecks", cardDeckList));
|
||||||
|
configList.push_back(ConfigInfo("CurrentCardDeck", CONFIG_TYPE_STRING, defaultCardDeck));
|
||||||
configList.push_back(ConfigInfo("PlaySoundEffects", CONFIG_TYPE_INT, "1"));
|
configList.push_back(ConfigInfo("PlaySoundEffects", CONFIG_TYPE_INT, "1"));
|
||||||
configList.push_back(ConfigInfo("SoundVolume", CONFIG_TYPE_INT, "8"));
|
configList.push_back(ConfigInfo("SoundVolume", CONFIG_TYPE_INT, "8"));
|
||||||
configList.push_back(ConfigInfo("PlayGameActions", CONFIG_TYPE_INT, "1"));
|
configList.push_back(ConfigInfo("PlayGameActions", CONFIG_TYPE_INT, "1"));
|
||||||
@@ -370,7 +385,7 @@ void ConfigFile::writeBuffer() const {
|
|||||||
config->LinkEndChild( tmpElement );
|
config->LinkEndChild( tmpElement );
|
||||||
tmpElement->SetAttribute("value", configBufferList[i].defaultValue);
|
tmpElement->SetAttribute("value", configBufferList[i].defaultValue);
|
||||||
|
|
||||||
if(configBufferList[i].type == CONFIG_TYPE_INT_LIST) {
|
if(configBufferList[i].type == CONFIG_TYPE_INT_LIST || configBufferList[i].type == CONFIG_TYPE_STRING_LIST) {
|
||||||
|
|
||||||
tmpElement->SetAttribute("type", "list");
|
tmpElement->SetAttribute("type", "list");
|
||||||
list<string> tempList = configBufferList[i].defaultListValue;
|
list<string> tempList = configBufferList[i].defaultListValue;
|
||||||
@@ -414,7 +429,7 @@ void ConfigFile::updateConfig(ConfigState myConfigState) {
|
|||||||
config->LinkEndChild( tmpElement );
|
config->LinkEndChild( tmpElement );
|
||||||
tmpElement->SetAttribute("value", myQtToolsInterface->stringToUtf8(configList[i].defaultValue));
|
tmpElement->SetAttribute("value", myQtToolsInterface->stringToUtf8(configList[i].defaultValue));
|
||||||
|
|
||||||
if(configList[i].type == CONFIG_TYPE_INT_LIST) {
|
if(configList[i].type == CONFIG_TYPE_INT_LIST || configBufferList[i].type == CONFIG_TYPE_STRING_LIST) {
|
||||||
|
|
||||||
tmpElement->SetAttribute("type", "list");
|
tmpElement->SetAttribute("type", "list");
|
||||||
list<string> tempList = configList[i].defaultListValue;
|
list<string> tempList = configList[i].defaultListValue;
|
||||||
@@ -520,7 +535,7 @@ void ConfigFile::updateConfig(ConfigState myConfigState) {
|
|||||||
config->LinkEndChild( tmpElement );
|
config->LinkEndChild( tmpElement );
|
||||||
tmpElement->SetAttribute("value", myQtToolsInterface->stringToUtf8(configList[i].defaultValue));
|
tmpElement->SetAttribute("value", myQtToolsInterface->stringToUtf8(configList[i].defaultValue));
|
||||||
|
|
||||||
if(configList[i].type == CONFIG_TYPE_INT_LIST) {
|
if(configList[i].type == CONFIG_TYPE_INT_LIST || configBufferList[i].type == CONFIG_TYPE_STRING_LIST) {
|
||||||
|
|
||||||
tmpElement->SetAttribute("type", "list");
|
tmpElement->SetAttribute("type", "list");
|
||||||
list<string> tempList = configList[i].defaultListValue;
|
list<string> tempList = configList[i].defaultListValue;
|
||||||
@@ -612,6 +627,22 @@ list<int> ConfigFile::readConfigIntList(string varName) const
|
|||||||
return tempIntList;
|
return tempIntList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
list<string> ConfigFile::readConfigStringList(string varName) const
|
||||||
|
{
|
||||||
|
boost::recursive_mutex::scoped_lock lock(m_configMutex);
|
||||||
|
|
||||||
|
size_t i;
|
||||||
|
list<string> tempStringList;
|
||||||
|
|
||||||
|
for (i=0; i<configBufferList.size(); i++) {
|
||||||
|
|
||||||
|
if (configBufferList[i].name == varName) {
|
||||||
|
tempStringList = configBufferList[i].defaultListValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return tempStringList;
|
||||||
|
}
|
||||||
|
|
||||||
void ConfigFile::writeConfigInt(string varName, int varCont)
|
void ConfigFile::writeConfigInt(string varName, int varCont)
|
||||||
{
|
{
|
||||||
@@ -630,7 +661,6 @@ void ConfigFile::writeConfigInt(string varName, int varCont)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ConfigFile::writeConfigIntList(string varName, list<int> varCont)
|
void ConfigFile::writeConfigIntList(string varName, list<int> varCont)
|
||||||
{
|
{
|
||||||
boost::recursive_mutex::scoped_lock lock(m_configMutex);
|
boost::recursive_mutex::scoped_lock lock(m_configMutex);
|
||||||
@@ -657,7 +687,6 @@ void ConfigFile::writeConfigIntList(string varName, list<int> varCont)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ConfigFile::writeConfigString(string varName, string varCont)
|
void ConfigFile::writeConfigString(string varName, string varCont)
|
||||||
{
|
{
|
||||||
boost::recursive_mutex::scoped_lock lock(m_configMutex);
|
boost::recursive_mutex::scoped_lock lock(m_configMutex);
|
||||||
@@ -668,3 +697,14 @@ void ConfigFile::writeConfigString(string varName, string varCont)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ConfigFile::writeConfigStringList(string varName, list<string> varCont)
|
||||||
|
{
|
||||||
|
boost::recursive_mutex::scoped_lock lock(m_configMutex);
|
||||||
|
|
||||||
|
size_t i;
|
||||||
|
for (i=0; i<configBufferList.size(); i++) {
|
||||||
|
|
||||||
|
if (configBufferList[i].name == varName) { configBufferList[i].defaultListValue = varCont; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
#include <boost/thread.hpp>
|
#include <boost/thread.hpp>
|
||||||
|
|
||||||
enum ConfigState { NONEXISTING, OLD };
|
enum ConfigState { NONEXISTING, OLD };
|
||||||
enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING, CONFIG_TYPE_INT_LIST };
|
enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING, CONFIG_TYPE_INT_LIST, CONFIG_TYPE_STRING_LIST };
|
||||||
|
|
||||||
class QtToolsInterface;
|
class QtToolsInterface;
|
||||||
|
|
||||||
@@ -42,13 +42,15 @@ public:
|
|||||||
void updateConfig(ConfigState);
|
void updateConfig(ConfigState);
|
||||||
|
|
||||||
std::string readConfigString(std::string varName) const;
|
std::string readConfigString(std::string varName) const;
|
||||||
|
std::list<std::string> readConfigStringList(std::string varName) const;
|
||||||
void writeConfigString(std::string varName, std::string varCont);
|
void writeConfigString(std::string varName, std::string varCont);
|
||||||
|
void writeConfigStringList(std::string varName, std::list<std::string> varCont);
|
||||||
int readConfigInt(std::string varName) const;
|
int readConfigInt(std::string varName) const;
|
||||||
std::list<int> readConfigIntList(std::string varName) const;
|
std::list<int> readConfigIntList(std::string varName) const;
|
||||||
void writeConfigInt(std::string varName, int varCont);
|
void writeConfigInt(std::string varName, int varCont);
|
||||||
void writeConfigIntList(std::string varName, std::list<int> varCont);
|
void writeConfigIntList(std::string varName, std::list<int> varCont);
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
mutable boost::recursive_mutex m_configMutex;
|
mutable boost::recursive_mutex m_configMutex;
|
||||||
@@ -70,6 +72,11 @@ private:
|
|||||||
std::string logDir;
|
std::string logDir;
|
||||||
std::string dataDir;
|
std::string dataDir;
|
||||||
std::string cacheDir;
|
std::string cacheDir;
|
||||||
|
std::string defaultGameTableStyle;
|
||||||
|
std::string defaultCardDeck;
|
||||||
|
std::list<std::string> gameTableStyleList;
|
||||||
|
std::list<std::string> cardDeckList;
|
||||||
|
|
||||||
int configRev;
|
int configRev;
|
||||||
bool noWriteAccess;
|
bool noWriteAccess;
|
||||||
|
|
||||||
|
|||||||
@@ -1547,19 +1547,19 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>440</x>
|
<x>440</x>
|
||||||
<y>42</y>
|
<y>42</y>
|
||||||
<width>95</width>
|
<width>90</width>
|
||||||
<height>36</height>
|
<height>36</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>95</width>
|
<width>90</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>95</width>
|
<width>90</width>
|
||||||
<height>16777215</height>
|
<height>16777215</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
|
|||||||
+1197
-1056
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user