Fix macOS startup project loading

This commit is contained in:
manongjohn 2023-10-21 12:17:48 -04:00
parent 32a45890bb
commit 263be7e428
3 changed files with 26 additions and 11 deletions

View file

@ -239,17 +239,6 @@ SymmetryTool::SymmetryTool()
m_color.setId("Color");
m_useLineSymmetry.setId("UseLineSymmetry");
m_preset.setId("SymmetryPreset");
std::wstring wpreset =
QString::fromStdString(SymmetryPreset.getValue()).toStdWString();
if (wpreset != CUSTOM_WSTR) {
initPresets();
if (!m_preset.isValue(wpreset)) wpreset = CUSTOM_WSTR;
m_preset.setValue(wpreset);
SymmetryPreset = m_preset.getValueAsString();
loadPreset();
} else
loadLastSymmetry();
}
//----------------------------------------------------------------------------------------------
@ -468,6 +457,21 @@ void SymmetryTool::loadLastSymmetry() {
//----------------------------------------------------------------------------------------------
void SymmetryTool::loadTool() {
std::wstring wpreset =
QString::fromStdString(SymmetryPreset.getValue()).toStdWString();
if (wpreset != CUSTOM_WSTR) {
initPresets();
if (!m_preset.isValue(wpreset)) wpreset = CUSTOM_WSTR;
m_preset.setValue(wpreset);
SymmetryPreset = m_preset.getValueAsString();
loadPreset();
} else
loadLastSymmetry();
}
//----------------------------------------------------------------------------------------------
void SymmetryTool::draw(SceneViewer *viewer) {
TRectD cameraRect = getApplication()
->getCurrentScene()

View file

@ -269,6 +269,8 @@ public:
void removePreset();
void loadLastSymmetry();
void loadTool() override;
protected:
TPropertyGroup m_prop;
std::vector<SymmetryToolOptionBox *> m_toolOptionsBox;

View file

@ -761,6 +761,15 @@ int main(int argc, char *argv[]) {
TTool::getTool(T_PerspectiveGrid, TTool::VectorImage);
if (perspectiveTool) perspectiveTool->loadTool();
// Symmetry tool -
splash.showMessage(offsetStr + QObject::tr("Loading Symmetry Guide..."),
Qt::AlignRight | Qt::AlignBottom, Qt::black);
a.processEvents();
TTool *symmetryTool =
TTool::getTool(T_Symmetry, TTool::VectorImage);
if (symmetryTool) symmetryTool->loadTool();
w.setWindowTitle(QString::fromStdString(TEnv::getApplicationFullName()));
if (TEnv::getIsPortable()) {
splash.showMessage(offsetStr + QObject::tr("Starting Tahoma2D..."),