May 2012 - tor-commits - lists.torproject.org

[tor/master] Add some MSVC stuff to gitignore
by nickm＠torproject.org 14 May '12

14 May '12

commit 67690307fb4cdcce3022ce6864b38c33340f9bb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 12:35:10 2012 -0400 Add some MSVC stuff to gitignore --- .gitignore | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 26e9e38..3a28ecf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.swp # C stuff *.o +*.obj # Diff droppings *.orig *.rej @@ -122,8 +123,11 @@ /src/common/Makefile.in /src/common/common_sha1.i /src/common/libor.a +/src/common/libor.lib /src/common/libor-crypto.a +/src/common/libor-crypto.lib /src/common/libor-event.a +/src/common/libor-event.lib # /src/config/ /src/config/Makefile @@ -140,6 +144,7 @@ /src/or/tor /src/or/tor.exe /src/or/libtor.a +/src/or/libtor.lib # /src/test /src/test/Makefile

1 0

[tor/master] We do not need to define _WIN32 by hand; MSVC does that for us
by nickm＠torproject.org 14 May '12

14 May '12

commit c5e87ef234e2feb7ac892f31c4c7eaedc56b06b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 12:22:51 2012 -0400 We do not need to define _WIN32 by hand; MSVC does that for us Bug 5858; fix on 0.2.3.12-alpha --- changes/bug5858 | 4 ++++ src/win32/orconfig.h | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug5858 b/changes/bug5858 new file mode 100644 index 0000000..aa1e8bb --- /dev/null +++ b/changes/bug5858 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Remove bogus definition of "_WIN32" from src/win32/orconfig.h, to + unbreak the MSVC build. Fies bug 5858; bugfix on 0.2.3.12-alpha. + diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index f6bbf8b..a08d0c6 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -3,7 +3,6 @@ */ /* Windows-only defines. */ -#define _WIN32 #define CONFDIR "" /* Define to 1 if you have the <arpa/inet.h> header file. */

1 0

[tor/master] Cut down on the OS information we give.
by nickm＠torproject.org 14 May '12

14 May '12

commit a2f0e7a65bb2397087ce92cf23149686185de8e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 17:50:30 2012 -0400 Cut down on the OS information we give. For uname-based detection, we now give only the OS name (e.g., "Darwin", "Linux".) For Windows, we give only the Operating System name as inferred from dw(Major|Minor)version, (e.g., "Windows XP", "Windows 7"), and whether the VER_NT_SERVER flag is set. For ticket 2988. --- changes/bug2988 | 6 ++++++ src/common/compat.c | 49 ++++++++++++------------------------------------- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/changes/bug2988 b/changes/bug2988 new file mode 100644 index 0000000..88911e3 --- /dev/null +++ b/changes/bug2988 @@ -0,0 +1,6 @@ + o Minor features: + - The advertised platform of a router now includes only its + operating system's name (e.g., "Linux", "Darwin", "Windows 7"), + and not its service pack level (for Windows), or its CPU + architecture (for Unix). This is part of ticket 2988. + diff --git a/src/common/compat.c b/src/common/compat.c index 1680f66..2cc3c06 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2030,8 +2030,7 @@ get_uname(void) #ifdef HAVE_UNAME if (uname(&u) != -1) { /* (Linux says 0 is success, Solaris says 1 is success) */ - tor_snprintf(uname_result, sizeof(uname_result), "%s %s", - u.sysname, u.machine); + strlcpy(uname_result, u.sysname, sizeof(uname_result)); } else #endif { @@ -2039,8 +2038,6 @@ get_uname(void) OSVERSIONINFOEX info; int i; const char *plat = NULL; - const char *extra = NULL; - char acsd[MAX_PATH] = {0}; static struct { unsigned major; unsigned minor; const char *version; } win_version_table[] = { @@ -2065,20 +2062,11 @@ get_uname(void) uname_result_is_set = 1; return uname_result; } -#ifdef UNICODE - wcstombs(acsd, info.szCSDVersion, MAX_PATH); -#else - strlcpy(acsd, info.szCSDVersion, sizeof(acsd)); -#endif if (info.dwMajorVersion == 4 && info.dwMinorVersion == 0) { if (info.dwPlatformId == VER_PLATFORM_WIN32_NT) plat = "Windows NT 4.0"; else plat = "Windows 95"; - if (acsd[1] == 'B') - extra = "OSR2 (B)"; - else if (acsd[1] == 'C') - extra = "OSR2 (C)"; } else { for (i=0; win_version_table[i].major>0; ++i) { if (win_version_table[i].major == info.dwMajorVersion && @@ -2088,39 +2076,26 @@ get_uname(void) } } } - if (plat && !strcmp(plat, "Windows 98")) { - if (acsd[1] == 'A') - extra = "SE (A)"; - else if (acsd[1] == 'B') - extra = "SE (B)"; - } if (plat) { - if (!extra) - extra = acsd; - tor_snprintf(uname_result, sizeof(uname_result), "%s %s", - plat, extra); + strlcpy(uname_result, plat, sizeof(uname_result)); } else { if (info.dwMajorVersion > 6 || (info.dwMajorVersion==6 && info.dwMinorVersion>2)) tor_snprintf(uname_result, sizeof(uname_result), - "Very recent version of Windows [major=%d,minor=%d] %s", - (int)info.dwMajorVersion,(int)info.dwMinorVersion, - acsd); + "Very recent version of Windows [major=%d,minor=%d]", + (int)info.dwMajorVersion,(int)info.dwMinorVersion, + ); else tor_snprintf(uname_result, sizeof(uname_result), - "Unrecognized version of Windows [major=%d,minor=%d] %s", - (int)info.dwMajorVersion,(int)info.dwMinorVersion, - acsd); + "Unrecognized version of Windows [major=%d,minor=%d]", + (int)info.dwMajorVersion,(int)info.dwMinorVersion); } #if !defined (WINCE) -#ifdef VER_SUITE_BACKOFFICE - if (info.wProductType == VER_NT_DOMAIN_CONTROLLER) { - strlcat(uname_result, " [domain controller]", sizeof(uname_result)); - } else if (info.wProductType == VER_NT_SERVER) { - strlcat(uname_result, " [server]", sizeof(uname_result)); - } else if (info.wProductType == VER_NT_WORKSTATION) { - strlcat(uname_result, " [workstation]", sizeof(uname_result)); - } +#ifdef VER_NT_SERVER + if (info.wProductType == VER_NT_SERVER || + info.wProductType == VER_NT_DOMAIN_CONTROLLER) { + strlcat(uname_result, " [server]", sizeof(uname_result)); + } #endif #endif #else

