mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove uneeded Facebook album setting

Browse source 
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>
This commit is contained in:
Tomaz Canabrava 2014-12-28 21:46:42 -02:00 • committed by Dirk Hohndel
parent b84edad597
commit a65816db7d
3 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/preferences.cpp
View file

@ -38,8 +38,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WindowFlags f) : QDial
} else { } else {
ui.facebookWebView->setUrl(fb->connectUrl()); 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(ui.facebookWebView, &QWebView::urlChanged, fb, &FacebookManager::tryLogin);
connect(fb, &FacebookManager::justLoggedIn, this, &PreferencesDialog::facebookLoggedIn); connect(fb, &FacebookManager::justLoggedIn, this, &PreferencesDialog::facebookLoggedIn);
connect(ui.btnDisconnectFacebook, &QPushButton::clicked, fb, &FacebookManager::logout); connect(ui.btnDisconnectFacebook, &QPushButton::clicked, fb, &FacebookManager::logout);

28
qt-ui/preferences.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>924</width> <width>924</width>
<height>735</height> <height>742</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -987,20 +987,6 @@
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QVBoxLayout" name="verticalLayout_9">
<item> <item>
<layout class="QHBoxLayout" name="connectedLayout"> <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> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
@ -1048,7 +1034,7 @@
<customwidget> <customwidget>
<class>QWebView</class> <class>QWebView</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>QtWebKit/QWebView</header> <header>QtWebKitWidgets/QWebView</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
@ -1391,12 +1377,12 @@
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="verticalSpeed"/>
<buttongroup name="buttonGroup_2"/>
<buttongroup name="buttonGroup_3"/> <buttongroup name="buttonGroup_3"/>
<buttongroup name="buttonGroup_4"/>
<buttongroup name="buttonGroup_5"/>
<buttongroup name="buttonGroup_6"/>
<buttongroup name="buttonGroup"/> <buttongroup name="buttonGroup"/>
<buttongroup name="buttonGroup_6"/>
<buttongroup name="buttonGroup_5"/>
<buttongroup name="buttonGroup_2"/>
<buttongroup name="buttonGroup_4"/>
<buttongroup name="verticalSpeed"/>
</buttongroups> </buttongroups>
</ui> </ui>

1
qt-ui/socialnetworks.cpp
View file

@ -196,7 +196,6 @@ void FacebookManager::sendDive()
if (dialog.exec() != QDialog::Accepted) if (dialog.exec() != QDialog::Accepted)
return; return;
setDesiredAlbumName(dialog.album()); setDesiredAlbumName(dialog.album());
requestAlbumId(); requestAlbumId();