[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r4012: Added initial code for TBB. (in vidalia/branches/extension-api: . src/plugins src/plugins/TorBrowserBundlePlugin src/vidalia/MessageLogPlugin src/vidalia/NetworkMapPlugin)
Author: tyree731
Date: 2009-08-05 20:22:12 -0400 (Wed, 05 Aug 2009)
New Revision: 4012
Added:
vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/
vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/CMakeLists.txt
vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.cpp
vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.h
Modified:
vidalia/branches/extension-api/CMakeLists.txt
vidalia/branches/extension-api/src/plugins/CMakeLists.txt
vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h
vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.h
vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h
Log:
Added initial code for TBB.
Modified: vidalia/branches/extension-api/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/CMakeLists.txt 2009-08-05 19:09:58 UTC (rev 4011)
+++ vidalia/branches/extension-api/CMakeLists.txt 2009-08-06 00:22:12 UTC (rev 4012)
@@ -32,6 +32,9 @@
## Allows for inclusion of QWebKit when using HerdictWeb Reporter
option(WITH_HERDICTWEB_PLUGIN "Enable HerdictWeb Reporter." ON)
+## Allows for building of Tor Browser bundle
+option(WITH_TORBROWSERBUNDLE_PLUGIN "Build Tor Browser Bundle." ON)
+
## Specify the minimum version of Qt required
set(QT_MIN_VERSION "4.5.0")
Modified: vidalia/branches/extension-api/src/plugins/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/plugins/CMakeLists.txt 2009-08-05 19:09:58 UTC (rev 4011)
+++ vidalia/branches/extension-api/src/plugins/CMakeLists.txt 2009-08-06 00:22:12 UTC (rev 4012)
@@ -30,3 +30,6 @@
add_subdirectory(HerdictWebReporterPlugin)
endif(WITH_HERDICTWEB_PLUGIN)
+if (WITH_TORBROWSERBUNDLE_PLUGIN)
+ add_subdirectory(TorBrowserBundlePlugin)
+endif(WITH_TORBROWSERBUNDLE_PLUGIN)
Added: vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/CMakeLists.txt (rev 0)
+++ vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/CMakeLists.txt 2009-08-06 00:22:12 UTC (rev 4012)
@@ -0,0 +1,30 @@
+##
+## $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
+## 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.vidalia-project.net/. No part of Vidalia, including this file,
+## may be copied, modified, propagated, or distributed except according to
+## the terms described in the LICENSE file.
+##
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(torbrowserbundleplugin_SRCS
+ TorBrowserBundlePlugin.cpp
+)
+qt4_wrap_cpp(torbrowserbundleplugin_SRCS
+ TorBrowserBundlePlugin.h
+)
+
+add_library(torbrowserbundleplugin SHARED ${torbrowserbundleplugin_SRCS})
+target_link_libraries(torbrowserbundleplugin
+ ${QT_LIBRARIES}
+ vidaliaplugin
+)
+
Property changes on: vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.cpp (rev 0)
+++ vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.cpp 2009-08-06 00:22:12 UTC (rev 4012)
@@ -0,0 +1,54 @@
+/*
+** 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.vidalia-project.net/. 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 TorBrowserBundlePlugin.cpp
+** \version $Id$
+** \brief The Tor Browser Bundle
+*/
+
+#include "TorBrowserBundlePlugin.h"
+
+#include <QString>
+
+TorBrowserBundlePlugin::TorBrowserBundlePlugin()
+{
+ /* Listen for the TorStarted() signal to begin TBB */
+ connect(_pluginManager, SIGNAL(torStarted()), this, SLOT(start()));
+}
+
+TorBrowserBundlePlugin::~TorBrowserBundlePlugin()
+{
+}
+
+QString
+TorBrowserBundlePlugin::name() const
+{
+ return QString("Tor Browser Bundle");
+}
+
+QString
+TorBrowserBundlePlugin::id() const
+{
+ return QString("torbrowserbundle");
+}
+
+QString
+TorBrowserBundlePlugin::description() const
+{
+ return QString("This plugin allows for bundling of Firefox and Pidgin with Vidalia. Coupled with proper configurations, this gives the user a lightweight and easy to use anonymity environment.");
+}
+
+void
+TorBrowserBundlePlugin::start()
+{
+}
+
+Q_EXPORT_PLUGIN2(torbrowserbundleplugin, TorBrowserBundlePlugin)
Property changes on: vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.h
===================================================================
--- vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.h (rev 0)
+++ vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.h 2009-08-06 00:22:12 UTC (rev 4012)
@@ -0,0 +1,42 @@
+/*
+** 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.vidalia-project.net/. 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 TorBrowserBundlePlugin.h
+** \version $Id$
+** \brief The Tor Browser Bundle
+*/
+
+#ifndef _TORBROWSERBUNDLEPLUGIN_H
+#define _TORBROWSERBUNDLEPLUGIN_H
+
+#include <plugins/VidaliaPluginInterface.h>
+
+class QString;
+
+class TorBrowserBundlePlugin : public VidaliaPluginInterface
+{
+ Q_OBJECT
+ Q_INTERFACES(VidaliaPluginInterface)
+
+public:
+ TorBrowserBundlePlugin();
+ ~TorBrowserBundlePlugin();
+
+ QString name() const;
+ QString id() const;
+ QString description() const;
+
+private slots:
+ /** When Tor comes online and building and circuits, this starts TBB */
+ void start();
+};
+
+#endif
Property changes on: vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.h
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h 2009-08-05 19:09:58 UTC (rev 4011)
+++ vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h 2009-08-06 00:22:12 UTC (rev 4012)
@@ -17,7 +17,7 @@
#ifndef _MESSAGELOGPLUGIN_H
#define _MESSAGELOGPLUGIN_H
-#include <VidaliaPluginInterface.h>
+#include <plugins/VidaliaPluginInterface.h>
#include <QObject>
Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.h 2009-08-05 19:09:58 UTC (rev 4011)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.h 2009-08-06 00:22:12 UTC (rev 4012)
@@ -19,7 +19,7 @@
#include "config.h"
#include "ui_NetViewer.h"
-#include "VidaliaPanel.h"
+#include <plugins/VidaliaPanel.h>
#include "GeoIpResolver.h"
#if defined(USE_MARBLE)
Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h 2009-08-05 19:09:58 UTC (rev 4011)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h 2009-08-06 00:22:12 UTC (rev 4012)
@@ -21,7 +21,7 @@
#include <QObject>
-#include <VidaliaPluginInterface.h>
+#include <plugins/VidaliaPluginInterface.h>
/** Plugin for viewer the user's network panel, containing a visual display of
* the Tor network. */