[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1934: Lay out the rest of the UI for the new Firewall page. The re (in trunk: . src/gui/config)
Author: edmanm
Date: 2007-09-21 02:52:06 -0400 (Fri, 21 Sep 2007)
New Revision: 1934
Modified:
trunk/
trunk/src/gui/config/firewallpage.cpp
trunk/src/gui/config/firewallpage.ui
Log:
r1943@lysithea: edmanm | 2007-09-21 02:52:01 -0400
Lay out the rest of the UI for the new Firewall page. The resizing behavior
isn't quite right yet, but I want feedback before I go messing with that.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /local/vidalia/trunk [r1943] on dc66be73-d13e-47ba-a267-8dc7cda68c65
Modified: trunk/src/gui/config/firewallpage.cpp
===================================================================
--- trunk/src/gui/config/firewallpage.cpp 2007-09-21 04:44:59 UTC (rev 1933)
+++ trunk/src/gui/config/firewallpage.cpp 2007-09-21 06:52:06 UTC (rev 1934)
@@ -50,6 +50,7 @@
bool
FirewallPage::save(QString &errmsg)
{
+ Q_UNUSED(errmsg);
return true;
}
@@ -57,5 +58,8 @@
void
FirewallPage::load()
{
+ ui.grpFirewallSettings->setVisible(false);
+ ui.grpProxySettings->setVisible(false);
+ ui.grpBridgeSettings->setVisible(false);
}
Modified: trunk/src/gui/config/firewallpage.ui
===================================================================
--- trunk/src/gui/config/firewallpage.ui 2007-09-21 04:44:59 UTC (rev 1933)
+++ trunk/src/gui/config/firewallpage.ui 2007-09-21 06:52:06 UTC (rev 1934)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>438</width>
- <height>329</height>
+ <width>526</width>
+ <height>535</height>
</rect>
</property>
<property name="font" >
@@ -41,6 +41,70 @@
</widget>
</item>
<item>
+ <widget class="QGroupBox" name="grpFirewallSettings" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>75</height>
+ </size>
+ </property>
+ <property name="title" >
+ <string>Firewall Settings</string>
+ </property>
+ <widget class="QWidget" name="horizontalLayout" >
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>481</width>
+ <height>41</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="lblAllowedPorts" >
+ <property name="text" >
+ <string>Allowed Ports:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineAllowedPorts" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="inputMask" >
+ <string/>
+ </property>
+ <property name="text" >
+ <string>80, 443</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
<widget class="QCheckBox" name="chkUseProxy" >
<property name="text" >
<string>I use a proxy to access the Internet</string>
@@ -48,6 +112,145 @@
</widget>
</item>
<item>
+ <widget class="QGroupBox" name="grpProxySettings" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>131</height>
+ </size>
+ </property>
+ <property name="title" >
+ <string>Proxy Settings</string>
+ </property>
+ <widget class="QWidget" name="gridLayout" >
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>481</width>
+ <height>105</height>
+ </rect>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="label_3" >
+ <property name="text" >
+ <string>Username:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="3" >
+ <widget class="QCheckBox" name="chkProxyUseHttps" >
+ <property name="text" >
+ <string>Use HTTPS</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="lblHttpProxy" >
+ <property name="text" >
+ <string>HTTP Proxy:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="4" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="1" colspan="4" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineHttpProxyUsername" />
+ </item>
+ <item>
+ <widget class="QLabel" name="label_4" >
+ <property name="text" >
+ <string>Password:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineHttpProxyPassword" >
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="1" colspan="4" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineHttpProxyAddress" />
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string>Port:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineHttpProxyPort" >
+ <property name="maximumSize" >
+ <size>
+ <width>75</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="maxLength" >
+ <number>5</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
<widget class="QCheckBox" name="chkUseBridge" >
<property name="text" >
<string>My ISP blocks connections to the Tor network</string>
@@ -55,14 +258,149 @@
</widget>
</item>
<item>
+ <widget class="QGroupBox" name="grpBridgeSettings" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>200</height>
+ </size>
+ </property>
+ <property name="title" >
+ <string>Tor Bridge Settings</string>
+ </property>
+ <widget class="QWidget" name="verticalLayout" >
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>481</width>
+ <height>171</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="lblAddBridge" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Add a Bridge:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineBridge" />
+ </item>
+ <item>
+ <widget class="QListWidget" name="listBridges" />
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="btnAddBridge" >
+ <property name="maximumSize" >
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/list-add.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnRemoveBridge" >
+ <property name="maximumSize" >
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/list-remove.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
- <width>420</width>
- <height>16</height>
+ <width>20</width>
+ <height>40</height>
</size>
</property>
</spacer>
@@ -72,6 +410,57 @@
<tabstops>
<tabstop>chkFascistFirewall</tabstop>
</tabstops>
- <resources/>
- <connections/>
+ <resources>
+ <include location="../res/vidalia_common.qrc" />
+ </resources>
+ <connections>
+ <connection>
+ <sender>chkFascistFirewall</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>grpFirewallSettings</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>222</x>
+ <y>21</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>222</x>
+ <y>82</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>chkUseProxy</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>grpProxySettings</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>222</x>
+ <y>143</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>222</x>
+ <y>216</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>chkUseBridge</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>grpBridgeSettings</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>222</x>
+ <y>305</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>222</x>
+ <y>390</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ui>