[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1563: Set eol-style native on just about everything. (trunk trunk/doc trunk/pkg trunk/pkg/osx trunk/pkg/rpm trunk/pkg/win32 trunk/src trunk/src/config trunk/src/control trunk/src/gui trunk/src/gui/about trunk/src/gui/bwgraph trunk/src/gui/common trunk/src/gui/config trunk/src/gui/help trunk/src/gui/help/browser trunk/src/gui/help/content trunk/src/gui/help/content/bg trunk/src/gui/help/content/de trunk/src/gui/help/content/en trunk/src/gui/help/content/es trunk/src/gui/help/content/fa trunk/src/gui/help/content/fi trunk/src/gui/help/content/fr trunk/src/gui/help/content/hu trunk/src/gui/help/content/it trunk/src/gui/help/content/nb trunk/src/gui/help/content/nl trunk/src/gui/help/content/pl trunk/src/gui/help/content/pt trunk/src/gui/help/content/ru trunk/src/gui/help/content/zh-cn trunk/src/gui/log trunk/src/gui/network trunk/src/gui/res trunk/src/gui/tray trunk/src/lang trunk/src/util trunk/src/util/geoip www)
- To: vidalia-svn@xxxxxxxx
- Subject: [vidalia-svn] r1563: Set eol-style native on just about everything. (trunk trunk/doc trunk/pkg trunk/pkg/osx trunk/pkg/rpm trunk/pkg/win32 trunk/src trunk/src/config trunk/src/control trunk/src/gui trunk/src/gui/about trunk/src/gui/bwgraph trunk/src/gui/common trunk/src/gui/config trunk/src/gui/help trunk/src/gui/help/browser trunk/src/gui/help/content trunk/src/gui/help/content/bg trunk/src/gui/help/content/de trunk/src/gui/help/content/en trunk/src/gui/help/content/es trunk/src/gui/help/content/fa trunk/src/gui/help/content/fi trunk/src/gui/help/content/fr trunk/src/gui/help/content/hu trunk/src/gui/help/content/it trunk/src/gui/help/content/nb trunk/src/gui/help/content/nl trunk/src/gui/help/content/pl trunk/src/gui/help/content/pt trunk/src/gui/help/content/ru trunk/src/gui/help/content/zh-cn trunk/src/gui/log trunk/src/gui/network trunk/src/gui/res trunk/src/gui/tray trunk/src/lang trunk/src/util trunk/src/util/geoip www)
- From: edmanm@xxxxxxxxxxxxxxxxxxx
- Date: Tue, 26 Dec 2006 01:06:05 -0500
- Delivered-to: archiver@seul.org
- Delivered-to: vidalia-svn-outgoing@seul.org
- Delivered-to: vidalia-svn@seul.org
- Delivery-date: Tue, 26 Dec 2006 01:01:38 -0500
- Reply-to: vidalia-svn@xxxxxxxxxxxxx
- Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: edmanm
Date: 2006-12-26 01:06:04 -0500 (Tue, 26 Dec 2006)
New Revision: 1563
Modified:
trunk/INSTALL
trunk/README
trunk/Vidalia.pro
trunk/autogen.sh
trunk/configure.in
trunk/doc/TODO
trunk/doc/coding-spec.txt
trunk/doc/feature-spec.txt
trunk/doc/geoip-spec.txt
trunk/doc/version-spec.txt
trunk/pkg/build-geoip-cache.sh
trunk/pkg/geoip-cache
trunk/pkg/osx/PrivoxyConfDesc.plist
trunk/pkg/osx/PrivoxyConfInfo.plist
trunk/pkg/osx/PrivoxyConfPostFlight
trunk/pkg/osx/TorPostFlight
trunk/pkg/osx/VidaliaBundleDesc.plist.in
trunk/pkg/osx/VidaliaBundleInfo.plist.in
trunk/pkg/osx/VidaliaBundleWelcome.rtf
trunk/pkg/osx/VidaliaDesc.plist.in
trunk/pkg/osx/VidaliaInfo.plist.in
trunk/pkg/osx/build-bundle.txt
trunk/pkg/osx/builddmg.sh.in
trunk/pkg/osx/buildmpkg.sh.in
trunk/pkg/osx/privoxy.config
trunk/pkg/package.sh
trunk/pkg/rpm/vidalia.spec
trunk/pkg/win32/BUNDLE_LICENSE
trunk/pkg/win32/build-bundle.txt
trunk/pkg/win32/vidalia-bundle.nsi
trunk/pkg/win32/vidalia.nsi
trunk/pkg/win32/vidalia_de.nsh
trunk/pkg/win32/vidalia_en.nsh
trunk/pkg/win32/vidalia_es.nsh
trunk/pkg/win32/vidalia_fa.nsh
trunk/pkg/win32/vidalia_fi.nsh
trunk/pkg/win32/vidalia_fr.nsh
trunk/pkg/win32/vidalia_pl.nsh
trunk/pkg/win32/vidalia_pt-br.nsh
trunk/pkg/win32/vidalia_zh-cn.nsh
trunk/src/config/config.pri
trunk/src/config/exitpolicy.cpp
trunk/src/config/exitpolicy.h
trunk/src/config/policy.cpp
trunk/src/config/policy.h
trunk/src/config/serversettings.cpp
trunk/src/config/serversettings.h
trunk/src/config/torsettings.cpp
trunk/src/config/torsettings.h
trunk/src/config/vidaliasettings.cpp
trunk/src/config/vidaliasettings.h
trunk/src/control/bandwidthevent.h
trunk/src/control/circuit.cpp
trunk/src/control/circuit.h
trunk/src/control/circuitevent.h
trunk/src/control/control.pri
trunk/src/control/controlcommand.cpp
trunk/src/control/controlcommand.h
trunk/src/control/controlconnection.cpp
trunk/src/control/controlconnection.h
trunk/src/control/controlreply.cpp
trunk/src/control/controlreply.h
trunk/src/control/controlsocket.cpp
trunk/src/control/controlsocket.h
trunk/src/control/eventtype.h
trunk/src/control/logevent.cpp
trunk/src/control/logevent.h
trunk/src/control/newdescriptorevent.h
trunk/src/control/orconnevent.cpp
trunk/src/control/orconnevent.h
trunk/src/control/replyline.cpp
trunk/src/control/replyline.h
trunk/src/control/routerdescriptor.cpp
trunk/src/control/routerdescriptor.h
trunk/src/control/stream.cpp
trunk/src/control/stream.h
trunk/src/control/streamevent.h
trunk/src/control/torcontrol.cpp
trunk/src/control/torcontrol.h
trunk/src/control/torevents.cpp
trunk/src/control/torevents.h
trunk/src/control/torprocess.cpp
trunk/src/control/torprocess.h
trunk/src/control/torsignal.cpp
trunk/src/control/torsignal.h
trunk/src/gui/about/about.pri
trunk/src/gui/about/aboutdialog.cpp
trunk/src/gui/about/aboutdialog.h
trunk/src/gui/about/aboutdialog.ui
trunk/src/gui/bwgraph/bwgraph.cpp
trunk/src/gui/bwgraph/bwgraph.h
trunk/src/gui/bwgraph/bwgraph.pri
trunk/src/gui/bwgraph/bwgraph.ui
trunk/src/gui/bwgraph/graphframe.cpp
trunk/src/gui/bwgraph/graphframe.h
trunk/src/gui/common/common.pri
trunk/src/gui/common/vidaliawindow.cpp
trunk/src/gui/common/vidaliawindow.h
trunk/src/gui/common/vmessagebox.cpp
trunk/src/gui/common/vmessagebox.h
trunk/src/gui/config/advancedpage.cpp
trunk/src/gui/config/advancedpage.h
trunk/src/gui/config/advancedpage.ui
trunk/src/gui/config/appearancepage.cpp
trunk/src/gui/config/appearancepage.h
trunk/src/gui/config/appearancepage.ui
trunk/src/gui/config/config.pri
trunk/src/gui/config/configdialog.cpp
trunk/src/gui/config/configdialog.h
trunk/src/gui/config/configdialog.ui
trunk/src/gui/config/configpage.h
trunk/src/gui/config/configpagestack.cpp
trunk/src/gui/config/configpagestack.h
trunk/src/gui/config/domainvalidator.cpp
trunk/src/gui/config/domainvalidator.h
trunk/src/gui/config/generalpage.cpp
trunk/src/gui/config/generalpage.h
trunk/src/gui/config/generalpage.ui
trunk/src/gui/config/ipvalidator.cpp
trunk/src/gui/config/ipvalidator.h
trunk/src/gui/config/nicknamevalidator.cpp
trunk/src/gui/config/nicknamevalidator.h
trunk/src/gui/config/portvalidator.cpp
trunk/src/gui/config/portvalidator.h
trunk/src/gui/config/serverpage.cpp
trunk/src/gui/config/serverpage.h
trunk/src/gui/config/serverpage.ui
trunk/src/gui/gui.pri
trunk/src/gui/help/browser/browser.pri
trunk/src/gui/help/browser/helpbrowser.cpp
trunk/src/gui/help/browser/helpbrowser.h
trunk/src/gui/help/browser/helpbrowser.ui
trunk/src/gui/help/browser/helptextbrowser.cpp
trunk/src/gui/help/browser/helptextbrowser.h
trunk/src/gui/help/content/bg/config.html
trunk/src/gui/help/content/bg/contents.xml
trunk/src/gui/help/content/bg/index.html
trunk/src/gui/help/content/bg/links.html
trunk/src/gui/help/content/bg/log.html
trunk/src/gui/help/content/bg/netview.html
trunk/src/gui/help/content/bg/running.html
trunk/src/gui/help/content/bg/server.html
trunk/src/gui/help/content/bg/troubleshooting.html
trunk/src/gui/help/content/content.pri
trunk/src/gui/help/content/content.qrc
trunk/src/gui/help/content/contents.dtd
trunk/src/gui/help/content/de/config.html
trunk/src/gui/help/content/de/contents.xml
trunk/src/gui/help/content/de/index.html
trunk/src/gui/help/content/de/links.html
trunk/src/gui/help/content/de/log.html
trunk/src/gui/help/content/de/netview.html
trunk/src/gui/help/content/de/running.html
trunk/src/gui/help/content/de/server.html
trunk/src/gui/help/content/de/troubleshooting.html
trunk/src/gui/help/content/en/config.html
trunk/src/gui/help/content/en/contents.xml
trunk/src/gui/help/content/en/index.html
trunk/src/gui/help/content/en/links.html
trunk/src/gui/help/content/en/log.html
trunk/src/gui/help/content/en/netview.html
trunk/src/gui/help/content/en/running.html
trunk/src/gui/help/content/en/server.html
trunk/src/gui/help/content/en/troubleshooting.html
trunk/src/gui/help/content/es/config.html
trunk/src/gui/help/content/es/contents.xml
trunk/src/gui/help/content/es/index.html
trunk/src/gui/help/content/es/links.html
trunk/src/gui/help/content/es/log.html
trunk/src/gui/help/content/es/netview.html
trunk/src/gui/help/content/es/running.html
trunk/src/gui/help/content/es/server.html
trunk/src/gui/help/content/es/troubleshooting.html
trunk/src/gui/help/content/fa/config.html
trunk/src/gui/help/content/fa/contents.xml
trunk/src/gui/help/content/fa/index.html
trunk/src/gui/help/content/fa/links.html
trunk/src/gui/help/content/fa/log.html
trunk/src/gui/help/content/fa/netview.html
trunk/src/gui/help/content/fa/running.html
trunk/src/gui/help/content/fa/server.html
trunk/src/gui/help/content/fa/troubleshooting.html
trunk/src/gui/help/content/fi/contents.xml
trunk/src/gui/help/content/fi/index.html
trunk/src/gui/help/content/fi/links.html
trunk/src/gui/help/content/fi/log.html
trunk/src/gui/help/content/fi/netview.html
trunk/src/gui/help/content/fi/running.html
trunk/src/gui/help/content/fi/server.html
trunk/src/gui/help/content/fi/troubleshooting.html
trunk/src/gui/help/content/fr/config.html
trunk/src/gui/help/content/fr/contents.xml
trunk/src/gui/help/content/fr/index.html
trunk/src/gui/help/content/fr/links.html
trunk/src/gui/help/content/fr/log.html
trunk/src/gui/help/content/fr/netview.html
trunk/src/gui/help/content/fr/running.html
trunk/src/gui/help/content/fr/server.html
trunk/src/gui/help/content/fr/troubleshooting.html
trunk/src/gui/help/content/hu/config.html
trunk/src/gui/help/content/hu/contents.xml
trunk/src/gui/help/content/hu/index.html
trunk/src/gui/help/content/hu/links.html
trunk/src/gui/help/content/hu/log.html
trunk/src/gui/help/content/hu/netview.html
trunk/src/gui/help/content/hu/running.html
trunk/src/gui/help/content/hu/server.html
trunk/src/gui/help/content/hu/troubleshooting.html
trunk/src/gui/help/content/it/config.html
trunk/src/gui/help/content/it/contents.xml
trunk/src/gui/help/content/it/index.html
trunk/src/gui/help/content/it/links.html
trunk/src/gui/help/content/it/log.html
trunk/src/gui/help/content/it/netview.html
trunk/src/gui/help/content/it/running.html
trunk/src/gui/help/content/it/server.html
trunk/src/gui/help/content/it/troubleshooting.html
trunk/src/gui/help/content/nb/config.html
trunk/src/gui/help/content/nb/contents.xml
trunk/src/gui/help/content/nb/index.html
trunk/src/gui/help/content/nb/links.html
trunk/src/gui/help/content/nb/log.html
trunk/src/gui/help/content/nb/netview.html
trunk/src/gui/help/content/nb/running.html
trunk/src/gui/help/content/nb/server.html
trunk/src/gui/help/content/nb/troubleshooting.html
trunk/src/gui/help/content/nl/config.html
trunk/src/gui/help/content/nl/contents.xml
trunk/src/gui/help/content/nl/index.html
trunk/src/gui/help/content/nl/links.html
trunk/src/gui/help/content/nl/log.html
trunk/src/gui/help/content/nl/netview.html
trunk/src/gui/help/content/nl/running.html
trunk/src/gui/help/content/nl/server.html
trunk/src/gui/help/content/nl/troubleshooting.html
trunk/src/gui/help/content/pl/config.html
trunk/src/gui/help/content/pl/contents.xml
trunk/src/gui/help/content/pl/index.html
trunk/src/gui/help/content/pl/links.html
trunk/src/gui/help/content/pl/log.html
trunk/src/gui/help/content/pl/netview.html
trunk/src/gui/help/content/pl/running.html
trunk/src/gui/help/content/pl/server.html
trunk/src/gui/help/content/pl/troubleshooting.html
trunk/src/gui/help/content/pt/config.html
trunk/src/gui/help/content/pt/contents.xml
trunk/src/gui/help/content/pt/index.html
trunk/src/gui/help/content/pt/links.html
trunk/src/gui/help/content/pt/log.html
trunk/src/gui/help/content/pt/netview.html
trunk/src/gui/help/content/pt/running.html
trunk/src/gui/help/content/pt/server.html
trunk/src/gui/help/content/pt/troubleshooting.html
trunk/src/gui/help/content/ru/config.html
trunk/src/gui/help/content/ru/contents.xml
trunk/src/gui/help/content/ru/index.html
trunk/src/gui/help/content/ru/links.html
trunk/src/gui/help/content/ru/log.html
trunk/src/gui/help/content/ru/netview.html
trunk/src/gui/help/content/ru/running.html
trunk/src/gui/help/content/ru/server.html
trunk/src/gui/help/content/ru/troubleshooting.html
trunk/src/gui/help/content/zh-cn/config.html
trunk/src/gui/help/content/zh-cn/contents.xml
trunk/src/gui/help/content/zh-cn/index.html
trunk/src/gui/help/content/zh-cn/links.html
trunk/src/gui/help/content/zh-cn/log.html
trunk/src/gui/help/content/zh-cn/netview.html
trunk/src/gui/help/content/zh-cn/running.html
trunk/src/gui/help/content/zh-cn/server.html
trunk/src/gui/help/content/zh-cn/troubleshooting.html
trunk/src/gui/help/help.pri
trunk/src/gui/log/log.pri
trunk/src/gui/log/logfile.cpp
trunk/src/gui/log/logfile.h
trunk/src/gui/log/logheaderview.cpp
trunk/src/gui/log/logheaderview.h
trunk/src/gui/log/logtreeitem.cpp
trunk/src/gui/log/logtreeitem.h
trunk/src/gui/log/logtreewidget.cpp
trunk/src/gui/log/logtreewidget.h
trunk/src/gui/log/messagelog.cpp
trunk/src/gui/log/messagelog.h
trunk/src/gui/log/messagelog.ui
trunk/src/gui/mainwindow.cpp
trunk/src/gui/mainwindow.h
trunk/src/gui/network/circuititem.cpp
trunk/src/gui/network/circuititem.h
trunk/src/gui/network/circuitlistwidget.cpp
trunk/src/gui/network/circuitlistwidget.h
trunk/src/gui/network/netviewer.cpp
trunk/src/gui/network/netviewer.h
trunk/src/gui/network/netviewer.ui
trunk/src/gui/network/network.pri
trunk/src/gui/network/routerdescriptorview.cpp
trunk/src/gui/network/routerdescriptorview.h
trunk/src/gui/network/routerlistitem.cpp
trunk/src/gui/network/routerlistitem.h
trunk/src/gui/network/routerlistwidget.cpp
trunk/src/gui/network/routerlistwidget.h
trunk/src/gui/network/streamitem.cpp
trunk/src/gui/network/streamitem.h
trunk/src/gui/network/tormapwidget.cpp
trunk/src/gui/network/tormapwidget.h
trunk/src/gui/network/zimageview.cpp
trunk/src/gui/network/zimageview.h
trunk/src/gui/res/qt_license.txt
trunk/src/gui/res/short_license.txt
trunk/src/gui/res/tor_license.txt
trunk/src/gui/res/vidalia_common.qrc
trunk/src/gui/res/vidalia_license.txt
trunk/src/gui/res/vidalia_win.rc
trunk/src/gui/res/vidalia_win.rc.h
trunk/src/gui/res/vidalia_x11.qrc
trunk/src/gui/tray/tray.pri
trunk/src/gui/tray/trayicon.cpp
trunk/src/gui/tray/trayicon.h
trunk/src/gui/tray/trayicon_mac.cpp
trunk/src/gui/tray/trayicon_mac.h
trunk/src/gui/tray/trayicon_win.h
trunk/src/gui/tray/trayicon_x11.cpp
trunk/src/gui/tray/trayicon_x11.h
trunk/src/lang/lang.pri
trunk/src/lang/lang.qrc
trunk/src/lang/languagesupport.cpp
trunk/src/lang/languagesupport.h
trunk/src/main.cpp
trunk/src/src.pri
trunk/src/util/file.cpp
trunk/src/util/file.h
trunk/src/util/geoip/geoip.cpp
trunk/src/util/geoip/geoip.h
trunk/src/util/geoip/geoip.pri
trunk/src/util/geoip/geoipcache.cpp
trunk/src/util/geoip/geoipcache.h
trunk/src/util/geoip/geoipcacheitem.cpp
trunk/src/util/geoip/geoipcacheitem.h
trunk/src/util/geoip/geoiprequest.cpp
trunk/src/util/geoip/geoiprequest.h
trunk/src/util/geoip/geoipresolver.cpp
trunk/src/util/geoip/geoipresolver.h
trunk/src/util/geoip/geoipresponse.cpp
trunk/src/util/geoip/geoipresponse.h
trunk/src/util/html.cpp
trunk/src/util/html.h
trunk/src/util/http.cpp
trunk/src/util/http.h
trunk/src/util/net.cpp
trunk/src/util/net.h
trunk/src/util/process.cpp
trunk/src/util/process.h
trunk/src/util/string.cpp
trunk/src/util/string.h
trunk/src/util/torsocket.cpp
trunk/src/util/torsocket.h
trunk/src/util/util.pri
trunk/src/util/win32.cpp
trunk/src/util/win32.h
trunk/src/vidalia.cpp
trunk/src/vidalia.h
www/download.php
www/footer.inc.php
www/header.inc.php
www/index.php
www/screenshots.php
www/stylesheet.css
Log:
Set eol-style native on just about everything.
Property changes on: trunk/INSTALL
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/README
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/Vidalia.pro
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/autogen.sh
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/configure.in
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/doc/TODO
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/doc/coding-spec.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/doc/feature-spec.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/doc/geoip-spec.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/doc/version-spec.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/build-geoip-cache.sh
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/geoip-cache
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/PrivoxyConfDesc.plist
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/PrivoxyConfInfo.plist
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/PrivoxyConfPostFlight
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/TorPostFlight
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/VidaliaBundleDesc.plist.in
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/VidaliaBundleInfo.plist.in
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/VidaliaBundleWelcome.rtf
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/VidaliaDesc.plist.in
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/VidaliaInfo.plist.in
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/build-bundle.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/builddmg.sh.in
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/buildmpkg.sh.in
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/osx/privoxy.config
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/package.sh
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/rpm/vidalia.spec
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/pkg/win32/BUNDLE_LICENSE
===================================================================
--- trunk/pkg/win32/BUNDLE_LICENSE 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/pkg/win32/BUNDLE_LICENSE 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,549 +1,549 @@
-=====================================================
-vidalia-bundle.nsi is distributed under this license
-
-vidalia-bundle.nsi : Pre-configured Vidalia/Tor/Privoxy bundled installer.
-Copyright (C) 2006 Matt Edman
-
-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 St, Fifth Floor, Boston, MA 02110-1301 USA
-=====================================================
-
-=====================================================
-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.
-=====================================================
-
-=====================================================
-Tor is distributed under this license:
-
-Copyright (c) 2001-2005 Roger Dingledine
-Copyright (c) 2004-2005 Nick Mathewson
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
- * Neither the names of the copyright owners nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-=====================================================
-src/or/tree.h by Niels Provos is licensed as follows:
-
- * Copyright 2002 Niels Provos <provos@xxxxxxxxxxxxxx>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=====================================================
-src/common/strlcat.c and src/common/strlcpy.c by Todd C. Miller are licensed
-under the following license:
-
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@xxxxxxxxxxxxx>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=====================================================
-If you got Tor as a static binary with OpenSSL included, then you should know:
- "This product includes software developed by the OpenSSL Project
- for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-=====================================================
-
-Privoxy is distributed under the following license:
-=====================================================
- Copyright (C) 2001, 2002 Privoxy Developers <developers@xxxxxxxxxxx>,
- and licensed under the GNU General Public License.
-
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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 St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
-=====================================================
-config.txt distributed with Privoxy was modified on
-12/13/2005 for Vidalia/Tor/Privoxy bundled and pre-configured
-installer
-
-The original, unmodified version of config.txt has been
-retained in the package and can be found as config.orig.txt
-
-=====================================================
-Torbutton is distributed under the following license:
-
-Copyright (c) 2006 Scott Squires, Oleg Ivanov
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
---------------------------------------------------------------------------------
-
-Date: Fri, 3 Mar 2006 03:16:21 +0200
-From: Oleg Ivanov
-To: Scott Squires
-Subject: Re: ProxyButton licensing question
-
-Hello Scott,
-
-I'm glad to support your project so you can use the Proxybutton in any way you
-need under any open source license as it's stated in mozdev's copyright
-policy.
-I'll just ask you to put in the Tor or it's source code any credits with
-references to me and the original Proxybutton. Feel free to ask if you have
-any questions regarding the extension - I'll be glad to help you.
-
-On Thursday 02 March 2006 05:01, you wrote:
-> Hello,
->
-> I am a volunteer for the Tor project, which is a network proxy with strong
-> anonymnity. We would like to make it easier for users to install and
-> configure the software, and would like a firefox button to enable/disable
-> Tor. Your extension is very close to what we need, our version would just
-> set the proxy for the user instead of the user needing to enter the
-> information. So I was wondering what license your software is released
-> under
-> and whether we can use it as a base for this extension.
->
-> Thanks!
-> --Scott
-
---
-Oleg Ivanov
-=====================================================
-
+=====================================================
+vidalia-bundle.nsi is distributed under this license
+
+vidalia-bundle.nsi : Pre-configured Vidalia/Tor/Privoxy bundled installer.
+Copyright (C) 2006 Matt Edman
+
+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 St, Fifth Floor, Boston, MA 02110-1301 USA
+=====================================================
+
+=====================================================
+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.
+=====================================================
+
+=====================================================
+Tor is distributed under this license:
+
+Copyright (c) 2001-2005 Roger Dingledine
+Copyright (c) 2004-2005 Nick Mathewson
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+ * Neither the names of the copyright owners nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=====================================================
+src/or/tree.h by Niels Provos is licensed as follows:
+
+ * Copyright 2002 Niels Provos <provos@xxxxxxxxxxxxxx>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=====================================================
+src/common/strlcat.c and src/common/strlcpy.c by Todd C. Miller are licensed
+under the following license:
+
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@xxxxxxxxxxxxx>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=====================================================
+If you got Tor as a static binary with OpenSSL included, then you should know:
+ "This product includes software developed by the OpenSSL Project
+ for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+=====================================================
+
+Privoxy is distributed under the following license:
+=====================================================
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@xxxxxxxxxxx>,
+ and licensed under the GNU General Public License.
+
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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 St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+=====================================================
+config.txt distributed with Privoxy was modified on
+12/13/2005 for Vidalia/Tor/Privoxy bundled and pre-configured
+installer
+
+The original, unmodified version of config.txt has been
+retained in the package and can be found as config.orig.txt
+
+=====================================================
+Torbutton is distributed under the following license:
+
+Copyright (c) 2006 Scott Squires, Oleg Ivanov
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+--------------------------------------------------------------------------------
+
+Date: Fri, 3 Mar 2006 03:16:21 +0200
+From: Oleg Ivanov
+To: Scott Squires
+Subject: Re: ProxyButton licensing question
+
+Hello Scott,
+
+I'm glad to support your project so you can use the Proxybutton in any way you
+need under any open source license as it's stated in mozdev's copyright
+policy.
+I'll just ask you to put in the Tor or it's source code any credits with
+references to me and the original Proxybutton. Feel free to ask if you have
+any questions regarding the extension - I'll be glad to help you.
+
+On Thursday 02 March 2006 05:01, you wrote:
+> Hello,
+>
+> I am a volunteer for the Tor project, which is a network proxy with strong
+> anonymnity. We would like to make it easier for users to install and
+> configure the software, and would like a firefox button to enable/disable
+> Tor. Your extension is very close to what we need, our version would just
+> set the proxy for the user instead of the user needing to enter the
+> information. So I was wondering what license your software is released
+> under
+> and whether we can use it as a base for this extension.
+>
+> Thanks!
+> --Scott
+
+--
+Oleg Ivanov
+=====================================================
+
Property changes on: trunk/pkg/win32/BUNDLE_LICENSE
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/win32/build-bundle.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/pkg/win32/vidalia-bundle.nsi 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,473 +1,473 @@
-;---------------------------------
-; $Id: $
-;
-; Vidalia/Tor/Privoxy Bundle Installer
-; See BUNDLE_LICENSE for licensing information
-;---------------------------------
-!include "MUI.nsh"
-
-SetCompressor /SOLID lzma
-!packhdr header.dat "upx --best header.dat"
-
-;---------------------------------
-; Global definitions
-!define SF_SELECTED 1
-!define SECTION_OFF 0xFFFFFFFE
-
-!define VIDALIA_NAME "Vidalia"
-!define VIDALIA_EXEC "vidalia.exe"
-!define VIDALIA_APPVERSION "0.0.11-svn"
-!define VIDALIA_DESC "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
-!define VIDALIA_UNINST "uninstall.exe"
-
-!define TOR_NAME "Tor"
-!define TOR_EXEC "tor.exe"
-!define TOR_APPVERSION "0.1.2.4-alpha"
-!define TOR_DESC "${TOR_NAME} ${TOR_APPVERSION}"
-!define TOR_UNINST "Uninstall.exe"
-
-!define PRIVOXY_NAME "Privoxy"
-!define PRIVOXY_EXEC "privoxy.exe"
-!define PRIVOXY_APPVERSION "3.0.6"
-!define PRIVOXY_DESC "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
-!define PRIVOXY_UNINST "privoxy_uninstall.exe"
-
-!define TORBUTTON_NAME "Torbutton"
-!define TORBUTTON_APPVERSION "1.0.4-fx+tb"
-!define TORBUTTON_DESC "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
-
-!define OPENSSL_NAME "OpenSSL"
-!define OPENSSL_APPVERSION "0.9.8d"
-!define OPENSSL_DESC "${OPENSSL_NAME} ${OPENSSL_APPVERSION}"
-
-!define BUNDLE_NAME "Vidalia Bundle"
-!define BUNDLE_APPVERSION "${TOR_APPVERSION}-${VIDALIA_APPVERSION}"
-!define BUNDLE_REVISION "1"
-!define BUNDLE_PRODVERSION "${VIDALIA_APPVERSION}.${BUNDLE_REVISION}" ; Product version must be x.x.x.x
-!define BUNDLE_DESC "${BUNDLE_NAME} ${BUNDLE_APPVERSION}"
-!define INSTALLFILE "vidalia-bundle-${BUNDLE_APPVERSION}.exe"
-
-;--------------------------------
-; Installer file details
-VIAddVersionKey "ProductName" "${BUNDLE_NAME}"
-VIAddVersionKey "Comments" "${BUNDLE_DESC}"
-VIAddVersionKey "FileVersion" "${BUNDLE_APPVERSION}"
-VIAddVersionKey "FileDescription" "${BUNDLE_DESC}"
-VIProductVersion "${BUNDLE_PRODVERSION}"
-
-;--------------------------------
-; Basic installer information
-Name "${BUNDLE_NAME}"
-Caption "$(BundleSetupCaption)"
-BrandingText "${BUNDLE_DESC} (Rev. ${BUNDLE_REVISION})"
-OutFile "${INSTALLFILE}"
-InstallDir "$PROGRAMFILES"
-SetOverWrite ifnewer
-AutoCloseWindow false
-ShowInstDetails show
-CRCCheck on
-XPStyle on
-
-;--------------------------------
-; MUI Options
-!define MUI_WELCOMEPAGE_TITLE "$(BundleWelcomeTitle)"
-!define MUI_WELCOMEPAGE_TEXT "$(BundleWelcomeText)"
-!define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
-!define MUI_HEADERIMAGE
-!define MUI_FINISHPAGE_TEXT "$(BundleFinishText)"
-!define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_FUNCTION CustomFinishFn
-!define MUI_FINISHPAGE_RUN_TEXT "$(BundleRunNow)"
-!define MUI_FINISHPAGE_LINK "$(BundleLinkText)"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://tor.eff.org/docs/tor-doc-win32.html";
-
-;--------------------------------
-; Pages
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-
-;--------------------------------
-; Available languages
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "Farsi"
-!insertmacro MUI_LANGUAGE "Finnish"
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Polish"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
-!insertmacro MUI_LANGUAGE "Russian"
-!insertmacro MUI_LANGUAGE "Spanish"
-!insertmacro MUI_LANGUAGE "SimpChinese"
-!include "vidalia_en.nsh"
-!include "vidalia_de.nsh"
-!include "vidalia_es.nsh"
-!include "vidalia_fa.nsh"
-!include "vidalia_fi.nsh"
-!include "vidalia_fr.nsh"
-!include "vidalia_pl.nsh"
-!include "vidalia_pt-br.nsh"
-!include "vidalia_ru.nsh"
-!include "vidalia_zh-cn.nsh"
-
-;--------------------------------
-; Install types
-!ifndef NOINSTTYPES ; only if not defined
- InstType "Full"
- InstType "Base"
- ;InstType /COMPONENTSONLYONCUSTOM
-!endif
-
-
-
-;--------------------------------
-; Tor
-Var configdir
-Var configfile
-var bInstallTor
-SectionGroup "!${TOR_DESC}" TorGroup
- ;--------------------------------
- ; Tor application binaries
- Section "${TOR_NAME}" Tor
- ;Files that have to be installed for tor to run and that the user
- ;cannot choose not to install
- SectionIn 1 2
- SetOutPath "$INSTDIR\Tor"
- File "tor\${TOR_APPVERSION}\tor.exe"
- File "tor\${TOR_APPVERSION}\tor-resolve.exe"
- File "tor\${TOR_APPVERSION}\${TOR_UNINST}"
- WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "http://tor.eff.org";
-
- StrCpy $configfile "torrc"
- StrCpy $configdir $APPDATA\Tor
- SetOutPath $configdir
-
- ;If there's already a torrc config file, ask if they want to
- ;overwrite it with the new one.
- IfFileExists "$configdir\torrc" "" endiftorrc
- MessageBox MB_ICONQUESTION|MB_YESNO "$(TorAskOverwriteTorrc)" IDNO yesreplace
- Delete $configdir\torrc
- Goto endiftorrc
- yesreplace:
- StrCpy $configfile "torrc.sample"
- endiftorrc:
- File /oname=$configfile "tor\${TOR_APPVERSION}\torrc.sample"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "DisplayName" "${TOR_DESC}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "UninstallString" '"$INSTDIR\Tor\${TOR_UNINST}"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoRepair" 1
-
- IntOp $bInstallTor 0 + 1
- SectionEnd
-
- ;--------------------------------
- ; OpenSSL binaries
- Section "$(TorOpenSSL)" TorOpenSSL
- SectionIn 1 2
- SetOutPath "$INSTDIR\Tor"
- File "tor\${TOR_APPVERSION}\libcrypto.a"
- File "tor\${TOR_APPVERSION}\libssl.a"
- SectionEnd
-
- ;--------------------------------
- ; Tor documentation
- Section "$(TorDocumentation)" TorDocs
- SectionIn 1
- SetOutPath "$INSTDIR\Tor\Documents"
- File "tor\${TOR_APPVERSION}\Documents\*.*"
- SectionEnd
-
- ;--------------------------------
- ; Tor Start menu shortcuts
- Section "$(TorShortcuts)" TorShortcuts
- SectionIn 1
- SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
- SetOutPath "$INSTDIR\Tor"
- IfFileExists "$SMPROGRAMS\Tor\*.*" "" +2
- RMDir /r "$SMPROGRAMS\Tor"
-
- CreateDirectory "$SMPROGRAMS\Tor"
- CreateShortCut "$SMPROGRAMS\Tor\Tor.lnk" "$INSTDIR\Tor\tor.exe"
- CreateShortCut "$SMPROGRAMS\Tor\Torrc.lnk" "Notepad.exe" "$configdir\torrc"
- CreateShortCut "$SMPROGRAMS\Tor\Tor Website.lnk" "$INSTDIR\Tor\Tor Website.url"
- CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Tor\${TOR_UNINST}"
-
- IfFileExists "$INSTDIR\Tor\Documents\*.*" "" endifdocs
- CreateDirectory "$SMPROGRAMS\Tor\Documents"
- CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Tor\Documents\tor-reference.html"
- CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Documentation.lnk" "$INSTDIR\Tor\Documents"
- CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Tor\Documents\tor-spec.txt"
- endifdocs:
- SectionEnd
-SectionGroupEnd
-
-
-;--------------------------------
-; Vidalia
-var bInstallVidalia
-SectionGroup "${VIDALIA_DESC}" VidaliaGroup
- ;--------------------------------
- ; Vidalia application binaries
- Section "${VIDALIA_NAME}" Vidalia
- SectionIn 1 2
-
- ; Set output path to the installation directory.
- SetOutPath "$INSTDIR\Vidalia"
- File "Vidalia\${VIDALIA_APPVERSION}\${VIDALIA_EXEC}"
- File "Vidalia\${VIDALIA_APPVERSION}\${VIDALIA_UNINST}"
- File "Vidalia\${VIDALIA_APPVERSION}\mingwm10.dll"
- File "Vidalia\${VIDALIA_APPVERSION}\README"
- File "Vidalia\${VIDALIA_APPVERSION}\CHANGELOG"
- File "Vidalia\${VIDALIA_APPVERSION}\LICENSE"
- File "Vidalia\${VIDALIA_APPVERSION}\COPYING"
- File "Vidalia\${VIDALIA_APPVERSION}\AUTHORS"
- File "BUNDLE_LICENSE"
-
- ; Include a prebuilt GeoIP cache
- SetOutPath "$APPDATA\Vidalia"
- File "Vidalia\${VIDALIA_APPVERSION}\geoip-cache"
-
- ; Tor gets installed to $INSTDIR\Tor, so let's remember it
- ; But first, we have to replace all the '\'s with '\\'s in the $INSTDIR
- ; Does NSIS make this easy by providing the ability to replace substrings? No.
- Push $INSTDIR
- Push "\"
- Push "\\"
- Call StrRep
- Pop $R0 ; contains the modified version of $INSTDIR
-
- SetShellVarContext current
- IfFileExists "$APPDATA\Vidalia" EndIfConf
- CreateDirectory "$APPDATA\Vidalia"
- EndIfConf:
- WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}"
- SetShellVarContext all
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "DisplayName" "${VIDALIA_DESC}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "UninstallString" '"$INSTDIR\Vidalia\${VIDALIA_UNINST}"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoRepair" 1
-
- IntOp $bInstallVidalia 0 + 1
- SectionEnd
-
- ;--------------------------------
- ; Vidalia Start menu shortcuts
- Section "$(VidaliaShortcuts)" VidaliaShortcuts
- SectionIn 1
- SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
- CreateDirectory "$SMPROGRAMS\Vidalia"
- CreateShortCut "$SMPROGRAMS\Vidalia\Uninstall.lnk" "$INSTDIR\Vidalia\uninstall.exe" "" "$INSTDIR\Vidalia\${VIDALIA_UNINST}" 0
- CreateShortCut "$SMPROGRAMS\Vidalia\Vidalia.lnk" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" "" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" 0
- SectionEnd
-
- ;--------------------------------
- ; Run Vidalia at startup
- Section "$(VidaliaStartup)" VidaliaStartup
- SectionIn 1
- WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
- SectionEnd
-SectionGroupEnd
-
-
-;--------------------------------
-; Privoxy
-var bInstallPrivoxy
-SectionGroup "${PRIVOXY_DESC}" PrivoxyGroup
- ;--------------------------------
- ; Privoxy application binaries
- Section "${PRIVOXY_NAME}" Privoxy
- SectionIn 1 2
- ; add files / whatever that need to be installed here.
- SetOutPath "$INSTDIR\Privoxy"
- File /r Privoxy\${PRIVOXY_APPVERSION}\*.*
-
- WriteRegStr HKEY_CLASSES_ROOT "PrivoxyActionFile\shell\open\command" "" 'Notepad.exe "%1"'
- WriteRegStr HKEY_CLASSES_ROOT ".action" "" "PrivoxyActionFile"
- WriteRegStr HKEY_CLASSES_ROOT "PrivoxyFilterFile\shell\open\command" "" 'Notepad.exe "%1"'
- WriteRegStr HKEY_CLASSES_ROOT ".filter" "" "PrivoxyFilterFile"
-
- ; Write the installation path into the registry
- WriteRegStr HKCU SOFTWARE\Privoxy "Install_Dir" "$INSTDIR"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "DisplayName" "${PRIVOXY_DESC}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "UninstallString" '"$INSTDIR\Privoxy\${PRIVOXY_UNINST}"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoRepair" 1
-
-
- IntOp $bInstallPrivoxy 0 + 1
- SectionEnd
-
- ;--------------------------------
- ; Privoxy Start menu shortcuts
- Section "$(PrivoxyShortcuts)" PrivoxyShortcuts
- SectionIn 1
- SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
- RMDir /r "$SMPROGRAMS\Privoxy"
- CreateDirectory "$SMPROGRAMS\Privoxy"
- CreateShortCut "$SMPROGRAMS\Privoxy\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe"
- WriteINIStr "$SMPROGRAMS\Privoxy\Web-based Configuration.url" "InternetShortcut" "URL" "http://config.privoxy.org/";
- CreateShortCut "$SMPROGRAMS\Privoxy\Web-based Feedback.lnk" "$INSTDIR\Privoxy\doc\user-manual\contact.html"
- CreateDirectory "$SMPROGRAMS\Privoxy\Edit Config"
- CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Main Configuration.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\config.txt"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Default Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.action"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\User Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\user.action"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Filters.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.filter"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Trust list.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\trust.txt"'
- CreateDirectory "$SMPROGRAMS\Privoxy\Documentation"
- CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\User Manual.lnk" "$INSTDIR\Privoxy\doc\user-manual\index.html"
- CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\Frequently Asked Questions.lnk" "$INSTDIR\Privoxy\doc\faq\index.html"
- CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\Credits.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\AUTHORS.txt"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\LICENSE.txt"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\ReadMe file.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\README.txt"'
- WriteINIStr "$SMPROGRAMS\Privoxy\Documentation\Web Site.url" "InternetShortcut" "URL" "http://privoxy.org/";
- CreateShortCut "$SMPROGRAMS\Privoxy\Privoxy Uninstall.lnk" "$INSTDIR\Privoxy\${PRIVOXY_UNINST}"
- SectionEnd
-
- ;--------------------------------
- ; Run Privoxy at startup
- Section "$(PrivoxyStartup)" PrivoxyStartup
- SectionIn 1
- CreateShortCut "$SMSTARTUP\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe" "" "" 0 SW_SHOWMINIMIZED
- SectionEnd
-SectionGroupEnd
-
-;--------------------------------
-; Torbutton
-SectionGroup "${TORBUTTON_DESC}" TorbuttonGroup
- Section "${TORBUTTON_NAME}" Torbutton
- SectionIn 1 2
- SetOutPath "$INSTDIR\Torbutton"
- File torbutton\${TORBUTTON_APPVERSION}\torbutton-${TORBUTTON_APPVERSION}.xpi
- SectionEnd
-
- Section "$(TorbuttonAddToFirefox)" TorbuttonAddToFirefox
- SectionIn 1 2
- ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
- StrCmp $1 "" FirefoxNotFound 0 ; if Path is empty or null, then skip to an error, otherwise proceed
- Exec '"$1firefox.exe" -install-global-extension "$INSTDIR\Torbutton\torbutton-${TORBUTTON_APPVERSION}.xpi"'
- Goto TorbuttonInstalled
- FirefoxNotFound:
- MessageBox MB_OK|MB_ICONSTOP "$(TorbuttonFirefoxNotFound)"
- TorbuttonInstalled:
- SectionEnd
-SectionGroupEnd
-
-;--------------------------------
-; Functions
-Function .onInit
- !insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
-
-Function .onSelChange
- Push $0
-
- ; Check if the Torbutton option was unchecked
- SectionGetFlags ${Torbutton} $0
- IntOp $0 $0 & ${SF_SELECTED}
- IntCmp $0 0 0 SelChangeDone SelChangeDone
-
- ; Uncheck the "Add to Firefox" box
- SectionGetFlags ${TorbuttonAddToFirefox} $0
- IntOp $0 $0 & ${SECTION_OFF}
- SectionSetFlags ${TorbuttonAddToFirefox} $0
-
- SelChangeDone:
- Pop $0
-FunctionEnd
-
-Function CustomFinishFn
- IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
- run_vidalia:
- Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
- goto check_privoxy
-
- check_tor:
- IntCmp $bInstallTor 1 run_tor check_privoxy check_privoxy
- run_tor:
- Exec '"$INSTDIR\Tor\${TOR_EXEC}"'
-
- check_privoxy:
- IntCmp $bInstallPrivoxy 1 run_privoxy done done
- run_privoxy:
- SetOutPath "$INSTDIR\Privoxy"
- Exec '"$INSTDIR\Privoxy\${PRIVOXY_EXEC}"'
- done:
-FunctionEnd
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${Tor} "$(TorAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorGroup} "$(TorGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorOpenSSL} "$(TorOpenSSLDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorDocs} "$(TorDocumentationDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorShortcuts} "$(TorShortcutsDesc)"
-
- !insertmacro MUI_DESCRIPTION_TEXT ${Vidalia} "$(VidaliaAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaGroup} "$(VidaliaGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaStartup} "$(VidaliaStartupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaShortcuts} "$(VidaliaShortcutsDesc)"
-
- !insertmacro MUI_DESCRIPTION_TEXT ${Privoxy} "$(PrivoxyAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyGroup} "$(PrivoxyGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyStartup} "$(PrivoxyStartupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyShortcuts} "$(PrivoxyShortcutsDesc)"
-
- !insertmacro MUI_DESCRIPTION_TEXT ${Torbutton} "$(TorbuttonAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonGroup} "$(TorbuttonGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonAddToFirefox} "$(TorbuttonAddToFirefoxDesc)"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-Function StrRep
-
- ;Written by dirtydingus 2003-02-20 04:30:09
- ; USAGE
- ;Push String to do replacement in (haystack)
- ;Push String to replace (needle)
- ;Push Replacement
- ;Call StrRep
- ;Pop $R0 result
-
- Exch $R4 ; $R4 = Replacement String
- Exch
- Exch $R3 ; $R3 = String to replace (needle)
- Exch 2
- Exch $R1 ; $R1 = String to do replacement in (haystack)
- Push $R2 ; Replaced haystack
- Push $R5 ; Len (needle)
- Push $R6 ; len (haystack)
- Push $R7 ; Scratch reg
- StrCpy $R2 ""
- StrLen $R5 $R3
- StrLen $R6 $R1
-loop:
- StrCpy $R7 $R1 $R5
- StrCmp $R7 $R3 found
- StrCpy $R7 $R1 1 ; - optimization can be removed if U know len needle=1
- StrCpy $R2 "$R2$R7"
- StrCpy $R1 $R1 $R6 1
- StrCmp $R1 "" done loop
-found:
- StrCpy $R2 "$R2$R4"
- StrCpy $R1 $R1 $R6 $R5
- StrCmp $R1 "" done loop
-done:
- StrCpy $R3 $R2
- Pop $R7
- Pop $R6
- Pop $R5
- Pop $R2
- Pop $R1
- Pop $R4
- Exch $R3
-
-FunctionEnd
-
+;---------------------------------
+; $Id: $
+;
+; Vidalia/Tor/Privoxy Bundle Installer
+; See BUNDLE_LICENSE for licensing information
+;---------------------------------
+!include "MUI.nsh"
+
+SetCompressor /SOLID lzma
+!packhdr header.dat "upx --best header.dat"
+
+;---------------------------------
+; Global definitions
+!define SF_SELECTED 1
+!define SECTION_OFF 0xFFFFFFFE
+
+!define VIDALIA_NAME "Vidalia"
+!define VIDALIA_EXEC "vidalia.exe"
+!define VIDALIA_APPVERSION "0.0.11-svn"
+!define VIDALIA_DESC "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
+!define VIDALIA_UNINST "uninstall.exe"
+
+!define TOR_NAME "Tor"
+!define TOR_EXEC "tor.exe"
+!define TOR_APPVERSION "0.1.2.4-alpha"
+!define TOR_DESC "${TOR_NAME} ${TOR_APPVERSION}"
+!define TOR_UNINST "Uninstall.exe"
+
+!define PRIVOXY_NAME "Privoxy"
+!define PRIVOXY_EXEC "privoxy.exe"
+!define PRIVOXY_APPVERSION "3.0.6"
+!define PRIVOXY_DESC "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
+!define PRIVOXY_UNINST "privoxy_uninstall.exe"
+
+!define TORBUTTON_NAME "Torbutton"
+!define TORBUTTON_APPVERSION "1.0.4-fx+tb"
+!define TORBUTTON_DESC "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
+
+!define OPENSSL_NAME "OpenSSL"
+!define OPENSSL_APPVERSION "0.9.8d"
+!define OPENSSL_DESC "${OPENSSL_NAME} ${OPENSSL_APPVERSION}"
+
+!define BUNDLE_NAME "Vidalia Bundle"
+!define BUNDLE_APPVERSION "${TOR_APPVERSION}-${VIDALIA_APPVERSION}"
+!define BUNDLE_REVISION "1"
+!define BUNDLE_PRODVERSION "${VIDALIA_APPVERSION}.${BUNDLE_REVISION}" ; Product version must be x.x.x.x
+!define BUNDLE_DESC "${BUNDLE_NAME} ${BUNDLE_APPVERSION}"
+!define INSTALLFILE "vidalia-bundle-${BUNDLE_APPVERSION}.exe"
+
+;--------------------------------
+; Installer file details
+VIAddVersionKey "ProductName" "${BUNDLE_NAME}"
+VIAddVersionKey "Comments" "${BUNDLE_DESC}"
+VIAddVersionKey "FileVersion" "${BUNDLE_APPVERSION}"
+VIAddVersionKey "FileDescription" "${BUNDLE_DESC}"
+VIProductVersion "${BUNDLE_PRODVERSION}"
+
+;--------------------------------
+; Basic installer information
+Name "${BUNDLE_NAME}"
+Caption "$(BundleSetupCaption)"
+BrandingText "${BUNDLE_DESC} (Rev. ${BUNDLE_REVISION})"
+OutFile "${INSTALLFILE}"
+InstallDir "$PROGRAMFILES"
+SetOverWrite ifnewer
+AutoCloseWindow false
+ShowInstDetails show
+CRCCheck on
+XPStyle on
+
+;--------------------------------
+; MUI Options
+!define MUI_WELCOMEPAGE_TITLE "$(BundleWelcomeTitle)"
+!define MUI_WELCOMEPAGE_TEXT "$(BundleWelcomeText)"
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_FINISHPAGE_TEXT "$(BundleFinishText)"
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_FUNCTION CustomFinishFn
+!define MUI_FINISHPAGE_RUN_TEXT "$(BundleRunNow)"
+!define MUI_FINISHPAGE_LINK "$(BundleLinkText)"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://tor.eff.org/docs/tor-doc-win32.html";
+
+;--------------------------------
+; Pages
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+;--------------------------------
+; Available languages
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "Farsi"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!include "vidalia_en.nsh"
+!include "vidalia_de.nsh"
+!include "vidalia_es.nsh"
+!include "vidalia_fa.nsh"
+!include "vidalia_fi.nsh"
+!include "vidalia_fr.nsh"
+!include "vidalia_pl.nsh"
+!include "vidalia_pt-br.nsh"
+!include "vidalia_ru.nsh"
+!include "vidalia_zh-cn.nsh"
+
+;--------------------------------
+; Install types
+!ifndef NOINSTTYPES ; only if not defined
+ InstType "Full"
+ InstType "Base"
+ ;InstType /COMPONENTSONLYONCUSTOM
+!endif
+
+
+
+;--------------------------------
+; Tor
+Var configdir
+Var configfile
+var bInstallTor
+SectionGroup "!${TOR_DESC}" TorGroup
+ ;--------------------------------
+ ; Tor application binaries
+ Section "${TOR_NAME}" Tor
+ ;Files that have to be installed for tor to run and that the user
+ ;cannot choose not to install
+ SectionIn 1 2
+ SetOutPath "$INSTDIR\Tor"
+ File "tor\${TOR_APPVERSION}\tor.exe"
+ File "tor\${TOR_APPVERSION}\tor-resolve.exe"
+ File "tor\${TOR_APPVERSION}\${TOR_UNINST}"
+ WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "http://tor.eff.org";
+
+ StrCpy $configfile "torrc"
+ StrCpy $configdir $APPDATA\Tor
+ SetOutPath $configdir
+
+ ;If there's already a torrc config file, ask if they want to
+ ;overwrite it with the new one.
+ IfFileExists "$configdir\torrc" "" endiftorrc
+ MessageBox MB_ICONQUESTION|MB_YESNO "$(TorAskOverwriteTorrc)" IDNO yesreplace
+ Delete $configdir\torrc
+ Goto endiftorrc
+ yesreplace:
+ StrCpy $configfile "torrc.sample"
+ endiftorrc:
+ File /oname=$configfile "tor\${TOR_APPVERSION}\torrc.sample"
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "DisplayName" "${TOR_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "UninstallString" '"$INSTDIR\Tor\${TOR_UNINST}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoRepair" 1
+
+ IntOp $bInstallTor 0 + 1
+ SectionEnd
+
+ ;--------------------------------
+ ; OpenSSL binaries
+ Section "$(TorOpenSSL)" TorOpenSSL
+ SectionIn 1 2
+ SetOutPath "$INSTDIR\Tor"
+ File "tor\${TOR_APPVERSION}\libcrypto.a"
+ File "tor\${TOR_APPVERSION}\libssl.a"
+ SectionEnd
+
+ ;--------------------------------
+ ; Tor documentation
+ Section "$(TorDocumentation)" TorDocs
+ SectionIn 1
+ SetOutPath "$INSTDIR\Tor\Documents"
+ File "tor\${TOR_APPVERSION}\Documents\*.*"
+ SectionEnd
+
+ ;--------------------------------
+ ; Tor Start menu shortcuts
+ Section "$(TorShortcuts)" TorShortcuts
+ SectionIn 1
+ SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+ SetOutPath "$INSTDIR\Tor"
+ IfFileExists "$SMPROGRAMS\Tor\*.*" "" +2
+ RMDir /r "$SMPROGRAMS\Tor"
+
+ CreateDirectory "$SMPROGRAMS\Tor"
+ CreateShortCut "$SMPROGRAMS\Tor\Tor.lnk" "$INSTDIR\Tor\tor.exe"
+ CreateShortCut "$SMPROGRAMS\Tor\Torrc.lnk" "Notepad.exe" "$configdir\torrc"
+ CreateShortCut "$SMPROGRAMS\Tor\Tor Website.lnk" "$INSTDIR\Tor\Tor Website.url"
+ CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Tor\${TOR_UNINST}"
+
+ IfFileExists "$INSTDIR\Tor\Documents\*.*" "" endifdocs
+ CreateDirectory "$SMPROGRAMS\Tor\Documents"
+ CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Tor\Documents\tor-reference.html"
+ CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Documentation.lnk" "$INSTDIR\Tor\Documents"
+ CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Tor\Documents\tor-spec.txt"
+ endifdocs:
+ SectionEnd
+SectionGroupEnd
+
+
+;--------------------------------
+; Vidalia
+var bInstallVidalia
+SectionGroup "${VIDALIA_DESC}" VidaliaGroup
+ ;--------------------------------
+ ; Vidalia application binaries
+ Section "${VIDALIA_NAME}" Vidalia
+ SectionIn 1 2
+
+ ; Set output path to the installation directory.
+ SetOutPath "$INSTDIR\Vidalia"
+ File "Vidalia\${VIDALIA_APPVERSION}\${VIDALIA_EXEC}"
+ File "Vidalia\${VIDALIA_APPVERSION}\${VIDALIA_UNINST}"
+ File "Vidalia\${VIDALIA_APPVERSION}\mingwm10.dll"
+ File "Vidalia\${VIDALIA_APPVERSION}\README"
+ File "Vidalia\${VIDALIA_APPVERSION}\CHANGELOG"
+ File "Vidalia\${VIDALIA_APPVERSION}\LICENSE"
+ File "Vidalia\${VIDALIA_APPVERSION}\COPYING"
+ File "Vidalia\${VIDALIA_APPVERSION}\AUTHORS"
+ File "BUNDLE_LICENSE"
+
+ ; Include a prebuilt GeoIP cache
+ SetOutPath "$APPDATA\Vidalia"
+ File "Vidalia\${VIDALIA_APPVERSION}\geoip-cache"
+
+ ; Tor gets installed to $INSTDIR\Tor, so let's remember it
+ ; But first, we have to replace all the '\'s with '\\'s in the $INSTDIR
+ ; Does NSIS make this easy by providing the ability to replace substrings? No.
+ Push $INSTDIR
+ Push "\"
+ Push "\\"
+ Call StrRep
+ Pop $R0 ; contains the modified version of $INSTDIR
+
+ SetShellVarContext current
+ IfFileExists "$APPDATA\Vidalia" EndIfConf
+ CreateDirectory "$APPDATA\Vidalia"
+ EndIfConf:
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}"
+ SetShellVarContext all
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "DisplayName" "${VIDALIA_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "UninstallString" '"$INSTDIR\Vidalia\${VIDALIA_UNINST}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoRepair" 1
+
+ IntOp $bInstallVidalia 0 + 1
+ SectionEnd
+
+ ;--------------------------------
+ ; Vidalia Start menu shortcuts
+ Section "$(VidaliaShortcuts)" VidaliaShortcuts
+ SectionIn 1
+ SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+ CreateDirectory "$SMPROGRAMS\Vidalia"
+ CreateShortCut "$SMPROGRAMS\Vidalia\Uninstall.lnk" "$INSTDIR\Vidalia\uninstall.exe" "" "$INSTDIR\Vidalia\${VIDALIA_UNINST}" 0
+ CreateShortCut "$SMPROGRAMS\Vidalia\Vidalia.lnk" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" "" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" 0
+ SectionEnd
+
+ ;--------------------------------
+ ; Run Vidalia at startup
+ Section "$(VidaliaStartup)" VidaliaStartup
+ SectionIn 1
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
+ SectionEnd
+SectionGroupEnd
+
+
+;--------------------------------
+; Privoxy
+var bInstallPrivoxy
+SectionGroup "${PRIVOXY_DESC}" PrivoxyGroup
+ ;--------------------------------
+ ; Privoxy application binaries
+ Section "${PRIVOXY_NAME}" Privoxy
+ SectionIn 1 2
+ ; add files / whatever that need to be installed here.
+ SetOutPath "$INSTDIR\Privoxy"
+ File /r Privoxy\${PRIVOXY_APPVERSION}\*.*
+
+ WriteRegStr HKEY_CLASSES_ROOT "PrivoxyActionFile\shell\open\command" "" 'Notepad.exe "%1"'
+ WriteRegStr HKEY_CLASSES_ROOT ".action" "" "PrivoxyActionFile"
+ WriteRegStr HKEY_CLASSES_ROOT "PrivoxyFilterFile\shell\open\command" "" 'Notepad.exe "%1"'
+ WriteRegStr HKEY_CLASSES_ROOT ".filter" "" "PrivoxyFilterFile"
+
+ ; Write the installation path into the registry
+ WriteRegStr HKCU SOFTWARE\Privoxy "Install_Dir" "$INSTDIR"
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "DisplayName" "${PRIVOXY_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "UninstallString" '"$INSTDIR\Privoxy\${PRIVOXY_UNINST}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoRepair" 1
+
+
+ IntOp $bInstallPrivoxy 0 + 1
+ SectionEnd
+
+ ;--------------------------------
+ ; Privoxy Start menu shortcuts
+ Section "$(PrivoxyShortcuts)" PrivoxyShortcuts
+ SectionIn 1
+ SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+ RMDir /r "$SMPROGRAMS\Privoxy"
+ CreateDirectory "$SMPROGRAMS\Privoxy"
+ CreateShortCut "$SMPROGRAMS\Privoxy\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe"
+ WriteINIStr "$SMPROGRAMS\Privoxy\Web-based Configuration.url" "InternetShortcut" "URL" "http://config.privoxy.org/";
+ CreateShortCut "$SMPROGRAMS\Privoxy\Web-based Feedback.lnk" "$INSTDIR\Privoxy\doc\user-manual\contact.html"
+ CreateDirectory "$SMPROGRAMS\Privoxy\Edit Config"
+ CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Main Configuration.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\config.txt"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Default Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.action"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\User Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\user.action"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Filters.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.filter"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Trust list.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\trust.txt"'
+ CreateDirectory "$SMPROGRAMS\Privoxy\Documentation"
+ CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\User Manual.lnk" "$INSTDIR\Privoxy\doc\user-manual\index.html"
+ CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\Frequently Asked Questions.lnk" "$INSTDIR\Privoxy\doc\faq\index.html"
+ CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\Credits.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\AUTHORS.txt"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\LICENSE.txt"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\ReadMe file.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\README.txt"'
+ WriteINIStr "$SMPROGRAMS\Privoxy\Documentation\Web Site.url" "InternetShortcut" "URL" "http://privoxy.org/";
+ CreateShortCut "$SMPROGRAMS\Privoxy\Privoxy Uninstall.lnk" "$INSTDIR\Privoxy\${PRIVOXY_UNINST}"
+ SectionEnd
+
+ ;--------------------------------
+ ; Run Privoxy at startup
+ Section "$(PrivoxyStartup)" PrivoxyStartup
+ SectionIn 1
+ CreateShortCut "$SMSTARTUP\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe" "" "" 0 SW_SHOWMINIMIZED
+ SectionEnd
+SectionGroupEnd
+
+;--------------------------------
+; Torbutton
+SectionGroup "${TORBUTTON_DESC}" TorbuttonGroup
+ Section "${TORBUTTON_NAME}" Torbutton
+ SectionIn 1 2
+ SetOutPath "$INSTDIR\Torbutton"
+ File torbutton\${TORBUTTON_APPVERSION}\torbutton-${TORBUTTON_APPVERSION}.xpi
+ SectionEnd
+
+ Section "$(TorbuttonAddToFirefox)" TorbuttonAddToFirefox
+ SectionIn 1 2
+ ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
+ StrCmp $1 "" FirefoxNotFound 0 ; if Path is empty or null, then skip to an error, otherwise proceed
+ Exec '"$1firefox.exe" -install-global-extension "$INSTDIR\Torbutton\torbutton-${TORBUTTON_APPVERSION}.xpi"'
+ Goto TorbuttonInstalled
+ FirefoxNotFound:
+ MessageBox MB_OK|MB_ICONSTOP "$(TorbuttonFirefoxNotFound)"
+ TorbuttonInstalled:
+ SectionEnd
+SectionGroupEnd
+
+;--------------------------------
+; Functions
+Function .onInit
+ !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+Function .onSelChange
+ Push $0
+
+ ; Check if the Torbutton option was unchecked
+ SectionGetFlags ${Torbutton} $0
+ IntOp $0 $0 & ${SF_SELECTED}
+ IntCmp $0 0 0 SelChangeDone SelChangeDone
+
+ ; Uncheck the "Add to Firefox" box
+ SectionGetFlags ${TorbuttonAddToFirefox} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${TorbuttonAddToFirefox} $0
+
+ SelChangeDone:
+ Pop $0
+FunctionEnd
+
+Function CustomFinishFn
+ IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
+ run_vidalia:
+ Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
+ goto check_privoxy
+
+ check_tor:
+ IntCmp $bInstallTor 1 run_tor check_privoxy check_privoxy
+ run_tor:
+ Exec '"$INSTDIR\Tor\${TOR_EXEC}"'
+
+ check_privoxy:
+ IntCmp $bInstallPrivoxy 1 run_privoxy done done
+ run_privoxy:
+ SetOutPath "$INSTDIR\Privoxy"
+ Exec '"$INSTDIR\Privoxy\${PRIVOXY_EXEC}"'
+ done:
+FunctionEnd
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${Tor} "$(TorAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorGroup} "$(TorGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorOpenSSL} "$(TorOpenSSLDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorDocs} "$(TorDocumentationDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorShortcuts} "$(TorShortcutsDesc)"
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${Vidalia} "$(VidaliaAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaGroup} "$(VidaliaGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaStartup} "$(VidaliaStartupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaShortcuts} "$(VidaliaShortcutsDesc)"
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${Privoxy} "$(PrivoxyAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyGroup} "$(PrivoxyGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyStartup} "$(PrivoxyStartupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyShortcuts} "$(PrivoxyShortcutsDesc)"
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${Torbutton} "$(TorbuttonAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonGroup} "$(TorbuttonGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonAddToFirefox} "$(TorbuttonAddToFirefoxDesc)"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+Function StrRep
+
+ ;Written by dirtydingus 2003-02-20 04:30:09
+ ; USAGE
+ ;Push String to do replacement in (haystack)
+ ;Push String to replace (needle)
+ ;Push Replacement
+ ;Call StrRep
+ ;Pop $R0 result
+
+ Exch $R4 ; $R4 = Replacement String
+ Exch
+ Exch $R3 ; $R3 = String to replace (needle)
+ Exch 2
+ Exch $R1 ; $R1 = String to do replacement in (haystack)
+ Push $R2 ; Replaced haystack
+ Push $R5 ; Len (needle)
+ Push $R6 ; len (haystack)
+ Push $R7 ; Scratch reg
+ StrCpy $R2 ""
+ StrLen $R5 $R3
+ StrLen $R6 $R1
+loop:
+ StrCpy $R7 $R1 $R5
+ StrCmp $R7 $R3 found
+ StrCpy $R7 $R1 1 ; - optimization can be removed if U know len needle=1
+ StrCpy $R2 "$R2$R7"
+ StrCpy $R1 $R1 $R6 1
+ StrCmp $R1 "" done loop
+found:
+ StrCpy $R2 "$R2$R4"
+ StrCpy $R1 $R1 $R6 $R5
+ StrCmp $R1 "" done loop
+done:
+ StrCpy $R3 $R2
+ Pop $R7
+ Pop $R6
+ Pop $R5
+ Pop $R2
+ Pop $R1
+ Pop $R4
+ Exch $R3
+
+FunctionEnd
+
Property changes on: trunk/pkg/win32/vidalia-bundle.nsi
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/pkg/win32/vidalia.nsi
===================================================================
--- trunk/pkg/win32/vidalia.nsi 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/pkg/win32/vidalia.nsi 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,186 +1,186 @@
-;-------------------------------------------
-; $Id: $
-;
-; Copyright (c) 2006, Matt Edman, Justin Hipple
-; See LICENSE for licensing information
-;-------------------------------------------
-!include "MUI.nsh"
-
-SetCompressor /SOLID lzma
-!packhdr header.dat "upx --best header.dat"
-
-;---------------------------------
-; Global definitions
-!define VIDALIA_NAME "Vidalia"
-!define VIDALIA_EXEC "vidalia.exe"
-!define VIDALIA_APPVERSION "0.0.11-svn"
-!define VIDALIA_PRODVERSION "0.0.11.0" ; Product version must be x.x.x.x
-!define VIDALIA_AUTHORS "Matt Edman, Justin Hipple"
-!define VIDALIA_INSTALLFILE "vidalia-${VIDALIA_APPVERSION}.exe"
-!define VIDALIA_DESC "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
-
-;--------------------------------
-; Installer file details
-VIAddVersionKey "ProductName" "${VIDALIA_NAME}"
-VIAddVersionKey "Comments" "${VIDALIA_DESC}"
-VIAddVersionKey "CompanyName" "${VIDALIA_AUTHORS}"
-VIAddVersionKey "LegalTrademarks" "${VIDALIA_AUTHORS}"
-VIAddVersionKey "LegalCopyright" "${VIDALIA_AUTHORS}"
-VIAddVersionKey "FileVersion" "${VIDALIA_APPVERSION}"
-VIAddVersionKey "FileDescription" "${VIDALIA_DESC}"
-VIProductVersion "${VIDALIA_PRODVERSION}"
-
-;--------------------------------
-; Basic installer information
-Name "${VIDALIA_NAME}"
-Caption "$(VidaliaSetupCaption)"
-BrandingText "${VIDALIA_DESC}"
-OutFile "${VIDALIA_INSTALLFILE}"
-InstallDir "$PROGRAMFILES\${VIDALIA_NAME}"
-InstallDirRegKey HKCU "Software" "${VIDALIA_NAME}"
-SetOverWrite ifnewer
-AutoCloseWindow false
-ShowInstDetails show
-CRCCheck on
-XPStyle on
-
-;--------------------------------
-; Install types
-!ifndef NOINSTTYPES ; only if not defined
- InstType "Full"
- InstType "Base"
- ;InstType /COMPONENTSONLYONCUSTOM
-!endif
-
-;--------------------------------
-; MUI Options
-!define MUI_WELCOMEPAGE_TITLE "$(VidaliaWelcomeTitle)"
-!define MUI_WELCOMEPAGE_TEXT "$(VidaliaWelcomeText)"
-!define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
-!define MUI_HEADERIMAGE
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${VIDALIA_EXEC}"
-!define MUI_FINISHPAGE_RUN_TEXT "$(VidaliaRunNow)"
-!define MUI_FINISHPAGE_LINK "$(VidaliaLinkText)"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.vidalia-project.net";
-
-;--------------------------------
-; Pages
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-; Available languages
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "Farsi"
-!insertmacro MUI_LANGUAGE "Finnish"
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Polish"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
-!insertmacro MUI_LANGUAGE "Russian"
-!insertmacro MUI_LANGUAGE "Spanish"
-!insertmacro MUI_LANGUAGE "SimpChinese"
-!include "vidalia_en.nsh"
-!include "vidalia_de.nsh"
-!include "vidalia_es.nsh"
-!include "vidalia_fa.nsh"
-!include "vidalia_fi.nsh"
-!include "vidalia_fr.nsh"
-!include "vidalia_pl.nsh"
-!include "vidalia_pt-br.nsh"
-!include "vidalia_ru.nsh"
-!include "vidalia_zh-cn.nsh"
-
-;--------------------------------
-; Functions
-Function .onInit
- !insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
-
-;--------------------------------
-; Required Components
-Section "${VIDALIA_DESC}" Vidalia
- SectionIn RO
-
- ; Set output path to the installation directory.
- SetOutPath $INSTDIR
- File "..\..\release\${VIDALIA_EXEC}"
- File "..\..\release\mingwm10.dll"
- File "..\..\AUTHORS"
- File "..\..\CHANGELOG"
- File "..\..\LICENSE"
- File "..\..\COPYING"
- File "..\..\README"
-
- ; Include a prebuilt GeoIP cache
- SetOutPath "$APPDATA\Vidalia"
- File "..\geoip-cache"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "DisplayName" "${VIDALIA_DESC}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "NoRepair" 1
- WriteUninstaller "uninstall.exe"
-SectionEnd
-
-;--------------------------------
-; Start Menu Shortcuts
-; Optional section (can be disabled by the user)
-Section "$(VidaliaShortcuts)" Shortcuts
- SectionIn 1
- SetShellVarContext all
- CreateDirectory "$SMPROGRAMS\${VIDALIA_NAME}"
- CreateShortCut "$SMPROGRAMS\${VIDALIA_NAME}\${VIDALIA_NAME}.lnk" "$INSTDIR\${VIDALIA_EXEC}" "" "$INSTDIR\${VIDALIA_EXEC}" 0
- CreateShortCut "$SMPROGRAMS\${VIDALIA_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-SectionEnd
-
-;--------------------------------
-; Run At Startup
-Section "$(VidaliaStartup)" RunAtStartup
- SectionIn 1
- WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\${VIDALIA_EXEC}"'
-SectionEnd
-
-;--------------------------------
-; Uninstaller
-Section "Uninstall"
- SetShellVarContext all
-
- ; Remove registry keys
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run\" "${VIDALIA_NAME}"
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}"
- DeleteRegKey HKCU "Software\${VIDALIA_NAME}"
-
- ; Remove files and uninstaller
- Delete $INSTDIR\uninstall.exe
-
- ; Remove shortcuts, if any
- Delete "$SMPROGRAMS\${VIDALIA_NAME}\*.*"
-
- ; Remove directories used
- RMDir "$SMPROGRAMS\${VIDALIA_NAME}"
- RMDir /r "$INSTDIR"
-
- SetShellVarContext current
- RMDir /r "$APPDATA\Vidalia"
-SectionEnd
-
-;--------------------------------
-; Descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${Vidalia} "$(VidaliaAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${Shortcuts} "$(VidaliaShortcutsDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${RunAtStartup} "$(VidaliaStartupDesc)"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
+;-------------------------------------------
+; $Id: $
+;
+; Copyright (c) 2006, Matt Edman, Justin Hipple
+; See LICENSE for licensing information
+;-------------------------------------------
+!include "MUI.nsh"
+
+SetCompressor /SOLID lzma
+!packhdr header.dat "upx --best header.dat"
+
+;---------------------------------
+; Global definitions
+!define VIDALIA_NAME "Vidalia"
+!define VIDALIA_EXEC "vidalia.exe"
+!define VIDALIA_APPVERSION "0.0.11-svn"
+!define VIDALIA_PRODVERSION "0.0.11.0" ; Product version must be x.x.x.x
+!define VIDALIA_AUTHORS "Matt Edman, Justin Hipple"
+!define VIDALIA_INSTALLFILE "vidalia-${VIDALIA_APPVERSION}.exe"
+!define VIDALIA_DESC "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
+
+;--------------------------------
+; Installer file details
+VIAddVersionKey "ProductName" "${VIDALIA_NAME}"
+VIAddVersionKey "Comments" "${VIDALIA_DESC}"
+VIAddVersionKey "CompanyName" "${VIDALIA_AUTHORS}"
+VIAddVersionKey "LegalTrademarks" "${VIDALIA_AUTHORS}"
+VIAddVersionKey "LegalCopyright" "${VIDALIA_AUTHORS}"
+VIAddVersionKey "FileVersion" "${VIDALIA_APPVERSION}"
+VIAddVersionKey "FileDescription" "${VIDALIA_DESC}"
+VIProductVersion "${VIDALIA_PRODVERSION}"
+
+;--------------------------------
+; Basic installer information
+Name "${VIDALIA_NAME}"
+Caption "$(VidaliaSetupCaption)"
+BrandingText "${VIDALIA_DESC}"
+OutFile "${VIDALIA_INSTALLFILE}"
+InstallDir "$PROGRAMFILES\${VIDALIA_NAME}"
+InstallDirRegKey HKCU "Software" "${VIDALIA_NAME}"
+SetOverWrite ifnewer
+AutoCloseWindow false
+ShowInstDetails show
+CRCCheck on
+XPStyle on
+
+;--------------------------------
+; Install types
+!ifndef NOINSTTYPES ; only if not defined
+ InstType "Full"
+ InstType "Base"
+ ;InstType /COMPONENTSONLYONCUSTOM
+!endif
+
+;--------------------------------
+; MUI Options
+!define MUI_WELCOMEPAGE_TITLE "$(VidaliaWelcomeTitle)"
+!define MUI_WELCOMEPAGE_TEXT "$(VidaliaWelcomeText)"
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${VIDALIA_EXEC}"
+!define MUI_FINISHPAGE_RUN_TEXT "$(VidaliaRunNow)"
+!define MUI_FINISHPAGE_LINK "$(VidaliaLinkText)"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.vidalia-project.net";
+
+;--------------------------------
+; Pages
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+;--------------------------------
+; Available languages
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "Farsi"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!include "vidalia_en.nsh"
+!include "vidalia_de.nsh"
+!include "vidalia_es.nsh"
+!include "vidalia_fa.nsh"
+!include "vidalia_fi.nsh"
+!include "vidalia_fr.nsh"
+!include "vidalia_pl.nsh"
+!include "vidalia_pt-br.nsh"
+!include "vidalia_ru.nsh"
+!include "vidalia_zh-cn.nsh"
+
+;--------------------------------
+; Functions
+Function .onInit
+ !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+;--------------------------------
+; Required Components
+Section "${VIDALIA_DESC}" Vidalia
+ SectionIn RO
+
+ ; Set output path to the installation directory.
+ SetOutPath $INSTDIR
+ File "..\..\release\${VIDALIA_EXEC}"
+ File "..\..\release\mingwm10.dll"
+ File "..\..\AUTHORS"
+ File "..\..\CHANGELOG"
+ File "..\..\LICENSE"
+ File "..\..\COPYING"
+ File "..\..\README"
+
+ ; Include a prebuilt GeoIP cache
+ SetOutPath "$APPDATA\Vidalia"
+ File "..\geoip-cache"
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "DisplayName" "${VIDALIA_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "NoRepair" 1
+ WriteUninstaller "uninstall.exe"
+SectionEnd
+
+;--------------------------------
+; Start Menu Shortcuts
+; Optional section (can be disabled by the user)
+Section "$(VidaliaShortcuts)" Shortcuts
+ SectionIn 1
+ SetShellVarContext all
+ CreateDirectory "$SMPROGRAMS\${VIDALIA_NAME}"
+ CreateShortCut "$SMPROGRAMS\${VIDALIA_NAME}\${VIDALIA_NAME}.lnk" "$INSTDIR\${VIDALIA_EXEC}" "" "$INSTDIR\${VIDALIA_EXEC}" 0
+ CreateShortCut "$SMPROGRAMS\${VIDALIA_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+SectionEnd
+
+;--------------------------------
+; Run At Startup
+Section "$(VidaliaStartup)" RunAtStartup
+ SectionIn 1
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\${VIDALIA_EXEC}"'
+SectionEnd
+
+;--------------------------------
+; Uninstaller
+Section "Uninstall"
+ SetShellVarContext all
+
+ ; Remove registry keys
+ DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run\" "${VIDALIA_NAME}"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}"
+ DeleteRegKey HKCU "Software\${VIDALIA_NAME}"
+
+ ; Remove files and uninstaller
+ Delete $INSTDIR\uninstall.exe
+
+ ; Remove shortcuts, if any
+ Delete "$SMPROGRAMS\${VIDALIA_NAME}\*.*"
+
+ ; Remove directories used
+ RMDir "$SMPROGRAMS\${VIDALIA_NAME}"
+ RMDir /r "$INSTDIR"
+
+ SetShellVarContext current
+ RMDir /r "$APPDATA\Vidalia"
+SectionEnd
+
+;--------------------------------
+; Descriptions
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${Vidalia} "$(VidaliaAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${Shortcuts} "$(VidaliaShortcutsDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${RunAtStartup} "$(VidaliaStartupDesc)"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
Property changes on: trunk/pkg/win32/vidalia.nsi
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/pkg/win32/vidalia_de.nsh
===================================================================
--- trunk/pkg/win32/vidalia_de.nsh 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/pkg/win32/vidalia_de.nsh 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,55 +1,55 @@
-;; $Id$
-;;
-;; Vidalia installer and bundle German translation
-;;
-
-; Bundle
-LangString BundleSetupCaption ${LANG_GERMAN} "${BUNDLE_NAME} Setup"
-LangString BundleWelcomeText ${LANG_GERMAN} "Dieser Assistent führt Sie durch die Installation von:\r\n\tTor\t${TOR_APPVERSION}\r\n\tVidalia\t${VIDALIA_APPVERSION}\r\n\tPrivoxy\t${PRIVOXY_APPVERSION}\r\n\r\nSollten Sie Tor, Vidalia oder Privoxy bereits installiert haben, beenden Sie diese Programme bitte bevor Sie fortfahren.\r\n\r\n$_CLICK"
-LangString BundleWelcomeTitle ${LANG_GERMAN} "Willkommen beim ${BUNDLE_NAME} Installations-Assistent"
-LangString BundleLinkText ${LANG_GERMAN} "${TOR_NAME} Installations-Dokumentation"
-LangString BundleFinishText ${LANG_GERMAN} "Die Installation wird abgeschlossen.\r\nBitte besuchen Sie http://tor.eff.org/docs/tor-doc-win32.html um zu erfahren, wie Sie Ihre Anwendungen zur Benutzung mit Tor einrichten können.\r\n"
-LangString BundleRunNow ${LANG_GERMAN} "Installierte Anwendungen jetzt starten"
-
-
-; Vidalia
-LangString VidaliaGroupDesc ${LANG_GERMAN} "Installiere ${VIDALIA_DESC}."
-LangString VidaliaSetupCaption ${LANG_GERMAN} "${VIDALIA_NAME} Setup"
-LangString VidaliaWelcomeText ${LANG_GERMAN} "Dieser Assistent führt Sie durch die Installation von ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
-LangString VidaliaWelcomeTitle ${LANG_GERMAN} "Willkommen beim ${VIDALIA_NAME} Installations-Assistent"
-LangString VidaliaLinkText ${LANG_GERMAN} "${VIDALIA_NAME} Homepage"
-LangString VidaliaAppDesc ${LANG_GERMAN} "Installiere ${VIDALIA_DESC}."
-LangString VidaliaStartup ${LANG_GERMAN} "Beim Systemstart ausführen"
-LangString VidaliaStartupDesc ${LANG_GERMAN} "${VIDALIA_NAME} beim Systemstart automatisch ausführen."
-LangString VidaliaShortcuts ${LANG_GERMAN} "Zum Startmenü hinzufügen"
-LangString VidaliaShortcutsDesc ${LANG_GERMAN} "${VIDALIA_NAME} zu Ihrem Startmenü hinzufügen."
-LangString VidaliaRunNow ${LANG_GERMAN} "${VIDALIA_NAME} jetzt starten"
-
-
-; Tor
-LangString TorGroupDesc ${LANG_GERMAN} "Installiere ${TOR_DESC}."
-LangString TorAppDesc ${LANG_GERMAN} "Installiere ${TOR_DESC}."
-LangString TorAskOverwriteTorrc ${LANG_GERMAN} "Sie haben bereits eine Tor Konfigurationsdatei.$\r$\nSoll diese mit der allgemeinen Beispiel-Konfigurationsdatei überschrieben werden?"
-LangString TorOpenSSL ${LANG_GERMAN} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_GERMAN} "Installiere ${OPENSSL_DESC}."
-LangString TorDocumentation ${LANG_GERMAN} "Dokumentation"
-LangString TorDocumentationDesc ${LANG_GERMAN} "Installiere ${TOR_NAME} Dokumentation."
-LangString TorShortcuts ${LANG_GERMAN} "Zum Startmenü hinzufügen"
-LangString TorShortcutsDesc ${LANG_GERMAN} "${TOR_NAME} zu Ihrem Startmenü hinzufügen."
-
-
-; Privoxy
-LangString PrivoxyGroupDesc ${LANG_GERMAN} "Installiere ${PRIVOXY_DESC}"
-LangString PrivoxyAppDesc ${LANG_GERMAN} "Installiere ${PRIVOXY_DESC}."
-LangString PrivoxyShortcuts ${LANG_GERMAN} "Zum Startmenü hinzufügen"
-LangString PrivoxyShortcutsDesc ${LANG_GERMAN} "${PRIVOXY_NAME} zu Ihrem Startmenü hinzufügen."
-LangString PrivoxyStartup ${LANG_GERMAN} "Beim Systemstart ausführen"
-LangString PrivoxyStartupDesc ${LANG_GERMAN} "${PRIVOXY_NAME} beim Systemstart automatisch ausführen."
-
-; Torbutton
-LangString TorbuttonGroupDesc ${LANG_GERMAN} "Installiere ${TORBUTTON_DESC}."
-LangString TorbuttonAppDesc ${LANG_GERMAN} "Installiere ${TORBUTTON_DESC}."
-LangString TorbuttonAddToFirefox ${LANG_GERMAN} "Zu Firefox hinzufügen"
-LangString TorbuttonAddToFirefoxDesc ${LANG_GERMAN} "Die ${TORBUTTON_DESC}-Erweiterung zu Firefox hinzufügen."
-LangString TorbuttonFirefoxNotFound ${LANG_GERMAN} "Firefox konnte nicht gefunden werden. Torbutton wird nicht installiert."
-
+;; $Id$
+;;
+;; Vidalia installer and bundle German translation
+;;
+
+; Bundle
+LangString BundleSetupCaption ${LANG_GERMAN} "${BUNDLE_NAME} Setup"
+LangString BundleWelcomeText ${LANG_GERMAN} "Dieser Assistent führt Sie durch die Installation von:\r\n\tTor\t${TOR_APPVERSION}\r\n\tVidalia\t${VIDALIA_APPVERSION}\r\n\tPrivoxy\t${PRIVOXY_APPVERSION}\r\n\r\nSollten Sie Tor, Vidalia oder Privoxy bereits installiert haben, beenden Sie diese Programme bitte bevor Sie fortfahren.\r\n\r\n$_CLICK"
+LangString BundleWelcomeTitle ${LANG_GERMAN} "Willkommen beim ${BUNDLE_NAME} Installations-Assistent"
+LangString BundleLinkText ${LANG_GERMAN} "${TOR_NAME} Installations-Dokumentation"
+LangString BundleFinishText ${LANG_GERMAN} "Die Installation wird abgeschlossen.\r\nBitte besuchen Sie http://tor.eff.org/docs/tor-doc-win32.html um zu erfahren, wie Sie Ihre Anwendungen zur Benutzung mit Tor einrichten können.\r\n"
+LangString BundleRunNow ${LANG_GERMAN} "Installierte Anwendungen jetzt starten"
+
+
+; Vidalia
+LangString VidaliaGroupDesc ${LANG_GERMAN} "Installiere ${VIDALIA_DESC}."
+LangString VidaliaSetupCaption ${LANG_GERMAN} "${VIDALIA_NAME} Setup"
+LangString VidaliaWelcomeText ${LANG_GERMAN} "Dieser Assistent führt Sie durch die Installation von ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
+LangString VidaliaWelcomeTitle ${LANG_GERMAN} "Willkommen beim ${VIDALIA_NAME} Installations-Assistent"
+LangString VidaliaLinkText ${LANG_GERMAN} "${VIDALIA_NAME} Homepage"
+LangString VidaliaAppDesc ${LANG_GERMAN} "Installiere ${VIDALIA_DESC}."
+LangString VidaliaStartup ${LANG_GERMAN} "Beim Systemstart ausführen"
+LangString VidaliaStartupDesc ${LANG_GERMAN} "${VIDALIA_NAME} beim Systemstart automatisch ausführen."
+LangString VidaliaShortcuts ${LANG_GERMAN} "Zum Startmenü hinzufügen"
+LangString VidaliaShortcutsDesc ${LANG_GERMAN} "${VIDALIA_NAME} zu Ihrem Startmenü hinzufügen."
+LangString VidaliaRunNow ${LANG_GERMAN} "${VIDALIA_NAME} jetzt starten"
+
+
+; Tor
+LangString TorGroupDesc ${LANG_GERMAN} "Installiere ${TOR_DESC}."
+LangString TorAppDesc ${LANG_GERMAN} "Installiere ${TOR_DESC}."
+LangString TorAskOverwriteTorrc ${LANG_GERMAN} "Sie haben bereits eine Tor Konfigurationsdatei.$\r$\nSoll diese mit der allgemeinen Beispiel-Konfigurationsdatei überschrieben werden?"
+LangString TorOpenSSL ${LANG_GERMAN} "OpenSSL ${OPENSSL_APPVERSION}"
+LangString TorOpenSSLDesc ${LANG_GERMAN} "Installiere ${OPENSSL_DESC}."
+LangString TorDocumentation ${LANG_GERMAN} "Dokumentation"
+LangString TorDocumentationDesc ${LANG_GERMAN} "Installiere ${TOR_NAME} Dokumentation."
+LangString TorShortcuts ${LANG_GERMAN} "Zum Startmenü hinzufügen"
+LangString TorShortcutsDesc ${LANG_GERMAN} "${TOR_NAME} zu Ihrem Startmenü hinzufügen."
+
+
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_GERMAN} "Installiere ${PRIVOXY_DESC}"
+LangString PrivoxyAppDesc ${LANG_GERMAN} "Installiere ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_GERMAN} "Zum Startmenü hinzufügen"
+LangString PrivoxyShortcutsDesc ${LANG_GERMAN} "${PRIVOXY_NAME} zu Ihrem Startmenü hinzufügen."
+LangString PrivoxyStartup ${LANG_GERMAN} "Beim Systemstart ausführen"
+LangString PrivoxyStartupDesc ${LANG_GERMAN} "${PRIVOXY_NAME} beim Systemstart automatisch ausführen."
+
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_GERMAN} "Installiere ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_GERMAN} "Installiere ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_GERMAN} "Zu Firefox hinzufügen"
+LangString TorbuttonAddToFirefoxDesc ${LANG_GERMAN} "Die ${TORBUTTON_DESC}-Erweiterung zu Firefox hinzufügen."
+LangString TorbuttonFirefoxNotFound ${LANG_GERMAN} "Firefox konnte nicht gefunden werden. Torbutton wird nicht installiert."
+
Property changes on: trunk/pkg/win32/vidalia_de.nsh
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/pkg/win32/vidalia_en.nsh
===================================================================
--- trunk/pkg/win32/vidalia_en.nsh 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/pkg/win32/vidalia_en.nsh 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,73 +1,73 @@
-;; $Id$
-;;
-;; Vidalia installer and bundle English translation
-;;
-;; All translations should be derived from this file.
-;;
-;; To translate this file:
-;;
-;; 1) Copy this file (vidalia_en.nsh), creating a new file with "en"
-;; replaced by the two-letter language code of your translated language.
-;; For example, if you are creating a German translation, your new file
-;; would be named "vidalia_de.nsh".
-;;
-;; 2) Replace all ${LANG_ENGLISH} tags with whatever language you are
-;; translating this file into. For example, if you are creating a German
-;; translation, all ${LANG_ENGLISH} tags would become ${LANG_GERMAN}.
-;;
-;; 3) Translate the quoted strings. You can move string replacement tags
-;; (e.g., ${BUNDLE_NAME}) around within the quoted strings, but you
-;; should not alter the tags themselves.
-;;
-;; Your resulting file should use a non-Unicode character encoding, since NSIS
-;; does not support Unicode.
-;;
-
-
-; Bundle
-LangString BundleSetupCaption ${LANG_ENGLISH} "${BUNDLE_NAME} setup"
-LangString BundleWelcomeText ${LANG_ENGLISH} "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\r\n\r\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\r\n\r\n$_CLICK"
-LangString BundleWelcomeTitle ${LANG_ENGLISH} "Welcome to the ${BUNDLE_NAME} Setup Wizard"
-LangString BundleLinkText ${LANG_ENGLISH} "${TOR_NAME} installation documentation"
-LangString BundleFinishText ${LANG_ENGLISH} "Installation is complete.\r\nPlease see http://tor.eff.org/docs/tor-doc-win32.html to learn how to configure your applications to use Tor.\r\n\r\nIf you installed Torbutton, you will need to restart Firefox."
-LangString BundleRunNow ${LANG_ENGLISH} "Run installed components now"
-
-; Vidalia
-LangString VidaliaGroupDesc ${LANG_ENGLISH} "Install ${VIDALIA_DESC}."
-LangString VidaliaSetupCaption ${LANG_ENGLISH} "${VIDALIA_NAME} setup"
-LangString VidaliaWelcomeText ${LANG_ENGLISH} "This wizard will guide you through the installation of ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
-LangString VidaliaWelcomeTitle ${LANG_ENGLISH} "Welcome to the ${VIDALIA_NAME} Setup Wizard"
-LangString VidaliaLinkText ${LANG_ENGLISH} "${VIDALIA_NAME} homepage"
-LangString VidaliaAppDesc ${LANG_ENGLISH} "Install ${VIDALIA_DESC}."
-LangString VidaliaStartup ${LANG_ENGLISH} "Run At Startup"
-LangString VidaliaStartupDesc ${LANG_ENGLISH} "Automatically run ${VIDALIA_NAME} at startup."
-LangString VidaliaShortcuts ${LANG_ENGLISH} "Add to Start Menu"
-LangString VidaliaShortcutsDesc ${LANG_ENGLISH} "Add ${VIDALIA_NAME} to your Start menu."
-LangString VidaliaRunNow ${LANG_ENGLISH} "Run ${VIDALIA_NAME} now"
-
-; Tor
-LangString TorGroupDesc ${LANG_ENGLISH} "Install ${TOR_DESC}."
-LangString TorAppDesc ${LANG_ENGLISH} "Install ${TOR_DESC}."
-LangString TorAskOverwriteTorrc ${LANG_ENGLISH} "You already have a Tor configuration file.$\r$\nDo you want to overwrite it with the default sample configuration file?"
-LangString TorOpenSSL ${LANG_ENGLISH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_ENGLISH} "Install ${OPENSSL_DESC}."
-LangString TorDocumentation ${LANG_ENGLISH} "Documentation"
-LangString TorDocumentationDesc ${LANG_ENGLISH} "Install ${TOR_NAME} documentation."
-LangString TorShortcuts ${LANG_ENGLISH} "Add to Start Menu"
-LangString TorShortcutsDesc ${LANG_ENGLISH} "Add ${TOR_NAME} to your Start menu."
-
-; Privoxy
-LangString PrivoxyGroupDesc ${LANG_ENGLISH} "Install ${PRIVOXY_DESC}"
-LangString PrivoxyAppDesc ${LANG_ENGLISH} "Install ${PRIVOXY_DESC}."
-LangString PrivoxyShortcuts ${LANG_ENGLISH} "Add to Start Menu"
-LangString PrivoxyShortcutsDesc ${LANG_ENGLISH} "Add ${PRIVOXY_NAME} to your Start menu."
-LangString PrivoxyStartup ${LANG_ENGLISH} "Run At Startup"
-LangString PrivoxyStartupDesc ${LANG_ENGLISH} "Automatically run ${PRIVOXY_NAME} at startup."
-
-; Torbutton
-LangString TorbuttonGroupDesc ${LANG_ENGLISH} "Install ${TORBUTTON_DESC}."
-LangString TorbuttonAppDesc ${LANG_ENGLISH} "Install ${TORBUTTON_DESC}."
-LangString TorbuttonAddToFirefox ${LANG_ENGLISH} "Add to Firefox"
-LangString TorbuttonAddToFirefoxDesc ${LANG_ENGLISH} "Add the ${TORBUTTON_DESC} extension to Firefox."
-LangString TorbuttonFirefoxNotFound ${LANG_ENGLISH} "Firefox was not found on your system. Not installing Torbutton."
-
+;; $Id$
+;;
+;; Vidalia installer and bundle English translation
+;;
+;; All translations should be derived from this file.
+;;
+;; To translate this file:
+;;
+;; 1) Copy this file (vidalia_en.nsh), creating a new file with "en"
+;; replaced by the two-letter language code of your translated language.
+;; For example, if you are creating a German translation, your new file
+;; would be named "vidalia_de.nsh".
+;;
+;; 2) Replace all ${LANG_ENGLISH} tags with whatever language you are
+;; translating this file into. For example, if you are creating a German
+;; translation, all ${LANG_ENGLISH} tags would become ${LANG_GERMAN}.
+;;
+;; 3) Translate the quoted strings. You can move string replacement tags
+;; (e.g., ${BUNDLE_NAME}) around within the quoted strings, but you
+;; should not alter the tags themselves.
+;;
+;; Your resulting file should use a non-Unicode character encoding, since NSIS
+;; does not support Unicode.
+;;
+
+
+; Bundle
+LangString BundleSetupCaption ${LANG_ENGLISH} "${BUNDLE_NAME} setup"
+LangString BundleWelcomeText ${LANG_ENGLISH} "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\r\n\r\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\r\n\r\n$_CLICK"
+LangString BundleWelcomeTitle ${LANG_ENGLISH} "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+LangString BundleLinkText ${LANG_ENGLISH} "${TOR_NAME} installation documentation"
+LangString BundleFinishText ${LANG_ENGLISH} "Installation is complete.\r\nPlease see http://tor.eff.org/docs/tor-doc-win32.html to learn how to configure your applications to use Tor.\r\n\r\nIf you installed Torbutton, you will need to restart Firefox."
+LangString BundleRunNow ${LANG_ENGLISH} "Run installed components now"
+
+; Vidalia
+LangString VidaliaGroupDesc ${LANG_ENGLISH} "Install ${VIDALIA_DESC}."
+LangString VidaliaSetupCaption ${LANG_ENGLISH} "${VIDALIA_NAME} setup"
+LangString VidaliaWelcomeText ${LANG_ENGLISH} "This wizard will guide you through the installation of ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
+LangString VidaliaWelcomeTitle ${LANG_ENGLISH} "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+LangString VidaliaLinkText ${LANG_ENGLISH} "${VIDALIA_NAME} homepage"
+LangString VidaliaAppDesc ${LANG_ENGLISH} "Install ${VIDALIA_DESC}."
+LangString VidaliaStartup ${LANG_ENGLISH} "Run At Startup"
+LangString VidaliaStartupDesc ${LANG_ENGLISH} "Automatically run ${VIDALIA_NAME} at startup."
+LangString VidaliaShortcuts ${LANG_ENGLISH} "Add to Start Menu"
+LangString VidaliaShortcutsDesc ${LANG_ENGLISH} "Add ${VIDALIA_NAME} to your Start menu."
+LangString VidaliaRunNow ${LANG_ENGLISH} "Run ${VIDALIA_NAME} now"
+
+; Tor
+LangString TorGroupDesc ${LANG_ENGLISH} "Install ${TOR_DESC}."
+LangString TorAppDesc ${LANG_ENGLISH} "Install ${TOR_DESC}."
+LangString TorAskOverwriteTorrc ${LANG_ENGLISH} "You already have a Tor configuration file.$\r$\nDo you want to overwrite it with the default sample configuration file?"
+LangString TorOpenSSL ${LANG_ENGLISH} "OpenSSL ${OPENSSL_APPVERSION}"
+LangString TorOpenSSLDesc ${LANG_ENGLISH} "Install ${OPENSSL_DESC}."
+LangString TorDocumentation ${LANG_ENGLISH} "Documentation"
+LangString TorDocumentationDesc ${LANG_ENGLISH} "Install ${TOR_NAME} documentation."
+LangString TorShortcuts ${LANG_ENGLISH} "Add to Start Menu"
+LangString TorShortcutsDesc ${LANG_ENGLISH} "Add ${TOR_NAME} to your Start menu."
+
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_ENGLISH} "Install ${PRIVOXY_DESC}"
+LangString PrivoxyAppDesc ${LANG_ENGLISH} "Install ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_ENGLISH} "Add to Start Menu"
+LangString PrivoxyShortcutsDesc ${LANG_ENGLISH} "Add ${PRIVOXY_NAME} to your Start menu."
+LangString PrivoxyStartup ${LANG_ENGLISH} "Run At Startup"
+LangString PrivoxyStartupDesc ${LANG_ENGLISH} "Automatically run ${PRIVOXY_NAME} at startup."
+
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_ENGLISH} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_ENGLISH} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_ENGLISH} "Add to Firefox"
+LangString TorbuttonAddToFirefoxDesc ${LANG_ENGLISH} "Add the ${TORBUTTON_DESC} extension to Firefox."
+LangString TorbuttonFirefoxNotFound ${LANG_ENGLISH} "Firefox was not found on your system. Not installing Torbutton."
+
Property changes on: trunk/pkg/win32/vidalia_en.nsh
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/pkg/win32/vidalia_es.nsh
===================================================================
--- trunk/pkg/win32/vidalia_es.nsh 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/pkg/win32/vidalia_es.nsh 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,53 +1,53 @@
-;; $Id$
-;;
-;; Vidalia installer and bundle Spanish translation
-;;
-
-
-; Bundle
-LangString BundleSetupCaption ${LANG_SPANISH} "Instalación de ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_SPANISH} "Este procedimiento le guiara a través de la instalación de Tor, Vidalia, Privoxy, y Torbutton.\r\n\r\nSi ha instalado previamente Tor, Vidalia, Privoxy, o Firefox, por favor asegúrese que no se estén ejecutando antes de continuar esta instalación.\r\n\r\n$_CLICK"
-LangString BundleWelcomeTitle ${LANG_SPANISH} "Bienvenido al procedimiento de instalación de ${BUNDLE_NAME}"
-LangString BundleLinkText ${LANG_SPANISH} "documentación de instalación de ${TOR_NAME}"
-LangString BundleFinishText ${LANG_SPANISH} "La instalación ha finalizado.\r\nPor favor vea http://tor.eff.org/docs/tor-doc-win32.html para aprender como configurar sus aplicaciones para que usen Tor.\r\n\r\nSi instalo Torbutton, necesitara reiniciar Firefox."
-LangString BundleRunNow ${LANG_SPANISH} "Ejecutar los componentes instalados"
-
-; Vidalia
-LangString VidaliaGroupDesc ${LANG_SPANISH} "Instalar ${VIDALIA_DESC}."
-LangString VidaliaSetupCaption ${LANG_SPANISH} "Instalación de ${VIDALIA_NAME}"
-LangString VidaliaWelcomeText ${LANG_SPANISH} "Este procedimiento le guiara a través de la instalación de ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
-LangString VidaliaWelcomeTitle ${LANG_SPANISH} "Bienvenido al procedimiento de instalación de ${VIDALIA_NAME}"
-LangString VidaliaLinkText ${LANG_SPANISH} "Pagina de internet de ${VIDALIA_NAME}"
-LangString VidaliaAppDesc ${LANG_SPANISH} "Instalar ${VIDALIA_DESC}."
-LangString VidaliaStartup ${LANG_SPANISH} "Ejecutar al iniciar sesión"
-LangString VidaliaStartupDesc ${LANG_SPANISH} "Automaticamente ejecutar ${VIDALIA_NAME} al iniciar sesión."
-LangString VidaliaShortcuts ${LANG_SPANISH} "Agregar al Menu Inicio"
-LangString VidaliaShortcutsDesc ${LANG_SPANISH} "Agregar ${VIDALIA_NAME} a su Menu Inicio."
-LangString VidaliaRunNow ${LANG_SPANISH} "Ejecutar ${VIDALIA_NAME}"
-
-; Tor
-LangString TorGroupDesc ${LANG_SPANISH} "Instalar ${TOR_DESC}."
-LangString TorAppDesc ${LANG_SPANISH} "Instalar ${TOR_DESC}."
-LangString TorAskOverwriteTorrc ${LANG_SPANISH} "Ya tiene un archivo de configuración de Tor.$\r$\n¿Desea sobreescribirlo con el archivo de configuración de muestra predeterminado?"
-LangString TorOpenSSL ${LANG_SPANISH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_SPANISH} "Instalar ${OPENSSL_DESC}."
-LangString TorDocumentation ${LANG_SPANISH} "Documentación"
-LangString TorDocumentationDesc ${LANG_SPANISH} "Instalar la documentación de ${TOR_NAME}."
-LangString TorShortcuts ${LANG_SPANISH} "Agregar al Menu Inicio"
-LangString TorShortcutsDesc ${LANG_SPANISH} "Agregar ${TOR_NAME} a su Menu Inicio."
-
-; Privoxy
-LangString PrivoxyGroupDesc ${LANG_SPANISH} "Instalar ${PRIVOXY_DESC}"
-LangString PrivoxyAppDesc ${LANG_SPANISH} "Instalar ${PRIVOXY_DESC}."
-LangString PrivoxyShortcuts ${LANG_SPANISH} "Añadir al Menu Inicio"
-LangString PrivoxyShortcutsDesc ${LANG_SPANISH} "Agregar ${PRIVOXY_NAME} a su Menu Inicio."
-LangString PrivoxyStartup ${LANG_SPANISH} "Ejecutar al iniciar sesión."
-LangString PrivoxyStartupDesc ${LANG_SPANISH} "Automaticamente ejecutar ${PRIVOXY_NAME} al iniciar sesión."
-
-; Torbutton
-LangString TorbuttonGroupDesc ${LANG_SPANISH} "Instalar ${TORBUTTON_DESC}."
-LangString TorbuttonAppDesc ${LANG_SPANISH} "Instalar ${TORBUTTON_DESC}."
-LangString TorbuttonAddToFirefox ${LANG_SPANISH} "Adgregar a Firefox"
-LangString TorbuttonAddToFirefoxDesc ${LANG_SPANISH} "Agregar la extensión ${TORBUTTON_DESC} a Firefox."
-LangString TorbuttonFirefoxNotFound ${LANG_SPANISH} "Firefox no se encontró en el sistema. No se puede instalar Torbutton."
-
+;; $Id$
+;;
+;; Vidalia installer and bundle Spanish translation
+;;
+
+
+; Bundle
+LangString BundleSetupCaption ${LANG_SPANISH} "Instalación de ${BUNDLE_NAME}"
+LangString BundleWelcomeText ${LANG_SPANISH} "Este procedimiento le guiara a través de la instalación de Tor, Vidalia, Privoxy, y Torbutton.\r\n\r\nSi ha instalado previamente Tor, Vidalia, Privoxy, o Firefox, por favor asegúrese que no se estén ejecutando antes de continuar esta instalación.\r\n\r\n$_CLICK"
+LangString BundleWelcomeTitle ${LANG_SPANISH} "Bienvenido al procedimiento de instalación de ${BUNDLE_NAME}"
+LangString BundleLinkText ${LANG_SPANISH} "documentación de instalación de ${TOR_NAME}"
+LangString BundleFinishText ${LANG_SPANISH} "La instalación ha finalizado.\r\nPor favor vea http://tor.eff.org/docs/tor-doc-win32.html para aprender como configurar sus aplicaciones para que usen Tor.\r\n\r\nSi instalo Torbutton, necesitara reiniciar Firefox."
+LangString BundleRunNow ${LANG_SPANISH} "Ejecutar los componentes instalados"
+
+; Vidalia
+LangString VidaliaGroupDesc ${LANG_SPANISH} "Instalar ${VIDALIA_DESC}."
+LangString VidaliaSetupCaption ${LANG_SPANISH} "Instalación de ${VIDALIA_NAME}"
+LangString VidaliaWelcomeText ${LANG_SPANISH} "Este procedimiento le guiara a través de la instalación de ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
+LangString VidaliaWelcomeTitle ${LANG_SPANISH} "Bienvenido al procedimiento de instalación de ${VIDALIA_NAME}"
+LangString VidaliaLinkText ${LANG_SPANISH} "Pagina de internet de ${VIDALIA_NAME}"
+LangString VidaliaAppDesc ${LANG_SPANISH} "Instalar ${VIDALIA_DESC}."
+LangString VidaliaStartup ${LANG_SPANISH} "Ejecutar al iniciar sesión"
+LangString VidaliaStartupDesc ${LANG_SPANISH} "Automaticamente ejecutar ${VIDALIA_NAME} al iniciar sesión."
+LangString VidaliaShortcuts ${LANG_SPANISH} "Agregar al Menu Inicio"
+LangString VidaliaShortcutsDesc ${LANG_SPANISH} "Agregar ${VIDALIA_NAME} a su Menu Inicio."
+LangString VidaliaRunNow ${LANG_SPANISH} "Ejecutar ${VIDALIA_NAME}"
+
+; Tor
+LangString TorGroupDesc ${LANG_SPANISH} "Instalar ${TOR_DESC}."
+LangString TorAppDesc ${LANG_SPANISH} "Instalar ${TOR_DESC}."
+LangString TorAskOverwriteTorrc ${LANG_SPANISH} "Ya tiene un archivo de configuración de Tor.$\r$\n¿Desea sobreescribirlo con el archivo de configuración de muestra predeterminado?"
+LangString TorOpenSSL ${LANG_SPANISH} "OpenSSL ${OPENSSL_APPVERSION}"
+LangString TorOpenSSLDesc ${LANG_SPANISH} "Instalar ${OPENSSL_DESC}."
+LangString TorDocumentation ${LANG_SPANISH} "Documentación"
+LangString TorDocumentationDesc ${LANG_SPANISH} "Instalar la documentación de ${TOR_NAME}."
+LangString TorShortcuts ${LANG_SPANISH} "Agregar al Menu Inicio"
+LangString TorShortcutsDesc ${LANG_SPANISH} "Agregar ${TOR_NAME} a su Menu Inicio."
+
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_SPANISH} "Instalar ${PRIVOXY_DESC}"
+LangString PrivoxyAppDesc ${LANG_SPANISH} "Instalar ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_SPANISH} "Añadir al Menu Inicio"
+LangString PrivoxyShortcutsDesc ${LANG_SPANISH} "Agregar ${PRIVOXY_NAME} a su Menu Inicio."
+LangString PrivoxyStartup ${LANG_SPANISH} "Ejecutar al iniciar sesión."
+LangString PrivoxyStartupDesc ${LANG_SPANISH} "Automaticamente ejecutar ${PRIVOXY_NAME} al iniciar sesión."
+
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_SPANISH} "Instalar ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_SPANISH} "Instalar ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_SPANISH} "Adgregar a Firefox"
+LangString TorbuttonAddToFirefoxDesc ${LANG_SPANISH} "Agregar la extensión ${TORBUTTON_DESC} a Firefox."
+LangString TorbuttonFirefoxNotFound ${LANG_SPANISH} "Firefox no se encontró en el sistema. No se puede instalar Torbutton."
+
Property changes on: trunk/pkg/win32/vidalia_es.nsh
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/win32/vidalia_fa.nsh
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/pkg/win32/vidalia_fi.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fi.nsh 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/pkg/win32/vidalia_fi.nsh 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,57 +1,57 @@
-;; $Id$
-;;
-;; Vidalia installer and bundle Finnish translation
-;;
-;;
-;;
-
-; Bundle
-LangString BundleSetupCaption ${LANG_FINNISH} "${BUNDLE_NAME}asennus"
-LangString BundleWelcomeText ${LANG_FINNISH} "Tämä velho auttaa asentaakseen koneelle:\r\n\tTor\t${TOR_APPVERSION}\r\n\tVidalia\t${VIDALIA_APPVERSION}\r\n\tPrivoxy\t${PRIVOXY_APPVERSION}\r\n\r\nJos koneelle on jo ennestään asennettu Tor, Vidalia tai Privoxy kannattaa tarkistaa ettei mikään niistä ole päällä ennen kuin asennusta jatkaa.\r\n\r\n$_CLICK"
-LangString BundleWelcomeTitle ${LANG_FINNISH} "Tervetuloa ${BUNDLE_NAME}asennukseen"
-LangString BundleLinkText ${LANG_FINNISH} "${TOR_NAME}asennusohje"
-LangString BundleFinishText ${LANG_FINNISH} "Asennus on valmis.\r\nOle hyvä ja tutustu http://tor.eff.org/docs/tor-doc-win32.html -ohjesivuun oppiakseen kuinka säätää ohjelmat käyttämään Tor-ohjelmaa.\r\n"
-LangString BundleRunNow ${LANG_FINNISH} "Käynnistä asennetut komponentit nyt"
-
-
-; Vidalia
-LangString VidaliaGroupDesc ${LANG_FINNISH} "Asenna ${VIDALIA_DESC}."
-LangString VidaliaSetupCaption ${LANG_FINNISH} "${VIDALIA_NAME} asennus"
-LangString VidaliaWelcomeText ${LANG_FINNISH} "Tämä velho auttaa asentaakseen koneelle ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
-LangString VidaliaWelcomeTitle ${LANG_FINNISH} "Tervetuloa ${VIDALIA_NAME}asennukseen"
-LangString VidaliaLinkText ${LANG_FINNISH} "${VIDALIA_NAME} kotisivu"
-LangString VidaliaAppDesc ${LANG_FINNISH} "Asenna ${VIDALIA_DESC}."
-LangString VidaliaStartup ${LANG_FINNISH} "Käynnistä Windowssin käynnistyessä"
-LangString VidaliaStartupDesc ${LANG_FINNISH} "Käynnistä automaattisesti ${VIDALIA_NAME} Windowssin käynnistyessä."
-LangString VidaliaShortcuts ${LANG_FINNISH} "Lisää Käynnistä-valikkoon"
-LangString VidaliaShortcutsDesc ${LANG_FINNISH} "Lisää ${VIDALIA_NAME} Käynnistä-valikkoon."
-LangString VidaliaRunNow ${LANG_FINNISH} "Käynnistä ${VIDALIA_NAME} nyt"
-
-
-; Tor
-LangString TorGroupDesc ${LANG_FINNISH} "Asenna ${TOR_DESC}."
-LangString TorAppDesc ${LANG_FINNISH} "Asenna ${TOR_DESC}."
-LangString TorAskOverwriteTorrc ${LANG_FINNISH} "Sinulla on jo ennestään Tor-asetustiedosto.$\r$\nHaluatko, että se korvataan oletusesimerkillä?"
-LangString TorOpenSSL ${LANG_FINNISH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_FINNISH} "Asenna ${OPENSSL_DESC}."
-LangString TorDocumentation ${LANG_FINNISH} "Ohjeet"
-LangString TorDocumentationDesc ${LANG_FINNISH} "Asenna ${TOR_NAME}-ohjeet."
-LangString TorShortcuts ${LANG_FINNISH} "Lisää Käynnistä-valikkoon"
-LangString TorShortcutsDesc ${LANG_FINNISH} "Lisää ${TOR_NAME} Käynnistä-valikkoon."
-
-
-; Privoxy
-LangString PrivoxyGroupDesc ${LANG_FINNISH} "Install ${PRIVOXY_DESC}"
-LangString PrivoxyAppDesc ${LANG_FINNISH} "Install ${PRIVOXY_DESC}."
-LangString PrivoxyShortcuts ${LANG_FINNISH} "Lisää Käynnistä-valikkoon"
-LangString PrivoxyShortcutsDesc ${LANG_FINNISH} "Lisää ${PRIVOXY_NAME} Käynnistä-valikkoon."
-LangString PrivoxyStartup ${LANG_FINNISH} "Käynnistä Windowssin käynnistyessä"
-LangString PrivoxyStartupDesc ${LANG_FINNISH} "Käynnistä automaattisesti ${PRIVOXY_NAME} Windowssin käynnistyessä."
-
-; Torbutton
-LangString TorbuttonGroupDesc ${LANG_FINNISH} "Asenna ${TORBUTTON_DESC}."
-LangString TorbuttonAppDesc ${LANG_FINNISH} "Asenna ${TORBUTTON_DESC}."
-LangString TorbuttonAddToFirefox ${LANG_FINNISH} "Lisää Firefoxiin"
-LangString TorbuttonAddToFirefoxDesc ${LANG_FINNISH} "Lisää ${TORBUTTON_DESC}-lisäosa Firefoxiin."
-LangString TorbuttonFirefoxNotFound ${LANG_FINNISH} "Firefox-selainta ei löytynyt koneelta. Torbuttonia ei asennettu."
-
+;; $Id$
+;;
+;; Vidalia installer and bundle Finnish translation
+;;
+;;
+;;
+
+; Bundle
+LangString BundleSetupCaption ${LANG_FINNISH} "${BUNDLE_NAME}asennus"
+LangString BundleWelcomeText ${LANG_FINNISH} "Tämä velho auttaa asentaakseen koneelle:\r\n\tTor\t${TOR_APPVERSION}\r\n\tVidalia\t${VIDALIA_APPVERSION}\r\n\tPrivoxy\t${PRIVOXY_APPVERSION}\r\n\r\nJos koneelle on jo ennestään asennettu Tor, Vidalia tai Privoxy kannattaa tarkistaa ettei mikään niistä ole päällä ennen kuin asennusta jatkaa.\r\n\r\n$_CLICK"
+LangString BundleWelcomeTitle ${LANG_FINNISH} "Tervetuloa ${BUNDLE_NAME}asennukseen"
+LangString BundleLinkText ${LANG_FINNISH} "${TOR_NAME}asennusohje"
+LangString BundleFinishText ${LANG_FINNISH} "Asennus on valmis.\r\nOle hyvä ja tutustu http://tor.eff.org/docs/tor-doc-win32.html -ohjesivuun oppiakseen kuinka säätää ohjelmat käyttämään Tor-ohjelmaa.\r\n"
+LangString BundleRunNow ${LANG_FINNISH} "Käynnistä asennetut komponentit nyt"
+
+
+; Vidalia
+LangString VidaliaGroupDesc ${LANG_FINNISH} "Asenna ${VIDALIA_DESC}."
+LangString VidaliaSetupCaption ${LANG_FINNISH} "${VIDALIA_NAME} asennus"
+LangString VidaliaWelcomeText ${LANG_FINNISH} "Tämä velho auttaa asentaakseen koneelle ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
+LangString VidaliaWelcomeTitle ${LANG_FINNISH} "Tervetuloa ${VIDALIA_NAME}asennukseen"
+LangString VidaliaLinkText ${LANG_FINNISH} "${VIDALIA_NAME} kotisivu"
+LangString VidaliaAppDesc ${LANG_FINNISH} "Asenna ${VIDALIA_DESC}."
+LangString VidaliaStartup ${LANG_FINNISH} "Käynnistä Windowssin käynnistyessä"
+LangString VidaliaStartupDesc ${LANG_FINNISH} "Käynnistä automaattisesti ${VIDALIA_NAME} Windowssin käynnistyessä."
+LangString VidaliaShortcuts ${LANG_FINNISH} "Lisää Käynnistä-valikkoon"
+LangString VidaliaShortcutsDesc ${LANG_FINNISH} "Lisää ${VIDALIA_NAME} Käynnistä-valikkoon."
+LangString VidaliaRunNow ${LANG_FINNISH} "Käynnistä ${VIDALIA_NAME} nyt"
+
+
+; Tor
+LangString TorGroupDesc ${LANG_FINNISH} "Asenna ${TOR_DESC}."
+LangString TorAppDesc ${LANG_FINNISH} "Asenna ${TOR_DESC}."
+LangString TorAskOverwriteTorrc ${LANG_FINNISH} "Sinulla on jo ennestään Tor-asetustiedosto.$\r$\nHaluatko, että se korvataan oletusesimerkillä?"
+LangString TorOpenSSL ${LANG_FINNISH} "OpenSSL ${OPENSSL_APPVERSION}"
+LangString TorOpenSSLDesc ${LANG_FINNISH} "Asenna ${OPENSSL_DESC}."
+LangString TorDocumentation ${LANG_FINNISH} "Ohjeet"
+LangString TorDocumentationDesc ${LANG_FINNISH} "Asenna ${TOR_NAME}-ohjeet."
+LangString TorShortcuts ${LANG_FINNISH} "Lisää Käynnistä-valikkoon"
+LangString TorShortcutsDesc ${LANG_FINNISH} "Lisää ${TOR_NAME} Käynnistä-valikkoon."
+
+
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_FINNISH} "Install ${PRIVOXY_DESC}"
+LangString PrivoxyAppDesc ${LANG_FINNISH} "Install ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_FINNISH} "Lisää Käynnistä-valikkoon"
+LangString PrivoxyShortcutsDesc ${LANG_FINNISH} "Lisää ${PRIVOXY_NAME} Käynnistä-valikkoon."
+LangString PrivoxyStartup ${LANG_FINNISH} "Käynnistä Windowssin käynnistyessä"
+LangString PrivoxyStartupDesc ${LANG_FINNISH} "Käynnistä automaattisesti ${PRIVOXY_NAME} Windowssin käynnistyessä."
+
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_FINNISH} "Asenna ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_FINNISH} "Asenna ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_FINNISH} "Lisää Firefoxiin"
+LangString TorbuttonAddToFirefoxDesc ${LANG_FINNISH} "Lisää ${TORBUTTON_DESC}-lisäosa Firefoxiin."
+LangString TorbuttonFirefoxNotFound ${LANG_FINNISH} "Firefox-selainta ei löytynyt koneelta. Torbuttonia ei asennettu."
+
Property changes on: trunk/pkg/win32/vidalia_fi.nsh
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/pkg/win32/vidalia_fr.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fr.nsh 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/pkg/win32/vidalia_fr.nsh 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,53 +1,53 @@
-;; $Id$
-;;
-;; Vidalia installer and bundle French translation
-;;
-
-
-; Bundle
-LangString BundleSetupCaption ${LANG_FRENCH} "Mise à jour de ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_FRENCH} "Cet assistant vous guidera pendant l'installation de Tor, Vidalia, Privoxy, et de Torbutton.\r\n\r\nSi vous avez déjà installé Tor, Vidalia, Privoxy, ou Firefox, assurez-vous qu'ils ne sont pas démarrés avant de poursuivre l'installation.\r\n\r\n$_CLICK"
-LangString BundleWelcomeTitle ${LANG_FRENCH} "Bienvenue dans l'Assistant d'installation de ${BUNDLE_NAME}"
-LangString BundleLinkText ${LANG_FRENCH} "Documentation de l'installation de ${TOR_NAME}"
-LangString BundleFinishText ${LANG_FRENCH} "L'installation est terminée.\r\nConsultez la page http://tor.eff.org/docs/tor-doc-win32.html pour apprendre comment configurer vos applications avec Tor.\r\n\r\nSi vous venez d'installer Torbutton, vous devrez redémarrer Firefox."
-LangString BundleRunNow ${LANG_FRENCH} "Démarrer les composants installés maintenant"
-
-; Vidalia
-LangString VidaliaGroupDesc ${LANG_FRENCH} "Installer ${VIDALIA_DESC}."
-LangString VidaliaSetupCaption ${LANG_FRENCH} "Mise à jour de ${VIDALIA_NAME}"
-LangString VidaliaWelcomeText ${LANG_FRENCH} "Cet assistant vous guidera pendant l'installation de ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
-LangString VidaliaWelcomeTitle ${LANG_FRENCH} "Bienvenue dans l'Assistant d'installation de ${VIDALIA_NAME}"
-LangString VidaliaLinkText ${LANG_FRENCH} "Site Web de ${VIDALIA_NAME}"
-LangString VidaliaAppDesc ${LANG_FRENCH} "Installer ${VIDALIA_DESC}."
-LangString VidaliaStartup ${LANG_FRENCH} "Lancer au démarrage"
-LangString VidaliaStartupDesc ${LANG_FRENCH} "Lancer automatiquement ${VIDALIA_NAME} au démarrage."
-LangString VidaliaShortcuts ${LANG_FRENCH} "Ajouter au Menu Démarrer"
-LangString VidaliaShortcutsDesc ${LANG_FRENCH} "Ajouter ${VIDALIA_NAME} à votre Menu Démarrer."
-LangString VidaliaRunNow ${LANG_FRENCH} "Démarrer ${VIDALIA_NAME} maintenant"
-
-; Tor
-LangString TorGroupDesc ${LANG_FRENCH} "Installer ${TOR_DESC}."
-LangString TorAppDesc ${LANG_FRENCH} "Installer ${TOR_DESC}."
-LangString TorAskOverwriteTorrc ${LANG_FRENCH} "Vous avez déjà un fichier de configuration de Tor.$\r$\nVoulez-vous le remplacer par le fichier de configuration par défaut ?"
-LangString TorOpenSSL ${LANG_FRENCH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_FRENCH} "Installer ${OPENSSL_DESC}."
-LangString TorDocumentation ${LANG_FRENCH} "Documentation"
-LangString TorDocumentationDesc ${LANG_FRENCH} "Installer la documentation de ${TOR_NAME}."
-LangString TorShortcuts ${LANG_FRENCH} "Ajouter au Menu Démarrer"
-LangString TorShortcutsDesc ${LANG_FRENCH} "Ajouter ${TOR_NAME} à votre Menu Démarrer."
-
-; Privoxy
-LangString PrivoxyGroupDesc ${LANG_FRENCH} "Installer ${PRIVOXY_DESC}"
-LangString PrivoxyAppDesc ${LANG_FRENCH} "Installer ${PRIVOXY_DESC}."
-LangString PrivoxyShortcuts ${LANG_FRENCH} "Ajouter au Menu Démarrer"
-LangString PrivoxyShortcutsDesc ${LANG_FRENCH} "Ajouter ${PRIVOXY_NAME} à votre Menu Démarrer."
-LangString PrivoxyStartup ${LANG_FRENCH} "Lancer au démarrage"
-LangString PrivoxyStartupDesc ${LANG_FRENCH} "Lancer automatiquement ${PRIVOXY_NAME} au démarrage."
-
-; Torbutton
-LangString TorbuttonGroupDesc ${LANG_FRENCH} "Installer ${TORBUTTON_DESC}."
-LangString TorbuttonAppDesc ${LANG_FRENCH} "Installer ${TORBUTTON_DESC}."
-LangString TorbuttonAddToFirefox ${LANG_FRENCH} "Ajouter à Firefox"
-LangString TorbuttonAddToFirefoxDesc ${LANG_FRENCH} "Ajouter l'extension ${TORBUTTON_DESC} à Firefox."
-LangString TorbuttonFirefoxNotFound ${LANG_FRENCH} "Firefox n'a pas été trouvé sur votre système. Torbutton ne sera pas installé."
-
+;; $Id$
+;;
+;; Vidalia installer and bundle French translation
+;;
+
+
+; Bundle
+LangString BundleSetupCaption ${LANG_FRENCH} "Mise à jour de ${BUNDLE_NAME}"
+LangString BundleWelcomeText ${LANG_FRENCH} "Cet assistant vous guidera pendant l'installation de Tor, Vidalia, Privoxy, et de Torbutton.\r\n\r\nSi vous avez déjà installé Tor, Vidalia, Privoxy, ou Firefox, assurez-vous qu'ils ne sont pas démarrés avant de poursuivre l'installation.\r\n\r\n$_CLICK"
+LangString BundleWelcomeTitle ${LANG_FRENCH} "Bienvenue dans l'Assistant d'installation de ${BUNDLE_NAME}"
+LangString BundleLinkText ${LANG_FRENCH} "Documentation de l'installation de ${TOR_NAME}"
+LangString BundleFinishText ${LANG_FRENCH} "L'installation est terminée.\r\nConsultez la page http://tor.eff.org/docs/tor-doc-win32.html pour apprendre comment configurer vos applications avec Tor.\r\n\r\nSi vous venez d'installer Torbutton, vous devrez redémarrer Firefox."
+LangString BundleRunNow ${LANG_FRENCH} "Démarrer les composants installés maintenant"
+
+; Vidalia
+LangString VidaliaGroupDesc ${LANG_FRENCH} "Installer ${VIDALIA_DESC}."
+LangString VidaliaSetupCaption ${LANG_FRENCH} "Mise à jour de ${VIDALIA_NAME}"
+LangString VidaliaWelcomeText ${LANG_FRENCH} "Cet assistant vous guidera pendant l'installation de ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
+LangString VidaliaWelcomeTitle ${LANG_FRENCH} "Bienvenue dans l'Assistant d'installation de ${VIDALIA_NAME}"
+LangString VidaliaLinkText ${LANG_FRENCH} "Site Web de ${VIDALIA_NAME}"
+LangString VidaliaAppDesc ${LANG_FRENCH} "Installer ${VIDALIA_DESC}."
+LangString VidaliaStartup ${LANG_FRENCH} "Lancer au démarrage"
+LangString VidaliaStartupDesc ${LANG_FRENCH} "Lancer automatiquement ${VIDALIA_NAME} au démarrage."
+LangString VidaliaShortcuts ${LANG_FRENCH} "Ajouter au Menu Démarrer"
+LangString VidaliaShortcutsDesc ${LANG_FRENCH} "Ajouter ${VIDALIA_NAME} à votre Menu Démarrer."
+LangString VidaliaRunNow ${LANG_FRENCH} "Démarrer ${VIDALIA_NAME} maintenant"
+
+; Tor
+LangString TorGroupDesc ${LANG_FRENCH} "Installer ${TOR_DESC}."
+LangString TorAppDesc ${LANG_FRENCH} "Installer ${TOR_DESC}."
+LangString TorAskOverwriteTorrc ${LANG_FRENCH} "Vous avez déjà un fichier de configuration de Tor.$\r$\nVoulez-vous le remplacer par le fichier de configuration par défaut ?"
+LangString TorOpenSSL ${LANG_FRENCH} "OpenSSL ${OPENSSL_APPVERSION}"
+LangString TorOpenSSLDesc ${LANG_FRENCH} "Installer ${OPENSSL_DESC}."
+LangString TorDocumentation ${LANG_FRENCH} "Documentation"
+LangString TorDocumentationDesc ${LANG_FRENCH} "Installer la documentation de ${TOR_NAME}."
+LangString TorShortcuts ${LANG_FRENCH} "Ajouter au Menu Démarrer"
+LangString TorShortcutsDesc ${LANG_FRENCH} "Ajouter ${TOR_NAME} à votre Menu Démarrer."
+
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_FRENCH} "Installer ${PRIVOXY_DESC}"
+LangString PrivoxyAppDesc ${LANG_FRENCH} "Installer ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_FRENCH} "Ajouter au Menu Démarrer"
+LangString PrivoxyShortcutsDesc ${LANG_FRENCH} "Ajouter ${PRIVOXY_NAME} à votre Menu Démarrer."
+LangString PrivoxyStartup ${LANG_FRENCH} "Lancer au démarrage"
+LangString PrivoxyStartupDesc ${LANG_FRENCH} "Lancer automatiquement ${PRIVOXY_NAME} au démarrage."
+
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_FRENCH} "Installer ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_FRENCH} "Installer ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_FRENCH} "Ajouter à Firefox"
+LangString TorbuttonAddToFirefoxDesc ${LANG_FRENCH} "Ajouter l'extension ${TORBUTTON_DESC} à Firefox."
+LangString TorbuttonFirefoxNotFound ${LANG_FRENCH} "Firefox n'a pas été trouvé sur votre système. Torbutton ne sera pas installé."
+
Property changes on: trunk/pkg/win32/vidalia_fr.nsh
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/pkg/win32/vidalia_pl.nsh
===================================================================
--- trunk/pkg/win32/vidalia_pl.nsh 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/pkg/win32/vidalia_pl.nsh 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,53 +1,53 @@
-;; $Id$
-;;
-;; Vidalia installer and bundle Polish translation
-;;
-
-
-; Bundle
-LangString BundleSetupCaption ${LANG_POLISH} "Instalator ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_POLISH} "Kreator przeprowadzi Ciê przez proces instalacji aplikacji Tor, Vidalia, Privoxy i Torbutton.\r\n\r\nJeœli instalowa³eœ wczeœniej Tor, Vidalia, Privoxy albo Firefox, upewnij siê, ¿e w tej chwili ¿adne z nich nie jest uruchomione.\r\n\r\n$_CLICK"
-LangString BundleWelcomeTitle ${LANG_POLISH} "Witaj w Kreatorze Instalacji ${BUNDLE_NAME}"
-LangString BundleLinkText ${LANG_POLISH} "Dokumentacja instalacji ${TOR_NAME}"
-LangString BundleFinishText ${LANG_POLISH} "Instalacja zakoñczona.\r\nZobacz proszê http://tor.eff.org/docs/tor-doc-win32.html aby dowiedzieæ siê jak skonfigurowaæ Twoje aplikacje do wspó³pracy z Torem.\r\n\r\nJeœli zainstalowa³eœ Torbutton, musisz ponownie uruchomiæ Firefox'a."
-LangString BundleRunNow ${LANG_POLISH} "Uruchom teraz zainstalowane komponenty"
-
-; Vidalia
-LangString VidaliaGroupDesc ${LANG_POLISH} "Instalacja ${VIDALIA_DESC}."
-LangString VidaliaSetupCaption ${LANG_POLISH} "Instalator ${VIDALIA_NAME}"
-LangString VidaliaWelcomeText ${LANG_POLISH} "Kreator przeprowadzi Ciê przez proces instalacji ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
-LangString VidaliaWelcomeTitle ${LANG_POLISH} "Witaj w Kreatorze Instalacji ${VIDALIA_NAME}"
-LangString VidaliaLinkText ${LANG_POLISH} "Strona g³ówna ${VIDALIA_NAME}"
-LangString VidaliaAppDesc ${LANG_POLISH} "Instalacja ${VIDALIA_DESC}."
-LangString VidaliaStartup ${LANG_POLISH} "Uruchom na starcie"
-LangString VidaliaStartupDesc ${LANG_POLISH} "Automatycznie uruchamiaj ${VIDALIA_NAME} na starcie."
-LangString VidaliaShortcuts ${LANG_POLISH} "Dodaj do Menu Start"
-LangString VidaliaShortcutsDesc ${LANG_POLISH} "Dodaj ${VIDALIA_NAME} do Twojego menu Start."
-LangString VidaliaRunNow ${LANG_POLISH} "Uruchom teraz ${VIDALIA_NAME}"
-
-; Tor
-LangString TorGroupDesc ${LANG_POLISH} "Instalacja ${TOR_DESC}."
-LangString TorAppDesc ${LANG_POLISH} "Instalacja ${TOR_DESC}."
-LangString TorAskOverwriteTorrc ${LANG_POLISH} "Plik konfiguracji Tora ju¿ istnieje.$\r$\nCzy chcesz go nadpisaæ konfiguracj¹ domyœln¹ ?"
-LangString TorOpenSSL ${LANG_POLISH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_POLISH} "Instalacja ${OPENSSL_DESC}."
-LangString TorDocumentation ${LANG_POLISH} "Dokumentacja"
-LangString TorDocumentationDesc ${LANG_POLISH} "Instalacja dokumentacji ${TOR_NAME}."
-LangString TorShortcuts ${LANG_POLISH} "Dodaj do Menu Start"
-LangString TorShortcutsDesc ${LANG_POLISH} "Dodaj ${TOR_NAME} do Twojego menu Start."
-
-; Privoxy
-LangString PrivoxyGroupDesc ${LANG_POLISH} "Instalacja ${PRIVOXY_DESC}"
-LangString PrivoxyAppDesc ${LANG_POLISH} "Instalacja ${PRIVOXY_DESC}."
-LangString PrivoxyShortcuts ${LANG_POLISH} "Dodaj do Menu Start"
-LangString PrivoxyShortcutsDesc ${LANG_POLISH} "Dodaj ${PRIVOXY_NAME} do Twojego menu Start."
-LangString PrivoxyStartup ${LANG_POLISH} "Uruchom na starcie"
-LangString PrivoxyStartupDesc ${LANG_POLISH} "Automatycznie uruchamiaj ${PRIVOXY_NAME} na starcie."
-
-; Torbutton
-LangString TorbuttonGroupDesc ${LANG_POLISH} "Instalacja ${TORBUTTON_DESC}."
-LangString TorbuttonAppDesc ${LANG_POLISH} "Instalacja ${TORBUTTON_DESC}."
-LangString TorbuttonAddToFirefox ${LANG_POLISH} "Dodaj do Firefox'a"
-LangString TorbuttonAddToFirefoxDesc ${LANG_POLISH} "Dodaj rozszerzenie ${TORBUTTON_DESC} do Firefox'a."
-LangString TorbuttonFirefoxNotFound ${LANG_POLISH} "Firefox nie zosta³ znaleziony w systemie. Torbutton nie bêdzie zainstalowany."
-
+;; $Id$
+;;
+;; Vidalia installer and bundle Polish translation
+;;
+
+
+; Bundle
+LangString BundleSetupCaption ${LANG_POLISH} "Instalator ${BUNDLE_NAME}"
+LangString BundleWelcomeText ${LANG_POLISH} "Kreator przeprowadzi Ciê przez proces instalacji aplikacji Tor, Vidalia, Privoxy i Torbutton.\r\n\r\nJeœli instalowa³eœ wczeœniej Tor, Vidalia, Privoxy albo Firefox, upewnij siê, ¿e w tej chwili ¿adne z nich nie jest uruchomione.\r\n\r\n$_CLICK"
+LangString BundleWelcomeTitle ${LANG_POLISH} "Witaj w Kreatorze Instalacji ${BUNDLE_NAME}"
+LangString BundleLinkText ${LANG_POLISH} "Dokumentacja instalacji ${TOR_NAME}"
+LangString BundleFinishText ${LANG_POLISH} "Instalacja zakoñczona.\r\nZobacz proszê http://tor.eff.org/docs/tor-doc-win32.html aby dowiedzieæ siê jak skonfigurowaæ Twoje aplikacje do wspó³pracy z Torem.\r\n\r\nJeœli zainstalowa³eœ Torbutton, musisz ponownie uruchomiæ Firefox'a."
+LangString BundleRunNow ${LANG_POLISH} "Uruchom teraz zainstalowane komponenty"
+
+; Vidalia
+LangString VidaliaGroupDesc ${LANG_POLISH} "Instalacja ${VIDALIA_DESC}."
+LangString VidaliaSetupCaption ${LANG_POLISH} "Instalator ${VIDALIA_NAME}"
+LangString VidaliaWelcomeText ${LANG_POLISH} "Kreator przeprowadzi Ciê przez proces instalacji ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
+LangString VidaliaWelcomeTitle ${LANG_POLISH} "Witaj w Kreatorze Instalacji ${VIDALIA_NAME}"
+LangString VidaliaLinkText ${LANG_POLISH} "Strona g³ówna ${VIDALIA_NAME}"
+LangString VidaliaAppDesc ${LANG_POLISH} "Instalacja ${VIDALIA_DESC}."
+LangString VidaliaStartup ${LANG_POLISH} "Uruchom na starcie"
+LangString VidaliaStartupDesc ${LANG_POLISH} "Automatycznie uruchamiaj ${VIDALIA_NAME} na starcie."
+LangString VidaliaShortcuts ${LANG_POLISH} "Dodaj do Menu Start"
+LangString VidaliaShortcutsDesc ${LANG_POLISH} "Dodaj ${VIDALIA_NAME} do Twojego menu Start."
+LangString VidaliaRunNow ${LANG_POLISH} "Uruchom teraz ${VIDALIA_NAME}"
+
+; Tor
+LangString TorGroupDesc ${LANG_POLISH} "Instalacja ${TOR_DESC}."
+LangString TorAppDesc ${LANG_POLISH} "Instalacja ${TOR_DESC}."
+LangString TorAskOverwriteTorrc ${LANG_POLISH} "Plik konfiguracji Tora ju¿ istnieje.$\r$\nCzy chcesz go nadpisaæ konfiguracj¹ domyœln¹ ?"
+LangString TorOpenSSL ${LANG_POLISH} "OpenSSL ${OPENSSL_APPVERSION}"
+LangString TorOpenSSLDesc ${LANG_POLISH} "Instalacja ${OPENSSL_DESC}."
+LangString TorDocumentation ${LANG_POLISH} "Dokumentacja"
+LangString TorDocumentationDesc ${LANG_POLISH} "Instalacja dokumentacji ${TOR_NAME}."
+LangString TorShortcuts ${LANG_POLISH} "Dodaj do Menu Start"
+LangString TorShortcutsDesc ${LANG_POLISH} "Dodaj ${TOR_NAME} do Twojego menu Start."
+
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_POLISH} "Instalacja ${PRIVOXY_DESC}"
+LangString PrivoxyAppDesc ${LANG_POLISH} "Instalacja ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_POLISH} "Dodaj do Menu Start"
+LangString PrivoxyShortcutsDesc ${LANG_POLISH} "Dodaj ${PRIVOXY_NAME} do Twojego menu Start."
+LangString PrivoxyStartup ${LANG_POLISH} "Uruchom na starcie"
+LangString PrivoxyStartupDesc ${LANG_POLISH} "Automatycznie uruchamiaj ${PRIVOXY_NAME} na starcie."
+
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_POLISH} "Instalacja ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_POLISH} "Instalacja ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_POLISH} "Dodaj do Firefox'a"
+LangString TorbuttonAddToFirefoxDesc ${LANG_POLISH} "Dodaj rozszerzenie ${TORBUTTON_DESC} do Firefox'a."
+LangString TorbuttonFirefoxNotFound ${LANG_POLISH} "Firefox nie zosta³ znaleziony w systemie. Torbutton nie bêdzie zainstalowany."
+
Property changes on: trunk/pkg/win32/vidalia_pl.nsh
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/pkg/win32/vidalia_pt-br.nsh
===================================================================
--- trunk/pkg/win32/vidalia_pt-br.nsh 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/pkg/win32/vidalia_pt-br.nsh 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,53 +1,53 @@
-;; $Id$
-;;
-;; Vidalia installer and bundle Portuguese (Brazilian) translation
-;;
-
-
-; Bundle
-LangString BundleSetupCaption ${LANG_PORTUGUESEBR} "Instalação do ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_PORTUGUESEBR} "Este assistente irá guiá-lo através da instalação do Tor, Vidalia, Privoxy e Torbutton.\r\n\r\nSe você já instalou previamente o Tor, Vidalia, Privoxy ou Firefox, por favor certifique-se de que eles não estejam sendo executados antes prosseguir com esta instalação.\r\n\r\n$_CLICK"
-LangString BundleWelcomeTitle ${LANG_PORTUGUESEBR} "Bem vindo ao Assistente de Instalação do ${BUNDLE_NAME}"
-LangString BundleLinkText ${LANG_PORTUGUESEBR} "Documentação da instalação ${TOR_NAME}"
-LangString BundleFinishText ${LANG_PORTUGUESEBR} "A instalação foi completada.\r\nPor favor visite http://tor.eff.org/docs/tor-doc-win32.html para aprender como configurar os seus aplicativos para usar o Tor.\r\n\r\nSe você instalou o Torbutton, você terá que reiniciar o Firefox."
-LangString BundleRunNow ${LANG_PORTUGUESEBR} "Executar os componentes instalados agora"
-
-; Vidalia
-LangString VidaliaGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${VIDALIA_DESC}."
-LangString VidaliaSetupCaption ${LANG_PORTUGUESEBR} "Instalação do ${VIDALIA_NAME}"
-LangString VidaliaWelcomeText ${LANG_PORTUGUESEBR} "Este assistente irá guiá-lo através da instalação do ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
-LangString VidaliaWelcomeTitle ${LANG_PORTUGUESEBR} "Bem vindo ao Assistente de Instalação do ${VIDALIA_NAME}"
-LangString VidaliaLinkText ${LANG_PORTUGUESEBR} "${VIDALIA_NAME} homepage"
-LangString VidaliaAppDesc ${LANG_PORTUGUESEBR} "Instalar ${VIDALIA_DESC}."
-LangString VidaliaStartup ${LANG_PORTUGUESEBR} "Executar Na Inicialização"
-LangString VidaliaStartupDesc ${LANG_PORTUGUESEBR} "Executar o ${VIDALIA_NAME} automaticamente na inicialização."
-LangString VidaliaShortcuts ${LANG_PORTUGUESEBR} "Adicionar ao Menu Iniciar"
-LangString VidaliaShortcutsDesc ${LANG_PORTUGUESEBR} "Adicionar ${VIDALIA_NAME} ao seu Menu Iniciar."
-LangString VidaliaRunNow ${LANG_PORTUGUESEBR} "Executar o ${VIDALIA_NAME} agora"
-
-; Tor
-LangString TorGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${TOR_DESC}."
-LangString TorAppDesc ${LANG_PORTUGUESEBR} "Instalar ${TOR_DESC}."
-LangString TorAskOverwriteTorrc ${LANG_PORTUGUESEBR} "Você já tem um arquivo de configuração do Tor.$\r$\nVocê deseja substituí-lo com o arquivo de exemplo de configuração padrão?"
-LangString TorOpenSSL ${LANG_PORTUGUESEBR} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_PORTUGUESEBR} "Instalar ${OPENSSL_DESC}."
-LangString TorDocumentation ${LANG_PORTUGUESEBR} "Documentação"
-LangString TorDocumentationDesc ${LANG_PORTUGUESEBR} "Instalar a documentação do ${TOR_NAME}."
-LangString TorShortcuts ${LANG_PORTUGUESEBR} "Adicionar ao Menu Iniciar"
-LangString TorShortcutsDesc ${LANG_PORTUGUESEBR} "Adicionar o ${TOR_NAME} ao seu Menu Iniciar."
-
-; Privoxy
-LangString PrivoxyGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${PRIVOXY_DESC}"
-LangString PrivoxyAppDesc ${LANG_PORTUGUESEBR} "Instalar ${PRIVOXY_DESC}."
-LangString PrivoxyShortcuts ${LANG_PORTUGUESEBR} "Adicionar ao Menu Iniciar"
-LangString PrivoxyShortcutsDesc ${LANG_PORTUGUESEBR} "Adicionar o ${PRIVOXY_NAME} ao seu Menu Iniciar."
-LangString PrivoxyStartup ${LANG_PORTUGUESEBR} "Executar Na Inicialização"
-LangString PrivoxyStartupDesc ${LANG_PORTUGUESEBR} "Executar o ${PRIVOXY_NAME} automaticamente na inicialização."
-
-; Torbutton
-LangString TorbuttonGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${TORBUTTON_DESC}."
-LangString TorbuttonAppDesc ${LANG_PORTUGUESEBR} "Instalar ${TORBUTTON_DESC}."
-LangString TorbuttonAddToFirefox ${LANG_PORTUGUESEBR} "Adicionar ao Firefox"
-LangString TorbuttonAddToFirefoxDesc ${LANG_PORTUGUESEBR} "Adicionar a extensão ${TORBUTTON_DESC} no Firefox."
-LangString TorbuttonFirefoxNotFound ${LANG_PORTUGUESEBR} "O Firefox não foi encontrado no seu sistema. O Torbutton não será instalado."
-
+;; $Id$
+;;
+;; Vidalia installer and bundle Portuguese (Brazilian) translation
+;;
+
+
+; Bundle
+LangString BundleSetupCaption ${LANG_PORTUGUESEBR} "Instalação do ${BUNDLE_NAME}"
+LangString BundleWelcomeText ${LANG_PORTUGUESEBR} "Este assistente irá guiá-lo através da instalação do Tor, Vidalia, Privoxy e Torbutton.\r\n\r\nSe você já instalou previamente o Tor, Vidalia, Privoxy ou Firefox, por favor certifique-se de que eles não estejam sendo executados antes prosseguir com esta instalação.\r\n\r\n$_CLICK"
+LangString BundleWelcomeTitle ${LANG_PORTUGUESEBR} "Bem vindo ao Assistente de Instalação do ${BUNDLE_NAME}"
+LangString BundleLinkText ${LANG_PORTUGUESEBR} "Documentação da instalação ${TOR_NAME}"
+LangString BundleFinishText ${LANG_PORTUGUESEBR} "A instalação foi completada.\r\nPor favor visite http://tor.eff.org/docs/tor-doc-win32.html para aprender como configurar os seus aplicativos para usar o Tor.\r\n\r\nSe você instalou o Torbutton, você terá que reiniciar o Firefox."
+LangString BundleRunNow ${LANG_PORTUGUESEBR} "Executar os componentes instalados agora"
+
+; Vidalia
+LangString VidaliaGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${VIDALIA_DESC}."
+LangString VidaliaSetupCaption ${LANG_PORTUGUESEBR} "Instalação do ${VIDALIA_NAME}"
+LangString VidaliaWelcomeText ${LANG_PORTUGUESEBR} "Este assistente irá guiá-lo através da instalação do ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
+LangString VidaliaWelcomeTitle ${LANG_PORTUGUESEBR} "Bem vindo ao Assistente de Instalação do ${VIDALIA_NAME}"
+LangString VidaliaLinkText ${LANG_PORTUGUESEBR} "${VIDALIA_NAME} homepage"
+LangString VidaliaAppDesc ${LANG_PORTUGUESEBR} "Instalar ${VIDALIA_DESC}."
+LangString VidaliaStartup ${LANG_PORTUGUESEBR} "Executar Na Inicialização"
+LangString VidaliaStartupDesc ${LANG_PORTUGUESEBR} "Executar o ${VIDALIA_NAME} automaticamente na inicialização."
+LangString VidaliaShortcuts ${LANG_PORTUGUESEBR} "Adicionar ao Menu Iniciar"
+LangString VidaliaShortcutsDesc ${LANG_PORTUGUESEBR} "Adicionar ${VIDALIA_NAME} ao seu Menu Iniciar."
+LangString VidaliaRunNow ${LANG_PORTUGUESEBR} "Executar o ${VIDALIA_NAME} agora"
+
+; Tor
+LangString TorGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${TOR_DESC}."
+LangString TorAppDesc ${LANG_PORTUGUESEBR} "Instalar ${TOR_DESC}."
+LangString TorAskOverwriteTorrc ${LANG_PORTUGUESEBR} "Você já tem um arquivo de configuração do Tor.$\r$\nVocê deseja substituí-lo com o arquivo de exemplo de configuração padrão?"
+LangString TorOpenSSL ${LANG_PORTUGUESEBR} "OpenSSL ${OPENSSL_APPVERSION}"
+LangString TorOpenSSLDesc ${LANG_PORTUGUESEBR} "Instalar ${OPENSSL_DESC}."
+LangString TorDocumentation ${LANG_PORTUGUESEBR} "Documentação"
+LangString TorDocumentationDesc ${LANG_PORTUGUESEBR} "Instalar a documentação do ${TOR_NAME}."
+LangString TorShortcuts ${LANG_PORTUGUESEBR} "Adicionar ao Menu Iniciar"
+LangString TorShortcutsDesc ${LANG_PORTUGUESEBR} "Adicionar o ${TOR_NAME} ao seu Menu Iniciar."
+
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${PRIVOXY_DESC}"
+LangString PrivoxyAppDesc ${LANG_PORTUGUESEBR} "Instalar ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_PORTUGUESEBR} "Adicionar ao Menu Iniciar"
+LangString PrivoxyShortcutsDesc ${LANG_PORTUGUESEBR} "Adicionar o ${PRIVOXY_NAME} ao seu Menu Iniciar."
+LangString PrivoxyStartup ${LANG_PORTUGUESEBR} "Executar Na Inicialização"
+LangString PrivoxyStartupDesc ${LANG_PORTUGUESEBR} "Executar o ${PRIVOXY_NAME} automaticamente na inicialização."
+
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_PORTUGUESEBR} "Instalar ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_PORTUGUESEBR} "Adicionar ao Firefox"
+LangString TorbuttonAddToFirefoxDesc ${LANG_PORTUGUESEBR} "Adicionar a extensão ${TORBUTTON_DESC} no Firefox."
+LangString TorbuttonFirefoxNotFound ${LANG_PORTUGUESEBR} "O Firefox não foi encontrado no seu sistema. O Torbutton não será instalado."
+
Property changes on: trunk/pkg/win32/vidalia_pt-br.nsh
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/pkg/win32/vidalia_zh-cn.nsh
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/config.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/exitpolicy.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/exitpolicy.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/policy.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/policy.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/serversettings.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/serversettings.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/torsettings.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/torsettings.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/vidaliasettings.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/config/vidaliasettings.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/bandwidthevent.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/circuit.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/circuit.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/circuitevent.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/control.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/controlcommand.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/controlcommand.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/controlconnection.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/controlconnection.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/controlreply.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/controlreply.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/controlsocket.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/controlsocket.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/eventtype.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/logevent.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/logevent.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/newdescriptorevent.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/orconnevent.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/orconnevent.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/replyline.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/replyline.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/routerdescriptor.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/routerdescriptor.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/stream.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/stream.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/streamevent.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/torcontrol.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/torcontrol.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/torevents.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/torevents.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/torprocess.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/torprocess.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/torsignal.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/control/torsignal.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/about/about.pri
===================================================================
--- trunk/src/gui/about/about.pri 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/about/about.pri 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,28 +1,28 @@
-#################################################################
-# $Id$
-#
-# 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.
-#################################################################
-
-FORMS += $$PWD/aboutdialog.ui
-
-HEADERS += $$PWD/aboutdialog.h
-
-SOURCES += $$PWD/aboutdialog.cpp
+#################################################################
+# $Id$
+#
+# 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.
+#################################################################
+
+FORMS += $$PWD/aboutdialog.ui
+
+HEADERS += $$PWD/aboutdialog.h
+
+SOURCES += $$PWD/aboutdialog.cpp
Property changes on: trunk/src/gui/about/about.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/about/aboutdialog.cpp
===================================================================
--- trunk/src/gui/about/aboutdialog.cpp 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/about/aboutdialog.cpp 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,83 +1,83 @@
-/****************************************************************
- * 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 aboutdialog.cpp
- * \version $Id$
- * \brief Displays information about Vidalia, Tor, and Qt
- */
-
-#include <QFile>
-#include <vidalia.h>
-#include "aboutdialog.h"
-
-
-/** Default Constructor **/
-AboutDialog::AboutDialog(QWidget *parent, Qt::WFlags flags)
-: VidaliaWindow("AboutDialog", parent, flags)
-{
- ui.setupUi(this);
-#if defined(Q_WS_WIN)
- setShortcut("Esc", SLOT(close()));
-#else
- setShortcut("Ctrl+W", SLOT(close()));
-#endif
-
- /* Save the TorControl object to use later */
- _torControl = Vidalia::torControl();
-
- /* Get Vidalia's version number */
- ui.lblVidaliaVersion->setText(Vidalia::version());
-
- /* Get Qt's version number */
- ui.lblQtVersion->setText(QT_VERSION_STR);
-
- /* Load the brief licensing information and hide it initally */
- loadLicense();
-}
-
-/** Loads the license information */
-void
-AboutDialog::loadLicense()
-{
- QFile licenseFile(":/docs/short_license.txt");
- licenseFile.open(QFile::ReadOnly);
- ui.txtLicense->setPlainText(licenseFile.readAll());
- licenseFile.close();
-}
-
-/** Displays the About dialog window **/
-void
-AboutDialog::showWindow()
-{
- /* Access the TorControl object to retrieve version */
- if (_torControl->isRunning()) {
- QString version = _torControl->getTorVersionString();
- if (version.isEmpty()) {
- version = tr("<Unavailable>");
- }
- ui.lblTorVersion->setText(version);
- } else {
- ui.lblTorVersion->setText(tr("<Not Running>"));
- }
- VidaliaWindow::showWindow();
-}
-
+/****************************************************************
+ * 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 aboutdialog.cpp
+ * \version $Id$
+ * \brief Displays information about Vidalia, Tor, and Qt
+ */
+
+#include <QFile>
+#include <vidalia.h>
+#include "aboutdialog.h"
+
+
+/** Default Constructor **/
+AboutDialog::AboutDialog(QWidget *parent, Qt::WFlags flags)
+: VidaliaWindow("AboutDialog", parent, flags)
+{
+ ui.setupUi(this);
+#if defined(Q_WS_WIN)
+ setShortcut("Esc", SLOT(close()));
+#else
+ setShortcut("Ctrl+W", SLOT(close()));
+#endif
+
+ /* Save the TorControl object to use later */
+ _torControl = Vidalia::torControl();
+
+ /* Get Vidalia's version number */
+ ui.lblVidaliaVersion->setText(Vidalia::version());
+
+ /* Get Qt's version number */
+ ui.lblQtVersion->setText(QT_VERSION_STR);
+
+ /* Load the brief licensing information and hide it initally */
+ loadLicense();
+}
+
+/** Loads the license information */
+void
+AboutDialog::loadLicense()
+{
+ QFile licenseFile(":/docs/short_license.txt");
+ licenseFile.open(QFile::ReadOnly);
+ ui.txtLicense->setPlainText(licenseFile.readAll());
+ licenseFile.close();
+}
+
+/** Displays the About dialog window **/
+void
+AboutDialog::showWindow()
+{
+ /* Access the TorControl object to retrieve version */
+ if (_torControl->isRunning()) {
+ QString version = _torControl->getTorVersionString();
+ if (version.isEmpty()) {
+ version = tr("<Unavailable>");
+ }
+ ui.lblTorVersion->setText(version);
+ } else {
+ ui.lblTorVersion->setText(tr("<Not Running>"));
+ }
+ VidaliaWindow::showWindow();
+}
+
Property changes on: trunk/src/gui/about/aboutdialog.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/about/aboutdialog.h
===================================================================
--- trunk/src/gui/about/aboutdialog.h 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/about/aboutdialog.h 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,59 +1,59 @@
-/****************************************************************
- * 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 aboutdialog.h
- * \version $Id$
- * \brief Displays information about Vidalia, Tor, and Qt
- */
-
-#ifndef _ABOUTDIALOG_H
-#define _ABOUTDIALOG_H
-
-#include <control/torcontrol.h>
-#include <gui/common/vidaliawindow.h>
-#include "ui_aboutdialog.h"
-
-
-class AboutDialog : public VidaliaWindow
-{
- Q_OBJECT
-
-public:
- /** Default constructor **/
- AboutDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
-
-public slots:
- /** Overriden VidaliaWindow::showWindow() */
- void showWindow();
-
-private:
- /** Loads the license file */
- void loadLicense();
-
- /** Qt Designer generated QObject **/
- Ui::AboutDialog ui;
- /** TorControl for access to Tor version info **/
- TorControl *_torControl;
-};
-
-#endif
-
+/****************************************************************
+ * 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 aboutdialog.h
+ * \version $Id$
+ * \brief Displays information about Vidalia, Tor, and Qt
+ */
+
+#ifndef _ABOUTDIALOG_H
+#define _ABOUTDIALOG_H
+
+#include <control/torcontrol.h>
+#include <gui/common/vidaliawindow.h>
+#include "ui_aboutdialog.h"
+
+
+class AboutDialog : public VidaliaWindow
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor **/
+ AboutDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
+
+public slots:
+ /** Overriden VidaliaWindow::showWindow() */
+ void showWindow();
+
+private:
+ /** Loads the license file */
+ void loadLicense();
+
+ /** Qt Designer generated QObject **/
+ Ui::AboutDialog ui;
+ /** TorControl for access to Tor version info **/
+ TorControl *_torControl;
+};
+
+#endif
+
Property changes on: trunk/src/gui/about/aboutdialog.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/about/aboutdialog.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/bwgraph/bwgraph.cpp
===================================================================
--- trunk/src/gui/bwgraph/bwgraph.cpp 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/bwgraph/bwgraph.cpp 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,282 +1,282 @@
-/****************************************************************
- * 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 bwgraph.cpp
- * \version $Id$
- * \brief Displays a graph of Tor's bandwidth usage
- */
-
-#include <vidalia.h>
-#include <control/bandwidthevent.h>
-#include "bwgraph.h"
-
-#define BWGRAPH_LINE_SEND (1u<<0)
-#define BWGRAPH_LINE_RECV (1u<<1)
-#define SETTING_FILTER "LineFilter"
-#define SETTING_OPACITY "Opacity"
-#define SETTING_ALWAYS_ON_TOP "AlwaysOnTop"
-#define SETTING_STYLE "GraphStyle"
-#define DEFAULT_FILTER (BWGRAPH_LINE_SEND|BWGRAPH_LINE_RECV)
-#define DEFAULT_ALWAYS_ON_TOP false
-#define DEFAULT_OPACITY 100
-#define DEFAULT_STYLE GraphFrame::AreaGraph
-
-#define ADD_TO_FILTER(f,v,b) (f = ((b) ? ((f) | (v)) : ((f) & ~(v))))
-
-/* Define the format used for displaying the date and time */
-#define DATETIME_FMT "MMM dd hh:mm:ss"
-
-/* Images used in the graph style drop-down */
-#define IMG_AREA_GRAPH ":/images/16x16/graph-area.png"
-#define IMG_LINE_GRAPH ":/images/16x16/graph-line.png"
-
-
-/** Default constructor */
-BandwidthGraph::BandwidthGraph(QWidget *parent, Qt::WFlags flags)
- : VidaliaWindow("BandwidthGraph", parent, flags)
-{
- /* Invoke Qt Designer generated QObject setup routine */
- ui.setupUi(this);
-#if defined(Q_WS_WIN)
- setShortcut("Esc", SLOT(close()));
-#else
- setShortcut("Ctrl+W", SLOT(close()));
-#endif
-
- /* Bind events to actions */
- createActions();
-
- /* Ask Tor to notify us about bandwidth updates */
- _torControl = Vidalia::torControl();
- _torControl->setEvent(TorEvents::Bandwidth, this, true);
-
- /* Initialize Sent/Receive data counters */
- reset();
- /* Hide Bandwidth Graph Settings frame */
- showSettingsFrame(false);
- /* Load the previously saved settings */
- loadSettings();
-
- /* Turn off opacity group on unsupported platforms */
-#if defined(Q_WS_WIN)
- if(!(QSysInfo::WV_2000 <= QSysInfo::WindowsVersion <= QSysInfo::WV_2003)) {
- ui.frmOpacity->setVisible(false);
- }
-#endif
-
-#if defined(Q_WS_X11)
- ui.frmOpacity->setVisible(false);
-#endif
-}
-
-/** Custom event handler. Checks if the event is a bandwidth update event. If it
- * is, it will add the data point to the history and updates the graph. */
-void
-BandwidthGraph::customEvent(QEvent *event)
-{
- if (event->type() == CustomEventType::BandwidthEvent) {
- BandwidthEvent *bw = (BandwidthEvent *)event;
- updateGraph(bw->bytesRead(), bw->bytesWritten());
- }
-}
-
-/** Binds events to actions. */
-void
-BandwidthGraph::createActions()
-{
- connect(ui.btnToggleSettings, SIGNAL(toggled(bool)),
- this, SLOT(showSettingsFrame(bool)));
-
- connect(ui.btnReset, SIGNAL(clicked()),
- this, SLOT(reset()));
-
- connect(ui.btnSaveSettings, SIGNAL(clicked()),
- this, SLOT(saveChanges()));
-
- connect(ui.btnCancelSettings, SIGNAL(clicked()),
- this, SLOT(cancelChanges()));
-
- connect(ui.sldrOpacity, SIGNAL(valueChanged(int)),
- this, SLOT(setOpacity(int)));
-}
-
-/** Adds new data to the graph. */
-void
-BandwidthGraph::updateGraph(quint64 bytesRead, quint64 bytesWritten)
-{
- /* Graph only cares about kilobytes */
- ui.frmGraph->addPoints(bytesRead/1024.0, bytesWritten/1024.0);
-}
-
-/** Loads the saved Bandwidth Graph settings. */
-void
-BandwidthGraph::loadSettings()
-{
- /* Set window opacity slider widget */
- ui.sldrOpacity->setValue(getSetting(SETTING_OPACITY, DEFAULT_OPACITY).toInt());
- setOpacity(ui.sldrOpacity->value());
-
- /* Set whether the window appears on top. */
- ui.chkAlwaysOnTop->setChecked(getSetting(SETTING_ALWAYS_ON_TOP,
- DEFAULT_ALWAYS_ON_TOP).toBool());
- if (ui.chkAlwaysOnTop->isChecked()) {
- setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
- } else {
- setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
- }
-
- /* Set the line filter checkboxes accordingly */
- uint filter = getSetting(SETTING_FILTER, DEFAULT_FILTER).toUInt();
- ui.chkReceiveRate->setChecked(filter & BWGRAPH_LINE_RECV);
- ui.chkSendRate->setChecked(filter & BWGRAPH_LINE_SEND);
-
- /* Set whether we are plotting bandwidth as area graphs or not */
- int graphStyle = getSetting(SETTING_STYLE, DEFAULT_STYLE).toInt();
- if (graphStyle < 0 || graphStyle >= ui.cmbGraphStyle->count()) {
- graphStyle = DEFAULT_STYLE;
- }
- ui.cmbGraphStyle->setCurrentIndex(graphStyle);
- ui.frmGraph->setGraphStyle((GraphFrame::GraphStyle)graphStyle);
-
- /* Set graph frame settings */
- ui.frmGraph->setShowCounters(ui.chkReceiveRate->isChecked(),
- ui.chkSendRate->isChecked());
-}
-
-/** Resets the log start time. */
-void
-BandwidthGraph::reset()
-{
- /* Set to current time */
- ui.statusbar->showMessage(tr("Since:") + " " +
- QDateTime::currentDateTime()
- .toString(DATETIME_FMT));
- /* Reset the graph */
- ui.frmGraph->resetGraph();
-}
-
-/** Saves the Bandwidth Graph settings and adjusts the graph if necessary. */
-void
-BandwidthGraph::saveChanges()
-{
- /* Hide the settings frame and reset toggle button */
- showSettingsFrame(false);
-
- /* Save the opacity and graph style */
- saveSetting(SETTING_OPACITY, ui.sldrOpacity->value());
- saveSetting(SETTING_STYLE, ui.cmbGraphStyle->currentIndex());
-
- /* Save the Always On Top setting */
- saveSetting(SETTING_ALWAYS_ON_TOP, ui.chkAlwaysOnTop->isChecked());
- if (ui.chkAlwaysOnTop->isChecked()) {
- setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
- } else {
- setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
- }
- setOpacity(ui.sldrOpacity->value());
-
- /* Save the line filter values */
- uint filter = 0;
- ADD_TO_FILTER(filter, BWGRAPH_LINE_RECV, ui.chkReceiveRate->isChecked());
- ADD_TO_FILTER(filter, BWGRAPH_LINE_SEND, ui.chkSendRate->isChecked());
- saveSetting(SETTING_FILTER, filter);
-
-
- /* Update the graph frame settings */
- ui.frmGraph->setShowCounters(ui.chkReceiveRate->isChecked(),
- ui.chkSendRate->isChecked());
- ui.frmGraph->setGraphStyle((GraphFrame::GraphStyle)ui.cmbGraphStyle->currentIndex());
-
- /* A change in window flags causes the window to disappear, so make sure
- * it's still visible. */
- showNormal();
-}
-
-/** Simply restores the previously saved settings. */
-void
-BandwidthGraph::cancelChanges()
-{
- /* Hide the settings frame and reset toggle button */
- showSettingsFrame(false);
-
- /* Reload the settings */
- loadSettings();
-}
-
-/** Toggles the Settings pane on and off, changes toggle button text. */
-void
-BandwidthGraph::showSettingsFrame(bool show)
-{
- static QSize minSize = minimumSize();
-
- QSize newSize = size();
- if (show) {
- /* Extend the bottom of the bandwidth graph and show the settings */
- ui.frmSettings->setVisible(true);
- ui.btnToggleSettings->setChecked(true);
- ui.btnToggleSettings->setText(tr("Hide Settings"));
-
- /* 6 = vertical spacing between the settings frame and graph frame */
- newSize.setHeight(newSize.height() + ui.frmSettings->height() + 6);
- } else {
- /* Shrink the height of the bandwidth graph and hide the settings */
- ui.frmSettings->setVisible(false);
- ui.btnToggleSettings->setChecked(false);
- ui.btnToggleSettings->setText(tr("Show Settings"));
-
- /* 6 = vertical spacing between the settings frame and graph frame */
- newSize.setHeight(newSize.height() - ui.frmSettings->height() - 6);
- setMinimumSize(minSize);
- }
- resize(newSize);
-}
-
-/** Sets the opacity of the Bandwidth Graph window. */
-void
-BandwidthGraph::setOpacity(int value)
-{
- qreal newValue = value / 100.0;
-
- /* Opacity only supported by Mac and Win32 */
-#if defined(Q_WS_MAC)
- this->setWindowOpacity(newValue);
- ui.lblPercentOpacity->setText(QString::number(value));
-#elif defined(Q_WS_WIN)
- if(QSysInfo::WV_2000 <= QSysInfo::WindowsVersion <= QSysInfo::WV_2003) {
- this->setWindowOpacity(newValue);
- ui.lblPercentOpacity->setText(QString::number(value));
- }
-#else
- Q_UNUSED(newValue);
-#endif
-}
-
-/** Overloads the default show() slot so we can set opacity. */
-void
-BandwidthGraph::showWindow()
-{
- /* Load saved settings */
- loadSettings();
- /* Show the window */
- VidaliaWindow::showWindow();
-}
-
+/****************************************************************
+ * 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 bwgraph.cpp
+ * \version $Id$
+ * \brief Displays a graph of Tor's bandwidth usage
+ */
+
+#include <vidalia.h>
+#include <control/bandwidthevent.h>
+#include "bwgraph.h"
+
+#define BWGRAPH_LINE_SEND (1u<<0)
+#define BWGRAPH_LINE_RECV (1u<<1)
+#define SETTING_FILTER "LineFilter"
+#define SETTING_OPACITY "Opacity"
+#define SETTING_ALWAYS_ON_TOP "AlwaysOnTop"
+#define SETTING_STYLE "GraphStyle"
+#define DEFAULT_FILTER (BWGRAPH_LINE_SEND|BWGRAPH_LINE_RECV)
+#define DEFAULT_ALWAYS_ON_TOP false
+#define DEFAULT_OPACITY 100
+#define DEFAULT_STYLE GraphFrame::AreaGraph
+
+#define ADD_TO_FILTER(f,v,b) (f = ((b) ? ((f) | (v)) : ((f) & ~(v))))
+
+/* Define the format used for displaying the date and time */
+#define DATETIME_FMT "MMM dd hh:mm:ss"
+
+/* Images used in the graph style drop-down */
+#define IMG_AREA_GRAPH ":/images/16x16/graph-area.png"
+#define IMG_LINE_GRAPH ":/images/16x16/graph-line.png"
+
+
+/** Default constructor */
+BandwidthGraph::BandwidthGraph(QWidget *parent, Qt::WFlags flags)
+ : VidaliaWindow("BandwidthGraph", parent, flags)
+{
+ /* Invoke Qt Designer generated QObject setup routine */
+ ui.setupUi(this);
+#if defined(Q_WS_WIN)
+ setShortcut("Esc", SLOT(close()));
+#else
+ setShortcut("Ctrl+W", SLOT(close()));
+#endif
+
+ /* Bind events to actions */
+ createActions();
+
+ /* Ask Tor to notify us about bandwidth updates */
+ _torControl = Vidalia::torControl();
+ _torControl->setEvent(TorEvents::Bandwidth, this, true);
+
+ /* Initialize Sent/Receive data counters */
+ reset();
+ /* Hide Bandwidth Graph Settings frame */
+ showSettingsFrame(false);
+ /* Load the previously saved settings */
+ loadSettings();
+
+ /* Turn off opacity group on unsupported platforms */
+#if defined(Q_WS_WIN)
+ if(!(QSysInfo::WV_2000 <= QSysInfo::WindowsVersion <= QSysInfo::WV_2003)) {
+ ui.frmOpacity->setVisible(false);
+ }
+#endif
+
+#if defined(Q_WS_X11)
+ ui.frmOpacity->setVisible(false);
+#endif
+}
+
+/** Custom event handler. Checks if the event is a bandwidth update event. If it
+ * is, it will add the data point to the history and updates the graph. */
+void
+BandwidthGraph::customEvent(QEvent *event)
+{
+ if (event->type() == CustomEventType::BandwidthEvent) {
+ BandwidthEvent *bw = (BandwidthEvent *)event;
+ updateGraph(bw->bytesRead(), bw->bytesWritten());
+ }
+}
+
+/** Binds events to actions. */
+void
+BandwidthGraph::createActions()
+{
+ connect(ui.btnToggleSettings, SIGNAL(toggled(bool)),
+ this, SLOT(showSettingsFrame(bool)));
+
+ connect(ui.btnReset, SIGNAL(clicked()),
+ this, SLOT(reset()));
+
+ connect(ui.btnSaveSettings, SIGNAL(clicked()),
+ this, SLOT(saveChanges()));
+
+ connect(ui.btnCancelSettings, SIGNAL(clicked()),
+ this, SLOT(cancelChanges()));
+
+ connect(ui.sldrOpacity, SIGNAL(valueChanged(int)),
+ this, SLOT(setOpacity(int)));
+}
+
+/** Adds new data to the graph. */
+void
+BandwidthGraph::updateGraph(quint64 bytesRead, quint64 bytesWritten)
+{
+ /* Graph only cares about kilobytes */
+ ui.frmGraph->addPoints(bytesRead/1024.0, bytesWritten/1024.0);
+}
+
+/** Loads the saved Bandwidth Graph settings. */
+void
+BandwidthGraph::loadSettings()
+{
+ /* Set window opacity slider widget */
+ ui.sldrOpacity->setValue(getSetting(SETTING_OPACITY, DEFAULT_OPACITY).toInt());
+ setOpacity(ui.sldrOpacity->value());
+
+ /* Set whether the window appears on top. */
+ ui.chkAlwaysOnTop->setChecked(getSetting(SETTING_ALWAYS_ON_TOP,
+ DEFAULT_ALWAYS_ON_TOP).toBool());
+ if (ui.chkAlwaysOnTop->isChecked()) {
+ setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ } else {
+ setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+ }
+
+ /* Set the line filter checkboxes accordingly */
+ uint filter = getSetting(SETTING_FILTER, DEFAULT_FILTER).toUInt();
+ ui.chkReceiveRate->setChecked(filter & BWGRAPH_LINE_RECV);
+ ui.chkSendRate->setChecked(filter & BWGRAPH_LINE_SEND);
+
+ /* Set whether we are plotting bandwidth as area graphs or not */
+ int graphStyle = getSetting(SETTING_STYLE, DEFAULT_STYLE).toInt();
+ if (graphStyle < 0 || graphStyle >= ui.cmbGraphStyle->count()) {
+ graphStyle = DEFAULT_STYLE;
+ }
+ ui.cmbGraphStyle->setCurrentIndex(graphStyle);
+ ui.frmGraph->setGraphStyle((GraphFrame::GraphStyle)graphStyle);
+
+ /* Set graph frame settings */
+ ui.frmGraph->setShowCounters(ui.chkReceiveRate->isChecked(),
+ ui.chkSendRate->isChecked());
+}
+
+/** Resets the log start time. */
+void
+BandwidthGraph::reset()
+{
+ /* Set to current time */
+ ui.statusbar->showMessage(tr("Since:") + " " +
+ QDateTime::currentDateTime()
+ .toString(DATETIME_FMT));
+ /* Reset the graph */
+ ui.frmGraph->resetGraph();
+}
+
+/** Saves the Bandwidth Graph settings and adjusts the graph if necessary. */
+void
+BandwidthGraph::saveChanges()
+{
+ /* Hide the settings frame and reset toggle button */
+ showSettingsFrame(false);
+
+ /* Save the opacity and graph style */
+ saveSetting(SETTING_OPACITY, ui.sldrOpacity->value());
+ saveSetting(SETTING_STYLE, ui.cmbGraphStyle->currentIndex());
+
+ /* Save the Always On Top setting */
+ saveSetting(SETTING_ALWAYS_ON_TOP, ui.chkAlwaysOnTop->isChecked());
+ if (ui.chkAlwaysOnTop->isChecked()) {
+ setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ } else {
+ setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+ }
+ setOpacity(ui.sldrOpacity->value());
+
+ /* Save the line filter values */
+ uint filter = 0;
+ ADD_TO_FILTER(filter, BWGRAPH_LINE_RECV, ui.chkReceiveRate->isChecked());
+ ADD_TO_FILTER(filter, BWGRAPH_LINE_SEND, ui.chkSendRate->isChecked());
+ saveSetting(SETTING_FILTER, filter);
+
+
+ /* Update the graph frame settings */
+ ui.frmGraph->setShowCounters(ui.chkReceiveRate->isChecked(),
+ ui.chkSendRate->isChecked());
+ ui.frmGraph->setGraphStyle((GraphFrame::GraphStyle)ui.cmbGraphStyle->currentIndex());
+
+ /* A change in window flags causes the window to disappear, so make sure
+ * it's still visible. */
+ showNormal();
+}
+
+/** Simply restores the previously saved settings. */
+void
+BandwidthGraph::cancelChanges()
+{
+ /* Hide the settings frame and reset toggle button */
+ showSettingsFrame(false);
+
+ /* Reload the settings */
+ loadSettings();
+}
+
+/** Toggles the Settings pane on and off, changes toggle button text. */
+void
+BandwidthGraph::showSettingsFrame(bool show)
+{
+ static QSize minSize = minimumSize();
+
+ QSize newSize = size();
+ if (show) {
+ /* Extend the bottom of the bandwidth graph and show the settings */
+ ui.frmSettings->setVisible(true);
+ ui.btnToggleSettings->setChecked(true);
+ ui.btnToggleSettings->setText(tr("Hide Settings"));
+
+ /* 6 = vertical spacing between the settings frame and graph frame */
+ newSize.setHeight(newSize.height() + ui.frmSettings->height() + 6);
+ } else {
+ /* Shrink the height of the bandwidth graph and hide the settings */
+ ui.frmSettings->setVisible(false);
+ ui.btnToggleSettings->setChecked(false);
+ ui.btnToggleSettings->setText(tr("Show Settings"));
+
+ /* 6 = vertical spacing between the settings frame and graph frame */
+ newSize.setHeight(newSize.height() - ui.frmSettings->height() - 6);
+ setMinimumSize(minSize);
+ }
+ resize(newSize);
+}
+
+/** Sets the opacity of the Bandwidth Graph window. */
+void
+BandwidthGraph::setOpacity(int value)
+{
+ qreal newValue = value / 100.0;
+
+ /* Opacity only supported by Mac and Win32 */
+#if defined(Q_WS_MAC)
+ this->setWindowOpacity(newValue);
+ ui.lblPercentOpacity->setText(QString::number(value));
+#elif defined(Q_WS_WIN)
+ if(QSysInfo::WV_2000 <= QSysInfo::WindowsVersion <= QSysInfo::WV_2003) {
+ this->setWindowOpacity(newValue);
+ ui.lblPercentOpacity->setText(QString::number(value));
+ }
+#else
+ Q_UNUSED(newValue);
+#endif
+}
+
+/** Overloads the default show() slot so we can set opacity. */
+void
+BandwidthGraph::showWindow()
+{
+ /* Load saved settings */
+ loadSettings();
+ /* Show the window */
+ VidaliaWindow::showWindow();
+}
+
Property changes on: trunk/src/gui/bwgraph/bwgraph.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/bwgraph/bwgraph.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/bwgraph/bwgraph.pri
===================================================================
--- trunk/src/gui/bwgraph/bwgraph.pri 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/bwgraph/bwgraph.pri 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,30 +1,30 @@
-#################################################################
-# $Id$
-#
-# 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.
-#################################################################
-
-FORMS += $$PWD/bwgraph.ui
-
-HEADERS += $$PWD/bwgraph.h \
- $$PWD/graphframe.h
-
-SOURCES += $$PWD/bwgraph.cpp \
- $$PWD/graphframe.cpp
+#################################################################
+# $Id$
+#
+# 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.
+#################################################################
+
+FORMS += $$PWD/bwgraph.ui
+
+HEADERS += $$PWD/bwgraph.h \
+ $$PWD/graphframe.h
+
+SOURCES += $$PWD/bwgraph.cpp \
+ $$PWD/graphframe.cpp
Property changes on: trunk/src/gui/bwgraph/bwgraph.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/bwgraph/bwgraph.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/bwgraph/graphframe.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/bwgraph/graphframe.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/common/common.pri
===================================================================
--- trunk/src/gui/common/common.pri 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/common/common.pri 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,29 +1,29 @@
-#################################################################
-# $Id$
-#
-# 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.
-#################################################################
-
-HEADERS += $$PWD/vidaliawindow.h \
- $$PWD/vmessagebox.h
-
-SOURCES += $$PWD/vidaliawindow.cpp \
- $$PWD/vmessagebox.cpp
-
+#################################################################
+# $Id$
+#
+# 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.
+#################################################################
+
+HEADERS += $$PWD/vidaliawindow.h \
+ $$PWD/vmessagebox.h
+
+SOURCES += $$PWD/vidaliawindow.cpp \
+ $$PWD/vmessagebox.cpp
+
Property changes on: trunk/src/gui/common/common.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/common/vidaliawindow.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/common/vidaliawindow.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/common/vmessagebox.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/common/vmessagebox.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/advancedpage.cpp
===================================================================
--- trunk/src/gui/config/advancedpage.cpp 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/advancedpage.cpp 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,175 +1,175 @@
-/****************************************************************
- * 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 advancedpage.cpp
- * \version $Id$
- * \brief Advanced Tor and Vidalia configuration options
- */
-
-#include <QFile>
-#include <QFileInfo>
-#include <gui/common/vmessagebox.h>
-#include <util/file.h>
-#include <vidalia.h>
-#include "advancedpage.h"
-
-#if defined(Q_WS_WIN)
-#include <control/torservice.h>
-#endif
-
-
-/** Constructor */
-AdvancedPage::AdvancedPage(QWidget *parent)
-: ConfigPage(parent)
-{
- /* Invoke the Qt Designer generated object setup routine */
- ui.setupUi(this);
-
- /* Create TorSettings object */
- _settings = new TorSettings();
-
- /* Bind event to actions */
- connect(ui.btnBrowseTorConfig, SIGNAL(clicked()), this, SLOT(browseTorConfig()));
-
- /* Hide platform specific features */
-#if defined(Q_WS_WIN)
- ui.grpPermissions->setVisible(false);
- ui.grpService->setVisible(TorService::isSupported());
-#endif
-}
-
-/** Destructor */
-AdvancedPage::~AdvancedPage()
-{
- delete _settings;
-}
-
-/** Saves all settings for this page. */
-bool
-AdvancedPage::save(QString &errmsg)
-{
- Q_UNUSED(errmsg);
- _settings->setControlPort(ui.lineControlPort->text().toUShort());
- _settings->setTorrc(ui.lineTorConfig->text());
- _settings->setUser(ui.lineUser->text());
- _settings->setGroup(ui.lineGroup->text());
-
-#if defined(Q_WS_WIN)
- /* Install or uninstall the Tor service as necessary */
- setupService(ui.chkUseService->isChecked());
-#endif
-
- return true;
-}
-
-/** Loads previously saved settings. */
-void
-AdvancedPage::load()
-{
- ui.lineControlPort->setText(QString::number(_settings->getControlPort()));
- ui.lineTorConfig->setText(_settings->getTorrc());
- ui.lineUser->setText(_settings->getUser());
- ui.lineGroup->setText(_settings->getGroup());
-
-#if defined(Q_WS_WIN)
- TorService s;
- ui.chkUseService->setChecked(s.isInstalled());
-#endif
-}
-
-
-
-/** Open a QFileDialog to browse for Tor config file. */
-void
-AdvancedPage::browseTorConfig()
-{
- /* Prompt the user to select a file or create a new one */
- QString filename = QFileDialog::getOpenFileName(this,
- tr("Select Tor Configuration File"),
- QFileInfo(ui.lineTorConfig->text()).fileName());
-
- /* Make sure a filename was selected */
- if (filename.isEmpty()) {
- return;
- }
-
- /* Check if the file exists */
- QFile torrcFile(filename);
- if (!QFileInfo(filename).exists()) {
- /* The given file does not exist. Should we create it? */
- int response = VMessageBox::question(this,
- tr("File Not Found"),
- tr("%1 does not exist. Would you like to create it?")
- .arg(filename),
- VMessageBox::Yes, VMessageBox::No);
-
- if (response == VMessageBox::No) {
- /* Don't create it. Just bail. */
- return;
- }
- /* Attempt to create the specified file */
- QString errmsg;
- if (!touch_file(filename, false, &errmsg)) {
- VMessageBox::warning(this,
- tr("Failed to Create File"),
- tr("Unable to create %1 [%2]").arg(filename)
- .arg(errmsg),
- VMessageBox::Ok);
- return;
- }
- }
- ui.lineTorConfig->setText(filename);
-}
-
-#if defined(Q_WS_WIN)
-/** Installs or removes the Tor service as necessary. */
-void
-AdvancedPage::setupService(bool useService)
-{
- TorService service;
- bool isInstalled = service.isInstalled();
-
- if (!useService && isInstalled) {
- /* Uninstall if we don't want to use it anymore */
- Vidalia::torControl()->stop();
-
- if (!service.remove()) {
- VMessageBox::critical(this,
- tr("Unable to remove Tor Service"),
- tr("Vidalia was unable to remove the Tor service.\n\n"
- "You may need to remove it manually."),
- VMessageBox::Ok, VMessageBox::Cancel);
- }
- } else if (useService && !isInstalled) {
- /* Install if we want to start using a service */
- if (!service.install(_settings->getExecutable(),
- _settings->getTorrc(),
- _settings->getControlPort())) {
- VMessageBox::critical(this,
- tr("Unable to install Tor Service"),
- tr("Vidalia was unable to install the Tor service."),
- VMessageBox::Ok, VMessageBox::Cancel);
- }
- }
-}
-#endif
-
+/****************************************************************
+ * 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 advancedpage.cpp
+ * \version $Id$
+ * \brief Advanced Tor and Vidalia configuration options
+ */
+
+#include <QFile>
+#include <QFileInfo>
+#include <gui/common/vmessagebox.h>
+#include <util/file.h>
+#include <vidalia.h>
+#include "advancedpage.h"
+
+#if defined(Q_WS_WIN)
+#include <control/torservice.h>
+#endif
+
+
+/** Constructor */
+AdvancedPage::AdvancedPage(QWidget *parent)
+: ConfigPage(parent)
+{
+ /* Invoke the Qt Designer generated object setup routine */
+ ui.setupUi(this);
+
+ /* Create TorSettings object */
+ _settings = new TorSettings();
+
+ /* Bind event to actions */
+ connect(ui.btnBrowseTorConfig, SIGNAL(clicked()), this, SLOT(browseTorConfig()));
+
+ /* Hide platform specific features */
+#if defined(Q_WS_WIN)
+ ui.grpPermissions->setVisible(false);
+ ui.grpService->setVisible(TorService::isSupported());
+#endif
+}
+
+/** Destructor */
+AdvancedPage::~AdvancedPage()
+{
+ delete _settings;
+}
+
+/** Saves all settings for this page. */
+bool
+AdvancedPage::save(QString &errmsg)
+{
+ Q_UNUSED(errmsg);
+ _settings->setControlPort(ui.lineControlPort->text().toUShort());
+ _settings->setTorrc(ui.lineTorConfig->text());
+ _settings->setUser(ui.lineUser->text());
+ _settings->setGroup(ui.lineGroup->text());
+
+#if defined(Q_WS_WIN)
+ /* Install or uninstall the Tor service as necessary */
+ setupService(ui.chkUseService->isChecked());
+#endif
+
+ return true;
+}
+
+/** Loads previously saved settings. */
+void
+AdvancedPage::load()
+{
+ ui.lineControlPort->setText(QString::number(_settings->getControlPort()));
+ ui.lineTorConfig->setText(_settings->getTorrc());
+ ui.lineUser->setText(_settings->getUser());
+ ui.lineGroup->setText(_settings->getGroup());
+
+#if defined(Q_WS_WIN)
+ TorService s;
+ ui.chkUseService->setChecked(s.isInstalled());
+#endif
+}
+
+
+
+/** Open a QFileDialog to browse for Tor config file. */
+void
+AdvancedPage::browseTorConfig()
+{
+ /* Prompt the user to select a file or create a new one */
+ QString filename = QFileDialog::getOpenFileName(this,
+ tr("Select Tor Configuration File"),
+ QFileInfo(ui.lineTorConfig->text()).fileName());
+
+ /* Make sure a filename was selected */
+ if (filename.isEmpty()) {
+ return;
+ }
+
+ /* Check if the file exists */
+ QFile torrcFile(filename);
+ if (!QFileInfo(filename).exists()) {
+ /* The given file does not exist. Should we create it? */
+ int response = VMessageBox::question(this,
+ tr("File Not Found"),
+ tr("%1 does not exist. Would you like to create it?")
+ .arg(filename),
+ VMessageBox::Yes, VMessageBox::No);
+
+ if (response == VMessageBox::No) {
+ /* Don't create it. Just bail. */
+ return;
+ }
+ /* Attempt to create the specified file */
+ QString errmsg;
+ if (!touch_file(filename, false, &errmsg)) {
+ VMessageBox::warning(this,
+ tr("Failed to Create File"),
+ tr("Unable to create %1 [%2]").arg(filename)
+ .arg(errmsg),
+ VMessageBox::Ok);
+ return;
+ }
+ }
+ ui.lineTorConfig->setText(filename);
+}
+
+#if defined(Q_WS_WIN)
+/** Installs or removes the Tor service as necessary. */
+void
+AdvancedPage::setupService(bool useService)
+{
+ TorService service;
+ bool isInstalled = service.isInstalled();
+
+ if (!useService && isInstalled) {
+ /* Uninstall if we don't want to use it anymore */
+ Vidalia::torControl()->stop();
+
+ if (!service.remove()) {
+ VMessageBox::critical(this,
+ tr("Unable to remove Tor Service"),
+ tr("Vidalia was unable to remove the Tor service.\n\n"
+ "You may need to remove it manually."),
+ VMessageBox::Ok, VMessageBox::Cancel);
+ }
+ } else if (useService && !isInstalled) {
+ /* Install if we want to start using a service */
+ if (!service.install(_settings->getExecutable(),
+ _settings->getTorrc(),
+ _settings->getControlPort())) {
+ VMessageBox::critical(this,
+ tr("Unable to install Tor Service"),
+ tr("Vidalia was unable to install the Tor service."),
+ VMessageBox::Ok, VMessageBox::Cancel);
+ }
+ }
+}
+#endif
+
Property changes on: trunk/src/gui/config/advancedpage.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/advancedpage.h
===================================================================
--- trunk/src/gui/config/advancedpage.h 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/advancedpage.h 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,69 +1,69 @@
-/****************************************************************
- * 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 advancedpage.h
- * \version $Id$
- * \brief Advanced Tor and Vidalia configuration options
- */
-
-#ifndef _ADVANCEDPAGE_H
-#define _ADVANCEDPAGE_H
-
-#include <QFileDialog>
-#include <config/torsettings.h>
-
-#include "configpage.h"
-#include "ui_advancedpage.h"
-
-
-class AdvancedPage : public ConfigPage
-{
- Q_OBJECT
-
-public:
- /** Default Constructor */
- AdvancedPage(QWidget *parent = 0);
- /** Default Destructor */
- ~AdvancedPage();
- /** Saves the changes on this page */
- bool save(QString &errmsg);
- /** Loads the settings for this page */
- void load();
-
-private slots:
- /** Called when user clicks "Browse" to choose location of Tor config file */
- void browseTorConfig();
-
-private:
-#if defined(Q_WS_WIN)
- /** Installs or removes the Tor service as necessary */
- void setupService(bool useService);
-#endif
-
- /** A TorSettings object used to save/load settings */
- TorSettings* _settings;
- /** Qt Designer generated object */
- Ui::AdvancedPage ui;
-};
-
-#endif
-
+/****************************************************************
+ * 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 advancedpage.h
+ * \version $Id$
+ * \brief Advanced Tor and Vidalia configuration options
+ */
+
+#ifndef _ADVANCEDPAGE_H
+#define _ADVANCEDPAGE_H
+
+#include <QFileDialog>
+#include <config/torsettings.h>
+
+#include "configpage.h"
+#include "ui_advancedpage.h"
+
+
+class AdvancedPage : public ConfigPage
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ AdvancedPage(QWidget *parent = 0);
+ /** Default Destructor */
+ ~AdvancedPage();
+ /** Saves the changes on this page */
+ bool save(QString &errmsg);
+ /** Loads the settings for this page */
+ void load();
+
+private slots:
+ /** Called when user clicks "Browse" to choose location of Tor config file */
+ void browseTorConfig();
+
+private:
+#if defined(Q_WS_WIN)
+ /** Installs or removes the Tor service as necessary */
+ void setupService(bool useService);
+#endif
+
+ /** A TorSettings object used to save/load settings */
+ TorSettings* _settings;
+ /** Qt Designer generated object */
+ Ui::AdvancedPage ui;
+};
+
+#endif
+
Property changes on: trunk/src/gui/config/advancedpage.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/advancedpage.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/appearancepage.cpp
===================================================================
--- trunk/src/gui/config/appearancepage.cpp 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/appearancepage.cpp 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,85 +1,85 @@
-/****************************************************************
- * 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 appearancepage.cpp
- * \version $Id$
- * \brief Displays Vidalia language and style settings
- */
-
-#include <vidalia.h>
-#include "appearancepage.h"
-
-
-/** Default Constructor */
-AppearancePage::AppearancePage(QWidget *parent)
-: ConfigPage(parent)
-{
- /* Invoke Designer-generated object setup routine */
- ui.setupUi(this);
-
- /* Create VidaliaSettings object */
- _settings = new VidaliaSettings();
-
- /* Populate combo boxes */
- foreach (QString code, LanguageSupport::languageCodes()) {
- ui.cmboLanguage->addItem(QIcon(":/images/flags/" + code + ".png"),
- LanguageSupport::languageName(code),
- code);
- }
- foreach (QString style, QStyleFactory::keys()) {
- ui.cmboStyle->addItem(style, style.toLower());
- }
-}
-
-/** Destructor */
-AppearancePage::~AppearancePage()
-{
- delete _settings;
-}
-
-/** Saves the changes on this page */
-bool
-AppearancePage::save(QString &errmsg)
-{
- Q_UNUSED(errmsg);
- QString languageCode =
- LanguageSupport::languageCode(ui.cmboLanguage->currentText());
-
- _settings->setLanguageCode(languageCode);
- _settings->setInterfaceStyle(ui.cmboStyle->currentText());
-
- /* Set to new style */
- Vidalia::setStyle(ui.cmboStyle->currentText());
- return true;
-}
-
-/** Loads the settings for this page */
-void
-AppearancePage::load()
-{
- int index = ui.cmboLanguage->findData(_settings->getLanguageCode());
- ui.cmboLanguage->setCurrentIndex(index);
-
- index = ui.cmboStyle->findData(Vidalia::style().toLower());
- ui.cmboStyle->setCurrentIndex(index);
-}
-
+/****************************************************************
+ * 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 appearancepage.cpp
+ * \version $Id$
+ * \brief Displays Vidalia language and style settings
+ */
+
+#include <vidalia.h>
+#include "appearancepage.h"
+
+
+/** Default Constructor */
+AppearancePage::AppearancePage(QWidget *parent)
+: ConfigPage(parent)
+{
+ /* Invoke Designer-generated object setup routine */
+ ui.setupUi(this);
+
+ /* Create VidaliaSettings object */
+ _settings = new VidaliaSettings();
+
+ /* Populate combo boxes */
+ foreach (QString code, LanguageSupport::languageCodes()) {
+ ui.cmboLanguage->addItem(QIcon(":/images/flags/" + code + ".png"),
+ LanguageSupport::languageName(code),
+ code);
+ }
+ foreach (QString style, QStyleFactory::keys()) {
+ ui.cmboStyle->addItem(style, style.toLower());
+ }
+}
+
+/** Destructor */
+AppearancePage::~AppearancePage()
+{
+ delete _settings;
+}
+
+/** Saves the changes on this page */
+bool
+AppearancePage::save(QString &errmsg)
+{
+ Q_UNUSED(errmsg);
+ QString languageCode =
+ LanguageSupport::languageCode(ui.cmboLanguage->currentText());
+
+ _settings->setLanguageCode(languageCode);
+ _settings->setInterfaceStyle(ui.cmboStyle->currentText());
+
+ /* Set to new style */
+ Vidalia::setStyle(ui.cmboStyle->currentText());
+ return true;
+}
+
+/** Loads the settings for this page */
+void
+AppearancePage::load()
+{
+ int index = ui.cmboLanguage->findData(_settings->getLanguageCode());
+ ui.cmboLanguage->setCurrentIndex(index);
+
+ index = ui.cmboStyle->findData(Vidalia::style().toLower());
+ ui.cmboStyle->setCurrentIndex(index);
+}
+
Property changes on: trunk/src/gui/config/appearancepage.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/appearancepage.h
===================================================================
--- trunk/src/gui/config/appearancepage.h 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/appearancepage.h 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,62 +1,62 @@
-/****************************************************************
- * 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 appearancepage.h
- * \version $Id$
- * \brief Displays Vidalia language and style settings
- */
-
-#ifndef _APPEARANCEPAGE_H
-#define _APPEARANCEPAGE_H
-
-#include <QStyleFactory>
-#include <QLineEdit>
-
-#include <config/vidaliasettings.h>
-#include <lang/languagesupport.h>
-
-#include "configpage.h"
-#include "ui_appearancepage.h"
-
-class AppearancePage : public ConfigPage
-{
- Q_OBJECT
-
-public:
- /** Default Constructor */
- AppearancePage(QWidget *parent = 0);
- /** Default Destructor */
- ~AppearancePage();
- /** Saves the changes on this page */
- bool save(QString &errmsg);
- /** Loads the settings for this page */
- void load();
-
-private:
- /** A VidaliaSettings object used for saving/loading settings */
- VidaliaSettings* _settings;
-
- /** Qt Designer generated object */
- Ui::AppearancePage ui;
-};
-
-#endif
+/****************************************************************
+ * 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 appearancepage.h
+ * \version $Id$
+ * \brief Displays Vidalia language and style settings
+ */
+
+#ifndef _APPEARANCEPAGE_H
+#define _APPEARANCEPAGE_H
+
+#include <QStyleFactory>
+#include <QLineEdit>
+
+#include <config/vidaliasettings.h>
+#include <lang/languagesupport.h>
+
+#include "configpage.h"
+#include "ui_appearancepage.h"
+
+class AppearancePage : public ConfigPage
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ AppearancePage(QWidget *parent = 0);
+ /** Default Destructor */
+ ~AppearancePage();
+ /** Saves the changes on this page */
+ bool save(QString &errmsg);
+ /** Loads the settings for this page */
+ void load();
+
+private:
+ /** A VidaliaSettings object used for saving/loading settings */
+ VidaliaSettings* _settings;
+
+ /** Qt Designer generated object */
+ Ui::AppearancePage ui;
+};
+
+#endif
Property changes on: trunk/src/gui/config/appearancepage.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/appearancepage.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/config.pri
===================================================================
--- trunk/src/gui/config/config.pri 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/config.pri 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,52 +1,52 @@
-#################################################################
-# $Id$
-#
-# 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.
-#################################################################
-
-FORMS += $$PWD/configdialog.ui \
- $$PWD/generalpage.ui \
- $$PWD/serverpage.ui \
- $$PWD/advancedpage.ui \
- $$PWD/appearancepage.ui
-
-HEADERS += $$PWD/configdialog.h \
- $$PWD/domainvalidator.h \
- $$PWD/ipvalidator.h \
- $$PWD/portvalidator.h \
- $$PWD/nicknamevalidator.h \
- $$PWD/configpage.h \
- $$PWD/configpagestack.h \
- $$PWD/generalpage.h \
- $$PWD/serverpage.h \
- $$PWD/advancedpage.h \
- $$PWD/appearancepage.h
-
-SOURCES += $$PWD/configdialog.cpp \
- $$PWD/domainvalidator.cpp \
- $$PWD/ipvalidator.cpp \
- $$PWD/portvalidator.cpp \
- $$PWD/nicknamevalidator.cpp \
- $$PWD/configpagestack.cpp \
- $$PWD/generalpage.cpp \
- $$PWD/serverpage.cpp \
- $$PWD/advancedpage.cpp \
- $$PWD/appearancepage.cpp
-
+#################################################################
+# $Id$
+#
+# 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.
+#################################################################
+
+FORMS += $$PWD/configdialog.ui \
+ $$PWD/generalpage.ui \
+ $$PWD/serverpage.ui \
+ $$PWD/advancedpage.ui \
+ $$PWD/appearancepage.ui
+
+HEADERS += $$PWD/configdialog.h \
+ $$PWD/domainvalidator.h \
+ $$PWD/ipvalidator.h \
+ $$PWD/portvalidator.h \
+ $$PWD/nicknamevalidator.h \
+ $$PWD/configpage.h \
+ $$PWD/configpagestack.h \
+ $$PWD/generalpage.h \
+ $$PWD/serverpage.h \
+ $$PWD/advancedpage.h \
+ $$PWD/appearancepage.h
+
+SOURCES += $$PWD/configdialog.cpp \
+ $$PWD/domainvalidator.cpp \
+ $$PWD/ipvalidator.cpp \
+ $$PWD/portvalidator.cpp \
+ $$PWD/nicknamevalidator.cpp \
+ $$PWD/configpagestack.cpp \
+ $$PWD/generalpage.cpp \
+ $$PWD/serverpage.cpp \
+ $$PWD/advancedpage.cpp \
+ $$PWD/appearancepage.cpp
+
Property changes on: trunk/src/gui/config/config.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/configdialog.cpp
===================================================================
--- trunk/src/gui/config/configdialog.cpp 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/configdialog.cpp 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,170 +1,170 @@
-/****************************************************************
- * 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 configdialog.cpp
- * \version $Id$
- * \brief Contains a series of Vidalia and Tor configuration pages
- */
-
-#include <gui/common/vmessagebox.h>
-#include <vidalia.h>
-
-#include "configdialog.h"
-
-#define FONT QFont(tr("Arial"), 10)
-
-/* Images for toolbar icons */
-#define IMAGE_GENERAL ":/images/22x22/preferences-system.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"
-#define IMAGE_SAVE ":/images/22x22/media-floppy.png"
-#define IMAGE_CANCEL ":/images/22x22/emblem-unreadable.png"
-#define IMAGE_HELP ":/images/22x22/help-browser.png"
-
-/** Constructor */
-ConfigDialog::ConfigDialog(QWidget* parent)
-: VidaliaWindow("ConfigDialog", parent)
-{
- QAction *helpAct, *saveAct, *cancelAct;
-
- /* Invoke the Qt Designer generated QObject setup routine */
- ui.setupUi(this);
-
- /* Create the config pages and actions */
- QActionGroup *grp = new QActionGroup(this);
- ui.stackPages->add(new GeneralPage(ui.stackPages),
- createPageAction(QIcon(IMAGE_GENERAL), tr("General"), grp));
-
- ui.stackPages->add(new ServerPage(ui.stackPages),
- createPageAction(QIcon(IMAGE_SERVER), tr("Server"), grp));
-
- ui.stackPages->add(new AppearancePage(ui.stackPages),
- createPageAction(QIcon(IMAGE_APPEARANCE), tr("Appearance"), grp));
-
- ui.stackPages->add(new AdvancedPage(ui.stackPages),
- createPageAction(QIcon(IMAGE_ADVANCED), tr("Advanced"), grp));
-
- /* Create the toolbar */
- ui.toolBar->addActions(grp->actions());
- ui.toolBar->addSeparator();
- connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *)));
-
-
- /* Create and bind the Save button */
- helpAct = new QAction(QIcon(IMAGE_HELP), tr("Help"), ui.toolBar);
- addAction(helpAct, SLOT(help()));
-
- /* Create and bind the Save button */
- saveAct = new QAction(QIcon(IMAGE_SAVE), tr("Save"), ui.toolBar);
- saveAct->setShortcut(QString("Ctrl+S"));
- addAction(saveAct, SLOT(saveChanges()));
-
- /* Create and bind the Cancel button */
- cancelAct = new QAction(QIcon(IMAGE_CANCEL), tr("Cancel"), ui.toolBar);
- addAction(cancelAct, SLOT(close()));
-
- /* Select the first action */
- grp->actions()[0]->setChecked(true);
-
-#if defined(Q_WS_WIN)
- helpAct->setShortcut(QString("F1"));
- cancelAct->setShortcut(QString("Esc"));
-#else
- helpAct->setShortcut(QString("Ctrl+?"));
- cancelAct->setShortcut(QString("Ctrl+W"));
-#endif
-}
-
-/** Creates a new action associated with a config page. */
-QAction*
-ConfigDialog::createPageAction(QIcon img, QString text, QActionGroup *group)
-{
- QAction *action = new QAction(img, text, group);
- action->setCheckable(true);
- action->setFont(FONT);
- return action;
-}
-
-/** Adds the given action to the toolbar and hooks its triggered() signal to
- * the specified slot (if given). */
-void
-ConfigDialog::addAction(QAction *action, const char *slot)
-{
- action->setFont(FONT);
- ui.toolBar->addAction(action);
- connect(action, SIGNAL(triggered()), this, slot);
-}
-
-/** Shows the config dialog with focus set to the given page. */
-void
-ConfigDialog::showWindow(Page page)
-{
- /* Load saved settings */
- loadSettings();
- /* Show the dialog. */
- VidaliaWindow::showWindow();
- /* Set the focus to the specified page. */
- ui.stackPages->setCurrentIndex((int)page);
-}
-
-/** Loads the saved ConfigDialog settings. */
-void
-ConfigDialog::loadSettings()
-{
- /* Call each config page's load() method to load its data */
- foreach (ConfigPage *page, ui.stackPages->pages()) {
- page->load();
- }
-}
-
-/** Saves changes made to settings. */
-void
-ConfigDialog::saveChanges()
-{
- QString errmsg;
-
- /* Call each config page's save() method to save its data */
- foreach (ConfigPage *page, ui.stackPages->pages()) {
- if (!page->save(errmsg)) {
- /* Display the offending page */
- ui.stackPages->setCurrentPage(page);
-
- /* Show the user what went wrong */
- VMessageBox::warning(this,
- tr("Error Saving Configuration"), errmsg,
- VMessageBox::Ok);
-
- /* Don't process the rest of the pages */
- return;
- }
- }
- QMainWindow::close();
-}
-
-/** Shows help information about the configuration dialog. */
-void
-ConfigDialog::help()
-{
- Vidalia::help("config");
-}
-
+/****************************************************************
+ * 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 configdialog.cpp
+ * \version $Id$
+ * \brief Contains a series of Vidalia and Tor configuration pages
+ */
+
+#include <gui/common/vmessagebox.h>
+#include <vidalia.h>
+
+#include "configdialog.h"
+
+#define FONT QFont(tr("Arial"), 10)
+
+/* Images for toolbar icons */
+#define IMAGE_GENERAL ":/images/22x22/preferences-system.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"
+#define IMAGE_SAVE ":/images/22x22/media-floppy.png"
+#define IMAGE_CANCEL ":/images/22x22/emblem-unreadable.png"
+#define IMAGE_HELP ":/images/22x22/help-browser.png"
+
+/** Constructor */
+ConfigDialog::ConfigDialog(QWidget* parent)
+: VidaliaWindow("ConfigDialog", parent)
+{
+ QAction *helpAct, *saveAct, *cancelAct;
+
+ /* Invoke the Qt Designer generated QObject setup routine */
+ ui.setupUi(this);
+
+ /* Create the config pages and actions */
+ QActionGroup *grp = new QActionGroup(this);
+ ui.stackPages->add(new GeneralPage(ui.stackPages),
+ createPageAction(QIcon(IMAGE_GENERAL), tr("General"), grp));
+
+ ui.stackPages->add(new ServerPage(ui.stackPages),
+ createPageAction(QIcon(IMAGE_SERVER), tr("Server"), grp));
+
+ ui.stackPages->add(new AppearancePage(ui.stackPages),
+ createPageAction(QIcon(IMAGE_APPEARANCE), tr("Appearance"), grp));
+
+ ui.stackPages->add(new AdvancedPage(ui.stackPages),
+ createPageAction(QIcon(IMAGE_ADVANCED), tr("Advanced"), grp));
+
+ /* Create the toolbar */
+ ui.toolBar->addActions(grp->actions());
+ ui.toolBar->addSeparator();
+ connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *)));
+
+
+ /* Create and bind the Save button */
+ helpAct = new QAction(QIcon(IMAGE_HELP), tr("Help"), ui.toolBar);
+ addAction(helpAct, SLOT(help()));
+
+ /* Create and bind the Save button */
+ saveAct = new QAction(QIcon(IMAGE_SAVE), tr("Save"), ui.toolBar);
+ saveAct->setShortcut(QString("Ctrl+S"));
+ addAction(saveAct, SLOT(saveChanges()));
+
+ /* Create and bind the Cancel button */
+ cancelAct = new QAction(QIcon(IMAGE_CANCEL), tr("Cancel"), ui.toolBar);
+ addAction(cancelAct, SLOT(close()));
+
+ /* Select the first action */
+ grp->actions()[0]->setChecked(true);
+
+#if defined(Q_WS_WIN)
+ helpAct->setShortcut(QString("F1"));
+ cancelAct->setShortcut(QString("Esc"));
+#else
+ helpAct->setShortcut(QString("Ctrl+?"));
+ cancelAct->setShortcut(QString("Ctrl+W"));
+#endif
+}
+
+/** Creates a new action associated with a config page. */
+QAction*
+ConfigDialog::createPageAction(QIcon img, QString text, QActionGroup *group)
+{
+ QAction *action = new QAction(img, text, group);
+ action->setCheckable(true);
+ action->setFont(FONT);
+ return action;
+}
+
+/** Adds the given action to the toolbar and hooks its triggered() signal to
+ * the specified slot (if given). */
+void
+ConfigDialog::addAction(QAction *action, const char *slot)
+{
+ action->setFont(FONT);
+ ui.toolBar->addAction(action);
+ connect(action, SIGNAL(triggered()), this, slot);
+}
+
+/** Shows the config dialog with focus set to the given page. */
+void
+ConfigDialog::showWindow(Page page)
+{
+ /* Load saved settings */
+ loadSettings();
+ /* Show the dialog. */
+ VidaliaWindow::showWindow();
+ /* Set the focus to the specified page. */
+ ui.stackPages->setCurrentIndex((int)page);
+}
+
+/** Loads the saved ConfigDialog settings. */
+void
+ConfigDialog::loadSettings()
+{
+ /* Call each config page's load() method to load its data */
+ foreach (ConfigPage *page, ui.stackPages->pages()) {
+ page->load();
+ }
+}
+
+/** Saves changes made to settings. */
+void
+ConfigDialog::saveChanges()
+{
+ QString errmsg;
+
+ /* Call each config page's save() method to save its data */
+ foreach (ConfigPage *page, ui.stackPages->pages()) {
+ if (!page->save(errmsg)) {
+ /* Display the offending page */
+ ui.stackPages->setCurrentPage(page);
+
+ /* Show the user what went wrong */
+ VMessageBox::warning(this,
+ tr("Error Saving Configuration"), errmsg,
+ VMessageBox::Ok);
+
+ /* Don't process the rest of the pages */
+ return;
+ }
+ }
+ QMainWindow::close();
+}
+
+/** Shows help information about the configuration dialog. */
+void
+ConfigDialog::help()
+{
+ Vidalia::help("config");
+}
+
Property changes on: trunk/src/gui/config/configdialog.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/configdialog.h
===================================================================
--- trunk/src/gui/config/configdialog.h 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/configdialog.h 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,82 +1,82 @@
-/****************************************************************
- * 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 configdialog.h
- * \version $Id$
- * \brief Contains a series of Vidalia and Tor configuration pages
- */
-
-#ifndef _CONFIGDIALOG_H
-#define _CONFIGDIALOG_H
-
-#include <QMainWindow>
-#include <QFileDialog>
-#include <gui/help/browser/helpbrowser.h>
-#include <gui/common/vidaliawindow.h>
-
-#include "generalpage.h"
-#include "serverpage.h"
-#include "advancedpage.h"
-#include "appearancepage.h"
-
-#include "ui_configdialog.h"
-
-class ConfigDialog : public VidaliaWindow
-{
- Q_OBJECT
-
-public:
- /** Config dialog pages. */
- enum Page {
- General = 0, /** General configuration page. */
- Server = 1, /** Server configuration page. */
- Appearance = 2, /** Appearance configuration page. */
- Advanced = 3 /** Advanced configuration page. */
- };
-
- /** Default Constructor */
- ConfigDialog(QWidget *parent = 0);
-
-public slots:
- /** Shows the config dialog with focus set to the given page. */
- void showWindow(Page page = General);
-
-private slots:
- /** Called when user clicks "Save Settings" */
- void saveChanges();
- /** Called when user clicks "Help" */
- void help();
-
-private:
- /** Loads the current configuration settings */
- void loadSettings();
- /** Creates a new action for a config page. */
- QAction* createPageAction(QIcon img, QString text, QActionGroup *group);
- /** Adds a new action to the toolbar. */
- void addAction(QAction *action, const char *slot = 0);
-
- /** Qt Designer generated object */
- Ui::ConfigDialog ui;
-};
-
-#endif
-
+/****************************************************************
+ * 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 configdialog.h
+ * \version $Id$
+ * \brief Contains a series of Vidalia and Tor configuration pages
+ */
+
+#ifndef _CONFIGDIALOG_H
+#define _CONFIGDIALOG_H
+
+#include <QMainWindow>
+#include <QFileDialog>
+#include <gui/help/browser/helpbrowser.h>
+#include <gui/common/vidaliawindow.h>
+
+#include "generalpage.h"
+#include "serverpage.h"
+#include "advancedpage.h"
+#include "appearancepage.h"
+
+#include "ui_configdialog.h"
+
+class ConfigDialog : public VidaliaWindow
+{
+ Q_OBJECT
+
+public:
+ /** Config dialog pages. */
+ enum Page {
+ General = 0, /** General configuration page. */
+ Server = 1, /** Server configuration page. */
+ Appearance = 2, /** Appearance configuration page. */
+ Advanced = 3 /** Advanced configuration page. */
+ };
+
+ /** Default Constructor */
+ ConfigDialog(QWidget *parent = 0);
+
+public slots:
+ /** Shows the config dialog with focus set to the given page. */
+ void showWindow(Page page = General);
+
+private slots:
+ /** Called when user clicks "Save Settings" */
+ void saveChanges();
+ /** Called when user clicks "Help" */
+ void help();
+
+private:
+ /** Loads the current configuration settings */
+ void loadSettings();
+ /** Creates a new action for a config page. */
+ QAction* createPageAction(QIcon img, QString text, QActionGroup *group);
+ /** Adds a new action to the toolbar. */
+ void addAction(QAction *action, const char *slot = 0);
+
+ /** Qt Designer generated object */
+ Ui::ConfigDialog ui;
+};
+
+#endif
+
Property changes on: trunk/src/gui/config/configdialog.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/configdialog.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/configpage.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/configpagestack.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/configpagestack.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/domainvalidator.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/domainvalidator.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/generalpage.cpp
===================================================================
--- trunk/src/gui/config/generalpage.cpp 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/generalpage.cpp 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,99 +1,99 @@
-/****************************************************************
- * 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 generalpage.cpp
- * \version $Id$
- * \brief General Tor and Vidalia configuration options
- */
-
-#include "generalpage.h"
-
-/** Constructor */
-GeneralPage::GeneralPage(QWidget *parent)
-: ConfigPage(parent)
-{
- /* Invoke the Qt Designer generated object setup routine */
- ui.setupUi(this);
-
- /* Create settings objects */
- _vidaliaSettings = new VidaliaSettings;
- _torSettings = new TorSettings;
-
- /* Bind event to actions */
- connect(ui.btnBrowseTorExecutable, SIGNAL(clicked()),
- this, SLOT(browseTorPath()));
-
- /* Hide platform specific features */
-#ifndef Q_WS_WIN
- ui.chkRunWithSys->setVisible(false);
-#endif
-}
-
-/** Destructor */
-GeneralPage::~GeneralPage()
-{
- delete _vidaliaSettings;
- delete _torSettings;
-}
-
-/* Open a QFileDialog to browse for Tor executable */
-void
-GeneralPage::browseTorPath()
-{
-#if defined(Q_OS_WIN32)
- QString filter = tr("Executables (*.exe)");
-#else
- QString filter = "";
-#endif
-
- /* Prompt the user for an executable file. If we're on windows, filter for
- * only .exe files. */
- QString filename = QDir::convertSeparators(
- QFileDialog::getOpenFileName(this,
- tr("Select Path to Tor"),
- ui.lineTorExecutable->text(),
- filter));
- if (!filename.isEmpty()) {
- ui.lineTorExecutable->setText(filename);
- }
-}
-
-/* Saves all settings for this page */
-bool
-GeneralPage::save(QString &errmsg)
-{
- Q_UNUSED(errmsg);
- _torSettings->setExecutable(ui.lineTorExecutable->text());
- _vidaliaSettings->setRunTorAtStart(ui.chkRunTor->isChecked());
- _vidaliaSettings->setRunVidaliaOnBoot(ui.chkRunWithSys->isChecked());
- return true;
-}
-
-/* Loads previously saved settings */
-void
-GeneralPage::load()
-{
- ui.lineTorExecutable->setText(_torSettings->getExecutable());
- ui.chkRunTor->setChecked(_vidaliaSettings->runTorAtStart());
- ui.chkRunWithSys->setChecked(_vidaliaSettings->runVidaliaOnBoot());
-}
-
+/****************************************************************
+ * 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 generalpage.cpp
+ * \version $Id$
+ * \brief General Tor and Vidalia configuration options
+ */
+
+#include "generalpage.h"
+
+/** Constructor */
+GeneralPage::GeneralPage(QWidget *parent)
+: ConfigPage(parent)
+{
+ /* Invoke the Qt Designer generated object setup routine */
+ ui.setupUi(this);
+
+ /* Create settings objects */
+ _vidaliaSettings = new VidaliaSettings;
+ _torSettings = new TorSettings;
+
+ /* Bind event to actions */
+ connect(ui.btnBrowseTorExecutable, SIGNAL(clicked()),
+ this, SLOT(browseTorPath()));
+
+ /* Hide platform specific features */
+#ifndef Q_WS_WIN
+ ui.chkRunWithSys->setVisible(false);
+#endif
+}
+
+/** Destructor */
+GeneralPage::~GeneralPage()
+{
+ delete _vidaliaSettings;
+ delete _torSettings;
+}
+
+/* Open a QFileDialog to browse for Tor executable */
+void
+GeneralPage::browseTorPath()
+{
+#if defined(Q_OS_WIN32)
+ QString filter = tr("Executables (*.exe)");
+#else
+ QString filter = "";
+#endif
+
+ /* Prompt the user for an executable file. If we're on windows, filter for
+ * only .exe files. */
+ QString filename = QDir::convertSeparators(
+ QFileDialog::getOpenFileName(this,
+ tr("Select Path to Tor"),
+ ui.lineTorExecutable->text(),
+ filter));
+ if (!filename.isEmpty()) {
+ ui.lineTorExecutable->setText(filename);
+ }
+}
+
+/* Saves all settings for this page */
+bool
+GeneralPage::save(QString &errmsg)
+{
+ Q_UNUSED(errmsg);
+ _torSettings->setExecutable(ui.lineTorExecutable->text());
+ _vidaliaSettings->setRunTorAtStart(ui.chkRunTor->isChecked());
+ _vidaliaSettings->setRunVidaliaOnBoot(ui.chkRunWithSys->isChecked());
+ return true;
+}
+
+/* Loads previously saved settings */
+void
+GeneralPage::load()
+{
+ ui.lineTorExecutable->setText(_torSettings->getExecutable());
+ ui.chkRunTor->setChecked(_vidaliaSettings->runTorAtStart());
+ ui.chkRunWithSys->setChecked(_vidaliaSettings->runVidaliaOnBoot());
+}
+
Property changes on: trunk/src/gui/config/generalpage.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/generalpage.h
===================================================================
--- trunk/src/gui/config/generalpage.h 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/generalpage.h 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,66 +1,66 @@
-/****************************************************************
- * 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 generalpage.h
- * \version $Id$
- * \brief General Tor and Vidalia configuration options
- */
-
-#ifndef _GENERALPAGE_H
-#define _GENERALPAGE_H
-
-#include <QFileDialog>
-#include <config/vidaliasettings.h>
-#include <config/torsettings.h>
-
-#include "configpage.h"
-#include "ui_generalpage.h"
-
-class GeneralPage : public ConfigPage
-{
- Q_OBJECT
-
-public:
- /** Default Constructor */
- GeneralPage(QWidget *parent = 0);
- /** Default Destructor */
- ~GeneralPage();
- /** Saves the changes on this page */
- bool save(QString &errmsg);
- /** Loads the settings for this page */
- void load();
-
-private slots:
- /** Called when the user clicks "Browse" */
- void browseTorPath();
-
-private:
- /* A VidaliaSettings object used for saving/loading vidalia settings */
- VidaliaSettings *_vidaliaSettings;
- /* A TorSettings ovject used for saving/loading tor settings */
- TorSettings *_torSettings;
- /** Qt Designer generated object */
- Ui::GeneralPage ui;
-};
-
-#endif
-
+/****************************************************************
+ * 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 generalpage.h
+ * \version $Id$
+ * \brief General Tor and Vidalia configuration options
+ */
+
+#ifndef _GENERALPAGE_H
+#define _GENERALPAGE_H
+
+#include <QFileDialog>
+#include <config/vidaliasettings.h>
+#include <config/torsettings.h>
+
+#include "configpage.h"
+#include "ui_generalpage.h"
+
+class GeneralPage : public ConfigPage
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ GeneralPage(QWidget *parent = 0);
+ /** Default Destructor */
+ ~GeneralPage();
+ /** Saves the changes on this page */
+ bool save(QString &errmsg);
+ /** Loads the settings for this page */
+ void load();
+
+private slots:
+ /** Called when the user clicks "Browse" */
+ void browseTorPath();
+
+private:
+ /* A VidaliaSettings object used for saving/loading vidalia settings */
+ VidaliaSettings *_vidaliaSettings;
+ /* A TorSettings ovject used for saving/loading tor settings */
+ TorSettings *_torSettings;
+ /** Qt Designer generated object */
+ Ui::GeneralPage ui;
+};
+
+#endif
+
Property changes on: trunk/src/gui/config/generalpage.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/generalpage.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/ipvalidator.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/ipvalidator.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/nicknamevalidator.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/nicknamevalidator.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/portvalidator.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/portvalidator.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/serverpage.cpp
===================================================================
--- trunk/src/gui/config/serverpage.cpp 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/serverpage.cpp 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,465 +1,465 @@
-/****************************************************************
- * 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 serverpage.cpp
- * \version $Id$
- * \brief Tor server configuration options
- */
-
-#include <vidalia.h>
-#include <util/net.h>
-#include <util/http.h>
-#include <util/html.h>
-#include <gui/common/vmessagebox.h>
-
-#include "serverpage.h"
-#include "ipvalidator.h"
-#include "portvalidator.h"
-#include "domainvalidator.h"
-#include "nicknamevalidator.h"
-
-/** Delay between updating our server IP address (in ms). */
-#define AUTO_UPDATE_ADDR_INTERVAL 1000*60*60
-
-/** Help topics */
-#define EXIT_POLICY_HELP "server.exitpolicy"
-#define BANDWIDTH_HELP "server.bandwidth"
-
-/* These are completely made up values (in bytes/sec). */
-#define CABLE256_AVG_RATE (32*1024)
-#define CABLE256_MAX_RATE (64*1024)
-#define CABLE512_AVG_RATE (64*1024)
-#define CABLE512_MAX_RATE (128*1024)
-#define CABLE768_AVG_RATE (96*1024)
-#define CABLE768_MAX_RATE (192*1024)
-#define T1_AVG_RATE (192*1024)
-#define T1_MAX_RATE (384*1024)
-#define HIGHBW_AVG_RATE (3072*1024)
-#define HIGHBW_MAX_RATE (6144*1024)
-/** Minimum allowed bandwidth rate (20KB) */
-#define MIN_BANDWIDTH_RATE 20
-/** Maximum bandwidth rate. This is limited to 2147483646 bytes,
- * or 2097151 kilobytes. (2147483646/1024) */
-#define MAX_BANDWIDTH_RATE 2097151
-
-/** Ports represented by the "Websites" checkbox. (80) */
-#define PORTS_HTTP (QStringList() << "80")
-/** Ports represented by the "Secure Websites" checkbox. (443) */
-#define PORTS_HTTPS (QStringList() << "443")
-/** Ports represented by the "Retrieve Mail" checkbox. (110,143,993,995) */
-#define PORTS_MAIL (QStringList() << "110" << "143" << "993" << "995")
-/** Ports represented by the "Instant Messaging" checkbox.
- * (703,1863,5050,5190,5222,8300,8888) */
-#define PORTS_IM (QStringList() << "706" << "1863" << "5050" << "5190" \
- << "5222" << "8300" << "8888")
-/** Ports represented by the "Internet Relay Chat" checkbox.
- * (6660-6669,6697) */
-#define PORTS_IRC (QStringList() << "6660-6669" << "6697")
-
-
-/** Constructor */
-ServerPage::ServerPage(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();
-
- /* Create ServerSettings object */
- _settings = new ServerSettings(_torControl);
-
- /* Create a timer that we can use to remind ourselves to check if our IP
- * changed since last time we looked. */
- _autoUpdateTimer = new QTimer(this);
- connect(_autoUpdateTimer, SIGNAL(timeout()),
- this, SLOT(updateServerIP()));
-
- /* Bind events to actions */
- connect(ui.btnGetAddress, SIGNAL(clicked()), this, SLOT(getServerAddress()));
- connect(ui.btnRateHelp, SIGNAL(clicked()), this, SLOT(bandwidthHelp()));
- connect(ui.btnExitHelp, SIGNAL(clicked()), this, SLOT(exitPolicyHelp()));
- connect(ui.cmboRate, SIGNAL(currentIndexChanged(int)),
- this, SLOT(rateChanged(int)));
- connect(ui.lineAvgRateLimit, SIGNAL(editingFinished()),
- this, SLOT(customRateChanged()));
- connect(ui.lineMaxRateLimit, SIGNAL(editingFinished()),
- this, SLOT(customRateChanged()));
-
- /* Set validators for address, mask and various port number fields */
- ui.lineServerNickname->setValidator(new NicknameValidator(this));
- ui.lineServerAddress->setValidator(new DomainValidator(this));
- ui.lineServerPort->setValidator(new QIntValidator(1, 65535, this));
- ui.lineDirPort->setValidator(new QIntValidator(1, 65535, this));
- ui.lineAvgRateLimit->setValidator(
- new QIntValidator(MIN_BANDWIDTH_RATE, MAX_BANDWIDTH_RATE, this));
- ui.lineMaxRateLimit->setValidator(
- new QIntValidator(MIN_BANDWIDTH_RATE, MAX_BANDWIDTH_RATE, this));
-}
-
-/** Destructor */
-ServerPage::~ServerPage()
-{
- delete _settings;
-}
-
-/** Enables or disables the automatic IP address update timer. */
-void
-ServerPage::setAutoUpdateTimer(bool enabled)
-{
- if (enabled && _settings->isServerEnabled()) {
- _autoUpdateTimer->start(AUTO_UPDATE_ADDR_INTERVAL);
- } else {
- _autoUpdateTimer->stop();
- }
-}
-
-/** Saves changes made to settings on the Server settings page. */
-bool
-ServerPage::save(QString &errmsg)
-{
- /* Force the bandwidth rate limits to validate */
- customRateChanged();
-
- if (ui.chkEnableServer->isChecked()) {
- /* A server must have an ORPort and a nickname */
- if (ui.lineServerPort->text().isEmpty() ||
- ui.lineServerNickname->text().isEmpty()) {
- errmsg = tr("You must specify at least a server nickname and port.");
- return false;
- }
- /* If the bandwidth rates aren't set, use some defaults before saving */
- if (ui.lineAvgRateLimit->text().isEmpty()) {
- ui.lineAvgRateLimit->setText(QString::number(2097152/1024) /* 2MB */);
- }
- if (ui.lineMaxRateLimit->text().isEmpty()) {
- ui.lineMaxRateLimit->setText(QString::number(5242880/1024) /* 5MB */);
- }
- }
- _settings->setServerEnabled(ui.chkEnableServer->isChecked());
- _settings->setDirectoryMirror(ui.chkMirrorDirectory->isChecked());
- _settings->setAutoUpdateAddress(ui.chkAutoUpdate->isChecked());
- _settings->setNickname(ui.lineServerNickname->text());
- _settings->setORPort(ui.lineServerPort->text().toUInt());
- _settings->setDirPort(ui.lineDirPort->text().toUInt());
- _settings->setAddress(ui.lineServerAddress->text());
- _settings->setContactInfo(ui.lineServerContact->text());
- saveBandwidthLimits();
- saveExitPolicies();
- setAutoUpdateTimer(ui.chkAutoUpdate->isChecked());
-
- /* If we're connected to Tor and we've changed the server settings, attempt
- * to apply the new settings now. */
- if (_torControl->isConnected() && _settings->changedSinceLastApply()) {
- if (!_settings->apply(&errmsg)) {
- _settings->revert();
- return false;
- }
- }
- return true;
-}
-
-/** Loads previously saved settings */
-void
-ServerPage::load()
-{
- ui.chkEnableServer->setChecked(_settings->isServerEnabled());
- ui.chkMirrorDirectory->setChecked(_settings->isDirectoryMirror());
- ui.chkAutoUpdate->setChecked(_settings->getAutoUpdateAddress());
- setAutoUpdateTimer(_settings->getAutoUpdateAddress());
-
- ui.lineServerNickname->setText(_settings->getNickname());
- ui.lineServerPort->setText(QString::number(_settings->getORPort()));
- ui.lineDirPort->setText(QString::number(_settings->getDirPort()));
- ui.lineServerAddress->setText(_settings->getAddress());
- ui.lineServerContact->setText(_settings->getContactInfo());
- loadBandwidthLimits();
- loadExitPolicies();
-
- ui.frmServer->setVisible(ui.chkEnableServer->isChecked());
-}
-
-/** Shows exit policy related help information */
-void
-ServerPage::exitPolicyHelp()
-{
- Vidalia::help(EXIT_POLICY_HELP);
-}
-
-/** Shows the bandwidth rate limiting help information */
-void
-ServerPage::bandwidthHelp()
-{
- Vidalia::help(BANDWIDTH_HELP);
-}
-
-/** Accesses an external site to try to get the user's public IP address. */
-void
-ServerPage::getServerPublicIP()
-{
- QString ip;
- bool success;
-
- /* This could take a bit, so show the wait cursor. */
- QApplication::setOverrideCursor(Qt::WaitCursor);
- success = net_get_public_ip(ip);
- QApplication::restoreOverrideCursor();
-
- /* Handle the result */
- if (success) {
- ui.lineServerAddress->setText(ip);
- } else {
- VMessageBox::warning(this, tr("Error"),
- p(tr("Vidalia was unable to determine your public IP address.")),
- VMessageBox::Ok);
- }
-}
-
-/** Attempts to determine this machine's IP address. If the local IP address
- * is a private address, then the user is asked whether they would like to
- * access an external site to try to get their public IP. */
-void
-ServerPage::getServerAddress()
-{
- QHostAddress addr = net_local_address();
- if (net_is_private_address(addr)) {
- int button = VMessageBox::information(this, tr("Get Address"),
- tr("Vidalia was only able to find a private IP "
- "address for your server.\n\nWould you like to "
- "access an external service to determine your public "
- "IP address?"),
- VMessageBox::Yes, VMessageBox::No);
- if (button == VMessageBox::Yes) {
- getServerPublicIP();
- return;
- }
- } else {
- ui.lineServerAddress->setText(addr.toString());
- }
-}
-
-/** Checks to see if this server's public IP had changed. If it has, then
- * update the UI, and Tor (if it's running). */
-void
-ServerPage::updateServerIP()
-{
- bool changed = false;
- QString ip;
- QHostAddress addr = net_local_address();
-
- if (net_is_private_address(addr)) {
- /* Try to get our public IP and see if it changed recently. */
- if (net_get_public_ip(ip) && ip != _settings->getAddress()) {
- changed = true;
- }
- } else if (addr.toString() != _settings->getAddress()) {
- ip = addr.toString();
- changed = true;
- }
-
- if (changed) {
- /* It changed so update our settings and the UI. */
- _settings->setAddress(ip);
- ui.lineServerAddress->setText(ip);
-
- /* If Tor is running, let it know about the change */
- if (_torControl->isConnected()) {
- _settings->apply();
- }
- }
-}
-
-/** Loads the server's bandwidth average and burst limits. */
-void
-ServerPage::loadBandwidthLimits()
-{
- quint32 avgRate = _settings->getBandwidthAvgRate();
- quint32 maxRate = _settings->getBandwidthBurstRate();
-
- if (avgRate == CABLE256_AVG_RATE &&
- maxRate == CABLE256_MAX_RATE) {
- /* Cable/DSL 256 Kbps */
- ui.cmboRate->setCurrentIndex(CableDsl256);
- } else if (avgRate == CABLE512_AVG_RATE &&
- maxRate == CABLE512_MAX_RATE) {
- /* Cable/DSL 512 Kbps */
- ui.cmboRate->setCurrentIndex(CableDsl512);
- } else if (avgRate == CABLE768_AVG_RATE &&
- maxRate == CABLE768_MAX_RATE) {
- /* Cable/DSL 768 Kbps */
- ui.cmboRate->setCurrentIndex(CableDsl768);
- } else if (avgRate == T1_AVG_RATE &&
- maxRate == T1_MAX_RATE) {
- /* T1/Cable/DSL 1.5 Mbps */
- ui.cmboRate->setCurrentIndex(T1CableDsl1500);
- } else if (avgRate == HIGHBW_AVG_RATE &&
- maxRate == HIGHBW_MAX_RATE) {
- /* > 1.5 Mbps */
- ui.cmboRate->setCurrentIndex(GreaterThan1500);
- } else {
- /* Custom bandwidth limits */
- ui.cmboRate->setCurrentIndex(CustomBwLimits);
- }
- /* Fill in the custom bandwidth limit boxes */
- ui.lineAvgRateLimit->setText(QString::number(avgRate/1024));
- ui.lineMaxRateLimit->setText(QString::number(maxRate/1024));
-}
-
-/** Saves the server's bandwidth average and burst limits. */
-void
-ServerPage::saveBandwidthLimits()
-{
- quint32 avgRate, maxRate;
-
- switch (ui.cmboRate->currentIndex()) {
- case CableDsl256: /* Cable/DSL 256 Kbps */
- avgRate = CABLE256_AVG_RATE;
- maxRate = CABLE256_MAX_RATE;
- break;
- case CableDsl512: /* Cable/DSL 512 Kbps */
- avgRate = CABLE512_AVG_RATE;
- maxRate = CABLE512_MAX_RATE;
- break;
- case CableDsl768: /* Cable/DSL 768 Kbps */
- avgRate = CABLE768_AVG_RATE;
- maxRate = CABLE768_MAX_RATE;
- break;
- case T1CableDsl1500: /* T1/Cable/DSL 1.5 Mbps */
- avgRate = T1_AVG_RATE;
- maxRate = T1_MAX_RATE;
- break;
- case GreaterThan1500: /* > 1.5 Mbps */
- avgRate = HIGHBW_AVG_RATE;
- maxRate = HIGHBW_MAX_RATE;
- break;
- default: /* Custom bandwidth limits */
- avgRate = (quint32)(ui.lineAvgRateLimit->text().toUInt()*1024);
- maxRate = (quint32)(ui.lineMaxRateLimit->text().toUInt()*1024);
- break;
- }
- _settings->setBandwidthAvgRate(avgRate);
- _settings->setBandwidthBurstRate(maxRate);
-}
-
-/** */
-void
-ServerPage::loadExitPolicies()
-{
- ExitPolicy exitPolicy = _settings->getExitPolicy();
-
- if (exitPolicy.contains(Policy(Policy::RejectAll))) {
- /* If the policy ends with reject *:*, check if the policy explicitly
- * accepts these ports */
- ui.chkWebsites->setChecked(exitPolicy.acceptsPorts(PORTS_HTTP));
- ui.chkSecWebsites->setChecked(exitPolicy.acceptsPorts(PORTS_HTTPS));
- ui.chkMail->setChecked(exitPolicy.acceptsPorts(PORTS_MAIL));
- ui.chkIRC->setChecked(exitPolicy.acceptsPorts(PORTS_IRC));
- ui.chkIM->setChecked(exitPolicy.acceptsPorts(PORTS_IM));
- ui.chkMisc->setChecked(false);
- } else {
- /* If the exit policy ends with accept *:*, check if the policy explicitly
- * rejects these ports */
- ui.chkWebsites->setChecked(!exitPolicy.rejectsPorts(PORTS_HTTP));
- ui.chkSecWebsites->setChecked(!exitPolicy.rejectsPorts(PORTS_HTTPS));
- ui.chkMail->setChecked(!exitPolicy.rejectsPorts(PORTS_MAIL));
- ui.chkIRC->setChecked(!exitPolicy.rejectsPorts(PORTS_IRC));
- ui.chkIM->setChecked(!exitPolicy.rejectsPorts(PORTS_IM));
- ui.chkMisc->setChecked(true);
- }
-}
-
-/** */
-void
-ServerPage::saveExitPolicies()
-{
- ExitPolicy exitPolicy;
- bool rejectUnchecked = ui.chkMisc->isChecked();
-
- /* If misc is checked, then reject unchecked items and leave the default exit
- * policy alone. Else, accept only checked items and end with reject *:*,
- * replacing the default exit policy. */
- if (ui.chkWebsites->isChecked() && !rejectUnchecked) {
- exitPolicy.addAcceptedPorts(PORTS_HTTP);
- } else if (!ui.chkWebsites->isChecked() && rejectUnchecked) {
- exitPolicy.addRejectedPorts(PORTS_HTTP);
- }
- if (ui.chkSecWebsites->isChecked() && !rejectUnchecked) {
- exitPolicy.addAcceptedPorts(PORTS_HTTPS);
- } else if (!ui.chkSecWebsites->isChecked() && rejectUnchecked) {
- exitPolicy.addRejectedPorts(PORTS_HTTPS);
- }
- if (ui.chkMail->isChecked() && !rejectUnchecked) {
- exitPolicy.addAcceptedPorts(PORTS_MAIL);
- } else if (!ui.chkMail->isChecked() && rejectUnchecked) {
- exitPolicy.addRejectedPorts(PORTS_MAIL);
- }
- if (ui.chkIRC->isChecked() && !rejectUnchecked) {
- exitPolicy.addAcceptedPorts(PORTS_IRC);
- } else if (!ui.chkIRC->isChecked() && rejectUnchecked) {
- exitPolicy.addRejectedPorts(PORTS_IRC);
- }
- if (ui.chkIM->isChecked() && !rejectUnchecked) {
- exitPolicy.addAcceptedPorts(PORTS_IM);
- } else if (!ui.chkIM->isChecked() && rejectUnchecked) {
- exitPolicy.addRejectedPorts(PORTS_IM);
- }
- if (!ui.chkMisc->isChecked()) {
- exitPolicy.addPolicy(Policy(Policy::RejectAll));
- }
- _settings->setExitPolicy(exitPolicy);
-}
-
-/** Called when the user selects a new value from the rate combo box. */
-void
-ServerPage::rateChanged(int index)
-{
- /* If the "Custom" option is selected, show the custom bandwidth
- * limits form. */
- ui.frmCustomRate->setVisible(index == CustomBwLimits);
-}
-
-/** Called when the user edits the long-term average or maximum bandwidth limit.
- * This ensures that the average bandwidth rate is greater than MIN_RATE
- * (20KB/s) and that the max rate is greater than the average rate. */
-void
-ServerPage::customRateChanged()
-{
- /* Make sure the average rate isn't too low or too high */
- quint32 avgRate = (quint32)ui.lineAvgRateLimit->text().toUInt();
- if (avgRate < MIN_BANDWIDTH_RATE) {
- ui.lineAvgRateLimit->setText(QString::number(MIN_BANDWIDTH_RATE));
- }
- if (avgRate > MAX_BANDWIDTH_RATE) {
- ui.lineAvgRateLimit->setText(QString::number(MAX_BANDWIDTH_RATE));
- }
- /* Ensure the max burst rate is greater than the average rate but less than
- * the maximum allowed rate. */
- quint32 burstRate = (quint32)ui.lineMaxRateLimit->text().toUInt();
- if (avgRate > burstRate) {
- ui.lineMaxRateLimit->setText(QString::number(avgRate));
- }
- if (burstRate > MAX_BANDWIDTH_RATE) {
- ui.lineMaxRateLimit->setText(QString::number(MAX_BANDWIDTH_RATE));
- }
-}
-
+/****************************************************************
+ * 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 serverpage.cpp
+ * \version $Id$
+ * \brief Tor server configuration options
+ */
+
+#include <vidalia.h>
+#include <util/net.h>
+#include <util/http.h>
+#include <util/html.h>
+#include <gui/common/vmessagebox.h>
+
+#include "serverpage.h"
+#include "ipvalidator.h"
+#include "portvalidator.h"
+#include "domainvalidator.h"
+#include "nicknamevalidator.h"
+
+/** Delay between updating our server IP address (in ms). */
+#define AUTO_UPDATE_ADDR_INTERVAL 1000*60*60
+
+/** Help topics */
+#define EXIT_POLICY_HELP "server.exitpolicy"
+#define BANDWIDTH_HELP "server.bandwidth"
+
+/* These are completely made up values (in bytes/sec). */
+#define CABLE256_AVG_RATE (32*1024)
+#define CABLE256_MAX_RATE (64*1024)
+#define CABLE512_AVG_RATE (64*1024)
+#define CABLE512_MAX_RATE (128*1024)
+#define CABLE768_AVG_RATE (96*1024)
+#define CABLE768_MAX_RATE (192*1024)
+#define T1_AVG_RATE (192*1024)
+#define T1_MAX_RATE (384*1024)
+#define HIGHBW_AVG_RATE (3072*1024)
+#define HIGHBW_MAX_RATE (6144*1024)
+/** Minimum allowed bandwidth rate (20KB) */
+#define MIN_BANDWIDTH_RATE 20
+/** Maximum bandwidth rate. This is limited to 2147483646 bytes,
+ * or 2097151 kilobytes. (2147483646/1024) */
+#define MAX_BANDWIDTH_RATE 2097151
+
+/** Ports represented by the "Websites" checkbox. (80) */
+#define PORTS_HTTP (QStringList() << "80")
+/** Ports represented by the "Secure Websites" checkbox. (443) */
+#define PORTS_HTTPS (QStringList() << "443")
+/** Ports represented by the "Retrieve Mail" checkbox. (110,143,993,995) */
+#define PORTS_MAIL (QStringList() << "110" << "143" << "993" << "995")
+/** Ports represented by the "Instant Messaging" checkbox.
+ * (703,1863,5050,5190,5222,8300,8888) */
+#define PORTS_IM (QStringList() << "706" << "1863" << "5050" << "5190" \
+ << "5222" << "8300" << "8888")
+/** Ports represented by the "Internet Relay Chat" checkbox.
+ * (6660-6669,6697) */
+#define PORTS_IRC (QStringList() << "6660-6669" << "6697")
+
+
+/** Constructor */
+ServerPage::ServerPage(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();
+
+ /* Create ServerSettings object */
+ _settings = new ServerSettings(_torControl);
+
+ /* Create a timer that we can use to remind ourselves to check if our IP
+ * changed since last time we looked. */
+ _autoUpdateTimer = new QTimer(this);
+ connect(_autoUpdateTimer, SIGNAL(timeout()),
+ this, SLOT(updateServerIP()));
+
+ /* Bind events to actions */
+ connect(ui.btnGetAddress, SIGNAL(clicked()), this, SLOT(getServerAddress()));
+ connect(ui.btnRateHelp, SIGNAL(clicked()), this, SLOT(bandwidthHelp()));
+ connect(ui.btnExitHelp, SIGNAL(clicked()), this, SLOT(exitPolicyHelp()));
+ connect(ui.cmboRate, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(rateChanged(int)));
+ connect(ui.lineAvgRateLimit, SIGNAL(editingFinished()),
+ this, SLOT(customRateChanged()));
+ connect(ui.lineMaxRateLimit, SIGNAL(editingFinished()),
+ this, SLOT(customRateChanged()));
+
+ /* Set validators for address, mask and various port number fields */
+ ui.lineServerNickname->setValidator(new NicknameValidator(this));
+ ui.lineServerAddress->setValidator(new DomainValidator(this));
+ ui.lineServerPort->setValidator(new QIntValidator(1, 65535, this));
+ ui.lineDirPort->setValidator(new QIntValidator(1, 65535, this));
+ ui.lineAvgRateLimit->setValidator(
+ new QIntValidator(MIN_BANDWIDTH_RATE, MAX_BANDWIDTH_RATE, this));
+ ui.lineMaxRateLimit->setValidator(
+ new QIntValidator(MIN_BANDWIDTH_RATE, MAX_BANDWIDTH_RATE, this));
+}
+
+/** Destructor */
+ServerPage::~ServerPage()
+{
+ delete _settings;
+}
+
+/** Enables or disables the automatic IP address update timer. */
+void
+ServerPage::setAutoUpdateTimer(bool enabled)
+{
+ if (enabled && _settings->isServerEnabled()) {
+ _autoUpdateTimer->start(AUTO_UPDATE_ADDR_INTERVAL);
+ } else {
+ _autoUpdateTimer->stop();
+ }
+}
+
+/** Saves changes made to settings on the Server settings page. */
+bool
+ServerPage::save(QString &errmsg)
+{
+ /* Force the bandwidth rate limits to validate */
+ customRateChanged();
+
+ if (ui.chkEnableServer->isChecked()) {
+ /* A server must have an ORPort and a nickname */
+ if (ui.lineServerPort->text().isEmpty() ||
+ ui.lineServerNickname->text().isEmpty()) {
+ errmsg = tr("You must specify at least a server nickname and port.");
+ return false;
+ }
+ /* If the bandwidth rates aren't set, use some defaults before saving */
+ if (ui.lineAvgRateLimit->text().isEmpty()) {
+ ui.lineAvgRateLimit->setText(QString::number(2097152/1024) /* 2MB */);
+ }
+ if (ui.lineMaxRateLimit->text().isEmpty()) {
+ ui.lineMaxRateLimit->setText(QString::number(5242880/1024) /* 5MB */);
+ }
+ }
+ _settings->setServerEnabled(ui.chkEnableServer->isChecked());
+ _settings->setDirectoryMirror(ui.chkMirrorDirectory->isChecked());
+ _settings->setAutoUpdateAddress(ui.chkAutoUpdate->isChecked());
+ _settings->setNickname(ui.lineServerNickname->text());
+ _settings->setORPort(ui.lineServerPort->text().toUInt());
+ _settings->setDirPort(ui.lineDirPort->text().toUInt());
+ _settings->setAddress(ui.lineServerAddress->text());
+ _settings->setContactInfo(ui.lineServerContact->text());
+ saveBandwidthLimits();
+ saveExitPolicies();
+ setAutoUpdateTimer(ui.chkAutoUpdate->isChecked());
+
+ /* If we're connected to Tor and we've changed the server settings, attempt
+ * to apply the new settings now. */
+ if (_torControl->isConnected() && _settings->changedSinceLastApply()) {
+ if (!_settings->apply(&errmsg)) {
+ _settings->revert();
+ return false;
+ }
+ }
+ return true;
+}
+
+/** Loads previously saved settings */
+void
+ServerPage::load()
+{
+ ui.chkEnableServer->setChecked(_settings->isServerEnabled());
+ ui.chkMirrorDirectory->setChecked(_settings->isDirectoryMirror());
+ ui.chkAutoUpdate->setChecked(_settings->getAutoUpdateAddress());
+ setAutoUpdateTimer(_settings->getAutoUpdateAddress());
+
+ ui.lineServerNickname->setText(_settings->getNickname());
+ ui.lineServerPort->setText(QString::number(_settings->getORPort()));
+ ui.lineDirPort->setText(QString::number(_settings->getDirPort()));
+ ui.lineServerAddress->setText(_settings->getAddress());
+ ui.lineServerContact->setText(_settings->getContactInfo());
+ loadBandwidthLimits();
+ loadExitPolicies();
+
+ ui.frmServer->setVisible(ui.chkEnableServer->isChecked());
+}
+
+/** Shows exit policy related help information */
+void
+ServerPage::exitPolicyHelp()
+{
+ Vidalia::help(EXIT_POLICY_HELP);
+}
+
+/** Shows the bandwidth rate limiting help information */
+void
+ServerPage::bandwidthHelp()
+{
+ Vidalia::help(BANDWIDTH_HELP);
+}
+
+/** Accesses an external site to try to get the user's public IP address. */
+void
+ServerPage::getServerPublicIP()
+{
+ QString ip;
+ bool success;
+
+ /* This could take a bit, so show the wait cursor. */
+ QApplication::setOverrideCursor(Qt::WaitCursor);
+ success = net_get_public_ip(ip);
+ QApplication::restoreOverrideCursor();
+
+ /* Handle the result */
+ if (success) {
+ ui.lineServerAddress->setText(ip);
+ } else {
+ VMessageBox::warning(this, tr("Error"),
+ p(tr("Vidalia was unable to determine your public IP address.")),
+ VMessageBox::Ok);
+ }
+}
+
+/** Attempts to determine this machine's IP address. If the local IP address
+ * is a private address, then the user is asked whether they would like to
+ * access an external site to try to get their public IP. */
+void
+ServerPage::getServerAddress()
+{
+ QHostAddress addr = net_local_address();
+ if (net_is_private_address(addr)) {
+ int button = VMessageBox::information(this, tr("Get Address"),
+ tr("Vidalia was only able to find a private IP "
+ "address for your server.\n\nWould you like to "
+ "access an external service to determine your public "
+ "IP address?"),
+ VMessageBox::Yes, VMessageBox::No);
+ if (button == VMessageBox::Yes) {
+ getServerPublicIP();
+ return;
+ }
+ } else {
+ ui.lineServerAddress->setText(addr.toString());
+ }
+}
+
+/** Checks to see if this server's public IP had changed. If it has, then
+ * update the UI, and Tor (if it's running). */
+void
+ServerPage::updateServerIP()
+{
+ bool changed = false;
+ QString ip;
+ QHostAddress addr = net_local_address();
+
+ if (net_is_private_address(addr)) {
+ /* Try to get our public IP and see if it changed recently. */
+ if (net_get_public_ip(ip) && ip != _settings->getAddress()) {
+ changed = true;
+ }
+ } else if (addr.toString() != _settings->getAddress()) {
+ ip = addr.toString();
+ changed = true;
+ }
+
+ if (changed) {
+ /* It changed so update our settings and the UI. */
+ _settings->setAddress(ip);
+ ui.lineServerAddress->setText(ip);
+
+ /* If Tor is running, let it know about the change */
+ if (_torControl->isConnected()) {
+ _settings->apply();
+ }
+ }
+}
+
+/** Loads the server's bandwidth average and burst limits. */
+void
+ServerPage::loadBandwidthLimits()
+{
+ quint32 avgRate = _settings->getBandwidthAvgRate();
+ quint32 maxRate = _settings->getBandwidthBurstRate();
+
+ if (avgRate == CABLE256_AVG_RATE &&
+ maxRate == CABLE256_MAX_RATE) {
+ /* Cable/DSL 256 Kbps */
+ ui.cmboRate->setCurrentIndex(CableDsl256);
+ } else if (avgRate == CABLE512_AVG_RATE &&
+ maxRate == CABLE512_MAX_RATE) {
+ /* Cable/DSL 512 Kbps */
+ ui.cmboRate->setCurrentIndex(CableDsl512);
+ } else if (avgRate == CABLE768_AVG_RATE &&
+ maxRate == CABLE768_MAX_RATE) {
+ /* Cable/DSL 768 Kbps */
+ ui.cmboRate->setCurrentIndex(CableDsl768);
+ } else if (avgRate == T1_AVG_RATE &&
+ maxRate == T1_MAX_RATE) {
+ /* T1/Cable/DSL 1.5 Mbps */
+ ui.cmboRate->setCurrentIndex(T1CableDsl1500);
+ } else if (avgRate == HIGHBW_AVG_RATE &&
+ maxRate == HIGHBW_MAX_RATE) {
+ /* > 1.5 Mbps */
+ ui.cmboRate->setCurrentIndex(GreaterThan1500);
+ } else {
+ /* Custom bandwidth limits */
+ ui.cmboRate->setCurrentIndex(CustomBwLimits);
+ }
+ /* Fill in the custom bandwidth limit boxes */
+ ui.lineAvgRateLimit->setText(QString::number(avgRate/1024));
+ ui.lineMaxRateLimit->setText(QString::number(maxRate/1024));
+}
+
+/** Saves the server's bandwidth average and burst limits. */
+void
+ServerPage::saveBandwidthLimits()
+{
+ quint32 avgRate, maxRate;
+
+ switch (ui.cmboRate->currentIndex()) {
+ case CableDsl256: /* Cable/DSL 256 Kbps */
+ avgRate = CABLE256_AVG_RATE;
+ maxRate = CABLE256_MAX_RATE;
+ break;
+ case CableDsl512: /* Cable/DSL 512 Kbps */
+ avgRate = CABLE512_AVG_RATE;
+ maxRate = CABLE512_MAX_RATE;
+ break;
+ case CableDsl768: /* Cable/DSL 768 Kbps */
+ avgRate = CABLE768_AVG_RATE;
+ maxRate = CABLE768_MAX_RATE;
+ break;
+ case T1CableDsl1500: /* T1/Cable/DSL 1.5 Mbps */
+ avgRate = T1_AVG_RATE;
+ maxRate = T1_MAX_RATE;
+ break;
+ case GreaterThan1500: /* > 1.5 Mbps */
+ avgRate = HIGHBW_AVG_RATE;
+ maxRate = HIGHBW_MAX_RATE;
+ break;
+ default: /* Custom bandwidth limits */
+ avgRate = (quint32)(ui.lineAvgRateLimit->text().toUInt()*1024);
+ maxRate = (quint32)(ui.lineMaxRateLimit->text().toUInt()*1024);
+ break;
+ }
+ _settings->setBandwidthAvgRate(avgRate);
+ _settings->setBandwidthBurstRate(maxRate);
+}
+
+/** */
+void
+ServerPage::loadExitPolicies()
+{
+ ExitPolicy exitPolicy = _settings->getExitPolicy();
+
+ if (exitPolicy.contains(Policy(Policy::RejectAll))) {
+ /* If the policy ends with reject *:*, check if the policy explicitly
+ * accepts these ports */
+ ui.chkWebsites->setChecked(exitPolicy.acceptsPorts(PORTS_HTTP));
+ ui.chkSecWebsites->setChecked(exitPolicy.acceptsPorts(PORTS_HTTPS));
+ ui.chkMail->setChecked(exitPolicy.acceptsPorts(PORTS_MAIL));
+ ui.chkIRC->setChecked(exitPolicy.acceptsPorts(PORTS_IRC));
+ ui.chkIM->setChecked(exitPolicy.acceptsPorts(PORTS_IM));
+ ui.chkMisc->setChecked(false);
+ } else {
+ /* If the exit policy ends with accept *:*, check if the policy explicitly
+ * rejects these ports */
+ ui.chkWebsites->setChecked(!exitPolicy.rejectsPorts(PORTS_HTTP));
+ ui.chkSecWebsites->setChecked(!exitPolicy.rejectsPorts(PORTS_HTTPS));
+ ui.chkMail->setChecked(!exitPolicy.rejectsPorts(PORTS_MAIL));
+ ui.chkIRC->setChecked(!exitPolicy.rejectsPorts(PORTS_IRC));
+ ui.chkIM->setChecked(!exitPolicy.rejectsPorts(PORTS_IM));
+ ui.chkMisc->setChecked(true);
+ }
+}
+
+/** */
+void
+ServerPage::saveExitPolicies()
+{
+ ExitPolicy exitPolicy;
+ bool rejectUnchecked = ui.chkMisc->isChecked();
+
+ /* If misc is checked, then reject unchecked items and leave the default exit
+ * policy alone. Else, accept only checked items and end with reject *:*,
+ * replacing the default exit policy. */
+ if (ui.chkWebsites->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_HTTP);
+ } else if (!ui.chkWebsites->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_HTTP);
+ }
+ if (ui.chkSecWebsites->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_HTTPS);
+ } else if (!ui.chkSecWebsites->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_HTTPS);
+ }
+ if (ui.chkMail->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_MAIL);
+ } else if (!ui.chkMail->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_MAIL);
+ }
+ if (ui.chkIRC->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_IRC);
+ } else if (!ui.chkIRC->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_IRC);
+ }
+ if (ui.chkIM->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_IM);
+ } else if (!ui.chkIM->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_IM);
+ }
+ if (!ui.chkMisc->isChecked()) {
+ exitPolicy.addPolicy(Policy(Policy::RejectAll));
+ }
+ _settings->setExitPolicy(exitPolicy);
+}
+
+/** Called when the user selects a new value from the rate combo box. */
+void
+ServerPage::rateChanged(int index)
+{
+ /* If the "Custom" option is selected, show the custom bandwidth
+ * limits form. */
+ ui.frmCustomRate->setVisible(index == CustomBwLimits);
+}
+
+/** Called when the user edits the long-term average or maximum bandwidth limit.
+ * This ensures that the average bandwidth rate is greater than MIN_RATE
+ * (20KB/s) and that the max rate is greater than the average rate. */
+void
+ServerPage::customRateChanged()
+{
+ /* Make sure the average rate isn't too low or too high */
+ quint32 avgRate = (quint32)ui.lineAvgRateLimit->text().toUInt();
+ if (avgRate < MIN_BANDWIDTH_RATE) {
+ ui.lineAvgRateLimit->setText(QString::number(MIN_BANDWIDTH_RATE));
+ }
+ if (avgRate > MAX_BANDWIDTH_RATE) {
+ ui.lineAvgRateLimit->setText(QString::number(MAX_BANDWIDTH_RATE));
+ }
+ /* Ensure the max burst rate is greater than the average rate but less than
+ * the maximum allowed rate. */
+ quint32 burstRate = (quint32)ui.lineMaxRateLimit->text().toUInt();
+ if (avgRate > burstRate) {
+ ui.lineMaxRateLimit->setText(QString::number(avgRate));
+ }
+ if (burstRate > MAX_BANDWIDTH_RATE) {
+ ui.lineMaxRateLimit->setText(QString::number(MAX_BANDWIDTH_RATE));
+ }
+}
+
Property changes on: trunk/src/gui/config/serverpage.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/config/serverpage.h
===================================================================
--- trunk/src/gui/config/serverpage.h 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/config/serverpage.h 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,110 +1,110 @@
-/****************************************************************
- * 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 serverpage.h
- * \version $Id$
- * \brief Tor server configuration options
- */
-
-#ifndef _SERVERPAGE_H
-#define _SERVERPAGE_H
-
-#include <QMessageBox>
-#include <QTimer>
-#include <control/torcontrol.h>
-#include <config/serversettings.h>
-#include <config/exitpolicy.h>
-#include <gui/help/browser/helpbrowser.h>
-
-#include "configpage.h"
-#include "ui_serverpage.h"
-
-
-class ServerPage : public ConfigPage
-{
- Q_OBJECT
-
-public:
- /** Default Constructor */
- ServerPage(QWidget *parent = 0);
- /** Default Destructor */
- ~ServerPage();
- /** Saves the changes on this page */
- bool save(QString &errmsg);
- /** Loads the settings for this page */
- void load();
-
-private slots:
- /** Called when the user clicks "Get Address" to guess our local IP */
- void getServerAddress();
- /** Called when the user clicks the bandwidth help button */
- void bandwidthHelp();
- /** Called when the user clicks the exit policy help button */
- void exitPolicyHelp();
- /** Called when the user's public IP address needs to be updated. */
- void updateServerIP();
- /** Called when the user selects a new value from the rate combo box */
- void rateChanged(int rate);
- /** Called when the user edits the max or average bandwidth limits. */
- void customRateChanged();
-
-private:
- /** Index values of rate values in the bandwidth limits dropdown box. */
- enum BwRateIndex {
- CableDsl256 = 0, /**< Cable/DSL 256 Kbps */
- CableDsl512, /**< Cable/DSL 512 Kbps */
- CableDsl768, /**< Cable/DSL 768 Kbps */
- T1CableDsl1500, /**< T1/Cable/DSL 1.5 Mbps */
- GreaterThan1500, /**< > 1.5 Mbps */
- CustomBwLimits /**< Custom bandwidth limits */
- };
-
- /** Attempts to find the server's public IP address */
- void getServerPublicIP();
- /** Returns the index of the selected item in lstExitPolicies */
- int selectedIndex();
- /** Enables or disables the automatic update timer. */
- void setAutoUpdateTimer(bool enabled);
-
- /** Saves the server's bandwidth average and burst limits. */
- void saveBandwidthLimits();
- /** Loads the server's bandwidth average and burst limits. */
- void loadBandwidthLimits();
- /** Saves the server's exit policies. */
- void saveExitPolicies();
- /** Loads the server's exit policies. */
- void loadExitPolicies();
-
- /** A TorControl object used to talk to Tor */
- TorControl* _torControl;
- /** A ServerSettings object used to get and set information about how a
- * local Tor server is configured. */
- ServerSettings* _settings;
- /** A timer that tells us when it's time to check if our server IP changed.*/
- QTimer* _autoUpdateTimer;
-
- /** Qt Designer generated object */
- Ui::ServerPage ui;
-};
-
-#endif
-
+/****************************************************************
+ * 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 serverpage.h
+ * \version $Id$
+ * \brief Tor server configuration options
+ */
+
+#ifndef _SERVERPAGE_H
+#define _SERVERPAGE_H
+
+#include <QMessageBox>
+#include <QTimer>
+#include <control/torcontrol.h>
+#include <config/serversettings.h>
+#include <config/exitpolicy.h>
+#include <gui/help/browser/helpbrowser.h>
+
+#include "configpage.h"
+#include "ui_serverpage.h"
+
+
+class ServerPage : public ConfigPage
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ ServerPage(QWidget *parent = 0);
+ /** Default Destructor */
+ ~ServerPage();
+ /** Saves the changes on this page */
+ bool save(QString &errmsg);
+ /** Loads the settings for this page */
+ void load();
+
+private slots:
+ /** Called when the user clicks "Get Address" to guess our local IP */
+ void getServerAddress();
+ /** Called when the user clicks the bandwidth help button */
+ void bandwidthHelp();
+ /** Called when the user clicks the exit policy help button */
+ void exitPolicyHelp();
+ /** Called when the user's public IP address needs to be updated. */
+ void updateServerIP();
+ /** Called when the user selects a new value from the rate combo box */
+ void rateChanged(int rate);
+ /** Called when the user edits the max or average bandwidth limits. */
+ void customRateChanged();
+
+private:
+ /** Index values of rate values in the bandwidth limits dropdown box. */
+ enum BwRateIndex {
+ CableDsl256 = 0, /**< Cable/DSL 256 Kbps */
+ CableDsl512, /**< Cable/DSL 512 Kbps */
+ CableDsl768, /**< Cable/DSL 768 Kbps */
+ T1CableDsl1500, /**< T1/Cable/DSL 1.5 Mbps */
+ GreaterThan1500, /**< > 1.5 Mbps */
+ CustomBwLimits /**< Custom bandwidth limits */
+ };
+
+ /** Attempts to find the server's public IP address */
+ void getServerPublicIP();
+ /** Returns the index of the selected item in lstExitPolicies */
+ int selectedIndex();
+ /** Enables or disables the automatic update timer. */
+ void setAutoUpdateTimer(bool enabled);
+
+ /** Saves the server's bandwidth average and burst limits. */
+ void saveBandwidthLimits();
+ /** Loads the server's bandwidth average and burst limits. */
+ void loadBandwidthLimits();
+ /** Saves the server's exit policies. */
+ void saveExitPolicies();
+ /** Loads the server's exit policies. */
+ void loadExitPolicies();
+
+ /** A TorControl object used to talk to Tor */
+ TorControl* _torControl;
+ /** A ServerSettings object used to get and set information about how a
+ * local Tor server is configured. */
+ ServerSettings* _settings;
+ /** A timer that tells us when it's time to check if our server IP changed.*/
+ QTimer* _autoUpdateTimer;
+
+ /** Qt Designer generated object */
+ Ui::ServerPage ui;
+};
+
+#endif
+
Property changes on: trunk/src/gui/config/serverpage.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/config/serverpage.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/gui.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/help/browser/browser.pri
===================================================================
--- trunk/src/gui/help/browser/browser.pri 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/help/browser/browser.pri 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,31 +1,31 @@
-#################################################################
-# $Id$
-#
-# 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.
-#################################################################
-
-FORMS += $$PWD/helpbrowser.ui
-
-HEADERS += $$PWD/helpbrowser.h \
- $$PWD/helptextbrowser.h
-
-SOURCES += $$PWD/helpbrowser.cpp \
- $$PWD/helptextbrowser.cpp
-
+#################################################################
+# $Id$
+#
+# 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.
+#################################################################
+
+FORMS += $$PWD/helpbrowser.ui
+
+HEADERS += $$PWD/helpbrowser.h \
+ $$PWD/helptextbrowser.h
+
+SOURCES += $$PWD/helpbrowser.cpp \
+ $$PWD/helptextbrowser.cpp
+
Property changes on: trunk/src/gui/help/browser/browser.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/browser/helpbrowser.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/browser/helpbrowser.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/browser/helpbrowser.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/browser/helptextbrowser.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/browser/helptextbrowser.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/bg/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/bg/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/bg/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/bg/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/bg/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/bg/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/bg/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/bg/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/bg/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/content.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/content.qrc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/contents.dtd
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/de/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/de/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/de/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/de/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/de/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/de/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/de/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/de/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/de/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/en/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/en/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/en/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/en/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/en/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/en/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/en/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/en/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/en/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/es/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/es/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/es/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/es/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/es/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/es/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/es/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/es/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/es/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fa/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fa/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fa/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fa/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fa/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fa/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fa/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fa/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fa/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fi/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fi/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fi/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fi/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fi/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fi/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fi/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fi/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fr/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fr/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fr/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fr/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fr/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fr/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fr/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fr/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/fr/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/hu/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/hu/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/hu/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/hu/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/hu/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/hu/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/hu/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/hu/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/hu/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/it/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/it/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/it/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/it/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/it/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/it/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/it/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/it/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/it/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nb/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nb/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nb/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nb/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nb/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nb/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nb/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nb/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nb/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nl/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nl/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nl/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nl/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nl/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nl/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nl/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nl/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/nl/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pl/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pl/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pl/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pl/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pl/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pl/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pl/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pl/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pl/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pt/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pt/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pt/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pt/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pt/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pt/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pt/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pt/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/pt/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/ru/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/ru/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/ru/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/ru/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/ru/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/ru/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/ru/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/ru/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/ru/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/zh-cn/config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/zh-cn/contents.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/zh-cn/index.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/zh-cn/links.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/zh-cn/log.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/zh-cn/netview.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/zh-cn/running.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/zh-cn/server.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/content/zh-cn/troubleshooting.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/help/help.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/log/log.pri
===================================================================
--- trunk/src/gui/log/log.pri 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/log/log.pri 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,37 +1,37 @@
-#################################################################
-# $Id$
-#
-# 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.
-#################################################################
-
-FORMS += $$PWD/messagelog.ui
-
-HEADERS += $$PWD/messagelog.h \
- $$PWD/logheaderview.h \
- $$PWD/logtreewidget.h \
- $$PWD/logtreeitem.h \
- $$PWD/logfile.h
-
-SOURCES += $$PWD/messagelog.cpp \
- $$PWD/logheaderview.cpp \
- $$PWD/logtreewidget.cpp \
- $$PWD/logtreeitem.cpp \
- $$PWD/logfile.cpp
-
+#################################################################
+# $Id$
+#
+# 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.
+#################################################################
+
+FORMS += $$PWD/messagelog.ui
+
+HEADERS += $$PWD/messagelog.h \
+ $$PWD/logheaderview.h \
+ $$PWD/logtreewidget.h \
+ $$PWD/logtreeitem.h \
+ $$PWD/logfile.h
+
+SOURCES += $$PWD/messagelog.cpp \
+ $$PWD/logheaderview.cpp \
+ $$PWD/logtreewidget.cpp \
+ $$PWD/logtreeitem.cpp \
+ $$PWD/logfile.cpp
+
Property changes on: trunk/src/gui/log/log.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/log/logfile.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/log/logfile.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/log/logheaderview.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/log/logheaderview.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/log/logtreeitem.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/log/logtreeitem.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/log/logtreewidget.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/log/logtreewidget.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/log/messagelog.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/log/messagelog.h
===================================================================
--- trunk/src/gui/log/messagelog.h 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/log/messagelog.h 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,113 +1,113 @@
-/****************************************************************
- * 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 messagelog.h
- * \version $Id$
- * \brief Displays log messages and message log settings
- */
-
-#ifndef _MESSAGELOG_H
-#define _MESSAGELOG_H
-
-#include <QMainWindow>
-#include <QStringList>
-#include <QResizeEvent>
-#include <control/torcontrol.h>
-#include <config/vidaliasettings.h>
-#include <gui/common/vidaliawindow.h>
-
-#include "logfile.h"
-#include "logtreeitem.h"
-#include "ui_messagelog.h"
-
-
-class MessageLog : public VidaliaWindow
-{
- Q_OBJECT
-
-public:
- /** Default constructor **/
- MessageLog(QWidget *parent = 0, Qt::WFlags flags = 0);
- /** Default destructor **/
- ~MessageLog();
-
-protected:
- /** Called to deliver custom event types */
- void customEvent(QEvent *event);
-
-private slots:
- /** Called when the user triggers the save all action **/
- void saveAll();
- /** Called when the user triggers save selected action **/
- void saveSelected();
- /** Called when the user triggers the copy action **/
- void copy();
- /** Called when the user triggers the find action. This will search
- * through all currently displayed log entries for text specified by the
- * user, highlighting the entries that contain a match. */
- void find();
- /** Called when user saves settings **/
- void saveSettings();
- /** Called when user cancels changed settings **/
- void cancelChanges();
- /** Called when the user clicks "Browse" to select a new log file. */
- void browse();
- /** Called when the user clicks "Help" to see help info about the log. */
- void help();
-
-protected:
- /** Responds to the user resizing the message log. */
- void resizeEvent(QResizeEvent *event);
-
-private:
- /** Create and bind actions to events **/
- void createActions();
- /** Set Tool Tips for various widgets **/
- void setToolTips();
- /** Loads the saved Message Log settings **/
- void loadSettings();
- /** Registers the current message filter with Tor */
- void registerLogEvents();
- /** Saves the given list of items to a file */
- void save(QStringList messages);
- /** Adds the passed message to the message log as the specified type **/
- void log(LogEvent::Severity, QString msg);
- /** Rotates the log file based on the filename and the current logging status. */
- bool rotateLogFile(QString filename);
-
- /** A pointer to a TorControl object, used to register for log events */
- TorControl* _torControl;
- /** A VidaliaSettings object that handles getting/saving settings **/
- VidaliaSettings* _settings;
- /** Stores the current message filter */
- uint _filter;
- /** Set to true if we will log all messages to a file. */
- bool _enableLogging;
- /* The log file used to store log messages. */
- LogFile _logFile;
-
- /** Qt Designer generatated QObject **/
- Ui::MessageLog ui;
-};
-
-#endif
-
+/****************************************************************
+ * 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 messagelog.h
+ * \version $Id$
+ * \brief Displays log messages and message log settings
+ */
+
+#ifndef _MESSAGELOG_H
+#define _MESSAGELOG_H
+
+#include <QMainWindow>
+#include <QStringList>
+#include <QResizeEvent>
+#include <control/torcontrol.h>
+#include <config/vidaliasettings.h>
+#include <gui/common/vidaliawindow.h>
+
+#include "logfile.h"
+#include "logtreeitem.h"
+#include "ui_messagelog.h"
+
+
+class MessageLog : public VidaliaWindow
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor **/
+ MessageLog(QWidget *parent = 0, Qt::WFlags flags = 0);
+ /** Default destructor **/
+ ~MessageLog();
+
+protected:
+ /** Called to deliver custom event types */
+ void customEvent(QEvent *event);
+
+private slots:
+ /** Called when the user triggers the save all action **/
+ void saveAll();
+ /** Called when the user triggers save selected action **/
+ void saveSelected();
+ /** Called when the user triggers the copy action **/
+ void copy();
+ /** Called when the user triggers the find action. This will search
+ * through all currently displayed log entries for text specified by the
+ * user, highlighting the entries that contain a match. */
+ void find();
+ /** Called when user saves settings **/
+ void saveSettings();
+ /** Called when user cancels changed settings **/
+ void cancelChanges();
+ /** Called when the user clicks "Browse" to select a new log file. */
+ void browse();
+ /** Called when the user clicks "Help" to see help info about the log. */
+ void help();
+
+protected:
+ /** Responds to the user resizing the message log. */
+ void resizeEvent(QResizeEvent *event);
+
+private:
+ /** Create and bind actions to events **/
+ void createActions();
+ /** Set Tool Tips for various widgets **/
+ void setToolTips();
+ /** Loads the saved Message Log settings **/
+ void loadSettings();
+ /** Registers the current message filter with Tor */
+ void registerLogEvents();
+ /** Saves the given list of items to a file */
+ void save(QStringList messages);
+ /** Adds the passed message to the message log as the specified type **/
+ void log(LogEvent::Severity, QString msg);
+ /** Rotates the log file based on the filename and the current logging status. */
+ bool rotateLogFile(QString filename);
+
+ /** A pointer to a TorControl object, used to register for log events */
+ TorControl* _torControl;
+ /** A VidaliaSettings object that handles getting/saving settings **/
+ VidaliaSettings* _settings;
+ /** Stores the current message filter */
+ uint _filter;
+ /** Set to true if we will log all messages to a file. */
+ bool _enableLogging;
+ /* The log file used to store log messages. */
+ LogFile _logFile;
+
+ /** Qt Designer generatated QObject **/
+ Ui::MessageLog ui;
+};
+
+#endif
+
Property changes on: trunk/src/gui/log/messagelog.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/log/messagelog.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/mainwindow.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/mainwindow.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/circuititem.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/circuititem.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/circuitlistwidget.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/circuitlistwidget.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/netviewer.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/netviewer.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/netviewer.ui
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/network/network.pri
===================================================================
--- trunk/src/gui/network/network.pri 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/network/network.pri 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,45 +1,45 @@
-#################################################################
-# $Id: network.pri 422 2006-03-13 05:13:00 hipplej$
-#
-# 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.
-#################################################################
-
-FORMS += $$PWD/netviewer.ui
-
-HEADERS += $$PWD/netviewer.h \
- $$PWD/zimageview.h \
- $$PWD/tormapwidget.h \
- $$PWD/routerlistwidget.h \
- $$PWD/routerlistitem.h \
- $$PWD/routerdescriptorview.h \
- $$PWD/circuitlistwidget.h \
- $$PWD/circuititem.h \
- $$PWD/streamitem.h
-
-SOURCES += $$PWD/netviewer.cpp \
- $$PWD/zimageview.cpp \
- $$PWD/tormapwidget.cpp \
- $$PWD/routerlistwidget.cpp \
- $$PWD/routerlistitem.cpp \
- $$PWD/routerdescriptorview.cpp \
- $$PWD/circuitlistwidget.cpp \
- $$PWD/circuititem.cpp \
- $$PWD/streamitem.cpp
-
+#################################################################
+# $Id: network.pri 422 2006-03-13 05:13:00 hipplej$
+#
+# 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.
+#################################################################
+
+FORMS += $$PWD/netviewer.ui
+
+HEADERS += $$PWD/netviewer.h \
+ $$PWD/zimageview.h \
+ $$PWD/tormapwidget.h \
+ $$PWD/routerlistwidget.h \
+ $$PWD/routerlistitem.h \
+ $$PWD/routerdescriptorview.h \
+ $$PWD/circuitlistwidget.h \
+ $$PWD/circuititem.h \
+ $$PWD/streamitem.h
+
+SOURCES += $$PWD/netviewer.cpp \
+ $$PWD/zimageview.cpp \
+ $$PWD/tormapwidget.cpp \
+ $$PWD/routerlistwidget.cpp \
+ $$PWD/routerlistitem.cpp \
+ $$PWD/routerdescriptorview.cpp \
+ $$PWD/circuitlistwidget.cpp \
+ $$PWD/circuititem.cpp \
+ $$PWD/streamitem.cpp
+
Property changes on: trunk/src/gui/network/network.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/routerdescriptorview.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/routerdescriptorview.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/routerlistitem.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/routerlistitem.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/routerlistwidget.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/routerlistwidget.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/streamitem.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/streamitem.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/tormapwidget.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/tormapwidget.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/network/zimageview.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/network/zimageview.h
===================================================================
--- trunk/src/gui/network/zimageview.h 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/network/zimageview.h 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,102 +1,102 @@
-/****************************************************************
- * 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 zimageview.h
- * \version $Id$
- * \brief Displays an image and allows zooming and panning
- */
-
-#ifndef ZIMAGEVIEW_H
-#define ZIMAGEVIEW_H
-
-#include <QImage>
-#include <QFrame>
-#include <QPixmap>
-#include <QWidget>
-
-
-class ZImageView : public QWidget
-{
- Q_OBJECT
-
-public:
- /** Default constructor. */
- ZImageView(QWidget *parent = 0);
- /** Sets the displayed image. */
- void setImage(QImage& pixmap);
-
-public slots:
- /** Resets the center zoom point back to the center of the viewport. */
- void resetZoomPoint();
- /** Sets the current zoom level to the given percent. */
- void zoom(float pct);
- /** Sets the current zoom level to the given percent and scrolls the window
- * to place the specified point in the middle. */
- void zoom(QPoint zoomAt, float pct);
- /** Zooms into the displayed image by 5% */
- void zoomIn();
- /** Zooms away from the displayed image by 5% */
- void zoomOut();
-
-protected:
- /** Virtual method to let subclasses paint on the image before it's scaled. */
- virtual void paintImage(QPainter *painter) { Q_UNUSED(painter); }
- /** Updates the viewport and repaints the displayed image. */
- virtual void paintEvent(QPaintEvent*);
- /** Handles the user pressing a mouse button. */
- virtual void mousePressEvent(QMouseEvent* e);
- /** Handles the user releasing a mouse button. */
- virtual void mouseReleaseEvent(QMouseEvent* e);
- /** Handles the user moving the mouse. */
- virtual void mouseMoveEvent(QMouseEvent* e);
- /** Handles events where the widget is resized. */
- virtual void resizeEvent(QResizeEvent* e);
-
- /** Update the viewport. This will set _view to a region that,
- * when copied from the image and scaled to the screen size, will
- * show what is expected. The _view may be larger in one or more
- * directions than the image, and you must deal with the
- * non-overlapping regions.
- *
- * Returns the _zoom==0.0 viewport rect (the max) and the
- * _zoom==1.0 viewport rect (the min). */
- QPair<QRect, QRect> updateViewport(int screendx=0, int screendy=0);
- /** Redraws the scaled image in the viewport. */
- void drawScaledImage();
-
-private:
- float _zoom; /**< The current zoom level. */
- QImage _image; /**< The displayed image. */
- float _padding; /**< Amount of padding to use on the side of the image. */
- float _maxZoomFactor; /**< Maximum amount to zoom into the image. */
-
- bool _mouseDown; /**< Set to true when a mouse button is depressed. */
- int _mouseX; /**< The x-coordinate of the current mouse position. */
- int _mouseY; /**< The y-coordinate of the current mouse position. */
-
- QRect _view; /**< The displayed viewport. */
- float _desiredX; /**< The X value we desire (???). */
- float _desiredY; /**< The Y value we desire (???). */
-};
-
-#endif
-
+/****************************************************************
+ * 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 zimageview.h
+ * \version $Id$
+ * \brief Displays an image and allows zooming and panning
+ */
+
+#ifndef ZIMAGEVIEW_H
+#define ZIMAGEVIEW_H
+
+#include <QImage>
+#include <QFrame>
+#include <QPixmap>
+#include <QWidget>
+
+
+class ZImageView : public QWidget
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ ZImageView(QWidget *parent = 0);
+ /** Sets the displayed image. */
+ void setImage(QImage& pixmap);
+
+public slots:
+ /** Resets the center zoom point back to the center of the viewport. */
+ void resetZoomPoint();
+ /** Sets the current zoom level to the given percent. */
+ void zoom(float pct);
+ /** Sets the current zoom level to the given percent and scrolls the window
+ * to place the specified point in the middle. */
+ void zoom(QPoint zoomAt, float pct);
+ /** Zooms into the displayed image by 5% */
+ void zoomIn();
+ /** Zooms away from the displayed image by 5% */
+ void zoomOut();
+
+protected:
+ /** Virtual method to let subclasses paint on the image before it's scaled. */
+ virtual void paintImage(QPainter *painter) { Q_UNUSED(painter); }
+ /** Updates the viewport and repaints the displayed image. */
+ virtual void paintEvent(QPaintEvent*);
+ /** Handles the user pressing a mouse button. */
+ virtual void mousePressEvent(QMouseEvent* e);
+ /** Handles the user releasing a mouse button. */
+ virtual void mouseReleaseEvent(QMouseEvent* e);
+ /** Handles the user moving the mouse. */
+ virtual void mouseMoveEvent(QMouseEvent* e);
+ /** Handles events where the widget is resized. */
+ virtual void resizeEvent(QResizeEvent* e);
+
+ /** Update the viewport. This will set _view to a region that,
+ * when copied from the image and scaled to the screen size, will
+ * show what is expected. The _view may be larger in one or more
+ * directions than the image, and you must deal with the
+ * non-overlapping regions.
+ *
+ * Returns the _zoom==0.0 viewport rect (the max) and the
+ * _zoom==1.0 viewport rect (the min). */
+ QPair<QRect, QRect> updateViewport(int screendx=0, int screendy=0);
+ /** Redraws the scaled image in the viewport. */
+ void drawScaledImage();
+
+private:
+ float _zoom; /**< The current zoom level. */
+ QImage _image; /**< The displayed image. */
+ float _padding; /**< Amount of padding to use on the side of the image. */
+ float _maxZoomFactor; /**< Maximum amount to zoom into the image. */
+
+ bool _mouseDown; /**< Set to true when a mouse button is depressed. */
+ int _mouseX; /**< The x-coordinate of the current mouse position. */
+ int _mouseY; /**< The y-coordinate of the current mouse position. */
+
+ QRect _view; /**< The displayed viewport. */
+ float _desiredX; /**< The X value we desire (???). */
+ float _desiredY; /**< The Y value we desire (???). */
+};
+
+#endif
+
Property changes on: trunk/src/gui/network/zimageview.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/res/qt_license.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/res/short_license.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/res/tor_license.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/res/vidalia_common.qrc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/res/vidalia_license.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/res/vidalia_win.rc
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/gui/res/vidalia_win.rc.h
===================================================================
--- trunk/src/gui/res/vidalia_win.rc.h 2006-12-26 04:59:06 UTC (rev 1562)
+++ trunk/src/gui/res/vidalia_win.rc.h 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,32 +1,32 @@
-/****************************************************************
- * 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 vidalia_win.rc.h
- * \version $Id: mainwindow.cpp 644 2006-04-11 08:49:24Z edmanm $
- * Defines resource identifiers for icons used on Win32.
- */
-
-#define IDI_APP_ICON 101
-#define IDI_TOR_OFF 102
-#define IDI_TOR_ON 103
-#define IDI_TOR_STARTING 104
-#define IDI_TOR_STOPPING 105
+/****************************************************************
+ * 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 vidalia_win.rc.h
+ * \version $Id: mainwindow.cpp 644 2006-04-11 08:49:24Z edmanm $
+ * Defines resource identifiers for icons used on Win32.
+ */
+
+#define IDI_APP_ICON 101
+#define IDI_TOR_OFF 102
+#define IDI_TOR_ON 103
+#define IDI_TOR_STARTING 104
+#define IDI_TOR_STOPPING 105
Property changes on: trunk/src/gui/res/vidalia_win.rc.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/res/vidalia_x11.qrc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/tray/tray.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/tray/trayicon.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/tray/trayicon.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/tray/trayicon_mac.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/tray/trayicon_mac.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/tray/trayicon_win.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/tray/trayicon_x11.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/gui/tray/trayicon_x11.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/lang/lang.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/lang/lang.qrc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/lang/languagesupport.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/lang/languagesupport.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/main.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/src.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/file.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/file.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoip.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoip.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoip.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoipcache.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoipcache.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoipcacheitem.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoipcacheitem.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoiprequest.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoiprequest.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoipresolver.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoipresolver.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoipresponse.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/geoip/geoipresponse.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/html.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/html.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/http.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/http.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/net.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/net.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/process.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/process.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/string.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/string.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/torsocket.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/torsocket.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/util.pri
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/win32.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/util/win32.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/vidalia.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/src/vidalia.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: www/download.php
===================================================================
--- www/download.php 2006-12-26 04:59:06 UTC (rev 1562)
+++ www/download.php 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,240 +1,240 @@
-<?php
-
-$pagename = "Vidalia - Download";
-include("header.inc.php");
-
-?>
-
-<p>
-<br>
-</p>
-
-<div class="content">
-<p>
-Grab the latest package for your platform below. Or, in the more likely case
-that we don't have a package for your platform, you can grab the source
-tarball.
-</p>
-
-<p>
-<i>Note:</i> Vidalia requires Tor 0.1.1.15 or later. If you're installing
-the Windows or Mac OS X bundle, then the latest version of Tor is already included.
-</p>
-
-<h3>Latest Vidalia Release (05-November-2006): <b>0.0.9</b>
-</h3>
-<table border="1">
-<tr>
- <td colspan="3">
- <b>Stable Bundles</b><br/>
- Includes
- <a href="http://tor.eff.org";>Tor</a>
- <a href="dist/other/tor-0.1.1.26.tar.gz">0.1.1.26</a> and
- <a href="http://www.privoxy.org";>Privoxy</a>
- <a href="dist/other/privoxy-3.0.6-stable-src.tar.gz">3.0.6</a>
- </td>
-</tr>
-<tr>
- <td>Windows</td>
- <td>
- <a href="dist/vidalia-bundle-0.1.1.26-0.0.9.exe">Download</a>
- (<a href="dist/vidalia-bundle-0.1.1.26-0.0.9.exe.asc">sig</a>)
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallWindows";>
- Windows Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td>Mac OS X (Tiger)</td>
- <td>
- <a href="dist/vidalia-bundle-0.1.1.26-0.0.9-tiger.dmg">Download</a>
- (<a href="dist/vidalia-bundle-0.1.1.26-0.0.9-tiger.dmg.asc">sig</a>)
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
- OS X Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td>Mac OS X (Panther)</td>
- <td>
- <a href="dist/vidalia-bundle-0.1.1.26-0.0.9-panther.dmg">Download</a>
- (<a href="dist/vidalia-bundle-0.1.1.26-0.0.9-panther.dmg.asc">sig</a>)
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
- OS X Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td colspan="3">
- <b>Development Bundles</b><br/>
- Includes
- <a href="http://tor.eff.org";>Tor</a>
- <a href="dist/other/tor-0.1.2.4-alpha.tar.gz">0.1.2.4-alpha</a> and
- <a href="http://www.privoxy.org";>Privoxy</a>
- <a href="dist/other/privoxy-3.0.6-stable-src.tar.gz">3.0.6</a>
- </td>
-</tr>
-<tr>
- <td>Windows</td>
- <td>
- <a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9.exe">Download</a>
- (<a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9.exe.asc">sig</a>)
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallWindows";>
- Windows Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td>Mac OS X (Tiger)</td>
- <td>
- <a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9-tiger.dmg">Download</a>
- (<a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9-tiger.dmg.asc">sig</a>)
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
- OS X Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td>Mac OS X (Panther)</td>
- <td>
- <a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9-panther.dmg">Download</a>
- (<a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9-panther.dmg.asc">sig</a>)
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
- OS X Installation Instructions
- </a>
- </td>
-</tr>
-</table><br/>
-<table border="1">
-<tr>
- <td colspan="3">
- <b>Vidalia-only Packages</b>
- </td>
-</tr>
-<tr>
- <td>Windows</td>
- <td>
- <a href="dist/vidalia-0.0.9.exe">Download</a>
- (<a href="dist/vidalia-0.0.9.exe.asc">sig</a>)
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallWindows";>
- Windows Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td>Mac OS X (Tiger)</td>
- <td>
- <a href="dist/vidalia-0.0.9-tiger.dmg">Download</a>
- (<a href="dist/vidalia-0.0.9-tiger.dmg.asc">sig</a>)
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
- OS X Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td>Mac OS X (Panther)</td>
- <td>
- <a href="dist/vidalia-0.0.9-panther.dmg">Download</a>
- (<a href="dist/vidalia-0.0.9-panther.dmg.asc">sig</a>)
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
- OS X Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td>Red Hat (RPM)</td>
- <td>
- <a href="dist/vidalia-0.0.9-1.i386.rpm">Download</a>
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallLinux#RedHat";>
- Red Hat Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td>Red Hat (SRPM)</td>
- <td>
- <a href="dist/vidalia-0.0.9-1.src.rpm">Download</a>
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallLinux#RedHat";>
- Red Hat Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td>Gentoo</td>
- <td>emerge</td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallLinux#Gentoo";>
- Gentoo Installation Instructions
- </a>
- </td>
-</tr>
-<tr>
- <td>Source</td>
- <td>
- <a href="dist/vidalia-0.0.9.tar.gz">Download</a>
- (<a href="dist/vidalia-0.0.9.tar.gz.asc">sig</a>)
- </td>
- <td>
- <a href="http://trac.vidalia-project.net/wiki/InstallSource";>
- Installing From Source
- </a>
- </td>
-</tr>
-</table>
-
-<p>
-Vidalia is distributed as
-<a href="http://www.fsf.org/";>Free Software</a>
-under the
-<a href="http://trac.vidalia-project.net/wiki/License";>GPL</a>.
-</p>
-
-<p>
-See our wiki page on <a href="http://trac.vidalia-project.net/wiki/VerifyingSignatures";>
-verifying signatures</a> for information on the keys used to sign Vidalia packages.
-</p>
-
-<h3>Snapshot</h3>
-<p>
-Find out how to grab a snapshot of the repository trunk
-<a
-href="http://trac.vidalia-project.net/wiki/GettingTheCode";>
-here</a>
-or
-<a href="http://trac.vidalia-project.net/browser/trunk";>browse</a>
-the repository yourself.
-</p>
-
-<h3>Archive</h3>
-<p>
-You can find old releases of Vidalia <a href="dist/archive/">here</a>.
-</p>
-</div>
-
-<?php
-
-include("footer.inc.php");
-
-?>
+<?php
+
+$pagename = "Vidalia - Download";
+include("header.inc.php");
+
+?>
+
+<p>
+<br>
+</p>
+
+<div class="content">
+<p>
+Grab the latest package for your platform below. Or, in the more likely case
+that we don't have a package for your platform, you can grab the source
+tarball.
+</p>
+
+<p>
+<i>Note:</i> Vidalia requires Tor 0.1.1.15 or later. If you're installing
+the Windows or Mac OS X bundle, then the latest version of Tor is already included.
+</p>
+
+<h3>Latest Vidalia Release (05-November-2006): <b>0.0.9</b>
+</h3>
+<table border="1">
+<tr>
+ <td colspan="3">
+ <b>Stable Bundles</b><br/>
+ Includes
+ <a href="http://tor.eff.org";>Tor</a>
+ <a href="dist/other/tor-0.1.1.26.tar.gz">0.1.1.26</a> and
+ <a href="http://www.privoxy.org";>Privoxy</a>
+ <a href="dist/other/privoxy-3.0.6-stable-src.tar.gz">3.0.6</a>
+ </td>
+</tr>
+<tr>
+ <td>Windows</td>
+ <td>
+ <a href="dist/vidalia-bundle-0.1.1.26-0.0.9.exe">Download</a>
+ (<a href="dist/vidalia-bundle-0.1.1.26-0.0.9.exe.asc">sig</a>)
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallWindows";>
+ Windows Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td>Mac OS X (Tiger)</td>
+ <td>
+ <a href="dist/vidalia-bundle-0.1.1.26-0.0.9-tiger.dmg">Download</a>
+ (<a href="dist/vidalia-bundle-0.1.1.26-0.0.9-tiger.dmg.asc">sig</a>)
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
+ OS X Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td>Mac OS X (Panther)</td>
+ <td>
+ <a href="dist/vidalia-bundle-0.1.1.26-0.0.9-panther.dmg">Download</a>
+ (<a href="dist/vidalia-bundle-0.1.1.26-0.0.9-panther.dmg.asc">sig</a>)
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
+ OS X Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td colspan="3">
+ <b>Development Bundles</b><br/>
+ Includes
+ <a href="http://tor.eff.org";>Tor</a>
+ <a href="dist/other/tor-0.1.2.4-alpha.tar.gz">0.1.2.4-alpha</a> and
+ <a href="http://www.privoxy.org";>Privoxy</a>
+ <a href="dist/other/privoxy-3.0.6-stable-src.tar.gz">3.0.6</a>
+ </td>
+</tr>
+<tr>
+ <td>Windows</td>
+ <td>
+ <a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9.exe">Download</a>
+ (<a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9.exe.asc">sig</a>)
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallWindows";>
+ Windows Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td>Mac OS X (Tiger)</td>
+ <td>
+ <a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9-tiger.dmg">Download</a>
+ (<a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9-tiger.dmg.asc">sig</a>)
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
+ OS X Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td>Mac OS X (Panther)</td>
+ <td>
+ <a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9-panther.dmg">Download</a>
+ (<a href="dist/vidalia-bundle-0.1.2.4-alpha-0.0.9-panther.dmg.asc">sig</a>)
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
+ OS X Installation Instructions
+ </a>
+ </td>
+</tr>
+</table><br/>
+<table border="1">
+<tr>
+ <td colspan="3">
+ <b>Vidalia-only Packages</b>
+ </td>
+</tr>
+<tr>
+ <td>Windows</td>
+ <td>
+ <a href="dist/vidalia-0.0.9.exe">Download</a>
+ (<a href="dist/vidalia-0.0.9.exe.asc">sig</a>)
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallWindows";>
+ Windows Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td>Mac OS X (Tiger)</td>
+ <td>
+ <a href="dist/vidalia-0.0.9-tiger.dmg">Download</a>
+ (<a href="dist/vidalia-0.0.9-tiger.dmg.asc">sig</a>)
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
+ OS X Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td>Mac OS X (Panther)</td>
+ <td>
+ <a href="dist/vidalia-0.0.9-panther.dmg">Download</a>
+ (<a href="dist/vidalia-0.0.9-panther.dmg.asc">sig</a>)
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallOSX";>
+ OS X Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td>Red Hat (RPM)</td>
+ <td>
+ <a href="dist/vidalia-0.0.9-1.i386.rpm">Download</a>
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallLinux#RedHat";>
+ Red Hat Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td>Red Hat (SRPM)</td>
+ <td>
+ <a href="dist/vidalia-0.0.9-1.src.rpm">Download</a>
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallLinux#RedHat";>
+ Red Hat Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td>Gentoo</td>
+ <td>emerge</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallLinux#Gentoo";>
+ Gentoo Installation Instructions
+ </a>
+ </td>
+</tr>
+<tr>
+ <td>Source</td>
+ <td>
+ <a href="dist/vidalia-0.0.9.tar.gz">Download</a>
+ (<a href="dist/vidalia-0.0.9.tar.gz.asc">sig</a>)
+ </td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki/InstallSource";>
+ Installing From Source
+ </a>
+ </td>
+</tr>
+</table>
+
+<p>
+Vidalia is distributed as
+<a href="http://www.fsf.org/";>Free Software</a>
+under the
+<a href="http://trac.vidalia-project.net/wiki/License";>GPL</a>.
+</p>
+
+<p>
+See our wiki page on <a href="http://trac.vidalia-project.net/wiki/VerifyingSignatures";>
+verifying signatures</a> for information on the keys used to sign Vidalia packages.
+</p>
+
+<h3>Snapshot</h3>
+<p>
+Find out how to grab a snapshot of the repository trunk
+<a
+href="http://trac.vidalia-project.net/wiki/GettingTheCode";>
+here</a>
+or
+<a href="http://trac.vidalia-project.net/browser/trunk";>browse</a>
+the repository yourself.
+</p>
+
+<h3>Archive</h3>
+<p>
+You can find old releases of Vidalia <a href="dist/archive/">here</a>.
+</p>
+</div>
+
+<?php
+
+include("footer.inc.php");
+
+?>
Property changes on: www/download.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: www/footer.inc.php
===================================================================
--- www/footer.inc.php 2006-12-26 04:59:06 UTC (rev 1562)
+++ www/footer.inc.php 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,3 +1,3 @@
-<hr>
-</body>
-</html>
+<hr>
+</body>
+</html>
Property changes on: www/footer.inc.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: www/header.inc.php
===================================================================
--- www/header.inc.php 2006-12-26 04:59:06 UTC (rev 1562)
+++ www/header.inc.php 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,26 +1,26 @@
-<?php
- $parts = Explode('/', $_SERVER["SCRIPT_NAME"]);
- $scriptname = $parts[count($parts) - 1];
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";>
-<html>
-<head>
-<title><?php echo $pagename; ?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<body>
-<div id="vidaliabanner">
- <a href="http://www.vidalia-project.net";>
- <img src="images/vidalia_logo.png" alt="Vidalia"/></a>
-</div>
-<div id="navcontainer">
- <a class="<?php echo ($scriptname == "index.php" ? "navtabcurrent" : "navtab");?>" href="index.php">Home</a>
- <a class="<?php echo ($scriptname == "download.php" ? "navtabcurrent" : "navtab");?>" href="download.php">Download</a>
- <a class="<?php echo ($scriptname == "screenshots.php" ? "navtabcurrent" : "navtab")?>" href="screenshots.php">Screenshots</a>
- <a class="navtab" href="http://trac.vidalia-project.net/wiki/WikiStart";>Support & Development</a>
-</div>
-<div id="mainnav">
- <br />
-</div>
-
+<?php
+ $parts = Explode('/', $_SERVER["SCRIPT_NAME"]);
+ $scriptname = $parts[count($parts) - 1];
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";>
+<html>
+<head>
+<title><?php echo $pagename; ?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" type="text/css" href="stylesheet.css">
+</head>
+<body>
+<div id="vidaliabanner">
+ <a href="http://www.vidalia-project.net";>
+ <img src="images/vidalia_logo.png" alt="Vidalia"/></a>
+</div>
+<div id="navcontainer">
+ <a class="<?php echo ($scriptname == "index.php" ? "navtabcurrent" : "navtab");?>" href="index.php">Home</a>
+ <a class="<?php echo ($scriptname == "download.php" ? "navtabcurrent" : "navtab");?>" href="download.php">Download</a>
+ <a class="<?php echo ($scriptname == "screenshots.php" ? "navtabcurrent" : "navtab")?>" href="screenshots.php">Screenshots</a>
+ <a class="navtab" href="http://trac.vidalia-project.net/wiki/WikiStart";>Support & Development</a>
+</div>
+<div id="mainnav">
+ <br />
+</div>
+
Property changes on: www/header.inc.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: www/index.php
===================================================================
--- www/index.php 2006-12-26 04:59:06 UTC (rev 1562)
+++ www/index.php 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,66 +1,66 @@
-<?php
-
-$pagename = "Vidalia - Home";
-include("header.inc.php");
-
-?>
-<p>
-<br />
-</p>
-
-<div class="content">
-<p>
-Vidalia is a cross-platform controller GUI for
-<a href="http://tor.eff.org";>Tor</a>, built using the
-<a href="http://www.trolltech.com/products/qt/index.html";>Qt</a>
-framework. Using Vidalia, you can start and stop Tor, view the status of Tor at
-a glance, and monitor Tor's bandwidth usage. Vidalia also makes it easy to
-contribute to the Tor network by helping you set up and manage your own Tor server.
-</p>
-
-<p>
-Vidalia runs on most platforms supported by Qt 4.1 or later, including
-Windows, Mac OS X, and Linux or other Unix variants using the X11 window
-system.
-</p>
-
-<p>
-You can view some <a href="screenshots.php">screenshots</a> of Vidalia or go
-straight to the <a href="download.php">download</a> page.
-</p>
-
-<h3>Recent News</h3>
-<ul>
- <li><b>05-November-2006:</b>
- Vidalia 0.0.9 is <a href="download.php">released</a>. 0.0.9 fixes a couple
- bugs in the message log and includes an improved interface for setting up a
- Tor server. The Windows Vidalia and bundle installers now also support multiple
- languages and the Windows bundle includes
- <a href="http://freehaven.net/~squires/torbutton/";>Torbutton</a> as well. See the
- <a href="http://trac.vidalia-project.net/browser/releases/vidalia-0.0.9/CHANGELOG";>
- changelog</a> for a complete list of fixes and improvements.
- <li><b>03-October-2006:</b>
- Vidalia 0.0.8 is released. 0.0.8 includes
- support for talking to an existing Tor process and running Tor as an NT
- service (Windows only), as well as several usability and aesthetic
- improvements and new translations. See the
- <a href="http://trac.vidalia-project.net/browser/releases/vidalia-0.0.8/CHANGELOG";>
- changelog</a> for details.
- </li>
- <li><b>07-July-2006:</b>
- Vidalia 0.0.7 is out. 0.0.7 is primarily a
- bug-fix release which fixes a couple stability issues reported by some
- 0.0.6 users. We have also added a French translation, contributed by
- Michel Burkhardt. See the
- <a href="http://trac.vidalia-project.net/browser/releases/vidalia-0.0.7/CHANGELOG";>
- changelog</a> for details.
- </li>
-</ul>
-</div>
-
-<?php
-
-include("footer.inc.php");
-
-?>
-
+<?php
+
+$pagename = "Vidalia - Home";
+include("header.inc.php");
+
+?>
+<p>
+<br />
+</p>
+
+<div class="content">
+<p>
+Vidalia is a cross-platform controller GUI for
+<a href="http://tor.eff.org";>Tor</a>, built using the
+<a href="http://www.trolltech.com/products/qt/index.html";>Qt</a>
+framework. Using Vidalia, you can start and stop Tor, view the status of Tor at
+a glance, and monitor Tor's bandwidth usage. Vidalia also makes it easy to
+contribute to the Tor network by helping you set up and manage your own Tor server.
+</p>
+
+<p>
+Vidalia runs on most platforms supported by Qt 4.1 or later, including
+Windows, Mac OS X, and Linux or other Unix variants using the X11 window
+system.
+</p>
+
+<p>
+You can view some <a href="screenshots.php">screenshots</a> of Vidalia or go
+straight to the <a href="download.php">download</a> page.
+</p>
+
+<h3>Recent News</h3>
+<ul>
+ <li><b>05-November-2006:</b>
+ Vidalia 0.0.9 is <a href="download.php">released</a>. 0.0.9 fixes a couple
+ bugs in the message log and includes an improved interface for setting up a
+ Tor server. The Windows Vidalia and bundle installers now also support multiple
+ languages and the Windows bundle includes
+ <a href="http://freehaven.net/~squires/torbutton/";>Torbutton</a> as well. See the
+ <a href="http://trac.vidalia-project.net/browser/releases/vidalia-0.0.9/CHANGELOG";>
+ changelog</a> for a complete list of fixes and improvements.
+ <li><b>03-October-2006:</b>
+ Vidalia 0.0.8 is released. 0.0.8 includes
+ support for talking to an existing Tor process and running Tor as an NT
+ service (Windows only), as well as several usability and aesthetic
+ improvements and new translations. See the
+ <a href="http://trac.vidalia-project.net/browser/releases/vidalia-0.0.8/CHANGELOG";>
+ changelog</a> for details.
+ </li>
+ <li><b>07-July-2006:</b>
+ Vidalia 0.0.7 is out. 0.0.7 is primarily a
+ bug-fix release which fixes a couple stability issues reported by some
+ 0.0.6 users. We have also added a French translation, contributed by
+ Michel Burkhardt. See the
+ <a href="http://trac.vidalia-project.net/browser/releases/vidalia-0.0.7/CHANGELOG";>
+ changelog</a> for details.
+ </li>
+</ul>
+</div>
+
+<?php
+
+include("footer.inc.php");
+
+?>
+
Property changes on: www/index.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: www/screenshots.php
===================================================================
--- www/screenshots.php 2006-12-26 04:59:06 UTC (rev 1562)
+++ www/screenshots.php 2006-12-26 06:06:04 UTC (rev 1563)
@@ -1,222 +1,222 @@
-<?php
-
-$pagename = "Vidalia - Screenshots";
-include("header.inc.php");
-
-?>
-
-<p>
-<br>
-</p>
-
-
-<div class="content">
-<p>
-The screenshots below should give you an idea of how Vidalia can help you
-manage Tor. Click on the thumbnails to see a full-size image.
-</p>
-<p>
-If you have some ideas you'd like to see implemented in Vidalia or
-ways we can make our interface prettier,
-<a href="http://trac.vidalia-project.net/wiki/RequestingFeatures";>let us know!</a>
-</p>
-
-
-<h3>Displays Status of Tor</h3>
-<table>
-<tr>
-<td align="center"><i>Windows</i></td>
-<td align="center"><i>OS X</i></td>
-</tr>
-<tr valign="top">
-<td>
- <img src="images/screenshots/traymenu_win32.png" alt="Win32 Tray Menu"/>
-</td>
-<td>
- <img src="images/screenshots/torstatus_off_mac.png" alt="OS X Dock Icon (Off)"/>
- <br/>
- <img src="images/screenshots/torstatus_on_mac.png" alt="OS X Doc Icon (On)"/>
-</td>
-</tr>
-</table>
-
-<p>
-Vidalia runs in your system's notification area, changing its icon to indicate
-the status of Tor. You will know at a glance if Tor is working or not without
-taking up a lot of screen real estate.
-</p>
-
-
-<h3>View Tor Messages</h3>
-<table>
-<tr>
-<td align="center"><i>Windows</i></td>
-<td align="center"><i>OS X</i></td>
-</tr>
-<tr valign="top">
-<td>
- <a href="images/screenshots/messagelog_win32.png">
- <img src="images/screenshots/thumb_messagelog_win32.png" alt="Message Log (Win32)"/></a>
-</td>
-<td>
- <a href="images/screenshots/messagelog_mac.png">
- <img src="images/screenshots/thumb_messagelog_mac.png" alt="Message Log (OS X)"/></a>
-</td>
-</tr>
-</table>
-
-<p>
-The message log displays informational messages that Vidalia gets from
-Tor. You can select which types of messages you'd like to see, have them
-automatically logged to a file, or search through your message log for
-specific messages.
-</p>
-
-<h3>Tor Network Map</h3>
-<table>
-<tr>
-<td align="center"><i>OS X</i></td>
-</tr>
-<tr>
-<td>
- <a href="images/screenshots/netmap_mac.png">
- <img src="images/screenshots/thumb_netmap_mac.png" alt="Network Map"/>
- </a>
-</td>
-</tr>
-</table>
-
-<p>
-Vidalia shows you a map of the Tor network, plotting points for each Tor router
-and drawing the path of your circuits through the network. You can also view
-details about routers, including their bandwidth and uptime, as well as
-monitor the status of your application connections through Tor.
-</p>
-
-<h3>Monitor Bandwidth Usage</h3>
-<table>
-<tr>
-<td align="center"><i>Windows</i></td>
-<td align="center"><i>OS X</i></td>
-</tr>
-<tr>
-<td>
- <a href="images/screenshots/bwgraph_win32.png">
- <img src="images/screenshots/thumb_bwgraph_win32.png" alt="Bandwidth Graph (Win32)"/>
- </a>
-</td>
-<td>
- <a href="images/screenshots/bwgraph_mac.png">
- <img src="images/screenshots/thumb_bwgraph_mac.png" alt="Bandwidth Graph (OS X)"/>
- </a>
-</td>
-</tr>
-</table>
-
-<p>
-The bandwidth graph lets you keep an eye on how much data you're sending and
-receiving through the Tor network.
-</p>
-
-
-<h3>Configure Tor</h3>
-<table>
-<tr>
-<td align="center"><i>Windows</i></td>
-<td align="center"><i>OS X</i></td>
-<td align="center"><i>X11</i></td>
-</tr>
-<tr valign="top">
-<td>
- <a href="images/screenshots/serverconfig_win32.png">
- <img src="images/screenshots/thumb_serverconfig_win32.png"
- alt="Server Configuration (Win32)"/></a>
-</td>
-<td>
- <a href="images/screenshots/generalconfig_mac.png">
- <img src="images/screenshots/thumb_generalconfig_mac.png"
- alt="General Configuration (OS X)"/></a>
-</td>
-<td>
- <a href="images/screenshots/appearanceconfig_x11.png">
- <img src="images/screenshots/thumb_appearanceconfig_x11.png"
- alt="Appearance Configuration (X11)"/></a>
-</td>
-</tr>
-</table>
-
-<p>
-The configuration dialog allows you to configure aspects and behaviors of both Vidalia
-and Tor.
-</p>
-
-<p>
-The Tor network is made up of
-<a href="http://tor.eff.org/volunteer.html.en";>volunteers</a> all over the world
-who care about Internet privacy. Vidalia helps you contribute to Tor by making
-it easy to set up and configure a Tor server.
-</p>
-
-<h3>Get Help</h3>
-<table>
-<tr>
-<td align="center"><i>Windows</i></td>
-<td align="center"><i>OS X</i></td>
-<td align="center"><i>X11</i></td>
-</tr>
-<tr>
-<td>
- <a href="images/screenshots/help_win32.png">
- <img src="images/screenshots/thumb_help_win32.png" alt="Help (Win32)"/></a>
-</td>
-<td>
- <a href="images/screenshots/help_mac.png">
- <img src="images/screenshots/thumb_help_mac.png" alt="Help (OS X)"/></a>
-</td>
-<td>
- <a href="images/screenshots/help_x11.png">
- <img src="images/screenshots/thumb_help_x11.png" alt="Help (X11)"/></a>
-</td>
-</tr>
-</table>
-
-<p>
-The Help dialog allows you to find help documentation about Vidalia.
-</p>
-
-<h3>Support for Translations</h3>
-<table>
-<tr>
-<td align="center"><i>Windows</i></td>
-<td align="center"><i>OS X</i></td>
-</tr>
-<tr>
-<td>
- <img src="images/screenshots/traymenu_win32-ru.png"
- alt="Russian Tray Menu"/>
-</td>
-<td>
- <a href="images/screenshots/help_mac-zh-cn.png">
- <img src="images/screenshots/thumb_help_mac-zh-cn.png"
- alt="Simplified Chinese Help"/></a>
-</td>
-</tr>
-</table>
-
-<p>
-We currently have translations for Vidalia in
-<a href="http://trac.vidalia-project.net/wiki/Translations";>
-several languages</a>, but we need your help translating Vidalia into more languages
-and keeping our current translations up to date! We also need help translating our
-<a href="http://trac.vidalia-project.net/browser/trunk/src/gui/help/content";>
-help content</a>. Learn how to help
-<a href="http://trac.vidalia-project.net/wiki/Translations";>here</a>.
-</p>
-</div>
-
-<?php
-
-include("footer.inc.php");
-
-?>
-
+<?php
+
+$pagename = "Vidalia - Screenshots";
+include("header.inc.php");
+
+?>
+
+<p>
+<br>
+</p>
+
+
+<div class="content">
+<p>
+The screenshots below should give you an idea of how Vidalia can help you
+manage Tor. Click on the thumbnails to see a full-size image.
+</p>
+<p>
+If you have some ideas you'd like to see implemented in Vidalia or
+ways we can make our interface prettier,
+<a href="http://trac.vidalia-project.net/wiki/RequestingFeatures";>let us know!</a>
+</p>
+
+
+<h3>Displays Status of Tor</h3>
+<table>
+<tr>
+<td align="center"><i>Windows</i></td>
+<td align="center"><i>OS X</i></td>
+</tr>
+<tr valign="top">
+<td>
+ <img src="images/screenshots/traymenu_win32.png" alt="Win32 Tray Menu"/>
+</td>
+<td>
+ <img src="images/screenshots/torstatus_off_mac.png" alt="OS X Dock Icon (Off)"/>
+ <br/>
+ <img src="images/screenshots/torstatus_on_mac.png" alt="OS X Doc Icon (On)"/>
+</td>
+</tr>
+</table>
+
+<p>
+Vidalia runs in your system's notification area, changing its icon to indicate
+the status of Tor. You will know at a glance if Tor is working or not without
+taking up a lot of screen real estate.
+</p>
+
+
+<h3>View Tor Messages</h3>
+<table>
+<tr>
+<td align="center"><i>Windows</i></td>
+<td align="center"><i>OS X</i></td>
+</tr>
+<tr valign="top">
+<td>
+ <a href="images/screenshots/messagelog_win32.png">
+ <img src="images/screenshots/thumb_messagelog_win32.png" alt="Message Log (Win32)"/></a>
+</td>
+<td>
+ <a href="images/screenshots/messagelog_mac.png">
+ <img src="images/screenshots/thumb_messagelog_mac.png" alt="Message Log (OS X)"/></a>
+</td>
+</tr>
+</table>
+
+<p>
+The message log displays informational messages that Vidalia gets from
+Tor. You can select which types of messages you'd like to see, have them
+automatically logged to a file, or search through your message log for
+specific messages.
+</p>
+
+<h3>Tor Network Map</h3>
+<table>
+<tr>
+<td align="center"><i>OS X</i></td>
+</tr>
+<tr>
+<td>
+ <a href="images/screenshots/netmap_mac.png">
+ <img src="images/screenshots/thumb_netmap_mac.png" alt="Network Map"/>
+ </a>
+</td>
+</tr>
+</table>
+
+<p>
+Vidalia shows you a map of the Tor network, plotting points for each Tor router
+and drawing the path of your circuits through the network. You can also view
+details about routers, including their bandwidth and uptime, as well as
+monitor the status of your application connections through Tor.
+</p>
+
+<h3>Monitor Bandwidth Usage</h3>
+<table>
+<tr>
+<td align="center"><i>Windows</i></td>
+<td align="center"><i>OS X</i></td>
+</tr>
+<tr>
+<td>
+ <a href="images/screenshots/bwgraph_win32.png">
+ <img src="images/screenshots/thumb_bwgraph_win32.png" alt="Bandwidth Graph (Win32)"/>
+ </a>
+</td>
+<td>
+ <a href="images/screenshots/bwgraph_mac.png">
+ <img src="images/screenshots/thumb_bwgraph_mac.png" alt="Bandwidth Graph (OS X)"/>
+ </a>
+</td>
+</tr>
+</table>
+
+<p>
+The bandwidth graph lets you keep an eye on how much data you're sending and
+receiving through the Tor network.
+</p>
+
+
+<h3>Configure Tor</h3>
+<table>
+<tr>
+<td align="center"><i>Windows</i></td>
+<td align="center"><i>OS X</i></td>
+<td align="center"><i>X11</i></td>
+</tr>
+<tr valign="top">
+<td>
+ <a href="images/screenshots/serverconfig_win32.png">
+ <img src="images/screenshots/thumb_serverconfig_win32.png"
+ alt="Server Configuration (Win32)"/></a>
+</td>
+<td>
+ <a href="images/screenshots/generalconfig_mac.png">
+ <img src="images/screenshots/thumb_generalconfig_mac.png"
+ alt="General Configuration (OS X)"/></a>
+</td>
+<td>
+ <a href="images/screenshots/appearanceconfig_x11.png">
+ <img src="images/screenshots/thumb_appearanceconfig_x11.png"
+ alt="Appearance Configuration (X11)"/></a>
+</td>
+</tr>
+</table>
+
+<p>
+The configuration dialog allows you to configure aspects and behaviors of both Vidalia
+and Tor.
+</p>
+
+<p>
+The Tor network is made up of
+<a href="http://tor.eff.org/volunteer.html.en";>volunteers</a> all over the world
+who care about Internet privacy. Vidalia helps you contribute to Tor by making
+it easy to set up and configure a Tor server.
+</p>
+
+<h3>Get Help</h3>
+<table>
+<tr>
+<td align="center"><i>Windows</i></td>
+<td align="center"><i>OS X</i></td>
+<td align="center"><i>X11</i></td>
+</tr>
+<tr>
+<td>
+ <a href="images/screenshots/help_win32.png">
+ <img src="images/screenshots/thumb_help_win32.png" alt="Help (Win32)"/></a>
+</td>
+<td>
+ <a href="images/screenshots/help_mac.png">
+ <img src="images/screenshots/thumb_help_mac.png" alt="Help (OS X)"/></a>
+</td>
+<td>
+ <a href="images/screenshots/help_x11.png">
+ <img src="images/screenshots/thumb_help_x11.png" alt="Help (X11)"/></a>
+</td>
+</tr>
+</table>
+
+<p>
+The Help dialog allows you to find help documentation about Vidalia.
+</p>
+
+<h3>Support for Translations</h3>
+<table>
+<tr>
+<td align="center"><i>Windows</i></td>
+<td align="center"><i>OS X</i></td>
+</tr>
+<tr>
+<td>
+ <img src="images/screenshots/traymenu_win32-ru.png"
+ alt="Russian Tray Menu"/>
+</td>
+<td>
+ <a href="images/screenshots/help_mac-zh-cn.png">
+ <img src="images/screenshots/thumb_help_mac-zh-cn.png"
+ alt="Simplified Chinese Help"/></a>
+</td>
+</tr>
+</table>
+
+<p>
+We currently have translations for Vidalia in
+<a href="http://trac.vidalia-project.net/wiki/Translations";>
+several languages</a>, but we need your help translating Vidalia into more languages
+and keeping our current translations up to date! We also need help translating our
+<a href="http://trac.vidalia-project.net/browser/trunk/src/gui/help/content";>
+help content</a>. Learn how to help
+<a href="http://trac.vidalia-project.net/wiki/Translations";>here</a>.
+</p>
+</div>
+
+<?php
+
+include("footer.inc.php");
+
+?>
+
Property changes on: www/screenshots.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: www/stylesheet.css
___________________________________________________________________
Name: svn:eol-style
+ native