[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3882: Deleted placeholder dashboard and home. Network Map compiles (in vidalia/branches/extension-api/src/vidalia: . NetworkMapPlugin)
Author: tyree731
Date: 2009-06-24 18:21:43 -0400 (Wed, 24 Jun 2009)
New Revision: 3882
Removed:
vidalia/branches/extension-api/src/vidalia/Dashboard.cpp
vidalia/branches/extension-api/src/vidalia/Dashboard.h
vidalia/branches/extension-api/src/vidalia/Dashboard.ui
vidalia/branches/extension-api/src/vidalia/HomePanel.cpp
vidalia/branches/extension-api/src/vidalia/HomePanel.h
vidalia/branches/extension-api/src/vidalia/HomePanel.ui
vidalia/branches/extension-api/src/vidalia/network/
Modified:
vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
vidalia/branches/extension-api/src/vidalia/MainWindow.h
vidalia/branches/extension-api/src/vidalia/MainWindow.ui
vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt
vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.cpp
vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h
vidalia/branches/extension-api/src/vidalia/PluginManager.cpp
vidalia/branches/extension-api/src/vidalia/PluginManager.h
vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h
Log:
Deleted placeholder dashboard and home. Network Map compiles without warnings now. Fixed a ton of things. Icons causing problems in Network map plugin.
Modified: vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/CMakeLists.txt 2009-06-24 18:34:43 UTC (rev 3881)
+++ vidalia/branches/extension-api/src/vidalia/CMakeLists.txt 2009-06-24 22:21:43 UTC (rev 3882)
@@ -19,7 +19,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/config
${CMAKE_CURRENT_SOURCE_DIR}/help/browser
${CMAKE_CURRENT_SOURCE_DIR}/log
- ${CMAKE_CURRENT_SOURCE_DIR}/network
${CMAKE_CURRENT_SOURCE_DIR}/tray
${MARBLE_INCLUDE_DIR}
)
@@ -152,14 +151,6 @@
)
endif(USE_MINIUPNPC)
-## Dashboard sources
-set(vidalia_SRCS ${vidalia_SRCS}
- Dashboard.cpp
-)
-qt4_wrap_cpp(vidalia_SRCS
- Dashboard.h
-)
-
## Help browser sources
set(vidalia_SRCS ${vidalia_SRCS}
help/browser/HelpBrowser.cpp
@@ -170,14 +161,6 @@
help/browser/HelpTextBrowser.h
)
-## Home Panel sources
-set(vidalia_SRCS ${vidalia_SRCS}
- HomePanel.cpp
-)
-qt4_wrap_cpp(vidalia_SRCS
- HomePanel.h
-)
-
## Message log sources
set(vidalia_SRCS ${vidalia_SRCS}
log/LogFile.cpp
@@ -194,54 +177,6 @@
log/MessageLog.h
)
-## Network map sources
-set(vidalia_SRCS ${vidalia_SRCS}
- network/CircuitItem.cpp
- network/CircuitListWidget.cpp
- network/GeoIpCache.cpp
- network/GeoIpCacheItem.cpp
- network/GeoIp.cpp
- network/GeoIpRequest.cpp
- network/GeoIpResolver.cpp
- network/GeoIpResponse.cpp
- network/NetViewer.cpp
- network/RouterDescriptorView.cpp
- network/RouterInfoDialog.cpp
- network/RouterListItem.cpp
- network/RouterListWidget.cpp
- network/StreamItem.cpp
-)
-qt4_wrap_cpp(vidalia_SRCS
- network/CircuitListWidget.h
- network/GeoIpCache.h
- network/GeoIpResolver.h
- network/NetViewer.h
- network/RouterDescriptorView.h
- network/RouterInfoDialog.h
- network/RouterListWidget.h
-)
-if (USE_MARBLE)
- set(vidalia_SRCS ${vidalia_SRCS}
- network/TorMapWidget.cpp
- network/TorMapWidgetInputHandler.cpp
- network/TorMapWidgetPopupMenu.cpp
- )
- qt4_wrap_cpp(vidalia_SRCS
- network/TorMapWidget.h
- network/TorMapWidgetInputHandler.h
- network/TorMapWidgetPopupMenu.h
- )
-else(USE_MARBLE)
- set(vidalia_SRCS ${vidalia_SRCS}
- network/TorMapImageView.cpp
- network/ZImageView.cpp
- )
- qt4_wrap_cpp(vidalia_SRCS
- network/TorMapImageView.h
- network/ZImageView.h
- )
-endif(USE_MARBLE)
-
## Choose the correct tray icon implementation for the current platform
set(vidalia_SRCS ${vidalia_SRCS} tray/TrayIcon.cpp)
qt4_wrap_cpp(vidalia_SRCS tray/TrayIcon.h)
@@ -275,14 +210,11 @@
VMessageBox.h
HelperProcess.h
ControlPasswordInputDialog.h
- PluginManager.h
)
## Specify all the Qt Designer .ui files
qt4_wrap_ui(vidalia_SRCS
ControlPasswordInputDialog.ui
- Dashboard.ui
- HomePanel.ui
MainWindow.ui
about/AboutDialog.ui
about/LicenseDialog.ui
@@ -298,8 +230,6 @@
config/ServicePage.ui
help/browser/HelpBrowser.ui
log/MessageLog.ui
- network/NetViewer.ui
- network/RouterInfoDialog.ui
)
if (USE_MINIUPNPC)
Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.cpp 2009-06-24 18:34:43 UTC (rev 3881)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.cpp 2009-06-24 22:21:43 UTC (rev 3882)
@@ -114,17 +114,16 @@
/* Create all the dialogs of which we only want one instance */
_messageLog = new MessageLog();
_bandwidthGraph = new BandwidthGraph();
- _dashboard = new Dashboard();
- _homePanel = new HomePanel();
- _netViewer = new NetViewer();
_configDialog = new ConfigDialog();
_menuBar = 0;
connect(_messageLog, SIGNAL(helpRequested(QString)),
this, SLOT(showHelpDialog(QString)));
+#if 0
connect(_netViewer, SIGNAL(helpRequested(QString)),
this, SLOT(showHelpDialog(QString)));
connect(_configDialog, SIGNAL(helpRequested(QString)),
this, SLOT(showHelpDialog(QString)));
+#endif
/* Create the actions that will go in the tray menu */
createActions();
@@ -142,14 +141,6 @@
/* Populate the tab bar with plugins */
populateTabs(_pluginManager->plugins());
-#if 0
- ui.tabMainPanel->addTab(_homePanel, tr("Home Panel"));
- ui.tabMainPanel->addTab(_dashboard, tr("Dashboard"));
- ui.tabMainPanel->addTab(_netViewer, tr("Network Viewer"));
- ui.tabMainPanel->addTab(_messageLog, tr("Message Log"));
-#endif
- ui.tabMainPanel->removeTab(0);
- ui.tabMainPanel->removeTab(0);
/* Create a new TorControl object, used to communicate with Tor */
_torControl = Vidalia::torControl();
@@ -230,11 +221,8 @@
{
_trayIcon.hide();
delete _messageLog;
- delete _dashboard;
- delete _homePanel;
delete _pluginManager;
delete _bandwidthGraph;
- delete _netViewer;
delete _configDialog;
}
@@ -461,9 +449,11 @@
connect(_messageAct, SIGNAL(triggered()),
_messageLog, SLOT(showWindow()));
+#if 0
_networkAct = new QAction(tr("Network Map"), this);
connect(_networkAct, SIGNAL(triggered()),
_netViewer, SLOT(showWindow()));
+#endif
_controlPanelAct = new QAction(tr("Control Panel"), this);
connect(_controlPanelAct, SIGNAL(triggered()), this, SLOT(show()));
@@ -646,7 +636,9 @@
MainWindow::populateTabs(QList<VidaliaPluginInterface*> plugins)
{
foreach (VidaliaPluginInterface* plugin, plugins) {
+ vInfo("Survey says...");
if (plugin->panel()) {
+ vInfo(plugin->panel()->tabLabel());
ui.tabMainPanel->addTab(plugin->panel(), plugin->panel()->tabIcon(),
plugin->panel()->tabLabel());
}
Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.h 2009-06-24 18:34:43 UTC (rev 3881)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.h 2009-06-24 22:21:43 UTC (rev 3882)
@@ -27,10 +27,7 @@
#include "MessageLog.h"
#include "BandwidthGraph.h"
#include "ConfigDialog.h"
-#include "Dashboard.h"
#include "HelpBrowser.h"
-#include "HomePanel.h"
-#include "NetViewer.h"
#include "PluginManager.h"
#include "VidaliaPluginInterface.h"
@@ -234,16 +231,10 @@
bool _delayedShutdownStarted;
/** Set to true if Vidalia started its own Tor process. */
bool _isVidaliaRunningTor;
- /** A Dashboard object which displays the user's dashboard */
- Dashboard* _dashboard;
- /** A HomePanel object which displays the user's home panel */
- HomePanel* _homePanel;
/** A MessageLog object which handles logging Tor messages */
MessageLog* _messageLog;
/** A BandwidthGraph object which handles monitoring Tor bandwidth usage */
BandwidthGraph* _bandwidthGraph;
- /** A NetViewer object which displays the Tor network graphically */
- NetViewer* _netViewer;
/** A ConfigDialog object which lets the user configure Tor and Vidalia */
ConfigDialog* _configDialog;
/** A Plugin Manager object which loads and manages Vidalia Plugins. */
Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.ui 2009-06-24 18:34:43 UTC (rev 3881)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.ui 2009-06-24 22:21:43 UTC (rev 3882)
@@ -46,16 +46,6 @@
<property name="documentMode">
<bool>true</bool>
</property>
- <widget class="QWidget" name="tab">
- <attribute name="title">
- <string>Tab 1</string>
- </attribute>
- </widget>
- <widget class="QWidget" name="tab_2">
- <attribute name="title">
- <string>Tab 2</string>
- </attribute>
- </widget>
</widget>
</item>
</layout>
Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt 2009-06-24 18:34:43 UTC (rev 3881)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt 2009-06-24 22:21:43 UTC (rev 3882)
@@ -34,21 +34,44 @@
)
qt4_wrap_cpp(networkmapplugin_SRCS
NetworkMapPlugin.h
- CircuitItem.h
+# CircuitItem.h
CircuitListWidget.h
GeoIpCache.h
- GeoIpCacheItem.h
- GeoIp.h
- GeoIpRequest.h
+# GeoIpCacheItem.h
+# GeoIp.h
+# GeoIpRequest.h
GeoIpResolver.h
- GeoIpResponse.h
+# GeoIpResponse.h
NetViewer.h
RouterDescriptorView.h
RouterInfoDialog.h
- RouterListItem.h
+# RouterListItem.h
RouterListWidget.h
- StreamItem.h
+# StreamItem.h
)
+
+if (USE_MARBLE)
+ set(networkmapplugin_SRCS ${networkmapplugin_SRCS}
+ TorMapWidget.cpp
+ TorMapWidgetInputHandler.cpp
+ TorMapWidgetPopupMenu.cpp
+ )
+ qt4_wrap_cpp(networkmapplugin_SRCS
+ TorMapWidget.h
+ TorMapWidgetInputHandler.h
+ TorMapWidgetPopupMenu.h
+ )
+else(USE_MARBLE)
+ set(networkmapplugin_SRCS ${networkmapplugin_SRCS}
+ TorMapImageView.cpp
+ ZImageView.cpp
+ )
+ qt4_wrap_cpp(networkmapplugin_SRCS
+ TorMapImageView.h
+ ZImageView.h
+ )
+endif(USE_MARBLE)
+
qt4_wrap_ui(networkmapplugin_SRCS
NetViewer.ui
RouterInfoDialog.ui
Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.cpp 2009-06-24 18:34:43 UTC (rev 3881)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.cpp 2009-06-24 22:21:43 UTC (rev 3882)
@@ -18,14 +18,23 @@
NetworkMapPlugin::NetworkMapPlugin()
{
+ _netViewer = new NetViewer();
}
NetworkMapPlugin::~NetworkMapPlugin()
{
+ delete _netViewer;
}
-QString NetworkMapPlugin::pluginHumanName() const
+VidaliaPanel*
+NetworkMapPlugin::panel() const
{
+ return _netViewer;
+}
+
+QString
+NetworkMapPlugin::pluginHumanName() const
+{
return QString("Network Map");
}
Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h 2009-06-24 18:34:43 UTC (rev 3881)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetworkMapPlugin.h 2009-06-24 22:21:43 UTC (rev 3882)
@@ -17,10 +17,14 @@
#ifndef _NETWORKMAPPLUGIN_H
#define _NETWORKMAPPLUGIN_H
+#include "NetViewer.h"
+
#include <QObject>
#include <vidalia/VidaliaPluginInterface.h>
+/** Plugin for viewer the user's network panel, containing a visual display of
+ * the Tor network. */
class NetworkMapPlugin : public QObject, public VidaliaPluginInterface
{
Q_OBJECT
@@ -30,7 +34,13 @@
NetworkMapPlugin();
~NetworkMapPlugin();
+ /** Returns the vidalia panel to be displayed in the main window. */
+ VidaliaPanel* panel() const;
+ /** Returns the human readable plugin name for adding and removing plugins. */
QString pluginHumanName() const;
+private:
+ /** The network map object. */
+ NetViewer* _netViewer;
};
#endif
Modified: vidalia/branches/extension-api/src/vidalia/PluginManager.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/PluginManager.cpp 2009-06-24 18:34:43 UTC (rev 3881)
+++ vidalia/branches/extension-api/src/vidalia/PluginManager.cpp 2009-06-24 22:21:43 UTC (rev 3882)
@@ -34,11 +34,12 @@
foreach (QObject *plugin, QPluginLoader::staticInstances()) {
VidaliaPluginInterface* pluginInstance =
qobject_cast<VidaliaPluginInterface*>(plugin);
- if (pluginInstance) {
- _pluginList.push_back(pluginInstance);
- } else {
- /* Invalid plugin type? */
- }
+ if (pluginInstance) {
+ vInfo(pluginInstance->pluginHumanName());
+ _pluginList.push_back(pluginInstance);
+ } else {
+ /* Invalid plugin type? */
+ }
}
#if 0
QDir dataPluginsDir = QDir(dataDirectory);
Modified: vidalia/branches/extension-api/src/vidalia/PluginManager.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/PluginManager.h 2009-06-24 18:34:43 UTC (rev 3881)
+++ vidalia/branches/extension-api/src/vidalia/PluginManager.h 2009-06-24 22:21:43 UTC (rev 3882)
@@ -14,6 +14,8 @@
** \brief Class for loading and managing plugins within Vidalia.
*/
+#include "Vidalia.h"
+
#include <QList>
#include <QObject>
#include <QString>
Modified: vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h 2009-06-24 18:34:43 UTC (rev 3881)
+++ vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h 2009-06-24 22:21:43 UTC (rev 3882)
@@ -26,8 +26,10 @@
class VidaliaPanel : public QMainWindow
{
public:
+ /** Constructor for a Vidalia Panel. */
+ VidaliaPanel() {}
/** Destructor for a Vidalia Panel. */
- virtual ~VidaliaPanel() = 0;
+ virtual ~VidaliaPanel() {}
/** Returns the label to be displayed on the panel's tab. */
virtual QString tabLabel() const = 0;
/** Returns the icon to be displayed adjacent to the tabLabel. */