1 0

[tor/master] Do not publish the "git-XXX" tag in server descriptors
by nickm＠torproject.org 14 May '12

14 May '12

commit 31eb73f88e858d4dedceb4a748cab5c068896036 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 18:06:12 2012 -0400 Do not publish the "git-XXX" tag in server descriptors Instead, allow packagers to put a 'TOR_BUILD_TAG' field in the server descriptor to indicate a platform-specific value, if they need to. (According to weasel, this was his use for the git- tag previously.) This is part of 2988 --- changes/bug2988 | 6 +++++- src/or/config.c | 22 ++++++++++++++++++++-- src/or/config.h | 1 + src/or/router.c | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/changes/bug2988 b/changes/bug2988 index 88911e3..aa141e8 100644 --- a/changes/bug2988 +++ b/changes/bug2988 @@ -3,4 +3,8 @@ operating system's name (e.g., "Linux", "Darwin", "Windows 7"), and not its service pack level (for Windows), or its CPU architecture (for Unix). This is part of ticket 2988. - + - Do not include the (git-XYZ) tag in published server descriptor + platform lines. This is part of ticket 2988. + - Allow packagers to insert an extra string in server descriptor + platform lines by setting the preprocessor variable TOR_BUILD_TAG. + This is part of ticket 2988. diff --git a/src/or/config.c b/src/or/config.c index d118354..dcc57f8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -783,6 +783,7 @@ extern const char tor_git_revision[]; /* from tor_main.c */ /** The version of this Tor process, as parsed. */ static char *the_tor_version = NULL; +static char *the_short_tor_version = NULL; /** Return the current Tor version. */ const char * @@ -790,14 +791,31 @@ get_version(void) { if (the_tor_version == NULL) { if (strlen(tor_git_revision)) { - tor_asprintf(&the_tor_version, "%s (git-%s)", VERSION, tor_git_revision); + tor_asprintf(&the_tor_version, "%s (git-%s)", get_short_version(), + tor_git_revision); } else { - the_tor_version = tor_strdup(VERSION); + the_tor_version = tor_strdup(get_short_version()); } } return the_tor_version; } +/** Return the current Tor version, without any git tag. */ +const char * +get_short_version(void) +{ + + if (the_short_tor_version == NULL) { +#ifdef TOR_BUILD_TAG + tor_asprintf(&the_short_tor_version, "%s (%s)", VERSION, TOR_BUILD_TAG); +#else + the_short_tor_version = tor_strdup(VERSION); +#endif + } + return the_short_tor_version; +} + + /** Release additional memory allocated in options */ static void diff --git a/src/or/config.h b/src/or/config.h index 0495186..a68a3e3 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -22,6 +22,7 @@ const char *safe_str(const char *address); const char *escaped_safe_str_client(const char *address); const char *escaped_safe_str(const char *address); const char *get_version(void); +const char *get_short_version(void); int config_get_lines(const char *string, config_line_t **result, int extended); void config_free_lines(config_line_t *front); diff --git a/src/or/router.c b/src/or/router.c index 4468c7b..a967f0d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1949,7 +1949,7 @@ router_guess_address_from_dir_headers(uint32_t *guess) void get_platform_str(char *platform, size_t len) { - tor_snprintf(platform, len, "Tor %s on %s", get_version(), get_uname()); + tor_snprintf(platform, len, "Tor %s on %s", get_short_version(), get_uname()); } /* XXX need to audit this thing and count fenceposts. maybe

1 0

[tor/master] Fix win32 compilation of 31eb73f88e8
by nickm＠torproject.org 14 May '12

14 May '12

