- tor-commits - lists.torproject.org

[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

[vidalia/master] Change QTime for QDateTime in StatusEventWidget/Item
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 5e0de05b039b3e23b5287c92dd169c0784856ca6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Sep 7 12:21:41 2011 -0300 Change QTime for QDateTime in StatusEventWidget/Item --- src/vidalia/log/StatusEventItem.cpp | 12 ++++++------ src/vidalia/log/StatusEventItem.h | 6 +++--- src/vidalia/log/StatusEventWidget.cpp | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/vidalia/log/StatusEventItem.cpp b/src/vidalia/log/StatusEventItem.cpp index ef62360..a0ec2b2 100644 --- a/src/vidalia/log/StatusEventItem.cpp +++ b/src/vidalia/log/StatusEventItem.cpp @@ -15,7 +15,7 @@ #include "StatusEventItem.h" -#include <QTime> +#include <QDateTime> #include <QPixmap> #include <QString> @@ -25,15 +25,15 @@ StatusEventItem::StatusEventItem(QTreeWidget *parent) } void -StatusEventItem::setTimestamp(const QTime &timestamp) +StatusEventItem::setTimestamp(const QDateTime &timestamp) { setData(0, TimestampRole, timestamp); } -QTime +QDateTime StatusEventItem::timestamp() const { - return data(0, TimestampRole).toTime(); + return data(0, TimestampRole).toDateTime(); } void @@ -101,8 +101,8 @@ StatusEventItem::toString() const bool StatusEventItem::operator<(const QTreeWidgetItem &other) const { - QTime a = data(0, TimestampRole).toTime(); - QTime b = other.data(0, TimestampRole).toTime(); + QDateTime a = data(0, TimestampRole).toDateTime(); + QDateTime b = other.data(0, TimestampRole).toDateTime(); return (a < b); } diff --git a/src/vidalia/log/StatusEventItem.h b/src/vidalia/log/StatusEventItem.h index 8e599a2..8aeb1cd 100644 --- a/src/vidalia/log/StatusEventItem.h +++ b/src/vidalia/log/StatusEventItem.h @@ -18,7 +18,7 @@ #include <QTreeWidgetItem> -class QTime; +class QDateTime; class QPixmap; class QString; @@ -44,12 +44,12 @@ public: /** Sets the <b>timestamp</b> at which this status event occurred. * \sa timestamp() */ - void setTimestamp(const QTime &timestamp); + void setTimestamp(const QDateTime &timestamp); /** Returns the timestamp at which this status event occurred. * \sa setTimestamp() */ - QTime timestamp() const; + QDateTime timestamp() const; /** Sets the icon to be drawn along with this status event to <b>pixmap</b>. * \sa icon() diff --git a/src/vidalia/log/StatusEventWidget.cpp b/src/vidalia/log/StatusEventWidget.cpp index 4bd11d0..c496aa1 100644 --- a/src/vidalia/log/StatusEventWidget.cpp +++ b/src/vidalia/log/StatusEventWidget.cpp @@ -186,7 +186,7 @@ StatusEventWidget::find(const QString &text, bool highlight) continue; if (item->title().contains(text, Qt::CaseInsensitive) - || item->description().contains(text, Qt::CaseInsensitive)) { + || item->description().contains(text, Qt::CaseInsensitive)) { items.append(item); if (highlight) item->setSelected(true); @@ -217,7 +217,7 @@ StatusEventWidget::addNotification(const QPixmap &icon, // Create the new notification item StatusEventItem *item = new StatusEventItem(this); - item->setTimestamp(QTime::currentTime()); + item->setTimestamp(QDateTime::currentDateTime()); item->setIcon(icon); item->setTitle(title); item->setDescription(description);

1 0

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

07 Oct '11

commit 19f605cabab8f3ceb0f667db327f56688f98849d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Sep 7 13:44:46 2011 -0300 Add a changes file --- changes/bug3759 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug3759 b/changes/bug3759 new file mode 100644 index 0000000..b7dc074 --- /dev/null +++ b/changes/bug3759 @@ -0,0 +1,3 @@ + o Change the parameter for ordering the entries in the Basic Log + list from currentTime to currentDateTime to avoid missplacing + entries from different days. \ No newline at end of file

1 0

[vidalia/master] Check if autoconfiguration failed because tor died
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit da4b003b22680968429c317559f9fea0dd7f2b3b Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Aug 30 20:05:17 2011 -0300 Check if autoconfiguration failed because tor died --- src/vidalia/MainWindow.cpp | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 4e86811..a7d43ff 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1163,9 +1163,15 @@ MainWindow::started() if(tries >= maxtries) { vWarn("Couldn't read port.conf file"); - connectFailed(QString("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n %2") - .arg(file.fileName()) - .arg(file.errorString())); + if(_torControl->isRunning()) { + connectFailed(tr("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n %2") + .arg(file.fileName()) + .arg(file.errorString())); + } else { + vWarn("Tor isn't running!"); + connectFailed(tr("It seems Tor has stopped running since Vidalia started it.\n\nSee the Advanced Message Log for more information.")); + } + return; }

1 0

[vidalia/master] Improve a bit the string formatting
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit ed1bd21a28737bee2210b22b86a0d9c96a41f053 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Aug 30 20:44:49 2011 -0300 Improve a bit the string formatting --- src/vidalia/MainWindow.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index a7d43ff..8e2c8ca 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1164,7 +1164,7 @@ MainWindow::started() if(tries >= maxtries) { vWarn("Couldn't read port.conf file"); if(_torControl->isRunning()) { - connectFailed(tr("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n %2") + connectFailed(tr("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n%2") .arg(file.fileName()) .arg(file.errorString())); } else {

1 0

[vidalia/master] Compute max with only the visible points in bwgraph
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit a08aa988a29ffa4d6db93250fe7589cd61395e09 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Sat May 21 14:43:41 2011 -0300 Compute max with only the visible points in bwgraph If the max is global instead of local, a peak in the connection will make the rest of the graph too small. --- src/vidalia/bwgraph/GraphFrame.cpp | 45 ++++++++++++++++++++++++++++++----- src/vidalia/bwgraph/GraphFrame.h | 4 +++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/vidalia/bwgraph/GraphFrame.cpp b/src/vidalia/bwgraph/GraphFrame.cpp index c9537a0..c5d3f60 100644 --- a/src/vidalia/bwgraph/GraphFrame.cpp +++ b/src/vidalia/bwgraph/GraphFrame.cpp @@ -15,7 +15,7 @@ #include "GraphFrame.h" -#include <QtGlobal> +#include <QtGui> /** Default contructor */ @@ -31,7 +31,8 @@ GraphFrame::GraphFrame(QWidget *parent) /* Initialize graph values */ _recvData->prepend(0); _sendData->prepend(0); - _maxPoints = getNumPoints(); + _maxPoints = getNumPoints(); + _maxPosition = 0; _showRecv = true; _showSend = true; _maxValue = MIN_SCALE; @@ -51,9 +52,7 @@ GraphFrame::~GraphFrame() int GraphFrame::getNumPoints() { - QDesktopWidget *desktop = QApplication::desktop(); - int width = desktop->width(); - return width; + return size().width() - _scaleWidth; } /** Adds new data points to the graph. */ @@ -66,6 +65,18 @@ GraphFrame::addPoints(qreal recv, qreal send) _recvData->removeLast(); } + /* Update the displayed maximum */ + if (_maxPosition >= _maxPoints) { + _maxValue = MIN_SCALE; + foreach(qreal send, *_sendData) + if(send > _maxValue) + _maxValue = send; + foreach(qreal recv, *_recvData) + if(recv > _maxValue) + _maxValue = recv; + _maxPosition = 0; + } + /* Add the points to their respective lists */ _sendData->prepend(send); _recvData->prepend(recv); @@ -74,9 +85,23 @@ GraphFrame::addPoints(qreal recv, qreal send) _totalSend += send; _totalRecv += recv; + bool maxUpdated = false; /* Check for a new maximum value */ - if (send > _maxValue) _maxValue = send; - if (recv > _maxValue) _maxValue = recv; + if (send > _maxValue) { + _maxValue = send; + maxUpdated = true; + } + + if (recv > _maxValue) { + _maxValue = recv; + maxUpdated = true; + } + + if (maxUpdated) { + _maxPosition = 0; + } else { + _maxPosition++; + } this->update(); } @@ -318,3 +343,9 @@ GraphFrame::paintScale() _painter->drawLine(_scaleWidth, top, _scaleWidth, bottom); } +void +GraphFrame::resizeEvent(QResizeEvent *ev) +{ + _maxPoints = ev->size().width() - _scaleWidth; + _maxPoints /= SCROLL_STEP; +} diff --git a/src/vidalia/bwgraph/GraphFrame.h b/src/vidalia/bwgraph/GraphFrame.h index 4819396..8e29cc2 100644 --- a/src/vidalia/bwgraph/GraphFrame.h +++ b/src/vidalia/bwgraph/GraphFrame.h @@ -89,6 +89,8 @@ private: /** Paints an integral using the supplied data. */ void paintIntegral(QVector<QPointF> points, QColor color, qreal alpha = 1.0); + void resizeEvent(QResizeEvent *ev); + /** Style with which the bandwidth data will be graphed. */ GraphStyle _graphStyle; /** A QPainter object that handles drawing the various graph elements. */ @@ -101,6 +103,8 @@ private: QRect _rec; /** The maximum data value plotted. */ qreal _maxValue; + /** The position of the local maximum in the displayed bandwidth */ + int _maxPosition; /** The maximum number of points to store. */ int _maxPoints; /** The total data sent/recv. */

1 0

[vidalia/master] Force qdatetime to be UTC before converting to LocalTime
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 02765836b3b284fea26a30d9baa05e05b0fcf12f Author: Tomas Touceda <chiiph(a)torproject.org> Date: Thu Jun 2 23:00:48 2011 -0300 Force qdatetime to be UTC before converting to LocalTime --- src/vidalia/config/ServerPage.cpp | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp index aaadbfc..1579286 100644 --- a/src/vidalia/config/ServerPage.cpp +++ b/src/vidalia/config/ServerPage.cpp @@ -590,6 +590,9 @@ ServerPage::displayBridgeUsage() if (!timeStarted.isValid()) goto err; + // Default is LocalTime, force UTC + timeStarted.setTimeSpec(Qt::UTC); + QStringList summary = keyvals.value("CountrySummary") .split(",", QString::SkipEmptyParts); if (summary.isEmpty()) {

1 0

[vidalia/master] Add more checks to make the controlport auto config better
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 0bd00acdb7bdefc5df31f20c0579632cf3ec0875 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Aug 29 18:41:12 2011 -0300 Add more checks to make the controlport auto config better It checks if DataDirectory is empty, and disables the feature in such case. It also checks the tor version and doesn't let the user save the configuration if she hasn't added a DataDirectory when "Configure ControlPort automatically" is checked. --- src/vidalia/MainWindow.cpp | 8 ++++++++ src/vidalia/config/AdvancedPage.cpp | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index b159d2e..4e86811 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -995,6 +995,14 @@ MainWindow::start() updateTorStatus(Starting); + // Disable autoconfiguration if there are missing config data + if(settings.autoControlPort()) { + if(settings.getDataDirectory().isEmpty()) { + vWarn("Disabling ControlPort autoconfiguration. DataDirectory is empty!"); + settings.setAutoControlPort(false); + } + } + /* Check if Tor is already running separately */ if(settings.getControlMethod() == ControlMethod::Port) { if(!settings.autoControlPort() && net_test_connect(settings.getControlAddress(), diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index 12842bc..865516d 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -121,6 +121,16 @@ AdvancedPage::save(QString &errmsg) QHostAddress controlAddress(ui.lineControlAddress->text()); QString path(ui.lineSocketPath->text()); + if(ui.chkAuto->isChecked()) { + if(ui.lineTorDataDirectory->text().isEmpty()) { + errmsg = tr("You've checked the autoconfiguration option for the ControlPort, but" + " provided no Data Directory. Please add one, or uncheck the" + " \"Configure ControlPort automatically\" option."); + return false; + } + _settings->setAutoControlPort(true); + } + /* Validate the control settings */ if(ui.rdoControlPort->isChecked()) { if (controlAddress.isNull()) { @@ -190,7 +200,6 @@ AdvancedPage::save(QString &errmsg) _settings->setControlPort(ui.lineControlPort->text().toUShort()); } _settings->setSocketPath(ui.lineSocketPath->text()); - _settings->setAutoControlPort(ui.chkAuto->isChecked()); _settings->setAuthenticationMethod(authMethod); _settings->setUseRandomPassword(ui.chkRandomPassword->isChecked()); @@ -233,6 +242,11 @@ AdvancedPage::load() ui.chkUseService->setChecked(s.isInstalled()); #endif #endif + + if(Vidalia::torControl()->getTorVersion() < 0x2021a) { // 0x2021a == 0.2.2.26 + ui.chkAuto->setChecked(false); + ui.chkAuto->setVisible(false); + } } /** Called when the user selects a different authentication method from the

1 0