[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3925: Fixed compilation issues. Removed old placeholder panels and (in vidalia/branches/extension-api/src/vidalia: . MessageLogPlugin NetworkMapPlugin)
Author: tyree731
Date: 2009-06-29 18:54:10 -0400 (Mon, 29 Jun 2009)
New Revision: 3925
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/log/
Modified:
vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
vidalia/branches/extension-api/src/vidalia/MainWindow.ui
vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp
vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp
vidalia/branches/extension-api/src/vidalia/PluginManager.cpp
vidalia/branches/extension-api/src/vidalia/PluginManager.h
vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h
vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.cpp
vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.h
Log:
Fixed compilation issues. Removed old placeholder panels and added a window icon.
Modified: vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/CMakeLists.txt 2009-06-29 21:25:35 UTC (rev 3924)
+++ vidalia/branches/extension-api/src/vidalia/CMakeLists.txt 2009-06-29 22:54:10 UTC (rev 3925)
@@ -195,6 +195,8 @@
VMessageBox.h
HelperProcess.h
ControlPasswordInputDialog.h
+ PluginManager.h
+ VidaliaPanel.h
)
## Specify all the Qt Designer .ui files
Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.ui 2009-06-29 21:25:35 UTC (rev 3924)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.ui 2009-06-29 22:54:10 UTC (rev 3925)
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -19,12 +19,19 @@
<property name="windowTitle">
<string>Vidalia</string>
</property>
+ <property name="windowIcon">
+ <iconset resource="../../../../trunk/src/vidalia/res/vidalia.qrc">
+ <normaloff>:/images/32x32/tor-logo.png</normaloff>:/images/32x32/tor-logo.png</iconset>
+ </property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="documentMode">
<bool>false</bool>
</property>
+ <property name="unifiedTitleAndToolBarOnMac">
+ <bool>true</bool>
+ </property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
@@ -36,7 +43,7 @@
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="margin">
- <number>12</number>
+ <number>0</number>
</property>
<item>
<widget class="QTabWidget" name="tabMainPanel">
@@ -64,6 +71,8 @@
</property>
</widget>
</widget>
- <resources/>
+ <resources>
+ <include location="../../../../trunk/src/vidalia/res/vidalia.qrc"/>
+ </resources>
<connections/>
</ui>
Modified: vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp 2009-06-29 21:25:35 UTC (rev 3924)
+++ vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp 2009-06-29 22:54:10 UTC (rev 3925)
@@ -162,7 +162,7 @@
MessageLog::loadSettings()
{
/* Acquire a settings object from the parent plugin. */
- QSettings* settings = VidaliaPanel::_parentPlugin->settings();
+ QSettings* settings = plugin()->settings();
/* Set Max Count widget */
uint maxMsgCount = settings->value(SETTING_MAX_MSG_COUNT,
DEFAULT_MAX_MSG_COUNT).toUInt();
@@ -191,6 +191,9 @@
QApplication::setOverrideCursor(Qt::WaitCursor);
ui.lstMessages->filter(_filter);
QApplication::restoreOverrideCursor();
+
+ /* Remove the settings object. */
+ delete settings;
}
/** Attempts to register the selected message filter with Tor and displays an
@@ -199,7 +202,7 @@
MessageLog::registerLogEvents()
{
/* Getting a QSettings object from my parent. */
- QSettings* settings = _parentPlugin->settings();
+ QSettings* settings = plugin()->settings();
QString errmsg;
_filter = settings->value(SETTING_MSG_FILTER, DEFAULT_MSG_FILTER).toUInt();
@@ -208,6 +211,9 @@
p(tr("Vidalia was unable to register for Tor's log events.")) + p(errmsg),
VMessageBox::Ok);
}
+
+ /* Remove the settings object. */
+ delete settings;
}
/** Opens a log file if necessary, or closes it if logging is disabled. If a
@@ -238,7 +244,7 @@
MessageLog::saveSettings()
{
/* Acquire a settings object from my parent plugin. */
- QSettings* settings = _parentPlugin->settings();
+ QSettings* settings = plugin()->settings();
/* Update the logging status */
_enableLogging = ui.chkEnableLogFile->isChecked();
if (_enableLogging && ui.lineFile->text().isEmpty()) {
@@ -277,6 +283,9 @@
/* Hide the settings frame and reset toggle button*/
ui.actionSettings->toggle();
+
+ /* Remove the settings object. */
+ delete settings;
}
/** Simply restores the previously saved settings and hides the settings
@@ -440,8 +449,6 @@
void
MessageLog::help()
{
-#if 0
emit helpRequested("log");
-#endif
}
Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp 2009-06-29 21:25:35 UTC (rev 3924)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp 2009-06-29 22:54:10 UTC (rev 3925)
@@ -314,9 +314,7 @@
void
NetViewer::help()
{
-#if 0
emit helpRequested("netview");
-#endif
}
/** Retrieves a list of all running routers from Tor and their descriptors,
Modified: vidalia/branches/extension-api/src/vidalia/PluginManager.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/PluginManager.cpp 2009-06-29 21:25:35 UTC (rev 3924)
+++ vidalia/branches/extension-api/src/vidalia/PluginManager.cpp 2009-06-29 22:54:10 UTC (rev 3925)
@@ -20,7 +20,7 @@
#include <QPluginLoader>
#include <QStringList>
-PluginManager::PluginManager(QString dataDirectory)
+PluginManager::PluginManager(const QString& dataDirectory)
: _dataDirectory(dataDirectory)
{
}
@@ -33,7 +33,7 @@
}
void
-PluginManager::loadPlugins(QString applicationDirectory)
+PluginManager::loadPlugins(const QString& applicationDirectory)
{
foreach (QObject *plugin, QPluginLoader::staticInstances()) {
VidaliaPluginInterface* pluginInstance =
Modified: vidalia/branches/extension-api/src/vidalia/PluginManager.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/PluginManager.h 2009-06-29 21:25:35 UTC (rev 3924)
+++ vidalia/branches/extension-api/src/vidalia/PluginManager.h 2009-06-29 22:54:10 UTC (rev 3925)
@@ -31,20 +31,24 @@
* communication. */
class PluginManager : public QObject
{
+ Q_OBJECT
+
public:
/** PluginManager constructor. */
- PluginManager(QString dataDirectory);
+ PluginManager(const QString& dataDirectory);
/** PluginManager destructor. */
~PluginManager();
/** Loads all included static and dynamic plugins. */
- void loadPlugins(QString applicationDirectory);
+ void loadPlugins(const QString& applicationDirectory);
/** Returns a QList of all loaded plugin instances. */
QList<VidaliaPluginInterface*> plugins() const;
/** Return the location of the users data directory plugin directory. */
QString dataDirectory() const;
+signals:
+ void helpRequested(const QString& topic);
private:
QList<VidaliaPluginInterface*> _pluginList;
- QString _dataDirectory;
+ const QString _dataDirectory;
};
#endif
Modified: vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h 2009-06-29 21:25:35 UTC (rev 3924)
+++ vidalia/branches/extension-api/src/vidalia/VidaliaPanel.h 2009-06-29 22:54:10 UTC (rev 3925)
@@ -30,6 +30,8 @@
* panel for when the tab is highlighted. */
class VidaliaPanel : public QMainWindow
{
+ Q_OBJECT
+
public:
/** Constructor for a Vidalia Panel. */
VidaliaPanel(VidaliaPluginInterface* parent) : QMainWindow(),
@@ -43,6 +45,8 @@
signals:
void helpRequested(const QString& topic);
protected:
+ const VidaliaPluginInterface* const plugin() const {return _parentPlugin;}
+private:
VidaliaPluginInterface* _parentPlugin;
};
Modified: vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.cpp 2009-06-29 21:25:35 UTC (rev 3924)
+++ vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.cpp 2009-06-29 22:54:10 UTC (rev 3925)
@@ -28,7 +28,7 @@
}
QSettings*
-VidaliaPluginInterface::settings()
+VidaliaPluginInterface::settings() const
{
QSettings* setting = new QSettings(dataDirectory(), QSettings::IniFormat);
return setting;
Modified: vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.h 2009-06-29 21:25:35 UTC (rev 3924)
+++ vidalia/branches/extension-api/src/vidalia/VidaliaPluginInterface.h 2009-06-29 22:54:10 UTC (rev 3925)
@@ -36,6 +36,7 @@
* not be included for the plugin. */
class VidaliaPluginInterface
{
+
friend class PluginManager;
public:
@@ -65,7 +66,7 @@
QString dataDirectory() const;
/** Returns a QSettings object for plugins to load and save configurations.
* Plugin is responsible for managing the QSettings object. */
- QSettings* settings();
+ QSettings* settings() const;
signals:
void helpRequested(const QString& topic);
private: