summaryrefslogtreecommitdiff
path: root/src/webtab
diff options
context:
space:
mode:
Diffstat (limited to 'src/webtab')
-rw-r--r--src/webtab/previewselectorbar.cpp20
-rw-r--r--src/webtab/webtab.cpp109
-rw-r--r--src/webtab/webtab.h16
3 files changed, 50 insertions, 95 deletions
diff --git a/src/webtab/previewselectorbar.cpp b/src/webtab/previewselectorbar.cpp
index b743e3c9..24461e79 100644
--- a/src/webtab/previewselectorbar.cpp
+++ b/src/webtab/previewselectorbar.cpp
@@ -33,8 +33,6 @@
#include "rekonq.h"
// Local Include
-#include "application.h"
-#include "mainwindow.h"
#include "webpage.h"
#include "webtab.h"
#include "websnap.h"
@@ -70,8 +68,8 @@ PreviewSelectorBar::PreviewSelectorBar(int index, QWidget* parent)
void PreviewSelectorBar::verifyUrl()
{
-
- if (rApp->mainWindow()->currentTab()->page()->mainFrame()->url().scheme() != "about")
+ WebTab *tab = qobject_cast<WebTab *>(parent());
+ if (tab->url().scheme() != "about")
{
m_insertAction->setEnabled(true);
m_insertAction->setToolTip("");
@@ -102,21 +100,21 @@ void PreviewSelectorBar::loadFinished()
void PreviewSelectorBar::clicked()
{
- WebPage *page = rApp->mainWindow()->currentTab()->page();
-
- if (page)
+ WebTab *tab = qobject_cast<WebTab *>(parent());
+
+ if (tab->page())
{
- KUrl url = page->mainFrame()->url();
+ KUrl url = tab->url();
QStringList names = ReKonfig::previewNames();
QStringList urls = ReKonfig::previewUrls();
//cleanup the previous image from the cache (useful to refresh the snapshot)
QFile::remove(WebSnap::imagePathFromUrl(urls.at(m_previewIndex)));
- QPixmap preview = WebSnap::renderPagePreview(*page);
+ QPixmap preview = WebSnap::renderPagePreview(*tab->page());
preview.save(WebSnap::imagePathFromUrl(url));
urls.replace(m_previewIndex, url.toMimeDataString());
- names.replace(m_previewIndex, page->mainFrame()->title());
+ names.replace(m_previewIndex, tab->page()->mainFrame()->title());
ReKonfig::setPreviewNames(names);
ReKonfig::setPreviewUrls(urls);
@@ -124,7 +122,7 @@ void PreviewSelectorBar::clicked()
ReKonfig::self()->writeConfig();
- page->mainFrame()->load(KUrl("about:favorites"));
+ tab->page()->mainFrame()->load(KUrl("about:favorites"));
}
animatedHide();
diff --git a/src/webtab/webtab.cpp b/src/webtab/webtab.cpp
index 13d2da93..81f63499 100644
--- a/src/webtab/webtab.cpp
+++ b/src/webtab/webtab.cpp
@@ -33,20 +33,21 @@
#include "rekonq.h"
// Local Includes
-#include "application.h"
#include "historymanager.h"
+#include "sessionmanager.h"
+#include "syncmanager.h"
+
#include "messagebar.h"
-#include "opensearchmanager.h"
#include "previewselectorbar.h"
-#include "rsswidget.h"
+// #include "rsswidget.h"
#include "searchenginebar.h"
-#include "sessionmanager.h"
-#include "syncmanager.h"
-#include "urlbar.h"
+// #include "urlbar.h"
#include "walletbar.h"
#include "webpage.h"
#include "websnap.h"
-#include "webshortcutwidget.h"
+// #include "webshortcutwidget.h"
+
+#include "webwindow.h"
// KDE Includes
#include <KWebWallet>
@@ -57,18 +58,20 @@
#include <KDebug>
#include <KBuildSycocaProgressDialog>
#include <kdeprintdialog.h>
+#include <KLocalizedString>
#include <KParts/Part>
#include <KParts/BrowserExtension>
// Qt Includes
#include <QVBoxLayout>
+#include <QPrintDialog>
+#include <QPrinter>
WebTab::WebTab(QWidget *parent)
: QWidget(parent)
, m_webView(0)
- , m_urlBar(new UrlBar(this))
, m_progress(0)
, m_part(0)
{
@@ -98,7 +101,7 @@ WebTab::WebTab(QWidget *parent)
connect(view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
// Session Manager
- connect(view(), SIGNAL(loadFinished(bool)), rApp->sessionManager(), SLOT(saveSession()));
+ connect(view(), SIGNAL(loadFinished(bool)), SessionManager::self(), SLOT(saveSession()));
}
@@ -107,12 +110,6 @@ WebTab::~WebTab()
m_walletBar.clear();
m_previewSelectorBar.clear();
- // NOTE:
- // Urlbar is reparented when inserted in StackedUrlBar, so we need
- // to get sure it will be deleted. Deleting it later to ensure everything
- // will be finished before ;)
- m_urlBar->deleteLater();
-
// Get sure m_part will be deleted
delete m_part;
}
@@ -214,7 +211,7 @@ void WebTab::createWalletBar(const QString &key, const QUrl &url)
// sync passwords
connect(m_walletBar.data(), SIGNAL(saveFormDataAccepted(QString)),
- rApp->syncManager(), SLOT(syncPasswords()), Qt::UniqueConnection);
+ SyncManager::self(), SLOT(syncPasswords()), Qt::UniqueConnection);
}
@@ -280,8 +277,8 @@ void WebTab::showRSSInfo(const QPoint &pos)
map.insert(KUrl(urlString), title);
}
- RSSWidget *widget = new RSSWidget(map, window());
- widget->showAt(pos);
+// FIXME RSSWidget *widget = new RSSWidget(map, window());
+// widget->showAt(pos);
}
@@ -336,8 +333,9 @@ KUrl WebTab::extractOpensearchUrl(QWebElement e)
bool WebTab::hasNewSearchEngine()
{
- QWebElement e = page()->mainFrame()->findFirstElement(QL1S("head >link[rel=\"search\"][ type=\"application/opensearchdescription+xml\"]"));
- return !e.isNull() && !rApp->opensearchManager()->engineExists(extractOpensearchUrl(e));
+// QWebElement e = page()->mainFrame()->findFirstElement(QL1S("head >link[rel=\"search\"][ type=\"application/opensearchdescription+xml\"]"));
+// return !e.isNull() && !rApp->opensearchManager()->engineExists(extractOpensearchUrl(e));
+ return false; // FIXME
}
@@ -347,26 +345,27 @@ void WebTab::showSearchEngine(const QPoint &pos)
QString title = e.attribute(QL1S("title"));
if (!title.isEmpty())
{
- WebShortcutWidget *widget = new WebShortcutWidget(window());
- widget->setWindowFlags(Qt::Popup);
-
- connect(widget, SIGNAL(webShortcutSet(KUrl, QString, QString)),
- rApp->opensearchManager(), SLOT(addOpenSearchEngine(KUrl, QString, QString)));
- connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString)),
- this, SLOT(openSearchEngineAdded()));
-
- widget->show(extractOpensearchUrl(e), title, pos);
+ // FIXME
+// WebShortcutWidget *widget = new WebShortcutWidget(window());
+// widget->setWindowFlags(Qt::Popup);
+//
+// connect(widget, SIGNAL(webShortcutSet(KUrl, QString, QString)),
+// rApp->opensearchManager(), SLOT(addOpenSearchEngine(KUrl, QString, QString)));
+// connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString)),
+// this, SLOT(openSearchEngineAdded()));
+//
+// widget->show(extractOpensearchUrl(e), title, pos);
}
}
void WebTab::openSearchEngineAdded()
{
- // If the providers changed, tell sycoca to rebuild its database...
- KBuildSycocaProgressDialog::rebuildKSycoca(this);
-
- disconnect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString, QString, QString)),
- this, SLOT(openSearchEngineAdded()));
+// // If the providers changed, tell sycoca to rebuild its database...
+// KBuildSycocaProgressDialog::rebuildKSycoca(this);
+//
+// disconnect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString, QString, QString)),
+// this, SLOT(openSearchEngineAdded()));
}
@@ -378,37 +377,7 @@ void WebTab::showMessageBar()
qobject_cast<QVBoxLayout *>(layout())->insertWidget(0, msgBar);
msgBar->animatedShow();
- connect(msgBar, SIGNAL(accepted()), rApp->sessionManager(), SLOT(restoreCrashedSession()));
-}
-
-
-bool WebTab::hasAdBlockedElements()
-{
- return page()->hasAdBlockedElements();
-}
-
-
-QPixmap WebTab::tabPreview(int width, int height)
-{
- if (isPageLoading())
- {
- // no previews during load
- return QPixmap();
- }
-
- if (!part())
- {
- return WebSnap::renderPagePreview(*page(), width, height);
- }
- else
- {
- QWidget *partWidget = part()->widget();
- QPixmap partThumb(partWidget->size());
-
- partWidget->render(&partThumb);
-
- return partThumb.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
- }
+ connect(msgBar, SIGNAL(accepted()), SessionManager::self(), SLOT(restoreCrashedSession()));
}
@@ -416,7 +385,7 @@ void WebTab::loadFinished()
{
// add page to history
QString pageTitle = (page() && page()->isOnRekonqPage()) ? url().url() : m_webView->title();
- rApp->historyManager()->addHistoryEntry(url(), pageTitle);
+ HistoryManager::self()->addHistoryEntry(url(), pageTitle);
}
@@ -450,15 +419,11 @@ void WebTab::printFrame()
}
}
- QWebFrame *printFrame = 0;
- if (frame == 0)
+ QWebFrame *printFrame = page()->currentFrame();
+ if (printFrame == 0)
{
printFrame = page()->mainFrame();
}
- else
- {
- printFrame = frame;
- }
QPrinter printer;
printer.setDocName(printFrame->title());
diff --git a/src/webtab/webtab.h b/src/webtab/webtab.h
index be7791c4..617e0782 100644
--- a/src/webtab/webtab.h
+++ b/src/webtab/webtab.h
@@ -45,10 +45,11 @@
class NotificationBar;
class PreviewSelectorBar;
class QPoint;
-class UrlBar;
class WalletBar;
class WebPage;
+class WebWindow;
+
class REKONQ_TESTS_EXPORT WebTab : public QWidget
{
@@ -62,11 +63,6 @@ public:
WebPage *page();
WebWindow *webWindow();
- inline UrlBar *urlBar() const
- {
- return m_urlBar;
- }
-
inline int progress() const
{
return m_progress;
@@ -91,10 +87,6 @@ public:
void setPart(KParts::ReadOnlyPart *p, const KUrl &u);
- bool hasAdBlockedElements();
-
- QPixmap tabPreview(int width, int height);
-
private Q_SLOTS:
void updateProgress(int progress);
void resetProgress();
@@ -118,11 +110,11 @@ Q_SIGNALS:
void loadProgressing();
void titleChanged(const QString &);
+ void triggerPartPrint();
+
private:
WebView *m_webView;
- UrlBar *m_urlBar;
-
int m_progress;
QWeakPointer<WalletBar> m_walletBar;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 14:25:13 +0000