callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use libglade for menus and toolbars in the message composer

Browse Source 
anymore.  This is the first step; next step is to use BonoboUIHandler.

svn path=/trunk/; revision=2010
This commit is contained in:
Ettore Perazzoli
2000-03-02 06:32:45 +00:00
parent 5f3b7f20ce
commit 6bddc9bd17
5 changed files with 17 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
composer/ChangeLog
View File

@ -1,3 +1,17 @@
2000-03-02 Ettore Perazzoli <ettore@helixcode.com>
* e-msg-composer.c (glade_connect): Removed.
(setup_signals): Removed.
(e_msg_composer_construct): Do not use libglade to set the toolbar
and menubar up.
(destroy): Removed libglade stuff.
(init): Likewise.
* e-msg-composer.h: Removed `menubar_gui', `toolbar_gui',
`appbar_gui'.
* e-msg-composer.glade: Removed.
2000-01-12 bertrand <bertrand@helixcode.com>
* Makefile.am (evolution_msg_composer_LDADD):

3
composer/Makefile.am
View File

@ -2,8 +2,7 @@ gladedir = $(datadir)/evolution/glade
glade_DATA = \
e-msg-composer-address-dialog.glade \
e-msg-composer-attachment.glade \
e-msg-composer.glade
e-msg-composer-attachment.glade
INCLUDES = \
-I$(top_srcdir) \

88
composer/e-msg-composer.c
View File

@ -125,11 +125,13 @@ show_attachments (EMsgComposer *composer,
/* Update the GUI. */
#if 0
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM
(glade_xml_get_widget (composer->menubar_gui,
"menu_view_attachments")),
show);
#endif
/* XXX we should update the toggle toolbar item as well. At
this point, it is not a toggle because Glade is broken. */
@ -257,23 +259,6 @@ address_dialog_cb (GtkWidget *widget,
gdk_window_show (composer->address_dialog->window);
}
static void
glade_connect (GladeXML *gui,
const gchar *widget_name,
const gchar *signal_name,
GtkSignalFunc callback,
gpointer callback_data)
{
GtkWidget *widget;
widget = glade_xml_get_widget (gui, widget_name);
if (widget == NULL)
g_warning ("Widget `%s' was not found.", widget_name);
else
gtk_signal_connect (GTK_OBJECT (widget), signal_name,
GTK_SIGNAL_FUNC (callback), callback_data);
}
static void
attachment_bar_changed (EMsgComposerAttachmentBar *bar,
gpointer data)
@ -288,47 +273,6 @@ attachment_bar_changed (EMsgComposerAttachmentBar *bar,
e_msg_composer_show_attachments (composer, FALSE);
}
static void
setup_signals (EMsgComposer *composer)
{
glade_connect (composer->menubar_gui, "menu_send",
"activate", GTK_SIGNAL_FUNC (send_cb), composer);
glade_connect (composer->toolbar_gui, "toolbar_send",
"clicked", GTK_SIGNAL_FUNC (send_cb), composer);
glade_connect (composer->menubar_gui, "menu_view_attachments",
"activate",
GTK_SIGNAL_FUNC (menu_view_attachments_activate_cb),
composer);
glade_connect (composer->toolbar_gui, "toolbar_view_attachments",
"clicked",
GTK_SIGNAL_FUNC (toolbar_view_attachments_clicked_cb),
composer);
glade_connect (composer->menubar_gui, "menu_add_attachment",
"activate",
GTK_SIGNAL_FUNC (add_attachment_cb), composer);
glade_connect (composer->toolbar_gui, "toolbar_add_attachment",
"clicked",
GTK_SIGNAL_FUNC (add_attachment_cb), composer);
glade_connect (composer->menubar_gui, "menubar_address_dialog",
"activate",
GTK_SIGNAL_FUNC (address_dialog_cb), composer);
glade_connect (composer->toolbar_gui, "toolbar_address_dialog",
"clicked",
GTK_SIGNAL_FUNC (address_dialog_cb), composer);
gtk_signal_connect (GTK_OBJECT (composer->attachment_bar),
"changed",
GTK_SIGNAL_FUNC (attachment_bar_changed),
composer);
gtk_signal_connect (GTK_OBJECT (composer->hdrs), "show_address_dialog",
GTK_SIGNAL_FUNC (address_dialog_cb),
composer);
}
/* GtkObject methods. */
@ -339,10 +283,6 @@ destroy (GtkObject *object)
composer = E_MSG_COMPOSER (object);
gtk_object_unref (GTK_OBJECT (composer->menubar_gui));
gtk_object_unref (GTK_OBJECT (composer->toolbar_gui));
gtk_object_unref (GTK_OBJECT (composer->appbar_gui));
if (composer->address_dialog != NULL)
gtk_widget_destroy (composer->address_dialog);
@ -384,10 +324,6 @@ class_init (EMsgComposerClass *klass)
static void
init (EMsgComposer *composer)
{
composer->menubar_gui = NULL;
composer->toolbar_gui = NULL;
composer->appbar_gui = NULL;
composer->hdrs = NULL;
composer->text = NULL;
@ -441,24 +377,6 @@ e_msg_composer_construct (EMsgComposer *composer)
gnome_app_construct (GNOME_APP (composer), "e-msg-composer",
"Compose a message");
composer->menubar_gui = glade_xml_new (E_GLADEDIR "/e-msg-composer.glade",
"menubar");
gnome_app_set_menus (GNOME_APP (composer),
GTK_MENU_BAR (glade_xml_get_widget (composer->menubar_gui,
"menubar")));
composer->toolbar_gui = glade_xml_new (E_GLADEDIR "/e-msg-composer.glade",
"toolbar");
gnome_app_set_toolbar (GNOME_APP (composer),
GTK_TOOLBAR (glade_xml_get_widget (composer->toolbar_gui,
"toolbar")));
composer->appbar_gui = glade_xml_new (E_GLADEDIR "/e-msg-composer.glade",
"appbar");
gnome_app_set_statusbar (GNOME_APP (composer),
glade_xml_get_widget (composer->appbar_gui,
"appbar"));
vbox = gtk_vbox_new (FALSE, 0);
composer->hdrs = e_msg_composer_hdrs_new ();
@ -502,8 +420,6 @@ e_msg_composer_construct (EMsgComposer *composer)
gtk_widget_show (vbox);
e_msg_composer_show_attachments (composer, FALSE);
setup_signals (composer);
}
/**

587
composer/e-msg-composer.glade
View File

@ -1,587 +0,0 @@
<?xml version="1.0"?>
<GTK-Interface>
<project>
<name>Message Composer</name>
<program_name>e-msg-composer</program_name>
<directory></directory>
<source_directory>src</source_directory>
<pixmaps_directory>pixmaps</pixmaps_directory>
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<use_widget_names>False</use_widget_names>
<output_main_file>True</output_main_file>
<output_support_files>True</output_support_files>
<output_build_files>True</output_build_files>
<backup_source_files>True</backup_source_files>
<main_source_file>interface.c</main_source_file>
<main_header_file>interface.h</main_header_file>
<handler_source_file>callbacks.c</handler_source_file>
<handler_header_file>callbacks.h</handler_header_file>
<support_source_file>support.c</support_source_file>
<support_header_file>support.h</support_header_file>
<translatable_strings_file></translatable_strings_file>
</project>
<widget>
<class>GnomeApp</class>
<name>app1</name>
<title>Message Composer</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<enable_layout_config>True</enable_layout_config>
<widget>
<class>GnomeDock</class>
<child_name>GnomeApp:dock</child_name>
<name>dock1</name>
<allow_floating>True</allow_floating>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GnomeDockItem</class>
<name>dockitem1</name>
<border_width>2</border_width>
<placement>GNOME_DOCK_TOP</placement>
<band>0</band>
<position>0</position>
<offset>0</offset>
<locked>False</locked>
<exclusive>True</exclusive>
<never_floating>False</never_floating>
<never_vertical>True</never_vertical>
<never_horizontal>False</never_horizontal>
<shadow_type>GTK_SHADOW_OUT</shadow_type>
<widget>
<class>GtkMenuBar</class>
<name>menubar</name>
<shadow_type>GTK_SHADOW_NONE</shadow_type>
<widget>
<class>GtkMenuItem</class>
<name>file</name>
<stock_item>GNOMEUIINFO_MENU_FILE_TREE</stock_item>
<widget>
<class>GtkMenu</class>
<name>file_menu</name>
<widget>
<class>GtkPixmapMenuItem</class>
<name>open</name>
<signal>
<name>activate</name>
<handler>on_open_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:25:08 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_OPEN_ITEM</stock_item>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>save</name>
<signal>
<name>activate</name>
<handler>on_save_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:25:13 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_SAVE_ITEM</stock_item>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>save_as</name>
<signal>
<name>activate</name>
<handler>on_save_as_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:25:16 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_SAVE_AS_ITEM</stock_item>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>save_in_folder</name>
<signal>
<name>activate</name>
<handler>on_save_in_folder_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:25:20 GMT</last_modification_time>
</signal>
<label>Save in _Folder...</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_SAVE_AS</stock_icon>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator8</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>menu_send</name>
<signal>
<name>activate</name>
<handler>on_send_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:25:29 GMT</last_modification_time>
</signal>
<label>S_end</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_MAIL_SND</stock_icon>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>postpone</name>
<signal>
<name>activate</name>
<handler>on_postpone_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:25:37 GMT</last_modification_time>
</signal>
<label>_Postpone</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator1</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>exit</name>
<signal>
<name>activate</name>
<handler>on_exit_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:25:59 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_EXIT_ITEM</stock_item>
</widget>
</widget>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>edit</name>
<stock_item>GNOMEUIINFO_MENU_EDIT_TREE</stock_item>
<widget>
<class>GtkMenu</class>
<name>edit_menu</name>
<widget>
<class>GtkPixmapMenuItem</class>
<name>undo</name>
<signal>
<name>activate</name>
<handler>on_undo_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:26:10 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_UNDO_ITEM</stock_item>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>redo</name>
<signal>
<name>activate</name>
<handler>on_redo_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:26:15 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_REDO_ITEM</stock_item>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator3</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>cut</name>
<signal>
<name>activate</name>
<handler>on_cut_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:26:21 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_CUT_ITEM</stock_item>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>copy</name>
<signal>
<name>activate</name>
<handler>on_copy_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:26:26 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_COPY_ITEM</stock_item>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>paste</name>
<signal>
<name>activate</name>
<handler>on_paste_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:26:31 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_PASTE_ITEM</stock_item>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator2</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>select_all</name>
<signal>
<name>activate</name>
<handler>on_select_all_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:26:37 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_SELECT_ALL_ITEM</stock_item>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator5</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>find</name>
<signal>
<name>activate</name>
<handler>on_find_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:26:42 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_FIND_ITEM</stock_item>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>find_again</name>
<signal>
<name>activate</name>
<handler>on_find_again_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:26:47 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_FIND_AGAIN_ITEM</stock_item>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>replace</name>
<signal>
<name>activate</name>
<handler>on_replace_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:26:53 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_REPLACE_ITEM</stock_item>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator6</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>properties</name>
<signal>
<name>activate</name>
<handler>on_properties_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:26:58 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_PROPERTIES_ITEM</stock_item>
</widget>
</widget>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>view1</name>
<stock_item>GNOMEUIINFO_MENU_VIEW_TREE</stock_item>
<widget>
<class>GtkMenu</class>
<name>view1_menu</name>
<widget>
<class>GtkCheckMenuItem</class>
<name>menu_view_attachments</name>
<signal>
<name>activate</name>
<handler>on_view_attachments_activate</handler>
<last_modification_time>Fri, 05 Nov 1999 18:31:16 GMT</last_modification_time>
</signal>
<label>Attachments</label>
<active>False</active>
<always_show_toggle>False</always_show_toggle>
</widget>
</widget>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>insert</name>
<label>_Insert</label>
<right_justify>False</right_justify>
<widget>
<class>GtkMenu</class>
<name>insert_menu</name>
<widget>
<class>GtkMenuItem</class>
<name>menu_add_attachment</name>
<signal>
<name>activate</name>
<handler>on_attachment_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:27:05 GMT</last_modification_time>
</signal>
<label>Attachment...</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>text_from_file</name>
<signal>
<name>activate</name>
<handler>on_text_from_file_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:27:16 GMT</last_modification_time>
</signal>
<label>Text from file...</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator6</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>hypertext_link</name>
<signal>
<name>activate</name>
<handler>on_hypertext_link_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:27:21 GMT</last_modification_time>
</signal>
<label>Hypertext link...</label>
<right_justify>False</right_justify>
</widget>
</widget>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>settings</name>
<stock_item>GNOMEUIINFO_MENU_SETTINGS_TREE</stock_item>
<widget>
<class>GtkMenu</class>
<name>settings_menu</name>
<widget>
<class>GtkPixmapMenuItem</class>
<name>preferences</name>
<signal>
<name>activate</name>
<handler>on_preferences_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:27:37 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_PREFERENCES_ITEM</stock_item>
</widget>
</widget>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>tools</name>
<label>_Tools</label>
<right_justify>False</right_justify>
<widget>
<class>GtkMenu</class>
<name>tools_menu</name>
<widget>
<class>GtkPixmapMenuItem</class>
<name>spell_check1</name>
<signal>
<name>activate</name>
<handler>on_spell_check_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:27:44 GMT</last_modification_time>
</signal>
<label>_Spell check</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_SPELLCHECK</stock_icon>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator7</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>check_names</name>
<signal>
<name>activate</name>
<handler>on_check_names_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:27:49 GMT</last_modification_time>
</signal>
<label>Check names</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>menubar_address_dialog</name>
<signal>
<name>activate</name>
<handler>on_address_book_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:27:53 GMT</last_modification_time>
</signal>
<label>Address book...</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_BOOK_RED</stock_icon>
</widget>
</widget>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>help</name>
<stock_item>GNOMEUIINFO_MENU_HELP_TREE</stock_item>
<widget>
<class>GtkMenu</class>
<name>help_menu</name>
<widget>
<class>GtkPixmapMenuItem</class>
<name>about</name>
<signal>
<name>activate</name>
<handler>on_about_activate</handler>
<last_modification_time>Wed, 27 Oct 1999 22:28:01 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_ABOUT_ITEM</stock_item>
</widget>
</widget>
</widget>
</widget>
</widget>
<widget>
<class>GnomeDockItem</class>
<name>dockitem2</name>
<border_width>1</border_width>
<placement>GNOME_DOCK_TOP</placement>
<band>1</band>
<position>0</position>
<offset>0</offset>
<locked>False</locked>
<exclusive>True</exclusive>
<never_floating>False</never_floating>
<never_vertical>False</never_vertical>
<never_horizontal>False</never_horizontal>
<shadow_type>GTK_SHADOW_OUT</shadow_type>
<widget>
<class>GtkToolbar</class>
<name>toolbar</name>
<border_width>1</border_width>
<orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
<type>GTK_TOOLBAR_BOTH</type>
<space_size>16</space_size>
<space_style>GTK_TOOLBAR_SPACE_LINE</space_style>
<relief>GTK_RELIEF_NONE</relief>
<tooltips>True</tooltips>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>toolbar_send</name>
<tooltip>Send this message</tooltip>
<label>Send
</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_MAIL_SND</stock_pixmap>
</widget>
<widget>
<class>GtkToggleButton</class>
<child_name>Toolbar:button</child_name>
<name>toolbar_view_attachments</name>
<tooltip>Show attachments for this message</tooltip>
<label>Show
attachments</label>
<active>False</active>
</widget>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>toolbar_add_attachment</name>
<tooltip>Attach a file</tooltip>
<label>Attach
file</label>
</widget>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>toolbar_address_dialog</name>
<tooltip>Go to addressbook</tooltip>
<label>Edit
addresses</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_BOOK_RED</stock_pixmap>
</widget>
</widget>
</widget>
<widget>
<class>Placeholder</class>
<child_name>GnomeDock:contents</child_name>
</widget>
</widget>
<widget>
<class>GnomeAppBar</class>
<child_name>GnomeApp:appbar</child_name>
<name>appbar</name>
<has_progress>True</has_progress>
<has_status>True</has_status>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
</widget>
</GTK-Interface>

4
composer/e-msg-composer.h
View File

@ -49,10 +49,6 @@ typedef struct _EMsgComposerClass EMsgComposerClass;
struct _EMsgComposer {
GnomeApp parent;
GladeXML *menubar_gui;
GladeXML *toolbar_gui;
GladeXML *appbar_gui;
GtkWidget *hdrs;
GtkWidget *text;