[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1941: Rename the "Firewall" config page to be the "Network" config (in trunk: . src/gui/config src/gui/res src/gui/res/22x22)
Author: edmanm
Date: 2007-09-21 20:36:26 -0400 (Fri, 21 Sep 2007)
New Revision: 1941
Added:
trunk/src/gui/config/networkpage.cpp
trunk/src/gui/config/networkpage.h
trunk/src/gui/config/networkpage.ui
trunk/src/gui/res/22x22/network-workgroup.png
Removed:
trunk/src/gui/config/firewallpage.cpp
trunk/src/gui/config/firewallpage.h
trunk/src/gui/config/firewallpage.ui
trunk/src/gui/res/22x22/firewall.png
Modified:
trunk/
trunk/src/gui/config/config.pri
trunk/src/gui/config/configdialog.cpp
trunk/src/gui/config/configdialog.h
trunk/src/gui/res/vidalia_common.qrc
Log:
r1953@lysithea: edmanm | 2007-09-21 20:34:29 -0400
Rename the "Firewall" config page to be the "Network" config page.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /local/vidalia/trunk [r1953] on dc66be73-d13e-47ba-a267-8dc7cda68c65
Modified: trunk/src/gui/config/config.pri
===================================================================
--- trunk/src/gui/config/config.pri 2007-09-21 23:03:21 UTC (rev 1940)
+++ trunk/src/gui/config/config.pri 2007-09-22 00:36:26 UTC (rev 1941)
@@ -26,7 +26,7 @@
$$PWD/serverpage.ui \
$$PWD/advancedpage.ui \
$$PWD/appearancepage.ui \
- $$PWD/firewallpage.ui
+ $$PWD/networkpage.ui
HEADERS += $$PWD/configdialog.h \
$$PWD/domainvalidator.h \
@@ -39,7 +39,7 @@
$$PWD/serverpage.h \
$$PWD/advancedpage.h \
$$PWD/appearancepage.h \
- $$PWD/firewallpage.h
+ $$PWD/networkpage.h
SOURCES += $$PWD/configdialog.cpp \
$$PWD/domainvalidator.cpp \
@@ -51,5 +51,5 @@
$$PWD/serverpage.cpp \
$$PWD/advancedpage.cpp \
$$PWD/appearancepage.cpp \
- $$PWD/firewallpage.cpp
+ $$PWD/networkpage.cpp
Modified: trunk/src/gui/config/configdialog.cpp
===================================================================
--- trunk/src/gui/config/configdialog.cpp 2007-09-21 23:03:21 UTC (rev 1940)
+++ trunk/src/gui/config/configdialog.cpp 2007-09-22 00:36:26 UTC (rev 1941)
@@ -32,7 +32,7 @@
/* Images for toolbar icons */
#define IMAGE_GENERAL ":/images/22x22/preferences-system.png"
-#define IMAGE_FIREWALL ":/images/22x22/firewall.png"
+#define IMAGE_NETWORK ":/images/22x22/network-workgroup.png"
#define IMAGE_SERVER ":/images/22x22/network-server.png"
#define IMAGE_APPEARANCE ":/images/22x22/preferences-desktop-locale.png"
#define IMAGE_ADVANCED ":/images/22x22/emblem-system.png"
@@ -55,8 +55,8 @@
ui.stackPages->add(new GeneralPage(ui.stackPages),
createPageAction(QIcon(IMAGE_GENERAL), tr("General"), grp));
- ui.stackPages->add(new FirewallPage(ui.stackPages),
- createPageAction(QIcon(IMAGE_FIREWALL), tr("Firewall"), grp));
+ ui.stackPages->add(new NetworkPage(ui.stackPages),
+ createPageAction(QIcon(IMAGE_NETWORK), tr("Network"), grp));
ui.stackPages->add(new ServerPage(ui.stackPages),
createPageAction(QIcon(IMAGE_SERVER), tr("Server"), grp));
Modified: trunk/src/gui/config/configdialog.h
===================================================================
--- trunk/src/gui/config/configdialog.h 2007-09-21 23:03:21 UTC (rev 1940)
+++ trunk/src/gui/config/configdialog.h 2007-09-22 00:36:26 UTC (rev 1941)
@@ -34,7 +34,7 @@
#include <gui/common/vidaliawindow.h>
#include "generalpage.h"
-#include "firewallpage.h"
+#include "networkpage.h"
#include "serverpage.h"
#include "advancedpage.h"
#include "appearancepage.h"
@@ -50,7 +50,7 @@
/** Config dialog pages. */
enum Page {
General = 0, /** General configuration page. */
- Firewall, /** Firewall configuration page. */
+ Network, /** Network configuration page. */
Server, /** Server configuration page. */
Appearance, /** Appearance configuration page. */
Advanced /** Advanced configuration page. */
Deleted: trunk/src/gui/config/firewallpage.cpp
Deleted: trunk/src/gui/config/firewallpage.h
Deleted: trunk/src/gui/config/firewallpage.ui
Added: trunk/src/gui/config/networkpage.cpp
===================================================================
--- trunk/src/gui/config/networkpage.cpp (rev 0)
+++ trunk/src/gui/config/networkpage.cpp 2007-09-22 00:36:26 UTC (rev 1941)
@@ -0,0 +1,65 @@
+/****************************************************************
+ * Vidalia is distributed under the following license:
+ *
+ * Copyright (C) 2006, Matt Edman, Justin Hipple
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ ****************************************************************/
+
+/**
+ * \file networkpage.cpp
+ * \version $Id$
+ * \brief Network and firewall configuration options
+ */
+
+#include <vidalia.h>
+
+#include "networkpage.h"
+
+
+/** Constructor */
+NetworkPage::NetworkPage(QWidget *parent)
+: ConfigPage(parent)
+{
+ /* Invoke the Qt Designer generated object setup routine */
+ ui.setupUi(this);
+
+ /* Keep a pointer to the TorControl object used to talk to Tor */
+ _torControl = Vidalia::torControl();
+}
+
+/** Destructor */
+NetworkPage::~NetworkPage()
+{
+}
+
+/** Saves changes made to settings on the Firewall settings page. */
+bool
+NetworkPage::save(QString &errmsg)
+{
+ Q_UNUSED(errmsg);
+ return true;
+}
+
+/** Loads previously saved settings */
+void
+NetworkPage::load()
+{
+ ui.grpFirewallSettings->setVisible(false);
+ ui.grpProxySettings->setVisible(false);
+ ui.grpBridgeSettings->setVisible(false);
+}
+
Property changes on: trunk/src/gui/config/networkpage.cpp
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: trunk/src/gui/config/networkpage.h
===================================================================
--- trunk/src/gui/config/networkpage.h (rev 0)
+++ trunk/src/gui/config/networkpage.h 2007-09-22 00:36:26 UTC (rev 1941)
@@ -0,0 +1,60 @@
+/****************************************************************
+ * Vidalia is distributed under the following license:
+ *
+ * Copyright (C) 2006, Matt Edman, Justin Hipple
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ ****************************************************************/
+
+/**
+ * \file neworkpage.h
+ * \version $Id$
+ * \brief Network and firewall configuration options
+ */
+
+#ifndef _NETWORKPAGE_H
+#define _NETWORKPAGE_H
+
+#include <vidalia.h>
+
+#include "configpage.h"
+#include "ui_networkpage.h"
+
+
+class NetworkPage : public ConfigPage
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ NetworkPage(QWidget *parent = 0);
+ /** Default Destructor */
+ ~NetworkPage();
+ /** Saves the changes on this page */
+ bool save(QString &errmsg);
+ /** Loads the settings for this page */
+ void load();
+
+private:
+ /** A TorControl object used to talk to Tor */
+ TorControl* _torControl;
+
+ /** Qt Designer generated object */
+ Ui::NetworkPage ui;
+};
+
+#endif
+
Property changes on: trunk/src/gui/config/networkpage.h
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: trunk/src/gui/config/networkpage.ui
===================================================================
--- trunk/src/gui/config/networkpage.ui (rev 0)
+++ trunk/src/gui/config/networkpage.ui 2007-09-22 00:36:26 UTC (rev 1941)
@@ -0,0 +1,466 @@
+<ui version="4.0" >
+ <class>NetworkPage</class>
+ <widget class="QWidget" name="NetworkPage" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>526</width>
+ <height>535</height>
+ </rect>
+ </property>
+ <property name="font" >
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="chkUseProxy" >
+ <property name="text" >
+ <string>I use a proxy to access the Internet</string>
+ </property>
+ </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 this proxy for HTTPS also</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="chkFascistFirewall" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string>Check to run as a Tor network server</string>
+ </property>
+ <property name="text" >
+ <string>My firewall only lets me connect to certain ports</string>
+ </property>
+ <property name="checked" >
+ <bool>false</bool>
+ </property>
+ </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="chkUseBridge" >
+ <property name="text" >
+ <string>My ISP blocks connections to the Tor network</string>
+ </property>
+ </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>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <tabstops>
+ <tabstop>chkFascistFirewall</tabstop>
+ </tabstops>
+ <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>
Property changes on: trunk/src/gui/config/networkpage.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: trunk/src/gui/res/22x22/firewall.png
Added: trunk/src/gui/res/22x22/network-workgroup.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/gui/res/22x22/network-workgroup.png
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Modified: trunk/src/gui/res/vidalia_common.qrc
===================================================================
--- trunk/src/gui/res/vidalia_common.qrc 2007-09-21 23:03:21 UTC (rev 1940)
+++ trunk/src/gui/res/vidalia_common.qrc 2007-09-22 00:36:26 UTC (rev 1941)
@@ -39,7 +39,6 @@
<file>22x22/edit-select-all.png</file>
<file>22x22/emblem-system.png</file>
<file>22x22/emblem-unreadable.png</file>
- <file>22x22/firewall.png</file>
<file>22x22/format-justify-fill.png</file>
<file>22x22/go-down.png</file>
<file>22x22/go-home.png</file>
@@ -51,6 +50,7 @@
<file>22x22/list-remove.png</file>
<file>22x22/media-floppy.png</file>
<file>22x22/network-server.png</file>
+ <file>22x22/network-workgroup.png</file>
<file>22x22/preferences-desktop.png</file>
<file>22x22/preferences-desktop-locale.png</file>
<file>22x22/preferences-system.png</file>