r23325 - gnucash/trunk/src/gnome-utils - Add a field to the commodity editor allowing setting the user symbol.

Geert Janssens gjanssens at code.gnucash.org
Thu Oct 24 08:28:58 EDT 2013


Author: gjanssens
Date: 2013-10-24 08:28:57 -0400 (Thu, 24 Oct 2013)
New Revision: 23325
Trac: http://svn.gnucash.org/trac/changeset/23325

Modified:
   gnucash/trunk/src/gnome-utils/dialog-commodity.c
   gnucash/trunk/src/gnome-utils/dialog-commodity.h
   gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.h
   gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c
   gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-commodity.glade
Log:
Add a field to the commodity editor allowing setting the user symbol.

Author:    Frédéric Perrin <frederic.perrin at resel.fr>

Modified: gnucash/trunk/src/gnome-utils/dialog-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-commodity.c	2013-10-24 12:28:30 UTC (rev 23324)
+++ gnucash/trunk/src/gnome-utils/dialog-commodity.c	2013-10-24 12:28:57 UTC (rev 23325)
@@ -71,6 +71,7 @@
     const char * default_cusip;
     const char * default_fullname;
     const char * default_mnemonic;
+    const char * default_user_symbol;
     int          default_fraction;
 };
 
@@ -80,6 +81,7 @@
     GtkWidget * table;
     GtkWidget * fullname_entry;
     GtkWidget * mnemonic_entry;
+    GtkWidget * user_symbol_entry;
     GtkWidget * namespace_combo;
     GtkWidget * code_entry;
     GtkWidget * fraction_spinbutton;
@@ -93,6 +95,7 @@
 
     guint comm_section_top;
     guint comm_section_bottom;
+    guint comm_symbol_line;
     guint fq_section_top;
     guint fq_section_bottom;
 
@@ -160,6 +163,7 @@
     win->default_cusip = cusip;
     win->default_fullname = fullname;
     win->default_mnemonic = mnemonic;
+    win->default_user_symbol = "";
 
     if (parent)
         gtk_window_set_transient_for (GTK_WINDOW (win->dialog), GTK_WINDOW (parent));
@@ -338,6 +342,7 @@
                                         w->default_cusip,
                                         w->default_fullname,
                                         w->default_mnemonic,
+                                        w->default_user_symbol,
                                         w->default_fraction);
     if (new_commodity)
     {
@@ -592,11 +597,11 @@
                             NULL);
 
     if ((offset < cw->comm_section_top) || (offset >= cw->comm_section_bottom))
-        return;
-    gtk_widget_set_sensitive(widget, !cw->is_currency);
+	return;
+    if (cw->is_currency)
+	gtk_widget_set_sensitive(widget, offset == cw->comm_symbol_line);
 }
 
-
 static void
 gnc_ui_update_commodity_info (CommodityWindow *cw)
 {
@@ -924,6 +929,7 @@
                               GtkWidget  *parent,
                               const char * fullname,
                               const char * mnemonic,
+                              const char * user_symbol,
                               const char * cusip,
                               int          fraction,
                               gboolean     edit)
@@ -957,18 +963,10 @@
     if (!help_callback)
         gtk_widget_hide (help_button);
 
-    /* Determine the commodity section of the dialog */
-    retval->table = GTK_WIDGET(gtk_builder_get_object (builder, "edit_table"));
-    sec_label = GTK_WIDGET(gtk_builder_get_object (builder, "security_label"));
-    gtk_container_child_get(GTK_CONTAINER(retval->table), sec_label,
-                            "bottom-attach", &retval->comm_section_top, NULL);
-    widget = GTK_WIDGET(gtk_builder_get_object (builder, "quote_label"));
-    gtk_container_child_get(GTK_CONTAINER(retval->table), widget,
-                            "top-attach", &retval->comm_section_bottom, NULL);
-
     /* Get widget pointers */
     retval->fullname_entry = GTK_WIDGET(gtk_builder_get_object (builder, "fullname_entry"));
     retval->mnemonic_entry = GTK_WIDGET(gtk_builder_get_object (builder, "mnemonic_entry"));
+    retval->user_symbol_entry = GTK_WIDGET(gtk_builder_get_object (builder, "user_symbol_entry"));
     retval->namespace_combo = GTK_WIDGET(gtk_builder_get_object (builder, "namespace_cbwe"));
     retval->code_entry = GTK_WIDGET(gtk_builder_get_object (builder, "code_entry"));
     retval->fraction_spinbutton = GTK_WIDGET(gtk_builder_get_object (builder, "fraction_spinbutton"));
