From e22170a6ba4363fdc83413a23042f5c2d32455e1 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Wed, 18 Dec 2024 20:45:25 +0100 Subject: lettering: automated size info (#3346) --- lib/gui/lettering/main_panel.py | 3 +++ lib/gui/lettering/option_panel.py | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/lib/gui/lettering/main_panel.py b/lib/gui/lettering/main_panel.py index 06388dd0..9e0e2e7d 100644 --- a/lib/gui/lettering/main_panel.py +++ b/lib/gui/lettering/main_panel.py @@ -223,6 +223,9 @@ class LetteringPanel(wx.Panel): self.options_panel.font_description.SetLabel(description) self.options_panel.font_description.SetForegroundColour(color) self.options_panel.font_description.Wrap(self.options_panel.GetSize().width - 50) + self.options_panel.size_info.SetLabel(str(font.size)) + self.options_panel.min_scale_info.SetLabel(str(int(font.min_scale * 100))) + self.options_panel.max_scale_info.SetLabel(str(int(font.max_scale * 100))) if font.reversible: self.options_panel.back_and_forth_checkbox.Enable() diff --git a/lib/gui/lettering/option_panel.py b/lib/gui/lettering/option_panel.py index aea281ba..f7424554 100644 --- a/lib/gui/lettering/option_panel.py +++ b/lib/gui/lettering/option_panel.py @@ -18,12 +18,36 @@ class LetteringOptionsPanel(wx.Panel): self.font_description = wx.StaticText(self, wx.ID_ANY) self.panel.Bind(wx.EVT_SIZE, self.panel.resize) + font_description_sizer = wx.BoxSizer(wx.HORIZONTAL) + size_info_sizer = wx.BoxSizer(wx.HORIZONTAL) + bold_font = wx.Font(wx.FontInfo().Bold()) + size_info_label = wx.StaticText(self, wx.ID_ANY, _("Height: ")) + size_info_label.SetFont(bold_font) + self.size_info = wx.StaticText(self, wx.ID_ANY, "10") + size_info_unit = wx.StaticText(self, wx.ID_ANY, "mm") + scale_info_label = wx.StaticText(self, wx.ID_ANY, _("Scale:")) + scale_info_label.SetFont(bold_font) + self.min_scale_info = wx.StaticText(self, wx.ID_ANY, '0') + middle_scale = wx.StaticText(self, wx.ID_ANY, '% - ') + self.max_scale_info = wx.StaticText(self, wx.ID_ANY, '200') + end_scale = wx.StaticText(self, wx.ID_ANY, '%') + size_info_sizer.Add(size_info_label, 0, wx.LEFT, 0) + size_info_sizer.Add(self.size_info, 0, wx.LEFT, 0) + size_info_sizer.Add(size_info_unit, 0, wx.LEFT, 0) + size_info_sizer.Add(scale_info_label, 0, wx.LEFT, 10) + size_info_sizer.Add(self.min_scale_info, 0, wx.LEFT, 5) + size_info_sizer.Add(middle_scale, 0, wx.LEFT, 0) + size_info_sizer.Add(self.max_scale_info, 0, wx.LEFT, 0) + size_info_sizer.Add(end_scale, 0, wx.LEFT, 0) + font_description_sizer.Add(size_info_sizer, 0, wx.ALL, 0) + self.font_selector_box = wx.StaticBox(self, wx.ID_ANY, label=_("Font")) font_selector_sizer = wx.StaticBoxSizer(self.font_selector_box, wx.VERTICAL) font_selector_box = wx.BoxSizer(wx.HORIZONTAL) font_selector_box.Add(self.font_chooser, 4, wx.EXPAND | wx.TOP | wx.BOTTOM | wx.RIGHT, 10) font_selector_sizer.Add(font_selector_box, 0, wx.EXPAND | wx.LEFT | wx.TOP | wx.RIGHT, 10) font_selector_sizer.Add(self.font_description, 1, wx.EXPAND | wx.ALL, 10) + font_selector_sizer.Add(font_description_sizer, 1, wx.EXPAND | wx.ALL, 10) outer_sizer.Add(font_selector_sizer, 0, wx.EXPAND | wx.LEFT | wx.TOP | wx.RIGHT, 10) # filter font list -- cgit v1.2.3