From 6b24c91d3aa81fdb99500c8c2c12f830fabaefb6 Mon Sep 17 00:00:00 2001
From: Steve Zesch <stevezesch2@gmail.com>
Date: Sat, 24 Nov 2012 20:44:45 -0500
Subject: Update codebase.

---
 data/buttons-programming.ui | 74 ++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 48 deletions(-)

(limited to 'data/buttons-programming.ui')

diff --git a/data/buttons-programming.ui b/data/buttons-programming.ui
index 374c5c1..ee56c80 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&#x2081;&#x2086; 256&#x2081;&#x2080;</property>
+                <property name="label" comments="Example content">FF₁₆ 256₁₀</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -33,6 +33,7 @@
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -1842,7 +1843,7 @@
             <property name="homogeneous">True</property>
             <child>
               <object class="GtkButton" id="calc_root_button">
-                <property name="label">&#x221A;</property>
+                <property name="label">√</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -1990,7 +1991,7 @@
             </child>
             <child>
               <object class="GtkButton" id="calc_divide_button">
-                <property name="label">&#xF7;</property>
+                <property name="label">÷</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -2010,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>
@@ -2026,7 +2028,7 @@
             </child>
             <child>
               <object class="GtkButton" id="calc_multiply_button">
-                <property name="label">&#xD7;</property>
+                <property name="label">×</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -2045,7 +2047,7 @@
             </child>
             <child>
               <object class="GtkButton" id="calc_subtract_button">
-                <property name="label">&#x2212;</property>
+                <property name="label">−</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -2102,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="icon-name">edit-clear-symbolic</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">6</property>
@@ -2413,7 +2420,7 @@
                 <child>
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
-                    <property name="label">&#x2193;n</property>
+                    <property name="label">↓n</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -2438,7 +2445,7 @@
                 <child>
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
-                    <property name="label">&#x2191;n</property>
+                    <property name="label">↑n</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -2451,42 +2458,14 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="calc_recall_button">
+              <object class="GtkButton" id="calc_numeric_point_button">
+                <property name="label" comments="Label is set in gtk.c to comply with LC flags">.</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 internal-child="accessible">
-                  <object class="AtkObject" id="calc_recall_button-atkobject">
-                    <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"/>
-                <child>
-                  <object class="GtkHBox" id="hbox19">
-                    <property name="visible">True</property>
-                    <property name="spacing">3</property>
-                    <child>
-                      <object class="GtkLabel" id="label22">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes" comments="The label on the memory recall button">&#x2190; R</property>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkArrow" id="arrow13">
-                        <property name="visible">True</property>
-                        <property name="arrow_type">down</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
+                <signal name="clicked" handler="numeric_point_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">2</property>
@@ -2496,7 +2475,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="calc_store_button">
+              <object class="GtkButton" id="calc_memory_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -2506,7 +2485,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"/>
+                <signal name="clicked" handler="memory_cb"/>
                 <child>
                   <object class="GtkHBox" id="hbox20">
                     <property name="visible">True</property>
@@ -2514,7 +2493,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">&#x2192; R</property>
+                        <property name="label" translatable="yes" comments="The label on the memory button">x</property>
                       </object>
                       <packing>
                         <property name="position">0</property>
@@ -2744,7 +2723,7 @@
             </child>
             <child>
               <object class="GtkButton" id="calc_character_button">
-                <property name="label">&#xE1;</property>
+                <property name="label">á</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -2826,7 +2805,7 @@
                 <child>
                   <object class="GtkLabel" id="label20">
                     <property name="visible">True</property>
-                    <property name="label">&lt;i&gt;x&lt;/i&gt;&lt;sup&gt;&#x2212;1&lt;/sup&gt;</property>
+                    <property name="label">&lt;i&gt;x&lt;/i&gt;&lt;sup&gt;−1&lt;/sup&gt;</property>
                     <property name="use_markup">True</property>
                     <property name="justify">center</property>
                   </object>
@@ -2943,7 +2922,6 @@
     <property name="title" translatable="yes" comments="Title of insert character code dialog">Insert Character Code</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <signal name="response" handler="character_code_dialog_response_cb"/>
     <signal name="delete_event" handler="character_code_dialog_delete_cb"/>
     <child internal-child="vbox">
@@ -2971,7 +2949,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">1</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
                 <signal name="activate" handler="character_code_dialog_activate_cb"/>
               </object>
               <packing>
-- 
cgit v1.2.1