From 2eaf8b2489e834175a67c677521385022422b899 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 5 Feb 2012 09:18:04 +0100
Subject: Make rekonq menu appear inside rekonq's window (as Dolphin does)

BUG:283269
---
 src/mainwindow.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index fb5eb0fe..97f4d94e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -46,6 +46,7 @@
 #include "historypanel.h"
 #include "iconmanager.h"
 #include "mainview.h"
+#include "rekonqmenu.h"
 #include "sessionmanager.h"
 #include "settingsdialog.h"
 #include "stackedurlbar.h"
@@ -555,7 +556,7 @@ void MainWindow::setupTools()
     toolsAction->setDelayed(false);
     toolsAction->setShortcutConfigurable(true);
     toolsAction->setShortcut(KShortcut(Qt::ALT + Qt::Key_T));
-    m_rekonqMenu = new KMenu(this);
+    m_rekonqMenu = new RekonqMenu(this);
     toolsAction->setMenu(m_rekonqMenu); // dummy menu to have the dropdown arrow
 
     // adding rekonq_tools to rekonq actionCollection
@@ -1526,6 +1527,9 @@ void MainWindow::setupBookmarksAndToolsShortcuts()
     if (toolsButton)
     {
         connect(actionByName(QL1S("rekonq_tools")), SIGNAL(triggered()), toolsButton, SLOT(showMenu()));
+
+        // HACK: set button widget in rekonq menu
+        m_rekonqMenu->setButtonWidget(toolsButton);
     }
 }
 
-- 
cgit v1.2.1


From e72f9a8f5fc2cd1cb4bba110eac05a44b7ba0fb2 Mon Sep 17 00:00:00 2001
From: Johannes Troscher <fritz_van_tom@hotmail.com>
Date: Wed, 8 Feb 2012 10:06:35 +0100
Subject: Move to KDE Print Dialog

This to have advanced printing options, available in KDE printing
dialog, removing the print preview.
Sorry for the forced choice. Actual KDE Print Preview dialog is a pain,
we cannot directly provide it.

REVIEW:103880
REVIEWED-BY: adjam
---
 src/mainwindow.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 97f4d94e..c2fbafd7 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -79,6 +79,7 @@
 #include <KTemporaryFile>
 #include <KToggleFullScreenAction>
 #include <KXMLGUIFactory>
+#include <kdeprintdialog.h>
 
 #include <KParts/Part>
 #include <KParts/BrowserExtension>
@@ -94,7 +95,6 @@
 #include <QtGui/QLabel>
 #include <QtGui/QPrintDialog>
 #include <QtGui/QPrinter>
-#include <QtGui/QPrintPreviewDialog>
 #include <QtGui/QVBoxLayout>
 
 #include <QtWebKit/QWebHistory>
@@ -833,11 +833,16 @@ void MainWindow::printRequested(QWebFrame *frame)
     }
 
     QPrinter printer;
-    QPrintPreviewDialog previewdlg(&printer, this);
+    printer.setDocName(printFrame->title());
+    QPrintDialog *printDialog = KdePrint::createPrintDialog(&printer, this);
 
-    connect(&previewdlg, SIGNAL(paintRequested(QPrinter*)), printFrame, SLOT(print(QPrinter*)));
+    if (printDialog) //check if the Dialog was created
+    {
+        if (printDialog->exec())
+            printFrame->print(&printer);
 
-    previewdlg.exec();
+        delete printDialog;
+    }
 }
 
 
-- 
cgit v1.2.1