[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3964: Added a toolbar (it looks pretty sweet). Removed start/stop (in vidalia/branches/extension-api/src/vidalia: . HomePlugin res res/32x32)
Author: tyree731
Date: 2009-07-14 02:57:41 -0400 (Tue, 14 Jul 2009)
New Revision: 3964
Added:
vidalia/branches/extension-api/src/vidalia/res/32x32/media-playback-start.png
vidalia/branches/extension-api/src/vidalia/res/32x32/media-playback-stop.png
vidalia/branches/extension-api/src/vidalia/res/32x32/view-media-artist.png
Modified:
vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.cpp
vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.h
vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.ui
vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.cpp
vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
vidalia/branches/extension-api/src/vidalia/MainWindow.h
vidalia/branches/extension-api/src/vidalia/PluginManager.cpp
vidalia/branches/extension-api/src/vidalia/PluginManager.h
vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc
Log:
Added a toolbar (it looks pretty sweet). Removed start/stop for Tor from API. Added new 32x32 icons. Removed clicklabels from home panel.
Modified: vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.cpp 2009-07-14 05:38:50 UTC (rev 3963)
+++ vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.cpp 2009-07-14 06:57:41 UTC (rev 3964)
@@ -32,14 +32,6 @@
connect(_proxyStatusAnimatedPixmap, SIGNAL(frameChanged(int)),
this, SLOT(proxyFrameChanged(int)));
#endif
-
- /* Connect buttons to signals */
- connect(ui.lblStartTorImg, SIGNAL(clicked()), this, SIGNAL(startTor()));
- connect(ui.lblStartTor, SIGNAL(clicked()), this, SIGNAL(startTor()));
- connect(ui.lblStartProxyImg, SIGNAL(clicked()), this, SIGNAL(startProxy()));
- connect(ui.lblStartProxy, SIGNAL(clicked()), this, SIGNAL(startProxy()));
- connect(ui.lblNewNym, SIGNAL(clicked()), this, SIGNAL(newIdentity()));
- connect(ui.lblNewNymImg, SIGNAL(clicked()), this, SIGNAL(newIdentity()));
}
HomePanel::~HomePanel()
@@ -79,12 +71,6 @@
{
ui.lblProxyStatusImg->setPixmap(QPixmap(":/images/48x48/tor-on.png"));
ui.lblProxyStatus->setText(tr("Your proxy server appears to be up and running."));
- ui.lblStartProxyImg->setPixmap(QPixmap(":/images/48x48/media-playback-stop.png"));
- ui.lblStartProxy->setText("Stop Proxy");
-
- /* Disconnect and reconnect proxy start signals */
- disconnect(ui.lblStartProxy, SIGNAL(clicked()), this, 0);
- connect(ui.lblStartProxy, SIGNAL(clicked()), this, SIGNAL(stopProxy()));
}
void
@@ -92,12 +78,6 @@
{
ui.lblProxyStatusImg->setPixmap(QPixmap(":/images/48x48/tor-off.png"));
ui.lblProxyStatus->setText(tr("Polipo does not appear to be running."));
- ui.lblStartProxyImg->setPixmap(QPixmap(":/images/48x48/media-playback-start.png"));
- ui.lblStartProxy->setText(tr("Start Proxy"));
-
- /* Disconnect and reconnect proxy start signals */
- disconnect(ui.lblStartProxy, SIGNAL(clicked()), this, 0);
- connect(ui.lblStartProxy, SIGNAL(clicked()), this, SIGNAL(startProxy()));
}
void
@@ -108,11 +88,6 @@
ui.lblTorStatusImg->setPixmap(_torStatusAnimatedPixmap->currentFrame());
#endif
ui.lblTorStatus->setText(tr("Tor is starting."));
- ui.lblStartTor->setText(tr("Starting Tor"));
-
- /* Disconnect the signals */
- disconnect(ui.lblStartTorImg, SIGNAL(clicked()), this, 0);
- disconnect(ui.lblStartTor, SIGNAL(clicked()), this, 0);
}
void
@@ -123,12 +98,6 @@
#endif
ui.lblTorStatusImg->setPixmap(QPixmap(":/images/48x48/tor-on.png"));
ui.lblTorStatus->setText(tr("You are connected to Tor!"));
- ui.lblStartTor->setText(tr("Stop Tor"));
- ui.lblStartTorImg->setPixmap(QPixmap(":/images/48x48/media-playback-stop.png"));
-
- /* Reconnect the signals */
- connect(ui.lblStartTorImg, SIGNAL(clicked()),this, SIGNAL(stopTor()));
- connect(ui.lblStartTor, SIGNAL(clicked()), this, SIGNAL(stopTor()));
}
void
@@ -139,11 +108,6 @@
ui.lblTorStatusImg->setPixmap(_torStatusAnimatedPixmap->currentFrame());
#endif
ui.lblTorStatus->setText(tr("Tor is stopping."));
- ui.lblStartTor->setText(tr("Stopping Tor"));
-
- /* Disconnect the signals */
- disconnect(ui.lblStartTorImg, SIGNAL(clicked()), this, 0);
- disconnect(ui.lblStartTor, SIGNAL(clicked()),this, 0);
}
void
@@ -154,10 +118,4 @@
#endif
ui.lblTorStatusImg->setPixmap(QPixmap(":/images/48x48/tor-off.png"));
ui.lblTorStatus->setText(tr("Tor does not appear to be running."));
- ui.lblStartTor->setText(tr("Start Tor"));
- ui.lblStartTorImg->setPixmap(QPixmap(":/images/48x48/media-playback-start.png"));
-
- /* Reconnect the signals */
- connect(ui.lblStartTorImg, SIGNAL(clicked()),this, SIGNAL(startTor()));
- connect(ui.lblStartTor, SIGNAL(clicked()), this, SIGNAL(startTor()));
}
Modified: vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.h 2009-07-14 05:38:50 UTC (rev 3963)
+++ vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.h 2009-07-14 06:57:41 UTC (rev 3964)
@@ -40,13 +40,6 @@
QString tabLabel() const;
QIcon tabIcon() const;
-signals:
- void newIdentity();
- void startProxy();
- void stopProxy();
- void startTor();
- void stopTor();
-
private slots:
/** Update status to next frame of animation */
void proxyFrameChanged(int frame);
Modified: vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.ui 2009-07-14 05:38:50 UTC (rev 3963)
+++ vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePanel.ui 2009-07-14 06:57:41 UTC (rev 3964)
@@ -14,115 +14,8 @@
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget">
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="VClickLabel" name="lblStartTorImg">
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap resource="../res/vidalia.qrc">:/images/48x48/media-playback-start.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="VClickLabel" name="lblStartTor">
- <property name="text">
- <string>Start Tor</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <spacer name="horizontalSpacer_5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>78</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="3">
- <widget class="VClickLabel" name="lblStartProxyImg">
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap resource="../res/vidalia.qrc">:/images/48x48/media-playback-start.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="VClickLabel" name="lblStartProxy">
- <property name="text">
- <string>Start Proxy</string>
- </property>
- </widget>
- </item>
- <item row="0" column="5">
- <spacer name="horizontalSpacer_7">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>78</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="6">
- <widget class="VClickLabel" name="lblNewNymImg">
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap resource="../res/vidalia.qrc">:/images/48x48/view-media-artist.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="0" column="7">
- <widget class="VClickLabel" name="lblNewNym">
- <property name="text">
- <string>New Identity</string>
- </property>
- </widget>
- </item>
- <item row="0" column="8">
- <spacer name="horizontalSpacer_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>74</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="9">
- <widget class="VClickLabel" name="lblSettingsImg">
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap resource="../res/vidalia.qrc">:/images/48x48/preferences-system.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="0" column="10">
- <widget class="VClickLabel" name="lblSettings">
- <property name="text">
- <string>Settings</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="11">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
<widget class="QGroupBox" name="groupTorStatus">
<property name="title">
<string>Tor Status</string>
@@ -234,7 +127,7 @@
</layout>
</widget>
</item>
- <item row="2" column="0" colspan="11">
+ <item>
<widget class="QGroupBox" name="groupProxyStatus">
<property name="title">
<string>Proxy Status</string>
@@ -270,23 +163,10 @@
</property>
</spacer>
</item>
- <item row="1" column="0" colspan="3">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>728</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
</item>
- <item row="3" column="4" colspan="2">
+ <item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -302,13 +182,6 @@
</layout>
</widget>
</widget>
- <customwidgets>
- <customwidget>
- <class>VClickLabel</class>
- <extends>QLabel</extends>
- <header>VClickLabel.h</header>
- </customwidget>
- </customwidgets>
<resources>
<include location="../res/vidalia.qrc"/>
</resources>
Modified: vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.cpp 2009-07-14 05:38:50 UTC (rev 3963)
+++ vidalia/branches/extension-api/src/vidalia/HomePlugin/HomePlugin.cpp 2009-07-14 06:57:41 UTC (rev 3964)
@@ -72,18 +72,6 @@
_homePanel, SLOT(proxyStarted()));
connect(_pluginManager, SIGNAL(proxyStopped()),
_homePanel, SLOT(proxyStopped()));
-
- /* Connect panel signals to the plugin manager */
- connect(_homePanel, SIGNAL(newIdentity()),
- _pluginManager,SLOT(newIdentity()));
- connect(_homePanel, SIGNAL(startProxy()),
- _pluginManager, SLOT(startProxy()));
- connect(_homePanel, SIGNAL(stopProxy()),
- _pluginManager, SLOT(stopProxy()));
- connect(_homePanel, SIGNAL(startTor()),
- _pluginManager, SLOT(startTor()));
- connect(_homePanel, SIGNAL(stopTor()),
- _pluginManager, SLOT(stopTor()));
}
Q_EXPORT_PLUGIN2(homeplugin, HomePlugin)
Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.cpp 2009-07-14 05:38:50 UTC (rev 3963)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.cpp 2009-07-14 06:57:41 UTC (rev 3964)
@@ -56,9 +56,15 @@
#define IMG_ABOUT ":/images/16x16/help-about.png"
#define IMG_EXIT ":/images/16x16/application-exit.png"
#define IMG_NETWORK ":/images/16x16/applications-internet.png"
+#define IMG_BWGRAPH_32 ":/images/32x32/utilities-system-monitor.png"
+#define IMG_CONFIG_32 ":/images/32x32/preferences-system.png"
+#define IMG_IDENTITY_32 ":/images/32x32/view-media-artist.png"
+#define IMG_HELP_32 ":/images/32x32/system-help.png"
#define IMG_START_TOR_16 ":/images/16x16/media-playback-start.png"
#define IMG_STOP_TOR_16 ":/images/16x16/media-playback-stop.png"
+#define IMG_START_TOR_32 ":/images/32x32/media-playback-start.png"
+#define IMG_STOP_TOR_32 ":/images/32x32/media-playback-stop.png"
#define IMG_START_TOR_48 ":/images/48x48/media-playback-start.png"
#define IMG_STOP_TOR_48 ":/images/48x48/media-playback-stop.png"
#define IMG_TOR_STOPPED_48 ":/images/48x48/tor-off.png"
@@ -160,6 +166,8 @@
/* Creates a tray icon with a context menu and adds it to the system's
* notification area. */
createTrayIcon();
+ /* Creates the toolbar */
+ createToolBar();
/* Start with Tor initially stopped */
_status = Unset;
_isVidaliaRunningTor = false;
@@ -201,8 +209,6 @@
/* Allow plugin manager to start/stop tor, request new identity, etc */
connect(_pluginManager, SIGNAL(newIdentityRequest()),
this, SLOT(newIdentity()));
- connect(_pluginManager, SIGNAL(startTorRequest()), this, SLOT(start()));
- connect(_pluginManager, SIGNAL(stopTorRequest()), this, SLOT(stop()));
connect(_pluginManager, SIGNAL(startProxyRequest()),
this, SLOT(startProxy()));
connect(_pluginManager, SIGNAL(stopProxyRequest()), this, SLOT(stopProxy()));
@@ -463,6 +469,8 @@
{
_startStopAct = new QAction(tr("Start Tor"), this);
connect(_startStopAct, SIGNAL(triggered()), this, SLOT(start()));
+ _startStopAct32 = new QAction(tr("Start Tor"), this);
+ connect(_startStopAct32, SIGNAL(triggered()), this, SLOT(start()));
_exitAct = new QAction(tr("Exit"), this);
connect(_exitAct, SIGNAL(triggered()), this, SLOT(close()));
@@ -470,23 +478,34 @@
_bandwidthAct = new QAction(tr("Bandwidth Graph"), this);
connect(_bandwidthAct, SIGNAL(triggered()),
_bandwidthGraph, SLOT(showWindow()));
+ _bandwidthAct32 = new QAction(tr("BandwidthGraph"), this);
+ connect(_bandwidthAct32, SIGNAL(triggered()),
+ _bandwidthGraph, SLOT(showWindow()));
_controlPanelAct = new QAction(tr("Control Panel"), this);
connect(_controlPanelAct, SIGNAL(triggered()), this, SLOT(show()));
_configAct = new QAction(tr("Settings"), this);
connect(_configAct, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
+ _configAct32 = new QAction(tr("Settings"), this);
+ connect(_configAct32, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
_aboutAct = new QAction(tr("About"), this);
connect(_aboutAct, SIGNAL(triggered()), this, SLOT(showAboutDialog()));
_helpAct = new QAction(tr("Help"), this);
connect(_helpAct, SIGNAL(triggered()), this, SLOT(showHelpDialog()));
+ _helpAct32 = new QAction(tr("Help"), this);
+ connect(_helpAct32, SIGNAL(triggered()), this, SLOT(showHelpDialog()));
_newIdentityAct = new QAction(tr("New Identity"), this);
_newIdentityAct->setEnabled(false);
connect(_newIdentityAct, SIGNAL(triggered()), this, SLOT(newIdentity()));
+ _newIdentityAct32 = new QAction(tr("New Identity"), this);
+ _newIdentityAct32->setEnabled(false);
+ connect(_newIdentityAct32, SIGNAL(triggered()), this, SLOT(newIdentity()));
+
#if !defined(Q_WS_MAC)
/* Don't give the menu items icons on OS X, since they end up in the
* application menu bar. Menu bar items on OS X typically do not have
@@ -500,6 +519,11 @@
_helpAct->setIcon(QIcon(IMG_HELP));
_newIdentityAct->setIcon(QIcon(IMG_IDENTITY));
#endif
+ _startStopAct32->setIcon(QIcon(IMG_START_TOR_32));
+ _bandwidthAct32->setIcon(QIcon(IMG_BWGRAPH_32));
+ _configAct32->setIcon(QIcon(IMG_CONFIG_32));
+ _helpAct32->setIcon(QIcon(IMG_HELP_32));
+ _newIdentityAct32->setIcon(QIcon(IMG_IDENTITY_32));
}
/** Creates a tray icon with a context menu and adds it to the system
@@ -643,6 +667,20 @@
setStatusBar(_statusBar);
}
+void
+MainWindow::createToolBar()
+{
+ QToolBar* toolBar = new QToolBar(this);
+
+ toolBar->addAction(_startStopAct32);
+ toolBar->addAction(_newIdentityAct32);
+ toolBar->addAction(_configAct32);
+ toolBar->addAction(_bandwidthAct32);
+ toolBar->addAction(_helpAct32);
+
+ addToolBar(toolBar);
+}
+
/** Start a web browser when given the directory containing the executable and
* profile */
void
@@ -1013,6 +1051,9 @@
_startStopAct->setEnabled(true);
_startStopAct->setText(actionText);
_startStopAct->setIcon(QIcon(IMG_START_TOR_16));
+ _startStopAct32->setEnabled(true);
+ _startStopAct32->setText(actionText);
+ _startStopAct32->setIcon(QIcon(IMG_START_TOR_32));
/* Notify plugin manager */
_pluginManager->sendTorStatus(pmStopped);
@@ -1021,6 +1062,8 @@
* slots to these triggered() and clicked() signals. */
QObject::disconnect(_startStopAct, SIGNAL(triggered()), this, 0);
connect(_startStopAct, SIGNAL(triggered()), this, SLOT(start()));
+ QObject::disconnect(_startStopAct32, SIGNAL(triggered()), this, 0);
+ connect(_startStopAct32, SIGNAL(triggered()), this, SLOT(start()));
setStartupProgressVisible(false);
} else if (status == Stopping) {
if (_delayedShutdownStarted) {
@@ -1039,11 +1082,16 @@
_startStopAct->setEnabled(true);
_startStopAct->setText(actionText);
_startStopAct->setIcon(QIcon(IMG_STOP_TOR_16));
+ _startStopAct32->setEnabled(true);
+ _startStopAct32->setText(actionText);
+ _startStopAct32->setIcon(QIcon(IMG_STOP_TOR_32));
/* XXX: This might need to be smarter if we ever start connecting other
* slots to these triggered() and clicked() signals. */
QObject::disconnect(_startStopAct, SIGNAL(triggered()), this, 0);
connect(_startStopAct, SIGNAL(triggered()), this, SLOT(stop()));
+ QObject::disconnect(_startStopAct32, SIGNAL(triggered()), this, 0);
+ connect(_startStopAct32, SIGNAL(triggered()), this, SLOT(stop()));
} else if (status == Starting) {
statusText = tr("Starting the Tor software");
trayIconFile = IMG_TOR_STARTING;
@@ -1400,6 +1448,7 @@
/*XXX We should warn here if we get disconnected when we didn't intend to */
_newIdentityAct->setEnabled(false);
+ _newIdentityAct32->setEnabled(false);
_isVidaliaRunningTor = false;
}
@@ -1497,6 +1546,7 @@
/* Let people click on their beloved "New Identity" button */
_newIdentityAct->setEnabled(true);
+ _newIdentityAct32->setEnabled(true);
/* Register for any pertinent asynchronous events. */
if (!_torControl->setEvents(&errmsg)) {
Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.h 2009-07-14 05:38:50 UTC (rev 3963)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.h 2009-07-14 06:57:41 UTC (rev 3964)
@@ -184,7 +184,7 @@
/** Create the actions on the tray menu or menubar */
void createActions();
/** Creates a tray icon with a context menu and adds it to the system
- * notification area. On Mac, we also set up an application menubar. */
+ * notification area. We also set up an application menubar. */
void createTrayIcon();
/** Create the tray popup menu and it's submenus */
QMenu* createTrayMenu();
@@ -192,6 +192,8 @@
void createMenuBar();
/** Creates the status bar with the permanent Tor Status */
void createStatusBar();
+ /** Creates the toolbar containing useful vidalia commands */
+ void createToolBar();
/** Updates the UI to reflect Tor's current <b>status</b>. Returns the
* previously set TorStatus value. */
TorStatus updateTorStatus(TorStatus status);
@@ -301,18 +303,17 @@
/** Defines the actions for the tray menu */
QAction* _controlPanelAct;
QAction* _startStopAct;
+ QAction* _startStopAct32;
QAction* _configAct;
+ QAction* _configAct32;
QAction* _aboutAct;
QAction* _exitAct;
QAction* _bandwidthAct;
-#if 0
- QAction* _messageAct;
-#endif
+ QAction* _bandwidthAct32;
QAction* _helpAct;
-#if 0
- QAction* _networkAct;
-#endif
+ QAction* _helpAct32;
QAction* _newIdentityAct;
+ QAction* _newIdentityAct32;
Ui::MainWindow ui; /**< Qt Designer generated object. */
};
Modified: vidalia/branches/extension-api/src/vidalia/PluginManager.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/PluginManager.cpp 2009-07-14 05:38:50 UTC (rev 3963)
+++ vidalia/branches/extension-api/src/vidalia/PluginManager.cpp 2009-07-14 06:57:41 UTC (rev 3964)
@@ -127,18 +127,6 @@
}
void
-PluginManager::startTor()
-{
- emit startTorRequest();
-}
-
-void
-PluginManager::stopTor()
-{
- emit stopTorRequest();
-}
-
-void
PluginManager::startProxy()
{
emit startProxyRequest();
Modified: vidalia/branches/extension-api/src/vidalia/PluginManager.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/PluginManager.h 2009-07-14 05:38:50 UTC (rev 3963)
+++ vidalia/branches/extension-api/src/vidalia/PluginManager.h 2009-07-14 06:57:41 UTC (rev 3964)
@@ -62,13 +62,7 @@
public slots:
/** Request MainWindow to start using a new Tor identity */
void newIdentity();
- /** Request MainWindow to start the tor executable */
- void startTor();
- /** Request MainWindow to stop the tor executable */
- void stopTor();
- /** Request MainWindow to start the proxy server */
void startProxy();
- /** Request MainWindow to stop the proxy server */
void stopProxy();
/** Displays the Vidalia help viewer with the current page set to
* <b>topic</b>. */
@@ -79,10 +73,6 @@
void helpRequested(const QString& topic);
/** Sends a signal to MainWindow requesting a NEWNYM message be sent to Tor */
void newIdentityRequest();
- /** Sends a signal to MainWindow requesting Tor to be started */
- void startTorRequest();
- /** Sends a signal to MainWindow requesting Tor to be stopped */
- void stopTorRequest();
/** Sends a signal to MainWindow requesting the Proxy Server be started */
void startProxyRequest();
/** Sends a signal to MainWindow requesting the Proxy server be stopped */
Added: vidalia/branches/extension-api/src/vidalia/res/32x32/media-playback-start.png
===================================================================
(Binary files differ)
Property changes on: vidalia/branches/extension-api/src/vidalia/res/32x32/media-playback-start.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vidalia/branches/extension-api/src/vidalia/res/32x32/media-playback-stop.png
===================================================================
(Binary files differ)
Property changes on: vidalia/branches/extension-api/src/vidalia/res/32x32/media-playback-stop.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vidalia/branches/extension-api/src/vidalia/res/32x32/view-media-artist.png
===================================================================
(Binary files differ)
Property changes on: vidalia/branches/extension-api/src/vidalia/res/32x32/view-media-artist.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc 2009-07-14 05:38:50 UTC (rev 3963)
+++ vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc 2009-07-14 06:57:41 UTC (rev 3964)
@@ -64,6 +64,8 @@
<file>32x32/go-next.png</file>
<file>32x32/go-previous.png</file>
<file>32x32/help-about.png</file>
+ <file>32x32/media-playback-start.png</file>
+ <file>32x32/media-playback-stop.png</file>
<file>32x32/network-workgroup.png</file>
<file>32x32/preferences-desktop-locale.png</file>
<file>32x32/preferences-other.png</file>
@@ -81,6 +83,7 @@
<file>32x32/utilities-log-viewer.png</file>
<file>32x32/utilities-system-monitor.png</file>
<file>32x32/view-fullscreen.png</file>
+ <file>32x32/view-media-artist.png</file>
<file>32x32/view-refresh.png</file>
<file>32x32/window-close.png</file>
<file>32x32/zoom-fit-best.png</file>