r21857 - gnucash/trunk - Remove no longer used druid-utils (replaced with assistant-utils)
Geert Janssens
gjanssens at code.gnucash.org
Mon Jan 16 12:42:34 EST 2012
Author: gjanssens
Date: 2012-01-16 12:42:34 -0500 (Mon, 16 Jan 2012)
New Revision: 21857
Trac: http://svn.gnucash.org/trac/changeset/21857
Removed:
gnucash/trunk/src/gnome-utils/druid-utils.c
gnucash/trunk/src/gnome-utils/druid-utils.h
Modified:
gnucash/trunk/po/POTFILES.in
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome-utils/gnome-utils.i
gnucash/trunk/src/html/gnc-html.i
Log:
Remove no longer used druid-utils (replaced with assistant-utils)
With this, the code is no longer using any deprecated Gnome symbols
(though it still uses deprecated Glib and Gtk symbols).
Modified: gnucash/trunk/po/POTFILES.in
===================================================================
--- gnucash/trunk/po/POTFILES.in 2012-01-16 17:42:23 UTC (rev 21856)
+++ gnucash/trunk/po/POTFILES.in 2012-01-16 17:42:34 UTC (rev 21857)
@@ -267,7 +267,6 @@
src/gnome-utils/dialog-transfer.c
src/gnome-utils/dialog-userpass.c
src/gnome-utils/dialog-utils.c
-src/gnome-utils/druid-utils.c
src/gnome-utils/gnc-account-sel.c
src/gnome-utils/gnc-amount-edit.c
src/gnome-utils/gnc-autosave.c
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2012-01-16 17:42:23 UTC (rev 21856)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2012-01-16 17:42:34 UTC (rev 21857)
@@ -47,7 +47,6 @@
dialog-transfer.c \
dialog-userpass.c \
dialog-utils.c \
- druid-utils.c \
gnc-account-sel.c \
gnc-amount-edit.c \
gnc-autosave.c \
@@ -122,7 +121,6 @@
dialog-totd.h \
dialog-transfer.h \
dialog-utils.h \
- druid-utils.h \
gnc-account-sel.h \
gnc-amount-edit.h \
gnc-commodity-edit.h \
Deleted: gnucash/trunk/src/gnome-utils/druid-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/druid-utils.c 2012-01-16 17:42:23 UTC (rev 21856)
+++ gnucash/trunk/src/gnome-utils/druid-utils.c 2012-01-16 17:42:34 UTC (rev 21857)
@@ -1,155 +0,0 @@
-/********************************************************************\
- * druid-utils.c -- utility functions for creating druids *
- * Copyright (C) 2001 Jeremy Collins *
- * Copyright (C) 2001 Dave Peticolas <dave at krondo.com> *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
- * *
-\********************************************************************/
-
-#include "config.h"
-
-#include <libgnomeui/gnome-druid-page-edge.h>
-#include <libgnomeui/gnome-druid-page-standard.h>
-
-#include "dialog-utils.h"
-#include "druid-utils.h"
-#include "qof.h"
-#include "gnc-gnome-utils.h"
-
-void
-gnc_druid_set_watermark_images (GnomeDruid *druid,
- const char *top_path,
- const char *side_path)
-{
- GdkPixbuf *top_pixbuf, *side_pixbuf;
- GList *page_list, *item;
- GtkWidget *page;
-
- page_list = gtk_container_get_children(GTK_CONTAINER(druid));
- top_pixbuf = gnc_gnome_get_gdkpixbuf(top_path);
- side_pixbuf = gnc_gnome_get_gdkpixbuf(side_path);
-
- for (item = page_list; item; item = g_list_next(item))
- {
- page = item->data;
- if (GNOME_IS_DRUID_PAGE_EDGE (page))
- {
- GnomeDruidPageEdge *page_edge;
-
- page_edge = GNOME_DRUID_PAGE_EDGE (page);
- gnome_druid_page_edge_set_top_watermark (page_edge, top_pixbuf);
- gnome_druid_page_edge_set_watermark (page_edge, side_pixbuf);
- }
- else
- {
- GnomeDruidPageStandard *page_standard;
-
- page_standard = GNOME_DRUID_PAGE_STANDARD (page);
- gnome_druid_page_standard_set_top_watermark (page_standard, top_pixbuf);
- }
- }
-
- g_object_unref (G_OBJECT(side_pixbuf));
- g_object_unref (G_OBJECT(top_pixbuf));
- g_list_free(page_list);
-}
-
-void
-gnc_druid_set_logo_image (GnomeDruid *druid, char *image_path)
-{
- GdkPixbuf *logo_pixbuf;
- GList *page_list, *item;
- GtkWidget *page;
-
- page_list = gtk_container_get_children(GTK_CONTAINER(druid));
- logo_pixbuf = gnc_gnome_get_gdkpixbuf(image_path);
-
- for (item = page_list; item; item = g_list_next(item))
- {
- page = item->data;
- if (GNOME_IS_DRUID_PAGE_EDGE (page))
- {
- GnomeDruidPageEdge *page_edge;
-
- page_edge = GNOME_DRUID_PAGE_EDGE (page);
- gnome_druid_page_edge_set_logo (page_edge, logo_pixbuf);
- }
- else
- {
- GnomeDruidPageStandard *page_standard;
-
- page_standard = GNOME_DRUID_PAGE_STANDARD (page);
- gnome_druid_page_standard_set_logo (page_standard, logo_pixbuf);
- }
- }
-
- g_object_unref (G_OBJECT(logo_pixbuf));
- g_list_free(page_list);
-}
-
-void
-gnc_druid_set_colors (GnomeDruid *druid)
-{
- GList *pages = gtk_container_get_children (GTK_CONTAINER (druid));
- GList *item = pages;
- GdkColor bluish;
- GdkColor white;
- GdkColormap *cm;
-
- if (!druid) return;
- if (!GNOME_IS_DRUID (druid)) return;
-
- bluish.red = (gushort) (.40 * 65535);
- bluish.green = (gushort) (.40 * 65535);
- bluish.blue = (gushort) (.60 * 65535);
-
- white.red = 65535;
- white.green = 65535;
- white.blue = 65535;
-
- cm = gtk_widget_get_colormap (GTK_WIDGET (druid));
-
- gdk_colormap_alloc_color(cm, &bluish, FALSE, TRUE);
- gdk_colormap_alloc_color(cm, &white, FALSE, TRUE);
-
- while (item != NULL)
- {
- GnomeDruidPage *page = GNOME_DRUID_PAGE (item->data);
-
- if (GNOME_IS_DRUID_PAGE_EDGE (page))
- {
- GnomeDruidPageEdge *page_edge;
-
- page_edge = GNOME_DRUID_PAGE_EDGE (page);
- gnome_druid_page_edge_set_bg_color (page_edge, &bluish);
- gnome_druid_page_edge_set_logo_bg_color (page_edge, &bluish);
- }
- else
- {
- GnomeDruidPageStandard *page_standard;
-
- page_standard = GNOME_DRUID_PAGE_STANDARD (page);
- gnome_druid_page_standard_set_background (page_standard, &bluish);
- gnome_druid_page_standard_set_logo_background (page_standard, &bluish);
- gnome_druid_page_standard_set_title_foreground (page_standard, &white);
- }
- item = item->next;
- }
- g_list_free(pages);
-}
Deleted: gnucash/trunk/src/gnome-utils/druid-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/druid-utils.h 2012-01-16 17:42:23 UTC (rev 21856)
+++ gnucash/trunk/src/gnome-utils/druid-utils.h 2012-01-16 17:42:34 UTC (rev 21857)
@@ -1,35 +0,0 @@
-/********************************************************************\
- * druid-utils.h -- utility functions for creating druids *
- * Copyright (C) 2001 Jeremy Collins *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
- * *
-\********************************************************************/
-
-#ifndef DRUID_UTILS_H
-#define DRUID_UTILS_H
-
-#include <libgnomeui/gnome-druid.h>
-
-void gnc_druid_set_watermark_images (GnomeDruid *druid,
- const char *top_path,
- const char *side_path);
-void gnc_druid_set_logo_image (GnomeDruid *druid, char *image_path);
-void gnc_druid_set_colors (GnomeDruid *druid);
-
-#endif
Modified: gnucash/trunk/src/gnome-utils/gnome-utils.i
===================================================================
--- gnucash/trunk/src/gnome-utils/gnome-utils.i 2012-01-16 17:42:23 UTC (rev 21856)
+++ gnucash/trunk/src/gnome-utils/gnome-utils.i 2012-01-16 17:42:34 UTC (rev 21857)
@@ -6,7 +6,6 @@
#include <glib-object.h>
#include <dialog-options.h>
#include <dialog-utils.h>
-#include <druid-utils.h>
#include <gnc-amount-edit.h>
#include <gnc-date-edit.h>
#include <gnc-file.h>
Modified: gnucash/trunk/src/html/gnc-html.i
===================================================================
--- gnucash/trunk/src/html/gnc-html.i 2012-01-16 17:42:23 UTC (rev 21856)
+++ gnucash/trunk/src/html/gnc-html.i 2012-01-16 17:42:34 UTC (rev 21857)
@@ -6,7 +6,6 @@
#include <glib-object.h>
#include <dialog-options.h>
#include <dialog-utils.h>
-#include <druid-utils.h>
#include <gnc-amount-edit.h>
#include <gnc-date-edit.h>
#include <gnc-file.h>
More information about the gnucash-changes
mailing list