Switched from QWidget to QDialog

Author: dxli

app/window.cpp renamed to app/QCpdWindow.cpp

@@ -1,9 +1,19 @@
-#include "window.h"
+#include "QCpdWindow.h"
+#include <QGridLayout>
+#include <QQuickItem>
 
-_Window *_window;
+extern "C" {
+    #include "../backends/cups/src/CPD.h"
+    #include "../backends/cups/src/print_frontend.h"
+}
+static int add_printer_callback(PrinterObj *p);
+static int remove_printer_callback(char *printer_name);
+void ui_add_printer_aux(gpointer key, gpointer value, gpointer user_data);
+
+QCpdWindow *_window;
 
-_Window::_Window(QPrinter *printer, QWidget *parent) :
-    QWidget(parent),
+QCpdWindow::QCpdWindow(QPrinter *printer, QWidget *parent) :
+    QDialog(parent),
     masterLayout(new QGridLayout(this)),
     tabs(new Tabs(this)),
     root(new Root(this)),
@@ -80,20 +90,20 @@ _Window::_Window(QPrinter *printer, QWidget *parent) :
 CPrintDialog::CPrintDialog(QPrinter* printer, QWidget *parent) :
     QAbstractPrintDialog(printer, parent)
 {
-    _window = new _Window(printer, parent);
+    _window = new QCpdWindow(printer, parent);
     _window->show();
 }
 
