[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3157: Add some UI for enabling or disabling automatic software upd (vidalia/trunk/src/vidalia/config)
Author: edmanm
Date: 2008-09-29 20:27:21 -0400 (Mon, 29 Sep 2008)
New Revision: 3157
Modified:
vidalia/trunk/src/vidalia/config/generalpage.cpp
vidalia/trunk/src/vidalia/config/generalpage.ui
Log:
Add some UI for enabling or disabling automatic software updates, as well as a
button to check for updates immediately. (Yes, I know this doesn't do
anything yet. No, I don't need you to tell me that.)
Modified: vidalia/trunk/src/vidalia/config/generalpage.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/generalpage.cpp 2008-09-29 12:58:43 UTC (rev 3156)
+++ vidalia/trunk/src/vidalia/config/generalpage.cpp 2008-09-30 00:27:21 UTC (rev 3157)
@@ -38,6 +38,8 @@
/* Hide platform specific features */
#ifndef Q_WS_WIN
ui.chkRunVidaliaAtSystemStartup->setVisible(false);
+ ui.lineHorizontalSeparator->setVisible(false);
+ ui.grpSoftwareUpdates->setVisible(false);
#endif
}
@@ -95,7 +97,7 @@
errmsg = tr("You must specify the name of your Tor executable.");
return false;
}
- if (ui.chkRunProxyAtVidaliaStartup->isChecked()) {
+ if (ui.chkRunProxyAtTorStartup->isChecked()) {
bool ok;
QStringList proxyArgs = string_parse_arguments(
ui.lineProxyExecutableArguments->text(), &ok);
@@ -112,7 +114,7 @@
_vidaliaSettings->setRunVidaliaOnBoot(
ui.chkRunVidaliaAtSystemStartup->isChecked());
_vidaliaSettings->setRunProxyAtStart(
- ui.chkRunProxyAtVidaliaStartup->isChecked());
+ ui.chkRunProxyAtTorStartup->isChecked());
return true;
}
@@ -130,6 +132,6 @@
ui.lineProxyExecutable->setText(_vidaliaSettings->getProxyExecutable());
ui.lineProxyExecutableArguments->setText(
string_format_arguments(_vidaliaSettings->getProxyExecutableArguments()));
- ui.chkRunProxyAtVidaliaStartup->setChecked(_vidaliaSettings->runProxyAtStart());
+ ui.chkRunProxyAtTorStartup->setChecked(_vidaliaSettings->runProxyAtStart());
}
Modified: vidalia/trunk/src/vidalia/config/generalpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/generalpage.ui 2008-09-29 12:58:43 UTC (rev 3156)
+++ vidalia/trunk/src/vidalia/config/generalpage.ui 2008-09-30 00:27:21 UTC (rev 3157)
@@ -5,10 +5,16 @@
<rect>
<x>0</x>
<y>0</y>
- <width>496</width>
- <height>288</height>
+ <width>492</width>
+ <height>402</height>
</rect>
</property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
@@ -24,6 +30,13 @@
</widget>
</item>
<item>
+ <widget class="Line" name="lineHorizontalSeparator" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QGroupBox" name="grpTorLocation" >
<property name="minimumSize" >
<size>
@@ -35,32 +48,25 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="title" >
- <string>Tor Executable</string>
+ <string>Tor</string>
</property>
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout" >
<item>
- <layout class="QVBoxLayout" >
+ <widget class="QCheckBox" name="chkRunTorAtVidaliaStartup" >
+ <property name="text" >
+ <string>Start the Tor software when Vidalia starts</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
<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>
+ <widget class="QLineEdit" name="lineTorExecutable" />
</item>
<item>
- <widget class="QCheckBox" name="chkRunTorAtVidaliaStartup" >
+ <widget class="QPushButton" name="btnBrowseTorExecutable" >
<property name="text" >
- <string>Start the Tor software when Vidalia starts</string>
+ <string>Browse</string>
</property>
</widget>
</item>
@@ -70,16 +76,6 @@
</widget>
</item>
<item>
- <widget class="QCheckBox" name="chkRunProxyAtVidaliaStartup" >
- <property name="text" >
- <string>Start a proxy application when Vidalia starts</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
<widget class="QGroupBox" name="grpProxyExecutable" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
@@ -94,10 +90,20 @@
</size>
</property>
<property name="title" >
- <string>Proxy Executable</string>
+ <string>Proxy Application (optional)</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
<item>
+ <widget class="QCheckBox" name="chkRunProxyAtTorStartup" >
+ <property name="text" >
+ <string>Start a proxy application when Tor starts</string>
+ </property>
+ <property name="checked" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
<layout class="QHBoxLayout" >
<item>
<widget class="QLineEdit" name="lineProxyExecutable" >
@@ -126,7 +132,7 @@
<bool>true</bool>
</property>
<property name="text" >
- <string>Command Line Arguments:</string>
+ <string>Proxy Application Arguments:</string>
</property>
</widget>
</item>
@@ -143,11 +149,60 @@
</widget>
</item>
<item>
- <spacer>
+ <widget class="QGroupBox" name="grpSoftwareUpdates" >
+ <property name="title" >
+ <string>Software Updates</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout" >
+ <item>
+ <widget class="QCheckBox" name="chkAutoUpdates" >
+ <property name="text" >
+ <string>Check for new software updates automatically</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnUpdateNow" >
+ <property name="text" >
+ <string>Check Now</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -158,24 +213,7 @@
</layout>
</widget>
<resources>
- <include location="../res/vidalia_common.qrc" />
+ <include location="../res/vidalia.qrc" />
</resources>
- <connections>
- <connection>
- <sender>chkRunProxyAtVidaliaStartup</sender>
- <signal>toggled(bool)</signal>
- <receiver>grpProxyExecutable</receiver>
- <slot>setVisible(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>247</x>
- <y>138</y>
- </hint>
- <hint type="destinationlabel" >
- <x>247</x>
- <y>208</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <connections/>
</ui>