start implementing 10 player mode

src/config/configfile.cpp

@@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	myQtToolsInterface = CreateQtToolsWrapper();
 
 	// !!!! Revisionsnummer der Configdefaults !!!!!
-	configRev = 58;
+	configRev = 59;
 
 	//standard defaults
 	logOnOffDefault = "1";
@@ -231,6 +231,12 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	configList.push_back(ConfigInfo("Opponent5Avatar", CONFIG_TYPE_STRING, ""));
 	configList.push_back(ConfigInfo("Opponent6Name", CONFIG_TYPE_STRING, "Player 6"));
 	configList.push_back(ConfigInfo("Opponent6Avatar", CONFIG_TYPE_STRING, ""));
+	configList.push_back(ConfigInfo("Opponent7Name", CONFIG_TYPE_STRING, "Player 7"));
+	configList.push_back(ConfigInfo("Opponent7Avatar", CONFIG_TYPE_STRING, ""));
+	configList.push_back(ConfigInfo("Opponent8Name", CONFIG_TYPE_STRING, "Player 8"));
+	configList.push_back(ConfigInfo("Opponent8Avatar", CONFIG_TYPE_STRING, ""));
+	configList.push_back(ConfigInfo("Opponent9Name", CONFIG_TYPE_STRING, "Player 9"));
+	configList.push_back(ConfigInfo("Opponent9Avatar", CONFIG_TYPE_STRING, ""));
 	configList.push_back(ConfigInfo("LogOnOff", CONFIG_TYPE_INT, logOnOffDefault));
 	configList.push_back(ConfigInfo("LogDir", CONFIG_TYPE_STRING, logDir));
 	configList.push_back(ConfigInfo("LogStoreDuration", CONFIG_TYPE_INT, "2"));

src/game_defs.h

@@ -21,7 +21,7 @@
 #define GAME_DEFS_H
 
 #define MIN_NUMBER_OF_PLAYERS		2
-#define MAX_NUMBER_OF_PLAYERS		7
+#define MAX_NUMBER_OF_PLAYERS		10
 
 #define MIN_GUI_SPEED			1
 #define MAX_GUI_SPEED			11

src/gui/qt/changecompleteblindsdialog.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>changeCompleteBlindsDialog</class>
  <widget class="QDialog" name="changeCompleteBlindsDialog">
@@ -69,7 +70,7 @@
       <item row="0" column="2">
        <widget class="QLabel" name="label_47">
         <property name="sizePolicy">
-         <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -96,7 +97,7 @@
       <item row="1" column="2">
        <widget class="QLabel" name="label_50">
         <property name="sizePolicy">
-         <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -112,7 +113,7 @@
    <item row="1" column="1">
     <widget class="QGroupBox" name="groupBox_7">
      <property name="sizePolicy">
-      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -153,12 +154,12 @@
       <string>Manual blinds order:</string>
      </property>
      <layout class="QGridLayout">
-      <item rowspan="2" row="0" column="0" >
+      <item row="0" column="0" rowspan="2">
        <layout class="QGridLayout">
         <property name="horizontalSpacing">
          <number>4</number>
         </property>
-        <item rowspan="2" row="0" column="0" >
+        <item row="0" column="0" rowspan="2">
          <widget class="QListWidget" name="listWidget_blinds"/>
         </item>
         <item row="0" column="1">
@@ -173,7 +174,7 @@
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
             <height>121</height>
@@ -184,7 +185,7 @@
         <item row="2" column="0">
          <widget class="QSpinBox" name="spinBox_input">
           <property name="maximum">
-           <number>9999</number>
+           <number>100000</number>
           </property>
          </widget>
         </item>
@@ -202,7 +203,7 @@
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>40</height>
@@ -241,7 +242,7 @@
            <item>
             <widget class="QSpinBox" name="spinBox_afterThisAlwaysRaiseValue">
              <property name="maximum">
-              <number>9999</number>
+              <number>10000</number>
              </property>
             </widget>
            </item>
@@ -273,7 +274,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

src/gui/qt/createinternetgamedialog.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>createInternetGameDialog</class>
  <widget class="QDialog" name="createInternetGameDialog">
@@ -5,30 +6,18 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>275</width>
+    <width>302</width>
-    <height>291</height>
+    <height>329</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Create Internet Game</string>
   </property>
   <layout class="QGridLayout">
-   <property name="leftMargin" >
+   <property name="margin">
     <number>9</number>
    </property>
-   <property name="topMargin" >
+   <property name="spacing">
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
     <number>6</number>
    </property>
    <item row="0" column="0">
@@ -53,10 +42,10 @@
          <number>2</number>
         </property>
         <property name="maximum">
-         <number>7</number>
+         <number>10</number>
         </property>
         <property name="value">
-         <number>7</number>
+         <number>10</number>
         </property>
        </widget>
       </item>
@@ -82,7 +71,7 @@
          <number>1000</number>
         </property>
         <property name="maximum">
-         <number>5000</number>
+         <number>1000000</number>
         </property>
         <property name="singleStep">
          <number>50</number>
