[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r3880: Moved plugin files to their (hopefully) final locations. Doe (in vidalia/branches/extension-api/src: . WebBrowserPlugin plugins vidalia vidalia/DashboardPlugin vidalia/HomePlugin vidalia/MessageLogPlugin vidalia/NetworkMapPlugin)



Author: tyree731
Date: 2009-06-24 13:45:32 -0400 (Wed, 24 Jun 2009)
New Revision: 3880

Added:
   vidalia/branches/extension-api/src/WebBrowserPlugin/
   vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowser.cpp
   vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowser.h
   vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowserPlugin.cpp
   vidalia/branches/extension-api/src/vidalia/DashboardPlugin/
   vidalia/branches/extension-api/src/vidalia/DashboardPlugin/DashboardPlugin.cpp
   vidalia/branches/extension-api/src/vidalia/DashboardPlugin/DashboardPlugin.h
   vidalia/branches/extension-api/src/vidalia/HomePlugin/
   vidalia/branches/extension-api/src/vidalia/HomePlugin/CMakeLists.txt
   vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.cpp
   vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.h
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.cpp
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.cpp
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h
Removed:
   vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowser.cpp
   vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowser.h
   vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowserPlugin.cpp
   vidalia/branches/extension-api/src/plugins/CMakeLists.txt
   vidalia/branches/extension-api/src/plugins/DashboardPlugin/
   vidalia/branches/extension-api/src/plugins/HomePlugin/
   vidalia/branches/extension-api/src/plugins/MessageLogPlugin/
   vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/
   vidalia/branches/extension-api/src/plugins/WebBrowserPlugin/
   vidalia/branches/extension-api/src/vidalia/DashboardPlugin/DashboardPlugin.cpp
   vidalia/branches/extension-api/src/vidalia/DashboardPlugin/DashboardPlugin.h
   vidalia/branches/extension-api/src/vidalia/HomePlugin/CMakeLists.txt
   vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.cpp
   vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.h
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.cpp
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.cpp
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h
Modified:
   vidalia/branches/extension-api/src/CMakeLists.txt
   vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt
Log:
Moved plugin files to their (hopefully) final locations. Doesn't compile but I'm working on that.


Modified: vidalia/branches/extension-api/src/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/CMakeLists.txt	2009-06-23 22:53:29 UTC (rev 3879)
+++ vidalia/branches/extension-api/src/CMakeLists.txt	2009-06-24 17:45:32 UTC (rev 3880)
@@ -16,12 +16,10 @@
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/torcontrol
   ${CMAKE_CURRENT_SOURCE_DIR}/common
-  ${CMAKE_CURRENT_SOURCE_DIR}/plugins
 )
 link_directories(
   ${CMAKE_CURRENT_BINARY_DIR}/torcontrol
   ${CMAKE_CURRENT_BINARY_DIR}/common
-  ${CMAKE_CURRENT_BINARY_DIR}/plugins
 )
 
 if(MSVC)
@@ -45,7 +43,8 @@
 endif(USE_MINIUPNPC)
 
 add_subdirectory(common)
-add_subdirectory(plugins)
+#add_subdirectory(plugins)
 add_subdirectory(tools)
 add_subdirectory(torcontrol)
 add_subdirectory(vidalia)
+add_subdirectory(webbrowserplugin)

Copied: vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowser.cpp (from rev 3878, vidalia/branches/extension-api/src/plugins/WebBrowserPlugin/WebBrowser.cpp)
===================================================================
--- vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowser.cpp	                        (rev 0)
+++ vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowser.cpp	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,52 @@
+/*
+**  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 WebBrowser.cpp
+** \version $Id$
+** \brief A VidaliaPanel containing a WebKit based web browser.
+*/
+
+#include "WebBrowser.h"
+
+WebBrowser::WebBrowser() 
+{
+  ui.setupUi(this);
+
+  /* When the user presses enter, the page they entered is loaded */
+  connect(ui.lineUrlEntry, SIGNAL(returnPressed()), this, SLOT(loadURL()));
+
+  /* Set the appropriate button actions */
+  connect(ui.buttonBack, SIGNAL(clicked()), ui.webView, SLOT(back()));
+  connect(ui.buttonForward, SIGNAL(clicked()), ui.webView, SLOT(forward()));
+  connect(ui.buttonRefresh, SIGNAL(clicked()), ui.webView, SLOT(reload()));
+  connect(ui.buttonLoad, SIGNAL(clicked()), this, SLOT(loadURL()));
+}
+
+WebBrowser::~WebBrowser() {
+}
+
+QString 
+WebBrowser::tabLabel() const 
+{
+  return QString("Web Browser");
+}
+
+QIcon 
+WebBrowser::tabIcon() const
+{
+  return QIcon();
+}
+
+void 
+WebBrowser::loadURL()
+{
+  ui.webView->load(ui.lineUrlEntry->displayText());
+}

