Mercurial > pidgin
changeset 11008:845a0dd5ca45
[gaim-migrate @ 12868]
sf patch #1211365, from Sadrul Habib Chowdhury
Show the modify account dialog with tabs
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 14 Jun 2005 02:03:58 +0000 |
| parents | d1a77ae75f23 |
| children | 926d2ff72899 |
| files | ChangeLog src/gtkaccount.c src/gtknotify.c |
| diffstat | 3 files changed, 24 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 14 01:19:52 2005 +0000 +++ b/ChangeLog Tue Jun 14 02:03:58 2005 +0000 @@ -37,6 +37,8 @@ * Attempt to detect the file type of a buddy icon when saving (Richard Laager) * Yahoo! Stealth Settings have been implemented. + * The modify account dialog now contains two tabs, which should display + better at lower resolutions (Sadrul Habib Chowdhury) Bug fixes: * People using input methods can now use Enter again.
--- a/src/gtkaccount.c Tue Jun 14 01:19:52 2005 +0000 +++ b/src/gtkaccount.c Tue Jun 14 02:03:58 2005 +0000 @@ -188,7 +188,7 @@ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 12); gtk_widget_show(widget); gaim_set_accessible_label (widget, label); @@ -466,14 +466,14 @@ GtkSelectionData *sd, guint info, guint t, AccountPrefsDialog *dialog) { gchar *name = sd->data; - + if ((sd->length >= 0) && (sd->format == 8)) { - /* Well, it looks like the drag event was cool. + /* Well, it looks like the drag event was cool. * Let's do something with it */ if (!g_ascii_strncasecmp(name, "file://", 7)) { GError *converr = NULL; gchar *tmp, *rtmp; - /* It looks like we're dealing with a local file. Let's + /* It looks like we're dealing with a local file. Let's * just untar it in the right place */ if(!(tmp = g_filename_from_uri(name, NULL, &converr))) { gaim_debug(GAIM_DEBUG_ERROR, "buddyicon", "%s\n", @@ -489,7 +489,7 @@ gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), dialog->icon_path); gtk_widget_show(dialog->icon_entry); g_free(tmp); - } + } gtk_drag_finish(dc, TRUE, FALSE, t); } gtk_drag_finish(dc, FALSE, FALSE, t); @@ -850,7 +850,7 @@ gtk_widget_show(vbox2); hbox2 = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, 12); gtk_widget_show(hbox2); button = gtk_button_new_from_stock(GTK_STOCK_OPEN); @@ -1223,7 +1223,7 @@ /* Setup the second vbox, which may be hidden at times. */ dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 12); gtk_widget_show(vbox2); /* Host */ @@ -1579,7 +1579,7 @@ GtkWidget *vbox; GtkWidget *bbox; GtkWidget *dbox; - GtkWidget *disclosure; + GtkWidget *notebook; GtkWidget *button; if (accounts_window != NULL && account != NULL && @@ -1638,30 +1638,30 @@ gtk_container_add(GTK_CONTAINER(win), main_vbox); gtk_widget_show(main_vbox); + notebook = gtk_notebook_new(); + gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0); + /* Setup the inner vbox */ - dialog->top_vbox = vbox = gtk_vbox_new(FALSE, 18); - gtk_box_pack_start(GTK_BOX(main_vbox), vbox, FALSE, FALSE, 0); + dialog->top_vbox = vbox = gtk_vbox_new(FALSE, 12); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, + gtk_label_new_with_mnemonic("_Basic")); gtk_widget_show(vbox); /* Setup the top frames. */ add_login_options(dialog, vbox); add_user_options(dialog, vbox); - /* Add the disclosure */ - disclosure = gaim_disclosure_new(_("Show more options"), - _("Show fewer options")); - gtk_box_pack_start(GTK_BOX(vbox), disclosure, FALSE, FALSE, 0); - gtk_widget_show(disclosure); - - /* Setup the box that the disclosure will cover. */ - dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, 18); - gtk_box_pack_start(GTK_BOX(vbox), dbox, FALSE, FALSE, 0); - - gaim_disclosure_set_container(GAIM_DISCLOSURE(disclosure), dbox); + /* Setup the page with 'Advanced'. */ + dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, 12); + gtk_container_set_border_width(GTK_CONTAINER(dbox), 12); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox, + gtk_label_new_with_mnemonic("_Advanced")); /** Setup the bottom frames. */ add_protocol_options(dialog, dbox); add_proxy_options(dialog, dbox); + gtk_widget_show_all(GTK_WIDGET(notebook)); /* Setup the button box */ bbox = gtk_hbutton_box_new();
--- a/src/gtknotify.c Tue Jun 14 01:19:52 2005 +0000 +++ b/src/gtknotify.c Tue Jun 14 02:03:58 2005 +0000 @@ -164,7 +164,7 @@ g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(message_response_cb), dialog); - gtk_container_set_border_width(GTK_CONTAINER(dialog), 6); + gtk_container_set_border_width(GTK_CONTAINER(dialog), 12); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 12);