diff --git a/ChangeLog b/ChangeLog index 94df01b2ed..7be5b270f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,24 @@ 2001-06-12 Dave Peticolas + * src/gnome/glade/Makefile.am: new file + + * src/gnome/glade/commodity.glade: new file. glade file for + commodity dialog + + * src/gnome/dialog-commodities.c: use libglade + + * src/gnome/dialog-utils.c (gnc_glade_xml_new): new func + (gnc_glade_xml_new_widget): new func + + * rpm/gnucash.spec.in: add glade dir + + * configure.in: move libglade check to glade section. + add configured glade file dir. + + * src/gnome/Makefile.am: add glade flags & glade dir + + * src/Makefile.am: add glade libs + * src/scm/report/account-piecharts.scm: same as below * src/scm/report/category-barchart.scm: remove hint text diff --git a/configure.in b/configure.in index 3560f24bd9..5a2ee27d24 100644 --- a/configure.in +++ b/configure.in @@ -121,6 +121,7 @@ else fi GNC_ACCOUNTS_DIR=${GNC_SHAREDIR}/accounts +GNC_GLADE_DIR=${GNC_SHAREDIR}/glade GNC_PIXMAP_DIR='${datadir}/pixmaps/gnucash' AC_SUBST(GNC_CONFIGDIR) @@ -129,6 +130,7 @@ AC_SUBST(GNC_SHAREDIR) AC_SUBST(GNC_SCM_INSTALL_DIR) AC_SUBST(GNC_DOC_INSTALL_DIR) AC_SUBST(GNC_ACCOUNTS_DIR) +AC_SUBST(GNC_GLADE_DIR) AC_SUBST(GNC_PIXMAP_DIR) # We should always see these errors... @@ -277,6 +279,19 @@ fi AC_SUBST(GLADE) +GLADE_LIBS=`$GNOME_CONFIG --libs libglade` +GLADE_CFLAGS=`$GNOME_CONFIG --cflags libglade` + +# check for glade libs +AC_CHECK_LIB(glade, glade_init, + GNOMEBUILDLIBS="${GNOMEBUILDLIBS} glade", + AC_MSG_ERROR([Cannot find libglade. See the README for more info.]), + $GLADE_LIBS) + +AC_SUBST(GLADE_LIBS) +AC_SUBST(GLADE_CFLAGS) + + ### -------------------------------------------------------------------------- ### Check for perl @@ -455,11 +470,6 @@ AC_CHECK_LIB(oaf, main, true, [AC_MSG_ERROR([liboaf development files not found. Guppi requires them.])], `$GNOME_CONFIG --libs oaf`) -AC_CHECK_LIB(glade, main, true, - [AC_MSG_ERROR([libglade development files not found. Guppi requires them.])] -, - `$GNOME_CONFIG --libs libglade`) - ## guppi itself. GUPPI_LIBS=`$GNOME_CONFIG --libs libguppi` @@ -622,6 +632,7 @@ AC_OUTPUT( src/experimental/ofx/explore/Makefile src/experimental/ofx/parser/Makefile src/gnome/Makefile + src/gnome/glade/Makefile src/guile/Makefile src/optional/Makefile src/pixmaps/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index b790b1442b..b19bf0d53e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -28,6 +28,7 @@ src/gnome/druid-qif-import.c src/gnome/druid-stock-split.c src/gnome/glade-gnc-dialogs.c src/gnome/glade-support.c +src/gnome/glade/commodity_strings.c src/gnome/gnc-commodity-edit.c src/gnome/gnc-datedelta.c src/gnome/gnc-dateedit.c diff --git a/rpm/gnucash.spec.in b/rpm/gnucash.spec.in index 10daa4bb6c..5445df319a 100644 --- a/rpm/gnucash.spec.in +++ b/rpm/gnucash.spec.in @@ -46,6 +46,7 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/libgncengine.* /usr/share/gnucash/accounts /usr/share/gnucash/doc +/usr/share/gnucash/glade /usr/share/gnucash/guile-modules /usr/share/gnucash/html /usr/share/gnucash/scm diff --git a/src/Makefile.am b/src/Makefile.am index 535d9b7a6a..06fb92f173 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,6 +37,7 @@ LDADD = \ ${GUILE_LIBS} \ ${GTKHTML_LIBS} \ ${GHTTP_LIBS} \ + ${GLADE_LIBS} \ ${GUPPI_LIBS} \ ${DB_LIBS} \ ${INTLLIBS} \ diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am index ceb4e590d0..8cd17f576e 100644 --- a/src/gnome/Makefile.am +++ b/src/gnome/Makefile.am @@ -1,3 +1,4 @@ +SUBDIRS = glade noinst_LIBRARIES = libgncgnome.a @@ -147,6 +148,7 @@ CFLAGS = @CFLAGS@ \ ${GNOME_PRINT_CFLAGS} \ ${GTKHTML_CFLAGS} \ ${GHTTP_CFLAGS} \ + ${GLADE_CFLAGS} \ ${GUPPI_CFLAGS} INCLUDES = \ @@ -179,8 +181,9 @@ gnucash.keys: gnucash.keys.in gnc-dir.h: gnc-dir.h.in rm -f $@.tmp sed < $@.in > $@.tmp \ - -e 's:@-GNC_PIXMAP_DIR-@:${GNC_PIXMAP_DIR}:g' \ - -e 's:@-GNC_ACCOUNTS_DIR-@:${GNC_ACCOUNTS_DIR}:g' + -e 's:@-GNC_ACCOUNTS_DIR-@:${GNC_ACCOUNTS_DIR}:g' \ + -e 's:@-GNC_GLADE_DIR-@:${GNC_GLADE_DIR}:g' \ + -e 's:@-GNC_PIXMAP_DIR-@:${GNC_PIXMAP_DIR}:g' mv $@.tmp $@ BUILT_SOURCES += gnc-dir.h diff --git a/src/gnome/dialog-commodities.c b/src/gnome/dialog-commodities.c index 8be0c43aac..ef674ac346 100644 --- a/src/gnome/dialog-commodities.c +++ b/src/gnome/dialog-commodities.c @@ -373,8 +373,11 @@ static void gnc_commodities_dialog_create (GtkWidget * parent, CommoditiesDialog *cd) { GtkWidget *dialog; + GladeXML *xml; - dialog = create_Commodities_Dialog (); + xml = gnc_glade_xml_new ("commodity.glade", "Commodities Dialog"); + + dialog = glade_xml_get_widget (xml, "Commodities Dialog"); cd->dialog = dialog; gnome_dialog_button_connect (GNOME_DIALOG (dialog), 0, @@ -394,7 +397,7 @@ gnc_commodities_dialog_create (GtkWidget * parent, CommoditiesDialog *cd) { GtkWidget *list; - list = lookup_widget (dialog, "commodity_list"); + list = glade_xml_get_widget (xml, "commodity_list"); cd->commodity_list = list; gtk_signal_connect (GTK_OBJECT(list), "select_row", @@ -408,24 +411,24 @@ gnc_commodities_dialog_create (GtkWidget * parent, CommoditiesDialog *cd) { GtkWidget *button; - button = lookup_widget (dialog, "edit_button"); + button = glade_xml_get_widget (xml, "edit_button"); cd->edit_button = button; gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (edit_clicked), cd); - button = lookup_widget (dialog, "remove_button"); + button = glade_xml_get_widget (xml, "remove_button"); cd->remove_button = button; gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (remove_clicked), cd); - button = lookup_widget (dialog, "add_button"); + button = glade_xml_get_widget (xml, "add_button"); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (add_clicked), cd); - button = lookup_widget (dialog, "show_currencies_button"); + button = glade_xml_get_widget (xml, "show_currencies_button"); gtk_signal_connect (GTK_OBJECT (button), "toggled", GTK_SIGNAL_FUNC (show_currencies_toggled), cd); diff --git a/src/gnome/dialog-utils.c b/src/gnome/dialog-utils.c index 70d9db8788..139b837476 100644 --- a/src/gnome/dialog-utils.c +++ b/src/gnome/dialog-utils.c @@ -24,6 +24,7 @@ #include "config.h" +#include #include #include "account-tree.h" @@ -844,3 +845,30 @@ gnc_clist_columns_autosize (GtkCList *list) gtk_clist_columns_autosize (list); } + + +static gboolean glade_inited = FALSE; + +GladeXML * +gnc_glade_xml_new (const char *filename, const char *root) +{ + GladeXML *xml; + char *fname; + + g_return_val_if_fail (filename != NULL, NULL); + g_return_val_if_fail (root != NULL, NULL); + + if (!glade_inited) + { + glade_gnome_init (); + glade_inited = TRUE; + } + + fname = g_strconcat (GNC_GLADE_DIR, "/", filename, NULL); + + xml = glade_xml_new (fname, root); + + g_free (fname); + + return xml; +} diff --git a/src/gnome/dialog-utils.h b/src/gnome/dialog-utils.h index 4ccf20d790..e2a6b6ad37 100644 --- a/src/gnome/dialog-utils.h +++ b/src/gnome/dialog-utils.h @@ -25,6 +25,7 @@ #ifndef __DIALOG_UTILS_H__ #define __DIALOG_UTILS_H__ +#include #include #include "Account.h" @@ -88,5 +89,6 @@ void gnc_clist_set_check (GtkCList *list, int row, int col, gboolean checked); * also takes into account the column titles. */ void gnc_clist_columns_autosize (GtkCList *list); +GladeXML * gnc_glade_xml_new (const char *filename, const char *root); #endif diff --git a/src/gnome/glade-gnc-dialogs.c b/src/gnome/glade-gnc-dialogs.c index eea2907749..7a76ebafa1 100644 --- a/src/gnome/glade-gnc-dialogs.c +++ b/src/gnome/glade-gnc-dialogs.c @@ -3439,9 +3439,6 @@ create_Account_Dialog (void) GtkWidget *button63; GtkWidget *cancel_button; GtkWidget *button72; - GtkTooltips *tooltips; - - tooltips = gtk_tooltips_new (); Account_Dialog = gnome_dialog_new (_("New Account"), NULL); gtk_object_set_data (GTK_OBJECT (Account_Dialog), "Account_Dialog", Account_Dialog); @@ -3840,7 +3837,6 @@ create_Account_Dialog (void) (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (opening_equity_radio); gtk_box_pack_start (GTK_BOX (vbox120), opening_equity_radio, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, opening_equity_radio, _("Use an Equity account to transfer the opening balance. The Equity account will be created if it doesn't exist already."), NULL); radiobutton8 = gtk_radio_button_new_with_label (vbox120_group, _("Select Transfer Account")); vbox120_group = gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton8)); @@ -3849,7 +3845,6 @@ create_Account_Dialog (void) (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (radiobutton8); gtk_box_pack_start (GTK_BOX (vbox120), radiobutton8, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, radiobutton8, _("Use the account select below to transfer the opening balance."), NULL); transfer_account_frame = gtk_frame_new (_("Transfer Account")); gtk_widget_ref (transfer_account_frame); @@ -3906,8 +3901,6 @@ create_Account_Dialog (void) gtk_widget_show (button72); GTK_WIDGET_SET_FLAGS (button72, GTK_CAN_DEFAULT); - gtk_object_set_data (GTK_OBJECT (Account_Dialog), "tooltips", tooltips); - return Account_Dialog; } @@ -7727,178 +7720,3 @@ create_Price_Dialog (void) return Price_Dialog; } -GtkWidget* -create_Commodities_Dialog (void) -{ - GtkWidget *Commodities_Dialog; - GtkWidget *vbox127; - GtkWidget *hbox107; - GtkWidget *frame51; - GtkWidget *vbox128; - GtkWidget *show_currencies_button; - GtkWidget *scrolledwindow33; - GtkWidget *commodity_list; - GtkWidget *label8477426; - GtkWidget *label8477427; - GtkWidget *label8477428; - GtkWidget *label8477429; - GtkWidget *label8477430; - GtkWidget *hbuttonbox7; - GtkWidget *add_button; - GtkWidget *remove_button; - GtkWidget *edit_button; - GtkWidget *hbuttonbox6; - GtkWidget *close_button; - GtkTooltips *tooltips; - - tooltips = gtk_tooltips_new (); - - Commodities_Dialog = gnome_dialog_new (_("Commodities"), NULL); - gtk_object_set_data (GTK_OBJECT (Commodities_Dialog), "Commodities_Dialog", Commodities_Dialog); - gtk_window_set_policy (GTK_WINDOW (Commodities_Dialog), TRUE, TRUE, FALSE); - - vbox127 = GNOME_DIALOG (Commodities_Dialog)->vbox; - gtk_object_set_data (GTK_OBJECT (Commodities_Dialog), "vbox127", vbox127); - gtk_widget_show (vbox127); - - hbox107 = gtk_hbox_new (FALSE, 2); - gtk_widget_ref (hbox107); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "hbox107", hbox107, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (hbox107); - gtk_box_pack_start (GTK_BOX (vbox127), hbox107, TRUE, TRUE, 0); - - frame51 = gtk_frame_new (_("Commodities")); - gtk_widget_ref (frame51); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "frame51", frame51, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (frame51); - gtk_box_pack_start (GTK_BOX (hbox107), frame51, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame51), 3); - - vbox128 = gtk_vbox_new (FALSE, 0); - gtk_widget_ref (vbox128); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "vbox128", vbox128, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (vbox128); - gtk_container_add (GTK_CONTAINER (frame51), vbox128); - - show_currencies_button = gtk_check_button_new_with_label (_("Show National Currencies")); - gtk_widget_ref (show_currencies_button); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "show_currencies_button", show_currencies_button, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (show_currencies_button); - gtk_box_pack_start (GTK_BOX (vbox128), show_currencies_button, FALSE, FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (show_currencies_button), 3); - - scrolledwindow33 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_ref (scrolledwindow33); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "scrolledwindow33", scrolledwindow33, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (scrolledwindow33); - gtk_box_pack_start (GTK_BOX (vbox128), scrolledwindow33, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow33), 3); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow33), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - - commodity_list = gtk_clist_new (5); - gtk_widget_ref (commodity_list); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "commodity_list", commodity_list, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (commodity_list); - gtk_container_add (GTK_CONTAINER (scrolledwindow33), commodity_list); - gtk_clist_set_column_width (GTK_CLIST (commodity_list), 0, 80); - gtk_clist_set_column_width (GTK_CLIST (commodity_list), 1, 80); - gtk_clist_set_column_width (GTK_CLIST (commodity_list), 2, 80); - gtk_clist_set_column_width (GTK_CLIST (commodity_list), 3, 80); - gtk_clist_set_column_width (GTK_CLIST (commodity_list), 4, 80); - gtk_clist_column_titles_show (GTK_CLIST (commodity_list)); - - label8477426 = gtk_label_new (_("Type")); - gtk_widget_ref (label8477426); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "label8477426", label8477426, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label8477426); - gtk_clist_set_column_widget (GTK_CLIST (commodity_list), 0, label8477426); - - label8477427 = gtk_label_new (_("Symbol")); - gtk_widget_ref (label8477427); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "label8477427", label8477427, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label8477427); - gtk_clist_set_column_widget (GTK_CLIST (commodity_list), 1, label8477427); - - label8477428 = gtk_label_new (_("Name")); - gtk_widget_ref (label8477428); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "label8477428", label8477428, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label8477428); - gtk_clist_set_column_widget (GTK_CLIST (commodity_list), 2, label8477428); - - label8477429 = gtk_label_new (_("Code")); - gtk_widget_ref (label8477429); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "label8477429", label8477429, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label8477429); - gtk_clist_set_column_widget (GTK_CLIST (commodity_list), 3, label8477429); - - label8477430 = gtk_label_new (_("Fraction")); - gtk_widget_ref (label8477430); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "label8477430", label8477430, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label8477430); - gtk_clist_set_column_widget (GTK_CLIST (commodity_list), 4, label8477430); - - hbuttonbox7 = gtk_hbutton_box_new (); - gtk_widget_ref (hbuttonbox7); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "hbuttonbox7", hbuttonbox7, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (hbuttonbox7); - gtk_box_pack_start (GTK_BOX (vbox128), hbuttonbox7, FALSE, FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox7), 3); - gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox7), GTK_BUTTONBOX_SPREAD); - - add_button = gtk_button_new_with_label (_("Add")); - gtk_widget_ref (add_button); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "add_button", add_button, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (add_button); - gtk_container_add (GTK_CONTAINER (hbuttonbox7), add_button); - GTK_WIDGET_SET_FLAGS (add_button, GTK_CAN_DEFAULT); - gtk_tooltips_set_tip (tooltips, add_button, _("Add a new price."), NULL); - - remove_button = gtk_button_new_with_label (_("Remove")); - gtk_widget_ref (remove_button); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "remove_button", remove_button, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (remove_button); - gtk_container_add (GTK_CONTAINER (hbuttonbox7), remove_button); - GTK_WIDGET_SET_FLAGS (remove_button, GTK_CAN_DEFAULT); - gtk_tooltips_set_tip (tooltips, remove_button, _("Remove the current price"), NULL); - - edit_button = gtk_button_new_with_label (_("Edit")); - gtk_widget_ref (edit_button); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "edit_button", edit_button, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (edit_button); - gtk_container_add (GTK_CONTAINER (hbuttonbox7), edit_button); - GTK_WIDGET_SET_FLAGS (edit_button, GTK_CAN_DEFAULT); - - hbuttonbox6 = GNOME_DIALOG (Commodities_Dialog)->action_area; - gtk_object_set_data (GTK_OBJECT (Commodities_Dialog), "hbuttonbox6", hbuttonbox6); - gtk_widget_show (hbuttonbox6); - gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox6), GTK_BUTTONBOX_END); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox6), 8); - - gnome_dialog_append_button (GNOME_DIALOG (Commodities_Dialog), GNOME_STOCK_BUTTON_CLOSE); - close_button = g_list_last (GNOME_DIALOG (Commodities_Dialog)->buttons)->data; - gtk_widget_ref (close_button); - gtk_object_set_data_full (GTK_OBJECT (Commodities_Dialog), "close_button", close_button, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (close_button); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); - - gtk_object_set_data (GTK_OBJECT (Commodities_Dialog), "tooltips", tooltips); - - return Commodities_Dialog; -} - diff --git a/src/gnome/glade-gnc-dialogs.h b/src/gnome/glade-gnc-dialogs.h index aeb7bae022..3f7cd08a46 100644 --- a/src/gnome/glade-gnc-dialogs.h +++ b/src/gnome/glade-gnc-dialogs.h @@ -27,4 +27,3 @@ GtkWidget* create_Edit_Column_View_Page (void); GtkWidget* create_Edit_Report_Size (void); GtkWidget* create_Prices_Dialog (void); GtkWidget* create_Price_Dialog (void); -GtkWidget* create_Commodities_Dialog (void); diff --git a/src/gnome/glade/Makefile.am b/src/gnome/glade/Makefile.am new file mode 100644 index 0000000000..ce5f768f25 --- /dev/null +++ b/src/gnome/glade/Makefile.am @@ -0,0 +1,10 @@ +gladedir = $(GNC_GLADE_DIR) +glade_DATA = \ + commodity.glade + +STRING_FILES = \ + commodity_strings.c + +EXTRA_DIST = $(glade_DATA) $(STRING_FILES) + + diff --git a/src/gnome/glade/commodity.glade b/src/gnome/glade/commodity.glade new file mode 100644 index 0000000000..e4c71188fd --- /dev/null +++ b/src/gnome/glade/commodity.glade @@ -0,0 +1,256 @@ + + + + + Glade + glade + + + + C + True + True + False + False + False + False + True + commodity_strings.c + + + + GnomeDialog + Commodities Dialog + Commodities + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + True + False + False + False + + + GtkVBox + GnomeDialog:vbox + vbox127 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + hbuttonbox6 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + close_button + True + True + GNOME_STOCK_BUTTON_CLOSE + + + + + GtkHBox + hbox107 + False + 2 + + 0 + True + True + + + + GtkFrame + frame51 + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVBox + vbox128 + False + 0 + + + GtkCheckButton + show_currencies_button + 3 + True + + False + True + + 0 + False + False + + + + + GtkScrolledWindow + scrolledwindow33 + 3 + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + GtkCList + commodity_list + True + 5 + 80,80,80,80,80 + GTK_SELECTION_SINGLE + True + GTK_SHADOW_IN + + + GtkLabel + CList:title + label8477426 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label8477427 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label8477428 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label8477429 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label8477430 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + + GtkHButtonBox + hbuttonbox7 + 3 + GTK_BUTTONBOX_SPREAD + 30 + 85 + 27 + 7 + 0 + + 0 + False + False + + + + GtkButton + add_button + Add a new price. + True + True + + + + + GtkButton + remove_button + Remove the current price + True + True + + + + + GtkButton + edit_button + True + True + + + + + + + + + + diff --git a/src/gnome/glade/commodity_strings.c b/src/gnome/glade/commodity_strings.c new file mode 100644 index 0000000000..13e5a2dec7 --- /dev/null +++ b/src/gnome/glade/commodity_strings.c @@ -0,0 +1,19 @@ +/* + * Translatable strings file generated by Glade. + * Add this file to your project's POTFILES.in. + * DO NOT compile it as part of your application. + */ + +gchar *s = N_("Commodities"); +gchar *s = N_("Commodities"); +gchar *s = N_("Show National Currencies"); +gchar *s = N_("Type"); +gchar *s = N_("Symbol"); +gchar *s = N_("Name"); +gchar *s = N_("Code"); +gchar *s = N_("Fraction"); +gchar *s = N_("Add a new price."); +gchar *s = N_("Add"); +gchar *s = N_("Remove the current price"); +gchar *s = N_("Remove"); +gchar *s = N_("Edit"); diff --git a/src/gnome/gnc-dialogs.glade b/src/gnome/gnc-dialogs.glade index 57002d17b3..c56b2be416 100644 --- a/src/gnome/gnc-dialogs.glade +++ b/src/gnome/gnc-dialogs.glade @@ -11400,239 +11400,4 @@ Unknown - - GnomeDialog - Commodities Dialog - Commodities - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - vbox127 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox6 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - close_button - True - True - GNOME_STOCK_BUTTON_CLOSE - - - - - GtkHBox - hbox107 - False - 2 - - 0 - True - True - - - - GtkFrame - frame51 - 3 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkVBox - vbox128 - False - 0 - - - GtkCheckButton - show_currencies_button - 3 - True - - False - True - - 0 - False - False - - - - - GtkScrolledWindow - scrolledwindow33 - 3 - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - GtkCList - commodity_list - True - 5 - 80,80,80,80,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN - - - GtkLabel - CList:title - label8477426 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label8477427 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label8477428 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label8477429 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label8477430 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkHButtonBox - hbuttonbox7 - 3 - GTK_BUTTONBOX_SPREAD - 30 - 85 - 27 - 7 - 0 - - 0 - False - False - - - - GtkButton - add_button - Add a new price. - True - True - - - - - GtkButton - remove_button - Remove the current price - True - True - - - - - GtkButton - edit_button - True - True - - - - - - - - - diff --git a/src/gnome/gnc-dir.h.in b/src/gnome/gnc-dir.h.in index b541dc68b8..ee45e2894d 100644 --- a/src/gnome/gnc-dir.h.in +++ b/src/gnome/gnc-dir.h.in @@ -23,7 +23,8 @@ #ifndef __GNC_DIR_H__ #define __GNC_DIR_H__ -#define GNC_PIXMAP_DIR "@-GNC_PIXMAP_DIR-@" #define GNC_ACCOUNTS_DIR "@-GNC_ACCOUNTS_DIR-@" +#define GNC_GLADE_DIR "@-GNC_GLADE_DIR-@" +#define GNC_PIXMAP_DIR "@-GNC_PIXMAP_DIR-@" #endif