Changed: New button for default location

code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp

@@ -49,9 +49,8 @@ CInstallDialog::CInstallDialog():QDialog()
 
 	updateAnotherLocationText();
 
-	m_dstDirectory = CConfigFile::getNewInstallationDirectory();
+	// update default destination
-
+	onDestinationDefaultButtonClicked();
-	updateDestinationText();
 
 	// check whether OS architecture is 32 or 64 bits
 	if (CConfigFile::has64bitsOS())
@@ -71,6 +70,7 @@ CInstallDialog::CInstallDialog():QDialog()
 	destinationGroupBox->setTitle(tr("Files will be installed to (requires %1):").arg(qBytesToHumanReadable(server.dataUncompressedSize)));
 
 	connect(anotherLocationBrowseButton, SIGNAL(clicked()), SLOT(onAnotherLocationBrowseButtonClicked()));
+	connect(destinationDefaultButton, SIGNAL(clicked()), SLOT(onDestinationDefaultButtonClicked()));
 	connect(destinationBrowseButton, SIGNAL(clicked()), SLOT(onDestinationBrowseButtonClicked()));
 
 	// TODO: if found a folder with initial data, get its total size and check if at least that size is free on the disk
@@ -117,6 +117,13 @@ void CInstallDialog::onAnotherLocationBrowseButtonClicked()
 	updateAnotherLocationText();
 }
 
+void CInstallDialog::onDestinationDefaultButtonClicked()
+{
+	m_dstDirectory = CConfigFile::getNewInstallationDirectory();
+
+	updateDestinationText();
+}
+
 void CInstallDialog::onDestinationBrowseButtonClicked()
 {
 	QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in"));

code/ryzom/tools/client/ryzom_installer/src/installdialog.h

@@ -36,6 +36,7 @@ public:
 private slots:
 	void onShowAdvancedParameters(int state);
 	void onAnotherLocationBrowseButtonClicked();
+	void onDestinationDefaultButtonClicked();
 	void onDestinationBrowseButtonClicked();
 
 	void accept();

code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp

@@ -46,9 +46,8 @@ CMigrateDialog::CMigrateDialog():QDialog()
 		}
 	}
 
-	m_dstDirectory = CConfigFile::getNewInstallationDirectory();
+	// update default destination
-
+	onDestinationDefaultButtonClicked();
-	updateDestinationText();
 
 	// check whether OS architecture is 32 or 64 bits
 	if (CConfigFile::has64bitsOS())
@@ -66,6 +65,7 @@ CMigrateDialog::CMigrateDialog():QDialog()
 
 	destinationGroupBox->setTitle(tr("Files will be installed to (requires %1):").arg(qBytesToHumanReadable(server.dataUncompressedSize)));
 
+	connect(destinationDefaultButton, SIGNAL(clicked()), SLOT(onDestinationDefaultButtonClicked()));
 	connect(destinationBrowseButton, SIGNAL(clicked()), SLOT(onDestinationBrowseButtonClicked()));
 	connect(continueButton, SIGNAL(clicked()), SLOT(accept()));
 	connect(quitButton, SIGNAL(clicked()), SLOT(reject()));
@@ -91,6 +91,13 @@ void CMigrateDialog::onShowAdvancedParameters(int state)
 	adjustSize();
 }
 
+void CMigrateDialog::onDestinationDefaultButtonClicked()
+{
+	m_dstDirectory = CConfigFile::getNewInstallationDirectory();
+
+	updateDestinationText();
+}
+
 void CMigrateDialog::onDestinationBrowseButtonClicked()
 {
 	QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in"));

code/ryzom/tools/client/ryzom_installer/src/migratedialog.h

@@ -35,6 +35,7 @@ public:
 
 private slots:
 	void onShowAdvancedParameters(int state);
+	void onDestinationDefaultButtonClicked();
 	void onDestinationBrowseButtonClicked();
 
 	void accept();

code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui

@@ -146,7 +146,7 @@ Just follow the  different steps and make your choice between the options presen
         <property name="title">
          <string>Files will be installed to (requires 10 GiB):</string>
         </property>
-        <layout class="QHBoxLayout" name="destinationLayout" stretch="1,0">
+        <layout class="QHBoxLayout" name="destinationLayout" stretch="1,0,0">
          <item>
           <widget class="QLabel" name="destinationLabel">
            <property name="text">
@@ -154,6 +154,13 @@ Just follow the  different steps and make your choice between the options presen
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QPushButton" name="destinationDefaultButton">
+           <property name="text">
+            <string>Default</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QPushButton" name="destinationBrowseButton">
            <property name="text">
@@ -206,10 +213,12 @@ Just follow the  different steps and make your choice between the options presen
   </layout>
  </widget>
  <tabstops>
+  <tabstop>advancedCheckBox</tabstop>
   <tabstop>oldDirectoryRadioButton</tabstop>
   <tabstop>anotherLocationRadioButton</tabstop>
   <tabstop>anotherLocationBrowseButton</tabstop>
   <tabstop>internetRadioButton</tabstop>
+  <tabstop>destinationDefaultButton</tabstop>
   <tabstop>destinationBrowseButton</tabstop>
   <tabstop>clientArch64RadioButton</tabstop>
   <tabstop>clientArch32RadioButton</tabstop>

code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui

@@ -93,7 +93,7 @@ Just press Continue button and follow the different steps until everything is do
         <property name="title">
          <string>Files will be installed to (requires 10 GiB):</string>
         </property>
-        <layout class="QHBoxLayout" name="destinationLayout" stretch="1,0">
+        <layout class="QHBoxLayout" name="destinationLayout" stretch="1,0,0">
          <item>
           <widget class="QLabel" name="destinationLabel">
            <property name="text">
@@ -101,6 +101,13 @@ Just press Continue button and follow the different steps until everything is do
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QPushButton" name="destinationDefaultButton">
+           <property name="text">
+            <string>Default</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QPushButton" name="destinationBrowseButton">
            <property name="text">
@@ -174,9 +181,13 @@ Just press Continue button and follow the different steps until everything is do
   </layout>
  </widget>
  <tabstops>
+  <tabstop>advancedCheckBox</tabstop>
+  <tabstop>destinationDefaultButton</tabstop>
   <tabstop>destinationBrowseButton</tabstop>
   <tabstop>clientArch64RadioButton</tabstop>
   <tabstop>clientArch32RadioButton</tabstop>
+  <tabstop>continueButton</tabstop>
+  <tabstop>quitButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>