gnucash maint: Hide owner abstraction from user oriented gui

Geert Janssens gjanssens at code.gnucash.org
Wed Jan 20 09:44:40 EST 2016


Updated	 via  https://github.com/Gnucash/gnucash/commit/00104588 (commit)
	from  https://github.com/Gnucash/gnucash/commit/58392358 (commit)



commit 001045881cde506a4610c6602c0a4314c64d9429
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Wed Jan 20 15:44:28 2016 +0100

    Hide owner abstraction from user oriented gui

diff --git a/src/business/business-gnome/gnc-plugin-page-owner-tree.c b/src/business/business-gnome/gnc-plugin-page-owner-tree.c
index a3a4f84..9864902 100644
--- a/src/business/business-gnome/gnc-plugin-page-owner-tree.c
+++ b/src/business/business-gnome/gnc-plugin-page-owner-tree.c
@@ -603,6 +603,8 @@ gnc_plugin_page_owner_tree_create_widget (GncPluginPage *plugin_page)
     {
     case GNC_OWNER_NONE :
     case GNC_OWNER_UNDEFINED :
+        PWARN("missing owner_type");
+        label = _("Unknown");
         break;
     case GNC_OWNER_CUSTOMER :
         label = _("Customers");
diff --git a/src/gnome-utils/gnc-tree-view-owner.c b/src/gnome-utils/gnc-tree-view-owner.c
index 0969576..19f7ae6 100644
--- a/src/gnome-utils/gnc-tree-view-owner.c
+++ b/src/gnome-utils/gnc-tree-view-owner.c
@@ -363,9 +363,36 @@ gnc_tree_view_owner_new (GncOwnerType owner_type)
     GncTreeView *view;
     GtkTreeModel *model, *f_model, *s_model;
     const gchar *sample_type, *sample_currency;
+    const gchar *owner_name = NULL, * owner_id = NULL;
     GncTreeViewOwnerPrivate *priv;
 
     ENTER(" ");
+
+    switch (owner_type)
+    {
+    case GNC_OWNER_NONE :
+    case GNC_OWNER_UNDEFINED :
+        PWARN("missing owner_type");
+        owner_name = _("Name");
+        owner_id = _("ID #");
+        break;
+    case GNC_OWNER_CUSTOMER :
+        owner_name = _("Company Name");
+        owner_id = _("Customer Number");
+        break;
+    case GNC_OWNER_JOB :
+        owner_name = _("Job Name");
+        owner_id = _("Job Number");
+        break;
+    case GNC_OWNER_VENDOR :
+        owner_name = _("Company Name");
+        owner_id = _("Vendor Number");
+        break;
+    case GNC_OWNER_EMPLOYEE :
+        owner_name = _("Employee Name");
+        owner_id = _("Employee Number");
+        break;
+    }
     /* Create our view */
     view = g_object_new (GNC_TYPE_TREE_VIEW_OWNER,
                          "name", "owner_tree", NULL);
@@ -394,7 +421,7 @@ gnc_tree_view_owner_new (GncOwnerType owner_type)
     sample_currency = gnc_commodity_get_fullname(gnc_default_currency());
 
     priv->name_column
-        = gnc_tree_view_add_text_column(view, _("Owner Name"), GNC_OWNER_TREE_NAME_COL,
+        = gnc_tree_view_add_text_column(view, owner_name, GNC_OWNER_TREE_NAME_COL,
                                         NULL, "GnuCash Inc.",
                                         GNC_TREE_MODEL_OWNER_COL_NAME,
                                         GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
@@ -405,7 +432,7 @@ gnc_tree_view_owner_new (GncOwnerType owner_type)
                                   GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                   sort_by_string);
     priv->id_column
-        = gnc_tree_view_add_text_column(view, _("Owner ID"), GNC_OWNER_TREE_ID_COL,
+        = gnc_tree_view_add_text_column(view, owner_id, GNC_OWNER_TREE_ID_COL,
                                         NULL, "1-123-1234",
                                         GNC_TREE_MODEL_OWNER_COL_ID,
                                         GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,



Summary of changes:
 .../business-gnome/gnc-plugin-page-owner-tree.c    |  2 ++
 src/gnome-utils/gnc-tree-view-owner.c              | 31 ++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)



More information about the gnucash-changes mailing list