From 1a40caee9d1c9ed57cebb5754825860c70d33099 Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Fri, 10 May 2019 12:07:05 +0100 Subject: [PATCH] Change dialog-order to use GtkGrids --- gnucash/gnome/dialog-order.c | 6 - gnucash/gtkbuilder/dialog-order.glade | 616 ++++++++++---------------- 2 files changed, 228 insertions(+), 394 deletions(-) diff --git a/gnucash/gnome/dialog-order.c b/gnucash/gnome/dialog-order.c index 0c9bfbe00ec..10a34c4422c 100644 --- a/gnucash/gnome/dialog-order.c +++ b/gnucash/gnome/dialog-order.c @@ -90,8 +90,6 @@ struct _order_window GtkWidget * active_check; GtkWidget * cd_label; - GtkWidget * hide1; - GtkWidget * hide2; GtkWidget * close_order_button; GtkWidget * owner_box; @@ -512,8 +510,6 @@ gnc_order_update_window (OrderWindow *ow) { gtk_widget_hide (ow->closed_date); gtk_widget_hide (ow->cd_label); - gtk_widget_hide (ow->hide1); - gtk_widget_hide (ow->hide2); } if (ow->dialog_type == VIEW_ORDER) @@ -606,8 +602,6 @@ gnc_order_new_window (GtkWindow *parent, QofBook *bookp, OrderDialogType type, ow->owner_label = GTK_WIDGET(gtk_builder_get_object (builder, "owner_label")); ow->cd_label = GTK_WIDGET(gtk_builder_get_object (builder, "cd_label")); - ow->hide1 = GTK_WIDGET(gtk_builder_get_object (builder, "hide1")); - ow->hide2 = GTK_WIDGET(gtk_builder_get_object (builder, "hide2")); ow->close_order_button = GTK_WIDGET(gtk_builder_get_object (builder, "close_order_button")); diff --git a/gnucash/gtkbuilder/dialog-order.glade b/gnucash/gtkbuilder/dialog-order.glade index e9707a0f98a..09e36238f47 100644 --- a/gnucash/gtkbuilder/dialog-order.glade +++ b/gnucash/gtkbuilder/dialog-order.glade @@ -1,5 +1,5 @@ - + @@ -9,6 +9,9 @@ 950 dialog + + + True @@ -107,150 +110,116 @@ False 0 - + True False - 3 + 6 + 6 + 6 - + True False - 2 - vertical - True - - - True - False - end - Order ID - right - - - False - False - 0 - - - - - True - False - end - Date Opened - right - - - False - False - 1 - - - - - True - False - end - Date Closed - right - - - False - False - 2 - - - - - True - False - center - - - False - False - 3 - - + end + Order ID + right - False - True - 0 + 0 + 0 - + + True + False + end + Date Opened + right + + + 0 + 1 + + + + + True + False + end + Date Closed + right + + + 0 + 2 + + + + + True + True + False + ● + True + False + False + + + 1 + 0 + + + + True False - 3 - vertical - True - - - True - True - False - ● - True - False - False - - - False - False - 0 - - - - - True - False - - - - - - True - True - 1 - - - - True - False - - - - - - True - True - 2 - + + + + 1 + 1 + + + + + True + False - - Active - True - True - False - start - True - True - - - False - False - 3 - + - False - False - 1 + 1 + 2 + + + + + True + True + False + start + True + True + + + 1 + 3 + + + + + True + False + end + Active + + + 0 + 3 @@ -276,139 +245,62 @@ 3 0 - + True False + 6 + 6 + 6 - + True False - 3 - vertical - True - - - True - False - end - (owner) - right - - - False - False - 0 - - - - - True - False - end - Reference - center - - - False - False - 1 - - - - - True - False - center - - - False - False - 2 - - - - - True - False - center - - - False - False - 3 - - + end + (owner) + right - True - True - 0 + 0 + 0 - + + True + False + end + Reference + center + + + 0 + 1 + + + + True False - 3 - vertical - True - - - True - False - - - - - - True - True - 0 - - - - - True - True - ● - False - False - - - False - False - 1 - - - - - True - False - center - - - False - False - 2 - - - - True - False - center - - - False - False - 3 - + - True - True - 1 + 1 + 0 + + + + + True + True + ● + False + False + + + 1 + 1 @@ -446,8 +338,8 @@ True True word - False notes_buffer + False @@ -530,6 +422,9 @@ New Order dialog + + + True @@ -610,95 +505,67 @@ 3 0 - + True False + 6 + 6 + 6 - + True False - 3 - vertical - True - - - True - False - end - Order ID - right - - - False - False - 0 - - - - - True - False - end - Date Opened - right - - - False - False - 1 - - + end + Order ID + right + + + 0 + 0 + + + + + True + True + True + The order ID number. If left blank a reasonable number will be chosen for you + The order ID number. If left blank a reasonable number will be chosen for you + True + ● + True + False + False - True - True - 0 + 1 + 0 - + + True + False + end + Date Opened + right + + + 0 + 1 + + + + True False - 3 - vertical - True - - - True - True - True - The order ID number. If left blank a reasonable number will be chosen for you - The order ID number. If left blank a reasonable number will be chosen for you - ● - True - False - False - - - False - False - 0 - - - - True - False - - - - - - True - True - 1 - + - True - True - 1 + 1 + 1 @@ -724,91 +591,64 @@ 3 0 - + True False + 6 + 6 + 6 - + True False - 3 - vertical - True - - - True - False - end - (owner) - right - - - False - False - 0 - - - - - True - False - end - Reference - right - - - False - False - 1 - - + end + (owner) + right - True - True - 0 + 0 + 0 - + True False - 3 - vertical - - True - False - - - - - - True - True - 0 - - - - - True - True - False - ● - False - False - - - False - False - 1 - + - True - True - 1 + 1 + 0 + + + + + True + False + end + Reference + right + + + 0 + 1 + + + + + True + True + True + False + ● + False + False + + + 1 + 1 @@ -848,8 +688,8 @@ True False word - False text_buffer + False