- tor-commits - lists.torproject.org

[vidalia/master] Revert the disable checkboxes idea for usability issues
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 0bbd224041d764ecd7fd8caebe73b5f5feb9fe5e Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 3 16:52:43 2011 -0300 Revert the disable checkboxes idea for usability issues The tab is disabled for both bridge and non-exit to be more clear about the fact that exit policies don't apply. Conflicts: src/vidalia/config/ServerPage.cpp --- src/vidalia/config/ServerPage.cpp | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp index f56d3d5..28308d8 100644 --- a/src/vidalia/config/ServerPage.cpp +++ b/src/vidalia/config/ServerPage.cpp @@ -259,12 +259,9 @@ ServerPage::serverModeChanged(bool enabled) 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()); + /* Disable the Exit Policies tab when bridge or non-exit relay mode is + * selected */ + ui.tabsMenu->setTabEnabled(2, !bridgeEnabled and !ui.rdoNonExitMode->isChecked()); } /** Returns true if the user has changed their server settings since the

1 0

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

07 Oct '11

commit 550fc048733a0d062a7f6e131b789c20ba630ecc Merge: 0a369b2 86ec8d9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 9 10:48:09 2011 -0300 Merge branch 'bug2188_bwgraph' 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/master] Merge branch 'feat2644_backport'
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 928e8ba257a101f7cd59dc828ab2d8a5bda157db Merge: 4a084f1 2ec2ae2 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 9 10:47:19 2011 -0300 Merge branch 'feat2644_backport' changes/bug2644 | 3 + src/vidalia/config/ServerPage.cpp | 99 ++++++++++++++++++++------------- src/vidalia/config/ServerPage.ui | 17 ++++-- src/vidalia/config/ServerSettings.cpp | 18 ++++++- src/vidalia/config/ServerSettings.h | 6 ++ 5 files changed, 99 insertions(+), 44 deletions(-)

1 0

[vidalia/master] Make the definition of IconDisplayPreference crossplatform
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 09b8c0ba4dfa8b06d3c1e27c7fde90426e2a8a6f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Sep 10 16:40:48 2011 -0300 Make the definition of IconDisplayPreference crossplatform --- src/vidalia/config/VidaliaSettings.cpp | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 85b70e9..6cf3238 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -45,9 +45,7 @@ #define VIDALIA_REG_KEY "Vidalia" #endif -#if defined(Q_WS_MAC) #define SETTING_ICON_PREF "IconDisplayPreference" -#endif /** Default Constructor */ VidaliaSettings::VidaliaSettings()

1 0

[vidalia/master] Add the missing plist file
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit 08e9adf80ae2fffa6b2bf34685f281e81e7c3120 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Oct 4 15:43:53 2011 -0300 Add the missing plist file --- src/vidalia/MacOSXBundleInfo.plist.in | 38 +++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MacOSXBundleInfo.plist.in b/src/vidalia/MacOSXBundleInfo.plist.in new file mode 100644 index 0000000..3b5bfe0 --- /dev/null +++ b/src/vidalia/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>

1 0

[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