@@ -979,6 +977,18 @@
     retval->source_button[SOURCE_MULTI] = GTK_WIDGET(gtk_builder_get_object (builder, "multi_source_button"));
     retval->quote_tz_label = GTK_WIDGET(gtk_builder_get_object (builder, "quote_tz_label"));
 
+    /* Determine the commodity section of the dialog */
+    retval->table = GTK_WIDGET(gtk_builder_get_object (builder, "edit_table"));
+    sec_label = GTK_WIDGET(gtk_builder_get_object (builder, "security_label"));
+    gtk_container_child_get(GTK_CONTAINER(retval->table), sec_label,
+                            "bottom-attach", &retval->comm_section_top, NULL);
+    widget = GTK_WIDGET(gtk_builder_get_object (builder, "quote_label"));
+    gtk_container_child_get(GTK_CONTAINER(retval->table), widget,
+                            "top-attach", &retval->comm_section_bottom, NULL);
+    gtk_container_child_get(GTK_CONTAINER(retval->table),
+                            retval->user_symbol_entry, "top-attach",
+                            &retval->comm_symbol_line, NULL);
+
     /* Build custom widgets */
     box = GTK_WIDGET(gtk_builder_get_object (builder, "single_source_box"));
     if (gnc_commodity_namespace_is_iso(selected_namespace))
@@ -1066,6 +1076,7 @@
     /* Fill in any data, top to bottom */
     gtk_entry_set_text (GTK_ENTRY (retval->fullname_entry), fullname ? fullname : "");
     gtk_entry_set_text (GTK_ENTRY (retval->mnemonic_entry), mnemonic ? mnemonic : "");
+    gtk_entry_set_text (GTK_ENTRY (retval->user_symbol_entry), user_symbol ? user_symbol : "");
     gnc_cbwe_add_completion(GTK_COMBO_BOX(retval->namespace_combo));
     gnc_ui_update_namespace_picker(retval->namespace_combo,
                                    selected_namespace,
@@ -1130,6 +1141,7 @@
                               const char * cusip,
                               const char * fullname,
                               const char * mnemonic,
+                              const char * user_symbol,
                               int fraction)
 {
     CommodityWindow * win;
@@ -1145,6 +1157,7 @@
         namespace = gnc_commodity_get_namespace (commodity);
         fullname = gnc_commodity_get_fullname (commodity);
         mnemonic = gnc_commodity_get_mnemonic (commodity);
+        user_symbol = gnc_commodity_get_user_symbol (commodity);
         cusip = gnc_commodity_get_cusip (commodity);
         fraction = gnc_commodity_get_fraction (commodity);
     }
@@ -1158,8 +1171,8 @@
     }
 
     win = gnc_ui_build_commodity_dialog(namespace, parent, fullname,
-                                        mnemonic, cusip, fraction,
-                                        (commodity != NULL));
+                                        mnemonic, user_symbol, cusip,
+                                        fraction, (commodity != NULL));
 
     /* Update stock quote info based on existing commodity */
     gnc_ui_commodity_update_quote_info(win, commodity);
@@ -1209,13 +1222,15 @@
                                 const char * cusip,
                                 const char * fullname,
                                 const char * mnemonic,
+                                const char * user_symbol,
                                 int fraction)
 {
     gnc_commodity *result;
 
     ENTER(" ");
     result = gnc_ui_common_commodity_modal(NULL, parent, namespace, cusip,
-                                           fullname, mnemonic, 10000);
+                                           fullname, mnemonic, user_symbol,
+                                           10000);
     LEAVE(" ");
     return result;
 }
@@ -1232,7 +1247,7 @@
 
     ENTER(" ");
     result = gnc_ui_common_commodity_modal(NULL, parent, default_namespace, NULL,
-                                           NULL, NULL, 0);
+                                           NULL, NULL, NULL, 0);
     LEAVE(" ");
     return result;
 }
@@ -1254,7 +1269,7 @@
 
     ENTER(" ");
     result = gnc_ui_common_commodity_modal(commodity, parent, NULL, NULL,
-                                           NULL, NULL, 0);
+                                           NULL, NULL, NULL, 0);
     LEAVE(" ");
     return result != NULL;
 }
@@ -1271,6 +1286,7 @@
     const char * fullname  = gtk_entry_get_text(GTK_ENTRY(w->fullname_entry));
     gchar *namespace = gnc_ui_namespace_picker_ns (w->namespace_combo);
     const char * mnemonic  = gtk_entry_get_text(GTK_ENTRY(w->mnemonic_entry));
+    const char * user_symbol = gtk_entry_get_text(GTK_ENTRY(w->user_symbol_entry));
     const char * code      = gtk_entry_get_text(GTK_ENTRY(w->code_entry));
     QofBook * book = gnc_get_current_book ();
     int fraction = gtk_spin_button_get_value_as_int
