fixed tab-order, remember external avatar directory, gui-speed-init only for first network game

src/gui/qt/createnetworkgamedialog.ui

@@ -196,6 +196,7 @@
   <tabstop>spinBox_smallBlind</tabstop>
   <tabstop>spinBox_handsBeforeRaiseSmallBlind</tabstop>
   <tabstop>spinBox_gameSpeed</tabstop>
+  <tabstop>spinBox_netTimeOutPlayerAction</tabstop>
   <tabstop>pushButton_createGame</tabstop>
   <tabstop>pushButton_cancel</tabstop>
  </tabstops>

src/gui/qt/joinnetworkgamedialog.ui

@@ -334,6 +334,7 @@ p, li { white-space: pre-wrap; }
   <tabstop>lineEdit_profileName</tabstop>
   <tabstop>spinBox_port</tabstop>
   <tabstop>checkBox_ipv6</tabstop>
+  <tabstop>checkBox_sctp</tabstop>
   <tabstop>treeWidget</tabstop>
   <tabstop>pushButton_save</tabstop>
   <tabstop>pushButton_delete</tabstop>

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -866,11 +866,15 @@ void mainWindowImpl::initGui(int speed)
 	for(int i=0; i<3; i++) {
 		userWidgetsArray[i]->show();
 	}
-
-	guiGameSpeed = speed;
-	//positioning Slider
-	horizontalSlider_speed->setValue(guiGameSpeed);
-	setSpeeds();
+	
+	//set speeds for local game and for first network game
+	if( !mySession->isNetworkClientRunning() || (mySession->isNetworkClientRunning() && !mySession->getCurrentGame()) ) {
+	
+		guiGameSpeed = speed;
+		//positioning Slider
+		horizontalSlider_speed->setValue(guiGameSpeed);
+		setSpeeds();
+	}
 }
 
 void mainWindowImpl::showServerStartDialog()

src/gui/qt/selectavatardialog.ui

@@ -127,6 +127,12 @@
    </layout>
   </widget>
  </widget>
+ <tabstops>
+  <tabstop>listWidget</tabstop>
+  <tabstop>lineEdit</tabstop>
+  <tabstop>pushButton_OpenAvatarFile</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

src/gui/qt/settingsdialog.ui

@@ -2028,6 +2028,8 @@ p, li { white-space: pre-wrap; }
   <tabstop>checkBox_showStatusbarMessages</tabstop>
   <tabstop>checkBox_showFadeOutCardsAnimation</tabstop>
   <tabstop>checkBox_showFlipCardsAnimation</tabstop>
+  <tabstop>checkBox_showBlindButtons</tabstop>
+  <tabstop>checkBox_playSoundEffects</tabstop>
   <tabstop>radioButton_flipsideTux</tabstop>
   <tabstop>radioButton_flipsideOwn</tabstop>
   <tabstop>lineEdit_OwnFlipsideFilename</tabstop>
@@ -2046,10 +2048,25 @@ p, li { white-space: pre-wrap; }
   <tabstop>spinBox_netHandsBeforeRaiseSmallBlind</tabstop>
   <tabstop>spinBox_netGameSpeed</tabstop>
   <tabstop>comboBox_netEngineVersion</tabstop>
+  <tabstop>spinBox_netTimeOutPlayerAction</tabstop>
   <tabstop>spinBox_serverPort</tabstop>
   <tabstop>lineEdit_serverPassword</tabstop>
   <tabstop>checkBox_useIpv6</tabstop>
+  <tabstop>checkBox_useSctp</tabstop>
+  <tabstop>pushButton_HumanPlayerAvatar</tabstop>
   <tabstop>lineEdit_HumanPlayerName</tabstop>
+  <tabstop>pushButton_Opponent1Avatar</tabstop>
+  <tabstop>lineEdit_Opponent1Name</tabstop>
+  <tabstop>pushButton_Opponent2Avatar</tabstop>
+  <tabstop>lineEdit_Opponent2Name</tabstop>
+  <tabstop>pushButton_Opponent3Avatar</tabstop>
+  <tabstop>lineEdit_Opponent3Name</tabstop>
+  <tabstop>pushButton_Opponent4Avatar</tabstop>
+  <tabstop>lineEdit_Opponent4Name</tabstop>
+  <tabstop>pushButton_Opponent5Avatar</tabstop>
+  <tabstop>lineEdit_Opponent5Name</tabstop>
+  <tabstop>pushButton_Opponent6Avatar</tabstop>
+  <tabstop>lineEdit_Opponent6Name</tabstop>
   <tabstop>lineEdit_logDir</tabstop>
   <tabstop>pushButton_openLogDir</tabstop>
   <tabstop>spinBox_logStoreDuration</tabstop>

src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp

@@ -24,7 +24,7 @@
 
 
 selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
-    : QDialog(parent), myConfig(c), settingsCorrect(TRUE)
+    : QDialog(parent), myConfig(c), settingsCorrect(TRUE), avatarDir("")
 {
 
 	 setupUi(this);
@@ -159,9 +159,12 @@ void selectAvatarDialogImpl::isRejected() { settingsCorrect = FALSE;  }
 
 void selectAvatarDialogImpl::setExternalAvatar() {
 	
-	QString fileName = QFileDialog::getOpenFileName(this, tr("Select external avatar picture"), QDir::homePath(), tr("Images (*.png)"));
+	if (avatarDir == "") avatarDir = QDir::homePath();
+	QString fileName = QFileDialog::getOpenFileName(this, tr("Select external avatar picture"), avatarDir, tr("Images (*.png)"));
 
-     	if (!fileName.isEmpty())
-     	lineEdit->setText(fileName);
+     	if (!fileName.isEmpty()) {
+     		lineEdit->setText(fileName);	
+		avatarDir =  fileName;
+	}
 }
 

src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h

@@ -53,6 +53,7 @@ private:
 	ConfigFile* myConfig;
 	bool settingsCorrect;
 	QString externalAvatar;
+	QString avatarDir;
 
 };
 

src/gui/qt/startnetworkgamedialog.ui

@@ -120,6 +120,7 @@
  </widget>
  <tabstops>
   <tabstop>treeWidget</tabstop>
+  <tabstop>pushButton_Kick</tabstop>
   <tabstop>pushButton_startGame</tabstop>
   <tabstop>pushButton_cancel</tabstop>
  </tabstops>