Copied: vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowser.h (from rev 3878, vidalia/branches/extension-api/src/plugins/WebBrowserPlugin/WebBrowser.h)
===================================================================
--- vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowser.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowser.h	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,57 @@
+/*
+**  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 WebBrowser.h
+** \version $Id$
+** \brief A VidaliaPanel containing a WebKit based web browser.
+*/
+
+#ifndef _WEBBROWSER_H
+#define _WEBBROWSER_H
+
+#include "ui_WebBrowser.h"
+
+#include <vidalia/PluginManager.h>
+#include <vidalia/VidaliaPanel.h>
+
+#include <QIcon>
+#include <QLineEdit>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QString>
+#include <QWebView>
+
+/** Panel which provides the user with a fully functioning WebKit based browser
+ * running over the Tor network. */
+class WebBrowser : public VidaliaPanel
+{
+  Q_OBJECT
+
+public:
+  /** Default constructor. */
+  WebBrowser();
+  /** Destructor. */
+  ~WebBrowser();
+  /** tabLabel provides a hook for the Vidalia plugin API to populate a given
+   * panel's tab with text. */
+  QString tabLabel() const;
+  /** tabIcon provides a hook for the Vidalia plugin API to populate a given
+   * panel's tab with an icon. */
+  QIcon tabIcon() const;
+private:
+  /** Required to use Qt Designer object */
+  Ui::WebBrowser ui;
+private slots:
+  /** Loads the URL inside of the URL entry box. */
+  void loadURL();
+};
+
+#endif

Copied: vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowserPlugin.cpp (from rev 3878, vidalia/branches/extension-api/src/plugins/WebBrowserPlugin/WebBrowserPlugin.cpp)
===================================================================
--- vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowserPlugin.cpp	                        (rev 0)
+++ vidalia/branches/extension-api/src/WebBrowserPlugin/WebBrowserPlugin.cpp	2009-06-24 17:45:32 UTC (rev 3880)
@@ -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 WebBrowserPlugin.cpp
+** \version $Id$
+** \brief A plugin which contains a Webkit based browser which runs over Tor
+*/
+
+#include "WebBrowserPlugin.h"
+
+WebBrowserPlugin::WebBrowserPlugin()
+{
+  _webBrowser = new WebBrowser();
+}
+
+WebBrowserPlugin::~WebBrowserPlugin()
+{
+  delete _webBrowser;
+}
+
+QString 
+WebBrowserPlugin::pluginHumanName() const
+{
+  return QString("Web Browser");
+}
+
+VidaliaPanel* 
+WebBrowserPlugin::panel() const
+{
+  return _webBrowser;
+}
+
+Q_EXPORT_PLUGIN2(webbrowserplugin, WebBrowserPlugin)
+

Modified: vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/CMakeLists.txt	2009-06-23 22:53:29 UTC (rev 3879)
+++ vidalia/branches/extension-api/src/vidalia/CMakeLists.txt	2009-06-24 17:45:32 UTC (rev 3880)
@@ -49,6 +49,20 @@
   ${CMAKE_CURRENT_BINARY_DIR}/i18n/vidalia_i18n.qrc
 )
 
+## Search for plugin libraries
+link_directories(
+  DashboardPlugin
+  HomePlugin
+  MessageLogPlugin
+  NetworkMapPlugin
+}
+
+## Process the static plugins
+add_subdirectory(DashboardPlugin)
+add_subdirectory(HomePlugin)
+add_subdirectory(MessageLogPlugin)
+add_subdirectory(NetworkMapPlugin)
+
 ## Process the translation files
 add_subdirectory(i18n)
 

