[gcalctool] Use icons for undo and clear buttons as the translations cause them to be oversized in some language
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcalctool] Use icons for undo and clear buttons as the translations cause them to be oversized in some language
- Date: Tue, 19 Oct 2010 23:27:51 +0000 (UTC)
commit 78a309b0d2122724a1b07576c0b5bb5ffbba1a69
Author: Robert Ancell <robert ancell canonical com>
Date: Wed Oct 20 10:27:21 2010 +1100
Use icons for undo and clear buttons as the translations cause them to be oversized in some languages
NEWS | 2 +
data/buttons-advanced.ui | 111 +++++++++++++++++++++++-------------------
data/buttons-basic.ui | 25 +++++++---
data/buttons-financial.ui | 91 ++++++++++++++++++++---------------
data/buttons-programming.ui | 34 ++++++++-----
5 files changed, 152 insertions(+), 111 deletions(-)
---
diff --git a/NEWS b/NEWS
index d8dfdb6..4452087 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ Overview of changes in gcalctool 5.91.2
* Fix broken thousands separators code (Bug #628908)
* Don't make window resizable, it is not supposed to be
+ * Use icons for undo and clear buttons as the translations cause them to be
+ oversized in some languages
Overview of changes in gcalctool 5.91.1
diff --git a/data/buttons-advanced.ui b/data/buttons-advanced.ui
index bf056a5..691c4be 100644
--- a/data/buttons-advanced.ui
+++ b/data/buttons-advanced.ui
@@ -64,7 +64,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the inverse button">Inverse</property>
</object>
</child>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
<child>
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
@@ -96,7 +96,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the factorize button">Factorize</property>
</object>
</child>
- <signal name="clicked" handler="factorize_cb" swapped="no"/>
+ <signal name="clicked" handler="factorize_cb"/>
</object>
<packing>
<property name="left_attach">5</property>
@@ -118,7 +118,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the factorial button">Factorial</property>
</object>
</child>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
<child>
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
@@ -144,7 +144,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">7</property>
@@ -162,7 +162,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
<child>
<object class="GtkLabel" id="imaginary_label">
<property name="visible">True</property>
@@ -188,7 +188,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="digit_cb" swapped="no"/>
+ <signal name="clicked" handler="digit_cb"/>
</object>
<packing>
<property name="top_attach">2</property>
@@ -205,7 +205,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="digit_cb" swapped="no"/>
+ <signal name="clicked" handler="digit_cb"/>
</object>
<packing>
<property name="top_attach">1</property>
@@ -222,7 +222,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="digit_cb" swapped="no"/>
+ <signal name="clicked" handler="digit_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -241,7 +241,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="digit_cb" swapped="no"/>
+ <signal name="clicked" handler="digit_cb"/>
</object>
<packing>
<property name="left_attach">2</property>
@@ -260,7 +260,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="digit_cb" swapped="no"/>
+ <signal name="clicked" handler="digit_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -279,7 +279,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="digit_cb" swapped="no"/>
+ <signal name="clicked" handler="digit_cb"/>
</object>
<packing>
<property name="left_attach">2</property>
@@ -298,7 +298,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">3</property>
@@ -317,7 +317,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="digit_cb" swapped="no"/>
+ <signal name="clicked" handler="digit_cb"/>
</object>
<packing>
<property name="top_attach">3</property>
@@ -334,7 +334,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="digit_cb" swapped="no"/>
+ <signal name="clicked" handler="digit_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -348,12 +348,13 @@
<child>
<object class="GtkButton" id="calc_0_button">
<property name="label">0</property>
+ <property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="digit_cb" swapped="no"/>
+ <signal name="clicked" handler="digit_cb"/>
</object>
<packing>
<property name="top_attach">4</property>
@@ -370,7 +371,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="numeric_point_cb" swapped="no"/>
+ <signal name="clicked" handler="numeric_point_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -389,7 +390,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="digit_cb" swapped="no"/>
+ <signal name="clicked" handler="digit_cb"/>
</object>
<packing>
<property name="left_attach">2</property>
@@ -408,7 +409,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">3</property>
@@ -427,7 +428,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="subtract_cb" swapped="no"/>
+ <signal name="clicked" handler="subtract_cb"/>
</object>
<packing>
<property name="left_attach">3</property>
@@ -446,7 +447,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">3</property>
@@ -465,7 +466,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="solve_cb" swapped="no"/>
+ <signal name="clicked" handler="solve_cb"/>
</object>
<packing>
<property name="left_attach">4</property>
@@ -478,13 +479,18 @@
</child>
<child>
<object class="GtkButton" id="calc_clear_button">
- <property name="label" translatable="yes" comments="Label on the clear display button">Clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="clear_cb" swapped="no"/>
+ <signal name="clicked" handler="clear_cb"/>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">5</property>
@@ -504,7 +510,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the subscript mode button">Subscript</property>
</object>
</child>
- <signal name="clicked" handler="set_subscript_cb" swapped="no"/>
+ <signal name="clicked" handler="set_subscript_cb"/>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
@@ -529,7 +535,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the superscript mode button">Superscript</property>
</object>
</child>
- <signal name="clicked" handler="set_superscript_cb" swapped="no"/>
+ <signal name="clicked" handler="set_superscript_cb"/>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
@@ -557,7 +563,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the scientific exponent button">Scientific Exponent</property>
</object>
</child>
- <signal name="clicked" handler="exponent_cb" swapped="no"/>
+ <signal name="clicked" handler="exponent_cb"/>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
@@ -581,7 +587,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">3</property>
@@ -598,7 +604,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">4</property>
@@ -617,7 +623,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">5</property>
@@ -639,7 +645,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the recall value button">Recall</property>
</object>
</child>
- <signal name="clicked" handler="recall_cb" swapped="no"/>
+ <signal name="clicked" handler="recall_cb"/>
<child>
<object class="GtkHBox" id="hbox19">
<property name="visible">True</property>
@@ -685,7 +691,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the store value button">Store</property>
</object>
</child>
- <signal name="clicked" handler="store_cb" swapped="no"/>
+ <signal name="clicked" handler="store_cb"/>
<child>
<object class="GtkHBox" id="hbox20">
<property name="visible">True</property>
@@ -732,7 +738,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the absolute value button">Absolute Value</property>
</object>
</child>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
@@ -758,7 +764,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">6</property>
@@ -777,7 +783,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">8</property>
@@ -796,7 +802,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">9</property>
@@ -815,7 +821,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">9</property>
@@ -833,7 +839,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">8</property>
@@ -855,7 +861,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the exponentiation (x to the power of y) button">Exponent</property>
</object>
</child>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
<child>
<object class="GtkLabel" id="x_pow_y_label">
<property name="visible">True</property>
@@ -881,7 +887,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">7</property>
@@ -894,13 +900,18 @@
</child>
<child>
<object class="GtkButton" id="calc_undo_button">
- <property name="label" translatable="yes" comments="Label on the undo button">Undo</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="undo_cb" swapped="no"/>
+ <signal name="clicked" handler="undo_cb"/>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-undo</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">4</property>
@@ -916,7 +927,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
<child>
<object class="GtkLabel" id="pi_label">
<property name="visible">True</property>
@@ -941,7 +952,7 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
<child>
<object class="GtkLabel" id="eulers_number_label">
<property name="visible">True</property>
@@ -972,7 +983,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
@@ -986,7 +997,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1002,7 +1013,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1018,7 +1029,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="top_attach">1</property>
@@ -1034,7 +1045,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1052,7 +1063,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="button_cb" swapped="no"/>
+ <signal name="clicked" handler="button_cb"/>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1081,7 +1092,7 @@
<property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the store value button">Store</property>
</object>
</child>
- <signal name="clicked" handler="function_cb" swapped="no"/>
+ <signal name="clicked" handler="function_cb"/>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
diff --git a/data/buttons-basic.ui b/data/buttons-basic.ui
index c9c74fa..6a4b69f 100644
--- a/data/buttons-basic.ui
+++ b/data/buttons-basic.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
@@ -115,7 +115,7 @@
</child>
<child>
<object class="GtkButton" id="calc_divide_button">
- <property name="label">÷</property>
+ <property name="label">÷</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -169,6 +169,7 @@
<child>
<object class="GtkButton" id="calc_0_button">
<property name="label">0</property>
+ <property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -242,7 +243,7 @@
</child>
<child>
<object class="GtkButton" id="calc_multiply_button">
- <property name="label">×</property>
+ <property name="label">Ã?</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -261,7 +262,7 @@
</child>
<child>
<object class="GtkButton" id="calc_subtract_button">
- <property name="label">−</property>
+ <property name="label">â??</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -356,13 +357,18 @@
</child>
<child>
<object class="GtkButton" id="calc_clear_button">
- <property name="label" translatable="yes" comments="Label on the clear display button">Clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
<signal name="clicked" handler="clear_cb"/>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">5</property>
@@ -373,7 +379,7 @@
</child>
<child>
<object class="GtkButton" id="calc_square_root_button">
- <property name="label">√</property>
+ <property name="label">â??</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -421,13 +427,18 @@
</child>
<child>
<object class="GtkButton" id="calc_undo_button">
- <property name="label" translatable="yes" comments="Label on the undo button">Undo</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
<signal name="clicked" handler="undo_cb"/>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-undo</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">4</property>
diff --git a/data/buttons-financial.ui b/data/buttons-financial.ui
index 4ccd6c5..ea6eab5 100644
--- a/data/buttons-financial.ui
+++ b/data/buttons-financial.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
@@ -54,7 +54,7 @@
<object class="GtkLabel" id="currency_label">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" comments="Example content">$100 = €120</property>
+ <property name="label" comments="Example content">$100 = â?¬120</property>
<child internal-child="accessible">
<object class="AtkObject" id="currency_label-atkobject">
<property name="AtkObject::accessible-name">currency_label</property>
@@ -97,7 +97,7 @@
<child>
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The label on the memory store button">→ R</property>
+ <property name="label" translatable="yes" comments="The label on the memory store button">â?? R</property>
</object>
<packing>
<property name="position">0</property>
@@ -144,7 +144,7 @@
<child>
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The label on the memory recall button">← R</property>
+ <property name="label" translatable="yes" comments="The label on the memory recall button">â?? R</property>
</object>
<packing>
<property name="position">0</property>
@@ -296,7 +296,7 @@
</child>
<child>
<object class="GtkButton" id="calc_divide_button">
- <property name="label">÷</property>
+ <property name="label">÷</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -350,6 +350,7 @@
<child>
<object class="GtkButton" id="calc_0_button">
<property name="label">0</property>
+ <property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -423,7 +424,7 @@
</child>
<child>
<object class="GtkButton" id="calc_multiply_button">
- <property name="label">×</property>
+ <property name="label">Ã?</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -442,7 +443,7 @@
</child>
<child>
<object class="GtkButton" id="calc_subtract_button">
- <property name="label">−</property>
+ <property name="label">â??</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -537,13 +538,18 @@
</child>
<child>
<object class="GtkButton" id="calc_clear_button">
- <property name="label" translatable="yes" comments="Label on the clear display button">Clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
<signal name="clicked" handler="clear_cb"/>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">5</property>
@@ -738,12 +744,17 @@
</child>
<child>
<object class="GtkButton" id="calc_undo_button">
- <property name="label" translatable="yes" comments="Label on the clear display button">Undo</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-undo</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">4</property>
@@ -781,7 +792,7 @@
</child>
<child>
<object class="GtkButton" id="calc_root_button">
- <property name="label">√</property>
+ <property name="label">â??</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -836,7 +847,7 @@
<object class="GtkEntry" id="ctrm_pint">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -852,7 +863,7 @@
<object class="GtkEntry" id="ctrm_fv">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -868,7 +879,7 @@
<object class="GtkEntry" id="ctrm_pv">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1053,7 +1064,7 @@
<object class="GtkEntry" id="ddb_life">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1069,7 +1080,7 @@
<object class="GtkEntry" id="ddb_cost">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1100,7 +1111,7 @@
<object class="GtkEntry" id="ddb_period">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1243,7 +1254,7 @@
<object class="GtkEntry" id="fv_n">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1259,7 +1270,7 @@
<object class="GtkEntry" id="fv_pint">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1275,7 +1286,7 @@
<object class="GtkEntry" id="fv_pmt">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1402,7 +1413,7 @@
<object class="GtkEntry" id="gpm_cost">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1418,7 +1429,7 @@
<object class="GtkEntry" id="gpm_margin">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1562,7 +1573,7 @@
<object class="GtkEntry" id="pmt_prin">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1578,7 +1589,7 @@
<object class="GtkEntry" id="pmt_pint">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1594,7 +1605,7 @@
<object class="GtkEntry" id="pmt_n">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1738,7 +1749,7 @@
<object class="GtkEntry" id="pv_pmt">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1754,7 +1765,7 @@
<object class="GtkEntry" id="pv_pint">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1770,7 +1781,7 @@
<object class="GtkEntry" id="pv_n">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1914,7 +1925,7 @@
<object class="GtkEntry" id="rate_fv">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1930,7 +1941,7 @@
<object class="GtkEntry" id="rate_pv">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -1946,7 +1957,7 @@
<object class="GtkEntry" id="rate_n">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -2077,7 +2088,7 @@
<object class="GtkEntry" id="sln_life">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -2093,7 +2104,7 @@
<object class="GtkEntry" id="sln_salvage">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -2109,7 +2120,7 @@
<object class="GtkEntry" id="sln_cost">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -2268,7 +2279,7 @@
<object class="GtkEntry" id="syd_cost">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -2284,7 +2295,7 @@
<object class="GtkEntry" id="syd_salvage">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -2300,7 +2311,7 @@
<object class="GtkEntry" id="syd_life">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -2316,7 +2327,7 @@
<object class="GtkEntry" id="syd_period">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -2415,7 +2426,7 @@
<object class="GtkEntry" id="term_pint">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -2431,7 +2442,7 @@
<object class="GtkEntry" id="term_fv">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
@@ -2447,7 +2458,7 @@
<object class="GtkEntry" id="term_pmt">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<property name="text">0</property>
<signal name="activate" handler="finc_activate_cb"/>
</object>
diff --git a/data/buttons-programming.ui b/data/buttons-programming.ui
index e42607c..8e74b51 100644
--- a/data/buttons-programming.ui
+++ b/data/buttons-programming.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
@@ -25,7 +25,7 @@
<object class="GtkLabel" id="base_label">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" comments="Example content">FF₁₆ 256₁₀</property>
+ <property name="label" comments="Example content">FFâ??â?? 256â??â??</property>
</object>
<packing>
<property name="position">1</property>
@@ -1843,7 +1843,7 @@
<property name="homogeneous">True</property>
<child>
<object class="GtkButton" id="calc_root_button">
- <property name="label">√</property>
+ <property name="label">â??</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1991,7 +1991,7 @@
</child>
<child>
<object class="GtkButton" id="calc_divide_button">
- <property name="label">÷</property>
+ <property name="label">÷</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2011,6 +2011,7 @@
<child>
<object class="GtkButton" id="calc_0_button">
<property name="label">0</property>
+ <property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2027,7 +2028,7 @@
</child>
<child>
<object class="GtkButton" id="calc_multiply_button">
- <property name="label">×</property>
+ <property name="label">Ã?</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2046,7 +2047,7 @@
</child>
<child>
<object class="GtkButton" id="calc_subtract_button">
- <property name="label">−</property>
+ <property name="label">â??</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2103,13 +2104,18 @@
</child>
<child>
<object class="GtkButton" id="calc_clear_button">
- <property name="label" translatable="yes" comments="Label on the clear display button">Clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
<signal name="clicked" handler="clear_cb"/>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">6</property>
@@ -2414,7 +2420,7 @@
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label">↓n</property>
+ <property name="label">â??n</property>
<property name="use_markup">True</property>
</object>
</child>
@@ -2439,7 +2445,7 @@
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="label">↑n</property>
+ <property name="label">â??n</property>
<property name="use_markup">True</property>
</object>
</child>
@@ -2470,7 +2476,7 @@
<child>
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The label on the memory recall button">← R</property>
+ <property name="label" translatable="yes" comments="The label on the memory recall button">â?? R</property>
</object>
<packing>
<property name="position">0</property>
@@ -2515,7 +2521,7 @@
<child>
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The label on the memory store button">→ R</property>
+ <property name="label" translatable="yes" comments="The label on the memory store button">â?? R</property>
</object>
<packing>
<property name="position">0</property>
@@ -2745,7 +2751,7 @@
</child>
<child>
<object class="GtkButton" id="calc_character_button">
- <property name="label">á</property>
+ <property name="label">á</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2827,7 +2833,7 @@
<child>
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
- <property name="label"><i>x</i><sup>−1</sup></property>
+ <property name="label"><i>x</i><sup>â??1</sup></property>
<property name="use_markup">True</property>
<property name="justify">center</property>
</object>
@@ -2971,7 +2977,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">1</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
<signal name="activate" handler="character_code_dialog_activate_cb"/>
</object>
<packing>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
