December 2011 - tor-commits - lists.torproject.org

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

24 Dec '11

commit 8861dad970f60dc9c9cf888148cfd72ba5be4d15 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. Conflicts: src/vidalia/MainWindow.cpp src/vidalia/config/VidaliaSettings.cpp src/vidalia/config/VidaliaSettings.h --- pkg/osx/MacOSXBundleInfo.plist.in | 38 ++++++++++++++++++++++ src/vidalia/CMakeLists.txt | 3 ++ src/vidalia/MainWindow.cpp | 23 +++++++++++++- src/vidalia/config/AppearancePage.cpp | 28 ++++++++++++++++ src/vidalia/config/AppearancePage.ui | 55 ++++++++++++++++++++++++++++++++ src/vidalia/config/VidaliaSettings.cpp | 16 +++++++++ src/vidalia/config/VidaliaSettings.h | 7 ++++ 7 files changed, 169 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 9fd58ca..efd9c7e 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -336,6 +336,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 8dbf8ae..8b57e24 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -43,6 +43,10 @@ #include <QtGui> +#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" @@ -115,6 +119,16 @@ MainWindow::MainWindow() _status = Unset; _isVidaliaRunningTor = false; updateTorStatus(Stopped); + +#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 */ @@ -1420,9 +1434,16 @@ 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 } /** Converts a TorStatus enum value to a string for debug logging purposes. */ 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 aa4d18b..5cbf067 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -46,6 +46,7 @@ #define VIDALIA_REG_KEY "Vidalia" #endif +#define SETTING_ICON_PREF "IconPref" /** Default Constructor */ VidaliaSettings::VidaliaSettings() @@ -84,6 +85,7 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_USE_LOCAL_GEOIP_DATABASE, false); setDefault(SETTING_LOCAL_GEOIP_DATABASE, ""); setDefault(SETTING_PLUGIN_PATH, vApp->dataDirectory()); + setDefault(SETTING_ICON_PREF, "Both"); } /** Gets the currently preferred language code for Vidalia. */ @@ -334,3 +336,17 @@ VidaliaSettings::setPluginPath(const QString &path) { setValue(SETTING_PLUGIN_PATH, path); } + +/** 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 029657f..da8f0a4 100644 --- a/src/vidalia/config/VidaliaSettings.h +++ b/src/vidalia/config/VidaliaSettings.h @@ -130,6 +130,13 @@ public: QString pluginPath() const; /** Sets the path where the plugins live */ void setPluginPath(const QString &path); + + /** Get the icon preference */ + QString getIconPref() const; + + /** Set the icon preference */ + void setIconPref(const QString &iconPref); +>>>>>>> 4df4ee1... Implement Icon Preference (appearance setting) in OSX (see #2163) }; #endif

1 0

