src/config/configfile.cpp

@@ -45,11 +45,13 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
 {
 	int i;
 
+	myQtToolsInterface = new QtToolsWrapper;
+
 	for (i=0; i<argc; i++) {
 		if(strcmp(argv[i], "--nowriteaccess") == 0) { noWriteAccess = 1; }
 	}
 	// !!!! Revisionsnummer der Configdefaults !!!!!
-	configRev = 25;
+	configRev = 26;
 
 	//standard defaults
 	logOnOffDefault = "1";
@@ -135,6 +137,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
 	ostringstream tempIntToString;
 	tempIntToString << configRev;
 	configList.push_back(ConfigInfo("ConfigRevision", CONFIG_TYPE_INT, tempIntToString.str()));
+	configList.push_back(ConfigInfo("Language", CONFIG_TYPE_INT, myQtToolsInterface->getDefaultLanguage()));
 	configList.push_back(ConfigInfo("ShowLeftToolBox", CONFIG_TYPE_INT, "1"));
 	configList.push_back(ConfigInfo("ShowRightToolBox", CONFIG_TYPE_INT, "1"));
 	configList.push_back(ConfigInfo("ShowStatusbarMessages", CONFIG_TYPE_INT, "1"));
@@ -221,13 +224,14 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
 
 ConfigFile::~ConfigFile()
 {
+	delete myQtToolsInterface;
+	myQtToolsInterface = 0;
+	
 }
 
 
 void ConfigFile::fillBuffer() {
 
-	QtToolsInterface *myQtToolsInterface = new QtToolsWrapper;
-
 	size_t i;
 	string tempString("");
 
@@ -251,9 +255,6 @@ void ConfigFile::fillBuffer() {
 // 			cout << configBufferList[i].name << " " << configBufferList[i].defaultValue << endl;
 		}
 	}
-
-	delete myQtToolsInterface;
-	myQtToolsInterface = 0;
 }
 
 void ConfigFile::writeBuffer() {
@@ -286,8 +287,6 @@ void ConfigFile::writeBuffer() {
 void ConfigFile::updateConfig(ConfigState myConfigState) {
 	
 	size_t i;
-
-	QtToolsInterface *myQtToolsInterface = new QtToolsWrapper;
 	
 	if(myConfigState == NONEXISTING) {
 		
@@ -368,10 +367,6 @@ void ConfigFile::updateConfig(ConfigState myConfigState) {
 
 		
 	}
-	
-	delete myQtToolsInterface;
-	myQtToolsInterface = 0;
-
 }
 
 string ConfigFile::readConfigString(string varName)

src/config/configfile.h

@@ -29,6 +29,7 @@
 enum ConfigState { NONEXISTING, OLD };
 enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING };
 
+class QtToolsInterface;
 
 class ConfigFile{
 public:
@@ -72,6 +73,7 @@ private:
 	std::string claNoWriteAccess;
 
 	ConfigState myConfigState;
+	QtToolsInterface *myQtToolsInterface;
 };
 
 #endif

src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp

@@ -286,4 +286,4 @@ void joinNetworkGameDialogImpl::checkIp() {
 	//remove whitespaces
 	QString tmp = lineEdit_ipAddress->text();
 	lineEdit_ipAddress->setText(tmp.remove(" "));
-}
+}

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -57,7 +57,7 @@
 using namespace std;
 
 mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
-     : QMainWindow(parent), myConfig(c), gameSpeed(0), myActionIsBet(0), myActionIsRaise(0), debugMode(0), breakAfterActualHand(FALSE)
+     : QMainWindow(parent), myConfig(c), gameSpeed(0), myActionIsBet(0), myActionIsRaise(0), debugMode(1), breakAfterActualHand(FALSE)
 {
 	int i;
 

src/gui/qt/qttools/qthelper/qthelper.cpp

@@ -28,3 +28,4 @@ std::string QtHelper::stringToUtf8(const std::string &myString) {
 	return myUtf8String;
 }
 
+std::string QtHelper::getDefaultLanguage() { return QLocale::system().name().toStdString(); }

src/gui/qt/qttools/qthelper/qthelper.h

@@ -23,6 +23,7 @@ public:
     ~QtHelper();
 
     std::string stringToUtf8(const std::string &);
+    std::string getDefaultLanguage();
 
 };
 

src/gui/qt/qttools/qttoolswrapper.cpp

@@ -37,4 +37,4 @@ QtToolsWrapper::~QtToolsWrapper()
 }
 
 std::string QtToolsWrapper::stringToUtf8(const std::string &myString) { return myQtHelper->stringToUtf8(myString); }
-
+std::string QtToolsWrapper::getDefaultLanguage() { return myQtHelper->getDefaultLanguage(); }

src/gui/qt/qttools/qttoolswrapper.h

@@ -35,6 +35,7 @@ public:
     ~QtToolsWrapper();
 
 	std::string stringToUtf8(const std::string &myString);
+	std::string getDefaultLanguage();
 
 private: 
 	

src/gui/qt/sound/sdlplayer.cpp

@@ -60,17 +60,17 @@ void SDLPlayer::playSound(string audioString, int playerID) {
 			
 			switch (playerID) {
 
-			case 0: { position = 180; distance = 30; }
+			case 0: { position = 180; distance = 10; }
 			break;
-			case 1: { position = 281; distance = 40; }
+			case 1: { position = 281; distance = 30; }
 			break;
-			case 2: { position = 315; distance = 80; }
+			case 2: { position = 315; distance = 90; }
 			break;
-			case 3: { position = 338; distance = 100; }
+			case 3: { position = 338; distance = 130; }
 			break;
-			case 4: { position = 23; distance = 100; }
+			case 4: { position = 23; distance = 130; }
 			break;
-			case 5: { position = 45; distance = 80; }
+			case 5: { position = 45; distance = 90; }
 			break;
 			case 6: { position = 79; distance = 30; }
 			break;

src/gui/qttoolsinterface.h

@@ -28,6 +28,7 @@ public:
 
 	//qthelper.cpp
 	virtual std::string stringToUtf8(const std::string &) =0;
+	virtual std::string getDefaultLanguage() =0;
 	
 
 };

src/pokerth.cpp

@@ -82,14 +82,12 @@ int main( int argc, char **argv )
 #endif
 	Q_INIT_RESOURCE(resources);
 
-	QString locale = QLocale::system().name();
-
 	QTranslator qtTranslator;
-        qtTranslator.load(QString(":/translations/resources/translations/qt_") + locale);
+        qtTranslator.load(QString(":/translations/resources/translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language")));
         a.installTranslator(&qtTranslator);
 
 	QTranslator translator;
-	translator.load(QString(":/translations/resources/translations/pokerth_") + locale);
+	translator.load(QString(":/translations/resources/translations/pokerth_") + QString::fromStdString(myConfig->readConfigString("Language")));
 	a.installTranslator(&translator);