From a12b47c4466cde9da9c6ca127a0084cca10ae6ac Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sat, 6 Aug 2016 20:10:31 +0200
Subject: [PATCH] Changed: Display directories in Settings, see #279

---
 .../ryzom_installer/src/settingsdialog.cpp    | 20 +++++--
 .../ryzom_installer/src/settingsdialog.h      |  7 +++
 .../ryzom_installer/ui/settingsdialog.ui      | 54 ++++++++++++-------
 3 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp
index 7ffe515f5..53090b592 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp
@@ -28,6 +28,10 @@ CSettingsDialog::CSettingsDialog(QWidget *parent):QDialog(parent)
 
 	CConfigFile *config = CConfigFile::getInstance();
 
+	m_installationDirectory = config->getInstallationDirectory();
+
+	updateInstallationDirectoryLabel();
+
 	// only 64 bits OS can switch between 32 and 64 bits
 	use64bitsClientsCheckBox->setEnabled(config->has64bitsOS());
 
@@ -47,6 +51,11 @@ CSettingsDialog::~CSettingsDialog()
 {
 }
 
+QString CSettingsDialog::getInstallationDirectory() const
+{
+	return m_installationDirectory;
+}
+
 void CSettingsDialog::accept()
 {
 	// TODO: add save code
@@ -56,11 +65,16 @@ void CSettingsDialog::accept()
 
 void CSettingsDialog::onInstallationDirectoryButtonClicked()
 {
-	QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom"));
+	QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom"), m_installationDirectory);
 
 	if (directory.isEmpty()) return;
 
-//	m_dstDirectory = directory;
+	m_installationDirectory = directory;
 
-//	updateDestinationText();
+	updateInstallationDirectoryLabel();
+}
+
+void CSettingsDialog::updateInstallationDirectoryLabel()
+{
+	installationDirectoryLabel->setText(m_installationDirectory);
 }
diff --git a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h
index 285a6417b..c2b3d69c8 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h
+++ b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h
@@ -33,11 +33,18 @@ public:
 	CSettingsDialog(QWidget *parent = NULL);
 	virtual ~CSettingsDialog();
 
+	QString getInstallationDirectory() const;
+
 public slots:
 	void onInstallationDirectoryButtonClicked();
 
 private slots:
 	void accept();
+
+private:
+	void updateInstallationDirectoryLabel();
+
+	QString m_installationDirectory;
 };
 
 #endif
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui
index 4887ced56..11f91f7d4 100644
--- a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui
+++ b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>428</width>
     <height>150</height>
    </rect>
   </property>
@@ -15,25 +15,36 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="3" column="0">
+      <widget class="QCheckBox" name="use64bitsClientsCheckBox">
+       <property name="text">
+        <string>Use 64 bits client</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="installationDirectoryLabelTitle">
+       <property name="text">
+        <string>Base location of Ryzom files:</string>
+       </property>
+      </widget>
+     </item>
      <item row="0" column="0">
-      <widget class="QLabel" name="label_2">
+      <widget class="QLabel" name="languageLabel">
        <property name="text">
         <string>Language</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="languageComboBox"/>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label">
+     <item row="2" column="2">
+      <widget class="QPushButton" name="oldDirectoryButton">
        <property name="text">
-        <string>Base location of Ryzom files: %1</string>
+        <string>Browse...</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="1" column="2">
       <widget class="QPushButton" name="installationDirectoryButton">
        <property name="text">
         <string>Browse...</string>
@@ -41,25 +52,28 @@
       </widget>
      </item>
      <item row="2" column="0">
-      <widget class="QLabel" name="label_3">
+      <widget class="QLabel" name="oldDirectoryLabelTitle">
        <property name="text">
-        <string>Location of source Ryzom files: %1</string>
+        <string>Location of source Ryzom files:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="installationDirectoryLabel">
+       <property name="text">
+        <string>D:\Ryzom</string>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QPushButton" name="pushButton_2">
+      <widget class="QLabel" name="oldDirectoryLabel">
        <property name="text">
-        <string>Browse...</string>
+        <string>E:\Ryzom</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QCheckBox" name="use64bitsClientsCheckBox">
-       <property name="text">
-        <string>Use 64 bits client</string>
-       </property>
-      </widget>
+     <item row="0" column="2">
+      <widget class="QComboBox" name="languageComboBox"/>
      </item>
     </layout>
    </item>