mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-17 19:37:09 +02:00
Code Issues Releases Wiki Activity

Add dynamic dns/static host name to settings UI

Browse Source
This commit is contained in:
Jeff Mitchell
2011-02-11 17:35:21 -05:00
parent 061db0cb57
commit 0411ff7fdc
2 changed files with 217 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/settingsdialog.cpp
View File

@@ -47,20 +47,19 @@ SettingsDialog::SettingsDialog( QWidget *parent )
ui->jabberPassword->setText( s->jabberPassword() ); ui->jabberPassword->setText( s->jabberPassword() );
ui->jabberServer->setText( s->jabberServer() ); ui->jabberServer->setText( s->jabberServer() );
ui->jabberPort->setValue( s->jabberPort() ); ui->jabberPort->setValue( s->jabberPort() );
ui->staticHostName->setText( s->externalHostname() );
ui->proxyButton->setVisible( false ); ui->proxyButton->setVisible( false );
if ( ui->jabberPort->text().toInt() != 5222 || !ui->jabberServer->text().isEmpty() ) if ( ui->jabberPort->text().toInt() != 5222 || !ui->jabberServer->text().isEmpty() )
{ {
ui->checkBoxJabberAdvanced->setChecked( true ); ui->checkBoxAdvanced->setChecked( true );
} }
else else
{ {
// hide advanved settings // hide advanved settings
ui->checkBoxJabberAdvanced->setChecked( false ); ui->checkBoxAdvanced->setChecked( false );
ui->jabberServer->setVisible( false ); ui->groupBoxJabberAdvanced->setVisible( false );
ui->jabberPort->setVisible( false ); ui->groupBoxNetworkAdvanced->setVisible( false );
ui->labelJabberServer->setVisible( false );
ui->labelJabberPort->setVisible( false );
} }
// MUSIC SCANNER // MUSIC SCANNER
@@ -117,6 +116,8 @@ SettingsDialog::~SettingsDialog()
s->setJabberPassword( ui->jabberPassword->text() ); s->setJabberPassword( ui->jabberPassword->text() );
s->setJabberServer( ui->jabberServer->text() ); s->setJabberServer( ui->jabberServer->text() );
s->setJabberPort( ui->jabberPort->value() ); s->setJabberPort( ui->jabberPort->value() );
s->setExternalHostname( ui->staticHostName->text() );
s->setScannerPath( ui->lineEditMusicPath->text() ); s->setScannerPath( ui->lineEditMusicPath->text() );

422
src/settingsdialog.ui
View File

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