Attachment 951804 Details for Bug 1158510 – patch

[patch] patch

kdelibs-4.10.5-bz#587016.patch (text/plain), 3.16 KB, created by Johnny Hughes on 2014-10-29 14:11:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johnny Hughes

Created: 2014-10-29 14:11:57 UTC

Size: 3.16 KB

patch

obsolete

>diff -up kdelibs-4.10.5/khtml/khtml_printsettings.cpp.me kdelibs-4.10.5/khtml/khtml_printsettings.cpp
>--- kdelibs-4.10.5/khtml/khtml_printsettings.cpp.me     2014-10-28 17:11:53.112634782 +0000
>+++ kdelibs-4.10.5/khtml/khtml_printsettings.cpp        2014-10-28 17:12:22.020272168 +0000
>@@ -106,5 +106,19 @@ bool KHTMLPrintSettings::printHeader()
>        return m_printheader->isChecked();
> }
> 
>+void KHTMLPrintSettings::setprintFriendly(bool b)
>+{
>+   m_printfriendly->setChecked(b);
>+}
>+
>+void KHTMLPrintSettings::setprintImages(bool b)
>+{
>+   m_printimages->setChecked(b);
>+}
>+
>+void KHTMLPrintSettings::setprintHeader(bool b)
>+{
>+   m_printheader->setChecked(b);
>+}
> 
> #include "khtml_printsettings.moc"
>diff -up kdelibs-4.10.5/khtml/khtml_printsettings.h.me kdelibs-4.10.5/khtml/khtml_printsettings.h
>--- kdelibs-4.10.5/khtml/khtml_printsettings.h.me       2014-10-28 17:18:01.058985704 +0000
>+++ kdelibs-4.10.5/khtml/khtml_printsettings.h  2014-10-28 17:18:42.384457810 +0000
>@@ -35,6 +35,10 @@ public:
>         bool printImages();
>         bool printHeader();
> 
>+        void setprintFriendly(bool);
>+        void setprintImages(bool);
>+        void setprintHeader(bool);
>+
> private:
>        QCheckBox       *m_printfriendly;
>        QCheckBox       *m_printimages;
>diff -up kdelibs-4.10.5/khtml/khtmlview.cpp.me kdelibs-4.10.5/khtml/khtmlview.cpp
>--- kdelibs-4.10.5/khtml/khtmlview.cpp.me       2013-06-28 18:03:41.256379776 +0100
>+++ kdelibs-4.10.5/khtml/khtmlview.cpp  2014-10-28 18:01:40.627135964 +0000
>@@ -3033,6 +3033,14 @@ void KHTMLView::print(bool quick)
>     if(!root) return;
> 
>     QPointer<KHTMLPrintSettings> printSettings(new KHTMLPrintSettings); //XXX: doesn't save settings between prints like this
>+
>+    // read print settings
>+    KSharedConfigPtr config = KGlobal::config();
>+    KConfigGroup group(config, "KHTML Print Settings");
>+    printSettings->setprintFriendly(group.readEntry("PrintFriendly", true));
>+    printSettings->setprintImages(group.readEntry("PrintImages", true));
>+    printSettings->setprintHeader(group.readEntry("PrintHeader", true));
>+
>     const QPointerDeleter settingsDeleter(printSettings); //the printdialog takes ownership of the settings widget, thus this workaround to avoid double deletion
>     QPrinter printer;
>     QPointer<QPrintDialog> dialog = KdePrint::createPrintDialog(&printer, KdePrint::SystemSelectsPages, QList<QWidget*>() << printSettings.data(), this);
>@@ -3044,6 +3052,13 @@ void KHTMLView::print(bool quick)
>         docname = KStringHandler::csqueeze(docname, 80);
> 
>     if(quick || (dialog->exec() && dialog)) { /*'this' and thus dialog might have been deleted while exec()!*/
>+        // write HTML settings
>+        KSharedConfigPtr config = KGlobal::config();
>+        KConfigGroup group(config, "KHTML Print Settings");
>+        group.writeEntry("PrintFriendly", printSettings->printFriendly());
>+        group.writeEntry("PrintImages", printSettings->printImages());
>+        group.writeEntry("PrintHeader", printSettings->printHeader());
>+
>         viewport()->setCursor( Qt::WaitCursor ); // only viewport(), no QApplication::, otherwise we get the busy cursor in kdeprint's dialogs
>         // set up KPrinter
>         printer.setFullPage(false);

Actions: View | Diff

Attachments on bug 1158510: 951804