@@ -175,16 +164,7 @@
         <property name="spacing">
          <number>6</number>
         </property>
-        <property name="leftMargin" >
+        <property name="margin">
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
          <number>0</number>
         </property>
         <item>
@@ -214,16 +194,7 @@
      <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
+     <property name="margin">
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
       <number>0</number>
      </property>
      <item>
@@ -231,7 +202,7 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>181</width>
          <height>20</height>

src/gui/qt/createnetworkgamedialog.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>createNetworkGameDialog</class>
  <widget class="QDialog" name="createNetworkGameDialog">
@@ -5,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>275</width>
+    <width>302</width>
-    <height>263</height>
+    <height>302</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -38,10 +39,10 @@
          <number>2</number>
         </property>
         <property name="maximum">
-         <number>7</number>
+         <number>10</number>
         </property>
         <property name="value">
-         <number>7</number>
+         <number>10</number>
         </property>
        </widget>
       </item>
@@ -67,7 +68,7 @@
          <number>1000</number>
         </property>
         <property name="maximum">
-         <number>5000</number>
+         <number>1000000</number>
         </property>
         <property name="value">
          <number>2000</number>
@@ -160,16 +161,7 @@
      <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
+     <property name="margin">
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
       <number>0</number>
      </property>
      <item>
@@ -177,7 +169,7 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>181</width>
          <height>20</height>

src/gui/qt/gametable/gametableimpl.cpp

@@ -200,6 +200,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	buttonLabelArray[4] = textLabel_Button4;
 	buttonLabelArray[5] = textLabel_Button5;
 	buttonLabelArray[6] = textLabel_Button6;
+	buttonLabelArray[7] = textLabel_Button7;
+	buttonLabelArray[8] = textLabel_Button8;
+	buttonLabelArray[9] = textLabel_Button9;
 
 	// cashLabelArray init
 	cashLabelArray[0] = textLabel_Cash0;
@@ -209,15 +212,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	cashLabelArray[4] = textLabel_Cash4;
 	cashLabelArray[5] = textLabel_Cash5;
 	cashLabelArray[6] = textLabel_Cash6;
-
+	cashLabelArray[7] = textLabel_Cash7;
-	// cashTopLabelArray init
+	cashLabelArray[8] = textLabel_Cash8;
-	cashTopLabelArray[0] = textLabel_TopCash0;
+	cashLabelArray[9] = textLabel_Cash9;
-	cashTopLabelArray[1] = textLabel_TopCash1;
-	cashTopLabelArray[2] = textLabel_TopCash2;
-	cashTopLabelArray[3] = textLabel_TopCash3;
-	cashTopLabelArray[4] = textLabel_TopCash4;
-	cashTopLabelArray[5] = textLabel_TopCash5;
-	cashTopLabelArray[6] = textLabel_TopCash6;
 
 	// playerNameLabelArray init
 	playerNameLabelArray[0] = label_PlayerName0;
@@ -227,6 +224,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	playerNameLabelArray[4] = label_PlayerName4;
 	playerNameLabelArray[5] = label_PlayerName5;
 	playerNameLabelArray[6] = label_PlayerName6;
+	playerNameLabelArray[7] = label_PlayerName7;
+	playerNameLabelArray[8] = label_PlayerName8;
+	playerNameLabelArray[9] = label_PlayerName9;
 
 	// playerAvatarLabelArray init
 	playerAvatarLabelArray[0] = label_Avatar0;
@@ -236,6 +236,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	playerAvatarLabelArray[4] = label_Avatar4;
 	playerAvatarLabelArray[5] = label_Avatar5;
 	playerAvatarLabelArray[6] = label_Avatar6;
+	playerAvatarLabelArray[7] = label_Avatar7;
+	playerAvatarLabelArray[8] = label_Avatar8;
+	playerAvatarLabelArray[9] = label_Avatar9;
 	for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) { 
 		playerAvatarLabelArray[i]->setMyW(this); 
 		playerAvatarLabelArray[i]->setMyId(i); 
@@ -249,6 +252,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	setLabelArray[4] = textLabel_Set4;
 	setLabelArray[5] = textLabel_Set5;
 	setLabelArray[6] = textLabel_Set6;
+	setLabelArray[7] = textLabel_Set7;
+	setLabelArray[8] = textLabel_Set8;
+	setLabelArray[9] = textLabel_Set9;
 	for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) { setLabelArray[i]->setMyW(this); }
 
 	// statusLabelArray init
@@ -259,6 +265,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	actionLabelArray[4] = textLabel_Status4;
 	actionLabelArray[5] = textLabel_Status5;
 	actionLabelArray[6] = textLabel_Status6;
+	actionLabelArray[7] = textLabel_Status7;
+	actionLabelArray[8] = textLabel_Status8;
+	actionLabelArray[9] = textLabel_Status9;
 
 	textLabel_Status0->setMyW(this);
 
@@ -270,6 +279,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	groupBoxArray[4] = groupBox4;
 	groupBoxArray[5] = groupBox5;
 	groupBoxArray[6] = groupBox6;
