mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 21:27:58 +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

58
src/proxydialog.ui
View File

@@ -16,34 +16,17 @@
<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 name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
<widget class="QWidget" name="gridLayoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>381</width>
<height>141</height>
</rect>
</property> </property>
<item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="rightMargin">
<number>8</number>
</property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>16</number> <number>4</number>
</property> </property>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
@@ -83,6 +66,9 @@
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="placeholderText">
<string>Hostname of proxy server</string>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@@ -113,7 +99,11 @@
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLineEdit" name="userLineEdit"/> <widget class="QLineEdit" name="userLineEdit">
<property name="placeholderText">
<string>Proxy login</string>
</property>
</widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="userLabel"> <widget class="QLabel" name="userLabel">
@@ -134,6 +124,9 @@
<property name="echoMode"> <property name="echoMode">
<enum>QLineEdit::Password</enum> <enum>QLineEdit::Password</enum>
</property> </property>
<property name="placeholderText">
<string>Proxy password</string>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
@@ -146,7 +139,7 @@
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="dnsLabel"> <widget class="QLabel" name="dnsLabel">
<property name="text"> <property name="text">
<string></string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
@@ -161,7 +154,18 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget> </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 );