diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 4f8567b..ac0d9cf 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -7,7 +7,8 @@ #include "tabformwidget.h" #include "SelectFormWidget.h" #include "ScanFormWidget.h" - +#include "guimessagedialog.h" +#include "device/DeviceManager.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -52,10 +53,18 @@ MainWindow::MainWindow(QWidget *parent) : "QLabel#systemMsgBar{min-width:500px;}\n" "QWidget QWidget#statusBarWidget{min-width:300px;}\n" "QWidget QToolButton{border:none;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}\n" + "QWidget QToolButton:disabled{color:#606060 }\n" "QWidget QToolButton:hover{background:#505050;}\n" "QWidget QToolButton:checked{border:5px solid darkorange;padding:0px;}" "QWidget#editcmdWidget{min-height:83px;max-height:83px;}" "QWidget#verSpaceLine{ border-right:1px solid #0078d8;}" + //蒙版Dialog + "QDialog QWidget#innerWidget{ background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1," + "stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);" + "border-radius:20px;border:5px solid #0078d8; }" + "QDialog QWidget QWidget{ background:transparent;color:#3078d8}" + "QDialog QWidget QWidget QLabel{ border:1px solid black}" + "QLabel#lbl_progressicon{min-width:75px;max-width:75px;font-size:30px}" "#spacer_1, #spacer_2{min-width:2px;max-width:2px;margin-top:6px;margin-bottom:6px;border-right:1px solid #0078d8;}"//green with 2 ; this->setStyleSheet(style); @@ -79,6 +88,17 @@ MainWindow::MainWindow(QWidget *parent) : ui->centralWidget->setLayout(layout); this->setWindowFlags (Qt::Window); this->showFullScreen (); + connect(EventCenter::Default(),&EventCenter::GUIErrorRaise,[=](){ + if (!msgDialog) msgDialog = new GUIMessageDialog(this); + msgDialog->show(); + }); + connect(EventCenter::Default(),&EventCenter::InvokeOperationStart,[=](){ + if (!msgDialog) msgDialog = new GUIMessageDialog(this); + msgDialog->show(); + }); + DeviceManager::Default()->initDevice(); +// GUIMessageDialog* dialog = new GUIMessageDialog(this); +// dialog->show(); } MainWindow::~MainWindow() diff --git a/src/mainwindow.h b/src/mainwindow.h index 9353441..1642914 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -6,7 +6,7 @@ namespace Ui { class MainWindow; } - +class GUIMessageDialog; class MainWindow : public QMainWindow { Q_OBJECT @@ -17,6 +17,7 @@ public: private: Ui::MainWindow *ui; + GUIMessageDialog* msgDialog = nullptr; }; #endif // MAINWINDOW_H