avatar gallery started
This commit is contained in:
@@ -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 \
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
<ui version="4.0" >
|
||||
<class>selectAvatarDialog</class>
|
||||
<widget class="QDialog" name="selectAvatarDialog" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>879</width>
|
||||
<height>523</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>Please select an avatar</string>
|
||||
</property>
|
||||
<widget class="QDialogButtonBox" name="buttonBox" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>480</x>
|
||||
<y>480</y>
|
||||
<width>341</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons" >
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QTableWidget" name="tableWidget" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>30</x>
|
||||
<y>10</y>
|
||||
<width>581</width>
|
||||
<height>351</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="showGrid" >
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<row>
|
||||
<property name="text" >
|
||||
<string>New Row</string>
|
||||
</property>
|
||||
</row>
|
||||
<row>
|
||||
<property name="text" >
|
||||
<string>New Row</string>
|
||||
</property>
|
||||
</row>
|
||||
<row>
|
||||
<property name="text" >
|
||||
<string>New Row</string>
|
||||
</property>
|
||||
</row>
|
||||
<row>
|
||||
<property name="text" >
|
||||
<string>New Row</string>
|
||||
</property>
|
||||
</row>
|
||||
<row>
|
||||
<property name="text" >
|
||||
<string>New Row</string>
|
||||
</property>
|
||||
</row>
|
||||
<row>
|
||||
<property name="text" >
|
||||
<string>New Row</string>
|
||||
</property>
|
||||
</row>
|
||||
<row>
|
||||
<property name="text" >
|
||||
<string>New Row</string>
|
||||
</property>
|
||||
</row>
|
||||
<column>
|
||||
<property name="text" >
|
||||
<string>New Column</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
<property name="text" >
|
||||
<string>New Column</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
<property name="text" >
|
||||
<string>New Column</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
<property name="text" >
|
||||
<string>New Column</string>
|
||||
</property>
|
||||
</column>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>selectAvatarDialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>selectAvatarDialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
@@ -18,12 +18,13 @@
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
#include "settingsdialogimpl.h"
|
||||
|
||||
#include "configfile.h"
|
||||
#include <iostream>
|
||||
|
||||
|
||||
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() {
|
||||
|
||||
@@ -21,16 +21,18 @@
|
||||
#define SETTINGSDIALOGIMPL_H
|
||||
|
||||
#include "ui_settingsdialog.h"
|
||||
#include "selectavatardialogimpl.h"
|
||||
|
||||
#include <QtCore>
|
||||
#include <QtGui>
|
||||
|
||||
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;
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user