[vidalia/alpha] Improve Jason's patch with Matt's suggestions
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit f1bd6c3f10bf16d9aa8a6f930bcc9c9035f7c6e4 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 Conflicts: src/vidalia/MainWindow.cpp src/vidalia/config/VidaliaSettings.cpp src/vidalia/config/VidaliaSettings.h --- 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 | 4 +- src/vidalia/config/AppearancePage.cpp | 24 ++++++++++---------- src/vidalia/config/VidaliaSettings.cpp | 32 +++++++++++++++++++++----- src/vidalia/config/VidaliaSettings.h | 13 ++++++++-- 8 files changed, 74 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 efd9c7e..4a28504 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -336,8 +336,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 8b57e24..e20bb08 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -122,7 +122,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); } @@ -1438,7 +1438,7 @@ MainWindow::setTrayIcon(const QString &iconFile) 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 */ 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 5cbf067..022c427 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -84,8 +84,9 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_LAST_UPDATE_CHECK, QDateTime()); setDefault(SETTING_USE_LOCAL_GEOIP_DATABASE, false); setDefault(SETTING_LOCAL_GEOIP_DATABASE, ""); + setDefault(SETTING_PLUGIN_PATH, vApp->dataDirectory()); - setDefault(SETTING_ICON_PREF, "Both"); + setDefault(SETTING_ICON_PREF, Both); } /** Gets the currently preferred language code for Vidalia. */ @@ -338,15 +339,34 @@ VidaliaSettings::setPluginPath(const QString &path) } /** 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 da8f0a4..bb6f1a0 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(); @@ -132,11 +138,12 @@ public: void setPluginPath(const QString &path); /** Get the icon preference */ - QString getIconPref() const; + IconPosition getIconPref(); /** Set the icon preference */ - void setIconPref(const QString &iconPref); ->>>>>>> 4df4ee1... Implement Icon Preference (appearance setting) in OSX (see #2163) + void setIconPref(const IconPosition iconPref); + QString toString(const IconPosition iconPref); + IconPosition fromString(QString iconPref); }; #endif

1 0

[vidalia/alpha] Add sleep to the plugin engine
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 41d32ca0135e88e45b4faecc3a2715bc08c1fe7d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 10:44:40 2011 -0300 Add sleep to the plugin engine Also, make sleep work on Windows when waiting for port.conf --- src/vidalia/MainWindow.cpp | 5 +++++ src/vidalia/plugin/PluginEngine.cpp | 18 ++++++++++++++++++ src/vidalia/plugin/PluginEngine.h | 1 + 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index e20bb08..88cb300 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -121,6 +121,7 @@ MainWindow::MainWindow() updateTorStatus(Stopped); #if defined(Q_WS_MAC) + VidaliaSettings settings; /* Display OSX dock icon if icon preference is not set to "Tray Only" */ if (settings.getIconPref() != VidaliaSettings::Tray) { ProcessSerialNumber psn = { 0, kCurrentProcess }; @@ -661,7 +662,11 @@ MainWindow::started() while((!file.open(QIODevice::ReadOnly | QIODevice::Text)) and (tries++ < maxtries)) { vWarn(QString("This is try number: %1.").arg(tries)); +#if defined(Q_WS_WIN) + Sleep(1000); +#else sleep(1); +#endif } if(tries >= maxtries) { diff --git a/src/vidalia/plugin/PluginEngine.cpp b/src/vidalia/plugin/PluginEngine.cpp index 41f9712..b3c35c1 100644 --- a/src/vidalia/plugin/PluginEngine.cpp +++ b/src/vidalia/plugin/PluginEngine.cpp @@ -36,6 +36,7 @@ PluginEngine::PluginEngine(QObject *parent) globalObject().setProperty("importExtension", newFunction(importExtension)); globalObject().setProperty("vdebug", newFunction(vdebug)); globalObject().setProperty("findWidget", newFunction(findWidget)); + globalObject().setProperty("sleep", newFunction(sleep)); VidaliaSettings settings; globalObject().setProperty("pluginPath", QScriptValue(settings.pluginPath())); @@ -201,3 +202,20 @@ PluginEngine::findWidget(QScriptContext *context, QScriptEngine *engine) return ret; } + +QScriptValue +PluginEngine::sleep(QScriptContext *context, QScriptEngine *engine) +{ + if(context->argumentCount() != 1) + return context->throwError(QString("sleep must be called with 1 parameter.")); + + int s = context->argument(1).toInt32(); + +#if defined(Q_WS_WIN) + Sleep(s*1000); +#else + !::sleep(s); +#endif + + return engine->nullValue(); +} diff --git a/src/vidalia/plugin/PluginEngine.h b/src/vidalia/plugin/PluginEngine.h index 2251e6c..c13e1cd 100644 --- a/src/vidalia/plugin/PluginEngine.h +++ b/src/vidalia/plugin/PluginEngine.h @@ -51,6 +51,7 @@ class PluginEngine : public QScriptEngine { // static QScriptValue includeScript(QScriptContext *context, QScriptEngine *engine); static QScriptValue vdebug(QScriptContext *context, QScriptEngine *engine); static QScriptValue findWidget(QScriptContext *context, QScriptEngine *engine); + static QScriptValue sleep(QScriptContext *context, QScriptEngine *engine); void loadAllPlugins(); void tryLoadPlugin(QDir path);

1 0

[vidalia/alpha] Adds a changes file
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 90f6631356968f97ab5993bec5264a3443f4192b 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/alpha] Improve a bit the string formatting
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit eec3363e4f1aa3023f3185b48bbe95302b14a718 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 10:46:52 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 88cb300..df4048b 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -672,7 +672,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/alpha] Merge branch 'bug3759_basiclog' into alpha
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 3668bd48a2342735c50a50ad0550220ccfea0de6 Merge: a9680d7 c121db9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 11:19:21 2011 -0300 Merge branch 'bug3759_basiclog' into alpha 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/alpha] Merge branch 'bug3342_time' into alpha
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 18eb653619600be620e997f87939cbe6827b88bb Merge: ced6b22 3e2eed6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 10:54:22 2011 -0300 Merge branch 'bug3342_time' into alpha changes/bug3342 | 2 ++ src/vidalia/config/ServerPage.cpp | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-)

