GNOME.org
 

[monkey-bubble: 273/753] Renamed to gnome-image-entry-component.[ch].

commit 124b76a988b413dd252a865a5f4f68b7c6b3e00d
Author: Martin Baulig <baulig suse de>
Date:   Wed May 9 11:44:24 2001 +0000

    Renamed to gnome-image-entry-component.[ch].
    
    2001-05-09  Martin Baulig  <baulig suse de>
    
    	* gnome-icon-entry.[ch]: Renamed to gnome-image-entry-component.[ch].
    
    	* gnome-image-entry-component.c: This is now a GnomeSelector component.

 libgnomeui/ChangeLog           |    9 ++
 libgnomeui/Makefile.am         |   17 ++--
 libgnomeui/gnome-image-entry.c |  164 ++++++++++++++++++++++++++++++++++++++++
 libgnomeui/gnome-image-entry.h |   82 ++++++++++++++++++++
 libgnomeui/libgnomeui.h        |    3 +-
 5 files changed, 266 insertions(+), 9 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index c537fe4..ebe33c5 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,5 +1,14 @@
 2001-05-09  Martin Baulig  <baulig suse de>
 
+	* gnome-icon-entry.[ch]: Renamed to gnome-image-entry-component.[ch].
+
+	* gnome-image-entry-component.c: This is now a GnomeSelector component.
+
+	* gnome-image-entry.[ch]: New files; this is a GnomeSelectorClient
+	wrapper for the GnomeImageEntryComponent.
+
+2001-05-09  Martin Baulig  <baulig suse de>
+
 	* gnome-entry.h (gnome_entry_new): Removed `history_id' argument.
 	(gnome_entry_new_full): Likewise.
 	* gnome-file-entry.h (gnome_file_entry_new): Likewise.
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index 7a3ee19..c95b185 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -64,7 +64,9 @@ unused_SOURCES = \
 	gnome-pouch.h			\
 	gnome-roo.h			\
 	gnome-helpsys.h			\
-	gnome-textfu.h
+	gnome-textfu.h			\
+	gnome-icon-selector.c		\
+	gnome-ditem-edit.c
 
 libgnomeui_2_la_SOURCES = \
 	gnome-stock-icons.c		\
@@ -75,7 +77,6 @@ libgnomeui_2_la_SOURCES = \
 	gnome-color-picker.c		\
 	gnome-cursors.c			\
 	gnome-dateedit.c		\
-	gnome-ditem-edit.c		\
 	gnome-druid.c			\
 	gnome-druid-page.c		\
 	gnome-druid-page-edge.c		\
@@ -83,12 +84,12 @@ libgnomeui_2_la_SOURCES = \
 	gnome-geometry.c		\
 	gnome-selector-client.c		\
 	gnome-entry.c			\
-	gnome-icon-selector.c		\
-	gnome-file-selector.c		\
+	gnome-file-entry.c		\
+	gnome-image-entry.c		\
+	gnome-image-entry-component.c	\
         gnome-font-picker.c		\
 	gnome-href.c			\
 	gnome-ice.c			\
-	gnome-icon-entry.c		\
 	gnome-init.c			\
 	gnome-less.c			\
 	gnome-pixmap.c			\
@@ -121,13 +122,14 @@ gnome_headers = \
 	gnome-druid-page-edge.h		\
 	gnome-druid-page-standard.h	\
 	gnome-entry.h			\
-	gnome-file-selector.h		\
+	gnome-file-entry.h		\
+	gnome-image-entry.h		\
+	gnome-image-entry-component.h	\
         gnome-font-picker.h		\
 	gnome-gconf.h			\
 	gnome-geometry.h		\
 	gnome-href.h			\
 	gnome-ice.h			\
-	gnome-icon-entry.h		\
 	gnome-icon-item.h		\
 	gnome-icon-list.h		\
 	gnome-icon-selector.h		\
@@ -137,7 +139,6 @@ gnome_headers = \
 	gnome-macros.h			\
         gnome-paper-selector.h		\
 	gnome-pixmap.h			\
-	gnome-selector.h		\
 	gnome-stock-icons.h		\
 	gnome-types.h			\
 	gnome-uidefs.h			\
diff --git a/libgnomeui/gnome-image-entry.c b/libgnomeui/gnome-image-entry.c
new file mode 100644
index 0000000..cbdd3c4
--- /dev/null
+++ b/libgnomeui/gnome-image-entry.c
@@ -0,0 +1,164 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ * All rights reserved.
+ *
+ * This file is part of the Gnome Library.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+/*
+  @NOTATION@
+ */
+
+/* GnomeImageEntry widget - combo box with auto-saved history
+ *
+ * Author: Federico Mena <federico nuclecu unam mx>
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtklist.h>
+#include <gtk/gtklistitem.h>
+#include <gtk/gtksignal.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-image-entry-component.h>
+#include "gnome-image-entry.h"
+
+struct _GnomeImageEntryPrivate {
+};
+	
+
+static void   gnome_image_entry_class_init   (GnomeImageEntryClass *class);
+static void   gnome_image_entry_init         (GnomeImageEntry      *gentry);
+static void   gnome_image_entry_finalize     (GObject         *object);
+
+static GnomeSelectorClientClass *parent_class;
+
+GType
+gnome_image_entry_get_type (void)
+{
+	static GType entry_type = 0;
+
+	if (!entry_type) {
+		GtkTypeInfo entry_info = {
+			"GnomeImageEntry",
+			sizeof (GnomeImageEntry),
+			sizeof (GnomeImageEntryClass),
+			(GtkClassInitFunc) gnome_image_entry_class_init,
+			(GtkObjectInitFunc) gnome_image_entry_init,
+			NULL,
+			NULL,
+			NULL
+		};
+
+		entry_type = gtk_type_unique (gnome_selector_client_get_type (), &entry_info);
+	}
+
+	return entry_type;
+}
+
+static void
+gnome_image_entry_class_init (GnomeImageEntryClass *class)
+{
+	GtkObjectClass *object_class;
+	GObjectClass *gobject_class;
+
+	object_class = (GtkObjectClass *) class;
+	gobject_class = (GObjectClass *) class;
+
+	parent_class = gtk_type_class (gnome_selector_client_get_type ());
+
+	gobject_class->finalize = gnome_image_entry_finalize;
+}
+
+static void
+gnome_image_entry_init (GnomeImageEntry *gentry)
+{
+	gentry->_priv = g_new0 (GnomeImageEntryPrivate, 1);
+}
+
+GtkWidget *
+gnome_image_entry_construct (GnomeImageEntry     *ientry,
+			     GNOME_Selector       corba_selector,
+			     Bonobo_UIContainer   uic)
+{
+	g_return_val_if_fail (ientry != NULL, NULL);
+	g_return_val_if_fail (GNOME_IS_IMAGE_ENTRY (ientry), NULL);
+	g_return_val_if_fail (corba_selector != CORBA_OBJECT_NIL, NULL);
+
+	return (GtkWidget *) gnome_selector_client_construct
+		(GNOME_SELECTOR_CLIENT (ientry), corba_selector, uic);
+}
+
+GtkWidget *
+gnome_image_entry_new_icon_entry (void)
+{
+	GnomeSelector *selector;
+
+	selector = g_object_new (gnome_image_entry_component_get_type (),
+				 "is_pixmap_entry", FALSE);
+
+	return gnome_image_entry_new_from_selector (BONOBO_OBJREF (selector),
+						    CORBA_OBJECT_NIL);
+}
+
+GtkWidget *
+gnome_image_entry_new_pixmap_entry (guint preview_x, guint preview_y)
+{
+	GnomeSelector *selector;
+
+	selector = g_object_new (gnome_image_entry_component_get_type (),
+				 "preview_x", preview_x, "preview_y", preview_y,
+				 "is_pixmap_entry", TRUE);
+
+	return gnome_image_entry_new_from_selector (BONOBO_OBJREF (selector),
+						    CORBA_OBJECT_NIL);
+}
+
+GtkWidget *
+gnome_image_entry_new_from_selector (GNOME_Selector     corba_selector,
+				     Bonobo_UIContainer uic)
+{
+	GnomeImageEntry *ientry;
+
+	g_return_val_if_fail (corba_selector != CORBA_OBJECT_NIL, NULL);
+
+	ientry = g_object_new (gnome_image_entry_get_type (), NULL);
+
+	return gnome_image_entry_construct (ientry, corba_selector, uic);
+}
+
+static void
+gnome_image_entry_finalize (GObject *object)
+{
+	GnomeImageEntry *ientry;
+
+	g_return_if_fail (object != NULL);
+	g_return_if_fail (GNOME_IS_IMAGE_ENTRY (object));
+
+	ientry = GNOME_IMAGE_ENTRY (object);
+
+	g_free (ientry->_priv);
+	ientry->_priv = NULL;
+
+	if (G_OBJECT_CLASS (parent_class)->finalize)
+		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+}
diff --git a/libgnomeui/gnome-image-entry.h b/libgnomeui/gnome-image-entry.h
new file mode 100644
index 0000000..97cf709
--- /dev/null
+++ b/libgnomeui/gnome-image-entry.h
@@ -0,0 +1,82 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ * All rights reserved.
+ *
+ * This file is part of the Gnome Library.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+/*
+  @NOTATION@
+ */
+
+/* GnomeImageEntry widget - combo box with auto-saved history
+ *
+ * Author: Federico Mena <federico nuclecu unam mx>
+ */
+
+#ifndef GNOME_IMAGE_ENTRY_H
+#define GNOME_IMAGE_ENTRY_H
+
+
+#include <libgnome/gnome-selector.h>
+#include <libgnomeui/gnome-selector-client.h>
+
+
+G_BEGIN_DECLS
+
+
+#define GNOME_TYPE_IMAGE_ENTRY            (gnome_image_entry_get_type ())
+#define GNOME_IMAGE_ENTRY(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_IMAGE_ENTRY, GnomeImageEntry))
+#define GNOME_IMAGE_ENTRY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_IMAGE_ENTRY, GnomeImageEntryClass))
+#define GNOME_IS_IMAGE_ENTRY(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_IMAGE_ENTRY))
+#define GNOME_IS_IMAGE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_IMAGE_ENTRY))
+
+
+typedef struct _GnomeImageEntry        GnomeImageEntry;
+typedef struct _GnomeImageEntryPrivate GnomeImageEntryPrivate;
+typedef struct _GnomeImageEntryClass   GnomeImageEntryClass;
+
+struct _GnomeImageEntry {
+	GnomeSelectorClient client;
+
+	/*< private >*/
+	GnomeImageEntryPrivate *_priv;
+};
+
+struct _GnomeImageEntryClass {
+	GnomeSelectorClientClass parent_class;
+};
+
+
+GType        gnome_image_entry_get_type          (void) G_GNUC_CONST;
+
+GtkWidget   *gnome_image_entry_new_icon_entry    (void);
+
+GtkWidget   *gnome_image_entry_new_pixmap_entry  (guint                preview_x,
+                                                  guint                preview_y);
+
+GtkWidget   *gnome_image_entry_new_from_selector (GNOME_Selector       corba_selector,
+						  Bonobo_UIContainer   uic);
+
+GtkWidget   *gnome_image_entry_construct         (GnomeImageEntry     *ientry,
+						  GNOME_Selector       corba_selector,
+						  Bonobo_UIContainer   uic);
+
+G_END_DECLS
+
+#endif
diff --git a/libgnomeui/libgnomeui.h b/libgnomeui/libgnomeui.h
index 30a4603..951f6b7 100644
--- a/libgnomeui/libgnomeui.h
+++ b/libgnomeui/libgnomeui.h
@@ -42,6 +42,8 @@
 #include <libgnomeui/gnome-color-picker.h>
 #include <libgnomeui/gnome-cursors.h>
 #include <libgnomeui/gnome-entry.h>
+#include <libgnomeui/gnome-file-entry.h>
+#include <libgnomeui/gnome-image-entry.h>
 #include <libgnomeui/gnome-font-picker.h>
 #include <libgnomeui/gnome-gconf.h>
 #include <libgnomeui/gnome-geometry.h>
@@ -49,7 +51,6 @@
 #include <libgnomeui/gnome-icon-list.h>
 #include <libgnomeui/gnome-icon-item.h>
 #include <libgnomeui/gnome-icon-selector.h>
-#include <libgnomeui/gnome-icon-entry.h>
 #include <libgnomeui/gnome-canvas-init.h>
 #include <libgnomeui/gnome-init.h>
 #include <libgnomeui/gnome-less.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]