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

[vidalia-svn] r3867: Massive cleanup. Added placeholders for main plugins. Update (in vidalia/branches/extension-api/src: plugins plugins/DashboardPlugin plugins/HomePlugin plugins/MessageLogPlugin plugins/NetworkMapPlugin vidalia)



Author: tyree731
Date: 2009-06-16 20:28:22 -0400 (Tue, 16 Jun 2009)
New Revision: 3867

Added:
   vidalia/branches/extension-api/src/plugins/DashboardPlugin/
   vidalia/branches/extension-api/src/plugins/DashboardPlugin/CMakeLists.txt
   vidalia/branches/extension-api/src/plugins/DashboardPlugin/DashboardPlugin.cpp
   vidalia/branches/extension-api/src/plugins/DashboardPlugin/DashboardPlugin.h
   vidalia/branches/extension-api/src/plugins/MessageLogPlugin/
   vidalia/branches/extension-api/src/plugins/MessageLogPlugin/CMakeLists.txt
   vidalia/branches/extension-api/src/plugins/MessageLogPlugin/MessageLogPlugin.cpp
   vidalia/branches/extension-api/src/plugins/MessageLogPlugin/MessageLogPlugin.h
   vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/
   vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/CMakeLists.txt
   vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/NetworkMapPlugin.cpp
   vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/NetworkMapPlugin.h
   vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h
   vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.h
   vidalia/branches/extension-api/src/vidalia/VidaliaWidget.h
Removed:
   vidalia/branches/extension-api/src/vidalia/Interfaces.h
Modified:
   vidalia/branches/extension-api/src/plugins/CMakeLists.txt
   vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt
   vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp
   vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.h
   vidalia/branches/extension-api/src/vidalia/main.cpp
Log:
Massive cleanup. Added placeholders for main plugins. Updated interface to be more correct.


Modified: vidalia/branches/extension-api/src/plugins/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/plugins/CMakeLists.txt	2009-06-16 22:18:08 UTC (rev 3866)
+++ vidalia/branches/extension-api/src/plugins/CMakeLists.txt	2009-06-17 00:28:22 UTC (rev 3867)
@@ -1,5 +1,5 @@
 ##
-##  $Id: CMakeLists.txt 2855 2008-07-13 04:08:49Z edmanm $
+##  $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 
@@ -14,10 +14,19 @@
 include_directories(
   ${QT_INCLUDES}
   ${CMAKE_CURRENT_SOURCE_DIR}
-#  ${CMAKE_CURRENT_SOURCE_DIR}/HomePlugin
+  ${CMAKE_CURRENT_SOURCE_DIR}/HomePlugin
+  ${CMAKE_CURRENT_BINARY_DIR}/DashboardPlugin
+  ${CMAKE_CURRENT_BINARY_DIR}/MessageLogPlugin
+  ${CMAKE_CURRENT_BINARY_DIR}/NetworkMapPlugin
 )
-#link_directories(
-#  ${CMAKE_CURRENT_BINARY_DIR}/HomePlugin
-#)
+link_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}/HomePlugin
+  ${CMAKE_CURRENT_BINARY_DIR}/DashboardPlugin
+  ${CMAKE_CURRENT_BINARY_DIR}/MessageLogPlugin
+  ${CMAKE_CURRENT_BINARY_DIR}/NetworkMapPlugin
+)
 
-#add_subdirectory(HomePlugin)
+add_subdirectory(HomePlugin)
+add_subdirectory(DashboardPlugin)
+add_subdirectory(MessageLogPlugin)
+add_subdirectory(NetworkMapPlugin)


Property changes on: vidalia/branches/extension-api/src/plugins/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Copied: vidalia/branches/extension-api/src/plugins/DashboardPlugin/CMakeLists.txt (from rev 3847, vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt)
===================================================================
--- vidalia/branches/extension-api/src/plugins/DashboardPlugin/CMakeLists.txt	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/DashboardPlugin/CMakeLists.txt	2009-06-17 00:28:22 UTC (rev 3867)
@@ -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(dashboardplugin_SRCS 
+  DashboardPlugin.cpp
+)
+qt4_wrap_cpp(dashboardplugin_SRCS
+  DashboardPlugin.h
+)
+
+add_library(dashboardplugin STATIC  ${dashboardplugin_SRCS})
+target_link_libraries(dashboardplugin ${QT_LIBRARIES})


