[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2447: * new icon for the directory search button * service window (in vidalia/branches/hidden-services/src/vidalia: config help/content/en res res/22x22)
Author: borkdomenik
Date: 2008-03-23 13:34:00 -0400 (Sun, 23 Mar 2008)
New Revision: 2447
Added:
vidalia/branches/hidden-services/src/vidalia/res/22x22/folder.png
Modified:
vidalia/branches/hidden-services/src/vidalia/config/configdialog.cpp
vidalia/branches/hidden-services/src/vidalia/config/servicepage.cpp
vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui
vidalia/branches/hidden-services/src/vidalia/help/content/en/config.html
vidalia/branches/hidden-services/src/vidalia/help/content/en/contents.xml
vidalia/branches/hidden-services/src/vidalia/res/vidalia_common.qrc
Log:
* new icon for the directory search button
* service window stretching with main window
* some smaller features
Modified: vidalia/branches/hidden-services/src/vidalia/config/configdialog.cpp
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/configdialog.cpp 2008-03-23 14:14:55 UTC (rev 2446)
+++ vidalia/branches/hidden-services/src/vidalia/config/configdialog.cpp 2008-03-23 17:34:00 UTC (rev 2447)
@@ -255,6 +255,8 @@
help("config.appearance"); break;
case Advanced:
help("config.advanced"); break;
+ case Service:
+ help("config.services"); break;
default:
help("config.general"); break;
}
Modified: vidalia/branches/hidden-services/src/vidalia/config/servicepage.cpp
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/servicepage.cpp 2008-03-23 14:14:55 UTC (rev 2446)
+++ vidalia/branches/hidden-services/src/vidalia/config/servicepage.cpp 2008-03-23 17:34:00 UTC (rev 2447)
@@ -39,14 +39,10 @@
/* A QList, consisting of all running services before vidalia starts*/
QList<Service> _torServices;
- ui.serviceWidget->horizontalHeader()->setResizeMode(0,QHeaderView::Stretch);
- ui.serviceWidget->horizontalHeader()->setResizeMode(1,QHeaderView::Custom);
- ui.serviceWidget->horizontalHeader()->setResizeMode(2,QHeaderView::Custom);
- ui.serviceWidget->horizontalHeader()->setResizeMode(3,QHeaderView::Custom);
- ui.serviceWidget->horizontalHeader()->setResizeMode(4,QHeaderView::Custom);
- ui.serviceWidget->horizontalHeader()->resizeSection(1, 100);
- ui.serviceWidget->horizontalHeader()->resizeSection(2, 125);
- ui.serviceWidget->horizontalHeader()->resizeSection(3, 155);
+ ui.serviceWidget->horizontalHeader()->resizeSection(0, 150);
+ ui.serviceWidget->horizontalHeader()->resizeSection(1, 89);
+ ui.serviceWidget->horizontalHeader()->resizeSection(2, 100);
+ ui.serviceWidget->horizontalHeader()->resizeSection(3, 120);
ui.serviceWidget->horizontalHeader()->resizeSection(4, 60);
ui.serviceWidget->verticalHeader()->hide();
@@ -56,8 +52,6 @@
connect(ui.browseButton, SIGNAL(clicked()), this, SLOT(browseDirectory()));
connect(ui.serviceWidget, SIGNAL(itemClicked(QTableWidgetItem*)), this, SLOT(serviceSelectionChanged()));
connect(ui.serviceWidget, SIGNAL(itemChanged(QTableWidgetItem*)), this, SLOT(valueChanged()));
- connect(ui.lblHelpServices, SIGNAL(linkActivated(QString)),
- this, SLOT(onLinkActivated(QString)));
}
/** Destructor */
Modified: vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui 2008-03-23 14:14:55 UTC (rev 2446)
+++ vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui 2008-03-23 17:34:00 UTC (rev 2447)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>693</width>
- <height>581</height>
+ <width>600</width>
+ <height>400</height>
</rect>
</property>
<property name="minimumSize" >
@@ -18,233 +18,148 @@
<property name="windowTitle" >
<string>Form</string>
</property>
- <widget class="QGroupBox" name="groupBox" >
- <property name="geometry" >
- <rect>
- <x>9</x>
- <y>9</y>
- <width>671</width>
- <height>281</height>
- </rect>
- </property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title" >
- <string>Hidden Services</string>
- </property>
- <widget class="QWidget" name="layoutWidget_2" >
- <property name="geometry" >
- <rect>
- <x>630</x>
- <y>70</y>
- <width>28</width>
- <height>201</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <layout class="QVBoxLayout" >
+ <item>
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="leftMargin" >
- <number>0</number>
+ <property name="title" >
+ <string>Provided Hidden Services</string>
</property>
- <property name="topMargin" >
- <number>0</number>
+ <layout class="QGridLayout" >
+ <item rowspan="5" row="0" column="0" >
+ <widget class="QTableWidget" name="serviceWidget" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="selectionMode" >
+ <enum>QAbstractItemView::SingleSelection</enum>
+ </property>
+ <property name="selectionBehavior" >
+ <enum>QAbstractItemView::SelectRows</enum>
+ </property>
+ <property name="textElideMode" >
+ <enum>Qt::ElideLeft</enum>
+ </property>
+ <property name="showGrid" >
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text" >
+ <string>Onion Address</string>
+ </property>
+ </column>
+ <column>
+ <property name="text" >
+ <string>Virtual Port</string>
+ </property>
+ </column>
+ <column>
+ <property name="text" >
+ <string>Target</string>
+ </property>
+ </column>
+ <column>
+ <property name="text" >
+ <string>Directory Path</string>
+ </property>
+ </column>
+ <column>
+ <property name="text" >
+ <string>Enabled</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QToolButton" name="addButton" >
+ <property name="toolTip" >
+ <string>Add new service to list</string>
+ </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 row="1" column="1" >
+ <widget class="QToolButton" name="removeButton" >
+ <property name="toolTip" >
+ <string>Remove selected service from list</string>
+ </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 row="2" column="1" >
+ <widget class="QToolButton" name="copyButton" >
+ <property name="toolTip" >
+ <string>Copy onion address of selected service to clipboard</string>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/edit-copy.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="QToolButton" name="browseButton" >
+ <property name="toolTip" >
+ <string>Browse in local file system and choose directory for selected service</string>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/folder.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>21</width>
+ <height>46</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
</property>
- <property name="rightMargin" >
- <number>0</number>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>141</height>
+ </size>
</property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
- <widget class="QToolButton" name="addButton" >
- <property name="toolTip" >
- <string>Add a new empty service to the list</string>
- </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="QToolButton" name="removeButton" >
- <property name="toolTip" >
- <string>Remove the selected service from the list</string>
- </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>
- <widget class="QToolButton" name="copyButton" >
- <property name="toolTip" >
- <string>Copy the onion address of the selected service to the clipboard</string>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/edit-copy.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="browseButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip" >
- <string>Browse in your local file system and select a directory for the service</string>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/system-search.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>
- </widget>
- <widget class="QWidget" name="layoutWidget" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>30</y>
- <width>651</width>
- <height>22</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
- <widget class="QLabel" name="lblAddBridge" >
- <property name="text" >
- <string>Configure hidden services to be provided by this Tor client or relay</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="lblHelpServices" >
- <property name="cursor" >
- <cursorShape>PointingHandCursor</cursorShape>
- </property>
- <property name="text" >
- <string><a href="services">How does this all work?</a></string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QTableWidget" name="serviceWidget" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>70</y>
- <width>611</width>
- <height>199</height>
- </rect>
- </property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="selectionMode" >
- <enum>QAbstractItemView::SingleSelection</enum>
- </property>
- <property name="selectionBehavior" >
- <enum>QAbstractItemView::SelectRows</enum>
- </property>
- <property name="textElideMode" >
- <enum>Qt::ElideLeft</enum>
- </property>
- <property name="showGrid" >
- <bool>true</bool>
- </property>
- <column>
- <property name="text" >
- <string>Onion Address</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Virtual Port</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Target</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Directory Path</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Enabled</string>
- </property>
- </column>
- </widget>
- </widget>
+ </spacer>
+ </item>
+ </layout>
</widget>
<resources/>
<connections/>
Modified: vidalia/branches/hidden-services/src/vidalia/help/content/en/config.html
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/help/content/en/config.html 2008-03-23 14:14:55 UTC (rev 2446)
+++ vidalia/branches/hidden-services/src/vidalia/help/content/en/config.html 2008-03-23 17:34:00 UTC (rev 2447)
@@ -186,6 +186,13 @@
</li>
</ul>
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g.
+an HTTP service, to others without revealing your IP address.
+</p>
+
</body>
</html>
Modified: vidalia/branches/hidden-services/src/vidalia/help/content/en/contents.xml
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/help/content/en/contents.xml 2008-03-23 14:14:55 UTC (rev 2446)
+++ vidalia/branches/hidden-services/src/vidalia/help/content/en/contents.xml 2008-03-23 17:34:00 UTC (rev 2447)
@@ -32,6 +32,7 @@
<Topic id="server" name="Relay Settings" html="config.html" section="server"/>
<Topic id="appearance" name="Appearance Settings" html="config.html" section="appearance"/>
<Topic id="advanced" name="Advanced Settings" html="config.html" section="advanced"/>
+ <Topic id="services" name="Hidden Services" html="config.html" section="services"/>
</Topic>
<Topic id="server" name="Setting Up a Tor Relay" html="server.html">
<Topic id="basic" name="Basic Setup" html="server.html" section="basic"/>
Added: vidalia/branches/hidden-services/src/vidalia/res/22x22/folder.png
===================================================================
(Binary files differ)
Property changes on: vidalia/branches/hidden-services/src/vidalia/res/22x22/folder.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vidalia/branches/hidden-services/src/vidalia/res/vidalia_common.qrc
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/res/vidalia_common.qrc 2008-03-23 14:14:55 UTC (rev 2446)
+++ vidalia/branches/hidden-services/src/vidalia/res/vidalia_common.qrc 2008-03-23 17:34:00 UTC (rev 2447)
@@ -66,6 +66,7 @@
<file>22x22/tor-on.png</file>
<file>22x22/tor-starting.png</file>
<file>22x22/tor-stopping.png</file>
+ <file>22x22/folder.png</file>
</qresource>
<qresource prefix="/images">
<file>32x32/applications-internet.png</file>