IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug #661851 - Migrate Account and Owner glade files

Browse Source 
Patch by Robert Fewell

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21457 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2011-10-18 18:10:45 +00:00
parent 4684029cbd
commit ac3f924152
9 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
po/POTFILES.in
View File

@ -219,7 +219,6 @@ src/gnome/gnc-plugin-page-register.c
src/gnome/gnc-plugin-page-sx-list.c src/gnome/gnc-plugin-page-sx-list.c
src/gnome/gnc-plugin-register.c src/gnome/gnc-plugin-register.c
src/gnome/gnc-split-reg.c src/gnome/gnc-split-reg.c
src/gnome/gtkbuilder/account.glade
src/gnome/gtkbuilder/assistant-acct-period.glade src/gnome/gtkbuilder/assistant-acct-period.glade
src/gnome/gtkbuilder/assistant-hierarchy.glade src/gnome/gtkbuilder/assistant-hierarchy.glade
src/gnome/gtkbuilder/assistant-loan.glade src/gnome/gtkbuilder/assistant-loan.glade
@ -234,8 +233,6 @@ src/gnome/gtkbuilder/dialog-progress.glade
src/gnome/gtkbuilder/dialog-sx.glade src/gnome/gtkbuilder/dialog-sx.glade
src/gnome/gtkbuilder/gnc-plugin-page-budget.glade src/gnome/gtkbuilder/gnc-plugin-page-budget.glade
src/gnome/gtkbuilder/gnc-plugin-page-register.glade src/gnome/gtkbuilder/gnc-plugin-page-register.glade
src/gnome/gtkbuilder/owner.glade
src/gnome/gtkbuilder/sched-xact.glade
src/gnome/gtkbuilder/tax.glade src/gnome/gtkbuilder/tax.glade
src/gnome/gtkbuilder/window-autoclear.glade src/gnome/gtkbuilder/window-autoclear.glade
src/gnome/gtkbuilder/window-reconcile.glade src/gnome/gtkbuilder/window-reconcile.glade
@ -351,12 +348,14 @@ src/gnome-utils/gnc-tree-view-owner.c
src/gnome-utils/gnc-tree-view-price.c src/gnome-utils/gnc-tree-view-price.c
src/gnome-utils/gnc-tree-view-sx-list.c src/gnome-utils/gnc-tree-view-sx-list.c
src/gnome-utils/gnc-window.c src/gnome-utils/gnc-window.c
src/gnome-utils/gtkbuilder/dialog-account.glade
src/gnome-utils/gtkbuilder/dialog-commodity.glade src/gnome-utils/gtkbuilder/dialog-commodity.glade
src/gnome-utils/gtkbuilder/dialog-transfer.glade src/gnome-utils/gtkbuilder/dialog-transfer.glade
src/gnome-utils/gtkbuilder/dialog-userpass.glade src/gnome-utils/gtkbuilder/dialog-userpass.glade
src/gnome-utils/gtkbuilder/gnc-date-format.glade src/gnome-utils/gtkbuilder/gnc-date-format.glade
src/gnome-utils/gtkbuilder/gnc-frequency.glade src/gnome-utils/gtkbuilder/gnc-frequency.glade
src/gnome-utils/gtkbuilder/gnc-recurrence.glade src/gnome-utils/gtkbuilder/gnc-recurrence.glade
src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
src/gnome-utils/misc-gnome-utils.c src/gnome-utils/misc-gnome-utils.c
src/gnome-utils/print-session.c src/gnome-utils/print-session.c
src/gnome-utils/schemas/apps_gnucash_history.schemas.in src/gnome-utils/schemas/apps_gnucash_history.schemas.in

8
src/gnome-utils/dialog-account.c
View File

@ -1311,8 +1311,8 @@ gnc_account_window_create(AccountWindow *aw)
ENTER("aw %p, modal %d", aw, aw->modal); ENTER("aw %p, modal %d", aw, aw->modal);
builder = gtk_builder_new(); builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "account.glade", "fraction_liststore"); gnc_builder_add_from_file (builder, "dialog-account.glade", "fraction_liststore");
gnc_builder_add_from_file (builder, "account.glade", "Account Dialog"); gnc_builder_add_from_file (builder, "dialog-account.glade", "Account Dialog");
aw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Account Dialog")); aw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Account Dialog"));
awo = G_OBJECT (aw->dialog); awo = G_OBJECT (aw->dialog);
@ -1980,8 +1980,8 @@ gnc_account_renumber_create_dialog (GtkWidget *window, Account *account)
data->num_children = gnc_account_n_children(account); data->num_children = gnc_account_n_children(account);
builder = gtk_builder_new(); builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "account.glade", "interval_adjustment"); gnc_builder_add_from_file (builder, "dialog-account.glade", "interval_adjustment");
gnc_builder_add_from_file (builder, "account.glade", "Renumber Accounts"); gnc_builder_add_from_file (builder, "dialog-account.glade", "Renumber Accounts");
data->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Renumber Accounts")); data->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Renumber Accounts"));
gtk_window_set_transient_for(GTK_WINDOW(data->dialog), GTK_WINDOW(window)); gtk_window_set_transient_for(GTK_WINDOW(data->dialog), GTK_WINDOW(window));
g_object_set_data_full(G_OBJECT(data->dialog), "builder", builder, g_object_unref); g_object_set_data_full(G_OBJECT(data->dialog), "builder", builder, g_object_unref);

