From e58388a222fd2c27eb3532174edf054c73f99f80 Mon Sep 17 00:00:00 2001
From: Syres916 <46537884+Syres916@users.noreply.github.com>
Date: Sun, 2 Feb 2025 22:24:27 +0000
Subject: [PATCH] [Gui] Fix Close without Saving button size (#19342)

---
 src/Gui/Dialogs/DlgMacroExecuteImp.cpp | 2 +-
 src/Gui/MainWindow.cpp                 | 3 ++-
 src/Gui/Stylesheets/FreeCAD Dark.qss   | 3 ++-
 src/Gui/Stylesheets/FreeCAD Light.qss  | 7 ++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
index 98b4622986..bf15b39e82 100644
--- a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
+++ b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
@@ -569,7 +569,7 @@ void DlgMacroExecuteImp::onToolbarButtonClicked()
         QAbstractButton* doNotShowAgainButton =
             msgBox.addButton(tr("Do not show again"), QMessageBox::YesRole);
         msgBox.setText(tr("Guided Walkthrough"));
-        msgBox.setObjectName(QString::fromLatin1("macroGuideWalkthrough"));
+        msgBox.setObjectName(QStringLiteral("macroGuideWalkthrough"));
         msgBox.setInformativeText(tr("This will guide you in setting up this macro in a custom \
 global toolbar.  Instructions will be in red text inside the dialog.\n\
 \n\
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 2376fb69d7..00cd9ae045 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -784,6 +784,7 @@ void MainWindow::closeActiveWindow ()
 
 int MainWindow::confirmSave(const char *docName, QWidget *parent, bool addCheckbox) {
     QMessageBox box(parent?parent:this);
+    box.setObjectName(QStringLiteral("confirmSave"));
     box.setIcon(QMessageBox::Question);
     box.setWindowFlags(box.windowFlags() | Qt::WindowStaysOnTopHint);
     box.setWindowTitle(QObject::tr("Unsaved document"));
@@ -798,7 +799,7 @@ int MainWindow::confirmSave(const char *docName, QWidget *parent, bool addCheckb
     box.setDefaultButton(QMessageBox::Save);
     box.setEscapeButton(QMessageBox::Cancel);
 
-    QCheckBox checkBox(QObject::tr("Apply answer to all"));
+    QCheckBox checkBox(QObject::tr("Apply to all"));
     ParameterGrp::handle hGrp;
     if(addCheckbox) {
          hGrp = App::GetApplication().GetUserParameter().
diff --git a/src/Gui/Stylesheets/FreeCAD Dark.qss b/src/Gui/Stylesheets/FreeCAD Dark.qss
index 6711d3021a..0326a321b7 100644
--- a/src/Gui/Stylesheets/FreeCAD Dark.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Dark.qss	
@@ -1292,7 +1292,8 @@ QDialogButtonBox QPushButton {
   min-width: 80px;
 }
 
-QMessageBox[objectName="macroGuideWalkthrough"] QDialogButtonBox QPushButton {
+QMessageBox[objectName="macroGuideWalkthrough"] QDialogButtonBox QPushButton,
+QMessageBox[objectName="confirmSave"] QDialogButtonBox QPushButton {
   min-width: 20px;
 }
 /* QToolButton ------------------------------------------------------------
diff --git a/src/Gui/Stylesheets/FreeCAD Light.qss b/src/Gui/Stylesheets/FreeCAD Light.qss
index fa2579e8dd..9cafa1cb2a 100644
--- a/src/Gui/Stylesheets/FreeCAD Light.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Light.qss	
@@ -1289,7 +1289,8 @@ QDialogButtonBox QPushButton {
   min-width: 80px;
 }
 
-QMessageBox[objectName="macroGuideWalkthrough"] QDialogButtonBox QPushButton {
+QMessageBox[objectName="macroGuideWalkthrough"] QDialogButtonBox QPushButton,
+QMessageBox[objectName="confirmSave"] QDialogButtonBox QPushButton {
   min-width: 20px;
 }
 
@@ -1395,12 +1396,12 @@ QToolButton::menu-arrow {
   /* background-color: transparent; */
 }
 QToolButton::menu-arrow:open {
-  image: url(qss:images_classic/arrow-Down-black.png);
+  image: url(qss:images_classic/arrow-down-black.png);
   width: 18px;
   height: 18px;
 }
 QToolButton::menu-arrow:hover {
-  image: url(qss:images_classic/arrow-Down-black.png);
+  image: url(qss:images_classic/arrow-down-black.png);
   width: 18px;
   height: 18px;
 }