Refactor InputObject(EventFilter and VirtualKeyboard).

src/EditPatientDialog.cpp

@@ -4,8 +4,6 @@
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QDateTime>
-#include <QLineEdit>
-#include <QTextEdit>
 #include <QToolButton>
 #include <QSqlTableModel>
 #include <QUuid>
@@ -13,16 +11,20 @@
 #include "dialogs/SelectDialog.h"
 #include "DateSelectDialog.h"
 #include "components/ListBox.h"
+#include "components/ULineEdit.h"
+#include "components/UTextEdit.h"
 
 int queryValue(QSqlTableModel* model, int colID, const QVariant& var)
 {
-    for (int i = 0; i < model->rowCount(); ++i) {
+    for (int i = 0; i < model->rowCount(); ++i)
+    {
         if (model->data(model->index(i, colID)) == var) return i;
     }
     return -1;
 }
 
-EditPatientDialog::EditPatientDialog(QWidget *parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f) {
+EditPatientDialog::EditPatientDialog(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f)
+{
     QVBoxLayout* layout = new QVBoxLayout(mFormWidget);
     layout->setSpacing(10);
     // add title
@@ -35,7 +37,7 @@ EditPatientDialog::EditPatientDialog(QWidget *parent, Qt::WindowFlags f) : GUIFo
     //add old password
     QLabel* lbl_id = new QLabel(this);
     lbl_id->setText(tr("ID"));
-    le_id = new QLineEdit(this);
+    le_id = new ULineEdit(this);
     layout->addWidget(lbl_id);
     layout->addWidget(le_id);
     QLabel* lbl_endline1 = new QLabel(this);
@@ -44,7 +46,7 @@ EditPatientDialog::EditPatientDialog(QWidget *parent, Qt::WindowFlags f) : GUIFo
 
     QLabel* lbl_name = new QLabel(this);
     lbl_name->setText(tr("Name"));
-    le_name = new QLineEdit(this);
+    le_name = new ULineEdit(this);
     layout->addWidget(lbl_name);
     layout->addWidget(le_name);
     QLabel* lbl_endline2 = new QLabel(this);
@@ -71,7 +73,8 @@ EditPatientDialog::EditPatientDialog(QWidget *parent, Qt::WindowFlags f) : GUIFo
         dialog.setValues(items);
         dialog.setSelectedValue(items[btnSex->property("idx").toInt()]);
         dialog.setWindowModality(Qt::WindowModal);
-        if (dialog.exec() == QDialog::Accepted){
+        if (dialog.exec() == QDialog::Accepted)
+        {
             btnSex->setText(dialog.getSelectedValue());
             btnSex->setProperty("idx", items.indexOf(dialog.getSelectedValue()));
         }
@@ -99,7 +102,8 @@ EditPatientDialog::EditPatientDialog(QWidget *parent, Qt::WindowFlags f) : GUIFo
         DateSelectDialog dialog(this);
         dialog.setSelectedValue(btnDate->text());
         dialog.setWindowModality(Qt::WindowModal);
-        if (dialog.exec() == QDialog::Accepted){
+        if (dialog.exec() == QDialog::Accepted)
+        {
             btnDate->setText(dialog.getSelectedValue());
         }
         });
@@ -110,7 +114,7 @@ EditPatientDialog::EditPatientDialog(QWidget *parent, Qt::WindowFlags f) : GUIFo
 
     QLabel* lbl_comment = new QLabel(this);
     lbl_comment->setText(tr("Comment"));
-    te_comment = new QTextEdit(this);
+    te_comment = new UTextEdit(this);
     layout->addWidget(lbl_comment);
     layout->addWidget(te_comment);
     QLabel* lbl_endline6 = new QLabel(this);
@@ -122,11 +126,13 @@ EditPatientDialog::EditPatientDialog(QWidget *parent, Qt::WindowFlags f) : GUIFo
     layout->addWidget(lbl_error);
 }
 
-EditPatientDialog::~EditPatientDialog() {
+EditPatientDialog::~EditPatientDialog()
+{
 
 }
 
-void EditPatientDialog::setPatientInformation(PatientInformation* information) {
+void EditPatientDialog::setPatientInformation(PatientInformation* information)
+{
     if (information)
     {
         le_id->setText(information->ID);
@@ -140,14 +146,16 @@ void EditPatientDialog::setPatientInformation(PatientInformation* information) {
     }
 }
 
-void EditPatientDialog::clearPatientInformation() {
+void EditPatientDialog::clearPatientInformation()
+{
     le_id->setText("");
     //    le_date->setText("");
     le_name->setText("");
     te_comment->setText("");
 }
 
-void EditPatientDialog::storePatientInformation() {
+void EditPatientDialog::storePatientInformation()
+{
     store.PatientUID = currentPatientUID;
     //    store.AddDate = AddDate;
     store.ID = le_id->text();
@@ -157,15 +165,18 @@ void EditPatientDialog::storePatientInformation() {
     store.Comment = te_comment->toPlainText();
 }
 
-bool EditPatientDialog::updateReferenceData() {
+bool EditPatientDialog::updateReferenceData()
+{
     PatientInformation* inf = getPatientInformation();
-    if (le_id->text().isEmpty()){
+    if (le_id->text().isEmpty())
+    {
         lbl_error->setText("ID can't be empty!");
         lbl_error->setVisible(true);
         return false;
     }
     inf->ID = le_id->text().trimmed();
-    if (le_name->text().isEmpty()){
+    if (le_name->text().isEmpty())
+    {
         lbl_error->setText("Patient Name can't be empty!");
         lbl_error->setVisible(true);
         return false;
@@ -173,7 +184,8 @@ bool EditPatientDialog::updateReferenceData() {
     inf->Name = le_name->text().trimmed();
     int selectedRow = 0;
     bool isAdd = currentPatientUID.isEmpty();
-    if (isAdd) {
+    if (isAdd)
+    {
         int ref_rowid = queryValue(model, 1, inf->ID);
         if (ref_rowid >= 0)
         {
@@ -185,7 +197,8 @@ bool EditPatientDialog::updateReferenceData() {
         inf->AddDate = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss");
         model->insertRow(0);
     }
-    else{
+    else
+    {
         inf->PatientUID = currentPatientUID;
         selectedRow = queryValue(model, 1, inf->ID);
         inf->AddDate = AddDate;
@@ -203,7 +216,8 @@ bool EditPatientDialog::updateReferenceData() {
         {
             return true;
         }
-    else {
+        else
+        {
             lbl_error->setText("Submit to database error!");
             lbl_error->setVisible(true);
             return false;

src/EditPatientDialog.h

@@ -8,8 +8,8 @@
 #include "dialogs/GUIFormBaseDialog.h"
 #include "forms/select/editpatientform.h"
 
-class QLineEdit;
+class ULineEdit;
-class QTextEdit;
+class UTextEdit;
 class QLabel;
 class QToolButton;
 class QSqlTableModel;
@@ -19,11 +19,13 @@ public:
     explicit EditPatientDialog(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
     ~EditPatientDialog();
 
-    void setModel(QSqlTableModel * m){
+    void setModel(QSqlTableModel* m)
+    {
         model = m;
     }
 
-    PatientInformation * getPatientInformation(){
+    PatientInformation* getPatientInformation()
+    {
         return &store;
     }
     void setPatientInformation(PatientInformation* information);
@@ -35,11 +37,11 @@ protected:
     bool updateReferenceData() override;
 
 private:
-    QLineEdit*  le_id= nullptr;
+    ULineEdit* le_id = nullptr;
-    QLineEdit* le_name = nullptr;
+    ULineEdit* le_name = nullptr;
-    QLineEdit* le_sex = nullptr;
+    ULineEdit* le_sex = nullptr;
-    QLineEdit* le_date = nullptr;
+    ULineEdit* le_date = nullptr;
-    QTextEdit* te_comment = nullptr;
+    UTextEdit* te_comment = nullptr;
     QLabel* lbl_error = nullptr;
     PatientInformation store;
     QString currentPatientUID;

src/UsctApplication.cpp

@@ -0,0 +1,22 @@
+#include "UsctApplication.h"
+#include "utilities/TouchScreenSignalSender.h"
+
+UsctApplication::UsctApplication(int& argc, char** argv)
+    : QApplication(argc, argv)
+{
+
+}
+
+UsctApplication::~UsctApplication()
+{
+}
+
+bool UsctApplication::notify(QObject* aReceiver, QEvent* aEvent)
+{
+    if (aEvent->type() == QEvent::MouseButtonPress)
+    {
+        TouchScreenSignalSender::getInstance()->sendTouchScreenSignal();
+    }
+
+    return QApplication::notify(aReceiver, aEvent);
+}

src/UsctApplication.h

@@ -0,0 +1,17 @@
+#ifndef USCTAPPLICATION_H
+#define USCTAPPLICATION_H
+
+#include <QApplication>
+
+class UsctApplication : public QApplication
+{
+    Q_OBJECT
+public:
+    UsctApplication(int& argc, char** argv);
+    ~UsctApplication();
+
+private:
+    bool notify(QObject* aReceiver, QEvent* aEvent);
+};
+
+#endif // USCTAPPLICATION_H

src/components/ULineEdit.cpp

@@ -0,0 +1,17 @@
+#include "ULineEdit.h"
+#include <QEvent>
+#include "keyboard/KeyboardManager.h"
+
+ULineEdit::ULineEdit(QWidget* aParent)
+    : QLineEdit(aParent)
+{
+}
+
+ULineEdit::~ULineEdit()
+{
+}
+
+void ULineEdit::mouseReleaseEvent(QMouseEvent* /*aEvent*/)
+{
+    KeyboardManager::getInstance()->showKeyboardPanel(this);
+}

src/components/ULineEdit.h

@@ -0,0 +1,19 @@
+#ifndef ULINEEDIT_H
+#define ULINEEDIT_H
+
+#include <QLineEdit>
+
+class ULineEdit : public QLineEdit
+{
+    Q_OBJECT
+
+public:
+    explicit ULineEdit(QWidget* aParent);
+    ~ULineEdit();
+
+protected:
+    void mouseReleaseEvent(QMouseEvent* aEvent);
+
+};
+
+#endif // ULINEEDIT_H

src/components/UTextEdit.cpp

@@ -0,0 +1,17 @@
+#include "UTextEdit.h"
+#include <QEvent>
+#include "keyboard/KeyboardManager.h"
+
+UTextEdit::UTextEdit(QWidget* aParent)
+    : QTextEdit(aParent)
+{
+}
+
+UTextEdit::~UTextEdit()
+{
+}
+
+void UTextEdit::mouseReleaseEvent(QMouseEvent* /*aEvent*/)
+{
+    KeyboardManager::getInstance()->showKeyboardPanel(this);
+}

src/components/UTextEdit.h

@@ -0,0 +1,19 @@
+#ifndef UTEXTEDIT_H
+#define UTEXTEDIT_H
+
+#include <QTextEdit>
+
+class UTextEdit : public QTextEdit
+{
+    Q_OBJECT
+
+public:
+    explicit UTextEdit(QWidget* aParent);
+    ~UTextEdit();
+
+protected:
+    void mouseReleaseEvent(QMouseEvent* aEvent);
+
+};
+
+#endif // UTEXTEDIT_H

src/dialogs/AccountFormDialog.cpp

@@ -9,13 +9,13 @@
 #include <QDebug>
 #include <QToolButton>
 #include <QPushButton>
-#include <QLineEdit>
 #include "ChangePasswordFormDialog.h"
 #include "event/EventCenter.h"
 #include "log/UserOperationLog.h"
 #include "db/SQLHelper.h"
 #include "models/User.h"
 #include "AlertDialog.h"
+#include "components/ULineEdit.h"
 
 AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::WindowFlags f)
     : GUIFormBaseDialog(parent, f)
@@ -23,9 +23,9 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::
     , mCommentChanged(false)
     , mRoleChanged(false)
     , mMode(mode)
-, mLeUserCode(new QLineEdit(this))
+    , mLeUserCode(new ULineEdit(this))
-, mLeUserName(new QLineEdit(this))
+    , mLeUserName(new ULineEdit(this))
-, mLeComment(new QLineEdit(this))
+    , mLeComment(new ULineEdit(this))
     , mLePwd(nullptr)
     , mBtnPwd(nullptr)
     , mLblError(new QLabel(this))
@@ -42,7 +42,8 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::
     auto hlayout = new QHBoxLayout;
     layout->addLayout(hlayout);
     if (mMode == Self)addSelfModeUI(hlayout);
-    if (mMode != New) {
+    if (mMode != New)
+    {
         addButtonPwd(hlayout);
         addEndLine(layout);
         connect(mBtnPwd, &QPushButton::clicked, this, mMode == Self ?
@@ -58,42 +59,49 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::
         });
 }
 
-void AccountFormDialog::addEndLine(QVBoxLayout *layout) {
+void AccountFormDialog::addEndLine(QVBoxLayout* layout)
+{
     auto lblEndline = new QLabel(this);
     lblEndline->setFixedHeight(2);
     lblEndline->setObjectName("endline");
     layout->addWidget(lblEndline);
 }
 
-void AccountFormDialog::resetUserPassword() {
+void AccountFormDialog::resetUserPassword()
+{
     AlertDialog dialog(this);
     dialog.setGeometry(geometry());
     dialog.setButtonMode(OkAndCancel);
     dialog.setWindowModality(Qt::WindowModal);
     dialog.setAlertMessage(tr("Reset password to \"123456\" ?"));
-    if (dialog.exec() == Accepted) {
+    if (dialog.exec() == Accepted)
+    {
         User user;
         dialog.setButtonMode(OkOnly);
-        if (!User::getUser(mUserID, user)) {
+        if (!User::getUser(mUserID, user))
+        {
             dialog.setAlertMessage(tr("Inner error, can't find reference user!"));
             dialog.exec();
             return;
         }
-        if (!user.resetPassword()) {
+        if (!user.resetPassword())
+        {
             dialog.setAlertMessage(tr("Submit change to database fail!"));
             dialog.exec();
         }
     }
 }
 
-void AccountFormDialog::changeSelfPassword() {
+void AccountFormDialog::changeSelfPassword()
+{
     ChangePasswordFormDialog dia(this);
     dia.setGeometry(geometry());
     dia.setWindowModality(Qt::WindowModal);
     dia.exec();
 }
 
-void AccountFormDialog::addButtonPwd(QHBoxLayout *layout) {
+void AccountFormDialog::addButtonPwd(QHBoxLayout* layout)
+{
     mBtnPwd = new QToolButton(this);
     mBtnPwd->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     mBtnPwd->setObjectName("editvalBtn");
@@ -104,13 +112,15 @@ void AccountFormDialog::addButtonPwd(QHBoxLayout *layout) {
     layout->addWidget(mBtnPwd);
 }
 
-void AccountFormDialog::addWarnLabel(QVBoxLayout *layout) {
+void AccountFormDialog::addWarnLabel(QVBoxLayout* layout)
+{
     mLblError->setObjectName("warn");
     mLblError->setVisible(false);
     layout->addWidget(mLblError);
 }
 
-void AccountFormDialog::addCommentLabel(QVBoxLayout *layout) {
+void AccountFormDialog::addCommentLabel(QVBoxLayout* layout)
+{
     auto lblComment = new QLabel(this);
     lblComment->setText(tr("Comment"));
     layout->addWidget(lblComment);
@@ -118,7 +128,8 @@ void AccountFormDialog::addCommentLabel(QVBoxLayout *layout) {
     addEndLine(layout);
 }
 
-void AccountFormDialog::initUserNameUI(QVBoxLayout *layout) {
+void AccountFormDialog::initUserNameUI(QVBoxLayout* layout)
+{
     auto lblUserName = new QLabel(this);
     lblUserName->setText(tr("Name"));
 
@@ -128,7 +139,8 @@ void AccountFormDialog::initUserNameUI(QVBoxLayout *layout) {
     addEndLine(layout);
 }
 
-void AccountFormDialog::initUserCodeUI(QVBoxLayout *layout) {
+void AccountFormDialog::initUserCodeUI(QVBoxLayout* layout)
+{
     auto lblUserCode = new QLabel(this);
     lblUserCode->setText(tr("User ID"));
 
@@ -139,7 +151,8 @@ void AccountFormDialog::initUserCodeUI(QVBoxLayout *layout) {
     addEndLine(layout);
 }
 
-void AccountFormDialog::addTitleLabel(QVBoxLayout *layout) {
+void AccountFormDialog::addTitleLabel(QVBoxLayout* layout)
+{
     auto lblTitle = new QLabel(this);
     lblTitle->setAlignment(Qt::AlignCenter);
     lblTitle->setText(tr("Account"));
@@ -147,7 +160,8 @@ void AccountFormDialog::addTitleLabel(QVBoxLayout *layout) {
     layout->addWidget(lblTitle);
 }
 
-void AccountFormDialog::addSelfModeUI(QHBoxLayout *hlayout) {
+void AccountFormDialog::addSelfModeUI(QHBoxLayout* hlayout)
+{
     auto btnLogout = new QToolButton(this);
     btnLogout->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     btnLogout->setIcon(QIcon(":/icons/logout.png"));
@@ -163,7 +177,8 @@ void AccountFormDialog::addSelfModeUI(QHBoxLayout *hlayout) {
             EventCenter::Default()->triggerEvent(RequestLogin, nullptr, nullptr);
         });
     // load current user data
-    if (User::Current()) {
+    if (User::Current())
+    {
         mLeUserCode->setText(User::Current()->getUserCode());
         mLeUserName->setText(User::Current()->getUserName());
         mUserID = User::Current()->getUserID();
@@ -171,11 +186,12 @@ void AccountFormDialog::addSelfModeUI(QHBoxLayout *hlayout) {
     }
 }
 
-void AccountFormDialog::addNewModeUI(QVBoxLayout *layout) {
+void AccountFormDialog::addNewModeUI(QVBoxLayout* layout)
+{
     auto lblPwd = new QLabel(this);
     lblPwd->setText(tr("Password"));
     layout->addWidget(lblPwd);
-    mLePwd = new QLineEdit(this);
+    mLePwd = new ULineEdit(this);
     mLePwd->setPlaceholderText(tr("Input password"));
     mLePwd->setEchoMode(QLineEdit::Password);
     layout->addWidget(mLePwd);
@@ -183,11 +199,15 @@ void AccountFormDialog::addNewModeUI(QVBoxLayout *layout) {
     addEndLine(layout);
 }
 
-bool AccountFormDialog::updateReferenceData() {
+bool AccountFormDialog::updateReferenceData()
-	if (mMode == Self) {
+{
+    if (mMode == Self)
+    {
         if (!this->mUserNameChanged && !this->mCommentChanged) return true;
-		if (!this->mUserNameChanged) {
+        if (!this->mUserNameChanged)
-			if (mNewUserName.isEmpty()) {
+        {
+            if (mNewUserName.isEmpty())
+            {
                 warn(tr("User Name can't be empty!"));
                 return false;
             }
@@ -195,21 +215,26 @@ bool AccountFormDialog::updateReferenceData() {
         }
         if (!this->mCommentChanged) User::Current()->setUserName(mLeComment->text());
         bool ret = User::Current()->submitChange();
-		if (ret) {
+        if (ret)
+        {
             hideWarn();
             LOG_USER_OPERATION(ChangeUserName)
         }
-		else {
+        else
+        {
             warn(tr("Submit change to database fail!"));
         }
         return ret;
     }
-	else if (mMode == Admin) {
+    else if (mMode == Admin)
+    {
         if (!this->mUserNameChanged && !this->mRoleChanged) return true;
         User user;
         if (!User::getUser(mUserID, user)) return true;
-		if (this->mUserNameChanged) {
+        if (this->mUserNameChanged)
-			if (mNewUserName.isEmpty()) {
+        {
+            if (mNewUserName.isEmpty())
+            {
                 warn(tr("User Name can't be empty!"));
                 return false;
             }
@@ -218,31 +243,38 @@ bool AccountFormDialog::updateReferenceData() {
         if (this->mRoleChanged) user.setRoleID(mRoleID);
         if (!this->mCommentChanged) user.setComment(mLeComment->text());
         bool ret = user.submitChange();
-		if (ret) {
+        if (ret)
+        {
             LOG_USER_OPERATION(AdminChangeAcountInformation)
         }
         return ret;
     }
-	else {
+    else
+    {
         //add new
         User user;
-        if (mLeUserCode->text().isEmpty()) {
+        if (mLeUserCode->text().isEmpty())
+        {
             warn(tr("User ID can't be empty!"));
             return false;
         }
-        if (mLeUserName->text().isEmpty()) {
+        if (mLeUserName->text().isEmpty())
+        {
             warn(tr("User Name can't be empty!"));
             return false;
         }
-        if (mLePwd->text().isEmpty()) {
+        if (mLePwd->text().isEmpty())
+        {
             warn(tr("Password can't be empty!"));
             return false;
         }
-        if (!mRefModel) {
+        if (!mRefModel)
+        {
             warn(tr("Inner error ,unset data model!"));
             return false;
         }
-        if (User::existsUser(mLeUserCode->text())) {
+        if (User::existsUser(mLeUserCode->text()))
+        {
             warn(tr("User Id exists!"));
             return false;
         }
@@ -274,10 +306,13 @@ bool AccountFormDialog::updateReferenceData() {
 #undef USER_READONLY_PROPERTY
 #undef USER_PROPERTY
 
-        if (mRefModel->submit()) {
+            if (mRefModel->submit())
+            {
                 hideWarn();
                 return true;
-        } else {
+            }
+            else
+            {
                 warn(tr("Submit to data base fail!"));
                 return false;
             }
@@ -285,7 +320,8 @@ bool AccountFormDialog::updateReferenceData() {
     return true;
 }
 
-void AccountFormDialog::setAccountInformation(const QMap<QString, QVariant>& values) {
+void AccountFormDialog::setAccountInformation(const QMap<QString, QVariant>& values)
+{
     mLeUserCode->setText(values["UserCode"].toString());
     mLeUserName->setText(values["UserName"].toString());
     mLeComment->setText(values["Comment"].toString());
@@ -293,11 +329,13 @@ void AccountFormDialog::setAccountInformation(const QMap<QString, QVariant>& val
     mUserPwd = values["Password"].toString();
 }
 
-void AccountFormDialog::warn(const QString& msg) {
+void AccountFormDialog::warn(const QString& msg)
+{
     mLblError->setText(msg);
     mLblError->setVisible(true);
 }
 
-void AccountFormDialog::hideWarn() {
+void AccountFormDialog::hideWarn()
+{
     mLblError->setVisible(false);
 }

src/dialogs/AccountFormDialog.h

@@ -5,7 +5,7 @@
 #ifndef GUI_ACCOUNTFORMDIALOG_H
 #define GUI_ACCOUNTFORMDIALOG_H
 class QLabel;
-class QLineEdit;
+class ULineEdit;
 class QToolButton;
 class QSqlTableModel;
 
@@ -21,7 +21,8 @@ public:
     explicit AccountFormDialog(QWidget* parent = nullptr, AccountEditMode mode = Self, Qt::WindowFlags f = Qt::WindowFlags());
     ~AccountFormDialog() override = default;
     void setAccountInformation(const QMap<QString, QVariant>& values);
-    void setReferenceModel(QSqlTableModel* model){
+    void setReferenceModel(QSqlTableModel* model)
+    {
         mRefModel = model;
     }
 protected:
@@ -48,10 +49,10 @@ private:
     bool mCommentChanged;
     bool mRoleChanged;
     AccountEditMode mMode;
-    QLineEdit* mLeUserCode;
+    ULineEdit* mLeUserCode;
-    QLineEdit* mLeUserName;
+    ULineEdit* mLeUserName;
-    QLineEdit* mLeComment;
+    ULineEdit* mLeComment;
-    QLineEdit* mLePwd;
+    ULineEdit* mLePwd;
     QToolButton* mBtnPwd;
 
     QLabel* mLblError;

src/dialogs/ChangePasswordFormDialog.cpp

@@ -4,22 +4,23 @@
 
 #include <QVBoxLayout>
 #include <QLabel>
-#include <QtWidgets/QLineEdit>
+#include "components/ULineEdit.h"
 #include "models/User.h"
 #include "log/UserOperationLog.h"
 #include "ChangePasswordFormDialog.h"
 
 ChangePasswordFormDialog::ChangePasswordFormDialog(QWidget* parent, Qt::WindowFlags f)
     : GUIFormBaseDialog(parent, f)
-, mLEPasswd(new QLineEdit(this))
+    , mLEPasswd(new ULineEdit(this))
-, mLENewPasswd(new QLineEdit(this))
+    , mLENewPasswd(new ULineEdit(this))
-, mLEConfirmPasswd(new QLineEdit(this))
+    , mLEConfirmPasswd(new ULineEdit(this))
     , mLblError(new QLabel(this))
 {
     initLayout();
 }
 
-void ChangePasswordFormDialog::initLayout() {
+void ChangePasswordFormDialog::initLayout()
+{
     auto layout = new QVBoxLayout(mFormWidget);
     layout->setSpacing(10);
     // add title
@@ -67,13 +68,15 @@ void ChangePasswordFormDialog::initLayout() {
 }
 
 
-bool ChangePasswordFormDialog::updateReferenceData() {
+bool ChangePasswordFormDialog::updateReferenceData()
+{
     if (mLEPasswd->text().isEmpty())
     {
         mLblError->setText(tr("Please enter your old password!"));
         return false;
     }
-	if (mLENewPasswd->text().length() < 6) {
+    if (mLENewPasswd->text().length() < 6)
+    {
         mLblError->setText(tr("New password should at least 6 characters!"));
         return false;
     }
@@ -89,7 +92,8 @@ bool ChangePasswordFormDialog::updateReferenceData() {
         return false;
     }
     User::Current()->setPassword(User::getEncryptedPassword(mLENewPasswd->text()));
-	if (!User::Current()->submitChange()) {
+    if (!User::Current()->submitChange())
+    {
         mLblError->setText(tr("Database update error!"));
         User::Current()->restorePassword(encryptPwd);
         return false;

src/dialogs/ChangePasswordFormDialog.h

@@ -6,7 +6,7 @@
 #define GUI_CHANGEPASSWORDFORMDIALOG_H
 
 #include "GUIFormBaseDialog.h"
-class QLineEdit;
+class ULineEdit;
 class QLabel;
 class ChangePasswordFormDialog :public  GUIFormBaseDialog {
     Q_OBJECT
@@ -19,9 +19,9 @@ protected:
 
 private:
     void initLayout();
-    QLineEdit* mLEPasswd;
+    ULineEdit* mLEPasswd;
-    QLineEdit* mLENewPasswd;
+    ULineEdit* mLENewPasswd;
-    QLineEdit* mLEConfirmPasswd;
+    ULineEdit* mLEConfirmPasswd;
     QLabel* mLblError;
 
 

src/forms/select/editpatientform.ui

@@ -29,11 +29,11 @@
         </widget>
       </item>
       <item>
-    <widget class="QLineEdit" name="tbx_ID">
+        <widget class="ULineEdit" name="tbx_ID" native="true">
           <property name="enabled">
             <bool>true</bool>
           </property>
-     <property name="readOnly">
+          <property name="readOnly" stdset="0">
             <bool>true</bool>
           </property>
         </widget>
@@ -46,11 +46,11 @@
         </widget>
       </item>
       <item>
-    <widget class="QLineEdit" name="tbx_Name">
+        <widget class="ULineEdit" name="tbx_Name" native="true">
           <property name="enabled">
             <bool>true</bool>
           </property>
-     <property name="readOnly">
+          <property name="readOnly" stdset="0">
             <bool>true</bool>
           </property>
         </widget>
@@ -63,11 +63,11 @@
         </widget>
       </item>
       <item>
-    <widget class="QLineEdit" name="tbx_Sex">
+        <widget class="ULineEdit" name="tbx_Sex" native="true">
           <property name="enabled">
             <bool>true</bool>
           </property>
-     <property name="readOnly">
+          <property name="readOnly" stdset="0">
             <bool>true</bool>
           </property>
         </widget>
@@ -121,7 +121,7 @@
         </widget>
       </item>
       <item>
-    <widget class="QTextEdit" name="rtbx_Comment">
+        <widget class="UTextEdit" name="rtbx_Comment">
           <property name="enabled">
             <bool>true</bool>
           </property>
@@ -135,6 +135,18 @@
       </item>
     </layout>
   </widget>
+  <customwidgets>
+    <customwidget>
+      <class>ULineEdit</class>
+      <extends>QLineEdit</extends>
+      <header>components/ULineEdit.h</header>
+    </customwidget>
+    <customwidget>
+      <class>UTextEdit</class>
+      <extends>QTextEdit</extends>
+      <header>components/UTextEdit.h</header>
+    </customwidget>
+  </customwidgets>
   <resources/>
   <connections/>
 </ui>

src/forms/settings/generalform.cpp

@@ -6,14 +6,13 @@
 #include <QHBoxLayout>
 #include <QDebug>
 #include <QLabel>
-#include <QLineEdit>
 #include <QEvent>
 #include "event/EventCenter.h"
 #include "json/jsonobject.h"
 #include "src/dialogs/SelectDialog.h"
-
 #include "src/utilities/locker.h"
 #include "src/utilities/languageswitcher.h"
+#include "components/ULineEdit.h"
 
 GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
 {
@@ -34,14 +33,14 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
     QHBoxLayout* instHeaderLayout = new QHBoxLayout(instHeader);
     QLabel* lbl_ins = new QLabel(tr("Institution Name"));
     instHeaderLayout->addWidget(lbl_ins);
-    QLineEdit* instName = new QLineEdit(instHeader);
+    QLineEdit* instName = new ULineEdit(instHeader);
     instName->setMaximumSize(QSize(300, 32768));
     instHeaderLayout->addWidget(instName);
     instHeaderLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Fixed));
 
     QLabel* lbl_insaddr = new QLabel(tr("Institution Addr"));
     instHeaderLayout->addWidget(lbl_insaddr);
-    QLineEdit* instAddr = new QLineEdit(instHeader);
+    QLineEdit* instAddr = new ULineEdit(instHeader);
     instHeaderLayout->addWidget(instAddr);
     instAddr->setMaximumSize(QSize(300, 32768));
     instHeaderLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
@@ -53,7 +52,7 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
     QLabel* lbl_lock = new QLabel(tr("Lock Screen"));
     lockHeaderLayout->addWidget(lbl_lock);
 
-    QLineEdit* lockTime = new QLineEdit(lockHeader);
+    QLineEdit* lockTime = new ULineEdit(lockHeader);
     lockTime->setMaximumSize(QSize(300, 32768));
     lockHeaderLayout->addWidget(lockTime);
 

src/forms/settings/systemsettingform.cpp

@@ -3,7 +3,6 @@
 
 #include <QPushButton>
 #include <QDebug>
-#include <QLineEdit>
 #include <QToolButton>
 #include <QGridLayout>
 

src/forms/settings/systemsettingform.h

@@ -5,10 +5,10 @@
 class QPushButton;
 class QVBoxLayout;
 class SelectDialog;
-class QLineEdit;
 class ImageSwitch;
 
-namespace Ui {
+namespace Ui
+{
     class systemSettingForm;
 }
 

src/keyboard/KeyboardManager.cpp

@@ -0,0 +1,23 @@
+#include "KeyboardManager.h"
+
+#include "KeyboardPanel.h"
+
+KeyboardManager* KeyboardManager::getInstance()
+{
+    static KeyboardManager instance;
+    return &instance;
+}
+
+KeyboardManager::KeyboardManager()
+    : mKeyboardPanel(new KeyboardPanel())
+{
+}
+
+KeyboardManager::~KeyboardManager()
+{
+}
+
+void KeyboardManager::showKeyboardPanel(QWidget* aInputWidget)
+{
+    mKeyboardPanel->showPanel(aInputWidget);
+}

src/keyboard/KeyboardManager.h

@@ -0,0 +1,27 @@
+#ifndef KEYBOARDMANAGER_H
+#define KEYBOARDMANAGER_H
+
+#include <QObject>
+#include <memory>
+
+class KeyboardPanel;
+typedef std::shared_ptr<KeyboardPanel> KeyboardPanelPointer;
+
+class KeyboardManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    static KeyboardManager* getInstance();
+    void showKeyboardPanel(QWidget* aInputWidget);
+
+private:
+    explicit KeyboardManager();
+    ~KeyboardManager();
+
+private:
+    KeyboardPanelPointer mKeyboardPanel;
+
+};
+
+#endif // KEYBOARDMANAGER_H

src/keyboard/KeyboardPanel.cpp

@@ -1,37 +1,35 @@
-#include "InputObject.h"
+#include "KeyboardPanel.h"
-#include "ui_InputObject.h"
+#include "ui_KeyboardPanel.h"
 
-#include <QDebug>
 #include <QEvent>
 #include <QKeyEvent>
 #include <QComboBox>
 #include <QDateEdit>
-#include <QtVirtualKeyboard>
 #include <QKeyEvent>
 #include <QLineEdit>
 #include <QAbstractSpinBox>
 
-InputObject::InputObject(QWidget* aParent)
+KeyboardPanel::KeyboardPanel(QWidget* aParent)
     : QWidget(aParent)
-    , mUI(new Ui::InputObject)
+    , mUI(new Ui::KeyboardPanel)
-    , mCurrentDateEdit(nullptr)
     , mCurrentLineEdit(nullptr)
     , mCurrentTextEdit(nullptr)
 {
     mUI->setupUi(this);
 
+    initializeStyle();
     initUi();
 
     setVisible(false);
     setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
 }
 
-InputObject::~InputObject()
+KeyboardPanel::~KeyboardPanel()
 {
     delete mUI;
 }
 
-void InputObject::initUi()
+void KeyboardPanel::initializeStyle()
 {
     //#3c3c3c
 #ifdef CUTE_STYLE
@@ -66,108 +64,37 @@ void InputObject::initUi()
         ;
 #endif
     setStyleSheet(style);
+}
 
-    mUI->dateEdit->setVisible(false);
+void KeyboardPanel::initUi()
-    mUI->dateEdit->setMaximumDate(QDate::currentDate());
+{
-    mUI->dateEdit->setDisplayFormat("yyyy/MM/dd");
-    mUI->dateEdit->setStyleSheet(style);
-
     connect(QGuiApplication::inputMethod(), &QInputMethod::visibleChanged, [=]() {
         if (QGuiApplication::inputMethod()->isVisible())
         {
             return;
         }
-        HidePanel();
+        hidePanel();
         hide();
         });
 }
 
-bool InputObject::eventFilter(QObject* aObject, QEvent* aEvent)
+void KeyboardPanel::showPanel(QWidget* aInputWidget)
 {
-    if (aEvent->type() == QEvent::MouseButtonPress)
+    if (!aInputWidget)
-    {
-        emit touchScreen();
-    }
-    if (aEvent->type() == QEvent::KeyPress)
-    {
-        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(aEvent);
-        if (keyEvent->key() == Qt::Key_Return && mCurrentDateEdit)
-        {
-            HidePanel();
-            hide();
-        }
-    }
-    //mouse button release means setfocus is useless
-    if (aEvent->type() == QEvent::MouseButtonRelease)
-    {
-        if (aObject->objectName() == QString("qt_spinbox_lineedit"))
-        {
-            QDateEdit* dateEdit = qobject_cast<QDateEdit*>(aObject->parent());
-            if (dateEdit == mUI->dateEdit)
-            {
-                return true;
-            }
-            if (dateEdit->isEnabled())
-            {
-                ShowPanel();
-                return true;
-            }
-        }
-        if (aObject->objectName() == QString("qt_scrollarea_viewport"))
-        {
-            QTextEdit* textEdit = qobject_cast<QTextEdit*>(aObject->parent());
-            if (!textEdit)
-            {
-                return false;
-            }
-            if (textEdit == mUI->textEdit)
-            {
-                return true;
-            }
-            if (textEdit->isEnabled())
-            {
-                ShowPanel();
-                return true;
-            }
-        }
-        if (aObject->inherits("QLineEdit"))
-        {
-            QLineEdit* lineEdit = qobject_cast<QLineEdit*>(aObject);
-            //you have to tell whether it is coming from qdateedit!!!
-            if (mUI->lineEdit != lineEdit && lineEdit->isEnabled())
-            {
-                ShowPanel();
-                return true;
-            }
-        }
-    }
-    return QObject::eventFilter(aObject, aEvent);
-}
-
-void InputObject::ShowPanel()
-{
-    if (!qApp->focusWidget())
     {
         return;
     }
-    if (qApp->focusWidget()->inherits("QLineEdit"))
+
+    if (aInputWidget->inherits("QLineEdit"))
     {
-        mCurrentLineEdit = qobject_cast<QLineEdit*>(qApp->focusWidget());
+        mCurrentLineEdit = qobject_cast<QLineEdit*>(aInputWidget);
         mUI->dateEdit->setVisible(false);
         mUI->lineEdit->setVisible(true);
         mUI->textEdit->setVisible(false);
     }
-    if (qApp->focusWidget()->inherits("QDateEdit"))
+    else if (aInputWidget->inherits("QTextEdit"))
     {
-        mCurrentDateEdit = qobject_cast<QDateEdit*>(qApp->focusWidget());
+        mCurrentTextEdit = qobject_cast<QTextEdit*>(aInputWidget);
-        mUI->dateEdit->setVisible(true);
-        mUI->lineEdit->setVisible(false);
-        mUI->textEdit->setVisible(false);
-    }
-
-    if (qApp->focusWidget()->inherits("QTextEdit"))
-    {
-        mCurrentTextEdit = qobject_cast<QTextEdit*>(qApp->focusWidget());
         mUI->dateEdit->setVisible(false);
         mUI->lineEdit->setVisible(false);
         mUI->textEdit->setVisible(true);
@@ -179,7 +106,7 @@ void InputObject::ShowPanel()
     activateWindow(); //it is quite important!!!
     while (QApplication::activeWindow() != this)
     {
-        qApp->processEvents();
+        QApplication::processEvents();
     }
 
     if (mCurrentLineEdit)
@@ -192,21 +119,7 @@ void InputObject::ShowPanel()
         QEvent event(QEvent::RequestSoftwareInputPanel);
         QApplication::sendEvent(mUI->lineEdit, &event);
     }
-    if (mCurrentDateEdit)
+    else if (mCurrentTextEdit)
-    {
-
-        mUI->dateEdit->setDateTime(mCurrentDateEdit->dateTime());
-        mUI->dateEdit->setFocus();
-        while (QGuiApplication::focusObject() != mUI->dateEdit)
-        {
-            qApp->processEvents();
-        }
-        qDebug() << QGuiApplication::focusObject();
-        QEvent event(QEvent::RequestSoftwareInputPanel);
-        QApplication::sendEvent(mUI->dateEdit, &event);
-    }
-
-    if (mCurrentTextEdit)
     {
         mUI->textEdit->setPlainText(mCurrentTextEdit->toPlainText());
         mUI->textEdit->setFocus();
@@ -219,7 +132,7 @@ void InputObject::ShowPanel()
     }
 }
 
-void InputObject::HidePanel()
+void KeyboardPanel::hidePanel()
 {
     if (mCurrentLineEdit)
     {
@@ -228,13 +141,6 @@ void InputObject::HidePanel()
         mUI->lineEdit->clear();
         mCurrentLineEdit = nullptr;
     }
-    else if (mCurrentDateEdit)
-    {
-        mCurrentDateEdit->setDateTime(mUI->dateEdit->dateTime());
-        mUI->dateEdit->clearFocus();
-        mUI->dateEdit->clear();
-        mCurrentDateEdit = nullptr;
-    }
     else if (mCurrentTextEdit)
     {
         mCurrentTextEdit->setText(mUI->textEdit->toPlainText());

src/keyboard/KeyboardPanel.h

@@ -0,0 +1,35 @@
+#ifndef KEYBOARDPANEL_H
+#define KEYBOARDPANEL_H
+
+#include <QWidget>
+
+class QLineEdit;
+class QDateEdit;
+class QTextEdit;
+
+namespace Ui
+{
+    class KeyboardPanel;
+}
+
+class KeyboardPanel : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit KeyboardPanel(QWidget* aParent = nullptr);
+    ~KeyboardPanel();
+    void showPanel(QWidget* aInputWidget);
+    void hidePanel();
+
+private:
+    void initializeStyle();
+    void initUi();
+
+private:
+    Ui::KeyboardPanel* mUI;
+    QLineEdit* mCurrentLineEdit;
+    QTextEdit* mCurrentTextEdit;
+};
+
+#endif // KEYBOARDPANEL_H

src/keyboard/KeyboardPanel.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>InputObject</class>
+ <class>KeyboardPanel</class>
- <widget class="QWidget" name="InputObject">
+ <widget class="QWidget" name="KeyboardPanel">
   <property name="geometry">
    <rect>
     <x>0</x>

src/main.cpp

@@ -1,7 +1,6 @@
 #include "windows/MainWindow.h"
-#include <QApplication>
+#include "UsctApplication.h"
 #include "windows/LoginDialog.h"
-#include "src/utilities/InputObject.h"
 #include <QQmlApplicationEngine>
 #include "db/SQLHelper.h"
 #include <QTextCodec>
@@ -13,8 +12,10 @@
 #include <QTranslator>
 #include <src/device/DeviceManager.h>
 #include "json/jsonobject.h"
-#include "src/utilities/locker.h"
+#include "src/utilities/Locker.h"
-#include "src/utilities/languageswitcher.h"
+#include "src/utilities/LanguageSwitcher.h"
+#include "utilities/TouchScreenSignalSender.h"
+
 QString loadFontFromFile(QString path)
 {
     static QString font;
@@ -41,7 +42,7 @@ int main(int argc, char* argv[])
     //qputenv("QT_LOGGING_RULES", QByteArray("qt.virtualkeyboard=true"));
 
 
-    QApplication a(argc, argv);
+    UsctApplication a(argc, argv);
     QString layouts_path = QString(QCoreApplication::applicationDirPath()).append("/layouts");
     qputenv("QT_VIRTUALKEYBOARD_LAYOUT_PATH", QByteArray(layouts_path.toStdString().c_str()));
 
@@ -59,15 +60,13 @@ int main(int argc, char* argv[])
     QFont font(fontName);
     QApplication::setFont(font);
 
-    InputObject* obj = new InputObject();
-    a.installEventFilter(obj);
     SQLHelper::Open();
     MainWindow w;
     UserOperationLog::Default()->init();
 
     //暂时为了调试关闭锁屏
-    //Locker::Instance()->start();
+    //Locker::getInstance()->start();
-    //QObject::connect(obj, SIGNAL(touchScreen()), Locker::Instance(), SLOT(refreshTimer()));
+    //QObject::connect(TouchScreenSignalSender::getInstance(), SIGNAL(touchScreen()), Locker::getInstance(), SLOT(refreshTimer()));
     QList<Qt::GestureType> gestures;
     gestures << Qt::SwipeGesture;
     gestures << Qt::PanGesture;

src/network/DicomCfgDialog.ui

@@ -70,13 +70,13 @@
                   </attribute>
                   <layout class="QGridLayout" name="gridLayout">
                     <item row="5" column="1">
-                      <widget class="QLineEdit" name="wl_IP"/>
+                      <widget class="ULineEdit" name="wl_IP"/>
                     </item>
                     <item row="6" column="1">
-                      <widget class="QLineEdit" name="wl_Port"/>
+                      <widget class="ULineEdit" name="wl_Port"/>
                     </item>
                     <item row="4" column="1">
-                      <widget class="QLineEdit" name="wl_AE"/>
+                      <widget class="ULineEdit" name="wl_AE"/>
                     </item>
                     <item row="0" column="1">
                       <spacer name="verticalSpacer_3">
@@ -129,7 +129,7 @@
                       </widget>
                     </item>
                     <item row="1" column="1">
-                      <widget class="QLineEdit" name="wl_Name"/>
+                      <widget class="ULineEdit" name="wl_Name"/>
                     </item>
                     <item row="6" column="2">
                       <widget class="QToolButton" name="toolButton_2">
@@ -157,10 +157,10 @@
                   </attribute>
                   <layout class="QGridLayout" name="gridLayout_2">
                     <item row="4" column="1">
-                      <widget class="QLineEdit" name="pacs_IP"/>
+                      <widget class="ULineEdit" name="pacs_IP"/>
                     </item>
                     <item row="3" column="1">
-                      <widget class="QLineEdit" name="pacs_AE"/>
+                      <widget class="ULineEdit" name="pacs_AE"/>
                     </item>
                     <item row="2" column="0">
                       <widget class="QLabel" name="lbl_Name_2">
@@ -190,7 +190,7 @@
                       </widget>
                     </item>
                     <item row="5" column="1">
-                      <widget class="QLineEdit" name="pacs_Port"/>
+                      <widget class="ULineEdit" name="pacs_Port"/>
                     </item>
                     <item row="0" column="1">
                       <spacer name="verticalSpacer_2">
@@ -209,7 +209,7 @@
                       </spacer>
                     </item>
                     <item row="2" column="1">
-                      <widget class="QLineEdit" name="pacs_Name"/>
+                      <widget class="ULineEdit" name="pacs_Name"/>
                     </item>
                     <item row="5" column="0">
                       <widget class="QLabel" name="lbl_Port_2">
@@ -247,7 +247,7 @@
                   </attribute>
                   <layout class="QGridLayout" name="gridLayout_3">
                     <item row="2" column="1">
-                      <widget class="QLineEdit" name="recon_Name"/>
+                      <widget class="ULineEdit" name="recon_Name"/>
                     </item>
                     <item row="1" column="1">
                       <spacer name="verticalSpacer">
@@ -280,7 +280,7 @@
                       </widget>
                     </item>
                     <item row="5" column="1">
-                      <widget class="QLineEdit" name="recon_IP"/>
+                      <widget class="ULineEdit" name="recon_IP"/>
                     </item>
                     <item row="2" column="0">
                       <widget class="QLabel" name="lbl_Name_3">
@@ -296,7 +296,7 @@
                       </widget>
                     </item>
                     <item row="6" column="1">
-                      <widget class="QLineEdit" name="recon_Port"/>
+                      <widget class="ULineEdit" name="recon_Port"/>
                     </item>
                     <item row="4" column="0">
                       <widget class="QLabel" name="lbl_AE_3">
@@ -306,7 +306,7 @@
                       </widget>
                     </item>
                     <item row="4" column="1">
-                      <widget class="QLineEdit" name="recon_AE"/>
+                      <widget class="ULineEdit" name="recon_AE"/>
                     </item>
                     <item row="6" column="2">
                       <widget class="QToolButton" name="toolButton_3">
@@ -382,4 +382,11 @@
       </hints>
     </connection>
   </connections>
+  <customwidgets>
+    <customwidget>
+      <class>ULineEdit</class>
+      <extends>QLineEdit</extends>
+      <header location="global">components/ULineEdit.h</header>
+    </customwidget>
+  </customwidgets>
 </ui>

src/network/GetAdminPsw.cpp

@@ -5,7 +5,7 @@
 
 #include <QFormLayout>
 #include <QLabel>
-#include <QtWidgets/QLineEdit>
+#include "components/ULineEdit.h"
 
 #ifndef WIN32
 #include <src/device/networkmanager.h>
@@ -13,7 +13,7 @@
 
 GetAdminPsw::GetAdminPsw(QWidget* parent, Qt::WindowFlags f)
     : GUIFormBaseDialog(parent, f)
-    , mPsw(new QLineEdit(this))
+    , mPsw(new ULineEdit(this))
     , mLabelError(new QLabel(this))
 {
     setWindowModality(Qt::WindowModal);

src/network/GetAdminPsw.h

@@ -7,7 +7,7 @@
 
 #include "src/dialogs/GUIFormBaseDialog.h"
 
-class QLineEdit;
+class ULineEdit;
 class QLabel;
 
 class GetAdminPsw : public GUIFormBaseDialog
@@ -22,7 +22,7 @@ protected:
     bool updateReferenceData();
 
 private:
-    QLineEdit* mPsw = nullptr;
+    ULineEdit* mPsw = nullptr;
     QLabel* mLabelError = nullptr;
 };
 

src/network/GetIPDialog.cpp

@@ -6,14 +6,14 @@
 
 #include <QFormLayout>
 #include <QLabel>
-#include <QtWidgets/QLineEdit>
+#include "components/ULineEdit.h"
 
 #include "device/networkmanager.h"
 
 GetIPDialog::GetIPDialog(QWidget* parent, Qt::WindowFlags f)
     : GUIFormBaseDialog(parent, f)
-    , mIp(new QLineEdit(this))
+    , mIp(new ULineEdit(this))
-    , mMask(new QLineEdit(this))
+    , mMask(new ULineEdit(this))
     , mLabelError(new QLabel(this))
 {
     setWindowModality(Qt::WindowModal);

src/network/GetIPDialog.h

@@ -7,7 +7,7 @@
 
 #include "src/dialogs/GUIFormBaseDialog.h"
 
-class QLineEdit;
+class ULineEdit;
 class QLabel;
 
 class GetIPDialog :public  GUIFormBaseDialog
@@ -24,8 +24,8 @@ protected:
     bool updateReferenceData();
 
 private:
-    QLineEdit* mIp = nullptr;
+    ULineEdit* mIp = nullptr;
-    QLineEdit* mMask = nullptr;
+    ULineEdit* mMask = nullptr;
     QLabel* mLabelError = nullptr;
 };
 

src/network/GetRouteDialog.cpp

@@ -6,15 +6,15 @@
 
 #include <QFormLayout>
 #include <QLabel>
-#include <QtWidgets/QLineEdit>
+#include "components/ULineEdit.h"
 
 #include "device/networkmanager.h"
 
 GetRouteDialog::GetRouteDialog(QWidget* parent, Qt::WindowFlags f)
     : GUIFormBaseDialog(parent, f)
-    , mDestination(new QLineEdit(this))
+    , mDestination(new ULineEdit(this))
-    , mNetmask(new QLineEdit(this))
+    , mNetmask(new ULineEdit(this))
-    , mGateway(new QLineEdit(this))
+    , mGateway(new ULineEdit(this))
     , mLabelError(new QLabel(this))
 {
     setWindowModality(Qt::WindowModal);

src/network/GetRouteDialog.h

@@ -7,7 +7,7 @@
 
 #include "src/dialogs/GUIFormBaseDialog.h"
 
-class QLineEdit;
+class ULineEdit;
 class QLabel;
 
 class GetRouteDialog :public  GUIFormBaseDialog
@@ -24,9 +24,9 @@ protected:
     bool updateReferenceData();
 
 private:
-    QLineEdit* mDestination = nullptr;
+    ULineEdit* mDestination = nullptr;
-    QLineEdit* mNetmask = nullptr;
+    ULineEdit* mNetmask = nullptr;
-    QLineEdit* mGateway = nullptr;
+    ULineEdit* mGateway = nullptr;
     QLabel* mLabelError = nullptr;
 };
 

src/network/NetworkCfgDialog.ui

@@ -37,7 +37,7 @@
         background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #ABABAB, stop: 1.0 #CDCDCD);
         }
 
-        QLineEdit#led_inface{font-size:15px;border: 0px;}
+        ULineEdit#led_inface{font-size:15px;border: 0px;}
       </string>
     </property>
     <layout class="QHBoxLayout" name="horizontalLayout_5">
@@ -103,7 +103,7 @@
                             </spacer>
                           </item>
                           <item row="5" column="0">
-                            <widget class="QLineEdit" name="addr_ip"/>
+                            <widget class="ULineEdit" name="addr_ip"/>
                           </item>
                           <item row="2" column="0">
                             <widget class="QLabel" name="label_3">
@@ -152,7 +152,7 @@
                             </widget>
                           </item>
                           <item row="0" column="1">
-                            <widget class="QLineEdit" name="led_inface">
+                            <widget class="ULineEdit" name="led_inface">
                               <property name="enabled">
                                 <bool>false</bool>
                               </property>
@@ -187,7 +187,7 @@
                             </widget>
                           </item>
                           <item row="5" column="1">
-                            <widget class="QLineEdit" name="addr_mask"/>
+                            <widget class="ULineEdit" name="addr_mask"/>
                           </item>
                           <item row="1" column="0">
                             <spacer name="verticalSpacer_2">
@@ -301,7 +301,7 @@
                       <widget class="QWidget" name="widget_4" native="true">
                         <layout class="QGridLayout" name="gridLayout_3">
                           <item row="0" column="2">
-                            <widget class="QLineEdit" name="led_gw">
+                            <widget class="ULineEdit" name="led_gw">
                               <property name="sizePolicy">
                                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                                   <horstretch>0</horstretch>
@@ -453,13 +453,13 @@
                             </widget>
                           </item>
                           <item row="1" column="1">
-                            <widget class="QLineEdit" name="daq_AE"/>
+                            <widget class="ULineEdit" name="daq_AE"/>
                           </item>
                           <item row="0" column="1">
-                            <widget class="QLineEdit" name="daq_Name"/>
+                            <widget class="ULineEdit" name="daq_Name"/>
                           </item>
                           <item row="3" column="1">
-                            <widget class="QLineEdit" name="daq_Port"/>
+                            <widget class="ULineEdit" name="daq_Port"/>
                           </item>
                           <item row="3" column="0">
                             <widget class="QLabel" name="lbl_Port">
@@ -496,7 +496,7 @@
                             </widget>
                           </item>
                           <item row="2" column="1">
-                            <widget class="QLineEdit" name="daq_IP">
+                            <widget class="ULineEdit" name="daq_IP">
                               <property name="enabled">
                                 <bool>false</bool>
                               </property>
@@ -563,6 +563,11 @@
       <extends>QTableView</extends>
       <header location="global">components/SlideTableView.h</header>
     </customwidget>
+    <customwidget>
+      <class>ULineEdit</class>
+      <extends>QLineEdit</extends>
+      <header location="global">components/ULineEdit.h</header>
+    </customwidget>
   </customwidgets>
   <resources/>
   <connections/>

src/utilities/InputObject.h

@@ -1,37 +0,0 @@
-#ifndef INPUTOBJECT_H
-#define INPUTOBJECT_H
-
-#include <QWidget>
-
-class QLineEdit;
-class QDateEdit;
-class QTextEdit;
-
-namespace Ui
-{
-    class InputObject;
-}
-
-class InputObject : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit InputObject(QWidget* aParent = nullptr);
-    ~InputObject();
-    bool eventFilter(QObject* aObject, QEvent* aEvent);
-
-signals:
-    void touchScreen();
-
-private:
-    Ui::InputObject* mUI;
-    void initUi();
-    void ShowPanel();
-    void HidePanel();
-    QDateEdit* mCurrentDateEdit = nullptr;
-    QLineEdit* mCurrentLineEdit = nullptr;
-    QTextEdit* mCurrentTextEdit = nullptr;
-};
-
-#endif // INPUTOBJECT_H

src/utilities/TouchScreenSignalSender.cpp

@@ -0,0 +1,20 @@
+#include "TouchScreenSignalSender.h"
+
+TouchScreenSignalSender* TouchScreenSignalSender::getInstance()
+{
+    static TouchScreenSignalSender instance;
+    return &instance;
+}
+
+TouchScreenSignalSender::TouchScreenSignalSender()
+{
+}
+
+TouchScreenSignalSender::~TouchScreenSignalSender()
+{
+}
+
+void TouchScreenSignalSender::sendTouchScreenSignal()
+{
+    emit touchScreen();
+}

src/utilities/TouchScreenSignalSender.h

@@ -0,0 +1,22 @@
+#ifndef TOUCHSCREENSIGNALSENDER_H
+#define TOUCHSCREENSIGNALSENDER_H
+
+#include <QObject>
+
+class TouchScreenSignalSender : public QObject
+{
+    Q_OBJECT
+public:
+    static TouchScreenSignalSender* getInstance();
+    void sendTouchScreenSignal();
+
+signals:
+    void touchScreen();
+
+
+private:
+    explicit TouchScreenSignalSender();
+    ~TouchScreenSignalSender();
+};
+
+#endif // TOUCHSCREENSIGNALSENDER_H

src/windows/LoginDialog.cpp

@@ -1,7 +1,6 @@
 #include "LoginDialog.h"
 
 #include <QVBoxLayout>
-#include <QLineEdit>
 #include <QToolButton>
 #include <QFrame>
 #include <QInputMethodEvent>
@@ -11,11 +10,11 @@
 #include "guimacros.h"
 #include "event/EventCenter.h"
 #include "db/SQLHelper.h"
-#include "utilities/InputObject.h"
 #include "models/User.h"
 #include "log/UserOperationLog.h"
 #include "json/jsonobject.h"
 #include "dialogs/guimessagedialog.h"
+#include "components/ULineEdit.h"
 
 LoginDialog::LoginDialog(QWidget* aParent)
     : QDialog(aParent)
@@ -23,8 +22,8 @@ LoginDialog::LoginDialog(QWidget* aParent)
     , mDialogTitle(new QLabel(this))
     , mDialogFrame(new QFrame(this))
     , mDialogContentsLayout(new QVBoxLayout(mDialogFrame))
-    , mAccountEdit(new QLineEdit(mDialogFrame))
+    , mAccountEdit(new ULineEdit(mDialogFrame))
-    , mPasswordEdit(new QLineEdit(mDialogFrame))
+    , mPasswordEdit(new ULineEdit(mDialogFrame))
     , mLoginButton(nullptr)
     , mErrorMessage(new QLabel(this))
 {

src/windows/LoginDialog.h

@@ -6,7 +6,7 @@
 #include <QDialog>
 
 class QVBoxLayout;
-class QLineEdit;
+class ULineEdit;
 class QToolButton;
 class QFrame;
 class QLabel;
@@ -41,8 +41,8 @@ private:
     QLabel* mDialogTitle;
     QFrame* mDialogFrame;
     QVBoxLayout* mDialogContentsLayout;
-    QLineEdit* mAccountEdit;
+    ULineEdit* mAccountEdit;
-    QLineEdit* mPasswordEdit;
+    ULineEdit* mPasswordEdit;
     QToolButton* mLoginButton;
     QLabel* mErrorMessage;
 };

src/windows/MainWindow.cpp

@@ -3,7 +3,6 @@
 #include <qtabwidget.h>
 #include <QSizePolicy>
 #include <QHBoxLayout>
-#include <QTextEdit>
 #include <QScrollBar>
 #include <QDateTime>
 #include <QGestureEvent>
@@ -24,6 +23,7 @@
 #include "LoginDialog.h"
 #include "models/User.h"
 #include "appvals/AppGlobalValues.h"
+#include "components/UTextEdit.h"
 
 MainWindow::MainWindow(QWidget* aParent)
     : QMainWindow(aParent)
@@ -256,8 +256,7 @@ void MainWindow::QMessageOutput(QtMsgType aType, const QMessageLogContext& aCont
 
 MainWindow::~MainWindow()
 {
-    mThread->quit();
+    mThread->terminate();
-    mThread->wait();
     mThread->deleteLater();
     delete mUI;
 }
@@ -322,7 +321,7 @@ void MainWindow::debugConsoleOn()
     mDebugConsoleWidget->setAllowedAreas(Qt::RightDockWidgetArea);
     this->addDockWidget(static_cast<Qt::DockWidgetArea>(2), mDebugConsoleWidget);
 
-    mDebugMessageConsole = new QTextEdit(this);
+    mDebugMessageConsole = new UTextEdit(this);
     mDebugMessageConsole->setFocusPolicy(Qt::NoFocus);
     mDebugConsoleWidget->setWidget(mDebugMessageConsole);