+	groupBoxArray[7] = groupBox7;
+	groupBoxArray[8] = groupBox8;
+	groupBoxArray[9] = groupBox9;
 
 	// boardCardsArray init
 	boardCardsArray[0] = pixmapLabel_cardBoard0;
@@ -293,6 +305,12 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	holeCardsArray[5][1] = pixmapLabel_card5b;
 	holeCardsArray[6][0] = pixmapLabel_card6a;
 	holeCardsArray[6][1] = pixmapLabel_card6b;
+	holeCardsArray[7][0] = pixmapLabel_card7a;
+	holeCardsArray[7][1] = pixmapLabel_card7b;
+	holeCardsArray[8][0] = pixmapLabel_card8a;
+	holeCardsArray[8][1] = pixmapLabel_card8b;
+	holeCardsArray[9][0] = pixmapLabel_card9a;
+	holeCardsArray[9][1] = pixmapLabel_card9b;
 
 	// Farben initalisieren
 	active.setRgb(86,170,86);
@@ -307,8 +325,8 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	font2String = "font-family: \"Nimbus Sans L\";";
 	QString textBrowserFontsize= "11";
 	QString cashFontSize = "11";
-	QString setLabelFontSize = "13";
+	QString setLabelFontSize = "11";
-	QString playerNameLabelFontSize = "14";
+	QString playerNameLabelFontSize = "11";
 	QString mediumTableFontSize = "13";
 	QString handLabelFontSize = "18";
 	QString labelPotFontSize = "19";
@@ -324,8 +342,8 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	#endif
 	QString textBrowserFontsize= "10";
 	QString cashFontSize = "10";
-	QString setLabelFontSize = "12";
+	QString setLabelFontSize = "10";
-	QString playerNameLabelFontSize = "13";
+	QString playerNameLabelFontSize = "11";
 	QString mediumTableFontSize = "13";
 	QString handLabelFontSize = "17";	
 	QString labelPotFontSize = "18";
@@ -347,20 +365,10 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 // 	tabWidget_Left->setStyleSheet("QTabWidget::pane { border: 1px solid #286400; border-radius: 2px; background-color: #145300; }");
 #endif
 
-
-	for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
-
-		cashTopLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #F0F0F0; }");
-		cashLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #F0F0F0; }");
-	}
-	
-	for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
-
-		setLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+setLabelFontSize+"px; font-weight: bold; color: #F0F0F0; }");
-	}
-
 	for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
 
+		cashLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #FFFF00; }");
+		setLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+setLabelFontSize+"px; font-weight: bold; color: #FFFF00; }");
 		playerNameLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+playerNameLabelFontSize+"px; font-weight: bold; color: #F0F0F0; }");
 	}
 	
@@ -404,15 +412,13 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	label_voteStarterNick->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");	
 	label_votestartedby->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");	
 
-	statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #B7FF00; }");
+// 	statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #B7FF00; }");
 
 	//Groupbox Background 
-	for (i=1; i<MAX_NUMBER_OF_PLAYERS; i++) {
+	for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
 
-		groupBoxArray[i]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); 
+		groupBoxArray[i]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); 
 	}
-	groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); 
-
 	//Human player button
 	pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked_hover.png);}");
 	pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked_hover.png);}");
@@ -469,9 +475,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	if(myConfig->readConfigInt("ShowStatusbarMessages")) {
  
 #ifdef __APPLE__
-                statusBar()->showMessage(tr("Cmd+N to start a new game"));
+//                 statusBar()->showMessage(tr("Cmd+N to start a new game"));
 #else
-                statusBar()->showMessage(tr("Ctrl+N to start a new game"));
+//                 statusBar()->showMessage(tr("Ctrl+N to start a new game"));
 #endif
         }
 
@@ -641,6 +647,9 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) {
 		(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent4Name->text().toUtf8().constData());
 		(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent5Name->text().toUtf8().constData());
 		(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent6Name->text().toUtf8().constData());
+		(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent7Name->text().toUtf8().constData());
+		(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent8Name->text().toUtf8().constData());
+		(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent9Name->text().toUtf8().constData());
 		mySettingsDialog->setPlayerNickIsChanged(FALSE);
 
 		refreshPlayerName();
@@ -657,6 +666,9 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) {
 		(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent4Avatar->getMyLink().toUtf8().constData());
 		(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent5Avatar->getMyLink().toUtf8().constData());
 		(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent6Avatar->getMyLink().toUtf8().constData());
+		(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent7Avatar->getMyLink().toUtf8().constData());
+		(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent8Avatar->getMyLink().toUtf8().constData());
+		(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent9Avatar->getMyLink().toUtf8().constData());
 
 		//avatar refresh
 		refreshPlayerAvatar();		
@@ -682,10 +694,10 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) {
 		if(myConfig->readConfigInt("AntiPeekMode")) {
 			holeCardsArray[0][0]->setPixmap(*flipside, TRUE);
 			tempCardsPixmapArray[0] = QPixmap::fromImage(QImage(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[0], 10)+".png"));
-			holeCardsArray[0][0]->setFrontPixmap(tempCardsPixmapArray[0]);
+			holeCardsArray[0][0]->setHiddenFrontPixmap(tempCardsPixmapArray[0]);
 			holeCardsArray[0][1]->setPixmap(*flipside, TRUE);
 			tempCardsPixmapArray[1]= QPixmap::fromImage(QImage(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[1], 10)+".png"));
