kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

PD: fix crash on Windows when loading PD workbench

Browse Source
This commit is contained in:
wmayer
2023-04-13 15:02:32 +02:00
committed by wwmayer
parent 12e46d7495
commit c93b5e27c9
6 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
View File

@@ -175,7 +175,7 @@ void TaskChamferParameters::onCheckBoxUseAllEdgesToggled(bool checked)
void TaskChamferParameters::setButtons(const selectionModes mode)
{
ui->buttonRefSel->setChecked(mode == refSel);
ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr : btnSelectStr);
ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr() : btnSelectStr());
}
void TaskChamferParameters::onRefDeleted()

2
src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
View File

@@ -165,7 +165,7 @@ void TaskDraftParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
void TaskDraftParameters::setButtons(const selectionModes mode)
{
ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr : btnSelectStr);
ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr() : btnSelectStr());
ui->buttonRefSel->setChecked(mode == refSel);
ui->buttonLine->setChecked(mode == line);
ui->buttonPlane->setChecked(mode == plane);

14
src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp
View File

@@ -51,8 +51,6 @@ FC_LOG_LEVEL_INIT("PartDesign",true,true)
using namespace PartDesignGui;
using namespace Gui;
const QString TaskDressUpParameters::btnPreviewStr = tr("Preview");
const QString TaskDressUpParameters::btnSelectStr = tr("Select");
/* TRANSLATOR PartDesignGui::TaskDressUpParameters */
@@ -81,6 +79,18 @@ TaskDressUpParameters::~TaskDressUpParameters()
Gui::Selection().rmvSelectionGate();
}
const QString TaskDressUpParameters::btnPreviewStr()
{
static const QString text{ tr("Preview") };
return text;
}
const QString TaskDressUpParameters::btnSelectStr()
{
static const QString text{ tr("Select") };
return text;
}
void TaskDressUpParameters::setupTransaction()
{
if (!DressUpView)

4
src/Mod/PartDesign/Gui/TaskDressUpParameters.h
View File

@@ -100,8 +100,8 @@ protected:
selectionModes selectionMode;
int transactionID;
static const QString btnPreviewStr;
static const QString btnSelectStr;
static const QString btnPreviewStr();
static const QString btnSelectStr();
};
/// simulation dialog for the TaskView

2
src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
View File

@@ -128,7 +128,7 @@ void TaskFilletParameters::onCheckBoxUseAllEdgesToggled(bool checked)
void TaskFilletParameters::setButtons(const selectionModes mode)
{
ui->buttonRefSel->setChecked(mode == refSel);
ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr : btnSelectStr);
ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr() : btnSelectStr());
}
void TaskFilletParameters::onRefDeleted()

2
src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
View File

@@ -131,7 +131,7 @@ void TaskThicknessParameters::onSelectionChanged(const Gui::SelectionChanges& ms
void TaskThicknessParameters::setButtons(const selectionModes mode)
{
ui->buttonRefSel->setChecked(mode == refSel);
ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr : btnSelectStr);
ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr() : btnSelectStr());
}
void TaskThicknessParameters::onRefDeleted(void)