Skip to content

Commit e9ed01a

Browse files
hansuhansu
committed
gmoccapy: add font chooser for G-code view, set default font to monospace
1 parent 7ff07b1 commit e9ed01a

2 files changed

Lines changed: 164 additions & 46 deletions

File tree

‎src/emc/usr_intf/gmoccapy/gmoccapy.glade‎

Lines changed: 137 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4743,6 +4743,7 @@ to test your settings.</property>
47434743
<property name="margin-end">3</property>
47444744
<property name="margin-top">5</property>
47454745
<property name="margin-bottom">5</property>
4746+
<property name="hexpand">False</property>
47464747
<property name="row-spacing">5</property>
47474748
<property name="column-spacing">3</property>
47484749
<child>
@@ -4761,6 +4762,7 @@ to test your settings.</property>
47614762
<object class="GtkComboBox" id="theme_choice">
47624763
<property name="visible">True</property>
47634764
<property name="can-focus">False</property>
4765+
<property name="hexpand">True</property>
47644766
<property name="model">lstst_themes</property>
47654767
<signal name="changed" handler="on_theme_choice_changed" swapped="no"/>
47664768
<child>
@@ -4810,55 +4812,139 @@ to test your settings.</property>
48104812
</packing>
48114813
</child>
48124814
<child>
4813-
<object class="GtkFileChooserButton" id="audio_error_chooser">
4815+
<object class="GtkLabel" id="lbl_sourceview_icon_themes">
48144816
<property name="visible">True</property>
48154817
<property name="can-focus">False</property>
4816-
<signal name="file-set" handler="on_change_sound" swapped="no"/>
4818+
<property name="label" translatable="yes">G-code Theme</property>
48174819
</object>
48184820
<packing>
4819-
<property name="left-attach">1</property>
4820-
<property name="top-attach">9</property>
4821+
<property name="left-attach">0</property>
4822+
<property name="top-attach">4</property>
4823+
<property name="width">2</property>
48214824
</packing>
48224825
</child>
48234826
<child>
4824-
<object class="GtkLabel" id="label27">
4827+
<object class="GtkComboBox" id="sourceview_theme_choice">
48254828
<property name="visible">True</property>
48264829
<property name="can-focus">False</property>
4827-
<property name="margin-start">3</property>
4828-
<property name="margin-end">3</property>
4829-
<property name="label" translatable="yes">Alert Audio</property>
4830-
<property name="xalign">0</property>
4830+
<property name="model">lstst_sourceview_themes</property>
4831+
<signal name="changed" handler="on_sourceview_theme_choice_changed" swapped="no"/>
4832+
<child>
4833+
<object class="GtkCellRendererText" id="cellrenderertext3"/>
4834+
<attributes>
4835+
<attribute name="text">0</attribute>
4836+
</attributes>
4837+
</child>
48314838
</object>
48324839
<packing>
48334840
<property name="left-attach">0</property>
4834-
<property name="top-attach">9</property>
4841+
<property name="top-attach">5</property>
4842+
<property name="width">2</property>
48354843
</packing>
48364844
</child>
48374845
<child>
4838-
<object class="GtkLabel" id="label25">
4846+
<object class="GtkSeparator" id="sep_themes_sound">
48394847
<property name="visible">True</property>
48404848
<property name="can-focus">False</property>
4841-
<property name="margin-start">3</property>
4842-
<property name="margin-end">3</property>
4843-
<property name="label" translatable="yes">Warning Audio</property>
4844-
<property name="xalign">0</property>
48454849
</object>
48464850
<packing>
48474851
<property name="left-attach">0</property>
4848-
<property name="top-attach">8</property>
4852+
<property name="top-attach">6</property>
4853+
<property name="width">2</property>
48494854
</packing>
48504855
</child>
48514856
<child>
4852-
<object class="GtkFileChooserButton" id="audio_alert_chooser">
4857+
<object class="GtkLabel">
48534858
<property name="visible">True</property>
48544859
<property name="can-focus">False</property>
4855-
<signal name="file-set" handler="on_change_sound" swapped="no"/>
4860+
<property name="label" translatable="yes">G-code Font</property>
48564861
</object>
48574862
<packing>
4858-
<property name="left-attach">1</property>
4863+
<property name="left-attach">0</property>
4864+
<property name="top-attach">7</property>
4865+
<property name="width">2</property>
4866+
</packing>
4867+
</child>
4868+
<child>
4869+
<object class="GtkFontButton" id="fontbutton_gcodeview">
4870+
<property name="visible">True</property>
4871+
<property name="can-focus">True</property>
4872+
<property name="receives-default">True</property>
4873+
<property name="font">Sans 12</property>
4874+
<property name="language">de-de</property>
4875+
<property name="level">GTK_FONT_CHOOSER_LEVEL_SIZE | GTK_FONT_CHOOSER_LEVEL_FAMILY</property>
4876+
<property name="preview-text">N1200 G1 X4.05 Y3.725 F240 S3500 M3</property>
4877+
<signal name="font-set" handler="on_fontbutton_gcodeview_font_set" swapped="no"/>
4878+
</object>
4879+
<packing>
4880+
<property name="left-attach">0</property>
48594881
<property name="top-attach">8</property>
4882+
<property name="width">2</property>
48604883
</packing>
48614884
</child>
4885+
<child>
4886+
<object class="GtkCheckButton" id="chk_font_monospace">
4887+
<property name="label" translatable="yes">Monospace</property>
4888+
<property name="visible">True</property>
4889+
<property name="can-focus">True</property>
4890+
<property name="receives-default">False</property>
4891+
<property name="active">True</property>
4892+
<property name="draw-indicator">True</property>
4893+
<signal name="toggled" handler="on_chk_font_monospace_toggled" swapped="no"/>
4894+
</object>
4895+
<packing>
4896+
<property name="left-attach">0</property>
4897+
<property name="top-attach">9</property>
4898+
</packing>
4899+
</child>
4900+
<child>
4901+
<object class="GtkCheckButton" id="chk_font_regular">
4902+
<property name="label" translatable="yes">Regular/Medium</property>
4903+
<property name="visible">True</property>
4904+
<property name="can-focus">True</property>
4905+
<property name="receives-default">False</property>
4906+
<property name="active">True</property>
4907+
<property name="draw-indicator">True</property>
4908+
<signal name="toggled" handler="on_chk_font_regular_toggled" swapped="no"/>
4909+
</object>
4910+
<packing>
4911+
<property name="left-attach">1</property>
4912+
<property name="top-attach">9</property>
4913+
</packing>
4914+
</child>
4915+
</object>
4916+
</child>
4917+
<child type="label">
4918+
<object class="GtkLabel" id="lbl_frm_themes">
4919+
<property name="visible">True</property>
4920+
<property name="can-focus">False</property>
4921+
<property name="label" translatable="yes">&lt;b&gt;Themes&lt;/b&gt;</property>
4922+
<property name="use-markup">True</property>
4923+
</object>
4924+
</child>
4925+
</object>
4926+
<packing>
4927+
<property name="expand">False</property>
4928+
<property name="fill">False</property>
4929+
<property name="position">1</property>
4930+
</packing>
4931+
</child>
4932+
<child>
4933+
<object class="GtkFrame" id="frm_gcodeview_font">
4934+
<property name="visible">True</property>
4935+
<property name="can-focus">False</property>
4936+
<property name="label-xalign">0.5</property>
4937+
<child>
4938+
<!-- n-columns=2 n-rows=3 -->
4939+
<object class="GtkGrid" id="grid_sound">
4940+
<property name="visible">True</property>
4941+
<property name="can-focus">False</property>
4942+
<property name="margin-start">3</property>
4943+
<property name="margin-end">3</property>
4944+
<property name="margin-top">3</property>
4945+
<property name="margin-bottom">3</property>
4946+
<property name="row-spacing">3</property>
4947+
<property name="column-spacing">3</property>
48624948
<child>
48634949
<object class="GtkCheckButton" id="chk_en_audio">
48644950
<property name="label" translatable="yes">Enable sound</property>
@@ -4870,72 +4956,77 @@ to test your settings.</property>
48704956
</object>
48714957
<packing>
48724958
<property name="left-attach">0</property>
4873-
<property name="top-attach">7</property>
4959+
<property name="top-attach">0</property>
48744960
<property name="width">2</property>
48754961
</packing>
48764962
</child>
48774963
<child>
4878-
<object class="GtkLabel" id="lbl_sourceview_icon_themes">
4964+
<object class="GtkLabel" id="label25">
48794965
<property name="visible">True</property>
48804966
<property name="can-focus">False</property>
4881-
<property name="label" translatable="yes">G-code Theme</property>
4967+
<property name="margin-start">3</property>
4968+
<property name="margin-end">3</property>
4969+
<property name="label" translatable="yes">Warning Audio</property>
4970+
<property name="xalign">0</property>
48824971
</object>
48834972
<packing>
48844973
<property name="left-attach">0</property>
4885-
<property name="top-attach">4</property>
4886-
<property name="width">2</property>
4974+
<property name="top-attach">1</property>
48874975
</packing>
48884976
</child>
48894977
<child>
4890-
<object class="GtkComboBox" id="sourceview_theme_choice">
4978+
<object class="GtkFileChooserButton" id="audio_alert_chooser">
48914979
<property name="visible">True</property>
48924980
<property name="can-focus">False</property>
4893-
<property name="model">lstst_sourceview_themes</property>
4894-
<signal name="changed" handler="on_sourceview_theme_choice_changed" swapped="no"/>
4895-
<child>
4896-
<object class="GtkCellRendererText" id="cellrenderertext3"/>
4897-
<attributes>
4898-
<attribute name="text">0</attribute>
4899-
</attributes>
4900-
</child>
4981+
<signal name="file-set" handler="on_change_sound" swapped="no"/>
49014982
</object>
49024983
<packing>
4903-
<property name="left-attach">0</property>
4904-
<property name="top-attach">5</property>
4905-
<property name="width">2</property>
4984+
<property name="left-attach">1</property>
4985+
<property name="top-attach">1</property>
49064986
</packing>
49074987
</child>
49084988
<child>
4909-
<object class="GtkSeparator" id="sep_themes_sound">
4989+
<object class="GtkLabel" id="label27">
49104990
<property name="visible">True</property>
49114991
<property name="can-focus">False</property>
4992+
<property name="margin-start">3</property>
4993+
<property name="margin-end">3</property>
4994+
<property name="label" translatable="yes">Alert Audio</property>
4995+
<property name="xalign">0</property>
49124996
</object>
49134997
<packing>
49144998
<property name="left-attach">0</property>
4915-
<property name="top-attach">6</property>
4916-
<property name="width">2</property>
4999+
<property name="top-attach">2</property>
5000+
</packing>
5001+
</child>
5002+
<child>
5003+
<object class="GtkFileChooserButton" id="audio_error_chooser">
5004+
<property name="visible">True</property>
5005+
<property name="can-focus">False</property>
5006+
<signal name="file-set" handler="on_change_sound" swapped="no"/>
5007+
</object>
5008+
<packing>
5009+
<property name="left-attach">1</property>
5010+
<property name="top-attach">2</property>
49175011
</packing>
49185012
</child>
49195013
</object>
49205014
</child>
49215015
<child type="label">
4922-
<object class="GtkLabel" id="lbl_frm_themes">
5016+
<object class="GtkLabel">
49235017
<property name="visible">True</property>
49245018
<property name="can-focus">False</property>
4925-
<property name="label" translatable="yes">&lt;b&gt;Themes and sound&lt;/b&gt;</property>
5019+
<property name="label" translatable="yes">&lt;b&gt;Sound&lt;/b&gt;</property>
49265020
<property name="use-markup">True</property>
49275021
</object>
49285022
</child>
49295023
</object>
49305024
<packing>
49315025
<property name="expand">False</property>
4932-
<property name="fill">False</property>
4933-
<property name="position">1</property>
5026+
<property name="fill">True</property>
5027+
<property name="position">2</property>
49345028
</packing>
49355029
</child>
4936-
<child>
4937-
<placeholder/>
4938-
</child>
49395030
</object>
49405031
<packing>
49415032
<property name="expand">False</property>

0 commit comments

Comments
 (0)