im.pidgin.pidgin.next.minor: bc5f3a2e4402a8d8964189815a0251ea4a4702de
sadrul at pidgin.im
sadrul at pidgin.im
Mon Nov 26 03:50:40 EST 2007
-----------------------------------------------------------------
Revision: bc5f3a2e4402a8d8964189815a0251ea4a4702de
Ancestor: 73f9fc06f86b6dfcd381f23f36e4d51fa2b01b37
Author: sadrul at pidgin.im
Date: 2007-11-26T08:47:08
Branch: im.pidgin.pidgin.next.minor
Modified files:
ChangeLog.API pidgin/gtkaccount.c pidgin/gtkcertmgr.c
pidgin/gtkft.c pidgin/gtkpounce.c pidgin/gtkprefs.c
pidgin/gtkprivacy.c pidgin/gtkrequest.c pidgin/gtkroomlist.c
pidgin/gtksavedstatuses.c pidgin/gtkutils.c
pidgin/gtkutils.h
ChangeLog:
Patch from fmoo. This makes a lot of the windows closeable with Escape. There
may be other windows that need this.
The buttons at the bottom don't quite line up properly. That needs to be fixed.
Closes #2137.
-------------- next part --------------
============================================================
--- ChangeLog.API 83f4523a5007e1518b6adfcb8c83073e0ddd1434
+++ ChangeLog.API 458c9fc32b682d4f91604a849d1bd24709d2d558
@@ -1,5 +1,13 @@ Pidgin and Finch: The Pimpin' Penguin IM
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
+version 2.4.0 (??/??/????):
+ Pidgin:
+ Added:
+ * pidgin_create_dialog to create a window that closes on escape. Also
+ added utility functions pidgin_dialog_get_vbox_with_properties,
+ pidgin_dialog_get_vbox, pidgin_dialog_get_action_area to access the
+ contents in the created dialog. (Peter 'fmoo' Ruibal)
+
version 2.3.0 (11/24/2007):
libpurple:
Added:
============================================================
--- pidgin/gtkaccount.c f51aaf31c4f0bd09b6a31b46e621e7fde4f454d7
+++ pidgin/gtkaccount.c f42d18b07e3fc1c52f2d7af8ec5497a67e53c92d
@@ -1475,16 +1475,14 @@ pidgin_account_dialog_show(PidginAccount
if ((dialog->plugin = purple_find_prpl(dialog->protocol_id)) != NULL)
dialog->prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(dialog->plugin);
- dialog->window = win = pidgin_create_window((type == PIDGIN_ADD_ACCOUNT_DIALOG) ? _("Add Account") : _("Modify Account"),
+ dialog->window = win = pidgin_create_dialog((type == PIDGIN_ADD_ACCOUNT_DIALOG) ? _("Add Account") : _("Modify Account"),
PIDGIN_HIG_BORDER, "account", FALSE);
g_signal_connect(G_OBJECT(win), "delete_event",
G_CALLBACK(account_win_destroy_cb), dialog);
/* Setup the vbox */
- main_vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(win), main_vbox);
- gtk_widget_show(main_vbox);
+ main_vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
notebook = gtk_notebook_new();
gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0);
@@ -1525,11 +1523,9 @@ pidgin_account_dialog_show(PidginAccount
add_proxy_options(dialog, dbox);
/* Setup the button box */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(win));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end(GTK_BOX(main_vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
/* Cancel button */
button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
@@ -2328,7 +2324,7 @@ pidgin_accounts_window_show(void)
width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/width");
height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/height");
- dialog->window = win = pidgin_create_window(_("Accounts"), PIDGIN_HIG_BORDER, "accounts", TRUE);
+ dialog->window = win = pidgin_create_dialog(_("Accounts"), PIDGIN_HIG_BORDER, "accounts", TRUE);
gtk_window_set_default_size(GTK_WINDOW(win), width, height);
g_signal_connect(G_OBJECT(win), "delete_event",
@@ -2337,9 +2333,7 @@ pidgin_accounts_window_show(void)
G_CALLBACK(configure_cb), accounts_window);
/* Setup the vbox */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(win), vbox);
- gtk_widget_show(vbox);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
/* Setup the scrolled window that will contain the list of accounts. */
sw = create_accounts_list(dialog);
@@ -2347,11 +2341,9 @@ pidgin_accounts_window_show(void)
gtk_widget_show(sw);
/* Button box. */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(win));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
/* Add button */
button = gtk_button_new_from_stock(GTK_STOCK_ADD);
============================================================
--- pidgin/gtkcertmgr.c 5e36d5e224dc4380b1ca1175af292080d5148f5d
+++ pidgin/gtkcertmgr.c a2d0d5d401df6fca525cb869c349f79a5a0b4594
@@ -599,7 +599,7 @@ pidgin_certmgr_show(void)
dlg = certmgr_dialog = g_new0(CertMgrDialog, 1);
win = dlg->window =
- pidgin_create_window(_("Certificate Manager"),/* Title */
+ pidgin_create_dialog(_("Certificate Manager"),/* Title */
PIDGIN_HIG_BORDER, /*Window border*/
"certmgr", /* Role */
TRUE); /* Allow resizing */
@@ -611,9 +611,7 @@ pidgin_certmgr_show(void)
gtk_window_set_default_size(GTK_WINDOW(win), 400, 400);
/* Main vbox */
- vbox = gtk_vbox_new( FALSE, PIDGIN_HIG_BORDER );
- gtk_container_add(GTK_CONTAINER(win), vbox);
- gtk_widget_show(vbox);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
/* Notebook of various certificate managers */
dlg->notebook = gtk_notebook_new();
@@ -623,11 +621,9 @@ pidgin_certmgr_show(void)
gtk_widget_show(dlg->notebook);
/* Box for the close button */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(win));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
/* Close button */
dlg->closebutton = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
============================================================
--- pidgin/gtkft.c d94855703960eddebb1c4b965822f088ead1c428
+++ pidgin/gtkft.c 715a12d1604f320d362964832a53379c312951e8
@@ -759,15 +759,13 @@ pidgin_xfer_dialog_new(void)
purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/filetransfer/clear_finished");
/* Create the window. */
- dialog->window = window = pidgin_create_window(_("File Transfers"), PIDGIN_HIG_BORDER, "file transfer", TRUE);
+ dialog->window = window = pidgin_create_dialog(_("File Transfers"), PIDGIN_HIG_BORDER, "file transfer", TRUE);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(delete_win_cb), dialog);
/* Create the parent vbox for everything. */
- vbox1 = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(window), vbox1);
- gtk_widget_show(vbox1);
+ vbox1 = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(window), FALSE, PIDGIN_HIG_BORDER);
/* Create the main vbox for top half of the window. */
vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
@@ -813,11 +811,9 @@ pidgin_xfer_dialog_new(void)
gtk_widget_show(table);
/* Now the button box for the buttons */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(window));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end(GTK_BOX(vbox1), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
/* Open button */
button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
============================================================
--- pidgin/gtkpounce.c 553cab9e3d9ce17dee37ec24f7a7af1e8a671029
+++ pidgin/gtkpounce.c 600e82c7ee27c82c8dc29ae1df3bdebe20f31854
@@ -1334,7 +1334,7 @@ pidgin_pounces_manager_show(void)
width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/pounces/dialog/width");
height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/pounces/dialog/height");
- dialog->window = win = pidgin_create_window(_("Buddy Pounces"), PIDGIN_HIG_BORDER, "pounces", TRUE);
+ dialog->window = win = pidgin_create_dialog(_("Buddy Pounces"), PIDGIN_HIG_BORDER, "pounces", TRUE);
gtk_window_set_default_size(GTK_WINDOW(win), width, height);
g_signal_connect(G_OBJECT(win), "delete_event",
@@ -1343,20 +1343,16 @@ pidgin_pounces_manager_show(void)
G_CALLBACK(pounces_manager_configure_cb), dialog);
/* Setup the vbox */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(win), vbox);
- gtk_widget_show(vbox);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
/* List of saved buddy pounces */
list = create_pounces_list(dialog);
gtk_box_pack_start(GTK_BOX(vbox), list, TRUE, TRUE, 0);
/* Button box. */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(win));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
/* Add button */
button = gtk_button_new_from_stock(GTK_STOCK_ADD);
============================================================
--- pidgin/gtkprefs.c 3ad1c167fb42abbd33762354600c61dbeef908ce
+++ pidgin/gtkprefs.c d9e28ce358e5d3a949a9c2af92a6a9f63a04ae58
@@ -2165,13 +2165,11 @@ void pidgin_prefs_show(void)
/* Back to instant-apply! I win! BU-HAHAHA! */
/* Create the window */
- prefs = pidgin_create_window(_("Preferences"), PIDGIN_HIG_BORDER, "preferences", FALSE);
+ prefs = pidgin_create_dialog(_("Preferences"), PIDGIN_HIG_BORDER, "preferences", FALSE);
g_signal_connect(G_OBJECT(prefs), "destroy",
G_CALLBACK(delete_prefs), NULL);
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(prefs), vbox);
- gtk_widget_show(vbox);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(prefs), FALSE, PIDGIN_HIG_BORDER);
/* The notebook */
prefsnotebook = notebook = gtk_notebook_new ();
@@ -2179,11 +2177,9 @@ void pidgin_prefs_show(void)
gtk_widget_show(prefsnotebook);
/* The buttons to press! */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(prefs));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
- gtk_widget_show (bbox);
button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
g_signal_connect_swapped(G_OBJECT(button), "clicked",
============================================================
--- pidgin/gtkprivacy.c d68693c883f033a0ca52d8ba03fd3067c203f826
+++ pidgin/gtkprivacy.c 97e5e3761fea66095ad8d7d2363b9ce7c9b220b3
@@ -367,15 +367,13 @@ privacy_dialog_new(void)
dialog = g_new0(PidginPrivacyDialog, 1);
- dialog->win = pidgin_create_window(_("Privacy"), PIDGIN_HIG_BORDER, "privacy", TRUE);
+ dialog->win = pidgin_create_dialog(_("Privacy"), PIDGIN_HIG_BORDER, "privacy", TRUE);
g_signal_connect(G_OBJECT(dialog->win), "delete_event",
G_CALLBACK(destroy_cb), dialog);
/* Main vbox */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(dialog->win), vbox);
- gtk_widget_show(vbox);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(dialog->win), FALSE, PIDGIN_HIG_BORDER);
/* Description label */
label = gtk_label_new(
@@ -466,10 +464,8 @@ privacy_dialog_new(void)
G_CALLBACK(clear_cb), dialog);
/* Another button box. */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(dialog->win));
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
- gtk_widget_show(bbox);
/* Close button */
button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
============================================================
--- pidgin/gtkrequest.c 243b33ea43778a5453f0054210d1ac61f5defe7e
+++ pidgin/gtkrequest.c 176b4189c55972b3135b81829aebd2f735ac9e10
@@ -1089,9 +1089,9 @@ pidgin_request_fields(const char *title,
#ifdef _WIN32
- data->dialog = win = pidgin_create_window(PIDGIN_ALERT_TITLE, PIDGIN_HIG_BORDER, "multifield", TRUE) ;
+ data->dialog = win = pidgin_create_dialog(PIDGIN_ALERT_TITLE, PIDGIN_HIG_BORDER, "multifield", TRUE) ;
#else /* !_WIN32 */
- data->dialog = win = pidgin_create_window(title, PIDGIN_HIG_BORDER, "multifield", TRUE) ;
+ data->dialog = win = pidgin_create_dialog(title, PIDGIN_HIG_BORDER, "multifield", TRUE) ;
#endif /* _WIN32 */
g_signal_connect(G_OBJECT(win), "delete_event",
@@ -1099,7 +1099,7 @@ pidgin_request_fields(const char *title,
/* Setup the main horizontal box */
hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(win), hbox);
+ gtk_container_add(GTK_CONTAINER(pidgin_dialog_get_vbox(GTK_DIALOG(win))), hbox);
gtk_widget_show(hbox);
/* Dialog icon. */
@@ -1383,11 +1383,9 @@ pidgin_request_fields(const char *title,
g_object_unref(sg);
/* Button box. */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(win));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
/* Cancel button */
button = gtk_button_new_from_stock(text_to_stock(cancel_text));
============================================================
--- pidgin/gtkroomlist.c 80b11597b1e7cff482cfecae0c03d816db532fa1
+++ pidgin/gtkroomlist.c c082c6c9955eda74216a67816c83004556846d3b
@@ -685,15 +685,13 @@ pidgin_roomlist_dialog_new_with_account(
dialog->account = account;
/* Create the window. */
- dialog->window = window = pidgin_create_window(_("Room List"), PIDGIN_HIG_BORDER, "room list", TRUE);
+ dialog->window = window = pidgin_create_dialog(_("Room List"), PIDGIN_HIG_BORDER, "room list", TRUE);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(delete_win_cb), dialog);
/* Create the parent vbox for everything. */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(window), vbox);
- gtk_widget_show(vbox);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(window), FALSE, PIDGIN_HIG_BORDER);
vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
gtk_container_add(GTK_CONTAINER(vbox), vbox2);
@@ -738,11 +736,9 @@ pidgin_roomlist_dialog_new_with_account(
gtk_widget_show(dialog->progress);
/* button box */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(window));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
/* stop button */
dialog->stop_button = gtk_button_new_from_stock(GTK_STOCK_STOP);
============================================================
--- pidgin/gtksavedstatuses.c 33473c5fb6f8f769e13e6543264a8cc0c70de96a
+++ pidgin/gtksavedstatuses.c 315dd6ef4bae54f87240df231b13f65e0e408170
@@ -594,7 +594,7 @@ pidgin_status_window_show(void)
width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/status/dialog/width");
height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/status/dialog/height");
- dialog->window = win = pidgin_create_window(_("Saved Statuses"), PIDGIN_HIG_BORDER, "statuses", TRUE);
+ dialog->window = win = pidgin_create_dialog(_("Saved Statuses"), PIDGIN_HIG_BORDER, "statuses", TRUE);
gtk_window_set_default_size(GTK_WINDOW(win), width, height);
g_signal_connect(G_OBJECT(win), "delete_event",
@@ -603,15 +603,14 @@ pidgin_status_window_show(void)
G_CALLBACK(configure_cb), dialog);
/* Setup the vbox */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(win), vbox);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
/* List of saved status states */
list = create_saved_status_list(dialog);
gtk_box_pack_start(GTK_BOX(vbox), list, TRUE, TRUE, 0);
/* Button box. */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(win));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
@@ -1147,14 +1146,13 @@ pidgin_status_editor_show(gboolean edit,
if (edit)
dialog->original_title = g_strdup(purple_savedstatus_get_title(saved_status));
- dialog->window = win = pidgin_create_window(_("Status"), PIDGIN_HIG_BORDER, "status", TRUE);
+ dialog->window = win = pidgin_create_dialog(_("Status"), PIDGIN_HIG_BORDER, "status", TRUE);
g_signal_connect(G_OBJECT(win), "delete_event",
G_CALLBACK(status_editor_destroy_cb), dialog);
/* Setup the vbox */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(win), vbox);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -1257,10 +1255,9 @@ pidgin_status_editor_show(gboolean edit,
(saved_status != NULL) && purple_savedstatus_has_substatuses(saved_status));
/* Button box */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(win));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
/* Cancel button */
button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
@@ -1486,15 +1483,14 @@ edit_substatus(StatusEditor *status_edit
dialog->account = account;
tmp = g_strdup_printf(_("Status for %s"), purple_account_get_username(account));
- dialog->window = win = pidgin_create_window(tmp, PIDGIN_HIG_BORDER, "substatus", TRUE);
+ dialog->window = win = pidgin_create_dialog(tmp, PIDGIN_HIG_BORDER, "substatus", TRUE);
g_free(tmp);
g_signal_connect(G_OBJECT(win), "delete_event",
G_CALLBACK(substatus_editor_destroy_cb), dialog);
/* Setup the vbox */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(win), vbox);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -1544,10 +1540,9 @@ edit_substatus(StatusEditor *status_edit
gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
/* Button box */
- bbox = gtk_hbutton_box_new();
+ bbox = pidgin_dialog_get_action_area(GTK_DIALOG(win));
gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
/* Cancel button */
button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
============================================================
--- pidgin/gtkutils.c 61a55e30a58d19e1b955b24736892376cfcd266b
+++ pidgin/gtkutils.c 55c05eec8fcd5de9c56899c97f6f9f522f53e440
@@ -132,12 +132,9 @@ pidgin_setup_imhtml(GtkWidget *imhtml)
}
}
-GtkWidget *
-pidgin_create_window(const char *title, guint border_width, const char *role, gboolean resizable)
+static
+void pidgin_window_init(GtkWindow *wnd, const char *title, guint border_width, const char *role, gboolean resizable)
{
- GtkWindow *wnd = NULL;
-
- wnd = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
if (title)
gtk_window_set_title(wnd, title);
#ifdef _WIN32
@@ -148,11 +145,51 @@ pidgin_create_window(const char *title,
if (role)
gtk_window_set_role(wnd, role);
gtk_window_set_resizable(wnd, resizable);
+}
+GtkWidget *
+pidgin_create_window(const char *title, guint border_width, const char *role, gboolean resizable)
+{
+ GtkWindow *wnd = NULL;
+
+ wnd = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
+ pidgin_window_init(wnd, title, border_width, role, resizable);
+
return GTK_WIDGET(wnd);
}
GtkWidget *
+pidgin_create_dialog(const char *title, guint border_width, const char *role, gboolean resizable)
+{
+ GtkWindow *wnd = NULL;
+
+ wnd = GTK_WINDOW(gtk_dialog_new());
+ pidgin_window_init(wnd, title, border_width, role, resizable);
+ g_object_set(G_OBJECT(wnd), "has-separator", FALSE, NULL);
+
+ return GTK_WIDGET(wnd);
+}
+
+GtkWidget *
+pidgin_dialog_get_vbox_with_properties(GtkDialog *dialog, gboolean homogeneous, gint spacing)
+{
+ GtkBox *vbox = GTK_BOX(GTK_DIALOG(dialog)->vbox);
+ gtk_box_set_homogeneous(vbox, homogeneous);
+ gtk_box_set_spacing(vbox, spacing);
+ return GTK_WIDGET(vbox);
+}
+
+GtkWidget *pidgin_dialog_get_vbox(GtkDialog *dialog)
+{
+ return GTK_DIALOG(dialog)->vbox;
+}
+
+GtkWidget *pidgin_dialog_get_action_area(GtkDialog *dialog)
+{
+ return GTK_DIALOG(dialog)->action_area;
+}
+
+GtkWidget *
pidgin_create_imhtml(gboolean editable, GtkWidget **imhtml_ret, GtkWidget **toolbar_ret, GtkWidget **sw_ret)
{
GtkWidget *frame;
============================================================
--- pidgin/gtkutils.h 52e44fe95fa2add694d30a81c6450aa005538161
+++ pidgin/gtkutils.h f6fcb381a4d69e4e71de38f652fe6411f5276b44
@@ -121,6 +121,47 @@ GtkWidget *pidgin_create_window(const ch
GtkWidget *pidgin_create_window(const char *title, guint border_width, const char *role, gboolean resizable);
/**
+ * Creates a new dialog window
+ *
+ * @param title The window title, or @c NULL
+ * @param border_width The window's desired border width
+ * @param role A string indicating what the window is responsible for doing, or @c NULL
+ * @param resizable Whether the window should be resizable (@c TRUE) or not (@c FALSE)
+ *
+ * @since 2.4.0
+ */
+GtkWidget *pidgin_create_dialog(const char *title, guint border_width, const char *role, gboolean resizable);
+
+/**
+ * Retrieves the main content box (vbox) from a pidgin dialog window
+ *
+ * @param dialog The dialog window
+ * @param homogeneous TRUE if all children are to be given equal space allotments.
+ * @param spacing the number of pixels to place by default between children
+ *
+ * @since 2.4.0
+ */
+GtkWidget *pidgin_dialog_get_vbox_with_properties(GtkDialog *dialog, gboolean homogeneous, gint spacing);
+
+/**
+ * Retrieves the main content box (vbox) from a pidgin dialog window
+ *
+ * @param dialog The dialog window
+ *
+ * @since 2.4.0
+ */
+GtkWidget *pidgin_dialog_get_vbox(GtkDialog *dialog);
+
+/**
+ * Retrieves the action area (button box) from a pidgin dialog window
+ *
+ * @param dialog The dialog window
+ *
+ * @since 2.4.0
+ */
+GtkWidget *pidgin_dialog_get_action_area(GtkDialog *dialog);
+
+/**
* Toggles the sensitivity of a widget.
*
* @param widget @c NULL. Used for signal handlers.
More information about the Commits
mailing list