Property changes on: vidalia/branches/extension-api/src/plugins/DashboardPlugin/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Copied: vidalia/branches/extension-api/src/plugins/DashboardPlugin/DashboardPlugin.cpp (from rev 3847, vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp)
===================================================================
--- vidalia/branches/extension-api/src/plugins/DashboardPlugin/DashboardPlugin.cpp	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/DashboardPlugin/DashboardPlugin.cpp	2009-06-17 00:28:22 UTC (rev 3867)
@@ -0,0 +1,28 @@
+/*
+**  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()
+{
+}
+
+Q_EXPORT_PLUGIN2(dashboardplugin, DashboardPlugin)
+

Copied: vidalia/branches/extension-api/src/plugins/DashboardPlugin/DashboardPlugin.h (from rev 3847, vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.h)
===================================================================
--- vidalia/branches/extension-api/src/plugins/DashboardPlugin/DashboardPlugin.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/DashboardPlugin/DashboardPlugin.h	2009-06-17 00:28:22 UTC (rev 3867)
@@ -0,0 +1,35 @@
+/*
+**  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();
+
+};
+
+#endif

Modified: vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt	2009-06-16 22:18:08 UTC (rev 3866)
+++ vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt	2009-06-17 00:28:22 UTC (rev 3867)
@@ -1,5 +1,5 @@
 ##
-##  $Id: CMakeLists.txt 3735 2009-04-28 20:28:01Z edmanm $
+##  $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 


Property changes on: vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp	2009-06-16 22:18:08 UTC (rev 3866)
+++ vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp	2009-06-17 00:28:22 UTC (rev 3867)
@@ -24,12 +24,5 @@
 {
 }
 
-QString
-HomePlugin::panelName()
-{
-  QString bob("bob");
-  return bob;
-}
-
 Q_EXPORT_PLUGIN2(homeplugin, HomePlugin)
 

Modified: vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.h
===================================================================
--- vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.h	2009-06-16 22:18:08 UTC (rev 3866)
+++ vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.h	2009-06-17 00:28:22 UTC (rev 3867)
@@ -17,23 +17,18 @@
 #ifndef _HOMEPLUGIN_H
 #define _HOMEPLUGIN_H
 
-#include <vidalia/Interfaces.h>
-
-#include <QIcon>
 #include <QObject>
-#include <QString>
-#include <QWidget>
 
-class HomePlugin : public QObject, public PanelInterface
+#include <vidalia/VidaliaPluginInterface.h>
+
+class HomePlugin : public QObject, public VidaliaPluginInterface
 {
   Q_OBJECT
-  Q_INTERFACES(PanelInterface)
+  Q_INTERFACES(VidaliaPluginInterface)
 
 public:
   HomePlugin();
   ~HomePlugin();
-  
-  QString panelName();
 };
 
 #endif

Copied: vidalia/branches/extension-api/src/plugins/MessageLogPlugin/CMakeLists.txt (from rev 3847, vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt)
===================================================================
--- vidalia/branches/extension-api/src/plugins/MessageLogPlugin/CMakeLists.txt	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/MessageLogPlugin/CMakeLists.txt	2009-06-17 00:28:22 UTC (rev 3867)
@@ -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(messagelogplugin_SRCS 
+  MessageLogPlugin.cpp
+)
+qt4_wrap_cpp(messagelogplugin_SRCS
+  MessageLogPlugin.h
+)
+
+add_library(messagelogplugin STATIC  ${messagelogplugin_SRCS})
+target_link_libraries(messagelogplugin ${QT_LIBRARIES})


Property changes on: vidalia/branches/extension-api/src/plugins/MessageLogPlugin/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Copied: vidalia/branches/extension-api/src/plugins/MessageLogPlugin/MessageLogPlugin.cpp (from rev 3847, vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp)
===================================================================
--- vidalia/branches/extension-api/src/plugins/MessageLogPlugin/MessageLogPlugin.cpp	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/MessageLogPlugin/MessageLogPlugin.cpp	2009-06-17 00:28:22 UTC (rev 3867)
@@ -0,0 +1,28 @@
+/*
+**  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()
+{
+}
+
+Q_EXPORT_PLUGIN2(messagelogplugin, MessageLogPlugin)
+

Copied: vidalia/branches/extension-api/src/plugins/MessageLogPlugin/MessageLogPlugin.h (from rev 3847, vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.h)
===================================================================
--- vidalia/branches/extension-api/src/plugins/MessageLogPlugin/MessageLogPlugin.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/MessageLogPlugin/MessageLogPlugin.h	2009-06-17 00:28:22 UTC (rev 3867)
@@ -0,0 +1,35 @@
+/*
+**  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();
+
+};
+
+#endif

Copied: vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/CMakeLists.txt (from rev 3847, vidalia/branches/extension-api/src/plugins/HomePlugin/CMakeLists.txt)
===================================================================
--- vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/CMakeLists.txt	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/CMakeLists.txt	2009-06-17 00:28:22 UTC (rev 3867)
@@ -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(networkmapplugin_SRCS 
+  NetworkMapPlugin.cpp
+)
+qt4_wrap_cpp(networkmapplugin_SRCS
+  NetworkMapPlugin.h
+)
+
+add_library(networkmapplugin STATIC  ${networkmapplugin_SRCS})
+target_link_libraries(networkmapplugin ${QT_LIBRARIES})


Property changes on: vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Copied: vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/NetworkMapPlugin.cpp (from rev 3847, vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.cpp)
===================================================================
--- vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/NetworkMapPlugin.cpp	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/NetworkMapPlugin.cpp	2009-06-17 00:28:22 UTC (rev 3867)
@@ -0,0 +1,28 @@
+/*
+**  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()
+{
+}
+
+Q_EXPORT_PLUGIN2(networkmapplugin, NetworkMapPlugin)
+

Copied: vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/NetworkMapPlugin.h (from rev 3847, vidalia/branches/extension-api/src/plugins/HomePlugin/HomePlugin.h)
===================================================================
--- vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/NetworkMapPlugin.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/NetworkMapPlugin/NetworkMapPlugin.h	2009-06-17 00:28:22 UTC (rev 3867)
@@ -0,0 +1,35 @@
+/*
+**  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();
+
+};
+
+#endif

Added: vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h	2009-06-17 00:28:22 UTC (rev 3867)
@@ -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 VidaliaPanel.h
+** \version $Id$
+** \brief Defines the Vidalia panel containing a tab and corresponding QMainWindow.
+*/
+
+#include <QIcon>
+#include <QMainWindow>
+#include <QString>
+
+/** A Vidalia Panel. Includes a tab entry on the main window and a displayable
+ * panel for when the tab is highlighted. */
+class VidaliaPanel : public QMainWindow
+{
+public:
+  /** Constructor for a Vidalia Panel. */
+  VidaliaPanel();
+  /** Destructor for a Vidalia Panel. */
+  ~VidaliaPanel();
+  /** Returns the label to be displayed on the plugin's tab. */
+  QString* tabLabel();
+  /** Returns the icon to be displayed adjacent to the tabLabel. */
+  QIcon* tabIcon();
+};


