- tor-commits - lists.torproject.org

[vidalia/master] Merge branch 'bug3843_checkauto'
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 0a369b233523366c484761296c8b9369598dadbd Merge: a402fe2 e43e1c9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 9 10:48:02 2011 -0300 Merge branch 'bug3843_checkauto' changes/bug3843 | 2 ++ src/vidalia/MainWindow.cpp | 20 +++++++++++++++++--- src/vidalia/config/AdvancedPage.cpp | 16 +++++++++++++++- 3 files changed, 34 insertions(+), 4 deletions(-)

1 0

[vidalia/master] Fix the text layout in the CHANGELOG a bit
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 8966ecdfff58de6c5beeccea4578dddc9dfde242 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Oct 7 16:16:56 2011 -0300 Fix the text layout in the CHANGELOG a bit --- CHANGELOG | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9803ecf..23c1c23 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,9 @@ 0.2.15 07-Oct-2011 o Draw the bandwidth graph curves based on the local maximum, not the global maximum. Fixes bug 2188. - o Add an option for setting up a non-exit relay to the Sharing configuration - panel. This is meant to clarify what an exit policy and an exit relay are. - Resolves bug 2644. + o Add an option for setting up a non-exit relay to the Sharing + configuration panel. This is meant to clarify what an exit policy + and an exit relay are. Resolves bug 2644. o Display time statistics for bridges in UTC time, rather than local time. Fixes bug 3342. o Change the parameter for ordering the entries in the Basic Log

1 0

[vidalia/master] Merge branch 'feat2163_osxicons'
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit a402fe2f17a57bac80df772bd209b875e92ead6c Merge: 928e8ba 5af6c27 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 9 10:47:53 2011 -0300 Merge branch 'feat2163_osxicons' changes/feat2163 | 2 + src/vidalia/CMakeLists.txt | 6 +++ src/vidalia/HelperProcess.cpp | 17 ++++++++++ src/vidalia/HelperProcess.h | 2 + src/vidalia/MainWindow.cpp | 24 +++++++++++++- src/vidalia/config/AppearancePage.cpp | 28 ++++++++++++++++ src/vidalia/config/AppearancePage.ui | 55 ++++++++++++++++++++++++++++++++ src/vidalia/config/VidaliaSettings.cpp | 36 +++++++++++++++++++++ src/vidalia/config/VidaliaSettings.h | 14 ++++++++ 9 files changed, 183 insertions(+), 1 deletions(-)

1 0

[vidalia/master] Merge branch 'bug3759_basiclog_backport'
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 764b202fcc299731eb09dc7a8f95d22582908e07 Merge: 30139ec 19f605c Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 11:23:33 2011 -0300 Merge branch 'bug3759_basiclog_backport' changes/bug3759 | 3 +++ src/vidalia/log/StatusEventItem.cpp | 12 ++++++------ src/vidalia/log/StatusEventItem.h | 6 +++--- src/vidalia/log/StatusEventWidget.cpp | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-)

1 0

[vidalia/master] Bump version to 0.2.15-git
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 30139eca796d9e1cc82a3aac4c8ae12bedce7d02 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Sep 10 16:42:22 2011 -0300 Bump version to 0.2.15-git --- CMakeLists.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18f2575..6906313 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ set(VER_MAJOR "0") set(VER_MINOR "2") -set(VER_PATCH "14") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") +set(VER_PATCH "15") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

1 0

[vidalia/master] Version bump and fold in changes for 0.2.15 release
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 1de8f44b56f6d8c8632754e3d2e2282c1995a045 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Oct 7 15:56:03 2011 -0300 Version bump and fold in changes for 0.2.15 release --- CHANGELOG | 18 ++++++++++++++++++ CMakeLists.txt | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f39003e..9803ecf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,21 @@ +0.2.15 07-Oct-2011 + o Draw the bandwidth graph curves based on the local maximum, not + the global maximum. Fixes bug 2188. + o Add an option for setting up a non-exit relay to the Sharing configuration + panel. This is meant to clarify what an exit policy and an exit relay are. + Resolves bug 2644. + o Display time statistics for bridges in UTC time, rather than local + time. Fixes bug 3342. + o Change the parameter for ordering the entries in the Basic Log + list from currentTime to currentDateTime to avoid missplacing + entries from different days. + o Check the tor version and that settings are sanitized before + trying to use the port autoconfiguration feature. Fixes bug 3843. + o Provide a way to hide Dock or System Tray icons in OSX. Resolves + ticket 2163. + o Make new processes appear at front when they are started (OSX + specific). + 0.2.14 26-Aug-2011 o Make the AutoPort setting default to false, so that it doesn't break backwards compatibility for people that aren't using Vidalia diff --git a/CMakeLists.txt b/CMakeLists.txt index 6906313..9303d6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(VER_MAJOR "0") set(VER_MINOR "2") set(VER_PATCH "15") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

