From d4169455e5f8261ec45755bc0c0d85e2a9e83fd8 Mon Sep 17 00:00:00 2001 From: krad Date: Wed, 27 Oct 2021 13:16:58 +0800 Subject: [PATCH] UI fix --- CMakeLists.txt | 2 +- src/loginwindow.cpp | 1 + src/main.cpp | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c27bdc..965f1ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ file(GLOB_RECURSE project_headers ./src/*.h) file(GLOB_RECURSE project_cpps ./src/*.cpp) file(GLOB_RECURSE project_cxx ./src/*.cxx) file(GLOB_RECURSE project_cc ./src/*.cc) -set(USE_SHIMLIB OFF) +set(USE_SHIMLIB ON) if(UNIX AND USE_SHIMLIB) file(GLOB_RECURSE project_c ./src/json/*.c) else() diff --git a/src/loginwindow.cpp b/src/loginwindow.cpp index b443b2f..576aedd 100644 --- a/src/loginwindow.cpp +++ b/src/loginwindow.cpp @@ -26,6 +26,7 @@ LoginWindow::LoginWindow(QWidget* parent) init(); setWindowFlags(windowFlags() | Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint); //Dialog::Instance()->InitForm(); + m_pUserCodeEdit->setText("usct"); } LoginWindow::~LoginWindow() diff --git a/src/main.cpp b/src/main.cpp index 67ead26..a3b75ea 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -49,19 +49,19 @@ int main(int argc, char* argv[]) //a.installEventFilter(obj); InputObject* obj = new InputObject(); a.installEventFilter(obj); - SQLHelper::Open(); - MainWindow w; - w.showFullScreen(); - LoginWindow l; -needLogin: - l.showFullScreen(); - int rec = l.exec(); - if (rec != QDialog::Accepted) - { - goto needLogin; - } - // l.deleteLater(); - w.centerWidgetShow(); + SQLHelper::Open(); + MainWindow w; + w.showFullScreen(); + LoginWindow l; + needLogin: + l.showFullScreen(); + int rec = l.exec(); + if (rec !=QDialog::Accepted ) + { + return 0; + } +// l.deleteLater(); + w.centerWidgetShow(); return a.exec();