-			holeCardsArray[0][1]->setFrontPixmap(tempCardsPixmapArray[1]);
+			holeCardsArray[0][1]->setHiddenFrontPixmap(tempCardsPixmapArray[1]);
 		}
 		else {
 			tempCardsPixmapArray[0]= QPixmap::fromImage(QImage(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[0], 10)+".png"));
@@ -950,11 +962,11 @@ void gameTableImpl::refreshCash() {
 		if((*it_c)->getMyActiveStatus()) { 
 
 			cashLabelArray[(*it_c)->getMyID()]->setText("$"+QString::number((*it_c)->getMyCash(),10)); 
-			cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:"); 
+// 			cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:"); 
 			
 		} else {
 			cashLabelArray[(*it_c)->getMyID()]->setText(""); 
-			cashTopLabelArray[(*it_c)->getMyID()]->setText("");
+// 			cashTopLabelArray[(*it_c)->getMyID()]->setText("");
 		}
 	}
 }
@@ -971,31 +983,22 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
 	
 			if((*it_c)->getMyTurn()) {
 				//Groupbox glow wenn der Spiele dran ist. 
-				if((*it_c)->getMyID()==0) {
+				groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatActive.png) }"); 
-					groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow_0.6.png) }"); 
-				}
-				else {
-					groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxActiveGlow.png) }"); 
-				}
-	
 			} else {
 				//Groupbox auf Hintergrundfarbe setzen wenn der Spiele nicht dran aber aktiv ist. 
 				if((*it_c)->getMyActiveStatus()) {
 					if((*it_c)->getMyID()==0) {
-						groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); 
 						//show buttons
 						for(j=0; j<6; j++) {
 							userWidgetsArray[j]->show();
 						}
 					}
-					else {
+					groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); 
-						groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); 
+					
-					}	
 				}
 				//Groupbox verdunkeln wenn der Spiele inactive ist.  
 				else {
 					if((*it_c)->getMyID()==0) {
-						groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); 
 						//hide buttons
 						for(j=0; j<6; j++) {
 							userWidgetsArray[j]->hide();
@@ -1004,9 +1007,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
 						holeCardsArray[0][0]->signalFastFlipCards(FALSE);
 						holeCardsArray[0][1]->signalFastFlipCards(FALSE);						
 					}
-					else {
+					groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); 
-						groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); 
-					}
 				}
 			}
 		}
@@ -1017,7 +1018,6 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
 		//inactive
 		case 0: { 
 				if (!playerID) {
-					groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); 	
 					//hide buttons
 					for(j=0; j<6; j++) {
 						userWidgetsArray[j]->hide();
@@ -1026,43 +1026,28 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
 					holeCardsArray[0][0]->signalFastFlipCards(FALSE);
 					holeCardsArray[0][1]->signalFastFlipCards(FALSE);						
 				}
-				else {
+				groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); 
-					groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); 
-				}
 			}
 		break;
 		//active but fold
 		case 1: {
 				if (!playerID) {
-					groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); 	
 					//show buttons
 					for(j=0; j<6; j++) {
 						userWidgetsArray[j]->show();
 					}		
 				}
-				else {
+				groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); 
-					groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); 
-				}
 			}
 		break;
 		//active in action
 		case 2:  {
-				if (!playerID) {
+				groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatActive.png) }"); 
-					groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow_0.6.png) }"); 
-				}
-				else {
-					groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxActiveGlow.png) }"); 
-				}
 			}
 		break;
 		//active not in action
 		case 3:  {
-				if (!playerID) {
+				groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); 
-					groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); 	
-				}
-				else {
-					groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); 
-				}
 			}
 		break;
 		default: {}
