From 3377b1506932d0d85ddaa62c1adacb148104ead5 Mon Sep 17 00:00:00 2001 From: duanshengchao <519970194@qq.com> Date: Mon, 21 Apr 2025 16:57:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90Windows=E5=92=8CLinux?= =?UTF-8?q?=E5=88=86=E6=94=AF=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/connectionDialog.cpp | 4 +++ source/customBorderContainer.cpp | 2 +- source/mainwindow.cpp | 31 ++++++++++++++++------ source/maskManager.cpp | 45 ++++++++++++++------------------ ui/groupSelectionDialog.ui | 36 ++++++++----------------- ui/mainwindow.ui | 26 +++++++++++++----- ui/modelInfoEditDialog.ui | 36 +++++-------------------- 7 files changed, 85 insertions(+), 95 deletions(-) diff --git a/source/connectionDialog.cpp b/source/connectionDialog.cpp index 55cd4f5..52f470a 100644 --- a/source/connectionDialog.cpp +++ b/source/connectionDialog.cpp @@ -234,6 +234,10 @@ void ConnectionDialog::clearErrorInfo() void ConnectionDialog::showMask() { + // QRect geometry = this->geometry(); + // QRect frameGeometry = this->geometry(); + // int nY = frameGeometry.height() - geometry.height(); + // m_pMaskLayer->setGeometry(0, nY, frameGeometry.width(), frameGeometry.height()); m_pMaskLayer->setGeometry(0, 0, this->width(), this->height()); m_pMaskLayer->show(); } diff --git a/source/customBorderContainer.cpp b/source/customBorderContainer.cpp index 51c55df..d1900ec 100644 --- a/source/customBorderContainer.cpp +++ b/source/customBorderContainer.cpp @@ -193,7 +193,7 @@ void CustomBorderContainer::updateBorder() m_borderLeftBottom->setGeometry(0, m_contentWidget->height() - m_borderSize, m_borderSize, m_borderSize); m_borderRightTop->setGeometry(m_contentWidget->width() - m_borderSize, 0, m_borderSize, m_borderSize); m_borderRightBottom->setGeometry(m_contentWidget->width() - m_borderSize, m_contentWidget->height() - m_borderSize, m_borderSize, m_borderSize); - m_borderMove->setGeometry(m_borderSize, m_borderSize, m_contentWidget->width() - m_borderSize * 2, m_borderSize * 10); + m_borderMove->setGeometry(m_borderSize, m_borderSize, m_contentWidget->width() - m_borderSize * 2, m_borderSize * 5); } void CustomBorderContainer::updateContentWidget() diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp index 1a28f91..2aa4d61 100644 --- a/source/mainwindow.cpp +++ b/source/mainwindow.cpp @@ -116,7 +116,8 @@ void MainWindow::showMessageDialog(MessageDialogType type,const QString& strTitl int nY = this->geometry().y() + (this->height() - m_pMessageDialog->height()) * 0.5; m_pMessageDialog->move(nX, nY); - MaskManager::instance()->showMask(m_pMessageDialog); + if(QSysInfo::kernelType() == "linux") + MaskManager::instance()->showMask(m_pMessageDialog); // if(type == type_question) // m_pMessageDialog->exec(); // else @@ -164,8 +165,13 @@ void MainWindow::onActionTrigger_connect() // centerPos -= QPoint(m_pConnectionDialog->width()/2, m_pConnectionDialog->height()/2); // m_pConnectionDialog->move(centerPos); - MaskManager::instance()->showMask(m_pConnectionDialog); - m_pConnectionDialog->show(); + if(QSysInfo::kernelType() == "linux") + { + MaskManager::instance()->showMask(m_pConnectionDialog); + m_pConnectionDialog->show(); + } + else + m_pConnectionDialog->exec(); } void MainWindow::onActionTrigger_disconnect() { @@ -192,9 +198,13 @@ void MainWindow::onActionTrigger_addModel() m_pModelInfoDialog->move(nX, nY); m_pModelInfoDialog->setState(DS_New); - MaskManager::instance()->showMask(m_pModelInfoDialog); - m_pModelInfoDialog->show(); - //MaskManager::instance()->hideMask(m_pModelInfoDialog); + if(QSysInfo::kernelType() == "linux") + { + MaskManager::instance()->showMask(m_pModelInfoDialog); + m_pModelInfoDialog->show(); + } + else + m_pModelInfoDialog->exec(); } void MainWindow::onActionTrigger_removeModel() { @@ -234,8 +244,13 @@ void MainWindow::onActionTrigger_addGroup(int modelID) m_pGroupSelectionDialog->move(nX, nY); m_pGroupSelectionDialog->setModel(modelID); - MaskManager::instance()->showMask(m_pGroupSelectionDialog); - m_pGroupSelectionDialog->show(); + if(QSysInfo::kernelType() == "linux") + { + MaskManager::instance()->showMask(m_pGroupSelectionDialog); + m_pGroupSelectionDialog->show(); + } + else + m_pGroupSelectionDialog->exec(); } void MainWindow::onSIG_errorFromDBManger(const QString& strConnectionName, const QString& error) diff --git a/source/maskManager.cpp b/source/maskManager.cpp index 6b6e6b3..2e4f052 100644 --- a/source/maskManager.cpp +++ b/source/maskManager.cpp @@ -54,29 +54,18 @@ void MaskManager::showMask(QWidget* requester) else { QWidget* widget = m_activeRequests.last(); - const QMetaObject* meta = widget->metaObject(); - int methodIndex = meta->indexOfMethod("showMask()"); - if(methodIndex != -1) + if(widget->windowFlags().testFlag(Qt::Dialog)) { - //QMetaMethod method = meta->method(methodIndex); - QMetaObject::invokeMethod(widget, "showMask", Qt::AutoConnection); + const QMetaObject* meta = widget->metaObject(); + int methodIndex = meta->indexOfMethod("showMask()"); + if(methodIndex != -1) + { + //QMetaMethod method = meta->method(methodIndex); + QMetaObject::invokeMethod(widget, "showMask", Qt::AutoConnection); + } } - - /*if(widget->parentWidget() == m_mainWindow && widget->isVisible() && !widget->isModal()) - { - // qDebug() << "Child Dialog Order:"; - // foreach (QObject* child, m_mainWindow->children()) - // { - // if(qobject_cast(child) || qobject_cast(child)) - // qDebug() << child->objectName(); - // } - - widget->stackUnder(m_maskLayer); - //widget->lower(); - //强制刷新 - //m_mainWindow->update(); - //QApplication::processEvents(); - }*/ + else + widget->lower(); } m_activeRequests.appendUnique(requester); @@ -91,11 +80,15 @@ void MaskManager::hideMask(QWidget* requester) else { QWidget* widget = m_activeRequests.last(); - const QMetaObject* meta = widget->metaObject(); - int methodIndex = meta->indexOfMethod("hideMask()"); - if(methodIndex != -1) - QMetaObject::invokeMethod(widget, "hideMask", Qt::AutoConnection); - widget->setFocus(); + if(widget->windowFlags().testFlag(Qt::Dialog)) + { + const QMetaObject* meta = widget->metaObject(); + int methodIndex = meta->indexOfMethod("hideMask()"); + if(methodIndex != -1) + QMetaObject::invokeMethod(widget, "hideMask", Qt::AutoConnection); + } + else + widget->raise(); } //qDebug() << "remove requester: " << requester->objectName() << "requester count: " << m_activeRequests.size(); diff --git a/ui/groupSelectionDialog.ui b/ui/groupSelectionDialog.ui index 1ad04fb..42082e2 100644 --- a/ui/groupSelectionDialog.ui +++ b/ui/groupSelectionDialog.ui @@ -18,29 +18,7 @@ :/img/images/icon_hierarchy.png:/img/images/icon_hierarchy.png - QListView -{ -outline:0px; -border-left:1px solid rgb(235,235,235); -border-right:1px solid rgb(235,235,235); -border-top:1px solid rgb(0,0,0); -border-bottom:1px solid rgb(0,0,0); -} -QListView::item -{ -border:0px; -padding-left:5px; -padding-top:1px; -padding-bottom:1px; -} -QListView::item:hover -{ -background-color: rgb(240, 248, 255); -} -QListView::item:selected -{ -background-color:rgb(211, 241, 250); -} + @@ -96,7 +74,11 @@ background-color:rgb(211, 241, 250); - + + + + + @@ -182,7 +164,11 @@ QPushButton:pressed - + + + + + diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 089aef0..cff7848 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -32,12 +32,6 @@ QPushButton:pressed background-color:rgba(70,130,180,50); } -QPlainTextEdit -{ -border:1px solid rgb(235,235,235); -border-bottom:1px solid rgb(0,0,0); -} - QComboBox QAbstractItemView { outline: 0px; /* 去除选中虚线框 */ @@ -125,6 +119,26 @@ QTreeView::item:selected color:rgb(0,0,0); background-color:rgb(211, 241, 250); } + +QListView +{ +outline:0px; +} +QListView::item +{ +border:0px; +padding-left:5px; +padding-top:1px; +padding-bottom:1px; +} +QListView::item:hover +{ +background-color: rgb(240, 248, 255); +} +QListView::item:selected +{ +background-color:rgb(211, 241, 250); +} diff --git a/ui/modelInfoEditDialog.ui b/ui/modelInfoEditDialog.ui index 4b4fe76..14259be 100644 --- a/ui/modelInfoEditDialog.ui +++ b/ui/modelInfoEditDialog.ui @@ -18,29 +18,7 @@ :/img/images/icon_addTable.png:/img/images/icon_addTable.png - QListView -{ -outline:0px; -border-left:1px solid rgb(235,235,235); -border-right:1px solid rgb(235,235,235); -border-top:1px solid rgb(0,0,0); -border-bottom:1px solid rgb(0,0,0); -} -QListView::item -{ -border:0px; -padding-left:5px; -padding-top:1px; -padding-bottom:1px; -} -QListView::item:hover -{ -background-color: rgb(240, 248, 255); -} -QListView::item:selected -{ -background-color:rgb(211, 241, 250); -} + @@ -84,13 +62,13 @@ background-color:rgb(211, 241, 250); - 61 + 71 21 - 61 + 71 21 @@ -103,13 +81,13 @@ background-color:rgb(211, 241, 250); - 61 + 71 21 - 61 + 71 21 @@ -141,13 +119,13 @@ background-color:rgb(211, 241, 250); - 61 + 71 21 - 61 + 71 21