im.pidgin.pidgin: 418bc7dd4e063c50039bba0d51b489b568f9aaaa
elb at pidgin.im
elb at pidgin.im
Sat Jan 5 09:35:40 EST 2008
-----------------------------------------------------------------
Revision: 418bc7dd4e063c50039bba0d51b489b568f9aaaa
Ancestor: 182c1128e0f382bc5c2ba7787c1a8579dbaae0ae
Author: elb at pidgin.im
Date: 2008-01-05T14:34:41
Branch: im.pidgin.pidgin
Modified files:
pidgin/gtkpluginpref.c pidgin/gtkprefs.c
pidgin/plugins/spellchk.c
ChangeLog:
An additional push from Gabriel's omgp.pidgin.add-widget-util branch.
-------------- next part --------------
============================================================
--- pidgin/gtkpluginpref.c a221156103f4a075f38e544fa2026ddf88774c1f
+++ pidgin/gtkpluginpref.c dd7615aa76732bb4e1b951029d9bc6c94082e9ed
@@ -93,22 +93,6 @@ make_string_pref(GtkWidget *parent, Purp
case PURPLE_PLUGIN_PREF_NONE:
default:
if (format == PURPLE_STRING_FORMAT_TYPE_NONE)
- box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
- else
- box = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
- gtk_widget_show(box);
- gtk_box_pack_start(GTK_BOX(parent), box, FALSE, FALSE, 0);
-
- gtk_label = gtk_label_new_with_mnemonic(pref_label);
- gtk_misc_set_alignment(GTK_MISC(gtk_label), 0, 0.5);
- gtk_widget_show(gtk_label);
- gtk_box_pack_start(GTK_BOX(box), gtk_label, FALSE, FALSE, 0);
-
- if(sg)
- gtk_size_group_add_widget(sg, gtk_label);
-
- if (format == PURPLE_STRING_FORMAT_TYPE_NONE)
{
entry = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(entry), purple_prefs_get_string(pref_name));
@@ -123,9 +107,7 @@ make_string_pref(GtkWidget *parent, Purp
g_signal_connect(G_OBJECT(entry), "changed",
G_CALLBACK(entry_cb),
(gpointer)pref_name);
- gtk_label_set_mnemonic_widget(GTK_LABEL(gtk_label), entry);
- gtk_widget_show(entry);
- gtk_box_pack_start(GTK_BOX(box), entry, FALSE, FALSE, 0);
+ pidgin_add_widget_to_vbox(GTK_BOX(parent), pref_label, sg, entry, TRUE, NULL);
}
else
{
@@ -135,6 +117,19 @@ make_string_pref(GtkWidget *parent, Purp
GtkWidget *toolbar;
GtkWidget *frame;
+ box = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+
+ gtk_widget_show(box);
+ gtk_box_pack_start(GTK_BOX(parent), box, FALSE, FALSE, 0);
+
+ gtk_label = gtk_label_new_with_mnemonic(pref_label);
+ gtk_misc_set_alignment(GTK_MISC(gtk_label), 0, 0.5);
+ gtk_widget_show(gtk_label);
+ gtk_box_pack_start(GTK_BOX(box), gtk_label, FALSE, FALSE, 0);
+
+ if(sg)
+ gtk_size_group_add_widget(sg, gtk_label);
+
hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
============================================================
--- pidgin/gtkprefs.c 0bd33736f6d340e0498e042b6ec092c2aaa62e8f
+++ pidgin/gtkprefs.c 3a4f8cfe8fe10cf80594c85be855e55451e7a92a
@@ -1749,7 +1749,6 @@ sound_page()
gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5);
entry = gtk_entry_new();
- gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
gtk_editable_set_editable(GTK_EDITABLE(entry), TRUE);
cmd = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/sound/command");
if(cmd)
@@ -1776,13 +1775,6 @@ sound_page()
NULL);
#ifdef USE_GSTREAMER
- hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
- label = gtk_label_new_with_mnemonic(_("Volume:"));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
sw = gtk_hscale_new_with_range(0.0, 100.0, 5.0);
gtk_range_set_increments(GTK_RANGE(sw), 5.0, 25.0);
gtk_range_set_value(GTK_RANGE(sw), purple_prefs_get_int(PIDGIN_PREFS_ROOT "/sound/volume"));
@@ -1792,7 +1784,7 @@ sound_page()
g_signal_connect (G_OBJECT (sw), "value-changed",
G_CALLBACK (prefs_sound_volume_changed),
NULL);
- gtk_box_pack_start(GTK_BOX(hbox), sw, TRUE, TRUE, 0);
+ hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Volume:"), NULL, sw, TRUE, NULL);
purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/method",
sound_changed3_cb, hbox);
============================================================
--- pidgin/plugins/spellchk.c bc5aaaded4722107ea3a5e39f278d32c29c7179e
+++ pidgin/plugins/spellchk.c dae3120a0a82a0f80ee5b19fd62aa3e6d140d2ba
@@ -2161,14 +2161,13 @@ get_config_frame(PurplePlugin *plugin)
get_config_frame(PurplePlugin *plugin)
{
GtkWidget *ret, *vbox, *win;
- GtkWidget *hbox, *label;
+ GtkWidget *hbox;
GtkWidget *button;
GtkSizeGroup *sg;
GtkSizeGroup *sg2;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
GtkWidget *vbox2;
- GtkWidget *hbox2;
GtkWidget *vbox3;
ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
@@ -2275,37 +2274,15 @@ get_config_frame(PurplePlugin *plugin)
sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
sg2 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
- hbox2 = gtk_hbox_new(FALSE, 2);
- gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, 0);
- gtk_widget_show(hbox2);
-
- label = gtk_label_new_with_mnemonic(_("You _type:"));
- gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0);
- gtk_size_group_add_widget(sg, label);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-
bad_entry = gtk_entry_new();
/* Set a minimum size. Since they're in a size group, the other entry will match up. */
gtk_widget_set_size_request(bad_entry, 350, -1);
- gtk_box_pack_start(GTK_BOX(hbox2), bad_entry, TRUE, TRUE, 0);
gtk_size_group_add_widget(sg2, bad_entry);
- gtk_label_set_mnemonic_widget(GTK_LABEL(label), bad_entry);
- gtk_widget_show(bad_entry);
+ pidgin_add_widget_to_vbox(GTK_BOX(vbox2), _("You _type:"), sg, bad_entry, FALSE, NULL);
- hbox2 = gtk_hbox_new(FALSE, 2);
- gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, 0);
- gtk_widget_show(hbox2);
-
- label = gtk_label_new_with_mnemonic(_("You _send:"));
- gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0);
- gtk_size_group_add_widget(sg, label);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-
good_entry = gtk_entry_new();
- gtk_box_pack_start(GTK_BOX(hbox2), good_entry, TRUE, TRUE, 0);
gtk_size_group_add_widget(sg2, good_entry);
- gtk_label_set_mnemonic_widget(GTK_LABEL(label), good_entry);
- gtk_widget_show(good_entry);
+ pidgin_add_widget_to_vbox(GTK_BOX(vbox2), _("You _send:"), sg, good_entry, FALSE, NULL);
/* Created here so it can be passed to whole_words_button_toggled. */
case_toggle = gtk_check_button_new_with_mnemonic(_("_Exact case match (uncheck for automatic case handling)"));
More information about the Commits
mailing list