1 0

[vidalia/master] Backport the new ServerPage to master
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit bb16e81f0906a209340533c1a38bbec0b2774de3 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Sep 1 13:51:24 2011 -0300 Backport the new ServerPage to master --- src/vidalia/config/ServerPage.cpp | 99 ++++++++++++++++++++------------- src/vidalia/config/ServerPage.ui | 17 ++++-- src/vidalia/config/ServerSettings.cpp | 18 ++++++- src/vidalia/config/ServerSettings.h | 6 ++ 4 files changed, 96 insertions(+), 44 deletions(-) diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp index 5e8e2b6..f15dd96 100644 --- a/src/vidalia/config/ServerPage.cpp +++ b/src/vidalia/config/ServerPage.cpp @@ -89,6 +89,8 @@ ServerPage::ServerPage(QWidget *parent) this, SLOT(customRateChanged())); connect(ui.rdoClientMode, SIGNAL(toggled(bool)), this, SLOT(serverModeChanged(bool))); + connect(ui.rdoNonExitMode, SIGNAL(toggled(bool)), + this, SLOT(serverModeChanged(bool))); connect(ui.rdoServerMode, SIGNAL(toggled(bool)), this, SLOT(serverModeChanged(bool))); connect(ui.rdoBridgeMode, SIGNAL(toggled(bool)), @@ -220,10 +222,12 @@ ServerPage::serverModeChanged(bool enabled) { Q_UNUSED(enabled); bool bridgeEnabled = ui.rdoBridgeMode->isChecked(); + bool relayEnabled = ui.rdoServerMode->isChecked() || + ui.rdoNonExitMode->isChecked(); /* Show the tab menu only if the user is running a normal relay or a bridge * relay. */ - ui.tabsMenu->setVisible(ui.rdoServerMode->isChecked() || bridgeEnabled); + ui.tabsMenu->setVisible(relayEnabled || bridgeEnabled); /* Disable the Exit Policies tab when bridge relay mode is selected */ ui.tabsMenu->setTabEnabled(2, !bridgeEnabled); @@ -254,6 +258,13 @@ ServerPage::serverModeChanged(bool enabled) ui.lblDirPort->setEnabled(!bridgeEnabled); ui.lineDirPort->setEnabled(!bridgeEnabled); } + + ui.chkWebsites->setEnabled(!ui.rdoNonExitMode->isChecked()); + ui.chkSecWebsites->setEnabled(!ui.rdoNonExitMode->isChecked()); + ui.chkMail->setEnabled(!ui.rdoNonExitMode->isChecked()); + ui.chkIRC->setEnabled(!ui.rdoNonExitMode->isChecked()); + ui.chkIM->setEnabled(!ui.rdoNonExitMode->isChecked()); + ui.chkMisc->setEnabled(!ui.rdoNonExitMode->isChecked()); } /** Returns true if the user has changed their server settings since the @@ -287,8 +298,10 @@ ServerPage::save(QString &errmsg) { /* Force the bandwidth rate limits to validate */ customRateChanged(); - - if (ui.rdoServerMode->isChecked() || ui.rdoBridgeMode->isChecked()) { + + if (ui.rdoServerMode->isChecked() || + ui.rdoNonExitMode->isChecked() || + ui.rdoBridgeMode->isChecked()) { /* A server must have an ORPort and a nickname */ if (ui.lineServerPort->text().isEmpty() || ui.lineServerNickname->text().isEmpty()) { @@ -307,7 +320,9 @@ ServerPage::save(QString &errmsg) /* "Server" is enabled whether we're a bridge or normal relay. "Bridge" is * only enabled if we're a bridge (obviously). */ _settings->setServerEnabled(ui.rdoServerMode->isChecked() - || ui.rdoBridgeMode->isChecked()); + || ui.rdoNonExitMode->isChecked() + || ui.rdoBridgeMode->isChecked()); + _settings->setNonExitEnabled(ui.rdoNonExitMode->isChecked()); _settings->setBridgeEnabled(ui.rdoBridgeMode->isChecked()); if (ui.rdoBridgeMode->isChecked()) _settings->setPublishServerDescriptor(ui.chkPublishBridgeAddress->isChecked()); @@ -338,6 +353,8 @@ ServerPage::load() { if (_settings->isBridgeEnabled()) ui.rdoBridgeMode->setChecked(true); + else if (_settings->isNonExitEnabled()) + ui.rdoNonExitMode->setChecked(true); else if (_settings->isServerEnabled()) ui.rdoServerMode->setChecked(true); else @@ -478,41 +495,47 @@ ServerPage::loadExitPolicies() 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)); + ExitPolicy *exitPolicy; + if(ui.rdoNonExitMode->isChecked()) { + exitPolicy = new ExitPolicy(ExitPolicy::Middleman); + } else { + exitPolicy = new 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); + + _settings->setExitPolicy(*exitPolicy); } /** Called when the user selects a new value from the rate combo box. */ diff --git a/src/vidalia/config/ServerPage.ui b/src/vidalia/config/ServerPage.ui index a642471..cfb3251 100644 --- a/src/vidalia/config/ServerPage.ui +++ b/src/vidalia/config/ServerPage.ui @@ -23,28 +23,28 @@ </property> </widget> </item> - <item row="1" column="0" colspan="3"> + <item row="2" column="0" colspan="3"> <widget class="QRadioButton" name="rdoServerMode"> <property name="text"> - <string>Relay traffic for the Tor network</string> + <string>Relay traffic for the Tor network (exit relay)</string> </property> </widget> </item> - <item row="2" column="0"> + <item row="3" column="0"> <widget class="QRadioButton" name="rdoBridgeMode"> <property name="text"> <string>Help censored users reach the Tor network</string> </property> </widget> </item> - <item row="2" column="1"> + <item row="3" column="1"> <widget class="QLabel" name="lblWhatsThis"> <property name="text"> <string><a href="#bridgeHelp">What's this?</a></string> </property> </widget> </item> - <item row="2" column="2" colspan="2"> + <item row="3" column="2" colspan="2"> <spacer name="horizontalSpacer_2"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -57,6 +57,13 @@ </property> </spacer> </item> + <item row="1" column="0" colspan="3"> + <widget class="QRadioButton" name="rdoNonExitMode"> + <property name="text"> + <string>Relay traffic inside the Tor network (non-exit relay)</string> + </property> + </widget> + </item> </layout> </item> <item> diff --git a/src/vidalia/config/ServerSettings.cpp b/src/vidalia/config/ServerSettings.cpp index 91f8600..f1caa53 100644 --- a/src/vidalia/config/ServerSettings.cpp +++ b/src/vidalia/config/ServerSettings.cpp @@ -43,6 +43,7 @@ #define SETTING_BANDWIDTH_RATE "BandwidthRate" #define SETTING_BANDWIDTH_BURST "BandwidthBurst" #define SETTING_BRIDGE_RELAY "BridgeRelay" +#define SETTING_NONEXIT_RELAY "NonExitRelay" #define SETTING_ENABLE_UPNP "EnableUPnP" #define SETTING_RELAY_BANDWIDTH_RATE "RelayBandwidthRate" #define SETTING_RELAY_BANDWIDTH_BURST "RelayBandwidthBurst" @@ -71,7 +72,7 @@ ServerSettings::ServerSettings(TorControl *torControl) setDefault(SETTING_BANDWIDTH_BURST, 10485760); setDefault(SETTING_RELAY_BANDWIDTH_BURST, 10485760); setDefault(SETTING_EXITPOLICY, - ExitPolicy(ExitPolicy::Default).toString()); + ExitPolicy(ExitPolicy::Middleman).toString()); setDefault(SETTING_ENABLE_UPNP, false); setDefault(SETTING_BRIDGE_RELAY, false); setDefault(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1"); @@ -257,6 +258,21 @@ ServerSettings::isBridgeEnabled() { return value(SETTING_BRIDGE_RELAY).toBool() && isServerEnabled(); } + +/** Sets to <b>enabled</b> whether Tor should be a non-exit node when acting as + * a server. */ +void +ServerSettings::setNonExitEnabled(bool enabled) +{ + setValue(SETTING_NONEXIT_RELAY, enabled); +} + +/** Returns true if Tor is configured to act as a non-exit node. */ +bool +ServerSettings::isNonExitEnabled() +{ + return value(SETTING_NONEXIT_RELAY).toBool() && isServerEnabled(); +} /** Sets the server's ORPort. */ void diff --git a/src/vidalia/config/ServerSettings.h b/src/vidalia/config/ServerSettings.h index 775c92d..9479c5a 100644 --- a/src/vidalia/config/ServerSettings.h +++ b/src/vidalia/config/ServerSettings.h @@ -42,6 +42,12 @@ public: /** Returns true if Tor is configured to act as a bridge node. */ bool isBridgeEnabled(); + /** Sets to <b>enabled</b> whether Tor should be a non-exit node when acting + * as a server. */ + void setNonExitEnabled(bool enable); + /** Returns true if Tor is configured to act as a non-exit node. */ + bool isNonExitEnabled(); + /** Sets the server's ORPort value. */ void setORPort(quint16 orPort); /** Gets the server's ORPort value. */

