From 90fb34baab66bfb345d0eba063795f284ee2e415 Mon Sep 17 00:00:00 2001
From: Jan Mulder <jlmulder@xs4all.nl>
Date: Sun, 9 Sep 2018 09:38:47 +0200
Subject: Desktop: Remove webservice, remove UI components (1)

The very first part of the full removal of the GPS webservice. This
removes the UI artefacts and a tiny bit fallout. This leaves in place
all the background processing.

Be very careful here as this can break workflow of users that currently
have unapplied GPS coordinates sitting in the webservice, and do upgrade
to the version where this commit goes in. They have no clean UI way any more
to apply those GPS fixes from the desktop.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
---
 desktop-widgets/mainwindow.ui                      |  9 ------
 .../preferences/preferences_network.cpp            |  5 ----
 desktop-widgets/preferences/preferences_network.ui | 32 ----------------------
 3 files changed, 46 deletions(-)

(limited to 'desktop-widgets')

diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui
index 51d334969..5c7e20fad 100644
--- a/desktop-widgets/mainwindow.ui
+++ b/desktop-widgets/mainwindow.ui
@@ -125,7 +125,6 @@
     </property>
     <addaction name="actionDownloadDC"/>
     <addaction name="actionImportDiveLog"/>
-    <addaction name="actionDownloadWeb"/>
     <addaction name="actionDivelogs_de"/>
    </widget>
    <widget class="QMenu" name="menu_Edit">
@@ -240,14 +239,6 @@
     <string notr="true">Ctrl+D</string>
    </property>
   </action>
-  <action name="actionDownloadWeb">
-   <property name="text">
-    <string>Import &amp;GPS data from Subsurface web service</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true">Ctrl+G</string>
-   </property>
-  </action>
   <action name="actionEditDeviceNames">
    <property name="text">
     <string>Edit device &amp;names</string>
diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp
index cb827f578..67b28c8f1 100644
--- a/desktop-widgets/preferences/preferences_network.cpp
+++ b/desktop-widgets/preferences/preferences_network.cpp
@@ -37,8 +37,6 @@ void PreferencesNetwork::refreshSettings()
 	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);
-	ui->save_uid_local->setChecked(prefs.save_userid_local);
-	ui->default_uid->setText(QString(prefs.userid).toUpper());
 	updateCloudAuthenticationState();
 }
 
@@ -47,9 +45,6 @@ void PreferencesNetwork::syncSettings()
 	auto cloud = qPrefCloudStorage::instance();
 	auto proxy = qPrefProxy::instance();
 
-	cloud->set_userid(ui->default_uid->text().toUpper());
-	cloud->set_save_userid_local(ui->save_uid_local->checkState());
-
 	proxy->set_proxy_type(ui->proxyType->itemData(ui->proxyType->currentIndex()).toInt());
 	proxy->set_proxy_host(ui->proxyHost->text());
 	proxy->set_proxy_port(ui->proxyPort->value());
diff --git a/desktop-widgets/preferences/preferences_network.ui b/desktop-widgets/preferences/preferences_network.ui
index 74f2548c1..7be1d3f4f 100644
--- a/desktop-widgets/preferences/preferences_network.ui
+++ b/desktop-widgets/preferences/preferences_network.ui
@@ -225,38 +225,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_8">
-     <property name="title">
-      <string>Subsurface web service</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_7">
-      <property name="spacing">
-       <number>5</number>
-      </property>
-      <property name="margin">
-       <number>5</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="label_16">
-        <property name="text">
-         <string>Default user ID</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="default_uid"/>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="save_uid_local">
-        <property name="text">
-         <string>Save user ID locally?</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
-- 
cgit v1.2.3-70-g09d2