@@ -1285,13 +1301,25 @@
     {
         if (w->edit_commodity)
         {
+            gboolean quote_set;
+            quote_set = gtk_toggle_button_get_active
+                (GTK_TOGGLE_BUTTON (w->get_quote_check));
             c = w->edit_commodity;
             gnc_commodity_begin_edit(c);
-            gnc_commodity_user_set_quote_flag (c, gtk_toggle_button_get_active
-                                               (GTK_TOGGLE_BUTTON (w->get_quote_check)));
-            selection = gtk_combo_box_get_active(GTK_COMBO_BOX(w->quote_tz_menu));
-            string = gnc_timezone_menu_position_to_string(selection);
-            gnc_commodity_set_quote_tz(c, string);
+            gnc_commodity_user_set_quote_flag (c, quote_set);
+            if (quote_set)
+            {
+                selection = gtk_combo_box_get_active(GTK_COMBO_BOX(w->quote_tz_menu));
+                string = gnc_timezone_menu_position_to_string(selection);
+                gnc_commodity_set_quote_tz(c, string);
+            } else
+                gnc_commodity_set_quote_tz(c, NULL);
+
+	    if (user_symbol && *user_symbol)
+                gnc_commodity_set_user_symbol(c, user_symbol);
+	    else
+                gnc_commodity_set_user_symbol(c, NULL);
+
             gnc_commodity_commit_edit(c);
             return TRUE;
         }

Modified: gnucash/trunk/src/gnome-utils/dialog-commodity.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-commodity.h	2013-10-24 12:28:30 UTC (rev 23324)
+++ gnucash/trunk/src/gnome-utils/dialog-commodity.h	2013-10-24 12:28:57 UTC (rev 23325)
@@ -158,6 +158,9 @@
  *  @param mnemonic If present, this will be the default mnemonic for
  *  the new commodity.
  *
+ *  @param user_symbol If present, this will be the default user symbol
+ *  for the new commodity.
+ *
  *  @param fraction If present, this will be the default fraction for
  *  the new commodity.  If absent, a default of 1000 will be used.
  *
@@ -169,6 +172,7 @@
                                 const char * cusip,
                                 const char * fullname,
                                 const char * mnemonic,
+                                const char * user_symbol,
                                 int fraction);
 
 /** Ask the user to provide the information necessary to create a new

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c	2013-10-24 12:28:30 UTC (rev 23324)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c	2013-10-24 12:28:57 UTC (rev 23325)
@@ -425,6 +425,7 @@
     case GNC_TREE_MODEL_COMMODITY_COL_UNIQUE_NAME:
     case GNC_TREE_MODEL_COMMODITY_COL_QUOTE_SOURCE:
     case GNC_TREE_MODEL_COMMODITY_COL_QUOTE_TZ:
+    case GNC_TREE_MODEL_COMMODITY_COL_USER_SYMBOL:
         return G_TYPE_STRING;
     case GNC_TREE_MODEL_COMMODITY_COL_FRACTION:
         return G_TYPE_INT;
@@ -686,6 +687,11 @@
             g_value_set_static_string (value, "");
         }
         break;
+    case GNC_TREE_MODEL_COMMODITY_COL_USER_SYMBOL:
+        g_value_init (value, G_TYPE_STRING);
+
+        g_value_set_string (value, gnc_commodity_get_user_symbol (commodity));
+        break;
     case GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY:
         g_value_init (value, G_TYPE_BOOLEAN);
         g_value_set_boolean (value, TRUE);

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.h	2013-10-24 12:28:30 UTC (rev 23324)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.h	2013-10-24 12:28:57 UTC (rev 23325)
@@ -57,6 +57,7 @@
 {
     GNC_TREE_MODEL_COMMODITY_COL_NAMESPACE,
     GNC_TREE_MODEL_COMMODITY_COL_MNEMONIC,
+    GNC_TREE_MODEL_COMMODITY_COL_USER_SYMBOL,
     GNC_TREE_MODEL_COMMODITY_COL_FULLNAME,
     GNC_TREE_MODEL_COMMODITY_COL_PRINTNAME,
     GNC_TREE_MODEL_COMMODITY_COL_UNIQUE_NAME,

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c	2013-10-24 12:28:30 UTC (rev 23324)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c	2013-10-24 12:28:57 UTC (rev 23325)
@@ -405,6 +405,12 @@
               GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
               sort_by_commodity_string);
     col = gnc_tree_view_add_text_column (
+              view, _("Display symbol"), "user_symbol", NULL, "ACME",
+              GNC_TREE_MODEL_COMMODITY_COL_USER_SYMBOL,
+              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
+              sort_by_commodity_string);
+    g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
+    col = gnc_tree_view_add_text_column (
               view, _("Unique Name"), "uniquename", NULL,
               "NASDAQ::ACMEACME", GNC_TREE_MODEL_COMMODITY_COL_UNIQUE_NAME,
               GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,

Modified: gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-commodity.glade
===================================================================
--- gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-commodity.glade	2013-10-24 12:28:30 UTC (rev 23324)
+++ gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-commodity.glade	2013-10-24 12:28:57 UTC (rev 23325)
@@ -8,12 +8,12 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox4">
+      <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area4">
+          <object class="GtkHButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -220,12 +220,12 @@
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox6">
+      <object class="GtkVBox" id="dialog-vbox6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area6">
+          <object class="GtkHButtonBox" id="dialog-action_area6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -294,19 +294,70 @@
           <object class="GtkTable" id="edit_table">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">15</property>
+            <property name="n_rows">16</property>
             <property name="n_columns">3</property>
             <property name="column_spacing">12</property>
             <property name="row_spacing">6</property>
             <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
               <object class="GtkLabel" id="label828">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options"/>
               </packing>
@@ -371,8 +422,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
                 <property name="y_options"/>
               </packing>
             </child>
@@ -418,8 +469,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -434,8 +485,8 @@
               </object>
               <packing>
                 <property name="right_attach">2</property>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
+                <property name="top_attach">8</property>
+                <property name="bottom_attach">9</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options"/>
               </packing>
@@ -465,8 +516,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">11</property>
-                <property name="bottom_attach">12</property>
+                <property name="top_attach">12</property>
+                <property name="bottom_attach">13</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -482,8 +533,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">12</property>
-                <property name="bottom_attach">13</property>
+                <property name="top_attach">13</property>
+                <property name="bottom_attach">14</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -499,8 +550,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">13</property>
-                <property name="bottom_attach">14</property>
+                <property name="top_attach">14</property>
+                <property name="bottom_attach">15</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -516,8 +567,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">14</property>
-                <property name="bottom_attach">15</property>
+                <property name="top_attach">15</property>
+                <property name="bottom_attach">16</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -539,8 +590,8 @@
               </object>
               <packing>
                 <property name="right_attach">2</property>
-                <property name="top_attach">10</property>
-                <property name="bottom_attach">11</property>
+                <property name="top_attach">11</property>
+                <property name="bottom_attach">12</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -610,8 +661,8 @@
                 </child>
               </object>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -634,8 +685,8 @@
                 </child>
               </object>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -657,8 +708,8 @@
                 </child>
               </object>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -713,8 +764,8 @@
               </object>
               <packing>
                 <property name="right_attach">2</property>
-                <property name="top_attach">8</property>
-                <property name="bottom_attach">9</property>
+                <property name="top_attach">9</property>
+                <property name="bottom_attach">10</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -740,8 +791,8 @@
               </object>
               <packing>
                 <property name="right_attach">2</property>
-                <property name="top_attach">9</property>
-                <property name="bottom_attach">10</property>
+                <property name="top_attach">10</property>
+                <property name="bottom_attach">11</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -770,8 +821,8 @@
                 </child>
               </object>
               <packing>
-                <property name="top_attach">11</property>
-                <property name="bottom_attach">12</property>
+                <property name="top_attach">12</property>
+                <property name="bottom_attach">13</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -800,8 +851,8 @@
                 </child>
               </object>
               <packing>
-                <property name="top_attach">12</property>
-                <property name="bottom_attach">13</property>
+                <property name="top_attach">14</property>
+                <property name="bottom_attach">15</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -830,8 +881,8 @@
                 </child>
               </object>
               <packing>
-                <property name="top_attach">13</property>
-                <property name="bottom_attach">14</property>
+                <property name="top_attach">14</property>
+                <property name="bottom_attach">15</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -853,8 +904,8 @@
                 </child>
               </object>
               <packing>
-                <property name="top_attach">14</property>
-                <property name="bottom_attach">15</property>
+                <property name="top_attach">15</property>
+                <property name="bottom_attach">16</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -877,59 +928,53 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkEntry" id="user_symbol_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup">Enter a display symbol. This can safely be left blank, in which case the ticker symbol or the currency ISO code will be used.</property>
+                <property name="tooltip_text" translatable="yes">Enter a display symbol. This can safely be left blank, in which case the ticker symbol or the currency ISO code will be used.</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkLabel" id="user_symbol_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Display symbol</property>
+                    <property name="use_underline">True</property>
+                    <property name="justify">center</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">True</property>



More information about the gnucash-changes mailing list