4
src/gnome-utils/gnc-tree-view-account.c
View File

@ -1928,13 +1928,11 @@ gppat_filter_response_cb (GtkWidget *dialog,
gint response, gint response,
AccountFilterDialog *fd) AccountFilterDialog *fd)
{ {
GtkWidget *view;
gpointer gptemp; gpointer gptemp;
g_return_if_fail(GTK_IS_DIALOG(dialog)); g_return_if_fail(GTK_IS_DIALOG(dialog));
ENTER("dialog %p, response %d", dialog, response); ENTER("dialog %p, response %d", dialog, response);
view = gnc_glade_lookup_widget(dialog, FILTER_TREE_VIEW);
if (response != GTK_RESPONSE_OK) if (response != GTK_RESPONSE_OK)
{ {
@ -1973,7 +1971,7 @@ account_filter_dialog_create(AccountFilterDialog *fd, GncPluginPage *page)
/* Create the dialog */ /* Create the dialog */
builder = gtk_builder_new(); builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "account.glade", "Filter By"); gnc_builder_add_from_file (builder, "dialog-account.glade", "Filter By");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Filter By")); dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Filter By"));
fd->dialog = dialog; fd->dialog = dialog;
gtk_window_set_transient_for(GTK_WINDOW(dialog), gtk_window_set_transient_for(GTK_WINDOW(dialog),

4
src/gnome-utils/gnc-tree-view-owner.c
View File

@ -1348,13 +1348,11 @@ gppot_filter_response_cb (GtkWidget *dialog,
gint response, gint response,
OwnerFilterDialog *fd) OwnerFilterDialog *fd)
{ {
GtkWidget *view;
gpointer gptemp; gpointer gptemp;
g_return_if_fail(GTK_IS_DIALOG(dialog)); g_return_if_fail(GTK_IS_DIALOG(dialog));
ENTER("dialog %p, response %d", dialog, response); ENTER("dialog %p, response %d", dialog, response);
view = gnc_glade_lookup_widget(dialog, FILTER_TREE_VIEW);
if (response != GTK_RESPONSE_OK) if (response != GTK_RESPONSE_OK)
{ {
@ -1390,7 +1388,7 @@ owner_filter_dialog_create(OwnerFilterDialog *fd, GncPluginPage *page)
/* Create the dialog */ /* Create the dialog */
builder = gtk_builder_new(); builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "owner.glade", "Filter By"); gnc_builder_add_from_file (builder, "gnc-tree-view-owner.glade", "Filter By");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Filter By")); dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Filter By"));
fd->dialog = dialog; fd->dialog = dialog;
gtk_window_set_transient_for(GTK_WINDOW(dialog), gtk_window_set_transient_for(GTK_WINDOW(dialog),

2
src/gnome-utils/gtkbuilder/Makefile.am
View File

@ -1,10 +1,12 @@
gtkbuilderdir = $(GNC_GTKBUILDER_DIR) gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
gtkbuilder_DATA = \ gtkbuilder_DATA = \
dialog-account.glade \
dialog-commodity.glade \ dialog-commodity.glade \
dialog-transfer.glade \ dialog-transfer.glade \
dialog-userpass.glade \ dialog-userpass.glade \
gnc-date-format.glade \ gnc-date-format.glade \
gnc-frequency.glade \ gnc-frequency.glade \
gnc-tree-view-owner.glade \
gnc-recurrence.glade gnc-recurrence.glade
EXTRA_DIST = $(gtkbuilder_DATA) EXTRA_DIST = $(gtkbuilder_DATA)

0
src/gnome/gtkbuilder/account.glade → src/gnome-utils/gtkbuilder/dialog-account.glade
View File

2
src/gnome/gtkbuilder/owner.glade → src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
View File

@ -14,7 +14,7 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkCheckButton" id="show_hidden"> <object class="GtkCheckButton" id="show_inactive">
<property name="label" translatable="yes">Only show _active owners</property> <property name="label" translatable="yes">Only show _active owners</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>

2
src/gnome/gnc-plugin-page-account-tree.c
View File

@ -1001,7 +1001,7 @@ gnc_plugin_page_account_tree_cmd_delete_account (GtkAction *action, GncPluginPag
gchar *title = NULL; gchar *title = NULL;
builder = gtk_builder_new(); builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "account.glade", "Delete Account"); gnc_builder_add_from_file (builder, "dialog-account.glade", "Delete Account");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Delete Account")); dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Delete Account"));
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(window)); gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(window));

2
src/gnome/gtkbuilder/Makefile.am
View File

@ -1,6 +1,5 @@
gtkbuilderdir = $(GNC_GTKBUILDER_DIR) gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
gtkbuilder_DATA = \ gtkbuilder_DATA = \
account.glade \
assistant-acct-period.glade \ assistant-acct-period.glade \
assistant-hierarchy.glade \ assistant-hierarchy.glade \
assistant-loan.glade \ assistant-loan.glade \
@ -15,7 +14,6 @@ gtkbuilder_DATA = \
dialog-sx.glade \ dialog-sx.glade \
gnc-plugin-page-budget.glade \ gnc-plugin-page-budget.glade \
gnc-plugin-page-register.glade \ gnc-plugin-page-register.glade \
owner.glade \
tax.glade \ tax.glade \
window-autoclear.glade \ window-autoclear.glade \
window-reconcile.glade window-reconcile.glade