From 64841ed85a090fdd16d39ca7d62fee6295033513 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Tue, 1 Mar 2016 13:48:51 +0100
Subject: [PATCH] Changed: Renamed configurations to profiles

---
 .../client/ryzom_installer/src/mainwindow.cpp | 16 +++++++++---
 .../client/ryzom_installer/src/mainwindow.h   |  1 +
 .../ryzom_installer/src/profilesdialog.h      |  2 +-
 .../client/ryzom_installer/ui/mainwindow.ui   | 14 +++++-----
 .../client/ryzom_installer/ui/profiles.ui     | 26 +++++++++----------
 5 files changed, 34 insertions(+), 25 deletions(-)

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("<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; }
     <property name="title">
      <string>&amp;Settings</string>
     </property>
-    <addaction name="action_Configurations"/>
-    <addaction name="action_Directories"/>
+    <addaction name="actionProfiles"/>
+    <addaction name="actionDirectories"/>
     <addaction name="separator"/>
-    <addaction name="action_Quit"/>
+    <addaction name="actionQuit"/>
    </widget>
    <widget class="QMenu" name="menu_Help">
     <property name="title">
@@ -189,17 +189,17 @@ p, li { white-space: pre-wrap; }
     <string>About...</string>
    </property>
   </action>
-  <action name="action_Configurations">
+  <action name="actionProfiles">
    <property name="text">
-    <string>&amp;Configurations</string>
+    <string>&amp;Profiles</string>
    </property>
   </action>
-  <action name="action_Directories">
+  <action name="actionDirectories">
    <property name="text">
     <string>&amp;Directories</string>
    </property>
   </action>
-  <action name="action_Quit">
+  <action name="actionQuit">
    <property name="text">
     <string>&amp;Quit</string>
    </property>
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/profiles.ui b/code/ryzom/tools/client/ryzom_installer/ui/profiles.ui
index 82cd5f9e0..8a5f40df8 100644
--- a/code/ryzom/tools/client/ryzom_installer/ui/profiles.ui
+++ b/code/ryzom/tools/client/ryzom_installer/ui/profiles.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ConfigurationsDialog</class>
- <widget class="QDialog" name="ConfigurationsDialog">
+ <class>ProfilesDialog</class>
+ <widget class="QDialog" name="ProfilesDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -17,16 +17,16 @@
    <item>
     <layout class="QHBoxLayout" name="mainLayout">
      <item>
-      <layout class="QVBoxLayout" name="configurationsLayout" stretch="0,1,0">
+      <layout class="QVBoxLayout" name="profilesLayout" stretch="0,1,0">
        <item>
-        <widget class="QLabel" name="configurationsLabel">
+        <widget class="QLabel" name="profilesLabel">
          <property name="text">
-          <string>List of configurations:</string>
+          <string>List of profiles:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QListView" name="configurationsListView">
+        <widget class="QListView" name="profilesListView">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Ignored" vsizetype="Expanding">
            <horstretch>0</horstretch>
@@ -45,7 +45,7 @@
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="configurationsActionsLayout" stretch="0,0">
+        <layout class="QHBoxLayout" name="profilesActionsLayout" stretch="0,0">
          <item>
           <widget class="QPushButton" name="addButton">
            <property name="text">
@@ -67,14 +67,14 @@
      <item>
       <layout class="QFormLayout" name="formLayout">
        <item row="0" column="0">
-        <widget class="QLabel" name="configurationLabel">
+        <widget class="QLabel" name="profileLabel">
          <property name="text">
-          <string>Configuration:</string>
+          <string>Profile:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="QLabel" name="configurationIdLabel">
+        <widget class="QLabel" name="profileIdLabel">
          <property name="text">
           <string>0</string>
          </property>
@@ -254,7 +254,7 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>configurationsListView</tabstop>
+  <tabstop>profilesListView</tabstop>
   <tabstop>addButton</tabstop>
   <tabstop>deleteButton</tabstop>
   <tabstop>accountEdit</tabstop>
@@ -272,7 +272,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>ConfigurationsDialog</receiver>
+   <receiver>ProfilesDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -288,7 +288,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>ConfigurationsDialog</receiver>
+   <receiver>ProfilesDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">