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

start skinning implementation (config not ready!!!)

Browse Source
This commit is contained in:
doitux
2009-03-28 20:34:23 +00:00
parent 959d514d32
commit 1dbaf5a7fc
6 changed files with 1310 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+47 -7
View File
@@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
myQtToolsInterface = CreateQtToolsWrapper();
// !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 60;
configRev = 61;
//standard defaults
logOnOffDefault = "1";
@@ -102,7 +102,12 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
mkdir(dataDir.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
//define app-dir
const char *homePath = getenv("HOME");
@@ -125,6 +130,12 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
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
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("FlipsideOwn", CONFIG_TYPE_INT, "0"));
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("SoundVolume", CONFIG_TYPE_INT, "8"));
configList.push_back(ConfigInfo("PlayGameActions", CONFIG_TYPE_INT, "1"));
@@ -370,7 +385,7 @@ void ConfigFile::writeBuffer() const {
config->LinkEndChild( tmpElement );
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");
list<string> tempList = configBufferList[i].defaultListValue;
@@ -414,7 +429,7 @@ void ConfigFile::updateConfig(ConfigState myConfigState) {
config->LinkEndChild( tmpElement );
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");
list<string> tempList = configList[i].defaultListValue;
@@ -520,7 +535,7 @@ void ConfigFile::updateConfig(ConfigState myConfigState) {
config->LinkEndChild( tmpElement );
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");
list<string> tempList = configList[i].defaultListValue;
@@ -612,6 +627,22 @@ list<int> ConfigFile::readConfigIntList(string varName) const
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)
{
@@ -630,7 +661,6 @@ void ConfigFile::writeConfigInt(string varName, int varCont)
}
}
void ConfigFile::writeConfigIntList(string varName, list<int> varCont)
{
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)
{
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; }
}
}
src/config/configfile.h
+9 -2
View File
@@ -26,7 +26,7 @@
#include <boost/thread.hpp>
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;
@@ -42,12 +42,14 @@ public:
void updateConfig(ConfigState);
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 writeConfigStringList(std::string varName, std::list<std::string> varCont);
int readConfigInt(std::string varName) const;
std::list<int> readConfigIntList(std::string varName) const;
void writeConfigInt(std::string varName, int varCont);
void writeConfigIntList(std::string varName, std::list<int> varCont);
private:
@@ -70,6 +72,11 @@ private:
std::string logDir;
std::string dataDir;
std::string cacheDir;
std::string defaultGameTableStyle;
std::string defaultCardDeck;
std::list<std::string> gameTableStyleList;
std::list<std::string> cardDeckList;
int configRev;
bool noWriteAccess;
src/gui/qt/gametable.ui
+3 -3
View File
@@ -1547,19 +1547,19 @@
<rect>
<x>440</x>
<y>42</y>
<width>95</width>
<width>90</width>
<height>36</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>95</width>
<width>90</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>95</width>
<width>90</width>
<height>16777215</height>
</size>
</property>
src/gui/qt/settingsdialog.ui
+1197 -1056
View File
File diff suppressed because it is too large Load Diff