[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2478: Mock up a UI for letting people set a proxy executable (e.g. (in vidalia/trunk: . src/vidalia/config)
Author: edmanm
Date: 2008-04-03 21:16:17 -0400 (Thu, 03 Apr 2008)
New Revision: 2478
Modified:
vidalia/trunk/
vidalia/trunk/src/vidalia/config/generalpage.cpp
vidalia/trunk/src/vidalia/config/generalpage.ui
Log:
r299@lysithea: edmanm | 2008-04-03 21:16:13 -0400
Mock up a UI for letting people set a proxy executable (e.g., Polipo) that
gets launched when Tor starts. This is just the UI. It currently does nothing.
I'm not kidding. Don't tell me it doesn't work.
Property changes on: vidalia/trunk
___________________________________________________________________
svk:merge ticket from /local/vidalia/trunk [r299] on 90112fd6-a33b-4cea-8d39-48ff1d78625c
Modified: vidalia/trunk/src/vidalia/config/generalpage.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/generalpage.cpp 2008-04-03 23:42:59 UTC (rev 2477)
+++ vidalia/trunk/src/vidalia/config/generalpage.cpp 2008-04-04 01:16:17 UTC (rev 2478)
@@ -34,7 +34,7 @@
/* Hide platform specific features */
#ifndef Q_WS_WIN
- ui.chkRunWithSys->setVisible(false);
+ ui.chkRunVidaliaAtSystemStartup->setVisible(false);
#endif
}
@@ -77,8 +77,9 @@
return false;
}
_torSettings->setExecutable(torExecutable);
- _vidaliaSettings->setRunTorAtStart(ui.chkRunTor->isChecked());
- _vidaliaSettings->setRunVidaliaOnBoot(ui.chkRunWithSys->isChecked());
+ _vidaliaSettings->setRunTorAtStart(ui.chkRunTorAtVidaliaStartup->isChecked());
+ _vidaliaSettings->setRunVidaliaOnBoot(
+ ui.chkRunVidaliaAtSystemStartup->isChecked());
return true;
}
@@ -87,7 +88,8 @@
GeneralPage::load()
{
ui.lineTorExecutable->setText(_torSettings->getExecutable());
- ui.chkRunTor->setChecked(_vidaliaSettings->runTorAtStart());
- ui.chkRunWithSys->setChecked(_vidaliaSettings->runVidaliaOnBoot());
+ ui.chkRunTorAtVidaliaStartup->setChecked(_vidaliaSettings->runTorAtStart());
+ ui.chkRunVidaliaAtSystemStartup->setChecked(
+ _vidaliaSettings->runVidaliaOnBoot());
}
Modified: vidalia/trunk/src/vidalia/config/generalpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/generalpage.ui 2008-04-03 23:42:59 UTC (rev 2477)
+++ vidalia/trunk/src/vidalia/config/generalpage.ui 2008-04-04 01:16:17 UTC (rev 2478)
@@ -1,28 +1,41 @@
<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
<class>GeneralPage</class>
<widget class="QWidget" name="GeneralPage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
- <width>507</width>
- <height>543</height>
+ <width>499</width>
+ <height>312</height>
</rect>
</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>
+ <property name="leftMargin" >
+ <number>9</number>
+ </property>
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
<item>
+ <widget class="QCheckBox" name="chkRunVidaliaAtSystemStartup" >
+ <property name="text" >
+ <string>Run Vidalia when my system starts</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QGroupBox" name="grpTorLocation" >
<property name="minimumSize" >
<size>
@@ -37,110 +50,89 @@
<string>Tor Executable</string>
</property>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>9</number>
+ </property>
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
<item>
- <widget class="QLineEdit" name="lineTorExecutable" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="minimumSize" >
- <size>
- <width>160</width>
- <height>0</height>
- </size>
- </property>
- <property name="cursor" >
- <cursor>4</cursor>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip" >
- <string>Path to Tor's executable</string>
- </property>
- </widget>
+ <layout class="QVBoxLayout" >
+ <item>
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QLineEdit" name="lineTorExecutable" />
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnBrowseTorExecutable" >
+ <property name="text" >
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkRunTorAtVidaliaStartup" >
+ <property name="text" >
+ <string>Start Tor when Vidalia starts</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item>
- <widget class="QPushButton" name="btnBrowseTorExecutable" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip" >
- <string>Select path to Tor executable</string>
- </property>
- <property name="text" >
- <string>Browse</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpStartup" >
+ <widget class="QGroupBox" name="grpProxyExecutable" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize" >
<size>
<width>0</width>
- <height>0</height>
+ <height>125</height>
</size>
</property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
<property name="title" >
- <string>Startup Options</string>
+ <string>Proxy Executable (optional)</string>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QCheckBox" name="chkRunWithSys" >
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip" >
- <string>Select to start Vidalia on system boot</string>
- </property>
- <property name="text" >
- <string>Run Vidalia on system startup</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="chkRunTor" >
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip" >
- <string>Set to start Tor when you launch Vidalia</string>
- </property>
- <property name="text" >
- <string>Start Tor when Vidalia starts</string>
- </property>
- </widget>
- </item>
- </layout>
+ <layout class="QVBoxLayout" >
+ <item>
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QLineEdit" name="lineProxyExecutable" />
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnBrowseProxyExecutable" >
+ <property name="text" >
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkRunProxyAtTorStartup" >
+ <property name="text" >
+ <string>Start my proxy application when Tor starts</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
<item>
@@ -151,14 +143,15 @@
<property name="sizeHint" >
<size>
<width>20</width>
- <height>309</height>
+ <height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
- <pixmapfunction></pixmapfunction>
- <resources/>
+ <resources>
+ <include location="../res/vidalia_common.qrc" />
+ </resources>
<connections/>
</ui>