commit d1ccb6d960bfe886623efa8c6728eef9a9edc221 Merge: 5288d65 868091e Author: Tomás Touceda <chiiph@torproject.org> Date: Mon Mar 5 09:40:37 2012 -0300 Merge branch 'featSettings' into alpha changes/featSettings | 6 + src/torcontrol/TorControl.cpp | 26 +- src/torcontrol/TorControl.h | 8 +- src/vidalia/CMakeLists.txt | 9 +- src/vidalia/MainWindow.cpp | 57 ++-- src/vidalia/Vidalia.cpp | 8 +- src/vidalia/Vidalia.h | 5 + src/vidalia/config/AbstractTorSettings.cpp | 10 + src/vidalia/config/AbstractTorSettings.h | 6 + src/vidalia/config/AdvancedPage.cpp | 4 +- src/vidalia/config/ConfigDialog.cpp | 16 +- src/vidalia/config/NetworkPage.cpp | 49 ++- src/vidalia/config/NetworkPage.h | 8 +- src/vidalia/config/NetworkSettings.cpp | 109 ++++-- src/vidalia/config/ServerSettings.cpp | 228 +++++++---- src/vidalia/config/ServerSettings.h | 6 +- src/vidalia/config/Service.cpp | 119 ------ src/vidalia/config/Service.h | 80 ---- src/vidalia/config/ServiceList.cpp | 56 --- src/vidalia/config/ServiceList.h | 51 --- src/vidalia/config/ServicePage.cpp | 613 ---------------------------- src/vidalia/config/ServicePage.h | 79 ---- src/vidalia/config/ServicePage.ui | 173 -------- src/vidalia/config/ServiceSettings.cpp | 167 -------- src/vidalia/config/ServiceSettings.h | 61 --- src/vidalia/config/TorSettings.cpp | 153 +++++--- src/vidalia/config/TorSettings.h | 7 +- src/vidalia/config/TorrcDialog.cpp | 92 +---- src/vidalia/config/TorrcDialog.ui | 43 -- src/vidalia/config/VSettings.cpp | 14 + src/vidalia/config/VSettings.h | 9 +- src/vidalia/config/torrc/Torrc.cpp | 247 +++++++++++ src/vidalia/config/torrc/Torrc.h | 75 ++++ src/vidalia/config/torrc/TorrcParser.cpp | 428 +++++++++++++++++++ src/vidalia/config/torrc/TorrcParser.h | 189 +++++++++ 35 files changed, 1424 insertions(+), 1787 deletions(-)