From a65816db7d9120cb4548e8277da1e627272fb937 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tomaz.canabrava@intel.com>
Date: Sun, 28 Dec 2014 21:46:42 -0200
Subject: Remove uneeded Facebook album setting

This now is chosen directly from the popup box that appears when you try
to send a picture to facebook.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/preferences.cpp    |  2 --
 qt-ui/preferences.ui     | 28 +++++++---------------------
 qt-ui/socialnetworks.cpp |  1 -
 3 files changed, 7 insertions(+), 24 deletions(-)

(limited to 'qt-ui')

diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp
index c3ae3b5f7..871faeace 100644
--- a/qt-ui/preferences.cpp
+++ b/qt-ui/preferences.cpp
@@ -38,8 +38,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WindowFlags f) : QDial
 	} else {
 		ui.facebookWebView->setUrl(fb->connectUrl());
 	}
-	fb->setDesiredAlbumName(ui.facebookAlbum->text());
-	connect(ui.facebookAlbum, &QLineEdit::textChanged, fb, &FacebookManager::setDesiredAlbumName);
 	connect(ui.facebookWebView, &QWebView::urlChanged, fb, &FacebookManager::tryLogin);
 	connect(fb, &FacebookManager::justLoggedIn, this, &PreferencesDialog::facebookLoggedIn);
 	connect(ui.btnDisconnectFacebook, &QPushButton::clicked, fb, &FacebookManager::logout);
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui
index 50fdd71a3..4b69636b4 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>924</width>
-    <height>735</height>
+    <height>742</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -987,20 +987,6 @@
            <layout class="QVBoxLayout" name="verticalLayout_9">
             <item>
              <layout class="QHBoxLayout" name="connectedLayout">
-              <item>
-               <widget class="QLabel" name="label_26">
-                <property name="text">
-                 <string>Facebook Album for Subsurface Uploads</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QLineEdit" name="facebookAlbum">
-                <property name="text">
-                 <string>subsurface</string>
-                </property>
-               </widget>
-              </item>
               <item>
                <spacer name="horizontalSpacer_2">
                 <property name="orientation">
@@ -1048,7 +1034,7 @@
   <customwidget>
    <class>QWebView</class>
    <extends>QWidget</extends>
-   <header>QtWebKit/QWebView</header>
+   <header>QtWebKitWidgets/QWebView</header>
   </customwidget>
  </customwidgets>
  <resources/>
@@ -1391,12 +1377,12 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="verticalSpeed"/>
-  <buttongroup name="buttonGroup_2"/>
   <buttongroup name="buttonGroup_3"/>
-  <buttongroup name="buttonGroup_4"/>
-  <buttongroup name="buttonGroup_5"/>
-  <buttongroup name="buttonGroup_6"/>
   <buttongroup name="buttonGroup"/>
+  <buttongroup name="buttonGroup_6"/>
+  <buttongroup name="buttonGroup_5"/>
+  <buttongroup name="buttonGroup_2"/>
+  <buttongroup name="buttonGroup_4"/>
+  <buttongroup name="verticalSpeed"/>
  </buttongroups>
 </ui>
diff --git a/qt-ui/socialnetworks.cpp b/qt-ui/socialnetworks.cpp
index 8d24b2269..2be2c8671 100644
--- a/qt-ui/socialnetworks.cpp
+++ b/qt-ui/socialnetworks.cpp
@@ -196,7 +196,6 @@ void FacebookManager::sendDive()
 	if (dialog.exec() != QDialog::Accepted)
 		return;
 
-
 	setDesiredAlbumName(dialog.album());
 	requestAlbumId();
 
-- 
cgit v1.2.3-70-g09d2