diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index f14d0363a..1e9bb042a 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -47,20 +47,19 @@ SettingsDialog::SettingsDialog( QWidget *parent )
ui->jabberPassword->setText( s->jabberPassword() );
ui->jabberServer->setText( s->jabberServer() );
ui->jabberPort->setValue( s->jabberPort() );
+ ui->staticHostName->setText( s->externalHostname() );
ui->proxyButton->setVisible( false );
if ( ui->jabberPort->text().toInt() != 5222 || !ui->jabberServer->text().isEmpty() )
{
- ui->checkBoxJabberAdvanced->setChecked( true );
+ ui->checkBoxAdvanced->setChecked( true );
}
else
{
// hide advanved settings
- ui->checkBoxJabberAdvanced->setChecked( false );
- ui->jabberServer->setVisible( false );
- ui->jabberPort->setVisible( false );
- ui->labelJabberServer->setVisible( false );
- ui->labelJabberPort->setVisible( false );
+ ui->checkBoxAdvanced->setChecked( false );
+ ui->groupBoxJabberAdvanced->setVisible( false );
+ ui->groupBoxNetworkAdvanced->setVisible( false );
}
// MUSIC SCANNER
@@ -117,6 +116,8 @@ SettingsDialog::~SettingsDialog()
s->setJabberPassword( ui->jabberPassword->text() );
s->setJabberServer( ui->jabberServer->text() );
s->setJabberPort( ui->jabberPort->value() );
+
+ s->setExternalHostname( ui->staticHostName->text() );
s->setScannerPath( ui->lineEditMusicPath->text() );
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 34b3440bf..f9f93c32e 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -7,7 +7,7 @@
0
0
621
- 353
+ 434
@@ -22,8 +22,14 @@
-
+
+
+ 0
+ 0
+
+
- 3
+ 0
@@ -66,7 +72,7 @@
-
-
+
0
0
@@ -89,7 +95,7 @@
-
-
+
0
0
@@ -103,9 +109,9 @@
-
-
+
-
+
0
0
@@ -121,147 +127,171 @@
-
-
-
- 16
+
+
+ true
-
-
-
-
-
- 0
- 0
-
-
-
-
- 100
- 0
-
-
-
- Jabber Server:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- jabberServer
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- Port:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
-
-
- Qt::Horizontal
-
-
- QSizePolicy::MinimumExpanding
-
-
-
- 40
- 8
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 90
- 0
-
-
-
-
- 90
- 16777215
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- 1
-
-
- 65535
-
-
- 5222
-
-
-
-
-
- -
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Proxy Settings...
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
+
+
+ 0
+ 0
+
+
+
+ Advanced Jabber Settings
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 50
+ 0
+
+
+
+ Server:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ jabberServer
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Port:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 90
+ 0
+
+
+
+
+ 90
+ 16777215
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ 1
+
+
+ 65535
+
+
+ 5222
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Advanced Network Settings
+
+
+
-
+
+
-
+
+
+ Static Host Name:
+
+
+
+ -
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Proxy Settings...
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
-
@@ -271,7 +301,7 @@
20
- 73
+ 40
@@ -611,71 +641,7 @@
- checkBoxJabberAdvanced
- toggled(bool)
- jabberServer
- setVisible(bool)
-
-
- 489
- 117
-
-
- 595
- 145
-
-
-
-
- checkBoxJabberAdvanced
- toggled(bool)
- labelJabberServer
- setVisible(bool)
-
-
- 492
- 117
-
-
- 123
- 145
-
-
-
-
- checkBoxJabberAdvanced
- toggled(bool)
- labelJabberPort
- setVisible(bool)
-
-
- 470
- 117
-
-
- 123
- 173
-
-
-
-
- checkBoxJabberAdvanced
- toggled(bool)
- jabberPort
- setVisible(bool)
-
-
- 441
- 112
-
-
- 594
- 172
-
-
-
-
- checkBoxJabberAdvanced
+ checkBoxAdvanced
toggled(bool)
proxyButton
setVisible(bool)
@@ -690,5 +656,37 @@
+
+ checkBoxAdvanced
+ toggled(bool)
+ groupBoxJabberAdvanced
+ setVisible(bool)
+
+
+ 310
+ 115
+
+
+ 310
+ 174
+
+
+
+
+ checkBoxAdvanced
+ toggled(bool)
+ groupBoxNetworkAdvanced
+ setVisible(bool)
+
+
+ 310
+ 115
+
+
+ 310
+ 262
+
+
+