-void _Window::tabBarIndexChanged(qint32 index) {
+void QCpdWindow::tabBarIndexChanged(qint32 index) {
     root->rootObject->setProperty("index", index);
 }
 
-void _Window::swipeViewIndexChanged(qint32 index) {
+void QCpdWindow::swipeViewIndexChanged(qint32 index) {
     tabs->rootObject->setProperty("index", index);
 }
 
-void _Window::cancelButtonClicked() {
-    exit(0);
+void QCpdWindow::cancelButtonClicked() {
+    close();
 }
 
 static int add_printer_callback(PrinterObj *p) {
@@ -104,7 +114,7 @@ static int remove_printer_callback(char *printer_name) {
     printf("print_frontend.c : Printer %s removed!\n", printer_name);
 }
 
-gpointer _Window::ui_add_printer(gpointer user_data) {
+gpointer QCpdWindow::ui_add_printer(gpointer user_data) {
     /*
      * Need this delay so that the FrontendObj
      * initialization completes
@@ -129,7 +139,7 @@ void ui_add_printer_aux(gpointer key, gpointer value, gpointer user_data) {
     qDebug() << "Added" << (const char*)key;
 }
 
-void _Window::addPrinter(const char *printer) {
+void QCpdWindow::addPrinter(const char *printer) {
     QObject* obj = root->rootObject->findChild<QObject*>("generalObject");
     if (obj) {
         QMetaObject::invokeMethod(obj,
@@ -140,7 +150,7 @@ void _Window::addPrinter(const char *printer) {
         qDebug() << "generalObject Not Found";
 }
 
-gpointer _Window::parse_commands(gpointer user_data) {
+gpointer QCpdWindow::parse_commands(gpointer user_data) {
     Command* cmd = (Command*)user_data;
     if (cmd->command.compare("hide-remote-cups") == 0)
         hide_remote_cups_printers(f);
@@ -153,7 +163,7 @@ gpointer _Window::parse_commands(gpointer user_data) {
     }
 }
 
-void _Window::init_backend() {
+void QCpdWindow::init_backend() {
     event_callback add_cb = (event_callback)add_printer_callback;
     event_callback rem_cb = (event_callback)remove_printer_callback;
     f = get_new_FrontendObj(NULL, add_cb, rem_cb);
@@ -165,7 +175,7 @@ void _Window::init_backend() {
     //g_main_loop_run(loop);
 }
 
-void _Window::clearPrinters() {
+void QCpdWindow::clearPrinters() {
 //    QObject* obj = root->rootObject->findChild<QObject*>("generalObject");
 //    if (obj) {
 //        QMetaObject::invokeMethod(obj,

app/window.h renamed to app/QCpdWindow.h

@@ -1,32 +1,32 @@
-#ifndef WINDOW_H
-#define WINDOW_H
+#ifndef QCPDWINDOW_H
+#define QCPDWINDOW_H
 
-#include <QGridLayout>
-#include <QPainter>
 #include <QAbstractPrintDialog>
-#include <QPrinter>
+#include <QDialog>
 #include "components.h"
 
-#include <QDebug>
-
-extern "C" {
-    #include "../backends/cups/src/CPD.h"
-    #include "../backends/cups/src/print_frontend.h"
-}
 
 class QPrinter;
+class QGridLayout;
+
+struct _FrontendObj;
+using FrontendObj = _FrontendObj;
+
+struct _GMainLoop;
+using GMainLoop = _GMainLoop;
+
+struct _PrinterObj;
+using PrinterObj = _PrinterObj;
 
-static int add_printer_callback(PrinterObj *p);
-static int remove_printer_callback(char *printer_name);
-void ui_add_printer_aux(gpointer key, gpointer value, gpointer user_data);
+using gpointer = void *;
 
 typedef struct {
     std::string command;
     std::string arg1;
     std::string arg2;
 } Command;
 
-class _Window : public QWidget {
+class QCpdWindow : public QDialog {
     Q_OBJECT
 public:
     FrontendObj *f;
@@ -37,7 +37,7 @@ class _Window : public QWidget {
     Controls *controls;
     QGridLayout *masterLayout;
 
-    _Window(QPrinter* printer, QWidget* parent = Q_NULLPTR);
+    QCpdWindow(QPrinter* printer, QWidget* parent = Q_NULLPTR);
     void init_backend();
     void addPrinter(const char* printer);
     void clearPrinters();
@@ -62,4 +62,4 @@ class Q_PRINTSUPPORT_EXPORT CPrintDialog : public QAbstractPrintDialog {
     int exec() override {}
 };
 
-#endif // WINDOW_H
+#endif // QCPDWINDOW_H

app/components.cpp

@@ -1,4 +1,9 @@
 #include "components.h"
+#include <QWidget>
+#include <QPainter>
+#include <QPrinter>
+#include <QPrintPreviewWidget>
+#include <QQuickWidget>
 #include <poppler/qt5/poppler-qt5.h>
 
 Tabs::Tabs(QWidget* parent) :

app/components.h

@@ -1,11 +1,12 @@
 #ifndef COMPONENTS_H
 #define COMPONENTS_H
 
-#include <QQuickItem>
-#include <QQuickWidget>
-#include <QPrintPreviewWidget>
-#include <QPainter>
-#include <QPrinter>
+#include <QWidget>
+
+class QPrinter;
+class QPrintPreviewWidget;
+class QQuickItem;
+class QQuickWidget;
 
 class Tabs : public QWidget {
     Q_OBJECT

common-print-dialog.pro

@@ -20,9 +20,9 @@ SOURCES += \#app/main.cpp \
     backends/cups/src/frontend_helper.c \
     backends/cups/src/common_helper.c \
     backends/cups/src/backend_interface.c \
-    app/window.cpp \
     cpd.cpp \
-    app/components.cpp
+    app/components.cpp \
+    app/QCpdWindow.cpp
 
 RESOURCES += qml.qrc
 
@@ -62,7 +62,7 @@ HEADERS += \
     backends/cups/src/CPD.h \
     backends/cups/src/common_helper.h \
     backends/cups/src/backend_interface.h \
-    app/window.h \
     cpd.h \
     cpd_global.h \
-    app/components.h
+    app/components.h \
+    app/QCpdWindow.h

cpd.cpp

@@ -1,5 +1,5 @@
 #include "cpd.h"
-#include "app/window.h"
+#include "app/QCpdWindow.h"
 
 CPD::CPD(QPrinter *printer, QWidget *parent) :
     QWidget(parent)
@@ -11,6 +11,11 @@ void CPD::showDialog() {
     w->show();
 }
 
+
+int CPD::exec() {
+    return w->exec();
+}
+
 QString CPD::information() {
     return QString("CPD Library");
 }

cpd.h

@@ -2,9 +2,9 @@
 #define CPD_H
 
 #include "cpd_global.h"
-#include <QPrinter>
 #include <QWidget>
 
+class QPrinter;
 class CPrintDialog;
 
 class CPDSHARED_EXPORT CPD : public QWidget
@@ -15,6 +15,7 @@ class CPDSHARED_EXPORT CPD : public QWidget
     CPD(QPrinter *printer, QWidget *parent = Q_NULLPTR);
     void showDialog();
     QString information();
+    int exec();
 };
 
 #endif // CPD_H