diff --git a/runner17/lpbengine.dll b/runner17/lpbengine.dll index 9717482..857cdd2 100644 Binary files a/runner17/lpbengine.dll and b/runner17/lpbengine.dll differ diff --git a/runner17/lpbengined.dll b/runner17/lpbengined.dll index da1de4f..6773979 100644 Binary files a/runner17/lpbengined.dll and b/runner17/lpbengined.dll differ diff --git a/runner17/lpdesigner.dll b/runner17/lpdesigner.dll index fe8834e..f02384f 100644 Binary files a/runner17/lpdesigner.dll and b/runner17/lpdesigner.dll differ diff --git a/runner17/lpdesignerd.dll b/runner17/lpdesignerd.dll index 3950968..57dc838 100644 Binary files a/runner17/lpdesignerd.dll and b/runner17/lpdesignerd.dll differ diff --git a/runner17/tpCam_100.dll b/runner17/tpCam_100.dll index 325e5cd..f45170b 100644 Binary files a/runner17/tpCam_100.dll and b/runner17/tpCam_100.dll differ diff --git a/runner17/tpCam_100d.dll b/runner17/tpCam_100d.dll index e806485..2b83db8 100644 Binary files a/runner17/tpCam_100d.dll and b/runner17/tpCam_100d.dll differ diff --git a/src/userCtrl/QLoginDlg.cpp b/src/userCtrl/QLoginDlg.cpp index 721045a..f0843a8 100644 --- a/src/userCtrl/QLoginDlg.cpp +++ b/src/userCtrl/QLoginDlg.cpp @@ -24,7 +24,7 @@ QLoginDlg::QLoginDlg(QUserDB* pUserDB) { ui.setupUi(this); setWindowFlags(Qt::WindowCloseButtonHint); - setWindowIcon(QIcon(":/userinfo")); + //setWindowIcon(QIcon(":/userinfo")); _UserNameComboBox = ui.login_UserName; _PasswdLineEdit = ui.login_Passwd; _UserNameComboBox->setEditable(true); diff --git a/src/userCtrl/QUserAddNew.cpp b/src/userCtrl/QUserAddNew.cpp index a777f13..bb8cf4f 100644 --- a/src/userCtrl/QUserAddNew.cpp +++ b/src/userCtrl/QUserAddNew.cpp @@ -5,7 +5,7 @@ QUserAddNew::QUserAddNew(QWidget *parent): QDialog(parent) { ui.setupUi(this); setWindowFlags(Qt::WindowCloseButtonHint); - setWindowIcon(QIcon(":/userinfo")); +// setWindowIcon(QIcon(":/userinfo")); ui.m_UserName_lineEdit->clear(); ui.m_Passwd_lineEdit->clear(); ui.m_Passwd2_lineEdit->clear(); diff --git a/src/userCtrl/QUserBase.h b/src/userCtrl/QUserBase.h index 51e926d..c335ba5 100644 --- a/src/userCtrl/QUserBase.h +++ b/src/userCtrl/QUserBase.h @@ -40,8 +40,8 @@ class IUserCtrl:public QObject { public: IUserCtrl() {}; ~IUserCtrl() {}; - virtual void CheckLogin() =0; - virtual void ShowUserMgrDlg() = 0; + virtual void CheckLogin(QWidget* parent = nullptr) =0; + virtual void ShowUserMgrDlg(QWidget* parent = nullptr) = 0; virtual void LogOutUser() =0; virtual QString CurUser() = 0; virtual int CurUserLevel() = 0; diff --git a/src/userCtrl/QUserCtrl.cpp b/src/userCtrl/QUserCtrl.cpp index 5c98da8..b4edc5a 100644 --- a/src/userCtrl/QUserCtrl.cpp +++ b/src/userCtrl/QUserCtrl.cpp @@ -61,17 +61,20 @@ QUserCtrl::~QUserCtrl() } } -void QUserCtrl::CheckLogin() +void QUserCtrl::CheckLogin(QWidget* parent) { - QStringList strList = _pUserDBSqlite->Users(-1); _LoginDlg->AddItems2List(strList); + _LoginDlg->setParent(parent); + _LoginDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); _LoginDlg->show(); } -void QUserCtrl::ShowUserMgrDlg() +void QUserCtrl::ShowUserMgrDlg(QWidget* parent) { QDesktopWidget* desktop = QApplication::desktop();// + _pDlgUsersMgr->setParent(parent); + _pDlgUsersMgr->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); _pDlgUsersMgr->move((desktop->width() - _pDlgUsersMgr->width()) / 2, (desktop->height() - _pDlgUsersMgr->height()) / 2); _pDlgUsersMgr->SetUserAndLevel(_CurrentUserName, m_nLevel); _pDlgUsersMgr->OnUpdateUserList(); diff --git a/src/userCtrl/QUserCtrl.h b/src/userCtrl/QUserCtrl.h index 35440bd..97f4eaf 100644 --- a/src/userCtrl/QUserCtrl.h +++ b/src/userCtrl/QUserCtrl.h @@ -13,8 +13,8 @@ public: QUserCtrl(QWidget* parent = 0); ~QUserCtrl(); - void CheckLogin(); - void ShowUserMgrDlg(); + void CheckLogin(QWidget* parent = nullptr); + void ShowUserMgrDlg(QWidget* parent = nullptr); void LogOutUser(); QString CurUser() { return _CurrentUserName; } //当前登录用户的用户名 int CurUserLevel() { return m_nLevel; } //当前登录用户的等级 diff --git a/src/userCtrl/QUserManagerDlg.cpp b/src/userCtrl/QUserManagerDlg.cpp index 4d682f2..4ac9d18 100644 --- a/src/userCtrl/QUserManagerDlg.cpp +++ b/src/userCtrl/QUserManagerDlg.cpp @@ -17,7 +17,7 @@ QUserManagerDlg::QUserManagerDlg(QUserDB* pLogic) { ui.setupUi(this); setWindowFlags(Qt::WindowCloseButtonHint); - setWindowIcon(QIcon(":/userinfo")); + //setWindowIcon(QIcon(":/userinfo")); QStringList headerList; headerList << QObject::tr("用户名") << QObject::tr("等级"); plistModel = QSharedPointer(new QStandardItemModel); @@ -58,7 +58,8 @@ void QUserManagerDlg::onAddUser() QMessageBox::warning(this, QObject::tr("错误警告"), QObject::tr("你当前没有权限添加用户，请登录！")); return; } - QUserAddNew dlg; + QUserAddNew dlg(this); + dlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); dlg.setTitle(QObject::tr("添加新用户")); UserInfo info; info.mLevel = m_level; @@ -132,7 +133,8 @@ void QUserManagerDlg::onModifyUser() QMessageBox::warning(this, QObject::tr("错误警告"), QObject::tr("你没有选中需要修改的用户，请联系管理员！")); return; } - QUserAddNew dlg; + QUserAddNew dlg(this); + dlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); dlg.setTitle(QObject::tr("修改用户信息")); UserInfo info; info.mLevel = m_level; diff --git a/tpvs17/lpMain/CMainWin.cpp b/tpvs17/lpMain/CMainWin.cpp index d0f15bd..fd981ed 100644 --- a/tpvs17/lpMain/CMainWin.cpp +++ b/tpvs17/lpMain/CMainWin.cpp @@ -582,7 +582,7 @@ Q_SLOT void CMainWin::onActionClicked() } } else - m_pUserCtrl->CheckLogin(); + m_pUserCtrl->CheckLogin(this); } else { @@ -594,7 +594,7 @@ Q_SLOT void CMainWin::onActionClicked() } else if ("main_action_userManager" == strObj) {//û if (m_pUserCtrl) { - m_pUserCtrl->ShowUserMgrDlg(); + m_pUserCtrl->ShowUserMgrDlg(this); } else { @@ -945,7 +945,7 @@ Q_SLOT void CMainWin::onShowImage(int ID, QImage img) } else { - QRect rt = ui.wf_lb_image_show_1->rect(); + QRect rt = pLab->rect(); int h = img.height(); int w = img.width(); float d = w * 1.0 / h; diff --git a/tpvs17/lpMain/CMainWin.ui b/tpvs17/lpMain/CMainWin.ui index 9cf362c..da69095 100644 --- a/tpvs17/lpMain/CMainWin.ui +++ b/tpvs17/lpMain/CMainWin.ui @@ -7,7 +7,7 @@ 0 0 1022 - 705 + 723 @@ -143,6 +143,12 @@ + + + 0 + 0 + + 492 @@ -167,19 +173,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -211,6 +204,12 @@ + + + 0 + 0 + + 492 @@ -235,19 +234,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - diff --git a/tpvs17/lpMain/QDeviceMgrUI.ui b/tpvs17/lpMain/QDeviceMgrUI.ui index b9d33b9..03cb139 100644 --- a/tpvs17/lpMain/QDeviceMgrUI.ui +++ b/tpvs17/lpMain/QDeviceMgrUI.ui @@ -6,7 +6,7 @@ 0 0 - 516 + 442 195