@@ -1160,14 +1145,15 @@ void gameTableImpl::dealHoleCards() {
 		for(j=0; j<2; j++) {
 			if((*it_c)->getMyActiveStatus()) { 
 				if (( (*it_c)->getMyID() == 0) || DEBUG_MODE) {
+					tempCardsPixmapArray[j].load(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png");
 					if(myConfig->readConfigInt("AntiPeekMode")) {
 						holeCardsArray[(*it_c)->getMyID()][j]->setPixmap(*flipside, TRUE);
-						tempCardsPixmapArray[j].load(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png");
+						holeCardsArray[(*it_c)->getMyID()][j]->setFront(*flipside);
-						holeCardsArray[(*it_c)->getMyID()][j]->setFrontPixmap(tempCardsPixmapArray[j]);
+						holeCardsArray[(*it_c)->getMyID()][j]->setHiddenFrontPixmap(tempCardsPixmapArray[j]);
 					}
 					else {
-						tempCardsPixmapArray[j].load(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png");
 						holeCardsArray[(*it_c)->getMyID()][j]->setPixmap(tempCardsPixmapArray[j],FALSE);
+						holeCardsArray[(*it_c)->getMyID()][j]->setFront(tempCardsPixmapArray[j]);
 					}
 				} 
 				else {
@@ -1543,9 +1529,9 @@ void gameTableImpl::meInAction() {
 	
 	if(myConfig->readConfigInt("ShowStatusbarMessages")) {
 		if ( myConfig->readConfigInt("AlternateFKeysUserActionMode") == 0 ) {
-			statusBar()->showMessage(tr("F1 - Fold | F2 - Check/Call | F3 - Bet/Raise | F4 - All-In"), 15000);
+// // 			statusBar()->showMessage(tr("F1 - Fold | F2 - Check/Call | F3 - Bet/Raise | F4 - All-In"), 15000);
 		} else {
-			statusBar()->showMessage(tr("F1 - All-In | F2 - Bet/Raise | F3 - Check/Call | F4 - Fold"), 15000);
+// 			statusBar()->showMessage(tr("F1 - All-In | F2 - Bet/Raise | F3 - Check/Call | F4 - Fold"), 15000);
 		}
 	}
 		
@@ -1637,7 +1623,7 @@ void gameTableImpl::myFold(){
 		//set that i was the last active player. need this for unhighlighting groupbox
 		currentHand->setLastPlayersTurn(0);
 		
-		statusBar()->clearMessage();
+// 		statusBar()->clearMessage();
 	
 		//Spiel läuft weiter
 		myActionDone();
@@ -1653,7 +1639,7 @@ void gameTableImpl::myCheck() {
 	//set that i was the last active player. need this for unhighlighting groupbox
 	currentHand->setLastPlayersTurn(0);
 
-	statusBar()->clearMessage();
+// 	statusBar()->clearMessage();
 
 	//Spiel läuft weiter
 	myActionDone();
@@ -1727,7 +1713,7 @@ void gameTableImpl::myCall(){
 	//set that i was the last active player. need this for unhighlighting groupbox
 	currentHand->setLastPlayersTurn(0);
 
-	statusBar()->clearMessage();
+// 	statusBar()->clearMessage();
 
 	//Spiel läuft weiter
 	myActionDone();
@@ -1777,7 +1763,7 @@ void gameTableImpl::mySet(){
 		currentHand->getBoard()->collectSets();
 		refreshPot();
 	
-		statusBar()->clearMessage();
+// 		statusBar()->clearMessage();
 	
 		//set that i was the last active player. need this for unhighlighting groupbox
 		currentHand->setLastPlayersTurn(0);
@@ -1807,7 +1793,7 @@ void gameTableImpl::myAllIn(){
 	currentHand->getBoard()->collectSets();
 	refreshPot();
 	
-	statusBar()->clearMessage();
+// 	statusBar()->clearMessage();
 
 	//set that i was the last active player. need this for unhighlighting groupbox
 	currentHand->setLastPlayersTurn(0);
@@ -2284,7 +2270,7 @@ void gameTableImpl::postRiverRunAnimation5() {
 			for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
 				if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) { 
 
-					cashTopLabelArray[(*it_c)->getMyID()]->setText("");
+// 					cashTopLabelArray[(*it_c)->getMyID()]->setText("");
 				}
 			}
 		}
@@ -2294,7 +2280,7 @@ void gameTableImpl::postRiverRunAnimation5() {
 			for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
 				if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) { 
 
-					cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:"); 
+// 					cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:"); 
 				}
 			}
 		}
@@ -2520,7 +2506,7 @@ void gameTableImpl::nextRoundCleanGui() {
 		pushButton_break->setText(tr("Stop"));
 	}
 	//Clear Statusbarmessage
-	statusBar()->clearMessage();
+// 	statusBar()->clearMessage();
 
 	//fix press mouse button during bankrupt with anti-peek-mode
 	this->mouseOverFlipCards(FALSE);
@@ -2697,13 +2683,13 @@ void gameTableImpl::changePlayingMode() {
 
 	switch (mode) {
 
-		case 0: { statusBar()->showMessage(tr("Manual mode set. You've got to choose yourself now."), 5000); }
+// 		case 0: { statusBar()->showMessage(tr("Manual mode set. You've got to choose yourself now."), 5000); }
 		break;
-		case 1: { statusBar()->showMessage(tr("Auto mode set: Check or call any."), 5000); }
+// 		case 1: { statusBar()->showMessage(tr("Auto mode set: Check or call any."), 5000); }
 		break;
-		case 2: { statusBar()->showMessage(tr("Auto mode set: Check or fold."), 5000); }
+// 		case 2: { statusBar()->showMessage(tr("Auto mode set: Check or fold."), 5000); }
 		break;
-		default: { cout << "changePlayingMode ERROR!!!!" << endl; }
+		default: { /*cout << "changePlayingMode ERROR!!!!" << endl;*/ }
 
 	}
 

src/gui/qt/gametable/mycardspixmaplabel.cpp

@@ -13,7 +13,7 @@
 #include "gametableimpl.h"
 // using namespace std;
 
-MyCardsPixmapLabel::MyCardsPixmapLabel(QFrame* parent)
+MyCardsPixmapLabel::MyCardsPixmapLabel(QGroupBox* parent)
  : QLabel(parent), myW(NULL)
 {
 
@@ -46,7 +46,7 @@ MyCardsPixmapLabel::~MyCardsPixmapLabel()
 void MyCardsPixmapLabel::startFadeOut(int speed) { 
 	
 	
-	frameOpacity = 0.0;
+	frameOpacity = 1.0;
 
 	if(speed <= 4) { opacityRaiseInterval = 0.01; }
 	if(speed > 4 && speed <= 7) { opacityRaiseInterval = 0.02; }
@@ -54,7 +54,7 @@ void MyCardsPixmapLabel::startFadeOut(int speed) {
 
 	if(speed != 11) {
 		fadeOutAction = TRUE;
-		frameOpacity = 0.0;
+		frameOpacity = 1.0;
 		fadeOutTimer->start(40);
 	} 
 	
@@ -63,8 +63,8 @@ void MyCardsPixmapLabel::startFadeOut(int speed) {
 
 void MyCardsPixmapLabel::nextFadeOutFrame() {
 
-	if (frameOpacity < 0.75) {
+	if (frameOpacity > 0.25) {
-		frameOpacity += opacityRaiseInterval;
+		frameOpacity -= opacityRaiseInterval;
      		update();
 	}
 	else { 
@@ -141,35 +141,23 @@ void MyCardsPixmapLabel::setPixmap(const QPixmap &pic, const bool flipsideIs) {
 	
 	QLabel::setPixmap(pic);
 	isFlipside = flipsideIs;
-
 }
 
-void MyCardsPixmapLabel::setFrontPixmap ( const QPixmap &pic ) {
+void MyCardsPixmapLabel::setHiddenFrontPixmap ( const QPixmap &pic ) {
 
 	myHiddenFront = pic.scaled(width(), height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);;
 }
 
 void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) {
 
-	if (!(flipCardsAction1 || flipCardsAction2)) {
+	if (!(flipCardsAction1 || flipCardsAction2 || fadeOutAction)) {
 		QLabel::paintEvent(event);
 	}
 
-	if (fadeOutAction) {
+	if (fadeOutAction && !fastFlipCardsFront) {
-
 		QPainter painter(this);
-// 		painter.setPen(QColor(74,131,83));
-		painter.setBrush(QColor(74,131,83));
-// 		painter.setBrush(palette().color(QPalette::Background));
-	//  	painter.setBrush(QColor(0,0,0));
-	
 		painter.setOpacity(frameOpacity);
-	// 	painter.drawRect(this->geometry());
+		painter.drawPixmap(0,0, front);
-		if(objectName().contains("pixmapLabel_cardBoard"))
-			painter.drawRect(-1,-1,80,115);
-		else
-			painter.drawRect(-1,-1,81,112);
-		
 	}
 
 	if (flipCardsAction1) {
@@ -193,12 +181,10 @@ void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) {
 	if (fastFlipCardsFront && !flipCardsAction1 && !flipCardsAction2) { 
 		if(objectName().contains("pixmapLabel_card0")) {
 			QPainter painter4(this);
-			painter4.drawPixmap(0,0, myHiddenFront); 
 			if(fadeOutAction) {
-				painter4.setBrush(QColor(74,131,83));
+				painter4.setOpacity(0.25);
-				painter4.setOpacity(0.75);
-				painter4.drawRect(-1,-1,81,112);
 			}
+			painter4.drawPixmap(0,0, myHiddenFront); 
 		}
 	}
 }

src/gui/qt/gametable/mycardspixmaplabel.h

@@ -23,7 +23,7 @@ class MyCardsPixmapLabel : public QLabel
 {
 Q_OBJECT
 public:
-    MyCardsPixmapLabel(QFrame*);
+    MyCardsPixmapLabel(QGroupBox*);
 
     ~MyCardsPixmapLabel();
 
@@ -48,7 +48,7 @@ signals:
 public slots:
 	
 	void setPixmap ( const QPixmap &, const bool );
-	void setFrontPixmap ( const QPixmap &);
+	void setHiddenFrontPixmap ( const QPixmap &);
 
 	void nextFadeOutFrame();
 	void nextFlipCardsFrame();
@@ -60,6 +60,9 @@ public slots:
 	void mousePressEvent ( QMouseEvent *);
 	void mouseReleaseEvent ( QMouseEvent *);
 
+	void setFront ( const QPixmap& theValue ) { front = theValue; }
+	
+
 private: 
 
 	gameTableImpl* myW;	

src/gui/qt/gametable/mystatuslabel.cpp

@@ -15,7 +15,7 @@
 
 using namespace std;
 
-MyStatusLabel::MyStatusLabel(QFrame* parent)
+MyStatusLabel::MyStatusLabel(QGroupBox* parent)
  : QLabel(parent) {
 
 	mousePress = FALSE;

src/gui/qt/gametable/mystatuslabel.h

@@ -23,7 +23,7 @@ class MyStatusLabel : public QLabel
 {
 Q_OBJECT
 public:
-    MyStatusLabel(QFrame*);
+    MyStatusLabel(QGroupBox*);
 
     ~MyStatusLabel();
 

src/gui/qt/manualblindsorderdialog.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>manualBlindsOrderDialog</class>
  <widget class="QDialog" name="manualBlindsOrderDialog">
@@ -18,7 +19,7 @@
      <property name="horizontalSpacing">
       <number>4</number>
      </property>
-     <item rowspan="2" row="0" column="0" >
+     <item row="0" column="0" rowspan="2">
       <widget class="QListWidget" name="listWidget_blinds"/>
      </item>
      <item row="0" column="1">
@@ -33,7 +34,7 @@
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>121</height>
@@ -46,8 +47,11 @@
        <property name="prefix">
         <string>$</string>
        </property>
+       <property name="minimum">
+        <number>1</number>
+       </property>
        <property name="maximum">
-        <number>5000</number>
+        <number>100000</number>
        </property>
        <property name="value">
         <number>5</number>
@@ -128,7 +132,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

src/gui/qt/newgamedialog.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>newGameDialog</class>
  <widget class="QDialog" name="newGameDialog">
@@ -5,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>207</width>
+    <width>225</width>
-    <height>235</height>
+    <height>271</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -35,10 +36,10 @@
          <number>2</number>
         </property>
         <property name="maximum">
-         <number>7</number>
+         <number>10</number>
         </property>
         <property name="value">
-         <number>7</number>
+         <number>10</number>
         </property>
        </widget>
       </item>
@@ -61,7 +62,7 @@
          <number>1000</number>
         </property>
         <property name="maximum">
-         <number>5000</number>
+         <number>1000000</number>
         </property>
         <property name="singleStep">
          <number>50</number>
@@ -132,7 +133,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

src/gui/qt/settingsdialog/settingsdialogimpl.cpp

@@ -72,6 +72,9 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
 	connect( lineEdit_Opponent4Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
 	connect( lineEdit_Opponent5Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
 	connect( lineEdit_Opponent6Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
+	connect( lineEdit_Opponent7Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
+	connect( lineEdit_Opponent8Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
+	connect( lineEdit_Opponent9Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
 	connect( pushButton_openFlipsidePicture, SIGNAL( clicked() ), this, SLOT( setFlipsidePicFileName()) );
 	connect( pushButton_openLogDir, SIGNAL( clicked() ), this, SLOT( setLogDir()) );
 	connect( pushButton_HumanPlayerAvatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile0()) );
@@ -81,7 +84,9 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
 	connect( pushButton_Opponent4Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile4()) );
 	connect( pushButton_Opponent5Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile5()) );
 	connect( pushButton_Opponent6Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile6()) );
-
+	connect( pushButton_Opponent7Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile7()) );
+	connect( pushButton_Opponent8Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile8()) );
+	connect( pushButton_Opponent9Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile9()) );
 	connect( pushButton_editManualBlindsOrder, SIGNAL( clicked() ), this, SLOT( callManualBlindsOrderDialog()) );
 	connect( pushButton_netEditManualBlindsOrder, SIGNAL( clicked() ), this, SLOT( callNetManualBlindsOrderDialog()) );
 
@@ -91,25 +96,17 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
 // 	connect( spinBox_firstSmallBlind, SIGNAL( valueChanged(int) ), this, SLOT ( checkProperFirstSmallBlind(int)));
 
 	connect( radioButton_netManualBlindsOrder, SIGNAL( toggled(bool) ), this, SLOT( setFirstSmallBlindMargin() ));
-	connect( radioButton_manualBlindsOrder, SIGNAL( toggled(bool) ), this, SLOT( setFirstSmallBlindMargin() ));	//temporarely unused until ai is enabled in network
+	connect( radioButton_manualBlindsOrder, SIGNAL( toggled(bool) ), this, SLOT( setFirstSmallBlindMargin() ));
 
 	connect( comboBox_switchLanguage, SIGNAL( currentIndexChanged (int) ), this, SLOT ( setLanguageChanged(int) ));
 
 	connect(groupBox_automaticServerConfig, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBoxAutomaticServerConfig(bool)));
 	connect(groupBox_manualServerConfig, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBoxManualServerConfig(bool)));
 
-// 	label_36->hide();
-// 	spinBox_netGameSpeed->hide();
-// 
 }
 
 void settingsDialogImpl::exec() {
 
-	
-// 	stackedWidget->removeWidget(page_4);
-// 	listWidget->takeItem(2);
-// 	page_4->hide();
-
 	playerNickIsChanged = FALSE;
 	
 	//Player Nicks
@@ -127,6 +124,12 @@ void settingsDialogImpl::exec() {
 	pushButton_Opponent5Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent5Avatar").c_str()));
 	lineEdit_Opponent6Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent6Name").c_str()));
 	pushButton_Opponent6Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent6Avatar").c_str()));
+	lineEdit_Opponent7Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent7Name").c_str()));
+	pushButton_Opponent7Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent7Avatar").c_str()));
+	lineEdit_Opponent8Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent8Name").c_str()));
+	pushButton_Opponent8Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent8Avatar").c_str()));
+	lineEdit_Opponent9Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent9Name").c_str()));
+	pushButton_Opponent9Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent9Avatar").c_str()));
 
 	//refresh AvatarIcons
 	pushButton_HumanPlayerAvatar->setIcon(QIcon(pushButton_HumanPlayerAvatar->getMyLink()));
@@ -136,6 +139,9 @@ void settingsDialogImpl::exec() {
 	pushButton_Opponent4Avatar->setIcon(QIcon(pushButton_Opponent4Avatar->getMyLink()));
 	pushButton_Opponent5Avatar->setIcon(QIcon(pushButton_Opponent5Avatar->getMyLink()));
 	pushButton_Opponent6Avatar->setIcon(QIcon(pushButton_Opponent6Avatar->getMyLink()));
+	pushButton_Opponent7Avatar->setIcon(QIcon(pushButton_Opponent7Avatar->getMyLink()));
+	pushButton_Opponent8Avatar->setIcon(QIcon(pushButton_Opponent8Avatar->getMyLink()));
+	pushButton_Opponent9Avatar->setIcon(QIcon(pushButton_Opponent9Avatar->getMyLink()));
 
 	//Local Game Settings
 	spinBox_quantityPlayers->setValue(myConfig->readConfigInt("NumberOfPlayers"));
@@ -289,6 +295,15 @@ void settingsDialogImpl::isAccepted() {
 	myConfig->writeConfigString("Opponent6Name", lineEdit_Opponent6Name->text().toUtf8().constData());
 	myConfig->writeConfigString("Opponent6Avatar", pushButton_Opponent6Avatar->getMyLink().toUtf8().constData());
 	
+	myConfig->writeConfigString("Opponent7Name", lineEdit_Opponent7Name->text().toUtf8().constData());
+	myConfig->writeConfigString("Opponent7Avatar", pushButton_Opponent7Avatar->getMyLink().toUtf8().constData());  
+
+	myConfig->writeConfigString("Opponent8Name", lineEdit_Opponent8Name->text().toUtf8().constData());
+	myConfig->writeConfigString("Opponent8Avatar", pushButton_Opponent8Avatar->getMyLink().toUtf8().constData());  
+
+	myConfig->writeConfigString("Opponent9Name", lineEdit_Opponent9Name->text().toUtf8().constData());
+	myConfig->writeConfigString("Opponent9Avatar", pushButton_Opponent9Avatar->getMyLink().toUtf8().constData());    
+
 // 	Local Game Settings
 	myConfig->writeConfigInt("NumberOfPlayers", spinBox_quantityPlayers->value());
 	myConfig->writeConfigInt("StartCash", spinBox_startCash->value());
@@ -525,6 +540,32 @@ void settingsDialogImpl::setAvatarFile6() {
 	}
 }
 
+void settingsDialogImpl::setAvatarFile7() {
+
+	callSelectAvatarDialog();
+	if(mySelectAvatarDialogImpl->getSettingsCorrect()) {
+		pushButton_Opponent7Avatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink());
+		pushButton_Opponent7Avatar->setIcon(QIcon(pushButton_Opponent7Avatar->getMyLink()));
+	}
+}
+
+void settingsDialogImpl::setAvatarFile8() {
+
+	callSelectAvatarDialog();
+	if(mySelectAvatarDialogImpl->getSettingsCorrect()) {
+		pushButton_Opponent8Avatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink());
+		pushButton_Opponent8Avatar->setIcon(QIcon(pushButton_Opponent8Avatar->getMyLink()));
+	}
+}
+
+void settingsDialogImpl::setAvatarFile9() {
+
+	callSelectAvatarDialog();
+	if(mySelectAvatarDialogImpl->getSettingsCorrect()) {
+		pushButton_Opponent9Avatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink());
+		pushButton_Opponent9Avatar->setIcon(QIcon(pushButton_Opponent9Avatar->getMyLink()));
+	}
+}
 void settingsDialogImpl::setLogDir()
  {
 	 QString dir = QFileDialog::getExistingDirectory(this, tr("Open Directory"),

src/gui/qt/settingsdialog/settingsdialogimpl.h

@@ -60,6 +60,9 @@ public slots:
 	void setAvatarFile4();
 	void setAvatarFile5();
 	void setAvatarFile6();
+	void setAvatarFile7();
+	void setAvatarFile8();
+	void setAvatarFile9();
 
 	void callManualBlindsOrderDialog();
 	void callNetManualBlindsOrderDialog();
@@ -101,7 +104,6 @@ private:
 
 	bool languageIsChanged;
 	int changedLanguageIndex;
-
 };
 
 #endif