Property changes on: vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Copied: vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.h (from rev 3866, vidalia/branches/extension-api/src/vidalia/Interfaces.h)
===================================================================
--- vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.h	2009-06-17 00:28:22 UTC (rev 3867)
@@ -0,0 +1,58 @@
+/*
+**  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 VidaliaPluginInterface.h
+** \version $Id$
+** \brief Defines the Vidalia plugin interface.
+*/
+
+#ifndef _VIDALIAPLUGININTERFACE_H
+#define _VIDALIAPLUGININTERFACE_H
+
+#include <QtPlugin>
+#include <QString>
+
+#include "config/ConfigPage.h"
+#include "VidaliaPanel.h"
+#include "VidaliaWidget.h"
+
+class QAction;
+
+/** API for vidalia plugins. Plugins have the ability to implement the various
+ * included functions in order to display themselves and have menu entries. If
+ * a plugin does not implement a given function then that functionality will
+ * not be included for the plugin. */
+class VidaliaPluginInterface
+{
+public:
+  /** Virtual destructor */
+  virtual ~VidaliaPluginInterface() {}
+  /** Virtual class to allow for display of a panel name */
+  virtual VidaliaPanel* panel() const { return 0; }
+  /** Virtual function to return a plugin's widget. */
+  virtual VidaliaWidget* widget() const { return 0; }
+  /** Virtual function to return any file menu entries a plugin has. */
+  virtual QAction* fileMenuEntry() const { return 0; }
+  /** Virtual function to return any tray menu entries a plugin has. */
+  virtual QAction* trayMenuEntry() const { return 0; }
+  /** Virtual function return a configuration page for a plugin. */
+  virtual ConfigPage* preferenceMenuEntry() const { return 0; }
+  /** Virtual function to allow for UI retranslation. */
+  virtual void retranslateUI() {}
+  /** Virtual function to return a plugin's description. */
+  virtual QString description() { return QString(""); }
+};
+
+Q_DECLARE_INTERFACE(VidaliaPluginInterface, 
+		    "net.vidalia-project.vidalia.VidaliaPluginInterface/1.0")
+
+
+#endif

Added: vidalia/branches/extension-api/src/vidalia/VidaliaWidget.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/VidaliaWidget.h	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/VidaliaWidget.h	2009-06-17 00:28:22 UTC (rev 3867)
@@ -0,0 +1,28 @@
+/*
+**  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 VidaliaWidget.h
+** \version $Id$
+** \brief Defines the Vidalia widget, a displayable entity living on the dashboard.
+*/
+
+#include <QWidget>
+
+/** A Vidalia Widget. A displayable entity that lives on a user's dashboard.
+ * Typically "lighter" than a VidaliaPanel. */
+class VidaliaWidget : public QWidget
+{
+public:
+  /** Constructor for a Vidalia Widget. */
+  VidaliaWidget();
+  /** Destructor for a Vidalia Widget. */
+  ~VidaliaWidget();
+};


Property changes on: vidalia/branches/extension-api/src/vidalia/VidaliaWidget.h
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: vidalia/branches/extension-api/src/vidalia/main.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/main.cpp	2009-06-16 22:18:08 UTC (rev 3866)
+++ vidalia/branches/extension-api/src/vidalia/main.cpp	2009-06-17 00:28:22 UTC (rev 3867)
@@ -32,9 +32,11 @@
 #include <signal.h>
 #endif
 
-#if 0
+
 Q_IMPORT_PLUGIN(homeplugin)
-#endif
+Q_IMPORT_PLUGIN(dashboardplugin)
+Q_IMPORT_PLUGIN(networkmapplugin)
+Q_IMPORT_PLUGIN(messagelogplugin)
 
 extern "C" void
 signal_handler(int signal)