1 0

[vidalia/alpha] Merge branch 'bug2188_bwgraph' into alpha
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit ced6b222368d99588948cdc4da6f4efd59193070 Merge: eec3363 86ec8d9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 10:53:35 2011 -0300 Merge branch 'bug2188_bwgraph' into alpha changes/bug2188 | 2 + src/vidalia/bwgraph/GraphFrame.cpp | 45 ++++++++++++++++++++++++++++++----- src/vidalia/bwgraph/GraphFrame.h | 4 +++ 3 files changed, 44 insertions(+), 7 deletions(-)

1 0

[vidalia/alpha] Provide toForeground for plugins
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit a9680d7b4055935d57791b01e1acf7cafc42610a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 11:19:04 2011 -0300 Provide toForeground for plugins --- .../plugin/prototypes/HelperProcessPrototype.cpp | 9 +++++++++ .../plugin/prototypes/HelperProcessPrototype.h | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp b/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp index 6b91660..2de8cf6 100644 --- a/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp +++ b/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp @@ -89,3 +89,12 @@ HelperProcessPrototype::state() return HelperProcess::NotRunning; } + +void +HelperProcessPrototype::toForeground() +{ + HelperProcess *obj = qscriptvalue_cast<HelperProcess *>(thisObject()); + + if(obj) + obj->toForeground(); +} diff --git a/src/vidalia/plugin/prototypes/HelperProcessPrototype.h b/src/vidalia/plugin/prototypes/HelperProcessPrototype.h index 1dae103..671a9f4 100644 --- a/src/vidalia/plugin/prototypes/HelperProcessPrototype.h +++ b/src/vidalia/plugin/prototypes/HelperProcessPrototype.h @@ -22,6 +22,7 @@ class HelperProcessPrototype : public QObject, public QScriptable Q_INVOKABLE QStringList systemEnvironment(); Q_INVOKABLE void setEnvironment(const QStringList &env); Q_INVOKABLE QProcess::ProcessState state(); + Q_INVOKABLE void toForeground(); }; Q_DECLARE_METATYPE(HelperProcess *);

1 0

[vidalia/alpha] Merge branch 'bug3898_auth' into alpha
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 29eeb14d7e5924b44a26b5090c5fbb4435233662 Merge: 3668bd4 8ab2ccd Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 11:22:29 2011 -0300 Merge branch 'bug3898_auth' into alpha changes/bug3898 | 3 + src/vidalia/MainWindow.cpp | 98 +++++++++++++++++++++++++++----------------- src/vidalia/MainWindow.h | 4 ++ 3 files changed, 67 insertions(+), 38 deletions(-)

1 0