diff --git a/src/proxydialog.ui b/src/proxydialog.ui
index 5b88e4d5e..ab810bf03 100644
--- a/src/proxydialog.ui
+++ b/src/proxydialog.ui
@@ -16,152 +16,156 @@
Proxy Settings
-
-
-
- 30
- 160
- 341
- 32
-
+
+
+ 2
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
- 10
- 10
- 381
- 141
-
-
-
-
- 16
-
- -
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Host
-
-
-
- -
-
-
- Port
-
-
-
- -
-
-
- 1
-
-
- 65535
-
-
- 1080
-
-
-
- -
-
-
- -
-
-
- User
-
-
-
- -
-
-
- Password
-
-
-
- -
-
-
- QLineEdit::Password
-
-
-
- -
-
-
- Type
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::RightToLeft
-
-
- Use proxy for DNS lookups?
-
-
-
-
-
+ -
+
+
+ 8
+
+
+ 4
+
+
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+
+
+
+ Hostname of proxy server
+
+
+
+ -
+
+
+ Host
+
+
+
+ -
+
+
+ Port
+
+
+
+ -
+
+
+ 1
+
+
+ 65535
+
+
+ 1080
+
+
+
+ -
+
+
+ Proxy login
+
+
+
+ -
+
+
+ User
+
+
+
+ -
+
+
+ Password
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+ Proxy password
+
+
+
+ -
+
+
+ Type
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Qt::RightToLeft
+
+
+ Use proxy for DNS lookups?
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 416935420..1c836280e 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#ifdef LIBLASTFM_FOUND
#include
@@ -80,6 +81,13 @@ SettingsDialog::SettingsDialog( QWidget *parent )
ui->verticalLayout->removeItem( ui->verticalSpacer_3 );
#endif
+#ifdef Q_WS_MAC
+ // Avoid resize handles on sheets on osx
+ m_proxySettings.setSizeGripEnabled( true );
+ QSizeGrip* p = m_proxySettings.findChild< QSizeGrip* >();
+ p->setFixedSize( 0, 0 );
+#endif
+
// SIP PLUGINS
SipConfigDelegate* sipdel = new SipConfigDelegate( this );
ui->accountsView->setItemDelegate( sipdel );