aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2001-06-22 04:39:58 +0800
committerJP Rosevear <jpr@src.gnome.org>2001-06-22 04:39:58 +0800
commitb6ef512a92ba249dae20b73244111295e65d7061 (patch)
tree81c075e948c9be562de2e72ceeafa3ad64e4fcf4
parenta25dee40a79b660e39ba74fd2de93bc40559ca5c (diff)
downloadgsoc2013-evolution-b6ef512a92ba249dae20b73244111295e65d7061.tar.gz
gsoc2013-evolution-b6ef512a92ba249dae20b73244111295e65d7061.tar.zst
gsoc2013-evolution-b6ef512a92ba249dae20b73244111295e65d7061.zip
remove buttons and use evolution's standard ui config
2001-06-21 JP Rosevear <jpr@ximian.com> * gui/dialogs/comp-editor.c (setup_widgets): remove buttons and use evolution's standard ui config * gui/print.c (print_comp_item): print description text svn path=/trunk/; revision=10383
-rw-r--r--calendar/ChangeLog3
-rw-r--r--calendar/gui/dialogs/comp-editor.c36
2 files changed, 18 insertions, 21 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1f21e9dd78..d5da4ab1e2 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,8 @@
2001-06-21 JP Rosevear <jpr@ximian.com>
+ * gui/dialogs/comp-editor.c (setup_widgets): remove buttons and
+ use evolution's standard ui config
+
* gui/print.c (print_comp_item): print description text
2001-06-21 Rodrigo Moya <rodrigo@ximian.com>
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index f0fdf837a5..252d858e7f 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -35,6 +35,7 @@
#include <gal/widgets/e-unicode.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>
+#include <evolution-shell-component-utils.h>
#include "../print.h"
#include "save-comp.h"
#include "delete-comp.h"
@@ -101,6 +102,17 @@ static void close_clicked_cb (GtkWidget *widget, gpointer data);
static void help_clicked_cb (GtkWidget *widget, gpointer data);
static gint delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data);
+static EPixmap pixmaps [] =
+{
+ E_PIXMAP ("/menu/File/FilePrint", "print.xpm"),
+ E_PIXMAP ("/menu/File/FilePrintPreview", "print-preview.xpm"),
+
+ E_PIXMAP ("/Toolbar/Print", "print.xpm"),
+ E_PIXMAP ("/Toolbar/Print Preview", "print-preview.xpm"),
+
+ E_PIXMAP_END
+};
+
static BonoboUIVerb verbs [] = {
BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", save_close_cmd),
BONOBO_UI_UNSAFE_VERB ("FileSaveAs", save_as_cmd),
@@ -180,6 +192,9 @@ setup_widgets (CompEditor *editor)
container = bonobo_ui_container_new ();
bonobo_ui_container_set_win (container, BONOBO_WINDOW (priv->window));
bonobo_ui_component_set_container (priv->uic, BONOBO_OBJREF (container));
+ bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (priv->window)),
+ "/evolution/UIConf/kvps");
+ e_pixmaps_update (priv->uic, pixmaps);
bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR "/gnome/gui",
@@ -193,27 +208,6 @@ setup_widgets (CompEditor *editor)
priv->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->notebook),
TRUE, TRUE, 0);
-
- /* Buttons */
- bbox = gtk_hbutton_box_new ();
- gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
-
- pixmap = gnome_stock_pixmap_widget (NULL, GNOME_STOCK_PIXMAP_SAVE);
- button = gnome_pixmap_button (pixmap, _("Save"));
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
- GTK_SIGNAL_FUNC (save_clicked_cb), editor);
-
- button = gnome_stock_button (GNOME_STOCK_BUTTON_CLOSE);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
- GTK_SIGNAL_FUNC (close_clicked_cb), editor);
-
- button = gnome_stock_button (GNOME_STOCK_BUTTON_HELP);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
- GTK_SIGNAL_FUNC (help_clicked_cb), editor);
}
/* Object initialization function for the calendar component editor */