New `ETitleBar' widget. Also, moved the `EClippedLabel' widget out of

the `EShortcutBar' directory.

svn path=/trunk/; revision=3053

10 files changed, 477 insertions, 12 deletions

diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index 52ea1f7b0c..9ffbf1cf41 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,3 +1,7 @@
 
-SUBDIRS =	\
-	e-text meeting-time-sel shortcut-bar e-table 
+SUBDIRS =			\
+	e-text			\
+	e-table			\
+	meeting-time-sel	\
+	misc			\
+	shortcut-bar
diff --git a/widgets/misc/.cvsignore b/widgets/misc/.cvsignore
new file mode 100644
index 0000000000..47f6730268
--- /dev/null
+++ b/widgets/misc/.cvsignore
@@ -0,0 +1,8 @@
+.deps
+.libs
+.pure
+Makefile
+Makefile.in
+*.lo
+*.la
+test-title-bar
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
new file mode 100644
index 0000000000..c3599c98a6
--- /dev/null
+++ b/widgets/misc/Makefile.am
@@ -0,0 +1,27 @@
+# FIXME we use the EClippedLabel widget from EShortcutBar.  Probably
+# it should be moved somewhere else.
+
+INCLUDES =					\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/widgets/shortcut-bar	\
+	$(EXTRA_GNOME_CFLAGS)			\
+	-DG_LOG_DOMAIN=\"e-title-bar\"
+
+noinst_LIBRARIES =	\
+	libemiscwidgets.a
+
+libemiscwidgets_a_SOURCES = 	\
+	e-clipped-label.c	\
+	e-clipped-label.h	\
+	e-title-bar.c		\
+	e-title-bar.h
+
+noinst_PROGRAMS = 	\
+	test-title-bar
+
+test_title_bar_SOURCES = 	\
+	test-title-bar.c
+
+test_title_bar_LDADD = 						\
+	./libemiscwidgets.a					\
+	$(EXTRA_GNOME_LIBS)
diff --git a/widgets/shortcut-bar/e-clipped-label.c b/widgets/misc/e-clipped-label.c
index e6666ae451..e6666ae451 100644
--- a/widgets/shortcut-bar/e-clipped-label.c
+++ b/widgets/misc/e-clipped-label.c
diff --git a/widgets/shortcut-bar/e-clipped-label.h b/widgets/misc/e-clipped-label.h
index a21ceadeca..a21ceadeca 100644
--- a/widgets/shortcut-bar/e-clipped-label.h
+++ b/widgets/misc/e-clipped-label.h
diff --git a/widgets/misc/e-title-bar.c b/widgets/misc/e-title-bar.c
new file mode 100644
index 0000000000..a161e8145a
--- /dev/null
+++ b/widgets/misc/e-title-bar.c
@@ -0,0 +1,268 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-title-bar.c
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Ettore Perazzoli
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gtk/gtkbox.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkpixmap.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtktypeutils.h>
+
+#include "e-util/e-util.h"
+#include "e-clipped-label.h"
+
+#include "e-title-bar.h"
+
+
+enum {
+	TITLE_BUTTON_PRESS_EVENT,
+	CLOSE_BUTTON_CLICKED,
+	LAST_SIGNAL
+};
+static guint signals[LAST_SIGNAL] = { 0 };
+
+
+static char *close_button_xpm[] = {
+	"12 12 2 1",
+	" 	c none",
+	".	c #000000000000",
+	"            ",
+	" ..      .. ",
+	" ...    ... ",
+	"  ...  ...  ",
+	"   ......   ",
+	"    ....    ",
+	"    ....    ",
+	"   ......   ",
+	"  ...  ...  ",
+	" ...    ... ",
+	" ..      .. ",
+	"            "
+};
+
+#define PARENT_TYPE GTK_TYPE_FRAME
+static GtkFrameClass *parent_class = NULL;
+
+struct _ETitleBarPrivate {
+	GtkWidget *label;
+	GtkWidget *close_button;
+	GtkWidget *close_button_gtk_pixmap;
+};
+
+
+/* Child signal callbacks.  */
+
+static void
+close_button_realize_cb (GtkWidget *widget,
+			 gpointer data)
+{
+	GdkPixmap *close_button_pixmap;
+	GdkBitmap *close_button_mask;
+	ETitleBar *title_bar;
+	ETitleBarPrivate *priv;
+
+	title_bar = E_TITLE_BAR (data);
+	priv = title_bar->priv;
+
+	if (priv->close_button_gtk_pixmap != NULL)
+		return;
+
+	close_button_pixmap = gdk_pixmap_create_from_xpm_d (GTK_WIDGET (priv->close_button)->window,
+							    &close_button_mask,
+							    NULL, close_button_xpm);
+	priv->close_button_gtk_pixmap = gtk_pixmap_new (close_button_pixmap, close_button_mask);
+
+	gtk_container_add (GTK_CONTAINER (priv->close_button), priv->close_button_gtk_pixmap);
+	gtk_widget_show (priv->close_button_gtk_pixmap);
+}
+
+static void
+close_button_clicked_cb (GtkButton *button,
+			 gpointer data)
+{
+	ETitleBar *title_bar;
+
+	title_bar = E_TITLE_BAR (data);
+
+	gtk_signal_emit (GTK_OBJECT (title_bar), signals[CLOSE_BUTTON_CLICKED]);
+}
+
+static void
+label_button_press_event_cb (GtkWidget *widget,
+			     GdkEventButton *event,
+			     gpointer data)
+{
+	ETitleBar *title_bar;
+
+	title_bar = E_TITLE_BAR (data);
+
+	gtk_signal_emit (GTK_OBJECT (title_bar), signals[TITLE_BUTTON_PRESS_EVENT], event);
+}
+
+
+/* GtkObject methods.  */
+
+static void
+destroy (GtkObject *object)
+{
+	ETitleBar *title_bar;
+	ETitleBarPrivate *priv;
+
+	title_bar = E_TITLE_BAR (object);
+	priv = title_bar->priv;
+
+	g_free (priv);
+
+	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
+
+
+static void
+class_init (ETitleBarClass *klass)
+{
+	GtkObjectClass *object_class;
+
+	object_class = (GtkObjectClass*) klass;
+	object_class->destroy = destroy;
+
+	parent_class = gtk_type_class (gtk_frame_get_type ());
+
+	signals[TITLE_BUTTON_PRESS_EVENT] = 
+		gtk_signal_new ("title_button_press_event",
+				GTK_RUN_FIRST,
+				object_class->type,
+				GTK_SIGNAL_OFFSET (ETitleBarClass, title_button_press_event),
+				gtk_marshal_NONE__POINTER,
+				GTK_TYPE_NONE, 1,
+				GTK_TYPE_GDK_EVENT);
+
+	signals[CLOSE_BUTTON_CLICKED] = 
+		gtk_signal_new ("close_button_clicked",
+				GTK_RUN_FIRST,
+				object_class->type,
+				GTK_SIGNAL_OFFSET (ETitleBarClass, close_button_clicked),
+				gtk_marshal_NONE__NONE,
+				GTK_TYPE_NONE, 0);
+
+	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+}
+
+static void
+init (ETitleBar *title_bar)
+{
+	ETitleBarPrivate *priv;
+
+	priv = g_new (ETitleBarPrivate, 1);
+
+	priv->label                   = NULL;
+	priv->close_button            = NULL;
+	priv->close_button_gtk_pixmap = NULL;
+
+	title_bar->priv = priv;
+}
+
+
+void
+e_title_bar_construct (ETitleBar *title_bar,
+		       const char *title)
+{
+	ETitleBarPrivate *priv;
+	GtkWidget *hbox;
+
+	g_return_if_fail (title_bar != NULL);
+	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
+
+	priv = title_bar->priv;
+
+	priv->label = e_clipped_label_new (title);
+	gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
+	gtk_widget_show (priv->label);
+
+	priv->close_button = gtk_button_new ();
+	GTK_WIDGET_UNSET_FLAGS (priv->close_button, GTK_CAN_FOCUS);
+	gtk_container_set_border_width (GTK_CONTAINER (priv->close_button), 1);
+	gtk_button_set_relief (GTK_BUTTON (priv->close_button), GTK_RELIEF_NONE);
+	gtk_widget_show (priv->close_button);
+
+	hbox = gtk_hbox_new (FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), priv->label, TRUE, TRUE, 2);
+	gtk_box_pack_start (GTK_BOX (hbox), priv->close_button, FALSE, TRUE, 1);
+	gtk_widget_show (hbox);
+
+	gtk_container_add (GTK_CONTAINER (title_bar), hbox);
+
+	gtk_signal_connect (GTK_OBJECT (priv->close_button), "realize",
+			    GTK_SIGNAL_FUNC (close_button_realize_cb), title_bar);
+	gtk_signal_connect (GTK_OBJECT (priv->close_button), "clicked",
+			    GTK_SIGNAL_FUNC (close_button_clicked_cb), title_bar);
+	gtk_signal_connect (GTK_OBJECT (priv->label), "button_press_event",
+			    GTK_SIGNAL_FUNC (label_button_press_event_cb), title_bar);
+}
+
+GtkWidget *
+e_title_bar_new (const char *title)
+{
+	ETitleBar *title_bar;
+
+	title_bar = gtk_type_new (e_title_bar_get_type ());
+
+	e_title_bar_construct (title_bar, title);
+
+	return GTK_WIDGET (title_bar);
+}
+
+
+void
+e_title_bar_set_title (ETitleBar *title_bar,
+		       const char *title)
+{
+	g_return_if_fail (title_bar != NULL);
+	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
+
+	gtk_label_set_text (GTK_LABEL (title_bar->priv->label), title);
+}
+
+void
+e_title_bar_show_close_button (ETitleBar *title_bar,
+			       gboolean show)
+{
+	ETitleBarPrivate *priv;
+
+	g_return_if_fail (title_bar != NULL);
+	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
+
+	priv = title_bar->priv;
+
+	if (show)
+		gtk_widget_show (priv->close_button);
+	else
+		gtk_widget_hide (priv->close_button);
+}
+
+
+E_MAKE_TYPE (e_title_bar, "ETitleBar", ETitleBar, class_init, init, PARENT_TYPE)
diff --git a/widgets/misc/e-title-bar.h b/widgets/misc/e-title-bar.h
new file mode 100644
index 0000000000..ce7d23b07b
--- /dev/null
+++ b/widgets/misc/e-title-bar.h
@@ -0,0 +1,79 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-title-bar.h
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Ettore Perazzoli
+ */
+
+#ifndef __E_TITLE_BAR_H__
+#define __E_TITLE_BAR_H__
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gtk/gtkframe.h>
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#define E_TYPE_TITLE_BAR			(e_title_bar_get_type ())
+#define E_TITLE_BAR(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_TITLE_BAR, ETitleBar))
+#define E_TITLE_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TITLE_BAR, ETitleBarClass))
+#define E_IS_TITLE_BAR(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_TITLE_BAR))
+#define E_IS_TITLE_BAR_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_TITLE_BAR))
+
+
+typedef struct _ETitleBar        ETitleBar;
+typedef struct _ETitleBarPrivate ETitleBarPrivate;
+typedef struct _ETitleBarClass   ETitleBarClass;
+
+struct _ETitleBar {
+	GtkFrame parent;
+
+	ETitleBarPrivate *priv;
+};
+
+struct _ETitleBarClass {
+	GtkFrameClass parent_class;
+
+	/* Signals.  */
+
+	void (* title_button_press_event) (ETitleBar *title_bar, GdkEventButton *event);
+	void (* close_button_clicked)     (ETitleBar *title_bar);
+};
+
+
+GtkType    e_title_bar_get_type   (void);
+void       e_title_bar_construct  (ETitleBar  *title_bar,
+				   const char *title);
+GtkWidget *e_title_bar_new        (const char *title);
+
+void  e_title_bar_set_title          (ETitleBar  *title_bar,
+				      const char *title);
+void  e_title_bar_show_close_button  (ETitleBar  *title_bar,
+				      gboolean    show);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __E_TITLE_BAR_H__ */
diff --git a/widgets/misc/test-title-bar.c b/widgets/misc/test-title-bar.c
new file mode 100644
index 0000000000..fdca1ae0db
--- /dev/null
+++ b/widgets/misc/test-title-bar.c
@@ -0,0 +1,73 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-title-bar.c
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Ettore Perazzoli
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnome.h>
+
+#include "e-title-bar.h"
+
+static void
+delete_event_cb (GtkWidget *widget,
+		 GdkEventAny *event,
+		 gpointer data)
+{
+	gtk_main_quit ();
+}
+
+int
+main (int argc, char **argv)
+{
+	GtkWidget *app;
+	GtkWidget *title_bar;
+	GtkWidget *text;
+	GtkWidget *vbox;
+
+	gnome_init ("test-title-bar", "0.0", argc, argv);
+
+	app = gnome_app_new ("Test", "Test");
+	gtk_window_set_default_size (GTK_WINDOW (app), 400, 400);
+	gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, FALSE);
+
+	gtk_signal_connect (GTK_OBJECT (app), "delete_event", GTK_SIGNAL_FUNC (delete_event_cb), NULL);
+
+	title_bar = e_title_bar_new ("This is a very annoyingly long title bar");
+	gtk_widget_show (title_bar);
+
+	text = gtk_text_new (NULL, NULL);
+	gtk_widget_show (text);
+
+	vbox = gtk_vbox_new (FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), title_bar, FALSE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), text, TRUE, TRUE, 0);
+	gtk_widget_show (vbox);
+
+	gnome_app_set_contents (GNOME_APP (app), vbox);
+	gtk_widget_show (app);
+
+	gtk_main ();
+
+	return 0;
+}
diff --git a/widgets/shortcut-bar/ChangeLog b/widgets/shortcut-bar/ChangeLog
index 2e1d9ae51f..9b6be0117d 100644
--- a/widgets/shortcut-bar/ChangeLog
+++ b/widgets/shortcut-bar/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* e-clipped-label.c: Moved to $(top_srcdir)/widgets/misc.
+	* e-clipped-label.h: Likewise.
+	* Makefile.am: Updated accordingly.
+
 2000-05-07  Larry Ewing  <lewing@helixcode.com>
 
 	* e-icon-bar.h (struct _EIconBarItem): remove the no longer needed
diff --git a/widgets/shortcut-bar/Makefile.am b/widgets/shortcut-bar/Makefile.am
index 66893fefb0..2d7189d901 100644
--- a/widgets/shortcut-bar/Makefile.am
+++ b/widgets/shortcut-bar/Makefile.am
@@ -2,14 +2,13 @@
 noinst_LIBRARIES = libshortcut-bar.a
 noinst_PROGRAMS = test-shortcut-bar
 
-INCLUDES = \
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	$(EXTRA_GNOME_CFLAGS)				\
-	-DG_LOG_DOMAIN=\"shortcut-bar\" 
+INCLUDES = 					\
+	-I$(top_srcdir)/widgets/misc		\
+	-DEVOLUTION_VERSION=\""$(VERSION)"\"	\
+	$(EXTRA_GNOME_CFLAGS)			\
+	-DG_LOG_DOMAIN=\"shortcut-bar\"
 
 libshortcut_bar_a_SOURCES = 	\
-	e-clipped-label.c	\
-	e-clipped-label.h	\
 	e-group-bar.c		\
 	e-group-bar.h		\
 	e-icon-bar-bg-item.c	\
@@ -24,10 +23,11 @@ libshortcut_bar_a_SOURCES = 	\
 test_shortcut_bar_SOURCES = 	\
 	test-shortcut-bar.c
 
-test_shortcut_bar_LDADD = 	\
-	./libshortcut-bar.a	\
-	../e-text/libetext.a	\
-	../../e-util/libeutil.la\
+test_shortcut_bar_LDADD = 		\
+	./libshortcut-bar.a		\
+	../e-text/libetext.a		\
+	../misc/libemiscwidgets.a	\
+	../../e-util/libeutil.la	\
 	$(EXTRA_GNOME_LIBS)
 
 test_shortcut_bar_LDFLAGS =	\