From ac77d98aff8fe4ee450316eb246c67d21947bea0 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sat, 11 Jun 2016 16:57:19 +0200
Subject: [PATCH] Changed: Removed account option

---
 .../client/ryzom_installer/src/configfile.cpp |  2 -
 .../client/ryzom_installer/src/configfile.h   |  1 -
 .../ryzom_installer/src/profilesdialog.cpp    |  3 --
 .../client/ryzom_installer/ui/profiles.ui     | 43 +++++++------------
 4 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
index 91877eb9e..d10e227ef 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
@@ -127,7 +127,6 @@ bool CConfigFile::load(const QString &filename)
 
 		profile.id = settings.value("id").toString();
 		profile.name = settings.value("name").toString();
-		profile.account = settings.value("account").toString();
 		profile.server = settings.value("server").toString();
 		profile.executable = settings.value("executable").toString();
 		profile.arguments = settings.value("arguments").toString();
@@ -216,7 +215,6 @@ bool CConfigFile::save() const
 
 		settings.setValue("id", profile.id);
 		settings.setValue("name", profile.name);
-		settings.setValue("account", profile.account);
 		settings.setValue("server", profile.server);
 		settings.setValue("executable", profile.executable);
 		settings.setValue("arguments", profile.arguments);
diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.h b/code/ryzom/tools/client/ryzom_installer/src/configfile.h
index aa3a61f8b..fe2dcb05e 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/configfile.h
+++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.h
@@ -54,7 +54,6 @@ struct CProfile
 	}
 
 	QString id;
-	QString account;
 	QString name;
 	QString server;
 	QString executable;
diff --git a/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp
index d113ab2c2..bc3cf8d76 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp
@@ -85,7 +85,6 @@ void CProfilesDialog::displayProfile(int index)
 	bool enabled = index > -1;
 
 	profileIdLabel->setEnabled(enabled);
-	accountEdit->setEnabled(enabled);
 	nameEdit->setEnabled(enabled);
 	serverComboBox->setEnabled(enabled);
 	argumentsEdit->setEnabled(enabled);
@@ -99,7 +98,6 @@ void CProfilesDialog::displayProfile(int index)
 
 	// update all widgets with content of profile
 	profileIdLabel->setText(profile.id);
-	accountEdit->setText(profile.account);
 	nameEdit->setText(profile.name);
 	serverComboBox->setCurrentIndex(m_serversModel->getIndexFromServerID(profile.server));
 	executablePathLabel->setText(QFileInfo(profile.executable).fileName());
@@ -120,7 +118,6 @@ void CProfilesDialog::saveProfile(int index)
 
 	CProfile &profile = m_model->getProfiles()[index];
 	
-	profile.account = accountEdit->text();
 	profile.name = nameEdit->text();
 	profile.server = m_serversModel->getServerIDFromIndex(serverComboBox->currentIndex());
 	profile.arguments = argumentsEdit->text();
diff --git a/code/ryzom/tools/client/ryzom_installer/ui/profiles.ui b/code/ryzom/tools/client/ryzom_installer/ui/profiles.ui
index 1e3e42768..c0c12bab2 100644
--- a/code/ryzom/tools/client/ryzom_installer/ui/profiles.ui
+++ b/code/ryzom/tools/client/ryzom_installer/ui/profiles.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>583</width>
-    <height>368</height>
+    <height>348</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -81,33 +81,23 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="accountLabel">
-         <property name="text">
-          <string>Account:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="accountEdit"/>
-       </item>
-       <item row="2" column="0">
         <widget class="QLabel" name="nameLabel">
          <property name="text">
           <string>Name:</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
+       <item row="1" column="1">
         <widget class="QLineEdit" name="nameEdit"/>
        </item>
-       <item row="3" column="0">
+       <item row="2" column="0">
         <widget class="QLabel" name="serverLabel">
          <property name="text">
           <string>Server:</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
+       <item row="2" column="1">
         <widget class="QComboBox" name="serverComboBox">
          <item>
           <property name="text">
@@ -121,14 +111,14 @@
          </item>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="executableLabel">
          <property name="text">
           <string>Executable:</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
+       <item row="3" column="1">
         <layout class="QHBoxLayout" name="executableLayout" stretch="1,0">
          <item>
           <widget class="QLabel" name="executablePathLabel">
@@ -146,38 +136,38 @@
          </item>
         </layout>
        </item>
-       <item row="5" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="clientVersionLabel">
          <property name="text">
           <string>Client version:</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="4" column="1">
         <widget class="QLabel" name="executableVersionLabel">
          <property name="text">
           <string>FV 3.0.0</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="argumentsLabel">
          <property name="text">
           <string>Arguments:</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
+       <item row="5" column="1">
         <widget class="QLineEdit" name="argumentsEdit"/>
        </item>
-       <item row="7" column="0">
+       <item row="6" column="0">
         <widget class="QLabel" name="commentsLabel">
          <property name="text">
           <string>Comments:</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="1">
+       <item row="6" column="1">
         <widget class="QPlainTextEdit" name="commentsEdit">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -187,14 +177,14 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="0">
+       <item row="7" column="0">
         <widget class="QLabel" name="directoryLabel">
          <property name="text">
           <string>Directory:</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="1">
+       <item row="7" column="1">
         <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
          <item>
           <widget class="QLabel" name="directoryPathLabel">
@@ -212,14 +202,14 @@
          </item>
         </layout>
        </item>
-       <item row="9" column="0">
+       <item row="8" column="0">
         <widget class="QLabel" name="shortcutsLabel">
          <property name="text">
           <string>Create shortcuts:</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="1">
+       <item row="8" column="1">
         <layout class="QVBoxLayout" name="shortcutsLayout">
          <item>
           <widget class="QCheckBox" name="desktopShortcutCheckBox">
@@ -257,7 +247,6 @@
   <tabstop>profilesListView</tabstop>
   <tabstop>addButton</tabstop>
   <tabstop>deleteButton</tabstop>
-  <tabstop>accountEdit</tabstop>
   <tabstop>nameEdit</tabstop>
   <tabstop>serverComboBox</tabstop>
   <tabstop>executableBrowseButton</tabstop>