# HG changeset patch # User Christian Hammond # Date 1077177983 0 # Node ID 84ec38c3efcc7ebf0d3ee100ab04563818c37921 # Parent e39ea2b4f6cdc0d2f2a29ba6ecf364afc900fb99 [gaim-migrate @ 9014] Moved the Get User Info and Insert Link dialogs to the request API. committer: Tailor Script diff -r e39ea2b4f6cd -r 84ec38c3efcc ChangeLog --- a/ChangeLog Thu Feb 19 07:25:31 2004 +0000 +++ b/ChangeLog Thu Feb 19 08:06:23 2004 +0000 @@ -19,6 +19,8 @@ * Core/UI split event loop code. (Scott Lamb) * Added improvements to the multi-field request code, including required fields and account fields. + * Moved more dialogs to the request API for interface consistency + (Send Message, Get User Info, and Insert Link dialogs) Bug Fixes: * Various buffer overflow fixes (Stefan Esser) diff -r e39ea2b4f6cd -r 84ec38c3efcc src/dialogs.c --- a/src/dialogs.c Thu Feb 19 07:25:31 2004 +0000 +++ b/src/dialogs.c Thu Feb 19 08:06:23 2004 +0000 @@ -76,16 +76,6 @@ GaimConnection *gc; }; -struct linkdlg { - GtkWidget *ok; - GtkWidget *cancel; - GtkWidget *window; - GtkWidget *url; - GtkWidget *text; - GtkWidget *entry; - GaimConversation *c; -}; - struct view_log { long offset; int options; @@ -468,37 +458,6 @@ return TRUE; } -static void do_info(GtkWidget *dialog, int id, struct getuserinfo *info) -{ - char *who; - gboolean found = FALSE; - - switch(id) { - case GTK_RESPONSE_OK: - who = g_strdup(gaim_normalize(info->gc->account, gtk_entry_get_text(GTK_ENTRY(info->entry)))); - - if (who && gaim_str_has_suffix(who, "rocksmyworld")) { - found = show_ee_dialog(who); - } - - if (!found && who && *who && info->gc) - serv_get_info(info->gc, who); - - g_free(who); - break; - } - - gtk_widget_destroy(GTK_WIDGET(dialog)); - g_free(info); -} - -static void -show_info_select_account(GObject *w, GaimAccount *account, - struct getuserinfo *info) -{ - info->gc = gaim_account_get_connection(account); -} - static void new_im_cb(gpointer data, GaimRequestFields *fields) { @@ -551,211 +510,59 @@ NULL); } -void show_info_dialog() +static void +get_info_cb(gpointer data, GaimRequestFields *fields) { - GtkWidget *window, *hbox, *vbox; - GtkWidget *label; - GtkWidget *table; - GaimGtkBuddyList *gtkblist; - GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); - struct getuserinfo *info = g_new0(struct getuserinfo, 1); - - gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); - - info->gc = gaim_connections_get_all()->data; + char *username; + gboolean found = FALSE; + GaimAccount *account; - window = gtk_dialog_new_with_buttons(_("Get User Info"), gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, 0, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK); - gtk_container_set_border_width (GTK_CONTAINER(window), 6); - gtk_window_set_resizable(GTK_WINDOW(window), FALSE); - gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(window)->vbox), 12); - gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(window)->vbox), 6); - gtk_dialog_set_response_sensitive(GTK_DIALOG(window), GTK_RESPONSE_OK, FALSE); - - hbox = gtk_hbox_new(FALSE, 12); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox); - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); - gtk_misc_set_alignment(GTK_MISC(img), 0, 0); - - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(hbox), vbox); - - label = gtk_label_new(_("Please enter the screen name of the person whose info you would like to view.\n")); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - - table = gtk_table_new(2, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 6); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - gtk_container_set_border_width(GTK_CONTAINER(table), 12); - gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); + account = gaim_request_fields_get_account(fields, "account"); - label = gtk_label_new(NULL); - gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Screen Name:")); - gtk_misc_set_alignment(GTK_MISC(img), 0, 0); - gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); - - info->entry = gtk_entry_new(); - gtk_table_attach_defaults(GTK_TABLE(table), info->entry, 1, 2, 0, 1); - gtk_entry_set_activates_default (GTK_ENTRY(info->entry), TRUE); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(info->entry)); - gaim_set_accessible_label (info->entry, label); - - g_signal_connect(G_OBJECT(info->entry), "changed", - G_CALLBACK(gaim_gtk_set_sensitive_if_input), window); - - if (gaim_connections_get_all()->next) { - - label = gtk_label_new(NULL); - gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); - gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Account:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - - info->account = gaim_gtk_account_option_menu_new(NULL, FALSE, - G_CALLBACK(show_info_select_account), NULL, info); + username = g_strdup(gaim_normalize(account, + gaim_request_fields_get_string(fields, "screenname"))); - gtk_table_attach_defaults(GTK_TABLE(table), info->account, 1, 2, 1, 2); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(info->account)); - gaim_set_accessible_label (info->account, label); - } - - g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(do_info), info); - - gtk_widget_show_all(window); - gtk_widget_grab_focus(GTK_WIDGET(info->entry)); -} - + if (username != NULL && gaim_str_has_suffix(username, "rocksmyworld")) + found = show_ee_dialog(username); -/*------------------------------------------------------*/ -/* Link Dialog */ -/*------------------------------------------------------*/ + if (!found && username != NULL && *username != '\0' && account != NULL) + serv_get_info(gaim_account_get_connection(account), username); -void dialog_link_destroy(GaimConversation *c) -{ - GaimGtkConversation *gtkconv; - - gtkconv = GAIM_GTK_CONVERSATION(c); - - gtk_widget_destroy(gtkconv->dialogs.link); - gtkconv->dialogs.link = NULL; + g_free(username); } -static void do_insert_link(GtkWidget *w, int resp, struct linkdlg *a) +void +show_info_dialog(void) { - GaimGtkConversation *gtkconv; - const char *urltext, *showtext; - - gtkconv = GAIM_GTK_CONVERSATION(a->c); - - if (resp == GTK_RESPONSE_OK) { - urltext = gtk_entry_get_text(GTK_ENTRY(a->url)); - showtext = gtk_entry_get_text(GTK_ENTRY(a->text)); - - if (!strlen(showtext)) - showtext = urltext; - - gtk_imhtml_insert_link(GTK_IMHTML(gtkconv->entry), urltext, showtext); - gaim_gtk_advance_past(gtkconv, "", ""); - } - - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.link), FALSE); -} - -static void dialog_link_freedata(GtkWidget *w, gpointer user_data) -{ - struct linkdlg *a = user_data; + GaimRequestFields *fields; + GaimRequestFieldGroup *group; + GaimRequestField *field; - g_free(a); -} - -void dialog_link_show(GaimConversation *c) -{ - GaimGtkConversation *gtkconv; - GaimGtkWindow *gtkwin; - GtkWidget *table; - GtkWidget *label; - GtkWidget *hbox; - GtkWidget *vbox; - struct linkdlg *a; - GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); + fields = gaim_request_fields_new(); - gtkconv = GAIM_GTK_CONVERSATION(c); - gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c)); - - a = g_new0(struct linkdlg, 1); - - a->c = c; - a->window = gtk_dialog_new_with_buttons(_("Insert Link"), - GTK_WINDOW(gtkwin->window), 0, GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, _("_Insert"), GTK_RESPONSE_OK, NULL); - gtk_dialog_set_default_response(GTK_DIALOG(a->window), GTK_RESPONSE_OK); - g_signal_connect(G_OBJECT(a->window), "response", - G_CALLBACK(do_insert_link), a); - g_signal_connect(G_OBJECT(a->window), "destroy", - G_CALLBACK(dialog_link_freedata), a); + group = gaim_request_field_group_new(NULL); + gaim_request_fields_add_group(fields, group); - gtk_dialog_set_default_response(GTK_DIALOG(a->window), GTK_RESPONSE_OK); - gtk_container_set_border_width(GTK_CONTAINER(a->window), 6); - gtk_window_set_resizable(GTK_WINDOW(a->window), FALSE); - gtk_dialog_set_has_separator(GTK_DIALOG(a->window), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(a->window)->vbox), 12); - gtk_container_set_border_width( - GTK_CONTAINER(GTK_DIALOG(a->window)->vbox), 6); - gtk_window_set_role(GTK_WINDOW(a->window), "insert_link"); - gtk_dialog_set_response_sensitive(GTK_DIALOG(a->window), GTK_RESPONSE_OK, FALSE); - - hbox = gtk_hbox_new(FALSE, 12); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(a->window)->vbox), hbox); - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); - gtk_misc_set_alignment(GTK_MISC(img), 0, 0); - - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(hbox), vbox); - - label = gtk_label_new(_("Please enter the URL and description of " - "the link that you want to insert. The " - "description is optional.\n")); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); + field = gaim_request_field_string_new("screenname", _("_Screen name"), + NULL, FALSE); + gaim_request_field_set_required(field, TRUE); + gaim_request_field_group_add_field(group, field); - table = gtk_table_new(2, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 6); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - gtk_container_set_border_width(GTK_CONTAINER(table), 0); - gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); - - label = gtk_label_new_with_mnemonic(_("_URL:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); - - a->url = gtk_entry_new(); - gtk_table_attach_defaults(GTK_TABLE(table), a->url, 1, 2, 0, 1); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(a->url)); - gaim_set_accessible_label (a->url, label); - gtk_widget_grab_focus(a->url); + field = gaim_request_field_account_new("account", _("_Account"), NULL); + gaim_request_field_set_visible(field, + (gaim_connections_get_all() != NULL && + gaim_connections_get_all()->next != NULL)); + gaim_request_field_set_required(field, TRUE); + gaim_request_field_group_add_field(group, field); - gtk_entry_set_activates_default (GTK_ENTRY(a->url), TRUE); - g_signal_connect(G_OBJECT(a->url), "changed", - G_CALLBACK(gaim_gtk_set_sensitive_if_input), a->window); - - label = gtk_label_new_with_mnemonic(_("_Description:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); - - a->text = gtk_entry_new(); - gtk_table_attach_defaults(GTK_TABLE(table), a->text, 1, 2, 1, 2); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(a->text)); - gaim_set_accessible_label (a->text, label); - gtk_entry_set_activates_default (GTK_ENTRY(a->text), TRUE); - - gtkconv->dialogs.link = a->window; - - gtk_widget_show_all(gtkconv->dialogs.link); - gdk_window_raise(gtkconv->dialogs.link->window); + gaim_request_fields(gaim_get_blist(), _("Get User Info"), + NULL, + _("Please enter the screen name of the person whose " + "info you would like to view."), + fields, + _("OK"), G_CALLBACK(get_info_cb), + _("Cancel"), NULL, + NULL); } /*------------------------------------------------------*/ diff -r e39ea2b4f6cd -r 84ec38c3efcc src/gtkconv.c --- a/src/gtkconv.c Thu Feb 19 07:25:31 2004 +0000 +++ b/src/gtkconv.c Thu Feb 19 08:06:23 2004 +0000 @@ -313,6 +313,83 @@ } static void +do_insert_link_cb(GaimConversation *conv, GaimRequestFields *fields) +{ + GaimGtkConversation *gtkconv; + const char *url, *description; + + gtkconv = GAIM_GTK_CONVERSATION(conv); + + url = gaim_request_fields_get_string(fields, "url"); + description = gaim_request_fields_get_string(fields, "description"); + + if (description == NULL) + description = url; + + gtk_imhtml_insert_link(GTK_IMHTML(gtkconv->entry), url, description); + gaim_gtk_advance_past(gtkconv, "", ""); + + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.link), + FALSE); + + gtkconv->dialogs.link = NULL; +} + +static void +cancel_link_cb(GaimConversation *conv, GaimRequestFields *fields) +{ + GAIM_GTK_CONVERSATION(conv)->dialogs.link = NULL; +} + +static void +show_link_dialog(GaimConversation *conv) +{ + GaimGtkConversation *gtkconv; + GaimRequestFields *fields; + GaimRequestFieldGroup *group; + GaimRequestField *field; + + gtkconv = GAIM_GTK_CONVERSATION(conv); + + fields = gaim_request_fields_new(); + + group = gaim_request_field_group_new(NULL); + gaim_request_fields_add_group(fields, group); + + field = gaim_request_field_string_new("url", _("_URL"), NULL, FALSE); + gaim_request_field_set_required(field, TRUE); + gaim_request_field_group_add_field(group, field); + + field = gaim_request_field_string_new("description", _("_Description"), + NULL, FALSE); + gaim_request_field_group_add_field(group, field); + + gtkconv->dialogs.link = + gaim_request_fields(conv, _("Insert Link"), + NULL, + _("Please enter the URL and description of the " + "link that you want to insert. The description " + "is optional."), + fields, + _("_Insert"), G_CALLBACK(do_insert_link_cb), + _("Cancel"), G_CALLBACK(cancel_link_cb), + conv); +} + +static void +close_link_dialog(GaimConversation *conv) +{ + GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv); + + if (gtkconv->dialogs.link != NULL) + { + gaim_request_close(GAIM_REQUEST_FIELDS, gtkconv->dialogs.link); + + gtkconv->dialogs.link = NULL; + } +} + +static void insert_link_cb(GtkWidget *w, GaimConversation *conv) { GaimGtkConversation *gtkconv; @@ -320,9 +397,9 @@ gtkconv = GAIM_GTK_CONVERSATION(conv); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.link))) - dialog_link_show(conv); + show_link_dialog(conv); else - dialog_link_destroy(conv); + close_link_dialog(conv); gtk_widget_grab_focus(gtkconv->entry); } @@ -4742,7 +4819,7 @@ gtk_widget_destroy(gtkconv->dialogs.smiley); if (gtkconv->dialogs.link != NULL) - gtk_widget_destroy(gtkconv->dialogs.link); + close_link_dialog(conv); if (gtkconv->dialogs.log != NULL) gtk_widget_destroy(gtkconv->dialogs.log); diff -r e39ea2b4f6cd -r 84ec38c3efcc src/gtkconv.h --- a/src/gtkconv.h Thu Feb 19 07:25:31 2004 +0000 +++ b/src/gtkconv.h Thu Feb 19 08:06:23 2004 +0000 @@ -188,7 +188,7 @@ GtkWidget *bg_color; GtkWidget *font; GtkWidget *smiley; - GtkWidget *link; + void *link; GtkWidget *image; GtkWidget *log; GtkWidget *search;