diff --git a/pokerth.pro b/pokerth.pro
index f03be798..8354af48 100755
--- a/pokerth.pro
+++ b/pokerth.pro
@@ -26,6 +26,7 @@ INCLUDEPATH += . \
src/gui/qt/joinnetworkgamedialog \
src/gui/qt/newlocalgamedialog \
src/gui/qt/settingsdialog \
+ src/gui/qt/settingsdialog/selectavatardialog \
src/gui/qt/startnetworkgamedialog \
src/gui/qt/waitforservertostartgamedialog
@@ -53,6 +54,7 @@ DEPENDPATH += . \
src/gui/qt/qttools/qthelper \
src/gui/qt/newlocalgamedialog \
src/gui/qt/settingsdialog \
+ src/gui/qt/settingsdialog/selectavatardialog \
src/gui/qt/startnetworkgamedialog \
src/gui/qt/waitforservertostartgamedialog
# Input
@@ -116,6 +118,7 @@ HEADERS += src/game.h \
src/gui/qt/log/log.h \
src/gui/qt/newlocalgamedialog/newgamedialogimpl.h \
src/gui/qt/settingsdialog/settingsdialogimpl.h \
+ src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h \
src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h \
src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h \
src/gui/qttoolsinterface.h \
@@ -129,6 +132,7 @@ FORMS += src/gui/qt/mainwindow.ui \
src/gui/qt/joinnetworkgamedialog.ui \
src/gui/qt/newgamedialog.ui \
src/gui/qt/settingsdialog.ui \
+ src/gui/qt/selectavatardialog.ui \
src/gui/qt/startnetworkgamedialog.ui \
src/gui/qt/waitforservertostartgamedialog.ui
SOURCES += src/game.cpp \
@@ -200,6 +204,7 @@ SOURCES += src/game.cpp \
src/gui/qt/log/log.cpp \
src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp \
src/gui/qt/settingsdialog/settingsdialogimpl.cpp \
+ src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp \
src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp \
src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp \
src/gui/qttoolsinterface.cpp \
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index 4c1f770a..1beccfcb 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -22,6 +22,7 @@
#include "newgamedialogimpl.h"
#include "aboutpokerthimpl.h"
#include "settingsdialogimpl.h"
+#include "selectavatardialogimpl.h"
#include "joinnetworkgamedialogimpl.h"
#include "connecttoserverdialogimpl.h"
#include "createnetworkgamedialogimpl.h"
@@ -497,7 +498,8 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
//Dialoge
myNewGameDialog = new newGameDialogImpl(this, myConfig);
- mySettingsDialog = new settingsDialogImpl(this, myConfig);
+ mySelectAvatarDialog = new selectAvatarDialogImpl(this, myConfig);
+ mySettingsDialog = new settingsDialogImpl(this, myConfig, mySelectAvatarDialog);
myJoinNetworkGameDialog = new joinNetworkGameDialogImpl(this, myConfig);
myConnectToServerDialog = new connectToServerDialogImpl(this);
myStartNetworkGameDialog = new startNetworkGameDialogImpl(this);
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h
index b6727eff..f7b508f0 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.h
+++ b/src/gui/qt/mainwindow/mainwindowimpl.h
@@ -42,6 +42,7 @@ class PlayerInterface;
class MyCardsPixmapLabel;
class newGameDialogImpl;
class settingsDialogImpl;
+class selectAvatarDialogImpl;
class aboutPokerthImpl;
class joinNetworkGameDialogImpl;
class connectToServerDialogImpl;
@@ -323,6 +324,7 @@ private:
aboutPokerthImpl *myAboutPokerthDialog;
newGameDialogImpl *myNewGameDialog;
settingsDialogImpl *mySettingsDialog;
+ selectAvatarDialogImpl *mySelectAvatarDialog;
joinNetworkGameDialogImpl *myJoinNetworkGameDialog;
connectToServerDialogImpl *myConnectToServerDialog;
startNetworkGameDialogImpl *myStartNetworkGameDialog;
diff --git a/src/gui/qt/selectavatardialog.ui b/src/gui/qt/selectavatardialog.ui
new file mode 100644
index 00000000..bd3e5233
--- /dev/null
+++ b/src/gui/qt/selectavatardialog.ui
@@ -0,0 +1,135 @@
+
+ selectAvatarDialog
+
+
+
+ 0
+ 0
+ 879
+ 523
+
+
+
+ Please select an avatar
+
+
+
+
+ 480
+ 480
+ 341
+ 32
+
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok
+
+
+
+
+
+ 30
+ 10
+ 581
+ 351
+
+
+
+ false
+
+
+
+ New Row
+
+
+
+
+ New Row
+
+
+
+
+ New Row
+
+
+
+
+ New Row
+
+
+
+
+ New Row
+
+
+
+
+ New Row
+
+
+
+
+ New Row
+
+
+
+
+ New Column
+
+
+
+
+ New Column
+
+
+
+
+ New Column
+
+
+
+
+ New Column
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ selectAvatarDialog
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ selectAvatarDialog
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index fbb43635..5bfff0e9 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -18,12 +18,13 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "settingsdialogimpl.h"
+
#include "configfile.h"
#include
-settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c)
- : QDialog(parent), myConfig(c)
+settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAvatarDialogImpl *s)
+ : QDialog(parent), myConfig(c), mySelectAvatarDialogImpl(s)
{
setupUi(this);
@@ -48,6 +49,8 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c)
connect( pushButton_openAvatarFile5, SIGNAL( clicked() ), this, SLOT( setAvatarFile5()) );
connect( pushButton_openAvatarFile6, SIGNAL( clicked() ), this, SLOT( setAvatarFile6()) );
+ connect( checkBox_showIntro, SIGNAL( clicked() ), this, SLOT( callSelectAvatarDialog()) );
+
}
void settingsDialogImpl::exec() {
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h
index d827f09b..6a0f0b32 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.h
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h
@@ -21,16 +21,18 @@
#define SETTINGSDIALOGIMPL_H
#include "ui_settingsdialog.h"
+#include "selectavatardialogimpl.h"
#include
#include
class ConfigFile;
+class selectAvatarDialogImpl;
class settingsDialogImpl: public QDialog, public Ui::settingsDialog {
Q_OBJECT
public:
- settingsDialogImpl(QWidget *parent = 0, ConfigFile *c = 0);
+ settingsDialogImpl(QWidget *parent = 0, ConfigFile *c = 0, selectAvatarDialogImpl *s = 0);
void exec();
@@ -52,12 +54,16 @@ public slots:
void setAvatarFile4();
void setAvatarFile5();
void setAvatarFile6();
+
+ void callSelectAvatarDialog() { mySelectAvatarDialogImpl->exec(); }
+
private:
bool playerNickIsChanged;
bool settingsCorrect;
ConfigFile* myConfig;
+ selectAvatarDialogImpl* mySelectAvatarDialogImpl;
};