diff --git a/ChangeLog b/ChangeLog index 351c5989d2..390b97d779 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2001-03-31 Dave Peticolas + * src/gnome/dialog-utils.c (gnc_get_gdk_imlib_image): new func + * src/scm/report.scm: translate report name * src/gnome/window-main.c: fix some i18n bugs diff --git a/src/gnome/dialog-utils.c b/src/gnome/dialog-utils.c index ed58418e9f..25244e7e9c 100644 --- a/src/gnome/dialog-utils.c +++ b/src/gnome/dialog-utils.c @@ -264,6 +264,30 @@ gnc_get_pixmap (const char *name) } +/********************************************************************\ + * gnc_get_imlib_image * + * returns a GdkImlibImage object given a pixmap filename * + * * + * Args: none * + * Returns: GnomePixmap widget or NULL if there was a problem * + \*******************************************************************/ +GdkImlibImage * +gnc_get_gdk_imlib_image (const char *name) +{ + GdkImlibImage *image; + + char *fullname; + + g_return_val_if_fail (name != NULL, NULL); + + fullname = g_strconcat (GNC_PIXMAP_DIR, "/", name, NULL); + image = gdk_imlib_load_image (fullname); + g_free (fullname); + + return image; +} + + /********************************************************************\ * gnc_get_toolbar_style * * returns the current toolbar style for gnucash toolbars * diff --git a/src/gnome/dialog-utils.h b/src/gnome/dialog-utils.h index b0b543ca65..86b1caa4e4 100644 --- a/src/gnome/dialog-utils.h +++ b/src/gnome/dialog-utils.h @@ -56,6 +56,7 @@ GtkWidget * gnc_build_option_menu (GNCOptionInfo *option_info, gint num_options); GtkWidget * gnc_get_pixmap (const char *name); +GdkImlibImage * gnc_get_gdk_imlib_image (const char *name); GtkToolbarStyle gnc_get_toolbar_style (void); diff --git a/src/gnome/druid-stock-split.c b/src/gnome/druid-stock-split.c index 00a3861968..44081723cc 100644 --- a/src/gnome/druid-stock-split.c +++ b/src/gnome/druid-stock-split.c @@ -717,7 +717,7 @@ gnc_stock_split_dialog (Account * initial) if (fill_account_list (info, initial) == 0) { - gnc_warning_dialog (_("You don't have any stock accounts!")); + gnc_warning_dialog (_("You don't have any stock accounts with balances!")); gnc_close_gui_component_by_data (DRUID_STOCK_SPLIT_CM_CLASS, info); return; } diff --git a/src/gnome/glade-gnc-dialogs.c b/src/gnome/glade-gnc-dialogs.c index b46359edc2..2eaba0f44d 100644 --- a/src/gnome/glade-gnc-dialogs.c +++ b/src/gnome/glade-gnc-dialogs.c @@ -3718,7 +3718,7 @@ create_New_Commodity_Format_Druid (void) GtkWidget *New_Commodity_Format_Druid; GtkWidget *commodity_druid; GtkWidget *start_page; - GdkColor start_page_bg_color = { 0, 39835, 49087, 40092 }; + GdkColor start_page_bg_color = { 0, 39320, 49087, 39320 }; GdkColor start_page_textbox_color = { 0, 65535, 65535, 65535 }; GdkColor start_page_logo_bg_color = { 0, 65535, 65535, 65535 }; GdkColor start_page_title_color = { 0, 65535, 65535, 65535 }; @@ -6197,11 +6197,11 @@ create_Stock_Split_Druid (void) { GtkWidget *Stock_Split_Druid; GtkWidget *stock_split_druid; - GtkWidget *druidpagestart2; - GdkColor druidpagestart2_bg_color = { 0, 6425, 6425, 28784 }; - GdkColor druidpagestart2_textbox_color = { 0, 65535, 65535, 65535 }; - GdkColor druidpagestart2_logo_bg_color = { 0, 65535, 65535, 65535 }; - GdkColor druidpagestart2_title_color = { 0, 65535, 65535, 65535 }; + GtkWidget *start_page; + GdkColor start_page_bg_color = { 0, 6425, 6425, 28784 }; + GdkColor start_page_textbox_color = { 0, 65535, 65535, 65535 }; + GdkColor start_page_logo_bg_color = { 0, 65535, 65535, 65535 }; + GdkColor start_page_title_color = { 0, 65535, 65535, 65535 }; GtkWidget *account_page; GdkColor account_page_bg_color = { 0, 6425, 6425, 28784 }; GdkColor account_page_logo_bg_color = { 0, 65535, 65535, 65535 }; @@ -6274,18 +6274,18 @@ create_Stock_Split_Druid (void) gtk_widget_show (stock_split_druid); gtk_container_add (GTK_CONTAINER (Stock_Split_Druid), stock_split_druid); - druidpagestart2 = gnome_druid_page_start_new (); - gtk_widget_ref (druidpagestart2); - gtk_object_set_data_full (GTK_OBJECT (Stock_Split_Druid), "druidpagestart2", druidpagestart2, + start_page = gnome_druid_page_start_new (); + gtk_widget_ref (start_page); + gtk_object_set_data_full (GTK_OBJECT (Stock_Split_Druid), "start_page", start_page, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (druidpagestart2); - gnome_druid_append_page (GNOME_DRUID (stock_split_druid), GNOME_DRUID_PAGE (druidpagestart2)); - gnome_druid_set_page (GNOME_DRUID (stock_split_druid), GNOME_DRUID_PAGE (druidpagestart2)); - gnome_druid_page_start_set_bg_color (GNOME_DRUID_PAGE_START (druidpagestart2), &druidpagestart2_bg_color); - gnome_druid_page_start_set_textbox_color (GNOME_DRUID_PAGE_START (druidpagestart2), &druidpagestart2_textbox_color); - gnome_druid_page_start_set_logo_bg_color (GNOME_DRUID_PAGE_START (druidpagestart2), &druidpagestart2_logo_bg_color); - gnome_druid_page_start_set_title_color (GNOME_DRUID_PAGE_START (druidpagestart2), &druidpagestart2_title_color); - gnome_druid_page_start_set_text (GNOME_DRUID_PAGE_START (druidpagestart2), _("This wizard will help you record a stock split or stock merger.")); + gtk_widget_show (start_page); + gnome_druid_append_page (GNOME_DRUID (stock_split_druid), GNOME_DRUID_PAGE (start_page)); + gnome_druid_set_page (GNOME_DRUID (stock_split_druid), GNOME_DRUID_PAGE (start_page)); + gnome_druid_page_start_set_bg_color (GNOME_DRUID_PAGE_START (start_page), &start_page_bg_color); + gnome_druid_page_start_set_textbox_color (GNOME_DRUID_PAGE_START (start_page), &start_page_textbox_color); + gnome_druid_page_start_set_logo_bg_color (GNOME_DRUID_PAGE_START (start_page), &start_page_logo_bg_color); + gnome_druid_page_start_set_title_color (GNOME_DRUID_PAGE_START (start_page), &start_page_title_color); + gnome_druid_page_start_set_text (GNOME_DRUID_PAGE_START (start_page), _("This wizard will help you record a stock split or stock merger.")); account_page = gnome_druid_page_standard_new_with_vals ("", NULL); gtk_widget_ref (account_page); diff --git a/src/gnome/gnc-dialogs.glade b/src/gnome/gnc-dialogs.glade index fa699e7834..e47fe6d4c1 100644 --- a/src/gnome/gnc-dialogs.glade +++ b/src/gnome/gnc-dialogs.glade @@ -5487,7 +5487,7 @@ update your accounts for the new version of Gnucash. Hit "Cancel" now to stop loading the file. 255,255,255 0,0,0 - 155,191,156 + 153,191,153 255,255,255 255,255,255 @@ -9174,7 +9174,7 @@ words. GnomeDruidPageStart - druidpagestart2 + start_page This wizard will help you record a stock split or stock merger. 255,255,255