diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp
index d9622d2a8..c93460f9a 100644
--- a/qt-ui/preferences.cpp
+++ b/qt-ui/preferences.cpp
@@ -82,7 +82,7 @@ void PreferencesDialog::facebookLoggedIn()
#ifndef Q_OS_ANDROID
// remove the login view and add the disconnect button
ui.fbLayout->removeItem(ui.fbLayout->itemAt(1));
- ui.fbLayout->addWidget(ui.fbConnected);
+ ui.fbLayout->insertWidget(1, ui.fbConnected, 0);
ui.fbConnected->show();
ui.FBLabel->setText(tr("To disconnect Subsurface from your Facebook account, use the button below"));
if (facebookWebView)
@@ -96,7 +96,7 @@ void PreferencesDialog::facebookDisconnect()
// remove the connect/disconnect button
// and instead add the login view
ui.fbLayout->removeItem(ui.fbLayout->itemAt(1));
- ui.fbLayout->addWidget(facebookWebView);
+ ui.fbLayout->insertWidget(1, facebookWebView, 1);
ui.fbConnected->hide();
ui.FBLabel->setText(tr("To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline"));
if (facebookWebView) {
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui
index 980da4abd..1b59e77a5 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -6,8 +6,8 @@
0
0
- 868
- 853
+ 711
+ 662
@@ -32,7 +32,7 @@
5
-
-
+
-
@@ -168,9 +168,15 @@
- 6
+ 0
+
+
+ 0
+ 0
+
+
5
@@ -192,13 +198,7 @@
Lists and tables
-
-
- 5
-
-
- 5
-
+
5
@@ -211,24 +211,24 @@
5
-
-
+
-
Font
- -
+
-
- -
+
-
Font size
- -
+
-
@@ -290,7 +290,7 @@
-
- Cloud storage default file
+ Clo&ud storage default file
defaultFileGroup
@@ -433,47 +433,6 @@
- -
-
-
- Subsurface web service
-
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
-
-
-
- Default user ID
-
-
-
- -
-
-
- -
-
-
- Save user ID locally?
-
-
-
-
-
-
-
@@ -521,6 +480,12 @@
+
+
+ 0
+ 0
+
+
5
@@ -538,50 +503,55 @@
5
-
-
-
-
-
-
- System
-
-
-
- -
-
-
- &Metric
-
-
- buttonGroup_6
-
-
-
- -
-
-
- Imperial
-
-
- buttonGroup_6
-
-
-
- -
-
-
- Personali&ze
-
-
- buttonGroup_6
-
-
-
-
+
+
+ Unit system
+
+
+ -
+
+
+ System
+
+
+
+ -
+
+
+ &Metric
+
+
+ buttonGroup_6
+
+
+
+ -
+
+
+ Imperial
+
+
+ buttonGroup_6
+
+
+
+ -
+
+
+ Personali&ze
+
+
+ buttonGroup_6
+
+
+
+
+
-
-
+ Individual settings
false
@@ -820,6 +790,12 @@
+
+
+ 0
+ 0
+
+
5
@@ -1114,10 +1090,19 @@
-
+
+
+ 0
+ 0
+
+
+
5
+
+ QLayout::SetNoConstraint
+
5
@@ -1131,45 +1116,82 @@
5
-
-
-
-
-
-
- System default
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Filter
-
-
-
- -
-
-
-
+
+
+
+ 0
+ 0
+
+
+
+ UI language
+
+
+ -
+
+
+ System default
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Filter
+
+
+
+ -
+
+
+
+
-
-
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
+
+ 0
+ 0
+
+
5
@@ -1386,6 +1408,47 @@
+ -
+
+
+ Subsurface web service
+
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
-
+
+
+ Default user ID
+
+
+
+ -
+
+
+ -
+
+
+ Save user ID locally?
+
+
+
+
+
+
-
@@ -1402,7 +1465,13 @@
-
+
+
+ 0
+ 0
+
+
+
5
@@ -1420,6 +1489,12 @@
-
+
+
+ 0
+ 0
+
+
true
@@ -1457,27 +1532,57 @@
-
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
-
-
-
- Enable geocoding for dive site management
-
-
-
- -
-
-
- Parse site without GPS data
-
-
-
- -
-
-
- Same format for existing dives
+
+
+ Dive site geo lookup
+
+
-
+
+
+ Enable geocoding for dive site management
+
+
+
+ -
+
+
+ Parse site without GPS data
+
+
+
+ -
+
+
+ Same format for existing dives
+
+
+
+
-
@@ -1547,7 +1652,7 @@
20
- 495
+ 0
@@ -1911,13 +2016,13 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/qt-ui/socialnetworks.cpp b/qt-ui/socialnetworks.cpp
index 6a81d5db7..c165043b6 100644
--- a/qt-ui/socialnetworks.cpp
+++ b/qt-ui/socialnetworks.cpp
@@ -269,8 +269,9 @@ void FacebookManager::sendDive()
}
}
-SocialNetworkDialog::SocialNetworkDialog(QWidget *parent) : QDialog(parent)
- , ui( new Ui::SocialnetworksDialog())
+SocialNetworkDialog::SocialNetworkDialog(QWidget *parent) :
+ QDialog(parent),
+ ui( new Ui::SocialnetworksDialog())
{
ui->setupUi(this);
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);