Skip to content

Commit 78ae6b5

Browse files
committed
calculatorwidget: icon changes
1 parent fa25e3b commit 78ae6b5

2 files changed

Lines changed: 10 additions & 23 deletions

File tree

lib/python/gladevcp/calculator.glade

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.38.2 -->
2+
<!-- Generated with glade 3.40.0 -->
33
<interface>
44
<requires lib="gtk+" version="3.24"/>
5-
<object class="GtkImage" id="backspace">
6-
<property name="visible">True</property>
7-
<property name="can-focus">False</property>
8-
<property name="icon-name">go-previous</property>
9-
</object>
105
<object class="GtkImage" id="cancel">
116
<property name="visible">True</property>
127
<property name="can-focus">False</property>
138
<property name="icon-name">gtk-cancel</property>
14-
</object>
15-
<object class="GtkImage" id="clr">
16-
<property name="visible">True</property>
17-
<property name="can-focus">False</property>
18-
<property name="icon-name">gtk-clear</property>
9+
<property name="icon_size">3</property>
1910
</object>
2011
<object class="GtkImage" id="ok">
2112
<property name="visible">True</property>
2213
<property name="can-focus">False</property>
2314
<property name="icon-name">gtk-ok</property>
24-
</object>
25-
<object class="GtkImage" id="pi">
26-
<property name="height-request">48</property>
27-
<property name="visible">True</property>
28-
<property name="can-focus">False</property>
29-
<property name="pixbuf">pi.png</property>
15+
<property name="icon_size">3</property>
3016
</object>
3117
<object class="GtkWindow" id="window_calculator">
3218
<property name="can-focus">False</property>
@@ -85,7 +71,6 @@
8571
<property name="visible">True</property>
8672
<property name="can-focus">True</property>
8773
<property name="receives-default">True</property>
88-
<property name="image">clr</property>
8974
<signal name="clicked" handler="on_CLR_clicked" swapped="no"/>
9075
</object>
9176
<packing>
@@ -108,10 +93,10 @@
10893
</child>
10994
<child>
11095
<object class="GtkButton" id="Pi">
96+
<property name="label" translatable="yes">Pi</property>
11197
<property name="visible">True</property>
11298
<property name="can-focus">True</property>
11399
<property name="receives-default">True</property>
114-
<property name="image">pi</property>
115100
<signal name="clicked" handler="on_Pi_clicked" swapped="no"/>
116101
</object>
117102
<packing>
@@ -281,7 +266,6 @@
281266
<property name="visible">True</property>
282267
<property name="can-focus">True</property>
283268
<property name="receives-default">True</property>
284-
<property name="image">backspace</property>
285269
<signal name="clicked" handler="on_Backspace_clicked" swapped="no"/>
286270
</object>
287271
<packing>
@@ -317,7 +301,6 @@
317301
</child>
318302
<child>
319303
<object class="GtkButton" id="cancel_button">
320-
<property name="label" translatable="yes">_Cancel_</property>
321304
<property name="visible">True</property>
322305
<property name="can-focus">True</property>
323306
<property name="receives-default">True</property>
@@ -332,7 +315,6 @@
332315
</child>
333316
<child>
334317
<object class="GtkButton" id="ok_button">
335-
<property name="label" translatable="yes">_Ok</property>
336318
<property name="visible">True</property>
337319
<property name="can-focus">True</property>
338320
<property name="receives-default">True</property>

lib/python/gladevcp/calculatorwidget.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ def __init__( self, *a, **kw ):
8787
self.wTree.connect_signals( dic )
8888
self.entry = self.wTree.get_object( "displayText" )
8989
self.entry.modify_font( Pango.FontDescription( self.font ) )
90+
self.wTree.get_object( "Backspace" ).set_label("\u232B")
91+
self.wTree.get_object( "Pi" ).set_label("\u03c0")
92+
self.wTree.get_object( "Pi" ).set_name("pi-symbol")
9093
self.calc_box = self.wTree.get_object( "calc_box" )
9194
self.calc_box.set_vexpand(True)
9295
self.calc_box.set_hexpand(True)
@@ -101,7 +104,9 @@ def __init__( self, *a, **kw ):
101104
self.calc_box.set_name("calc_widget")
102105
style_context = self.calc_box.get_style_context()
103106
style_context.add_provider_for_screen(screen, provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
104-
css = b"#calc_widget {font-size: 15px;}"
107+
css = b"""
108+
#calc_widget {font-size: 15px;}
109+
#pi-symbol {font-size: 18px; font-family: sans-serif;}"""
105110
provider.load_from_data(css)
106111

107112
def num_pad_only( self, value ):

0 commit comments

Comments
 (0)