Refactor InputObject(EventFilter and VirtualKeyboard).
This commit is contained in:
@@ -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))
|
||||
, mPasswordEdit(new QLineEdit(mDialogFrame))
|
||||
, mAccountEdit(new ULineEdit(mDialogFrame))
|
||||
, mPasswordEdit(new ULineEdit(mDialogFrame))
|
||||
, mLoginButton(nullptr)
|
||||
, mErrorMessage(new QLabel(this))
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
QLineEdit* mPasswordEdit;
|
||||
ULineEdit* mAccountEdit;
|
||||
ULineEdit* mPasswordEdit;
|
||||
QToolButton* mLoginButton;
|
||||
QLabel* mErrorMessage;
|
||||
};
|
||||
|
||||
@@ -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->wait();
|
||||
mThread->terminate();
|
||||
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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user