commit b6028b9e8b4c97c503a5de83b89f411d003c531b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 12:08:05 2012 -0400 Fix win32 compilation of 31eb73f88e8 --- src/common/compat.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 2cc3c06..d40e503 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2083,8 +2083,7 @@ get_uname(void) (info.dwMajorVersion==6 && info.dwMinorVersion>2)) tor_snprintf(uname_result, sizeof(uname_result), "Very recent version of Windows [major=%d,minor=%d]", - (int)info.dwMajorVersion,(int)info.dwMinorVersion, - ); + (int)info.dwMajorVersion,(int)info.dwMinorVersion); else tor_snprintf(uname_result, sizeof(uname_result), "Unrecognized version of Windows [major=%d,minor=%d]",

1 0

[vidalia/master] visual feedback from vclicklabel when "pressed"
by chiiph＠torproject.org 14 May '12

14 May '12

commit 7c25ed518387ec31df516af1fe98ef121beb0f56 Author: Sebastian Baginski <sebthestampede(a)gmail.com> Date: Mon May 14 16:25:43 2012 +0200 visual feedback from vclicklabel when "pressed" --- changes/bug5766 | 3 +++ src/vidalia/VClickLabel.cpp | 32 +++++++++++++++++++++++++------- src/vidalia/VClickLabel.h | 3 +++ 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/changes/bug5766 b/changes/bug5766 new file mode 100644 index 0000000..6332721 --- /dev/null +++ b/changes/bug5766 @@ -0,0 +1,3 @@ + New Features: + o Add visual feedback from VClickLabel when in "pressed" state. + Resolves ticket 5766. diff --git a/src/vidalia/VClickLabel.cpp b/src/vidalia/VClickLabel.cpp index 0165de4..a20df07 100644 --- a/src/vidalia/VClickLabel.cpp +++ b/src/vidalia/VClickLabel.cpp @@ -25,6 +25,7 @@ VClickLabel::VClickLabel(QWidget *parent) { setCursor(Qt::PointingHandCursor); _flashToggle = false; + _isPressed = false; } /** Returns the current size hint for this widget's current contents. */ @@ -50,7 +51,7 @@ VClickLabel::paintEvent(QPaintEvent *e) QPainter p(this); QRect rect = this->rect(); - if(_flashToggle) { + if (_flashToggle || _isPressed) { p.setBrush(QColor(150,150,150)); rect.setX(rect.x()+1); rect.setY(rect.y()+1); @@ -60,30 +61,47 @@ VClickLabel::paintEvent(QPaintEvent *e) } rect = this->rect(); + + // when label is in "pressed" state, we will translate the pixmap and text + // a bit, just like regular buttons do + const int d = _isPressed ? 2 : 0; if (vApp->isLeftToRight()) { if (!_pixmap.isNull()) - p.drawPixmap(0, qMax((rect.height()-_pixmap.height())/2, 0), _pixmap); + p.drawPixmap(d, qMax((rect.height()-_pixmap.height())/2+d, 0), _pixmap); if (!_text.isEmpty()) - p.drawText(_pixmap.width()+2, (rect.height()+fontInfo().pixelSize())/2, _text); + p.drawText(_pixmap.width()+2+d, (rect.height()+fontInfo().pixelSize())/2+d, _text); } else { if (!_pixmap.isNull()) - p.drawPixmap(qMax(rect.right()-_pixmap.width(), 0), - qMax((rect.height()-_pixmap.height())/2, 0), _pixmap); + p.drawPixmap(qMax(rect.right()-_pixmap.width()-d, d), + qMax((rect.height()-_pixmap.height())/2-d, d), _pixmap); if (!_text.isEmpty()) { int textWidth = fontMetrics().width(_text); - p.drawText(qMax(rect.right()-_pixmap.width()-textWidth-2, 0), - (rect.height()+fontInfo().pixelSize())/2, _text); + p.drawText(qMax(rect.right()-_pixmap.width()-textWidth-2-d, d), + (rect.height()+fontInfo().pixelSize())/2-d, _text); } } e->accept(); } +/** Overloaded mouse event to remember click state. */ +void +VClickLabel::mousePressEvent(QMouseEvent * e) +{ + if (e->button() == Qt::LeftButton) { + _isPressed = true; + update(); + } + e->accept(); +} + /** Overloaded mouse event to catch left mouse button clicks. */ void VClickLabel::mouseReleaseEvent(QMouseEvent *e) { if (e->button() == Qt::LeftButton) { + _isPressed = false; + update(); emit clicked(); } e->accept(); diff --git a/src/vidalia/VClickLabel.h b/src/vidalia/VClickLabel.h index c9c0766..acdc58e 100644 --- a/src/vidalia/VClickLabel.h +++ b/src/vidalia/VClickLabel.h @@ -59,6 +59,8 @@ signals: protected: /** Overloaded paint event to draw a pixmap and a text label. */ virtual void paintEvent(QPaintEvent *e); + /** Overloaded mouse event to remember click state. */ + virtual void mousePressEvent(QMouseEvent * e); /** Overloaded mouse event to catch left mouse button clicks. */ virtual void mouseReleaseEvent(QMouseEvent *e); @@ -66,6 +68,7 @@ private: QString _text; /**< Text label to display in the widget. */ QPixmap _pixmap; /**< Image to display in the widget. */ bool _flashToggle;/**< Bool toggle for flashing the button. */ + bool _isPressed; /**< Remember if label is currently pressed. */ }; #endif

1 0

[vidalia/master] Merge branch '5766_clicklabel'
by chiiph＠torproject.org 14 May '12

14 May '12

commit 48178c17c3f250fd8a8a69038355d0c5381f6a68 Merge: caeea27 7c25ed5 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon May 14 12:23:56 2012 -0300 Merge branch '5766_clicklabel' changes/bug5766 | 3 +++ src/vidalia/VClickLabel.cpp | 32 +++++++++++++++++++++++++------- src/vidalia/VClickLabel.h | 3 +++ 3 files changed, 31 insertions(+), 7 deletions(-)

1 0

[vidalia/master] Fold in more changes
by chiiph＠torproject.org 14 May '12

14 May '12

commit 3039905652be90601b7da7ac804a8fce64fcc52f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon May 14 12:25:57 2012 -0300 Fold in more changes --- CHANGELOG | 2 ++ changes/bug5766 | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8dc6178..b2a45a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,8 @@ o Enable Burmese, Croatian, Basque and Serbian translation. o Remove the "Find bridges" button in order to avoid compromising users that need to hide behind tor at all times. Fixes bug 5371. + o Add visual feedback from VClickLabel when in "pressed" state. + Resolves ticket 5766. 0.2.17 11-Feb-2012 o Improve the translation policy: do not remove translations that diff --git a/changes/bug5766 b/changes/bug5766 deleted file mode 100644 index 6332721..0000000 --- a/changes/bug5766 +++ /dev/null @@ -1,3 +0,0 @@ - New Features: - o Add visual feedback from VClickLabel when in "pressed" state. - Resolves ticket 5766.

1 0

[vidalia/master] Bump version to 0.2.18
by chiiph＠torproject.org 14 May '12

14 May '12

commit 1c9c8a94148602d625990080f978a80e477485a6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon May 14 09:42:31 2012 -0300 Bump version to 0.2.18 --- CMakeLists.txt | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 498041c..cdab126 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ ## ## $Id$ -## +## ## This file is part of Vidalia, and is subject to the license terms in the -## LICENSE file, found in the top level directory of this distribution. If +## LICENSE file, found in the top level directory of this distribution. If ## you did not receive the LICENSE file with this file, you may obtain it ## from the Vidalia source package distributed by the Vidalia Project at -## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, -## including this file, may be copied, modified, propagated, or distributed +## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +## including this file, may be copied, modified, propagated, or distributed ## except according to the terms described in the LICENSE file. ## @@ -14,7 +14,7 @@ set(VER_MAJOR "0") set(VER_MINOR "2") set(VER_PATCH "18") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia) @@ -61,7 +61,7 @@ if(MSVC_IDE) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) endif(MSVC_IDE) - + ## Define Vidalia-specific CMake options if (APPLE) option(OSX_TIGER_COMPAT "Build an OS X 10.4 Compatible Vidalia." OFF) @@ -74,7 +74,7 @@ if (APPLE) option(OSX_FAT_BINARY "Build Vidalia as a Universal binary." OFF) if (OSX_FAT_BINARY) - set(CMAKE_OSX_ARCHITECTURES "ppc;i386" + set(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "OS X build architectures" FORCE) set(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.4" CACHE STRING "Flags used by the linker." FORCE) @@ -85,7 +85,7 @@ if (APPLE) option(OSX_FORCE_32BIT "Force a 32-bit build for compatibility." OFF) if (OSX_FORCE_32BIT) add_definitions(-m32) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" CACHE STRING "Flags used by the linker." FORCE) endif(OSX_FORCE_32BIT) endif(APPLE)

1 0

[vidalia/master] Remove Find bridges button and the rest of the functionality
by chiiph＠torproject.org 14 May '12

14 May '12

commit caeea278a13c8c64d86d181b38a4f6a60f9e40e6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon May 14 11:33:28 2012 -0300 Remove Find bridges button and the rest of the functionality --- CHANGELOG | 6 +- src/vidalia/CMakeLists.txt | 5 - src/vidalia/config/BridgeDownloader.cpp | 149 -------------------- src/vidalia/config/BridgeDownloader.h | 122 ---------------- .../config/BridgeDownloaderProgressDialog.cpp | 90 ------------ .../config/BridgeDownloaderProgressDialog.h | 83 ----------- .../config/BridgeDownloaderProgressDialog.ui | 73 ---------- src/vidalia/config/NetworkPage.cpp | 91 ------------ src/vidalia/config/NetworkPage.h | 15 -- src/vidalia/config/NetworkPage.ui | 79 +---------- 10 files changed, 9 insertions(+), 704 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8429b72..8dc6178 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -0.2.18 13-May-2012 +0.2.18 14-May-2012 o Use consensus bandwidth for routers when microdescriptors is enabled. Fixes bug 3287. o Notify users that a warning status event has appeared by flashing @@ -12,8 +12,6 @@ that string if needed.) Fixes bug 5109. o Displays Korean, Catalan and Greek in their native scripts. Fix bug 5110. - o Fix the bridge line parsing for requests to bridges.torproject.org - when the user clicks 'find bridges now'. Fixes bug 5730. o Support adding comments in the same line as a config option inside the torrc dialog. Fixes bug 5475. o Remove Polipo and Torbutton from Vidalia's build scripts. Resolves @@ -24,6 +22,8 @@ the Vidalia binary location as the starting point for relative paths. o Enable Burmese, Croatian, Basque and Serbian translation. + o Remove the "Find bridges" button in order to avoid compromising + users that need to hide behind tor at all times. Fixes bug 5371. 0.2.17 11-Feb-2012 o Improve the translation policy: do not remove translations that diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index 52ba510..7cc1d20 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -86,8 +86,6 @@ set(vidalia_SRCS ${vidalia_SRCS} config/AbstractTorSettings.cpp config/AdvancedPage.cpp config/AppearancePage.cpp - config/BridgeDownloader.cpp - config/BridgeDownloaderProgressDialog.cpp config/BridgeUsageDialog.cpp config/ConfigDialog.cpp config/ConfigPageStack.cpp @@ -116,8 +114,6 @@ qt4_wrap_cpp(vidalia_SRCS config/AbstractTorSettings.h config/AdvancedPage.h config/AppearancePage.h - config/BridgeDownloader.h - config/BridgeDownloaderProgressDialog.h config/BridgeUsageDialog.h config/ConfigDialog.h config/ConfigPage.h @@ -271,7 +267,6 @@ qt4_wrap_ui(vidalia_SRCS bwgraph/BandwidthGraph.ui config/AdvancedPage.ui config/AppearancePage.ui - config/BridgeDownloaderProgressDialog.ui config/BridgeUsageDialog.ui config/ConfigDialog.ui config/GeneralPage.ui diff --git a/src/vidalia/config/BridgeDownloader.cpp b/src/vidalia/config/BridgeDownloader.cpp deleted file mode 100644 index 1cf47ea..0000000 --- a/src/vidalia/config/BridgeDownloader.cpp +++ /dev/null @@ -1,149 +0,0 @@ -/* -** This file is part of Vidalia, and is subject to the license terms in the -** LICENSE file, found in the top level directory of this distribution. If you -** did not receive the LICENSE file with this file, you may obtain it from the -** Vidalia source package distributed by the Vidalia Project at -** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, -** including this file, may be copied, modified, propagated, or distributed -** except according to the terms described in the LICENSE file. -*/ - -/* -** \file BridgeDownloader.cpp -** \brief Downloads a list of new bridge addresses via HTTPS -*/ - -#include "BridgeDownloader.h" -#include "Vidalia.h" - -#define BRIDGEDB_HOST "bridges.torproject.org" -#define BRIDGEDB_PORT 443 - -BridgeDownloader::BridgeDownloader(QObject *parent) - : QObject(parent) -{ - _https = new QNetworkAccessManager(); - - connect(_https, SIGNAL(finished(QNetworkReply *)), - this, SLOT(httpsRequestFinished(QNetworkReply *))); - connect(_https, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)), - this, SLOT(sslErrors(QNetworkReply *, QList<QSslError>))); -} - -void -BridgeDownloader::setProxy(const QString &host, int port, - const QString &username, const QString &password) -{ - _https->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, host, port, username, password)); -} - -bool -BridgeDownloader::downloadBridges(BridgeDownloadMethod method) -{ - if (! isMethodSupported(method)) - return false; - - switch (method) { - case DownloadMethodHttps: - startHttpsDownload(); - break; - - default: - break; - } - return true; -} - -bool -BridgeDownloader::isMethodSupported(BridgeDownloadMethod method) -{ - switch (method) { - case DownloadMethodHttps: - return QSslSocket::supportsSsl(); - - default: - break; - } - return false; -} - -void -BridgeDownloader::startHttpsDownload() -{ - emit statusChanged(tr("Starting HTTPS bridge request...")); - emit downloadProgress(0, 0); - - _reply = _https->get(QNetworkRequest(QUrl("https://bridges.torproject.org/?format=plain"))); - connect(_reply, SIGNAL(downloadProgress(qint64, qint64)), - this, SIGNAL(downloadProgress(qint64, qint64))); - vInfo("Sending an HTTPS bridge request to %1:%2.").arg(BRIDGEDB_HOST) - .arg(BRIDGEDB_PORT); -} - -void -BridgeDownloader::cancelBridgeRequest() -{ - _reply->close(); - disconnect(_reply, 0, 0, 0); -} - -void -BridgeDownloader::httpsStateChanged(int state) -{ - switch (state) { - case QHttp::Connecting: - emit statusChanged(tr("Connecting to %1:%2...").arg(BRIDGEDB_HOST) - .arg(BRIDGEDB_PORT)); - break; - - case QHttp::Sending: - emit statusChanged(tr("Sending an HTTPS request for bridges...")); - break; - - case QHttp::Reading: - emit statusChanged(tr("Downloading a list of bridges...")); - break; - - default: - break; - } -} - -void -BridgeDownloader::httpsRequestFinished(QNetworkReply *reply) -{ - if (reply->error() != QNetworkReply::NoError) { - QString errorString = reply->errorString(); - vWarn("Bridge request failed: %2").arg(errorString); - - emit bridgeRequestFailed(errorString); - } else { - QByteArray response = reply->readAll(); - vInfo("Bridge request complete: received %2 bytes.").arg(response.size()); - - QStringList bridges, lines = QString(response).split("\n"); - foreach (QString line, lines) { - line = line.trimmed(); - if (line.startsWith("bridge ", Qt::CaseInsensitive)) - bridges << line; - } - emit bridgeRequestFinished(bridges); - } - _reply->close(); - disconnect(_reply,0,0,0); -} - -void -BridgeDownloader::sslErrors(QNetworkReply *reply, const QList<QSslError> &sslErrors) -{ - QString errorString; - QStringList errorStrings; - - vWarn("%1 SSL error(s) when requesting bridge information:") - .arg(sslErrors.size()); - foreach (QSslError sslError, sslErrors) { - errorString = sslError.errorString(); - errorStrings << errorString; - vWarn(" SSL Error: %1").arg(errorString); - } -} diff --git a/src/vidalia/config/BridgeDownloader.h b/src/vidalia/config/BridgeDownloader.h deleted file mode 100644 index 7bef313..0000000 --- a/src/vidalia/config/BridgeDownloader.h +++ /dev/null @@ -1,122 +0,0 @@ -/* -** This file is part of Vidalia, and is subject to the license terms in the -** LICENSE file, found in the top level directory of this distribution. If you -** did not receive the LICENSE file with this file, you may obtain it from the -** Vidalia source package distributed by the Vidalia Project at -** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, -** including this file, may be copied, modified, propagated, or distributed -** except according to the terms described in the LICENSE file. -*/ - -/* -** \file BridgeDownloader.h -** \brief Downloads a list of new bridge addresses via HTTPS -*/ - -#ifndef _BRIDGEDOWNLOADER_H -#define _BRIDGEDOWNLOADER_H - -#include <QtNetwork> - -class BridgeDownloader : public QObject -{ - Q_OBJECT - -public: - /** Available bridge download methods. */ - enum BridgeDownloadMethod { - DownloadMethodHttps, /** Download via an HTTPS connection. */ - }; - - /** Default constructor. - */ - BridgeDownloader(QObject *parent = 0); - - /** Initiates a request for a set of bridges using the specified - * download method. Returns true if the request was initiated - * successfully, or false on error. - */ - bool downloadBridges(BridgeDownloadMethod method); - - /** Enables HTTPS proxy support, using the proxy server host on - * port port. A username and password can also - * optionally be supplied, if required by the proxy. - */ - void setProxy(const QString &host, int port, - const QString &username = QString(), - const QString &password = QString()); - - /** Returns true if method is supported by the currently - * available Qt libraries. - */ - static bool isMethodSupported(BridgeDownloadMethod method); - -public slots: - /** Cancels any pending bridge download requests. - */ - void cancelBridgeRequest(); - -signals: - /** Emitted when the underlying QHttp object reads data from an HTTPS - * response. done indicates how many bytes out of total - * have been read so far. Note that total may be 0 if the expected - * total size of the response is not known. - */ - void downloadProgress(qint64 done, qint64 total); - - /** Emitted when the status of the bridge request changes. status - * describes the new current state of the request. - */ - void statusChanged(const QString &status); - - /** Emitted when the previous request for bridge addresses completes - * successfully. The QStringList bridges contains a (possibly empty) - * list of bridge addresses parsed from the received response. - */ - void bridgeRequestFinished(const QStringList &bridges); - - /** Emitted when the previous request for bridge addresses fails. The - * QString error is a human-readable string describing the error - * encountered. - */ - void bridgeRequestFailed(const QString &error); - -private slots: - /** Called when the state of the underlying QHttp object changes. A - * statusChanged() signal is emitted with the appropriate text - * describing the new state of the request. - */ - void httpsStateChanged(int state); - - /** Called when the underlying QHttp object used to make the bridge - * request completes. error is set to false if the request was - * successful, or true if the request failed. If id does not - * match the request ID previously returned by QHttp::get(), then the - * signal is ignored since it is the result of a close() or abort() - * request. - */ - void httpsRequestFinished(QNetworkReply *reply); - - /** Called when the HTTPS connection encounters one or more - * sslErrors. Currently the errors are just logged and - * bridgeRequestFailed() is not emitted, since QHttp will also - * emit - */ - void sslErrors(QNetworkReply *, const QList<QSslError> &sslErrors); - -private: - /** Initiates an HTTPS connection to bridges.torproject.org to start - * downloading a set of bridges. - */ - void startHttpsDownload(); - - /** Used to connect to the bridge database, send an HTTPS request for - * new bridge addresses and then read the response. */ - QNetworkAccessManager* _https; - - /** Identifier of the current bridge request */ - QNetworkReply *_reply; -}; - -#endif - diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp b/src/vidalia/config/BridgeDownloaderProgressDialog.cpp deleted file mode 100644 index 9150988..0000000 --- a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp +++ /dev/null @@ -1,90 +0,0 @@ -/* -** This file is part of Vidalia, and is subject to the license terms in the -** LICENSE file, found in the top level directory of this distribution. If you -** did not receive the LICENSE file with this file, you may obtain it from the -** Vidalia source package distributed by the Vidalia Project at -** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, -** including this file, may be copied, modified, propagated, or distributed -** except according to the terms described in the LICENSE file. -*/ - -/* -** \file BridgeDownloaderProgressDialog.cpp -** \brief Displays the progress of a request for bridge addresses -*/ - -#include "BridgeDownloaderProgressDialog.h" - -#include <QTimer> - - -BridgeDownloaderProgressDialog::BridgeDownloaderProgressDialog(QWidget *parent) - : QDialog(parent) -{ - ui.setupUi(this); - - connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), - this, SLOT(buttonClicked(QAbstractButton *))); - - setModal(true); -} - -void -BridgeDownloaderProgressDialog::setVisible(bool visible) -{ - if (visible) { - ui.progressBar->setRange(0, 0); - ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel); - } - QDialog::setVisible(visible); -} - -void -BridgeDownloaderProgressDialog::setStatus(const QString &status) -{ - ui.lblStatus->setText(status); -} - -void -BridgeDownloaderProgressDialog::setDownloadProgress(qint64 done, qint64 total) -{ - ui.progressBar->setRange(0, total); - ui.progressBar->setValue(done); -} - -void -BridgeDownloaderProgressDialog::bridgeRequestFinished(const QStringList &bridges) -{ - Q_UNUSED(bridges); - - accept(); -} - -void -BridgeDownloaderProgressDialog::bridgeRequestFailed(const QString &error) -{ - ui.lblStatus->setText(tr("Unable to download bridges: %1").arg(error)); - - ui.progressBar->setRange(0, 1); - ui.progressBar->setValue(1); - - ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel - | QDialogButtonBox::Retry - | QDialogButtonBox::Help); -} - -void -BridgeDownloaderProgressDialog::buttonClicked(QAbstractButton *button) -{ - int standardButton = ui.buttonBox->standardButton(button); - if (standardButton == QDialogButtonBox::Retry) { - setStatus(tr("Retrying bridge request...")); - setDownloadProgress(0, 0); - ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel); - - QTimer::singleShot(1000, this, SIGNAL(retry())); - } else { - done(standardButton); - } -} - diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.h b/src/vidalia/config/BridgeDownloaderProgressDialog.h deleted file mode 100644 index 34f15c2..0000000 --- a/src/vidalia/config/BridgeDownloaderProgressDialog.h +++ /dev/null @@ -1,83 +0,0 @@ -/* -** This file is part of Vidalia, and is subject to the license terms in the -** LICENSE file, found in the top level directory of this distribution. If you -** did not receive the LICENSE file with this file, you may obtain it from the -** Vidalia source package distributed by the Vidalia Project at -** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, -** including this file, may be copied, modified, propagated, or distributed -** except according to the terms described in the LICENSE file. -*/ - -/* -** \file BridgeDownloaderProgressDialog.h -** \brief Displays the progress of a request for bridge addresses -*/ - -#ifndef _BRIDGEDOWNLOADERPROGRESSDIALOG_H -#define _BRIDGEDOWNLOADERPROGRESSDIALOG_H - -#include "ui_BridgeDownloaderProgressDialog.h" - -#include <QDialog> - - -class BridgeDownloaderProgressDialog : public QDialog -{ - Q_OBJECT - -public: - /** Default constructor. - */ - BridgeDownloaderProgressDialog(QWidget *parent = 0); - -public slots: - /** Sets the status message text in the dialog to status. - */ - void setStatus(const QString &status); - - /** Updates the bridge download progress bar to value out of - * maximum steps. If value and maximum are both 0, - * then a "busy" progress bar is displayed. - */ - void setDownloadProgress(qint64 value, qint64 maximum); - - /** Called when the bridge download completes successfully and discards - * the progress dialog with an Accept result code. bridges - * contains the list of bridges downloaded, but is currently ignored. - */ - void bridgeRequestFinished(const QStringList &bridges); - - /** Called when the bridge download fails. The string error - * provides a human-readable description of the reason the download - * failed, which is displayed for the user. - */ - void bridgeRequestFailed(const QString &error); - -signals: - /** Emitted when the user clicks the "Retry" button after a previous - * bridge request has failed. - */ - void retry(); - -protected: - /** Overloaded method called when the progress dialog is first shown in - * order to initialize the progress bar, status text and dialog button - * box. - */ - virtual void setVisible(bool visible); - -private slots: - /** Called when button is clicked in the progress dialog's - * QDialogButtonBox. Dismisses the dialog and sets the result code to - * the QDialogButtonBox::StandardButton enum value indicated by - * button. - */ - void buttonClicked(QAbstractButton *button); - -private: - /**< Qt Designer generated object. */ - Ui::BridgeDownloaderProgressDialog ui; -}; - -#endif - diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.ui b/src/vidalia/config/BridgeDownloaderProgressDialog.ui deleted file mode 100644 index 84210a6..0000000 --- a/src/vidalia/config/BridgeDownloaderProgressDialog.ui +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>BridgeDownloaderProgressDialog</class> - <widget class="QDialog" name="BridgeDownloaderProgressDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>366</width> - <height>105</height> - </rect> - </property> - <property name="windowTitle"> - <string>Downloading Bridges</string> - </property> - <property name="windowIcon"> - <iconset resource="../res/vidalia.qrc"> - <normaloff>:/images/32x32/network-workgroup.png</normaloff>:/images/32x32/network-workgroup.png</iconset> - </property> - <property name="modal"> - <bool>true</bool> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" rowspan="2"> - <widget class="QLabel" name="lblPixmap"> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../res/vidalia.qrc">:/images/48x48/network-workgroup.png</pixmap> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLabel" name="lblStatus"> - <property name="text"> - <string/> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QProgressBar" name="progressBar"> - <property name="value"> - <number>0</number> - </property> - <property name="textVisible"> - <bool>false</bool> - </property> - <property name="format"> - <string/> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel</set> - </property> - </widget> - </item> - </layout> - </widget> - <resources> - <include location="../res/vidalia.qrc"/> - </resources> - <connections/> -</ui> diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index e0651dd..7d16fbd 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -17,7 +17,6 @@ #include "NetworkSettings.h" #include "VMessageBox.h" #include "Vidalia.h" -#include "BridgeDownloaderProgressDialog.h" #include "DomainValidator.h" #include "stringutil.h" @@ -50,7 +49,6 @@ NetworkPage::NetworkPage(QWidget *parent) connect(ui.lineBridge, SIGNAL(returnPressed()), this, SLOT(addBridge())); connect(ui.lblHelpFindBridges, SIGNAL(linkActivated(QString)), this, SLOT(onLinkActivated(QString))); - connect(ui.btnFindBridges, SIGNAL(clicked()), this, SLOT(findBridges())); connect(ui.cmboProxyType, SIGNAL(currentIndexChanged(int)), this, SLOT(proxyTypeChanged(int))); @@ -61,17 +59,6 @@ NetworkPage::NetworkPage(QWidget *parent) ui.listBridges, this, SLOT(copySelectedBridgesToClipboard())); - if (! BridgeDownloader::isMethodSupported(BridgeDownloader::DownloadMethodHttps)) { - ui.btnFindBridges->setVisible(false); - ui.lblHelpFindBridges->setText( - tr("<a href=\"bridges.finding\">How can I find bridges?</a>")); - _bridgeDownloader = 0; - } else { - _bridgeDownloader = new BridgeDownloader(this); - connect(_bridgeDownloader, SIGNAL(bridgeRequestFinished(QStringList)), - this, SLOT(bridgeRequestFinished(QStringList))); - } - #if defined(Q_WS_MAC) /* On OS X, the network page looks better without frame titles. Everywhere * else needs titles or else there's a break in the frame border. */ @@ -329,84 +316,6 @@ NetworkPage::load() ui.listBridges->addItems(settings.getBridgeList()); } -/** Called when the user clicks the "Find Bridges Now" button. - * Attempts to establish an HTTPS connection to bridges.torproject.org - * and download one or more bridge addresses. */ -void -NetworkPage::findBridges() -{ - BridgeDownloaderProgressDialog *dlg = new BridgeDownloaderProgressDialog(this); - - connect(_bridgeDownloader, SIGNAL(statusChanged(QString)), - dlg, SLOT(setStatus(QString))); - connect(_bridgeDownloader, SIGNAL(downloadProgress(qint64, qint64)), - dlg, SLOT(setDownloadProgress(qint64, qint64))); - connect(_bridgeDownloader, SIGNAL(bridgeRequestFailed(QString)), - dlg, SLOT(bridgeRequestFailed(QString))); - connect(_bridgeDownloader, SIGNAL(bridgeRequestFinished(QStringList)), - dlg, SLOT(bridgeRequestFinished(QStringList))); - connect(dlg, SIGNAL(retry()), this, SLOT(startBridgeRequest())); - - startBridgeRequest(); - switch (dlg->exec()) { - case QDialogButtonBox::Cancel: - _bridgeDownloader->cancelBridgeRequest(); - break; - - case QDialogButtonBox::Help: - emit helpRequested("bridges.finding"); - break; - } - - delete dlg; -} - -/** Starts a new request for additional bridge addresses. */ -void -NetworkPage::startBridgeRequest() -{ - if (ui.chkUseProxy->isChecked() && - ui.cmboProxyType->currentIndex() == NetworkSettings::HttpHttpsProxy) { - _bridgeDownloader->setProxy(ui.lineProxyAddress->text(), - ui.lineProxyPort->text().toUInt(), - ui.lineProxyUsername->text(), - ui.lineProxyPassword->text()); - } - - _bridgeDownloader->downloadBridges(BridgeDownloader::DownloadMethodHttps); -} - -/** Called when a previous bridge request initiated by the findBridges() - * method has completed. bridges contains a list of all bridges - * received. */ -void -NetworkPage::bridgeRequestFinished(const QStringList &bridges) -{ - bool foundNewBridges = false; - - foreach (QString bridge, bridges) { - QString address = bridge.trimmed().split(" ").at(1); - if (ui.listBridges->findItems(address, Qt::MatchContains).isEmpty()) { - ui.listBridges->addItem(address); - foundNewBridges = true; - } - } - - if (! foundNewBridges) { - QMessageBox dlg(this); - dlg.setIcon(QMessageBox::Information); - dlg.setText(tr("No new bridges are currently available. You can either " - "wait a while and try again, or try another method of " - "finding new bridges.")); - dlg.setInformativeText(tr("Click Help to see other methods of finding " - "new bridges.")); - dlg.setStandardButtons(QMessageBox::Ok | QMessageBox::Help); - - if (dlg.exec() == QMessageBox::Help) - emit helpRequested("bridges.finding"); - } -} - /** Disable proxy username and password fields when the user wants to use * a SOCKS 4 proxy. */ void diff --git a/src/vidalia/config/NetworkPage.h b/src/vidalia/config/NetworkPage.h index 073e006..0b94ef2 100644 --- a/src/vidalia/config/NetworkPage.h +++ b/src/vidalia/config/NetworkPage.h @@ -19,7 +19,6 @@ #include "ui_NetworkPage.h" #include "ConfigPage.h" #include "Vidalia.h" -#include "BridgeDownloader.h" #include <QPoint> @@ -65,26 +64,12 @@ private slots: /** Called when a link in a label is clicked. url is the target of * the clicked link.*/ void onLinkActivated(const QString &url); - /** Called when the user clicks the "Find Bridges Now" button. Calls - * startBridgeRequest() to start a new request for additional bridge - * addresses, and displays a progress dialog for the user. */ - void findBridges(); - /** Starts a new request for additional bridge addresses. */ - void startBridgeRequest(); - /** Called when a previous bridge request initiated by the findBridges() - * method has completed. bridges contains a list of all bridges - * received. */ - void bridgeRequestFinished(const QStringList &bridges); /** Disable proxy username and password fields when the user wants to use * a SOCKS 4 proxy. */ void proxyTypeChanged(int selection); private: - /** Helper class used to facilitate downloading one or more bridge - * addresses. */ - BridgeDownloader* _bridgeDownloader; - /** Qt Designer generated object */ Ui::NetworkPage ui; }; diff --git a/src/vidalia/config/NetworkPage.ui b/src/vidalia/config/NetworkPage.ui index 4704604..3fc301b 100644 --- a/src/vidalia/config/NetworkPage.ui +++ b/src/vidalia/config/NetworkPage.ui @@ -14,12 +14,6 @@ <enum>Qt::NoContextMenu</enum> </property> <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>9</number> - </property> <item> <widget class="QCheckBox" name="chkUseProxy"> <property name="toolTip"> @@ -57,12 +51,6 @@ <string>Proxy Settings</string> </property> <layout class="QGridLayout"> - <property name="margin"> - <number>9</number> - </property> - <property name="spacing"> - <number>6</number> - </property> <item row="0" column="0"> <widget class="QLabel" name="lblProxyAddress"> <property name="text"> @@ -75,12 +63,6 @@ </item> <item row="0" column="1" colspan="2"> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QLineEdit" name="lineProxyAddress"/> </item> @@ -118,12 +100,6 @@ </item> <item row="1" column="1" colspan="2"> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QLineEdit" name="lineProxyUsername"/> </item> @@ -148,7 +124,7 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -206,12 +182,6 @@ <string>Firewall Settings</string> </property> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>9</number> - </property> <item> <widget class="QLabel" name="lblReachablePorts"> <property name="text"> @@ -263,20 +233,8 @@ <string>Bridge Settings</string> </property> <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>9</number> - </property> <item> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QLabel" name="lblAddBridge"> <property name="text"> @@ -289,7 +247,7 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -301,20 +259,8 @@ </item> <item> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QLineEdit" name="lineBridge"> <property name="maxLength"> @@ -336,12 +282,6 @@ </item> <item> <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QToolButton" name="btnAddBridge"> <property name="text"> @@ -392,7 +332,7 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height> @@ -407,19 +347,12 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> - <widget class="QPushButton" name="btnFindBridges"> - <property name="text"> - <string>Find Bridges Now</string> - </property> - </widget> - </item> - <item> <widget class="QLabel" name="lblHelpFindBridges"> <property name="cursor"> <cursorShape>PointingHandCursor</cursorShape> </property> <property name="text"> - <string><a href="bridges.finding">How else can I find bridges?</a></string> + <string><a href="bridges.finding">How can I find bridges?</a></string> </property> </widget> </item> @@ -428,7 +361,7 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -446,7 +379,7 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height>

1 0