diff --git a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
index 1fccb6fcb..d316bc6c9 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
@@ -19,6 +19,7 @@
#include "downloader.h"
#include "archive.h"
#include "wizarddialog.h"
+#include "profilesdialog.h"
#include "configfile.h"
#include "config.h"
@@ -67,6 +68,8 @@ CMainWindow::CMainWindow():QMainWindow(), m_archive(NULL), m_statusLabel(NULL)
connect(m_archive, SIGNAL(extractSuccess(qint64)), SLOT(onExtractSuccess(qint64)));
connect(m_archive, SIGNAL(extractFail(QString)), SLOT(onExtractFail(QString)));
+ connect(actionProfiles, SIGNAL(triggered()), SLOT(onProfiles()));
+
connect(actionAboutQt, SIGNAL(triggered()), SLOT(onAboutQt()));
connect(actionAbout, SIGNAL(triggered()), SLOT(onAbout()));
@@ -75,10 +78,6 @@ CMainWindow::CMainWindow():QMainWindow(), m_archive(NULL), m_statusLabel(NULL)
statusBar()->addWidget(m_statusLabel);
// setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
-
-// processNextStep();
-
- m_archive->extract("d:/Ryzom/bonjourx.7z", "");
}
CMainWindow::~CMainWindow()
@@ -175,6 +174,8 @@ void CMainWindow::showEvent(QShowEvent *e)
#endif
e->accept();
+
+ processNextStep();
}
void CMainWindow::closeEvent(QCloseEvent *e)
@@ -208,6 +209,13 @@ void CMainWindow::onStopClicked()
}
}
+void CMainWindow::onProfiles()
+{
+ CProfilesDialog dialog;
+
+ dialog.exec();
+}
+
void CMainWindow::onAbout()
{
QString br("
");
diff --git a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.h b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.h
index bf14b8b4d..7e03f9a80 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.h
+++ b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.h
@@ -41,6 +41,7 @@ public slots:
void onResumeClicked();
void onStopClicked();
+ void onProfiles();
void onAbout();
void onAboutQt();
diff --git a/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.h b/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.h
index 1ba25c5e0..5da0df89b 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.h
+++ b/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.h
@@ -19,7 +19,7 @@
#include "ui_profiles.h"
-class CProfilesDialog : public QDialog, public Ui::ConfigurationsDialog
+class CProfilesDialog : public QDialog, public Ui::ProfilesDialog
{
Q_OBJECT
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui b/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui
index ec7e52ad7..ee9bd7b0e 100644
--- a/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui
+++ b/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui
@@ -159,10 +159,10 @@ p, li { white-space: pre-wrap; }
&Settings
-
-
+
+
-
+