[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3971: DNS requests go through tor (.onion sites load). https conne (in vidalia/branches/extension-api/src/vidalia: . HerdictWebReporterPlugin)
Author: tyree731
Date: 2009-07-22 19:22:14 -0400 (Wed, 22 Jul 2009)
New Revision: 3971
Modified:
vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h
vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
vidalia/branches/extension-api/src/vidalia/MainWindow.h
vidalia/branches/extension-api/src/vidalia/MainWindow.ui
Log:
DNS requests go through tor (.onion sites load). https connections fail. Any webpage without http:// before it fails. Statustips working for ToolBar icons.
Modified: vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp 2009-07-22 21:38:51 UTC (rev 3970)
+++ vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp 2009-07-22 23:22:14 UTC (rev 3971)
@@ -26,6 +26,9 @@
{
ui.setupUi(this);
+ /* Create the status widget */
+ _statusWidget = new QLabel(this);
+
/* Proxy hostname and port */
QHostAddress address(QHostAddress::LocalHost);
QString hostname = address.toString();
@@ -57,10 +60,21 @@
connect(ui.lineUrlEntry, SIGNAL(returnPressed()),
this, SLOT(loadUrl()));
+
+ /* Connect page signals to their respective handlers */
+ connect(ui.webViewPlain, SIGNAL(loadFinished(bool)),
+ this, SLOT(plainLoadFinished(bool)));
+ connect(ui.webViewTor, SIGNAL(loadFinished(bool)),
+ this, SLOT(torLoadFinished(bool)));
+ connect(ui.webViewPlain, SIGNAL(statusBarMessage(const QString&)),
+ this, SLOT(changeStatusMessage(const QString&)));
+ connect(ui.webViewTor, SIGNAL(statusBarMessage(const QString&)),
+ this, SLOT(changeStatusMessage(const QString&)));
}
HerdictWebReporterPanel::~HerdictWebReporterPanel()
{
+ delete _statusWidget;
}
QString
@@ -75,10 +89,36 @@
return QIcon(":/images/16x16/go-home.png");
}
+QWidget*
+HerdictWebReporterPanel::statusWidget() const
+{
+ return _statusWidget;
+}
+
void
+HerdictWebReporterPanel::changeStatusMessage(const QString& message)
+{
+ _statusWidget->setText(message);
+}
+
+void
HerdictWebReporterPanel::loadUrl()
{
QString url = ui.lineUrlEntry->text();
ui.webViewPlain->load(QUrl(url));
ui.webViewTor->load(QUrl(url));
}
+
+void
+HerdictWebReporterPanel::plainLoadFinished(bool result)
+{
+ if (!result)
+ ui.webViewPlain->load(QUrl("about:blank"));
+}
+
+void
+HerdictWebReporterPanel::torLoadFinished(bool result)
+{
+ if (!result)
+ ui.webViewTor->load(QUrl("about:blank"));
+}
Modified: vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h 2009-07-22 21:38:51 UTC (rev 3970)
+++ vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h 2009-07-22 23:22:14 UTC (rev 3971)
@@ -17,6 +17,8 @@
#ifndef _HERDICTWEBREPORTERPANEL_H
#define _HERDICTWEBREPORTERPANEL_H
+#include <QLabel>
+
#include <vidalia/VidaliaPanel.h>
#include "ui_HerdictWebReporterPanel.h"
@@ -36,13 +38,22 @@
QString tabLabel() const;
QIcon tabIcon() const;
+ QWidget* statusWidget() const;
+
private slots:
+ /* Change the status bar message */
+ void changeStatusMessage(const QString& message);
/* Loads the Url in the text box */
void loadUrl();
-
+ /* Handle webViewPlain finishing */
+ void plainLoadFinished(bool result);
+ /* Handle webViewTor finishing. */
+ void torLoadFinished(bool result);
private:
/** Qt Designer Object */
Ui::HerdictWebReporterPanel ui;
+ /** The status bar widget */
+ QLabel* _statusWidget;
};
#endif
Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.cpp 2009-07-22 21:38:51 UTC (rev 3970)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.cpp 2009-07-22 23:22:14 UTC (rev 3971)
@@ -470,7 +470,7 @@
connect(ui.configAct32, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
connect(ui.bandwidthAct32, SIGNAL(triggered()),
_bandwidthGraph, SLOT(showWindow()));
- connect(ui.helpAct32, SIGNAL(triggered()), this, SLOT(showHelpDialog()()));
+ connect(ui.helpAct32, SIGNAL(triggered()), this, SLOT(showHelpDialog()));
}
/** Create and bind actions to events. Setup for initial
@@ -611,19 +611,16 @@
/* Set the current status widget to empty */
_currentStatusWidget = 0;
- /* Create the status bar */
- _statusBar = new QStatusBar(this);
-
#if defined(Q_WS_MAC)
/* Change border color for statusbar widgets */
- QPalette statusPalette = _statusBar->palette();
+ QPalette statusPalette = ui.statusBar->palette();
statusPalette.setColor(QPalette::Light, QColor(96, 96, 96));
statusPalette.setColor(QPalette::Dark, QColor(192, 192, 192));
- _statusBar->setPalette(statusPalette);
+ ui.statusBar->setPalette(statusPalette);
#endif
/* Create the widget to be inserted in the statusbar */
- QWidget* statusWidget = new QWidget(_statusBar);
+ QWidget* statusWidget = new QWidget(ui.statusBar);
QHBoxLayout* hLayout = new QHBoxLayout(statusWidget);
hLayout->setContentsMargins(0,0,0,0);
@@ -661,10 +658,10 @@
statusWidget->setLayout(hLayout);
/* Add widget to statusbar */
- _statusBar->addPermanentWidget(statusWidget);
+ ui.statusBar->addPermanentWidget(statusWidget);
/* Set window statusbar */
- setStatusBar(_statusBar);
+ setStatusBar(ui.statusBar);
}
/** Start a web browser when given the directory containing the executable and
@@ -1130,13 +1127,13 @@
if (visible) {
_lblTorStatus->setVisible(false);
_lblTorStatusImg->setVisible(false);
- repaint(_statusBar->rect());
+ repaint(ui.statusBar->rect());
_lblStartupProgress->setVisible(true);
_progressBar->setVisible(true);
} else {
_lblStartupProgress->setVisible(false);
_progressBar->setVisible(false);
- repaint(_statusBar->rect());
+ repaint(ui.statusBar->rect());
_lblTorStatus->setVisible(true);
_lblTorStatusImg->setVisible(true);
}
@@ -1378,10 +1375,6 @@
VMessageBox::Ok|VMessageBox::Escape,
VMessageBox::ShowLog|VMessageBox::Default,
VMessageBox::Help);
-#if 0
- if (ret == VMessageBox::ShowLog)
- _messageLog->showWindow();
-#endif
if (ret == VMessageBox::Help)
showHelpDialog("troubleshooting.torexited");
}
@@ -1399,9 +1392,9 @@
QWidget* statusWidget = selectedPanel->statusWidget();
if (statusWidget) {
if (_currentStatusWidget) {
- _statusBar->removeWidget(_currentStatusWidget);
+ ui.statusBar->removeWidget(_currentStatusWidget);
}
- _statusBar->addWidget(statusWidget);
+ ui.statusBar->addWidget(statusWidget);
_currentStatusWidget = statusWidget;
}
}
Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.h 2009-07-22 21:38:51 UTC (rev 3970)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.h 2009-07-22 23:22:14 UTC (rev 3971)
@@ -293,8 +293,6 @@
#endif
/** The menubar */
QMenuBar *_menuBar;
- /** The statusbar */
- QStatusBar *_statusBar;
/** The statusbar variables */
QProgressBar *_progressBar;
QLabel *_lblStartupProgress;
Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.ui 2009-07-22 21:38:51 UTC (rev 3970)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.ui 2009-07-22 23:22:14 UTC (rev 3971)
@@ -49,7 +49,7 @@
<bool>false</bool>
</property>
<property name="movable">
- <bool>true</bool>
+ <bool>false</bool>
</property>
</widget>
</item>
@@ -66,64 +66,89 @@
</property>
</widget>
<widget class="QToolBar" name="toolBar">
- <property name="contextMenuPolicy" >
+ <property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonIconOnly</enum>
+ </property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
- <addaction name="startStopAct32" />
- <addaction name="newIdentityAct32" />
- <addaction name="configAct32" />
- <addaction name="bandwidthAct32" />
- <addaction name="helpAct32" />
+ <addaction name="startStopAct32"/>
+ <addaction name="newIdentityAct32"/>
+ <addaction name="configAct32"/>
+ <addaction name="bandwidthAct32"/>
+ <addaction name="helpAct32"/>
</widget>
+ <widget class="QStatusBar" name="statusBar"/>
<action name="startStopAct32">
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/media-playback-start.png</iconset>
+ <property name="icon">
+ <iconset resource="res/vidalia.qrc">
+ <normaloff>:/images/32x32/media-playback-start.png</normaloff>:/images/32x32/media-playback-start.png</iconset>
</property>
- <property name="text" >
- <string>Start Tor</string>
+ <property name="text">
+ <string>Start Tor</string>
</property>
+ <property name="statusTip">
+ <string>Start Tor</string>
+ </property>
</action>
<action name="newIdentityAct32">
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-media-artist.png</iconset>
+ <property name="icon">
+ <iconset resource="res/vidalia.qrc">
+ <normaloff>:/images/32x32/view-media-artist.png</normaloff>:/images/32x32/view-media-artist.png</iconset>
</property>
- <property name="text" >
- <string>New Identity</string>
+ <property name="text">
+ <string>New Identity</string>
</property>
+ <property name="statusTip">
+ <string>New Identity</string>
+ </property>
</action>
<action name="configAct32">
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/preferences-system.png</iconset>
+ <property name="icon">
+ <iconset resource="res/vidalia.qrc">
+ <normaloff>:/images/32x32/preferences-system.png</normaloff>:/images/32x32/preferences-system.png</iconset>
</property>
- <property name="text" >
- <string>Settings</string>
+ <property name="text">
+ <string>Settings</string>
</property>
+ <property name="statusTip">
+ <string>Settings</string>
+ </property>
</action>
<action name="bandwidthAct32">
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/utilities-system-monitor.png</iconset>
+ <property name="icon">
+ <iconset resource="res/vidalia.qrc">
+ <normaloff>:/images/32x32/utilities-system-monitor.png</normaloff>:/images/32x32/utilities-system-monitor.png</iconset>
</property>
- <property name="text" >
- <string>Bandwidth Graph</string>
+ <property name="text">
+ <string>Bandwidth Graph</string>
</property>
+ <property name="statusTip">
+ <string>Bandwidth Graph</string>
+ </property>
</action>
<action name="helpAct32">
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/system-help.png</iconset>
+ <property name="icon">
+ <iconset resource="res/vidalia.qrc">
+ <normaloff>:/images/32x32/system-help.png</normaloff>:/images/32x32/system-help.png</iconset>
</property>
- <property name="text" >
- <string>Help</string>
+ <property name="text">
+ <string>Help</string>
</property>
+ <property name="statusTip">
+ <string>Help</string>
+ </property>
</action>
</widget>
<resources>
<include location="res/vidalia.qrc"/>
+ <include location="../res/vidalia.qrc"/>
</resources>
<connections/>
</ui>