Skip to content

Commit ea7538a

Browse files
committed
gmoccapy: change text to icons of undo/redo buttons to fit window size
For some translations the text for the search/replace buttons is too wide to fit the smallest window size. The result is that the window width increases in edit mode. Changing the text to icons for the undo and redo buttons gives enough space.
1 parent 9a3aa17 commit ea7538a

File tree

1 file changed

+23
-2
lines changed

1 file changed

+23
-2
lines changed

src/emc/usr_intf/gmoccapy/gmoccapy.glade

+23-2
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,18 @@
159159
<signal name="value-changed" handler="on_adj_y_pos_popup_value_changed" swapped="no"/>
160160
</object>
161161
<object class="GtkTextBuffer" id="alarm_buffer"/>
162+
<object class="GtkImage" id="edit-redo">
163+
<property name="visible">True</property>
164+
<property name="can-focus">False</property>
165+
<property name="icon-name">edit-redo</property>
166+
<property name="icon_size">5</property>
167+
</object>
168+
<object class="GtkImage" id="edit-undo">
169+
<property name="visible">True</property>
170+
<property name="can-focus">False</property>
171+
<property name="icon-name">edit-undo</property>
172+
<property name="icon_size">5</property>
173+
</object>
162174
<object class="GtkFileFilter" id="ff_file_to_load"/>
163175
<object class="GtkFileFilter" id="filefilter1"/>
164176
<object class="EMC_Action_Open" id="hal_action_open"/>
@@ -1807,14 +1819,18 @@
18071819
<property name="can-focus">False</property>
18081820
<child>
18091821
<object class="GtkButton" id="btn_undo">
1810-
<property name="label" translatable="yes">Undo</property>
18111822
<property name="use-action-appearance">False</property>
18121823
<property name="name">gcode_edit</property>
18131824
<property name="height-request">48</property>
18141825
<property name="visible">True</property>
18151826
<property name="can-focus">False</property>
18161827
<property name="receives-default">False</property>
1828+
<property name="tooltip-text" translatable="yes">Undo</property>
18171829
<property name="valign">center</property>
1830+
<property name="margin-start">2</property>
1831+
<property name="margin-end">2</property>
1832+
<property name="image">edit-undo</property>
1833+
<property name="image-position">top</property>
18181834
<signal name="clicked" handler="on_btn_undo_clicked" swapped="no"/>
18191835
</object>
18201836
<packing>
@@ -1879,6 +1895,7 @@
18791895
<property name="visible">True</property>
18801896
<property name="can-focus">True</property>
18811897
<property name="valign">center</property>
1898+
<property name="hexpand">True</property>
18821899
<property name="invisible-char">●</property>
18831900
<property name="primary-icon-activatable">False</property>
18841901
<property name="secondary-icon-activatable">False</property>
@@ -1917,6 +1934,7 @@
19171934
<property name="visible">True</property>
19181935
<property name="can-focus">True</property>
19191936
<property name="valign">center</property>
1937+
<property name="hexpand">True</property>
19201938
<property name="invisible-char">●</property>
19211939
<property name="primary-icon-activatable">False</property>
19221940
<property name="secondary-icon-activatable">False</property>
@@ -2014,14 +2032,17 @@
20142032
</child>
20152033
<child>
20162034
<object class="GtkButton" id="btn_redo">
2017-
<property name="label" translatable="yes">Redo</property>
20182035
<property name="use-action-appearance">False</property>
20192036
<property name="name">gcode_edit</property>
20202037
<property name="height-request">48</property>
20212038
<property name="visible">True</property>
20222039
<property name="can-focus">False</property>
20232040
<property name="receives-default">False</property>
2041+
<property name="tooltip-text" translatable="yes">Redo</property>
20242042
<property name="valign">center</property>
2043+
<property name="margin-start">2</property>
2044+
<property name="margin-end">2</property>
2045+
<property name="image">edit-redo</property>
20252046
<signal name="clicked" handler="on_btn_redo_clicked" swapped="no"/>
20262047
</object>
20272048
<packing>

0 commit comments

Comments
 (0)