From 695c85536dfaf7ba8a923e964f860ae191354416 Mon Sep 17 00:00:00 2001
From: duanshengchao <519970194@qq.com>
Date: Tue, 10 Jun 2025 16:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3Linux=E4=B8=8B=E5=90=8E?=
=?UTF-8?q?=E4=BA=8EmessageDialog=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84?=
=?UTF-8?q?=E5=85=84=E5=BC=9F=E6=8E=A7=E4=BB=B6=E8=A7=A6=E5=8F=91messageDi?=
=?UTF-8?q?alog=E6=98=BE=E7=A4=BA=E6=97=B6=E7=9A=84=E5=B1=82=E7=BA=A7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
source/mainwindow.cpp | 8 +++++++-
ui/connectionDialog.ui | 8 ++++----
ui/messageDialog.ui | 43 +++++++++++++++++++++++++-----------------
3 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp
index e6c5324..39e8500 100644
--- a/source/mainwindow.cpp
+++ b/source/mainwindow.cpp
@@ -131,7 +131,13 @@ void MainWindow::showMessageDialog(MessageDialogType type,const QString& strTitl
}
m_pMessageDialog->move(nX, nY);
- m_pMessageDialog->exec();
+ if(QSysInfo::kernelType() == "linux")
+ {
+ m_pMessageDialog->show();
+ m_pMessageDialog->raise();
+ }
+ else
+ m_pMessageDialog->exec();
}
void MainWindow::hideMessageDialog()
{
diff --git a/ui/connectionDialog.ui b/ui/connectionDialog.ui
index c401e23..706a21a 100644
--- a/ui/connectionDialog.ui
+++ b/ui/connectionDialog.ui
@@ -25,16 +25,16 @@
0
- 1
+ 2
- 1
+ 2
- 1
+ 2
- 1
+ 2
-
diff --git a/ui/messageDialog.ui b/ui/messageDialog.ui
index 9b1c20b..654ac54 100644
--- a/ui/messageDialog.ui
+++ b/ui/messageDialog.ui
@@ -22,16 +22,16 @@
0
- 1
+ 2
- 1
+ 2
- 1
+ 2
- 1
+ 2
-
@@ -96,20 +96,21 @@
QPushButton
{
-color: rgb(250, 250, 250);
-font: 10pt ;
+color: rgb(240, 240, 240);
+font: 10pt;
border:0px;
-border-radius:2px;
-background-color:rgb(67,160,249);
+border-radius:5px;
+background-color: rgb(49, 91, 125);
}
QPushButton:hover
{
-background-color:rgb(55,131,204);
+background-color: rgb(65, 122, 166);
}
QPushButton:pressed
{
-background-color:rgb(67,160,249);
-}
+background-color: rgb(49, 91, 125);
+}
+
确认
@@ -132,20 +133,21 @@ background-color:rgb(67,160,249);
QPushButton
{
-color: rgb(250, 250, 250);
+color: rgb(240, 240, 240);
font: 10pt;
border:0px;
border-radius:5px;
-background-color:rgb(67,160,249);
+background-color: rgb(49, 91, 125);
}
QPushButton:hover
{
-background-color:rgb(55,131,204);
+background-color: rgb(65, 122, 166);
}
QPushButton:pressed
{
-background-color:rgb(67,160,249);
-}
+background-color: rgb(49, 91, 125);
+}
+
是
@@ -164,7 +166,14 @@ background-color:rgb(67,160,249);
-
+ QPushButton
+{
+color: rgb(240, 240, 240);
+font: 10pt;
+border-radius:5px;
+background-color: transparent;
+}
+
否