GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-18 02:25:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Store activ font style

Browse Source
This commit is contained in:
Filip Sykala 2022-02-21 09:00:03 +01:00
parent 7c95f8f9aa
commit 233ea5e0d8
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libslic3r/TextConfiguration.hpp
View File

@ -9,6 +9,7 @@ namespace Slic3r {
/// <summary> /// <summary>
/// User modifiable property of text style /// User modifiable property of text style
/// NOTE: OnEdit fix serializations: FontListSerializable, TextConfigurationSerialization
/// </summary> /// </summary>
struct FontProp struct FontProp
{ {

33
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -572,12 +572,12 @@ void GLGizmoEmboss::initialize()
assert(success); assert(success);
const AppConfig *app_cfg = wxGetApp().app_config; const AppConfig *app_cfg = wxGetApp().app_config;
FontList font_list = load_font_list_from_app_config(app_cfg); size_t activ_index = -1;
FontList font_list = load_font_list_from_app_config(app_cfg, activ_index);
fill_stored_font_items(font_list); fill_stored_font_items(font_list);
m_font_manager.add_fonts(font_list); m_font_manager.add_fonts(font_list);
// TODO: select last session sellected font index if (!m_font_manager.load_font(activ_index) &&
!m_font_manager.load_first_valid_font()) {
if (!m_font_manager.load_first_valid_font()) {
m_font_manager.add_fonts(create_default_font_list()); m_font_manager.add_fonts(create_default_font_list());
// TODO: What to do when default fonts are not loadable? // TODO: What to do when default fonts are not loadable?
bool success = m_font_manager.load_first_valid_font(); bool success = m_font_manager.load_first_valid_font();
@ -2059,7 +2059,8 @@ bool GLGizmoEmboss::draw_button(IconType icon, bool disable)
); );
} }
FontList GLGizmoEmboss::load_font_list_from_app_config(const AppConfig *cfg) static std::string APP_CONFIG_ACTIVE_FONT = "activ_font";
FontList GLGizmoEmboss::load_font_list_from_app_config(const AppConfig *cfg, size_t &activ_font_index)
{ {
FontList result; FontList result;
unsigned index = 1; unsigned index = 1;
@ -2071,6 +2072,19 @@ FontList GLGizmoEmboss::load_font_list_from_app_config(const AppConfig *cfg)
} }
if (result.empty()) if (result.empty())
return create_default_font_list(); return create_default_font_list();
// read selected (activ) font
if (cfg->has_section(AppConfig::SECTION_FONT)) {
auto section = cfg->get_section(AppConfig::SECTION_FONT);
auto it = section.find(APP_CONFIG_ACTIVE_FONT);
if (it != section.end()) {
size_t active_font = static_cast<size_t>(std::atoi(it->second.c_str()));
if (active_font > 0 && active_font <= result.size()) {
// stored index start from 1 (readablity in config file)
activ_font_index = active_font - 1;
}
}
}
return result; return result;
} }
@ -2079,6 +2093,14 @@ void GLGizmoEmboss::store_font_list_to_app_config()
AppConfig *cfg = wxGetApp().app_config; AppConfig *cfg = wxGetApp().app_config;
unsigned index = 1; unsigned index = 1;
const auto& fonts = m_font_manager.get_fonts(); const auto& fonts = m_font_manager.get_fonts();
// store actual font index
size_t activ_index = &m_font_manager.get_font() - &fonts.front();
cfg->clear_section(AppConfig::SECTION_FONT);
// activ font first index is +1 to correspond with section name
std::string activ_font = std::to_string(activ_index + 1);
cfg->set(AppConfig::SECTION_FONT, APP_CONFIG_ACTIVE_FONT, activ_font);
FontList font_list; FontList font_list;
font_list.reserve(fonts.size()); font_list.reserve(fonts.size());
for (const auto& item : fonts) { for (const auto& item : fonts) {
@ -2096,6 +2118,7 @@ void GLGizmoEmboss::store_font_list_to_app_config()
cfg->clear_section(section_name); cfg->clear_section(section_name);
section_name = FontListSerializable::create_section_name(++index); section_name = FontListSerializable::create_section_name(++index);
} }
cfg->save();
} }
//void GLGizmoEmboss::store_font_item_to_app_config() const //void GLGizmoEmboss::store_font_item_to_app_config() const

2
src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
View File

@ -247,7 +247,7 @@ private:
bool draw_button(IconType icon, bool disable = false); bool draw_button(IconType icon, bool disable = false);
// load / store appConfig // load / store appConfig
static FontList load_font_list_from_app_config(const AppConfig *cfg); static FontList load_font_list_from_app_config(const AppConfig *cfg, size_t &activ_font_index);
void store_font_list_to_app_config(); void store_font_list_to_app_config();
//void store_font_item_to_app_config() const; //void store_font_item_to_app_config() const;