Refactoring the new dialog manager module and fixed keyboard problem in Linux touch panel.

src/windows/LoginDialog.cpp

@@ -10,7 +10,6 @@
 #include "models/User.h"
 #include "log/UserOperationLog.h"
 #include "json/jsonobject.h"
-#include "dialogs/GUIMessageDialog.h"
 #include "components/ULineEdit.h"
 
 LoginDialog::LoginDialog(QWidget* aParent)
@@ -45,25 +44,6 @@ void LoginDialog::initializeAllWidget()
     initializeEdit();
     initializeLoginButton();
     initializeErrorMessage();
-
-    connect(EventCenter::Default(), &EventCenter::DeviceErrorRaise, [=](QObject* parent, QObject* msg) {
-        if (!this->isVisible()) return;
-        //默认旧模式
-        GUIMessageDialog msgDialog(this);
-        msgDialog.setOpacity(1.0);
-        if (msg)
-        {
-            QString* str = (QString*)msg;
-            msgDialog.showMessage(*str);
-        }
-        else
-        {
-            msgDialog.showMessage("Something went error!");
-        }
-        msgDialog.stopLoading();
-        msgDialog.showExitButton();
-        msgDialog.exec();
-        });
 }
 
 void LoginDialog::initializeLayout()
@@ -94,10 +74,12 @@ void LoginDialog::initializeEdit()
 {
     mAccountEdit->setObjectName("combobox_UserName");
     mAccountEdit->setPlaceholderText(tr("Username"));
+    mAccountEdit->setFocusPolicy(Qt::ClickFocus);
     mDialogContentsLayout->addWidget(mAccountEdit);
     mPasswordEdit->setObjectName("edt_Password");
     mPasswordEdit->setEchoMode(QLineEdit::Password);
     mPasswordEdit->setPlaceholderText(tr("Password"));
+    mPasswordEdit->setFocusPolicy(Qt::ClickFocus);
     mDialogContentsLayout->addWidget(mPasswordEdit);
 }
 

src/windows/MainWindow.cpp

@@ -14,7 +14,6 @@
 #include "forms/scan/ScanFormWidget.h"
 #include "forms/settings/SettingFormWidget.h"
 #include "forms/TopBarWidget.h"
-#include "dialogs/GUIMessageDialog.h"
 #include "dialogs/DialogManager.h"
 #include "device/DeviceManager.h"
 #include "errorhandle/GUIErrorHandle.h"
@@ -27,7 +26,6 @@ MainWindow::MainWindow(QWidget* aParent)
     : QMainWindow(aParent)
     , mUI(new Ui::MainWindow)
     , mDebugConsoleWidget(nullptr)
-    , mMessageDialog(nullptr)
     , mDebugMessageConsole(nullptr)
     , mTabWidget(new QTabWidget(this))
     , mAdminTabIndex(-1)
@@ -45,6 +43,7 @@ MainWindow::MainWindow(QWidget* aParent)
     connect(EventCenter::Default(), &EventCenter::RequestLogin, this,&MainWindow::requestLogin);
     connect(EventCenter::Default(), &EventCenter::LoginRoleChanged, this,&MainWindow::resetRoleLayout);
     connect(DeviceManager::Default(), &DeviceManager::raiseGlobalError, this, &MainWindow::triggerError);
+    connect(DeviceManager::Default(), &DeviceManager::raiseGlobalInfo, this, &MainWindow::triggerInfo);
     connect(EventCenter::Default(), &EventCenter::ReloadLanguage, this, &MainWindow::reloadLanguage);
     GUIErrorHandle::Default()->init();
     mThread = QThread::create([]() {
@@ -138,6 +137,12 @@ void MainWindow::triggerError(const QString& aMessage)
     EventCenter::Default()->triggerEvent(GUIErrorRaise, nullptr, (QObject*)&message);
 }
 
+void MainWindow::triggerInfo(const QPair<QString, unsigned int>& aInfoData)
+{
+    QPair<QString, unsigned int> infoData = aInfoData;
+    EventCenter::Default()->triggerEvent(DeviceInfoRaise, nullptr, (QObject*)&infoData);
+}
+
 //------events-----------------------------------------------------------------
 
 //! [event handler]
@@ -267,7 +272,7 @@ void MainWindow::swipeTriggered(QSwipeGesture* aSwipeGesture)
 
 void MainWindow::requestLogin()
 {
-    DialogManager::Default()->requestLogin();
+    DialogManager::Default()->requestLogin(this);
     QApplication::setActiveWindow(centralWidget());
 }
 

src/windows/MainWindow.h

@@ -37,6 +37,7 @@ public:
 
 public slots:
     void triggerError(const QString&);
+    void triggerInfo(const QPair<QString,unsigned int>&);
 
 protected:
     void changeEvent(QEvent* aEvent) override;
@@ -55,7 +56,6 @@ private:
 private:
     Ui::MainWindow* mUI;
     QDockWidget* mDebugConsoleWidget;
-    GUIMessageDialog* mMessageDialog;
     QTextEdit* mDebugMessageConsole;
     QTabWidget* mTabWidget;
     int mAdminTabIndex;