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

Set a top-level layout for the proxy dialog.

Browse Source 
Also tweak the margins a bit and remove the sizegrip from being visible on osx.
This commit is contained in:
Leo Franchi
2011-05-13 09:40:30 +02:00
parent aedc1b362d
commit 12d0dec63c
2 changed files with 157 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

294
src/proxydialog.ui
View File

@@ -16,152 +16,156 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Proxy Settings</string> <string>Proxy Settings</string>
</property> </property>
<widget class="QDialogButtonBox" name="buttonBox"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="geometry"> <property name="margin">
<rect> <number>2</number>
<x>30</x>
<y>160</y>
<width>341</width>
<height>32</height>
</rect>
</property> </property>
<property name="orientation"> <item>
<enum>Qt::Horizontal</enum> <layout class="QGridLayout" name="gridLayout">
</property> <property name="rightMargin">
<property name="standardButtons"> <number>8</number>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property>
</property> <property name="horizontalSpacing">
</widget> <number>4</number>
<widget class="QWidget" name="gridLayoutWidget"> </property>
<property name="geometry"> <item row="0" column="1">
<rect> <layout class="QHBoxLayout" name="horizontalLayout">
<x>10</x> <item>
<y>10</y> <spacer name="horizontalSpacer">
<width>381</width> <property name="orientation">
<height>141</height> <enum>Qt::Horizontal</enum>
</rect> </property>
</property> <property name="sizeHint" stdset="0">
<layout class="QGridLayout" name="gridLayout"> <size>
<property name="horizontalSpacing"> <width>40</width>
<number>16</number> <height>20</height>
</property> </size>
<item row="0" column="1"> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> </spacer>
<item> </item>
<spacer name="horizontalSpacer"> <item>
<property name="orientation"> <widget class="QComboBox" name="typeBox"/>
<enum>Qt::Horizontal</enum> </item>
</property> <item>
<property name="sizeHint" stdset="0"> <spacer name="horizontalSpacer_2">
<size> <property name="orientation">
<width>40</width> <enum>Qt::Horizontal</enum>
<height>20</height> </property>
</size> <property name="sizeHint" stdset="0">
</property> <size>
</spacer> <width>40</width>
</item> <height>20</height>
<item> </size>
<widget class="QComboBox" name="typeBox"/> </property>
</item> </spacer>
<item> </item>
<spacer name="horizontalSpacer_2"> </layout>
<property name="orientation"> </item>
<enum>Qt::Horizontal</enum> <item row="1" column="1">
</property> <widget class="QLineEdit" name="hostLineEdit">
<property name="sizeHint" stdset="0"> <property name="text">
<size> <string/>
<width>40</width> </property>
<height>20</height> <property name="placeholderText">
</size> <string>Hostname of proxy server</string>
</property> </property>
</spacer> </widget>
</item> </item>
</layout> <item row="1" column="0">
</item> <widget class="QLabel" name="hostLabel">
<item row="1" column="1"> <property name="text">
<widget class="QLineEdit" name="hostLineEdit"> <string>Host</string>
<property name="text"> </property>
<string/> </widget>
</property> </item>
</widget> <item row="2" column="0">
</item> <widget class="QLabel" name="portLabel">
<item row="1" column="0"> <property name="text">
<widget class="QLabel" name="hostLabel"> <string>Port</string>
<property name="text"> </property>
<string>Host</string> </widget>
</property> </item>
</widget> <item row="2" column="1">
</item> <widget class="QSpinBox" name="portSpinBox">
<item row="2" column="0"> <property name="minimum">
<widget class="QLabel" name="portLabel"> <number>1</number>
<property name="text"> </property>
<string>Port</string> <property name="maximum">
</property> <number>65535</number>
</widget> </property>
</item> <property name="value">
<item row="2" column="1"> <number>1080</number>
<widget class="QSpinBox" name="portSpinBox"> </property>
<property name="minimum"> </widget>
<number>1</number> </item>
</property> <item row="3" column="1">
<property name="maximum"> <widget class="QLineEdit" name="userLineEdit">
<number>65535</number> <property name="placeholderText">
</property> <string>Proxy login</string>
<property name="value"> </property>
<number>1080</number> </widget>
</property> </item>
</widget> <item row="3" column="0">
</item> <widget class="QLabel" name="userLabel">
<item row="3" column="1"> <property name="text">
<widget class="QLineEdit" name="userLineEdit"/> <string>User</string>
</item> </property>
<item row="3" column="0"> </widget>
<widget class="QLabel" name="userLabel"> </item>
<property name="text"> <item row="4" column="0">
<string>User</string> <widget class="QLabel" name="passwordLabel">
</property> <property name="text">
</widget> <string>Password</string>
</item> </property>
<item row="4" column="0"> </widget>
<widget class="QLabel" name="passwordLabel"> </item>
<property name="text"> <item row="4" column="1">
<string>Password</string> <widget class="QLineEdit" name="passwordLineEdit">
</property> <property name="echoMode">
</widget> <enum>QLineEdit::Password</enum>
</item> </property>
<item row="4" column="1"> <property name="placeholderText">
<widget class="QLineEdit" name="passwordLineEdit"> <string>Proxy password</string>
<property name="echoMode"> </property>
<enum>QLineEdit::Password</enum> </widget>
</property> </item>
</widget> <item row="0" column="0">
</item> <widget class="QLabel" name="typeLabel">
<item row="0" column="0"> <property name="text">
<widget class="QLabel" name="typeLabel"> <string>Type</string>
<property name="text"> </property>
<string>Type</string> </widget>
</property> </item>
</widget> <item row="5" column="0">
</item> <widget class="QLabel" name="dnsLabel">
<item row="5" column="0"> <property name="text">
<widget class="QLabel" name="dnsLabel"> <string/>
<property name="text"> </property>
<string></string> </widget>
</property> </item>
</widget> <item row="5" column="1">
</item> <widget class="QCheckBox" name="checkBoxUseProxyForDns">
<item row="5" column="1"> <property name="layoutDirection">
<widget class="QCheckBox" name="checkBoxUseProxyForDns"> <enum>Qt::RightToLeft</enum>
<property name="layoutDirection"> </property>
<enum>Qt::RightToLeft</enum> <property name="text">
</property> <string>Use proxy for DNS lookups?</string>
<property name="text"> </property>
<string>Use proxy for DNS lookups?</string> </widget>
</property> </item>
</widget> </layout>
</item> </item>
</layout> <item>
</widget> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections> <connections>

8
src/settingsdialog.cpp
View File

@@ -25,6 +25,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QNetworkProxy> #include <QNetworkProxy>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QSizeGrip>
#ifdef LIBLASTFM_FOUND #ifdef LIBLASTFM_FOUND
#include <lastfm/ws.h> #include <lastfm/ws.h>
@@ -80,6 +81,13 @@ SettingsDialog::SettingsDialog( QWidget *parent )
ui->verticalLayout->removeItem( ui->verticalSpacer_3 ); ui->verticalLayout->removeItem( ui->verticalSpacer_3 );
#endif #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 // SIP PLUGINS
SipConfigDelegate* sipdel = new SipConfigDelegate( this ); SipConfigDelegate* sipdel = new SipConfigDelegate( this );
ui->accountsView->setItemDelegate( sipdel ); ui->accountsView->setItemDelegate( sipdel );