Copied: vidalia/branches/extension-api/src/vidalia/DashboardPlugin/DashboardPlugin.cpp (from rev 3872, vidalia/branches/extension-api/src/plugins/DashboardPlugin/DashboardPlugin.cpp)
===================================================================
--- vidalia/branches/extension-api/src/vidalia/DashboardPlugin/DashboardPlugin.cpp	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/DashboardPlugin/DashboardPlugin.cpp	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,33 @@
+/*
+**  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 DashboardPlugin.cpp
+** \version $Id$
+** \brief The user's dashboard panel, containing Vidalia widgets
+*/
+
+#include "DashboardPlugin.h"
+
+DashboardPlugin::DashboardPlugin()
+{
+}
+
+DashboardPlugin::~DashboardPlugin()
+{
+}
+
+QString DashboardPlugin::pluginHumanName() const
+{
+  return QString("Dashboard");
+}
+
+Q_EXPORT_PLUGIN2(dashboardplugin, DashboardPlugin)
+

Copied: vidalia/branches/extension-api/src/vidalia/DashboardPlugin/DashboardPlugin.h (from rev 3872, vidalia/branches/extension-api/src/plugins/DashboardPlugin/DashboardPlugin.h)
===================================================================
--- vidalia/branches/extension-api/src/vidalia/DashboardPlugin/DashboardPlugin.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/DashboardPlugin/DashboardPlugin.h	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,36 @@
+/*
+**  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 DashboardPlugin.h
+** \version $Id$
+** \brief The user's dashboard panel, containing plugin widgets.
+*/
+
+#ifndef _DASHBOARDPLUGIN_H
+#define _DASHBOARDPLUGIN_H
+
+#include <QObject>
+
+#include <vidalia/VidaliaPluginInterface.h>
+
+class DashboardPlugin : public QObject, public VidaliaPluginInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(VidaliaPluginInterface)
+
+public:
+  DashboardPlugin();
+  ~DashboardPlugin();
+
+  QString pluginHumanName() const;
+};
+
+#endif

Copied: vidalia/branches/extension-api/src/vidalia/HomePlugin/CMakeLists.txt (from rev 3867, vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt)
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HomePlugin/CMakeLists.txt	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/HomePlugin/CMakeLists.txt	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,22 @@
+##
+##  $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.
+##
+
+
+set(homeplugin_SRCS 
+  HomePlugin.cpp
+)
+qt4_wrap_cpp(homeplugin_SRCS
+  HomePlugin.h
+)
+
+add_library(homeplugin STATIC  ${homeplugin_SRCS})
+target_link_libraries(homeplugin ${QT_LIBRARIES})

Copied: vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.cpp (from rev 3878, vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp)
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.cpp	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.cpp	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,34 @@
+/*
+**  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 HomePlugin.cpp
+** \version $Id$
+** \brief The user's home panel, containing important status' and buttons
+*/
+
+#include "HomePlugin.h"
+
+HomePlugin::HomePlugin()
+{
+}
+
+HomePlugin::~HomePlugin()
+{
+}
+
+QString 
+HomePlugin::pluginHumanName() const
+{
+  return QString("Home Panel");
+}
+
+Q_EXPORT_PLUGIN2(homeplugin, HomePlugin)
+

Copied: vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.h (from rev 3872, vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.h)
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.h	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,36 @@
+/*
+**  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 HomePlugin.h
+** \version $Id$
+** \brief The user's home panel, containing important status' and buttons
+*/
+
+#ifndef _HOMEPLUGIN_H
+#define _HOMEPLUGIN_H
+
+#include <QObject>
+
+#include <vidalia/VidaliaPluginInterface.h>
+
+class HomePlugin : public QObject, public VidaliaPluginInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(VidaliaPluginInterface)
+
+public:
+  HomePlugin();
+  ~HomePlugin();
+
+  QString pluginHumanName() const;
+};
+
+#endif

