From a6b667478034cee6efde4b0828ad4a263345355f Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sun, 31 May 2015 17:42:12 -0700
Subject: Cloud storage: rethink the terminology used

Cloud storage makes more sense that remote storage - at least I assume
that more people are used to thinking about "storing things in the cloud".

Don't use PIN or passphrase, call it a password everywhere.

Don't use copy_string() to copy the password - the git credentials routine
asserts that password is not NULL, so make sure we at least have a pointer
to an empty string here.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/preferences.cpp | 28 +++++++++++++---------------
 qt-ui/preferences.ui  | 22 +++++++++++-----------
 2 files changed, 24 insertions(+), 26 deletions(-)

(limited to 'qt-ui')

diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp
index da3a45715..f0f1212a2 100644
--- a/qt-ui/preferences.cpp
+++ b/qt-ui/preferences.cpp
@@ -205,11 +205,9 @@ void PreferencesDialog::setUiFromPrefs()
 	ui.proxyType->setCurrentIndex(ui.proxyType->findData(prefs.proxy_type));
 	ui.btnUseDefaultFile->setChecked(prefs.use_default_file);
 
-	s.beginGroup("RemoteStorage");
-	ui.remote_storage_email->setText(prefs.remote_storage_email);
-	ui.remote_storage_pin->setText(prefs.passphrase);
-	ui.save_PIN_local->setChecked(prefs.save_PIN_local);
-	s.endGroup();
+	ui.cloud_storage_email->setText(prefs.cloud_storage_email);
+	ui.cloud_storage_password->setText(prefs.cloud_storage_password);
+	ui.save_password_local->setChecked(prefs.save_password_local);
 }
 
 void PreferencesDialog::restorePrefs()
@@ -361,13 +359,13 @@ void PreferencesDialog::syncSettings()
 	s.setValue("proxy_pass", ui.proxyPassword->text());
 	s.endGroup();
 
-	s.beginGroup("RemoteStorage");
-	SAVE_OR_REMOVE("remote_storage_email", default_prefs.remote_storage_email, ui.remote_storage_email->text());
-	SAVE_OR_REMOVE("save_PIN_local", default_prefs.save_PIN_local, ui.save_PIN_local->isChecked());
-	if (ui.save_PIN_local->isChecked())
-		SAVE_OR_REMOVE("passphrase", default_prefs.passphrase, ui.remote_storage_pin->text());
+	s.beginGroup("CloudStorage");
+	SAVE_OR_REMOVE("email", default_prefs.cloud_storage_email, ui.cloud_storage_email->text());
+	SAVE_OR_REMOVE("save_password_local", default_prefs.save_password_local, ui.save_password_local->isChecked());
+	if (ui.save_password_local->isChecked())
+		SAVE_OR_REMOVE("password", default_prefs.cloud_storage_password, ui.cloud_storage_password->text());
 	else
-		s.remove("passphrase");
+		s.remove("password");
 	s.endGroup();
 	loadSettings();
 	emit settingsChanged();
@@ -480,10 +478,10 @@ void PreferencesDialog::loadSettings()
 	GET_TXT("proxy_pass", proxy_pass);
 	s.endGroup();
 
-	s.beginGroup("RemoteStorage");
-	GET_TXT("passphrase", passphrase);
-	GET_TXT("remote_storage_email", remote_storage_email);
-	GET_BOOL("save_PIN_local", save_PIN_local);
+	s.beginGroup("CloudStorage");
+	GET_TXT("password", cloud_storage_password);
+	GET_TXT("email", cloud_storage_email);
+	GET_BOOL("save_password_local", save_password_local);
 	s.endGroup();
 }
 
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui
index 05a30f0cf..1692ab069 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -420,7 +420,7 @@
              <item row="0" column="0">
               <widget class="QLabel" name="label_16b">
                <property name="toolTip">
-                <string extracomment="Email address used for the Subsurface remote storage infrastructure"/>
+                <string extracomment="Email address used for the Subsurface cloud storage infrastructure"/>
                </property>
                <property name="text">
                 <string>Email address</string>
@@ -430,24 +430,24 @@
              <item row="0" column="1">
               <widget class="QLabel" name="label_16c">
                <property name="text">
-                <string>PIN</string>
+                <string>Password</string>
                </property>
               </widget>
              </item>
              <item row="1" column="0">
-              <widget class="QLineEdit" name="remote_storage_email">
+              <widget class="QLineEdit" name="cloud_storage_email">
                <property name="toolTip">
-                <string extracomment="Email address used for the Subsurface remote storage infrastructure"/>
+                <string extracomment="Email address used for the Subsurface cloud storage infrastructure"/>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
-              <widget class="QLineEdit" name="remote_storage_pin"/>
+              <widget class="QLineEdit" name="cloud_storage_password"/>
              </item>
              <item row="2" column="1">
-              <widget class="QCheckBox" name="save_PIN_local">
+              <widget class="QCheckBox" name="save_password_local">
                <property name="text">
-                <string>Save PIN locally?</string>
+                <string>Save Password locally?</string>
                </property>
               </widget>
              </item>
@@ -1733,13 +1733,13 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="buttonGroup_7"/>
-  <buttongroup name="buttonGroup_4"/>
   <buttongroup name="buttonGroup_2"/>
+  <buttongroup name="buttonGroup_4"/>
+  <buttongroup name="buttonGroup_3"/>
   <buttongroup name="buttonGroup_5"/>
+  <buttongroup name="buttonGroup"/>
   <buttongroup name="buttonGroup_6"/>
+  <buttongroup name="buttonGroup_7"/>
   <buttongroup name="verticalSpeed"/>
-  <buttongroup name="buttonGroup_3"/>
-  <buttongroup name="buttonGroup"/>
  </buttongroups>
 </ui>
-- 
cgit v1.2.3-70-g09d2