1 0

[vidalia/master] Implement Icon Preference (appearance setting) in OSX (see #2163)
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 4df4ee18c1acbc9fdad4e2395a8384190ff420db Author: Jason Klein <trac.torproject.org(a)my.jrklein.com> Date: Sun Apr 17 17:13:25 2011 -0500 Implement Icon Preference (appearance setting) in OSX (see #2163) Updated the Appearance settings page to include an Icon Preference group box with three new radio options: Show Tray Icon and Dock Icon Hide the Dock Icon Hide the Tray Icon In order to hide the Dock Icon, I had to create a custom Info.plist file with LSUIElement set to "1" so OSX would launch Vidalia in the background (without Dock Icon). I then use TransformProcessType to force Vidalia to the foreground (show Dock Icon). Hiding the Tray Icon was trival. I only call "_trayIcon.setIcon" if the user wants to see the System/Tray Icon. By default, the user will continue to see Tray Icon and Dock Icon. --- pkg/osx/MacOSXBundleInfo.plist.in | 38 ++++++++++++++++++++++ src/vidalia/CMakeLists.txt | 3 ++ src/vidalia/MainWindow.cpp | 22 ++++++++++++- src/vidalia/config/AppearancePage.cpp | 28 ++++++++++++++++ src/vidalia/config/AppearancePage.ui | 55 ++++++++++++++++++++++++++++++++ src/vidalia/config/VidaliaSettings.cpp | 17 ++++++++++ src/vidalia/config/VidaliaSettings.h | 6 +++ 7 files changed, 168 insertions(+), 1 deletions(-) diff --git a/pkg/osx/MacOSXBundleInfo.plist.in b/pkg/osx/MacOSXBundleInfo.plist.in new file mode 100644 index 0000000..3b5bfe0 --- /dev/null +++ b/pkg/osx/MacOSXBundleInfo.plist.in @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string> + <key>CFBundleGetInfoString</key> + <string>${MACOSX_BUNDLE_INFO_STRING}</string> + <key>CFBundleIconFile</key> + <string>${MACOSX_BUNDLE_ICON_FILE}</string> + <key>CFBundleIdentifier</key> + <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleLongVersionString</key> + <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string> + <key>CFBundleName</key> + <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleVersion</key> + <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string> + <key>CSResourcesFileMapped</key> + <true/> + <key>LSRequiresCarbon</key> + <true/> + <key>NSHumanReadableCopyright</key> + <string>${MACOSX_BUNDLE_COPYRIGHT}</string> + <key>LSUIElement</key> + <string>1</string> +</dict> +</plist> diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index 08fb510..be3e012 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -361,6 +361,9 @@ if (APPLE) set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/) add_executable(${vidalia_BIN} MACOSX_BUNDLE ${vidalia_SRCS}) + ## Specify location of custom Info.plist file + set_target_properties(${vidalia_BIN} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ../pkg/osx/MacOSXBundleInfo.plist.in) + ## Get the location of the app bundle for the current configuration get_target_property(VIDALIA_EXECUTABLE ${vidalia_BIN} LOCATION) get_filename_component(MACOSX_BUNDLE_DIRECTORY ${VIDALIA_EXECUTABLE} PATH) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index b159d2e..967e2df 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -39,6 +39,10 @@ #include <QTimer> #include <QTextStream> +#ifdef Q_WS_MAC +#include <Carbon/Carbon.h> +#endif + #define IMG_BWGRAPH ":/images/16x16/utilities-system-monitor.png" #define IMG_CONTROL_PANEL ":/images/16x16/system-run.png" #define IMG_MESSAGELOG ":/images/16x16/format-justify-fill.png" @@ -215,6 +219,16 @@ MainWindow::MainWindow() show(); /* Optimistically hope that the tray icon gets added. */ _trayIcon.show(); + +#if defined(Q_WS_MAC) + /* Display OSX dock icon if icon preference is not set to "Tray Only" */ + if (settings.getIconPref() != "Tray") { + ProcessSerialNumber psn = { 0, kCurrentProcess }; + TransformProcessType(&psn, kProcessTransformToForegroundApplication); + } + /* Vidalia launched in background (LSUIElement=true). Bring to foreground. */ + VidaliaWindow::setVisible(true); +#endif } /** Destructor. */ @@ -572,9 +586,15 @@ void MainWindow::setTrayIcon(const QString &iconFile) { #if defined(Q_WS_MAC) + VidaliaSettings settings; QApplication::setWindowIcon(QPixmap(iconFile)); -#endif + /* only display tray icon if icon preference is not set to "Dock Only" */ + if (settings.getIconPref() != "Dock") + _trayIcon.setIcon(QIcon(iconFile)); +#else + /* always display tray icon for other platforms */ _trayIcon.setIcon(QIcon(iconFile)); +#endif } /** Respond to a double-click on the tray icon by opening the Control Panel diff --git a/src/vidalia/config/AppearancePage.cpp b/src/vidalia/config/AppearancePage.cpp index 11939c3..647b67a 100644 --- a/src/vidalia/config/AppearancePage.cpp +++ b/src/vidalia/config/AppearancePage.cpp @@ -72,6 +72,21 @@ AppearancePage::save(QString &errmsg) /* Set the new style */ Vidalia::setStyle(ui.cmboStyle->currentText()); _settings->setInterfaceStyle(ui.cmboStyle->currentText()); + +#if defined(Q_WS_MAC) + /* Save new icon preference */ + if(ui.rdoIconPrefDock->isChecked()) { + _settings->setIconPref("Dock"); + } + else if(ui.rdoIconPrefTray->isChecked()) { + _settings->setIconPref("Tray"); + } + else { + /* default setting */ + _settings->setIconPref("Both"); + } +#endif + return true; } @@ -84,5 +99,18 @@ AppearancePage::load() index = ui.cmboStyle->findData(Vidalia::style().toLower()); ui.cmboStyle->setCurrentIndex(index); + +#if defined(Q_WS_MAC) + /* set current icon preference */ + ui.rdoIconPrefBoth->setChecked(_settings->getIconPref() == "Both"); + ui.rdoIconPrefTray->setChecked(_settings->getIconPref() == "Tray"); + ui.rdoIconPrefDock->setChecked(_settings->getIconPref() == "Dock"); +#else + /* hide preference on non-OSX platforms */ + ui.grpIconPref->setVisible(false); + ui.rdoIconPrefBoth->setVisible(false); + ui.rdoIconPrefTray->setVisible(false); + ui.rdoIconPrefDock->setVisible(false); +#endif } diff --git a/src/vidalia/config/AppearancePage.ui b/src/vidalia/config/AppearancePage.ui index 8672af3..ef7ef5f 100644 --- a/src/vidalia/config/AppearancePage.ui +++ b/src/vidalia/config/AppearancePage.ui @@ -111,6 +111,61 @@ </widget> </item> <item> + <widget class="QGroupBox" name="grpIconPref"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>100</height> + </size> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::PreventContextMenu</enum> + </property> + <property name="title"> + <string>System Icon Preferences (changes will take effect when you restart Vidalia)</string> + </property> + <widget class="QRadioButton" name="rdoIconPrefBoth"> + <property name="geometry"> + <rect> + <x>20</x> + <y>30</y> + <width>441</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Show the Tray Icon and Dock Icon (default)</string> + </property> + </widget> + <widget class="QRadioButton" name="rdoIconPrefDock"> + <property name="geometry"> + <rect> + <x>20</x> + <y>70</y> + <width>441</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Hide the Tray Icon</string> + </property> + </widget> + <widget class="QRadioButton" name="rdoIconPrefTray"> + <property name="geometry"> + <rect> + <x>20</x> + <y>50</y> + <width>441</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Hide the Dock Icon</string> + </property> + </widget> + </widget> + </item> + <item> <spacer> <property name="orientation" > <enum>Qt::Vertical</enum> diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 0812b03..858ca8e 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -45,6 +45,9 @@ #define VIDALIA_REG_KEY "Vidalia" #endif +#if defined(Q_WS_MAC) +#define SETTING_ICON_PREF "IconPref" +#endif /** Default Constructor */ VidaliaSettings::VidaliaSettings() @@ -82,6 +85,7 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_LAST_UPDATE_CHECK, QDateTime()); setDefault(SETTING_USE_LOCAL_GEOIP_DATABASE, false); setDefault(SETTING_LOCAL_GEOIP_DATABASE, ""); + setDefault(SETTING_ICON_PREF, "Both"); } /** Gets the currently preferred language code for Vidalia. */ @@ -321,3 +325,16 @@ VidaliaSettings::setLocalGeoIpDatabase(const QString &databaseFile) setValue(SETTING_LOCAL_GEOIP_DATABASE, databaseFile); } +/** Get the icon preference */ +QString +VidaliaSettings::getIconPref() const +{ + return value(SETTING_ICON_PREF).toString(); +} + +/** Set the icon preference */ +void +VidaliaSettings::setIconPref(const QString &iconPref) +{ + setValue(SETTING_ICON_PREF, iconPref); +} diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h index 2667b12..2efec12 100644 --- a/src/vidalia/config/VidaliaSettings.h +++ b/src/vidalia/config/VidaliaSettings.h @@ -125,6 +125,12 @@ public: QString localGeoIpDatabase() const; /** Sets the file to use as a local GeoIP database. */ void setLocalGeoIpDatabase(const QString &databaseFile); + + /** Get the icon preference */ + QString getIconPref() const; + + /** Set the icon preference */ + void setIconPref(const QString &iconPref); }; #endif

1 0

[vidalia/master] Improve Jason's patch with Matt's suggestions
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 1a4249ab2e678349c508dc1d6bdbf85a638d311b Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Sep 1 15:56:39 2011 -0300 Improve Jason's patch with Matt's suggestions --- pkg/osx/MacOSXBundleInfo.plist.in | 38 -------------------------------- src/vidalia/CMakeLists.txt | 7 ++++- src/vidalia/HelperProcess.cpp | 17 ++++++++++++++ src/vidalia/HelperProcess.h | 2 + src/vidalia/MainWindow.cpp | 6 +++- src/vidalia/config/AppearancePage.cpp | 24 ++++++++++---------- src/vidalia/config/VidaliaSettings.cpp | 33 +++++++++++++++++++++------ src/vidalia/config/VidaliaSettings.h | 12 ++++++++- 8 files changed, 76 insertions(+), 63 deletions(-) diff --git a/pkg/osx/MacOSXBundleInfo.plist.in b/pkg/osx/MacOSXBundleInfo.plist.in deleted file mode 100644 index 3b5bfe0..0000000 --- a/pkg/osx/MacOSXBundleInfo.plist.in +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string> - <key>CFBundleGetInfoString</key> - <string>${MACOSX_BUNDLE_INFO_STRING}</string> - <key>CFBundleIconFile</key> - <string>${MACOSX_BUNDLE_ICON_FILE}</string> - <key>CFBundleIdentifier</key> - <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleLongVersionString</key> - <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string> - <key>CFBundleName</key> - <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string> - <key>CSResourcesFileMapped</key> - <true/> - <key>LSRequiresCarbon</key> - <true/> - <key>NSHumanReadableCopyright</key> - <string>${MACOSX_BUNDLE_COPYRIGHT}</string> - <key>LSUIElement</key> - <string>1</string> -</dict> -</plist> diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index be3e012..52ba510 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -361,8 +361,11 @@ if (APPLE) set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/) add_executable(${vidalia_BIN} MACOSX_BUNDLE ${vidalia_SRCS}) - ## Specify location of custom Info.plist file - set_target_properties(${vidalia_BIN} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ../pkg/osx/MacOSXBundleInfo.plist.in) + ## Specify location of custom Info.plist file + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in + ${CMAKE_CURRENT_BINARY_DIR}/MacOSXBundleInfo.plist) + set_target_properties(${vidalia_BIN} PROPERTIES MACOSX_BUNDLE_INFO_PLIST + ${CMAKE_CURRENT_BINARY_DIR}/MacOSXBundleInfo.plist) ## Get the location of the app bundle for the current configuration get_target_property(VIDALIA_EXECUTABLE ${vidalia_BIN} LOCATION) diff --git a/src/vidalia/HelperProcess.cpp b/src/vidalia/HelperProcess.cpp index 0abc848..b80f151 100644 --- a/src/vidalia/HelperProcess.cpp +++ b/src/vidalia/HelperProcess.cpp @@ -45,6 +45,9 @@ #include <QString> #include <QFileInfo> +#ifdef Q_WS_MAC +#include <Carbon/Carbon.h> +#endif /** Default constructor */ HelperProcess::HelperProcess(QObject *parent) @@ -131,3 +134,17 @@ HelperProcess::isDone() const return state() == NotRunning; } +void +HelperProcess::toForeground() +{ +#if defined(Q_WS_MAC) + ProcessSerialNumber psn; + OSStatus st; + + do { + st = GetProcessForPID(pid(), &psn); + } while(st == -600); + + SetFrontProcess(&psn); +#endif +} diff --git a/src/vidalia/HelperProcess.h b/src/vidalia/HelperProcess.h index cf2b234..62aef98 100644 --- a/src/vidalia/HelperProcess.h +++ b/src/vidalia/HelperProcess.h @@ -58,6 +58,8 @@ public: void start(const QString &app, const QStringList &args); /** Returns true iff process is not running. */ bool isDone() const; + /** Bring process to foreground */ + void toForeground(); signals: /** Invoked when start() fails. */ diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 967e2df..d646ebe 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -222,7 +222,7 @@ MainWindow::MainWindow() #if defined(Q_WS_MAC) /* Display OSX dock icon if icon preference is not set to "Tray Only" */ - if (settings.getIconPref() != "Tray") { + if (settings.getIconPref() != VidaliaSettings::Tray) { ProcessSerialNumber psn = { 0, kCurrentProcess }; TransformProcessType(&psn, kProcessTransformToForegroundApplication); } @@ -589,7 +589,7 @@ MainWindow::setTrayIcon(const QString &iconFile) VidaliaSettings settings; QApplication::setWindowIcon(QPixmap(iconFile)); /* only display tray icon if icon preference is not set to "Dock Only" */ - if (settings.getIconPref() != "Dock") + if (settings.getIconPref() != VidaliaSettings::Dock) _trayIcon.setIcon(QIcon(iconFile)); #else /* always display tray icon for other platforms */ @@ -648,6 +648,7 @@ MainWindow::launchBrowserFromDirectory() /* Launch the browser */ _browserProcess->start(browserExecutable, commandLine); + _browserProcess->toForeground(); } /** Starts the web browser and IM client, if appropriately configured */ @@ -665,6 +666,7 @@ MainWindow::startSubprocesses() /* BrowserDirectory is not set, but BrowserExecutable is; use this */ _browserProcess->setEnvironment(updateBrowserEnv()); _browserProcess->start(subprocess, QStringList()); + _browserProcess->toForeground(); } /* Launch the IM client */ diff --git a/src/vidalia/config/AppearancePage.cpp b/src/vidalia/config/AppearancePage.cpp index 647b67a..95998e9 100644 --- a/src/vidalia/config/AppearancePage.cpp +++ b/src/vidalia/config/AppearancePage.cpp @@ -76,14 +76,14 @@ AppearancePage::save(QString &errmsg) #if defined(Q_WS_MAC) /* Save new icon preference */ if(ui.rdoIconPrefDock->isChecked()) { - _settings->setIconPref("Dock"); + _settings->setIconPref(VidaliaSettings::Dock); } else if(ui.rdoIconPrefTray->isChecked()) { - _settings->setIconPref("Tray"); + _settings->setIconPref(VidaliaSettings::Tray); } else { /* default setting */ - _settings->setIconPref("Both"); + _settings->setIconPref(VidaliaSettings::Both); } #endif @@ -101,16 +101,16 @@ AppearancePage::load() ui.cmboStyle->setCurrentIndex(index); #if defined(Q_WS_MAC) - /* set current icon preference */ - ui.rdoIconPrefBoth->setChecked(_settings->getIconPref() == "Both"); - ui.rdoIconPrefTray->setChecked(_settings->getIconPref() == "Tray"); - ui.rdoIconPrefDock->setChecked(_settings->getIconPref() == "Dock"); + /* set current icon preference */ + ui.rdoIconPrefBoth->setChecked(_settings->getIconPref() == VidaliaSettings::Both); + ui.rdoIconPrefTray->setChecked(_settings->getIconPref() == VidaliaSettings::Tray); + ui.rdoIconPrefDock->setChecked(_settings->getIconPref() == VidaliaSettings::Dock); #else - /* hide preference on non-OSX platforms */ - ui.grpIconPref->setVisible(false); - ui.rdoIconPrefBoth->setVisible(false); - ui.rdoIconPrefTray->setVisible(false); - ui.rdoIconPrefDock->setVisible(false); + /* hide preference on non-OSX platforms */ + ui.grpIconPref->setVisible(false); + ui.rdoIconPrefBoth->setVisible(false); + ui.rdoIconPrefTray->setVisible(false); + ui.rdoIconPrefDock->setVisible(false); #endif } diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 858ca8e..85b70e9 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -46,7 +46,7 @@ #endif #if defined(Q_WS_MAC) -#define SETTING_ICON_PREF "IconPref" +#define SETTING_ICON_PREF "IconDisplayPreference" #endif /** Default Constructor */ @@ -85,7 +85,7 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_LAST_UPDATE_CHECK, QDateTime()); setDefault(SETTING_USE_LOCAL_GEOIP_DATABASE, false); setDefault(SETTING_LOCAL_GEOIP_DATABASE, ""); - setDefault(SETTING_ICON_PREF, "Both"); + setDefault(SETTING_ICON_PREF, Both); } /** Gets the currently preferred language code for Vidalia. */ @@ -326,15 +326,34 @@ VidaliaSettings::setLocalGeoIpDatabase(const QString &databaseFile) } /** Get the icon preference */ -QString -VidaliaSettings::getIconPref() const +VidaliaSettings::IconPosition +VidaliaSettings::getIconPref() { - return value(SETTING_ICON_PREF).toString(); + return fromString(value(SETTING_ICON_PREF).toString()); } /** Set the icon preference */ void -VidaliaSettings::setIconPref(const QString &iconPref) +VidaliaSettings::setIconPref(const IconPosition iconPref) +{ + setValue(SETTING_ICON_PREF, toString(iconPref)); +} + +QString +VidaliaSettings::toString(const IconPosition iconPref) { - setValue(SETTING_ICON_PREF, iconPref); + switch(iconPref) { + case Dock: return "Dock"; + case Tray: return "Tray"; + default: return "Both"; + } +} + +VidaliaSettings::IconPosition +VidaliaSettings::fromString(QString iconPref) +{ + if(iconPref == "Dock") return Dock; + if(iconPref == "Tray") return Tray; + + return Both; } diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h index 2efec12..6cbdefb 100644 --- a/src/vidalia/config/VidaliaSettings.h +++ b/src/vidalia/config/VidaliaSettings.h @@ -33,6 +33,12 @@ class VidaliaSettings : public VSettings Q_OBJECT public: + enum IconPosition { + Tray, + Dock, + Both, + }; + /** Default constructor. */ VidaliaSettings(); @@ -127,10 +133,12 @@ public: void setLocalGeoIpDatabase(const QString &databaseFile); /** Get the icon preference */ - QString getIconPref() const; + IconPosition getIconPref(); /** Set the icon preference */ - void setIconPref(const QString &iconPref); + void setIconPref(const IconPosition iconPref); + QString toString(const IconPosition iconPref); + IconPosition fromString(QString iconPref); }; #endif

1 0

[vidalia/master] Adds a changes file
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit e43e1c9b7a4c26fc68aed4ade04184ab8ed4d333 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Sep 7 13:57:11 2011 -0300 Adds a changes file --- changes/bug3843 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug3843 b/changes/bug3843 new file mode 100644 index 0000000..6ccd062 --- /dev/null +++ b/changes/bug3843 @@ -0,0 +1,2 @@ + o Check tor version and that settings are sanitized before trying to + use the port autoconfiguration feature. Fixes bug 3843. \ No newline at end of file

1 0