[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3969: HerdictWeb reporter, now pretending that it works (in vidalia/branches/extension-api: . src/vidalia src/vidalia/HerdictWebReporterPlugin)
Author: tyree731
Date: 2009-07-21 20:30:19 -0400 (Tue, 21 Jul 2009)
New Revision: 3969
Added:
vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/CMakeLists.txt
Modified:
vidalia/branches/extension-api/CMakeLists.txt
vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h
vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPlugin.h
vidalia/branches/extension-api/src/vidalia/main.cpp
Log:
HerdictWeb reporter, now pretending that it works
Modified: vidalia/branches/extension-api/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/CMakeLists.txt 2009-07-22 00:05:00 UTC (rev 3968)
+++ vidalia/branches/extension-api/CMakeLists.txt 2009-07-22 00:30:19 UTC (rev 3969)
@@ -29,6 +29,9 @@
## required Qt version
option(USE_MARBLE "Enable the KDE Marble-based map widget." OFF)
+## Allows for inclusion of QWebKit when using HerdictWeb Reporter
+option(USE_HERDICTWEB "Enable HerdictWeb Reporter." ON)
+
## Specify the minimum version of Qt required
set(QT_MIN_VERSION "4.5.0")
@@ -37,6 +40,11 @@
find_package(Qt4 REQUIRED)
set(QT_USE_QTNETWORK true)
set(QT_USE_QTXML true)
+
+if (USE_HERDICTWEB)
+ set(QT_USE_QTWEBKIT true)
+endif(USE_HERDICTWEB)
+
if (USE_MARBLE)
set(QT_USE_QTSVG true)
set(QT_USE_QTWEBKIT true)
Modified: vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/CMakeLists.txt 2009-07-22 00:05:00 UTC (rev 3968)
+++ vidalia/branches/extension-api/src/vidalia/CMakeLists.txt 2009-07-22 00:30:19 UTC (rev 3969)
@@ -58,6 +58,7 @@
## Process the static plugins
add_subdirectory(DashboardPlugin)
+add_subdirectory(HerdictWebReporterPlugin)
add_subdirectory(HomePlugin)
add_subdirectory(MessageLogPlugin)
add_subdirectory(NetworkMapPlugin)
@@ -393,6 +394,7 @@
${MARBLE_LIBRARIES}
common
dashboardplugin
+ herdictwebreporterplugin
homeplugin
messagelogplugin
networkmapplugin
Added: vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/CMakeLists.txt (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/CMakeLists.txt 2009-07-22 00:30:19 UTC (rev 3969)
@@ -0,0 +1,31 @@
+##
+## $Id$
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not receive the LICENSE file with this file, you may obtain it
+## from the Vidalia source package distributed by the Vidalia Project at
+## http://www.vidalia-project.net/. No part of Vidalia, including this file,
+## may be copied, modified, propagated, or distributed except according to
+## the terms described in the LICENSE file.
+##
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(herdictwebreporterplugin_SRCS
+ HerdictWebReporterPlugin.cpp
+ HerdictWebReporterPanel.cpp
+)
+qt4_wrap_cpp(herdictwebreporterplugin_SRCS
+ HerdictWebReporterPlugin.h
+ HerdictWebReporterPanel.h
+)
+qt4_wrap_ui(herdictwebreporterplugin_SRCS
+ HerdictWebReporterPanel.ui
+)
+
+add_library(herdictwebreporterplugin STATIC ${herdictwebreporterplugin_SRCS})
+target_link_libraries(herdictwebreporterplugin ${QT_LIBRARIES})
Property changes on: vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp 2009-07-22 00:05:00 UTC (rev 3968)
+++ vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp 2009-07-22 00:30:19 UTC (rev 3969)
@@ -14,12 +14,33 @@
** \brief The user's home panel, containing important status' and buttons
*/
-#include "HomePanel.h"
+#include "HerdictWebReporterPanel.h"
+#include <QUrl>
+
HerdictWebReporterPanel::HerdictWebReporterPanel(VidaliaPluginInterface* parent)
: VidaliaPanel(parent)
{
ui.setupUi(this);
+
+ /* Connect button actions and URL actions to the WebView widgets. */
+ connect(ui.buttonBack, SIGNAL(clicked()),
+ ui.webViewPlain, SLOT(back()));
+ connect(ui.buttonBack, SIGNAL(clicked()),
+ ui.webViewTor, SLOT(back()));
+
+ connect(ui.buttonForward, SIGNAL(clicked()),
+ ui.webViewPlain, SLOT(forward()));
+ connect(ui.buttonForward, SIGNAL(clicked()),
+ ui.webViewTor, SLOT(forward()));
+
+ connect(ui.buttonRefresh, SIGNAL(clicked()),
+ ui.webViewPlain, SLOT(refresh()));
+ connect(ui.buttonRefresh, SIGNAL(clicked()),
+ ui.webViewTor, SLOT(reload()));
+
+ connect(ui.lineUrlEntry, SIGNAL(returnPressed()),
+ this, SLOT(loadUrl()));
}
HerdictWebReporterPanel::~HerdictWebReporterPanel()
@@ -37,3 +58,11 @@
{
return QIcon(":/images/16x16/go-home.png");
}
+
+void
+HerdictWebReporterPanel::loadUrl()
+{
+ QString url = ui.lineUrlEntry->text();
+ ui.webViewPlain->load(QUrl(url));
+ ui.webViewTor->load(QUrl(url));
+}
Modified: vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h 2009-07-22 00:05:00 UTC (rev 3968)
+++ vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h 2009-07-22 00:30:19 UTC (rev 3969)
@@ -36,9 +36,13 @@
QString tabLabel() const;
QIcon tabIcon() const;
+private slots:
+ /* Loads the Url in the text box */
+ void loadUrl();
+
private:
/** Qt Designer Object */
- Ui::HomePanel ui;
+ Ui::HerdictWebReporterPanel ui;
};
#endif
Modified: vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPlugin.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPlugin.h 2009-07-22 00:05:00 UTC (rev 3968)
+++ vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPlugin.h 2009-07-22 00:30:19 UTC (rev 3969)
@@ -40,7 +40,7 @@
private:
void setupUI();
- HerdictWebReporterPanel* _homePanel;
+ HerdictWebReporterPanel* _herdictPanel;
};
#endif
Modified: vidalia/branches/extension-api/src/vidalia/main.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/main.cpp 2009-07-22 00:05:00 UTC (rev 3968)
+++ vidalia/branches/extension-api/src/vidalia/main.cpp 2009-07-22 00:30:19 UTC (rev 3969)
@@ -37,6 +37,7 @@
Q_IMPORT_PLUGIN(dashboardplugin)
Q_IMPORT_PLUGIN(networkmapplugin)
Q_IMPORT_PLUGIN(messagelogplugin)
+Q_IMPORT_PLUGIN(herdictwebreporterplugin)
extern "C" void
signal_handler(int signal)