From 0411ff7fdc5e185d7c8b56ba219563d0a3624403 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Fri, 11 Feb 2011 17:35:21 -0500
Subject: [PATCH] Add dynamic dns/static host name to settings UI

---
 src/settingsdialog.cpp |  13 +-
 src/settingsdialog.ui  | 422 ++++++++++++++++++++---------------------
 2 files changed, 217 insertions(+), 218 deletions(-)

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 @@
     <x>0</x>
     <y>0</y>
     <width>621</width>
-    <height>353</height>
+    <height>434</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -22,8 +22,14 @@
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QTabWidget" name="tabWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tabJabber">
       <attribute name="title">
@@ -66,7 +72,7 @@
          <item row="2" column="1">
           <widget class="QLineEdit" name="jabberUsername">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -89,7 +95,7 @@
          <item row="3" column="1">
           <widget class="QLineEdit" name="jabberPassword">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -103,9 +109,9 @@
           </widget>
          </item>
          <item row="4" column="0" colspan="2">
-          <widget class="QCheckBox" name="checkBoxJabberAdvanced">
+          <widget class="QCheckBox" name="checkBoxAdvanced">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -121,147 +127,171 @@
         </layout>
        </item>
        <item>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <property name="horizontalSpacing">
-          <number>16</number>
+        <widget class="QGroupBox" name="groupBoxJabberAdvanced">
+         <property name="enabled">
+          <bool>true</bool>
          </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="labelJabberServer">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>100</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Jabber Server:</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-           <property name="buddy">
-            <cstring>jabberServer</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QLineEdit" name="jabberServer">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="labelJabberPort">
-           <property name="text">
-            <string>Port:</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <layout class="QHBoxLayout" name="horizontalLayout_3">
-           <item>
-            <spacer name="horizontalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::MinimumExpanding</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>8</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QSpinBox" name="jabberPort">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>90</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>90</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="minimum">
-              <number>1</number>
-             </property>
-             <property name="maximum">
-              <number>65535</number>
-             </property>
-             <property name="value">
-              <number>5222</number>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="2" column="1">
-          <layout class="QHBoxLayout" name="horizontalLayout_8">
-           <item>
-            <spacer name="horizontalSpacer_4">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="proxyButton">
-             <property name="text">
-              <string>Proxy Settings...</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_3">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
-        </layout>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Advanced Jabber Settings</string>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_5">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item>
+             <widget class="QLabel" name="labelJabberServer">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>50</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Server:</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+              <property name="buddy">
+               <cstring>jabberServer</cstring>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="jabberServer">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelJabberPort">
+              <property name="text">
+               <string>Port:</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="jabberPort">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>90</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>90</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+              <property name="minimum">
+               <number>1</number>
+              </property>
+              <property name="maximum">
+               <number>65535</number>
+              </property>
+              <property name="value">
+               <number>5222</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBoxNetworkAdvanced">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Advanced Network Settings</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_9">
+          <item>
+           <layout class="QHBoxLayout" name="staticHostNameHLayout">
+            <item>
+             <widget class="QLabel" name="staticHostNameLabel">
+              <property name="text">
+               <string>Static Host Name:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="staticHostName"/>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="proxySettingsHLayout">
+            <item>
+             <spacer name="horizontalSpacer_4">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QPushButton" name="proxyButton">
+              <property name="text">
+               <string>Proxy Settings...</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
@@ -271,7 +301,7 @@
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>73</height>
+           <height>40</height>
           </size>
          </property>
         </spacer>
@@ -611,71 +641,7 @@
    </hints>
   </connection>
   <connection>
-   <sender>checkBoxJabberAdvanced</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>jabberServer</receiver>
-   <slot>setVisible(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>489</x>
-     <y>117</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>595</x>
-     <y>145</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBoxJabberAdvanced</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>labelJabberServer</receiver>
-   <slot>setVisible(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>492</x>
-     <y>117</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>123</x>
-     <y>145</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBoxJabberAdvanced</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>labelJabberPort</receiver>
-   <slot>setVisible(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>470</x>
-     <y>117</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>123</x>
-     <y>173</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBoxJabberAdvanced</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>jabberPort</receiver>
-   <slot>setVisible(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>441</x>
-     <y>112</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>594</x>
-     <y>172</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBoxJabberAdvanced</sender>
+   <sender>checkBoxAdvanced</sender>
    <signal>toggled(bool)</signal>
    <receiver>proxyButton</receiver>
    <slot>setVisible(bool)</slot>
@@ -690,5 +656,37 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>checkBoxAdvanced</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>groupBoxJabberAdvanced</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>310</x>
+     <y>115</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>310</x>
+     <y>174</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>checkBoxAdvanced</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>groupBoxNetworkAdvanced</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>310</x>
+     <y>115</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>310</x>
+     <y>262</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>