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

Make the message composer use a EScrollFrame for the attachment bar

Browse Source 
and make the quit message I18N aware.

svn path=/trunk/; revision=3533
This commit is contained in:
Ettore Perazzoli
2000-06-12 20:29:39 +00:00
parent 860fb187ff
commit c845d685bb
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
composer/ChangeLog
View File

@ -1,3 +1,12 @@
2000-06-12 Ettore Perazzoli <ettore@helixcode.com>
* e-msg-composer.c: Make the `attachment_scroll_frame' an
`EScrollFrame'.
(exit_cb): I18N the quit message.
* e-msg-composer.h: `attachment_scrolled_window' renamed to
`attachment_scroll_frame'.
2000-06-12 Dan Winship <danw@helixcode.com>
* e-msg-composer.c (format_text): Don't break on non-breaking

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

@ -35,17 +35,18 @@
#endif
#include <errno.h>
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <bonobo.h>
#include <bonobo/bonobo-stream-memory.h>
#include "e-util/e-html-utils.h"
#include "e-util/e-setup.h"
#include <glade/glade.h>
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <camel/camel.h>
#include "e-util/e-html-utils.h"
#include "e-util/e-setup.h"
#include "widgets/misc/e-scroll-frame.h"
#include "e-msg-composer.h"
#include "e-msg-composer-address-dialog.h"
#include "e-msg-composer-attachment-bar.h"
@ -418,10 +419,10 @@ show_attachments (EMsgComposer *composer,
gboolean show)
{
if (show) {
gtk_widget_show (composer->attachment_scrolled_window);
gtk_widget_show (composer->attachment_scroll_frame);
gtk_widget_show (composer->attachment_bar);
} else {
gtk_widget_hide (composer->attachment_scrolled_window);
gtk_widget_hide (composer->attachment_scroll_frame);
gtk_widget_hide (composer->attachment_bar);
}
@ -498,7 +499,7 @@ exit_cb (GtkWidget *widget, gpointer data)
GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (data),
GTK_TYPE_WINDOW));
gnome_ok_cancel_dialog_parented ("Discard this message?",
gnome_ok_cancel_dialog_parented (_("Discard this message?"),
exit_dialog_cb, composer, parent);
}
@ -749,7 +750,7 @@ init (EMsgComposer *composer)
composer->address_dialog = NULL;
composer->attachment_bar = NULL;
composer->attachment_scrolled_window = NULL;
composer->attachment_scroll_frame = NULL;
}
@ -818,17 +819,16 @@ e_msg_composer_construct (EMsgComposer *composer)
/* Attachment editor, wrapped into a GtkScrolledWindow. We don't
show it for now. */
composer->attachment_scrolled_window = gtk_scrolled_window_new (NULL,
NULL);
gtk_scrolled_window_set_policy
(GTK_SCROLLED_WINDOW (composer->attachment_scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
composer->attachment_scroll_frame = e_scroll_frame_new (NULL, NULL);
e_scroll_frame_set_policy (E_SCROLL_FRAME (composer->attachment_scroll_frame),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
composer->attachment_bar = e_msg_composer_attachment_bar_new (NULL);
GTK_WIDGET_SET_FLAGS (composer->attachment_bar, GTK_CAN_FOCUS);
gtk_container_add (GTK_CONTAINER (composer->attachment_scrolled_window),
gtk_container_add (GTK_CONTAINER (composer->attachment_scroll_frame),
composer->attachment_bar);
gtk_box_pack_start (GTK_BOX (vbox),
composer->attachment_scrolled_window,
composer->attachment_scroll_frame,
FALSE, TRUE, GNOME_PAD_SMALL);
gtk_signal_connect (GTK_OBJECT (composer->attachment_bar), "changed",

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

@ -57,7 +57,7 @@ struct _EMsgComposer {
GtkWidget *editor;
GtkWidget *attachment_bar;
GtkWidget *attachment_scrolled_window;
GtkWidget *attachment_scroll_frame;
GtkWidget *address_dialog;