Print Preview becomes the main printing dialog

Author: ddmitov

doc/CONSTANTS.md

@@ -88,5 +88,4 @@ A typical ``{PEB_executable_directory}`` looks like this:
 All specific keyboard shortcuts are available only in the QtWebKit builds of PEB.
 
 * <kbd>Ctrl</kbd> + <kbd>I</kbd> - start QWebInspector
-* <kbd>Ctrl</kbd> + <kbd>P</kbd> - get printer selection dialog. If no printer is configured, no dialog is displayed.
-* <kbd>Ctrl</kbd> + <kbd>R</kbd> - get print preview
+* <kbd>Ctrl</kbd> + <kbd>P</kbd> - get Print Preview

src/webkit-view.cpp

@@ -34,12 +34,8 @@ QViewWidget::QViewWidget()
 
     // Keyboard shortcuts:
 #ifndef QT_NO_PRINTER
-    QShortcut *printShortcut = new QShortcut(QKeySequence("Ctrl+P"), this);
-    QObject::connect(printShortcut, SIGNAL(activated()),
-                     this, SLOT(qPrintSlot()));
-
     QShortcut *printPreviewShortcut =
-            new QShortcut(QKeySequence("Ctrl+R"), this);
+            new QShortcut(QKeySequence("Ctrl+P"), this);
     QObject::connect(printPreviewShortcut, SIGNAL(activated()),
                      this, SLOT(qStartPrintPreviewSlot()));
 #endif

src/webkit-view.h

@@ -145,8 +145,8 @@ public slots:
                                .screen()->rect().width() * 0.8,
                                QDesktopWidget()
                                .screen()->rect().height() * 0.8);
-        connect(&preview, SIGNAL(paintRequested(QPrinter*)),
-                SLOT(qPrintPreviewSlot(QPrinter*)));
+        QObject::connect(&preview, SIGNAL(paintRequested(QPrinter*)),
+                         SLOT(qPrintPreviewSlot(QPrinter*)));
         preview.exec();
 #endif
     }
@@ -160,26 +160,6 @@ public slots:
 #endif
     }
 
-    void qPrintSlot()
-    {
-#ifndef QT_NO_PRINTER
-        QPrinter printer;
-        QPrintDialog *printDialog = new QPrintDialog(&printer);
-        printDialog->setWindowModality(Qt::WindowModal);
-        QSize dialogSize = printDialog->sizeHint();
-        QRect screenRect = QDesktopWidget().screen()->rect();
-        printDialog->move(QPoint((screenRect.width() / 2)
-                                 - (dialogSize.width() / 2),
-                                 (screenRect.height() / 2)
-                                 - (dialogSize.height() / 2)));
-        if (printDialog->exec() == QDialog::Accepted) {
-            QViewWidget::print(&printer);
-        }
-        printDialog->close();
-        printDialog->deleteLater();
-#endif
-    }
-
     // ==============================
     // QWebInspector window:
     // ==============================