/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto
*
* 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
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#endif
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkcombo.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkhbbox.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkcheckbutton.h>
-#include "intl.h"
#include "inputdialog.h"
#include "manage_window.h"
#include "gtkutils.h"
static InputDialogType type;
static GtkWidget *dialog;
+static GtkWidget *msg_title;
static GtkWidget *msg_label;
static GtkWidget *entry;
static GtkWidget *combo;
+static GtkWidget *remember_chkbtn;
static GtkWidget *ok_button;
-
-static void input_dialog_create (void);
+static GtkWidget *icon_q, *icon_p;
+static gboolean is_pass = FALSE;
+static void input_dialog_create (gboolean is_password);
static gchar *input_dialog_open (const gchar *title,
const gchar *message,
- const gchar *default_string);
+ const gchar *default_string,
+ gboolean *remember);
static void input_dialog_set (const gchar *title,
const gchar *message,
const gchar *default_string);
static gint delete_event (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
-static void key_pressed (GtkWidget *widget,
+static gboolean key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void entry_activated (GtkEditable *editable);
if (dialog && GTK_WIDGET_VISIBLE(dialog)) return NULL;
if (!dialog)
- input_dialog_create();
+ input_dialog_create(FALSE);
type = INPUT_DIALOG_NORMAL;
gtk_widget_hide(combo);
gtk_widget_show(entry);
+
+ gtk_widget_hide(remember_chkbtn);
+
+ gtk_widget_show(icon_q);
+ gtk_widget_hide(icon_p);
+ is_pass = FALSE;
gtk_entry_set_visibility(GTK_ENTRY(entry), TRUE);
- return input_dialog_open(title, message, default_string);
+ return input_dialog_open(title, message, default_string, NULL);
}
gchar *input_dialog_with_invisible(const gchar *title, const gchar *message,
if (dialog && GTK_WIDGET_VISIBLE(dialog)) return NULL;
if (!dialog)
- input_dialog_create();
+ input_dialog_create(TRUE);
type = INPUT_DIALOG_INVISIBLE;
gtk_widget_hide(combo);
gtk_widget_show(entry);
+ gtk_widget_hide(remember_chkbtn);
+
+ gtk_widget_hide(icon_q);
+ gtk_widget_show(icon_p);
+ is_pass = TRUE;
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
- return input_dialog_open(title, message, default_string);
+ return input_dialog_open(title, message, default_string, NULL);
}
gchar *input_dialog_combo(const gchar *title, const gchar *message,
const gchar *default_string, GList *list,
gboolean case_sensitive)
+{
+ return input_dialog_combo_remember(title, message,
+ default_string, list, case_sensitive, NULL);
+}
+
+gchar *input_dialog_combo_remember(const gchar *title, const gchar *message,
+ const gchar *default_string, GList *list,
+ gboolean case_sensitive, gboolean *remember)
{
if (dialog && GTK_WIDGET_VISIBLE(dialog)) return NULL;
if (!dialog)
- input_dialog_create();
+ input_dialog_create(FALSE);
type = INPUT_DIALOG_COMBO;
gtk_widget_hide(entry);
gtk_widget_show(combo);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remember_chkbtn), FALSE);
+ if (remember)
+ gtk_widget_show(remember_chkbtn);
+ else
+ gtk_widget_hide(remember_chkbtn);
+
+ gtk_widget_show(icon_q);
+ gtk_widget_hide(icon_p);
+ is_pass = FALSE;
+
if (!list) {
GList empty_list;
gtk_combo_set_case_sensitive(GTK_COMBO(combo), case_sensitive);
- return input_dialog_open(title, message, default_string);
+ return input_dialog_open(title, message, default_string, remember);
}
gchar *input_dialog_query_password(const gchar *server, const gchar *user)
return pass;
}
-static void input_dialog_create(void)
+static void input_dialog_create(gboolean is_password)
{
- GtkWidget *vbox;
+ static PangoFontDescription *font_desc;
+ GtkWidget *w_hbox;
GtkWidget *hbox;
- GtkWidget *confirm_area;
+ GtkWidget *vbox;
GtkWidget *cancel_button;
+ GtkWidget *confirm_area;
dialog = gtk_dialog_new();
- gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, FALSE);
- gtk_widget_set_usize(dialog, INPUT_DIALOG_WIDTH, -1);
- gtk_container_set_border_width
- (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
- gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
- GTK_SIGNAL_FUNC(delete_event), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog), "key_press_event",
- GTK_SIGNAL_FUNC(key_pressed), NULL);
- MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
- gtk_widget_realize(dialog);
+ gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 375, 100);
+ gtk_window_set_title(GTK_WINDOW(dialog), "");
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
- vbox = gtk_vbox_new(FALSE, 8);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
-
- hbox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(dialog), "delete_event",
+ G_CALLBACK(delete_event), NULL);
+ g_signal_connect(G_OBJECT(dialog), "key_press_event",
+ G_CALLBACK(key_pressed), NULL);
+ MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
+ hbox = gtk_hbox_new (FALSE, 12);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
+ FALSE, FALSE, 0);
+
+ /* for title label */
+ w_hbox = gtk_hbox_new(FALSE, 0);
+
+ icon_q = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION,
+ GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (icon_q), 0.5, 0.0);
+ gtk_box_pack_start (GTK_BOX (hbox), icon_q, FALSE, FALSE, 0);
+ icon_p = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION,
+ GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (icon_p), 0.5, 0.0);
+ gtk_box_pack_start (GTK_BOX (hbox), icon_p, FALSE, FALSE, 0);
+
+ vbox = gtk_vbox_new (FALSE, 12);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+ gtk_widget_show (vbox);
+
+ msg_title = gtk_label_new("");
+ gtk_misc_set_alignment(GTK_MISC(msg_title), 0, 0.5);
+ gtk_label_set_justify(GTK_LABEL(msg_title), GTK_JUSTIFY_LEFT);
+ gtk_label_set_use_markup (GTK_LABEL (msg_title), TRUE);
+ gtk_box_pack_start(GTK_BOX(vbox), msg_title, FALSE, FALSE, 0);
+ gtk_label_set_line_wrap(GTK_LABEL(msg_title), TRUE);
+ if (!font_desc) {
+ gint size;
+
+ size = pango_font_description_get_size
+ (msg_title->style->font_desc);
+ font_desc = pango_font_description_new();
+ pango_font_description_set_weight
+ (font_desc, PANGO_WEIGHT_BOLD);
+ pango_font_description_set_size
+ (font_desc, size * PANGO_SCALE_LARGE);
+ }
+ if (font_desc)
+ gtk_widget_modify_font(msg_title, font_desc);
+
msg_label = gtk_label_new("");
- gtk_box_pack_start(GTK_BOX(hbox), msg_label, FALSE, FALSE, 0);
+ gtk_misc_set_alignment(GTK_MISC(msg_label), 0, 0.5);
gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_LEFT);
-
+ gtk_box_pack_start(GTK_BOX(vbox), msg_label, FALSE, FALSE, 0);
+ gtk_widget_show(msg_label);
+
entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(entry), "activate",
- GTK_SIGNAL_FUNC(entry_activated), NULL);
+ g_signal_connect(G_OBJECT(entry), "activate",
+ G_CALLBACK(entry_activated), NULL);
combo = gtk_combo_new();
gtk_box_pack_start(GTK_BOX(vbox), combo, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(GTK_COMBO(combo)->entry), "activate",
- GTK_SIGNAL_FUNC(combo_activated), NULL);
-
- gtkut_button_set_create(&confirm_area,
- &ok_button, _("OK"),
- &cancel_button, _("Cancel"),
- NULL, NULL);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
- confirm_area);
- gtk_widget_grab_default(ok_button);
+ g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "activate",
+ G_CALLBACK(combo_activated), NULL);
+
+ remember_chkbtn = gtk_check_button_new_with_label(_("Remember this"));
+ gtk_box_pack_start(GTK_BOX(vbox), remember_chkbtn, FALSE, FALSE, 0);
+
+ hbox = gtk_hbox_new(TRUE, 0);
- gtk_signal_connect(GTK_OBJECT(ok_button), "clicked",
- GTK_SIGNAL_FUNC(ok_clicked), NULL);
- gtk_signal_connect(GTK_OBJECT(cancel_button), "clicked",
- GTK_SIGNAL_FUNC(cancel_clicked), NULL);
+ gtkut_stock_button_set_create(&confirm_area,
+ &cancel_button, GTK_STOCK_CANCEL,
+ &ok_button, GTK_STOCK_OK,
+ NULL, NULL);
+ gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
+ confirm_area, FALSE, FALSE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);
gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
+
+ gtk_widget_hide(remember_chkbtn);
+
+ if (is_password)
+ gtk_widget_hide(icon_q);
+ else
+ gtk_widget_hide(icon_p);
+
+ is_pass = is_password;
+
+ gtk_widget_grab_default(ok_button);
+
+ g_signal_connect(G_OBJECT(ok_button), "clicked",
+ G_CALLBACK(ok_clicked), NULL);
+ g_signal_connect(G_OBJECT(cancel_button), "clicked",
+ G_CALLBACK(cancel_clicked), NULL);
}
static gchar *input_dialog_open(const gchar *title, const gchar *message,
- const gchar *default_string)
+ const gchar *default_string, gboolean *remember)
{
gchar *str;
if (dialog && GTK_WIDGET_VISIBLE(dialog)) return NULL;
if (!dialog)
- input_dialog_create();
+ input_dialog_create(FALSE);
input_dialog_set(title, message, default_string);
gtk_widget_show(dialog);
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remember_chkbtn), FALSE);
+ if (remember)
+ gtk_widget_show(remember_chkbtn);
+ else
+ gtk_widget_hide(remember_chkbtn);
+
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
manage_window_set_transient(GTK_WINDOW(dialog));
editable = GTK_EDITABLE(entry);
str = gtk_editable_get_chars(editable, 0, -1);
- if (str && *str == '\0') {
+ if (str && *str == '\0' && !is_pass) {
g_free(str);
str = NULL;
}
GTK_EVENTS_FLUSH();
- debug_print("return string = %s\n", str ? str : "(none)");
+ if (remember) {
+ *remember = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remember_chkbtn));
+ }
+ if (is_pass)
+ debug_print("return string = %s\n", str ? "********": ("none"));
+ else
+ debug_print("return string = %s\n", str ? str : "(none)");
return str;
}
entry_ = entry;
gtk_window_set_title(GTK_WINDOW(dialog), title);
+ gtk_label_set_text(GTK_LABEL(msg_title), title);
gtk_label_set_text(GTK_LABEL(msg_label), message);
if (default_string && *default_string) {
gtk_entry_set_text(GTK_ENTRY(entry_), default_string);
- gtk_entry_set_position(GTK_ENTRY(entry_), 0);
- gtk_entry_select_region(GTK_ENTRY(entry_), 0, -1);
+ gtk_editable_set_position(GTK_EDITABLE(entry_), 0);
+ gtk_editable_select_region(GTK_EDITABLE(entry_), 0, -1);
} else
gtk_entry_set_text(GTK_ENTRY(entry_), "");
return TRUE;
}
-static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
if (event && event->keyval == GDK_Escape) {
ack = FALSE;
fin = TRUE;
+ } else if (event && event->keyval == GDK_Return) {
+ ack = TRUE;
+ fin = TRUE;
+ return TRUE; /* do not let Return pass - it
+ * pops up the combo on validating */
}
+
+ return FALSE;
}
static void entry_activated(GtkEditable *editable)
projects / claws.git / blobdiff