[Gui] Fix Close without Saving button size (#19342)

This commit is contained in:
Syres916
2025-02-02 22:24:27 +00:00
committed by GitHub
parent a52f2e5081
commit e58388a222
4 changed files with 9 additions and 6 deletions

View File

@@ -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\

View File

@@ -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().

View File

@@ -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 ------------------------------------------------------------

View File

@@ -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;
}