diff --git a/src/gui/qt/resources/pokerth.qrc b/src/gui/qt/resources/pokerth.qrc
index 704daba4..d9c9015b 100644
--- a/src/gui/qt/resources/pokerth.qrc
+++ b/src/gui/qt/resources/pokerth.qrc
@@ -1,51 +1,30 @@
media_podcast.png
- audio_input_microphone_small.png
book.png
system_users_big.png
- document_import.png
- document_export.png
- bday.png
- document_multiple.png
tools_wizard.png
speaker.png
- player_stop.png
player_play.png
- folder_sound.png
arrow_right_double.png
view_refresh.png
arrow_left_double.png
list_remove_user.png
- archive_extract.png
- preferences_system_time.png
- archive_remove.png
- audio_x_monkey.png
user.png
application_exit.png
system_users.png
list_add_user.png
- document_new.png
- kontact_date.png
list_add.png
applications_education.png
- go_jump_today.png
- document_properties.png
audio_input_microphone.png
dialog_close.png
systemsettings.png
- archive_insert.png
- sound.png
- document_preview.png
editdelete.png
user_properties.png
printer1.png
pdf.png
- view_calendar_day.png
- clock.png
preferences_desktop_user.png
dialog_ok_apply.png
filesave.png
- view_calendar_list.png
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 5437cc81..c389c58d 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -99,7 +99,7 @@
-
- 4
+ 0
@@ -152,6 +152,9 @@
-
+
+ -1
+
-
@@ -194,13 +197,20 @@
- -
+
-
Show buttons for small blind and big blind
+ -
+
+
+ Reverse order of F-Keys (F1 - F4)
+
+
+
-
@@ -208,13 +218,6 @@
- -
-
-
- Reverse order of F-Keys (F1 - F4)
-
-
-
-
@@ -1167,6 +1170,19 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
@@ -1203,9 +1219,15 @@ p, li { white-space: pre-wrap; }
-
+
+
+ 300
+ 0
+
+
- 285
+ 300
16777215
@@ -1391,6 +1413,12 @@ p, li { white-space: pre-wrap; }
-
+
+
+ 0
+ 0
+
+
80
@@ -1412,17 +1440,10 @@ p, li { white-space: pre-wrap; }
- -
-
-
- #pokerth
-
-
-
-
- Channel Password:
+ Password:
lineEdit_IRCChannelPassword
@@ -1453,7 +1474,24 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ #pokerth
+
+
+
+ label_48
+ lineEdit_IRCServerAddress
+ label_46
+ spinBox_IRCServerPort
+ label_49
+ label_17
+ lineEdit_IRCChannelPassword
+ checkBox_IRCServerUseIpv6
+ label_45
+ lineEdit_IRCChannel
-
@@ -2733,8 +2771,6 @@ p, li { white-space: pre-wrap; }
checkBox_showFadeOutCardsAnimation
checkBox_showFlipCardsAnimation
checkBox_showBlindButtons
- checkBox_antiPeekMode
- checkBox_alternateFKeysUserActionMode
checkBox_enableBetInputFocusSwitch
radioButton_flipsideTux
radioButton_flipsideOwn
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index f211c568..082daf17 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -698,12 +698,12 @@ void startWindowImpl::networkError(int errorID, int /*osErrorID*/) {
QMessageBox::Close); }
break;
case ERR_NET_PLAYER_NAME_IN_USE:
- { /*myChangeHumanPlayerNameDialog->label_Message->setText(tr("Your player name is already used by another player.\nPlease choose a different name."));
- myChangeHumanPlayerNameDialog->exec();*/ }
+ { myChangeHumanPlayerNameDialog->label_Message->setText(tr("Your player name is already used by another player.\nPlease choose a different name."));
+ myChangeHumanPlayerNameDialog->exec(); }
break;
case ERR_NET_INVALID_PLAYER_NAME:
- { /*myChangeHumanPlayerNameDialog->label_Message->setText(tr("The player name is too short, too long or invalid. Please choose another one."));
- myChangeHumanPlayerNameDialog->exec();*/ }
+ { myChangeHumanPlayerNameDialog->label_Message->setText(tr("The player name is too short, too long or invalid. Please choose another one."));
+ myChangeHumanPlayerNameDialog->exec(); }
break;
case ERR_NET_INVALID_GAME_NAME:
{ QMessageBox::warning(this, tr("Network Error"),