[vidalia-svn] r3906: Closer to compiling. What to do with the VSettings object in (vidalia/branches/extension-api/src/vidalia/MessageLogPlugin)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-06-28 18:35:36 -0400 (Sun, 28 Jun 2009)
New Revision: 3906

Modified:
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.h
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.cpp
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h
Log:
Closer to compiling. What to do with the VSettings object in VidaliaWindow?


Modified: vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp	2009-06-28 21:54:14 UTC (rev 3905)
+++ vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp	2009-06-28 22:35:36 UTC (rev 3906)
@@ -85,6 +85,18 @@
   _logFile.close();
 }
 
+QString
+MessageLog::tabLabel() const
+{
+  return QString("Message Log");
+}
+
+QIcon
+MessageLog::tabIcon() const
+{
+  return QIcon(":/images/32x32/format-justify-fill.png");
+}
+
 /** Binds events (signals) to actions (slots). */
 void
 MessageLog::createActions()

Modified: vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.h	2009-06-28 21:54:14 UTC (rev 3905)
+++ vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.h	2009-06-28 22:35:36 UTC (rev 3906)
@@ -18,7 +18,7 @@
 #define _MESSAGELOG_H
 
 #include "ui_MessageLog.h"
-#include "VidaliaWindow.h"
+#include "VidaliaPanel.h"
 #include "LogFile.h"
 #include "LogTreeItem.h"
 #include "TorControl.h"
@@ -38,6 +38,11 @@
   MessageLog(QWidget *parent = 0);
   /** Default destructor **/
   ~MessageLog();
+
+  /** Hook for Vidalia API to display text in the Message Log Panel's tab. */
+  QString tabLabel() const;
+  /** Hook for Vidalia API to display text in the Message Log Panel's tab. */
+  QIcon tabIcon() const;
   
 protected:
   /** Called to deliver custom event types */

Modified: vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.cpp	2009-06-28 21:54:14 UTC (rev 3905)
+++ vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.cpp	2009-06-28 22:35:36 UTC (rev 3906)
@@ -18,10 +18,13 @@
 
 MessageLogPlugin::MessageLogPlugin()
 {
+  _messageLog = 0;
 }
 
 MessageLogPlugin::~MessageLogPlugin()
 {
+  if (_messageLog)
+    delete _messageLog;
 }
 
 QString MessageLogPlugin::pluginHumanName() const
@@ -29,5 +32,19 @@
   return QString("Message Log");
 }
 
+VidaliaPanel*
+MessageLogPlugin::panel()
+{
+  if (!_messageLog)
+    init();
+  return _messageLog;
+}
+
+void 
+MessageLogPlugin::init()
+{
+  _messageLog = new MessageLog();
+}
+
 Q_EXPORT_PLUGIN2(messagelogplugin, MessageLogPlugin)
 

Modified: vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h	2009-06-28 21:54:14 UTC (rev 3905)
+++ vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLogPlugin.h	2009-06-28 22:35:36 UTC (rev 3906)
@@ -32,8 +32,9 @@
   MessageLogPlugin();
   ~MessageLogPlugin();
 
+  /** Returns the panel to be displayed in the main window. */
   VidaliaPanel* panel();
-
+  /** Returns the human readable plugin name for adding and removing plugins. */
   QString pluginHumanName() const;
 
 private: