UI fix
This commit is contained in:
@@ -8,7 +8,7 @@ file(GLOB_RECURSE project_headers ./src/*.h)
|
|||||||
file(GLOB_RECURSE project_cpps ./src/*.cpp)
|
file(GLOB_RECURSE project_cpps ./src/*.cpp)
|
||||||
file(GLOB_RECURSE project_cxx ./src/*.cxx)
|
file(GLOB_RECURSE project_cxx ./src/*.cxx)
|
||||||
file(GLOB_RECURSE project_cc ./src/*.cc)
|
file(GLOB_RECURSE project_cc ./src/*.cc)
|
||||||
set(USE_SHIMLIB OFF)
|
set(USE_SHIMLIB ON)
|
||||||
if(UNIX AND USE_SHIMLIB)
|
if(UNIX AND USE_SHIMLIB)
|
||||||
file(GLOB_RECURSE project_c ./src/json/*.c)
|
file(GLOB_RECURSE project_c ./src/json/*.c)
|
||||||
else()
|
else()
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ LoginWindow::LoginWindow(QWidget* parent)
|
|||||||
init();
|
init();
|
||||||
setWindowFlags(windowFlags() | Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
|
setWindowFlags(windowFlags() | Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
|
||||||
//Dialog::Instance()->InitForm();
|
//Dialog::Instance()->InitForm();
|
||||||
|
m_pUserCodeEdit->setText("usct");
|
||||||
}
|
}
|
||||||
|
|
||||||
LoginWindow::~LoginWindow()
|
LoginWindow::~LoginWindow()
|
||||||
|
|||||||
26
src/main.cpp
26
src/main.cpp
@@ -49,19 +49,19 @@ int main(int argc, char* argv[])
|
|||||||
//a.installEventFilter(obj);
|
//a.installEventFilter(obj);
|
||||||
InputObject* obj = new InputObject();
|
InputObject* obj = new InputObject();
|
||||||
a.installEventFilter(obj);
|
a.installEventFilter(obj);
|
||||||
SQLHelper::Open();
|
SQLHelper::Open();
|
||||||
MainWindow w;
|
MainWindow w;
|
||||||
w.showFullScreen();
|
w.showFullScreen();
|
||||||
LoginWindow l;
|
LoginWindow l;
|
||||||
needLogin:
|
needLogin:
|
||||||
l.showFullScreen();
|
l.showFullScreen();
|
||||||
int rec = l.exec();
|
int rec = l.exec();
|
||||||
if (rec != QDialog::Accepted)
|
if (rec !=QDialog::Accepted )
|
||||||
{
|
{
|
||||||
goto needLogin;
|
return 0;
|
||||||
}
|
}
|
||||||
// l.deleteLater();
|
// l.deleteLater();
|
||||||
w.centerWidgetShow();
|
w.centerWidgetShow();
|
||||||
|
|
||||||
|
|
||||||
return a.exec();
|
return a.exec();
|
||||||
|
|||||||
Reference in New Issue
Block a user