0b5acb6141
2003-03-07 Jeffrey Stedfast <fejj@ximian.com> All this snot just to fix bug #38925 and an attempt to fix bug #38926 (but it seems no matter what I do, I can't work around the bonoboness/modality/whatever of the shell's preferences dialog). * mail-account-gui.c (sig_add_new_signature): Get the toplevel parent GtkWindow and pass that along to mail_composer_prefs_new_signature() so that window layering can be done correctly. * mail-composer-prefs.c (mail_composer_prefs_new_signature): Simplify. We don't want to add the signature to the list until after they have saved. (sig_edit_cb): Pass FALSE as the is_new argument to mail_signature_editor(). (sig_event_client): Listen for signatures being added. (mail_composer_prefs_new_signature): Now takes a GtkWindow arg as the first arg rather than a MailComposerPrefs arg since we don't really need it to be a MailComposerPrefs object. We'd rather use the first arg as the parent GtkWindow so that we can set transience for the editor window. * mail-signature-editor.c (mail_signature_editor): Now takes a 'parent' argument (so we can set transient_for()) and a 'is_new' argument specifying whether the editor is editing a new signature or not. If it is, when the user saves, it will be added to the signature list. otherwise it won't. (sig_name_changed): Only use the mail_config_signature_set_name() interface if it is *not* a new signature. (menu_file_save_cb): If is_new, then save the signature to the config - otherwise do what we did before and set the modifications to it and emit the CHANGED event. * mail-config.c (mail_config_signature_new): Renamed from mail_config_signature_add(). We no longer immediately add the signature to the list of saved signatures. (mail_config_signature_add): New function which adds the signature and emits the SIG_ADDED event. svn path=/trunk/; revision=20221
136 lines
3.7 KiB
C
136 lines
3.7 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
|
/*
|
|
* Authors: Jeffrey Stedfast <fejj@ximian.com>
|
|
*
|
|
* Copyright 2002 Ximian, Inc. (www.ximian.com)
|
|
*
|
|
* 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 Street #330, Boston, MA 02111-1307, USA.
|
|
*
|
|
*/
|
|
|
|
|
|
#ifndef __MAIL_COMPOSER_PREFS_H__
|
|
#define __MAIL_COMPOSER_PREFS_H__
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#pragma }
|
|
#endif
|
|
|
|
#include <gtk/gtk.h>
|
|
#include <glade/glade.h>
|
|
#include <gtkhtml/gtkhtml.h>
|
|
#warning "re-add gtkhtml prop manager"
|
|
/* this isn't ported in gtkhtml yet */
|
|
/*#include <gtkhtml/gtkhtml-propmanager.h>*/
|
|
|
|
#include <libgnomeui/gnome-color-picker.h>
|
|
#include <libgnomeui/gnome-file-entry.h>
|
|
#include <gconf/gconf-client.h>
|
|
|
|
#include "mail-signature-editor.h"
|
|
|
|
#include "evolution-config-control.h"
|
|
|
|
#include <shell/Evolution.h>
|
|
#include "Spell.h"
|
|
|
|
#define MAIL_COMPOSER_PREFS_TYPE (mail_composer_prefs_get_type ())
|
|
#define MAIL_COMPOSER_PREFS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MAIL_COMPOSER_PREFS_TYPE, MailComposerPrefs))
|
|
#define MAIL_COMPOSER_PREFS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MAIL_COMPOSER_PREFS_TYPE, MailComposerPrefsClass))
|
|
#define IS_MAIL_COMPOSER_PREFS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MAIL_COMPOSER_PREFS_TYPE))
|
|
#define IS_MAIL_COMPOSER_PREFS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MAIL_COMPOSER_PREFS_TYPE))
|
|
|
|
typedef struct _MailComposerPrefs MailComposerPrefs;
|
|
typedef struct _MailComposerPrefsClass MailComposerPrefsClass;
|
|
|
|
struct _MailComposerPrefs {
|
|
GtkVBox parent_object;
|
|
|
|
EvolutionConfigControl *control;
|
|
|
|
GConfClient *gconf;
|
|
|
|
GladeXML *gui;
|
|
|
|
/* General tab */
|
|
|
|
/* Default Behavior */
|
|
GtkToggleButton *send_html;
|
|
GtkToggleButton *auto_smileys;
|
|
GtkToggleButton *prompt_empty_subject;
|
|
GtkToggleButton *prompt_bcc_only;
|
|
GtkOptionMenu *charset;
|
|
|
|
/* Spell Checking */
|
|
struct _GtkHTMLPropmanager *pman;
|
|
GtkToggleButton *spell_check;
|
|
GnomeColorPicker *colour;
|
|
GtkTreeView *language;
|
|
CORBA_sequence_GNOME_Spell_Language *language_seq;
|
|
gboolean spell_active;
|
|
char *language_str;
|
|
char *language_str_orig;
|
|
GdkColor spell_error_color;
|
|
GdkColor spell_error_color_orig;
|
|
GdkPixmap *mark_pixmap;
|
|
GdkBitmap *mark_bitmap;
|
|
GdkPixbuf *enabled_pixbuf;
|
|
GtkWidget *spell_able_button;
|
|
|
|
/* Forwards and Replies */
|
|
GtkOptionMenu *forward_style;
|
|
GtkOptionMenu *reply_style;
|
|
|
|
/* Keyboard Shortcuts */
|
|
GtkOptionMenu *shortcuts_type;
|
|
|
|
/* Signatures */
|
|
GtkTreeView *sig_list;
|
|
GtkButton *sig_add;
|
|
GtkButton *sig_edit;
|
|
GtkButton *sig_delete;
|
|
GtkHTML *sig_preview;
|
|
gboolean sig_switch;
|
|
int sig_row;
|
|
GladeXML *sig_script_gui;
|
|
GtkWidget *sig_script_dialog;
|
|
};
|
|
|
|
struct _MailComposerPrefsClass {
|
|
GtkVBoxClass parent_class;
|
|
|
|
/* signals */
|
|
|
|
};
|
|
|
|
|
|
GType mail_composer_prefs_get_type (void);
|
|
|
|
GtkWidget *mail_composer_prefs_new (void);
|
|
|
|
void mail_composer_prefs_apply (MailComposerPrefs *prefs);
|
|
|
|
MailConfigSignature *mail_composer_prefs_new_signature (GtkWindow *parent, gboolean html, const char *script);
|
|
|
|
/* needed by global config */
|
|
#define MAIL_COMPOSER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl"
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* __MAIL_COMPOSER_PREFS_H__ */
|