Copied: vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.cpp (from rev 3872, vidalia/branches/extension-api/src/plugins/MessageLogPlugin/MessageLogPlugin.cpp)
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.cpp	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.cpp	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,33 @@
+/*
+**  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 MessageLogPlugin.cpp
+** \version $Id$
+** \brief The user's message log panel, containing the output of Tor logs.
+*/
+
+#include "MessageLogPlugin.h"
+
+MessageLogPlugin::MessageLogPlugin()
+{
+}
+
+MessageLogPlugin::~MessageLogPlugin()
+{
+}
+
+QString MessageLogPlugin::pluginHumanName() const
+{
+  return QString("Message Log");
+}
+
+Q_EXPORT_PLUGIN2(messagelogplugin, MessageLogPlugin)
+

Copied: vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h (from rev 3872, vidalia/branches/extension-api/src/plugins/MessageLogPlugin/MessageLogPlugin.h)
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,36 @@
+/*
+**  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 MessageLogPlugin.h
+** \version $Id$
+** \brief The user's message log panel, containing the output of Tor logs.
+*/
+
+#ifndef _MESSAGELOGPLUGIN_H
+#define _MESSAGELOGPLUGIN_H
+
+#include <QObject>
+
+#include <vidalia/VidaliaPluginInterface.h>
+
+class MessageLogPlugin : public QObject, public VidaliaPluginInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(VidaliaPluginInterface)
+
+public:
+  MessageLogPlugin();
+  ~MessageLogPlugin();
+
+  QString pluginHumanName() const;
+};
+
+#endif

Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/CMakeLists.txt	2009-06-17 00:28:22 UTC (rev 3867)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt	2009-06-24 17:45:32 UTC (rev 3880)
@@ -10,12 +10,37 @@
 ##  the terms described in the LICENSE file.
 ##
 
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
 set(networkmapplugin_SRCS 
   NetworkMapPlugin.cpp
+  CircuitItem.cpp
+  CircuitListWidget.cpp
+  GeoIpCache.cpp
+  GeoIpCacheItem.cpp
+  GeoIp.cpp
+  GeoIpRequest.cpp
+  GeoIpResolver.cpp
+  GeoIpResponse.cpp
+  NetViewer.cpp
+  RouterDescriptorView.cpp
+  RouterInfoDialog.cpp
+  RouterListItem.cpp
+  RouterListWidget.cpp
+  StreamItem.cpp
 )
 qt4_wrap_cpp(networkmapplugin_SRCS
   NetworkMapPlugin.h
+  CircuitListWidget.h
+  GeoIpCache.h
+  GeoIpResolver.h
+  NetViewer.h
+  RouterDescriptorView.h
+  RouterInfoDialog.h
+  RouterListWidget.h
 )
 
 add_library(networkmapplugin STATIC  ${networkmapplugin_SRCS})

Copied: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.cpp (from rev 3872, vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/NetworkMapPlugin.cpp)
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.cpp	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.cpp	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,33 @@
+/*
+**  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 NetworkMapPlugin.cpp
+** \version $Id$
+** \brief The user's network map panel, containing a visual display of Tor
+*/
+
+#include "NetworkMapPlugin.h"
+
+NetworkMapPlugin::NetworkMapPlugin()
+{
+}
+
+NetworkMapPlugin::~NetworkMapPlugin()
+{
+}
+
+QString NetworkMapPlugin::pluginHumanName() const
+{
+  return QString("Network Map");
+}
+
+Q_EXPORT_PLUGIN2(networkmapplugin, NetworkMapPlugin)
+

Copied: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h (from rev 3872, vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/NetworkMapPlugin.h)
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h	2009-06-24 17:45:32 UTC (rev 3880)
@@ -0,0 +1,36 @@
+/*
+**  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 NetworkMapPlugin.h
+** \version $Id$
+** \brief The user's network panel, containing a visual display of the Tor network.
+*/
+
+#ifndef _NETWORKMAPPLUGIN_H
+#define _NETWORKMAPPLUGIN_H
+
+#include <QObject>
+
+#include <vidalia/VidaliaPluginInterface.h>
+
+class NetworkMapPlugin : public QObject, public VidaliaPluginInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(VidaliaPluginInterface)
+
+public:
+  NetworkMapPlugin();
+  ~NetworkMapPlugin();
+
+  QString pluginHumanName() const;
+};
+
+#endif