3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix & refactor legacy datadir dialog

Browse source
This commit is contained in:
Vojtech Kral 2018-04-27 12:29:18 +02:00
parent a3d5251b8e
commit 6d38943222
3 changed files with 47 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
xs/src/slic3r/GUI/GUI.cpp
View file

@ -53,6 +53,7 @@
#include "ConfigWizard.hpp" #include "ConfigWizard.hpp"
#include "Preferences.hpp" #include "Preferences.hpp"
#include "PresetBundle.hpp" #include "PresetBundle.hpp"
#include "UpdateDialogs.hpp"
#include "../Utils/PresetUpdater.hpp" #include "../Utils/PresetUpdater.hpp"
#include "../Config/Snapshot.hpp" #include "../Config/Snapshot.hpp"
@ -480,24 +481,8 @@ bool config_wizard_startup(bool app_config_exists)
// Looks like user has legacy pre-vendorbundle data directory, // Looks like user has legacy pre-vendorbundle data directory,
// explain what this is and run the wizard // explain what this is and run the wizard
const auto msg = _(L("Configuration update")); MsgDataLegacy dlg;
const auto ext_msg = wxString::Format( dlg.ShowModal();
_(L(
"Slic3r PE now uses an updated configuration structure.\n\n"
"So called 'System presets' have been introduced, which hold the built-in default settings for various "
"printers. These System presets cannot be modified, instead, users now may create their"
"own presets inheriting settings from one of the System presets.\n"
"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n\n"
"Please proceed with the %s that follows to set up the new presets "
"and to choose whether to enable automatic preset updates."
)),
ConfigWizard::name()
);
wxMessageDialog dlg(NULL, msg, _(L("Configuration update")), wxOK|wxCENTRE);
dlg.SetExtendedMessage(ext_msg);
const auto res = dlg.ShowModal();
config_wizard(ConfigWizard::RR_DATA_LEGACY); config_wizard(ConfigWizard::RR_DATA_LEGACY);
return true; return true;

32
xs/src/slic3r/GUI/UpdateDialogs.cpp
View file

@ -12,6 +12,7 @@
#include "libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "GUI.hpp" #include "GUI.hpp"
#include "ConfigWizard.hpp"
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
@ -201,5 +202,36 @@ MsgDataIncompatible::MsgDataIncompatible(const std::unordered_map<std::string, w
MsgDataIncompatible::~MsgDataIncompatible() {} MsgDataIncompatible::~MsgDataIncompatible() {}
// MsgDataLegacy
MsgDataLegacy::MsgDataLegacy() :
MsgDialog(_(L("Configuration update")), _(L("Configuration update")))
{
auto *text = new wxStaticText(this, wxID_ANY, wxString::Format(
_(L(
"Slic3r PE now uses an updated configuration structure.\n\n"
"So called 'System presets' have been introduced, which hold the built-in default settings for various "
"printers. These System presets cannot be modified, instead, users now may create their "
"own presets inheriting settings from one of the System presets.\n"
"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n\n"
"Please proceed with the %s that follows to set up the new presets "
"and to choose whether to enable automatic preset updates."
)),
ConfigWizard::name()
));
text->Wrap(CONTENT_WIDTH);
content_sizer->Add(text);
content_sizer->AddSpacer(VERT_SPACING);
// TODO: Add link to wiki?
Fit();
}
MsgDataLegacy::~MsgDataLegacy() {}
} }
} }

12
xs/src/slic3r/GUI/UpdateDialogs.hpp
View file

@ -85,6 +85,18 @@ public:
~MsgDataIncompatible(); ~MsgDataIncompatible();
}; };
// Informs about a legacy data directory - an update from Slic3r PE < 1.40
class MsgDataLegacy : public MsgDialog
{
public:
MsgDataLegacy();
MsgDataLegacy(MsgDataLegacy &&) = delete;
MsgDataLegacy(const MsgDataLegacy &) = delete;
MsgDataLegacy &operator=(MsgDataLegacy &&) = delete;
MsgDataLegacy &operator=(const MsgDataLegacy &) = delete;
~MsgDataLegacy();
};
} }
} }