mirror
/
inkstitch
kopia lustrzana https://github.com/inkstitch/inkstitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

lettering: add scale info in mm (#3366)

pull/3371/head
Kaalleen 2024-12-26 05:39:49 +01:00 zatwierdzone przez GitHub
rodzic 9bae24a79a
commit 1253544ea0
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
2 zmienionych plików z 6 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
lib/gui/lettering/main_panel.py
Wyświetl plik

@ -224,8 +224,8 @@ class LetteringPanel(wx.Panel):
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)))
self.options_panel.scale_info_percent.SetLabel(f'{int(font.min_scale * 100)}% - {int(font.max_scale * 100)}%')
self.options_panel.scale_info_mm.SetLabel(f' ({round(font.size * font.min_scale, 2)}mm - {round(font.size * font.max_scale, 2)}mm)')
if font.reversible:
self.options_panel.back_and_forth_checkbox.Enable()

12
lib/gui/lettering/option_panel.py
Wyświetl plik

@ -27,18 +27,14 @@ class LetteringOptionsPanel(wx.Panel):
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, '%')
self.scale_info_percent = wx.StaticText(self, wx.ID_ANY, '0% - 200%')
self.scale_info_mm = wx.StaticText(self, wx.ID_ANY, ' (10mm - 100mm)')
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)
size_info_sizer.Add(self.scale_info_percent, 0, wx.LEFT, 5)
size_info_sizer.Add(self.scale_info_mm, 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"))