grim/guifications1

just a little cleanup...

2003-12-28, grim
1f59c7cde313
Parents 41edc0c509ba
Children 45f198643a2e
just a little cleanup...
1 files changed, 58 insertions(+), 153 deletions(-)
  • +58 -153
    gf_conf.c
    • --- a/gf_conf.c Sun Dec 28 20:09:03 2003 +0000
    +++ b/gf_conf.c Sun Dec 28 20:35:36 2003 +0000
    @@ -63,7 +63,7 @@
    /**********************************************************************/
    GtkWidget *
    get_config_frame(GaimPlugin *plugin) {
    - GtkWidget *note, *vbox, *vbox2, *hbox, *frame, *label, *spin;
    + GtkWidget *note, *vbox, *hbox, *frame, *label, *spin;
    GtkWidget *chk_btn, *opt_mnu, *edt_box;
    GtkSizeGroup *sg;
    gint pad_x, pad_y;
    @@ -88,13 +88,9 @@
    /* create notification frame */
    frame = gaim_gtk_make_frame(vbox, "Notifications");
    - /* create notification vbox */
    - vbox2 = gtk_vbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(frame), vbox2);
    -
    /* create sign on/off hbox */
    hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    /* create sign on check */
    chk_btn = make_check_button(GF_PREF_BEHAVIOR_SHOW_SIGN_ON, "Show _Sign On", sg);
    @@ -106,7 +102,7 @@
    /* create away/back hbox */
    hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    /* create away check */
    chk_btn = make_check_button(GF_PREF_BEHAVIOR_SHOW_AWAY, "Show _Away", sg);
    @@ -118,7 +114,7 @@
    /* create idle/unidle hbox */
    hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    /* create idle check */
    chk_btn = make_check_button(GF_PREF_BEHAVIOR_SHOW_IDLE, "Show _Idle", sg);
    @@ -132,14 +128,11 @@
    frame = gaim_gtk_make_frame(vbox, "Position");
    /* create position option menu */
    - hbox = gtk_hbox_new(FALSE,4);
    - gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    - label = make_label("_Position:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    opt_mnu = make_window_position_option_menu(gaim_prefs_get_int(GF_PREF_BEHAVIOR_WINDOW_POS));
    g_signal_connect(G_OBJECT(opt_mnu), "changed", G_CALLBACK(opt_mnu_cb), GF_PREF_BEHAVIOR_WINDOW_POS);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), opt_mnu);
    - gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    +
    + label = add_label(opt_mnu, "_Position:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    /* create vertical check */
    chk_btn = make_check_button(GF_PREF_BEHAVIOR_WINDOW_VERTICAL, "_Vertical", sg);
    @@ -156,14 +149,11 @@
    gtk_box_pack_start(GTK_BOX(frame), spin, FALSE, FALSE, 0);
    /* create zoom option menu */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    - label = make_label("_Zoom:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    opt_mnu = make_window_zoom_option_menu(gaim_prefs_get_int(GF_PREF_BEHAVIOR_ZOOM));
    g_signal_connect(G_OBJECT(opt_mnu), "changed", G_CALLBACK(opt_mnu_cb), GF_PREF_BEHAVIOR_ZOOM);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), opt_mnu);
    - gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    +
    + label = add_label(opt_mnu, "_Zoom:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    /* create alias check */
    chk_btn = make_check_button(GF_PREF_BEHAVIOR_ALIAS, "S_how alias if set", NULL);
    @@ -178,34 +168,25 @@
    frame = gaim_gtk_make_frame(vbox, "Mouse");
    /* create mouse1 option */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    - label = make_label("_Left Button:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    opt_mnu = make_window_mouse_option_menu(gaim_prefs_get_int(GF_PREF_BEHAVIOR_MOUSE1));
    g_signal_connect(G_OBJECT(opt_mnu), "changed", G_CALLBACK(opt_mnu_cb), GF_PREF_BEHAVIOR_MOUSE1);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), opt_mnu);
    - gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    +
    + label = add_label(opt_mnu, "_Left Button:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    /* create mouse2 option */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    - label = make_label("_Middle Button:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    opt_mnu = make_window_mouse_option_menu(gaim_prefs_get_int(GF_PREF_BEHAVIOR_MOUSE2));
    g_signal_connect(G_OBJECT(opt_mnu), "changed", G_CALLBACK(opt_mnu_cb), GF_PREF_BEHAVIOR_MOUSE2);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), opt_mnu);
    - gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    +
    + label = add_label(opt_mnu, "_Middle Button:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    /* create mouse3 option */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    - label = make_label("_Right Button:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    opt_mnu = make_window_mouse_option_menu(gaim_prefs_get_int(GF_PREF_BEHAVIOR_MOUSE3));
    g_signal_connect(G_OBJECT(opt_mnu), "changed", G_CALLBACK(opt_mnu_cb), GF_PREF_BEHAVIOR_MOUSE3);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), opt_mnu);
    - gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    +
    + label = add_label(opt_mnu, "_Right Button:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    /*******************************************************************
    appearance tab
    @@ -222,17 +203,13 @@
    /* create image frame */
    frame = gaim_gtk_make_frame(vbox, "Image");
    - /* create image vbox */
    - vbox2 = gtk_vbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(frame), vbox2);
    -
    /* create image check */
    chk_btn = make_check_button(GF_PREF_APPEARANCE_IMAGE, "Use custom _image", sg);
    - gtk_box_pack_start(GTK_BOX(vbox2), chk_btn, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), chk_btn, FALSE, FALSE, 0);
    /* create image entry/button hbox */
    hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    /* create image edit box */
    edt_image = make_entry(GF_PREF_APPEARANCE_IMAGE_FILE);
    @@ -240,7 +217,7 @@
    gtk_box_pack_start(GTK_BOX(hbox), edt_image, FALSE, FALSE, 0);
    /* create image button */
    - btn_image = make_button("_Browse");
    + btn_image = make_button("_Browse...");
    gtk_widget_set_sensitive(btn_image, gaim_prefs_get_bool(GF_PREF_APPEARANCE_IMAGE));
    g_signal_connect(G_OBJECT(btn_image), "clicked", G_CALLBACK(image_file_dialog), NULL);
    gtk_box_pack_start(GTK_BOX(hbox), btn_image, FALSE, FALSE, 0);
    @@ -248,13 +225,9 @@
    /* create text frame */
    frame = gaim_gtk_make_frame(vbox, "Text");
    - /* create text vbox */
    - vbox2 = gtk_vbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(frame), vbox2);
    -
    /* create font hbox */
    hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    /* create font check */
    chk_btn = make_check_button(GF_PREF_APPEARANCE_FONT, "Use custom fon_t", sg);
    @@ -268,7 +241,7 @@
    /* create color hbox */
    hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
    /* create color check */
    chk_btn = make_check_button(GF_PREF_APPEARANCE_COLOR, "Use custom co_lor", sg);
    @@ -287,71 +260,55 @@
    gtk_box_pack_start(GTK_BOX(hbox), evt_color, FALSE, FALSE, 0);
    /* create clipping option menu */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    - label = make_label("Clippin_g:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    opt_mnu = make_text_clipping_option_menu(gaim_prefs_get_int(GF_PREF_APPEARANCE_TEXT_CLIPPING));
    g_signal_connect(G_OBJECT(opt_mnu), "changed", G_CALLBACK(opt_mnu_cb), GF_PREF_APPEARANCE_TEXT_CLIPPING);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), opt_mnu);
    - gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    +
    + label = add_label(opt_mnu, "Clippin_g:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    /* create position option menu */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    - label = make_label("_Position:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    opt_mnu = make_item_position_option_menu(gaim_prefs_get_int(GF_PREF_APPEARANCE_TEXT_POS));
    g_signal_connect(G_OBJECT(opt_mnu), "changed", G_CALLBACK(opt_mnu_cb), GF_PREF_APPEARANCE_TEXT_POS);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), opt_mnu);
    - gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    +
    + label = add_label(opt_mnu, "_Position:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    /* create horz spin */
    spin = make_spin_button_with_label("_Horizontal Offset:", GF_PREF_APPEARANCE_TEXT_X, sg);
    gtk_label_set_mnemonic_widget(GTK_LABEL(label), spin);
    - gtk_box_pack_start(GTK_BOX(vbox2), spin, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), spin, FALSE, FALSE, 0);
    /* create vert spin */
    spin = make_spin_button_with_label("_Vertical Offset:", GF_PREF_APPEARANCE_TEXT_Y, sg);
    gtk_label_set_mnemonic_widget(GTK_LABEL(label), spin);
    - gtk_box_pack_start(GTK_BOX(vbox2), spin, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), spin, FALSE, FALSE, 0);
    /* create protocol frame */
    frame = gaim_gtk_make_frame(vbox, "Protocol");
    - /* create procotol vbox */
    - vbox2 = gtk_vbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(frame), vbox2);
    -
    /* create position option menu */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    - label = make_label("P_osition:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    opt_mnu = make_item_position_option_menu(gaim_prefs_get_int(GF_PREF_APPEARANCE_PROT_POS));
    g_signal_connect(G_OBJECT(opt_mnu), "changed", G_CALLBACK(opt_mnu_cb), GF_PREF_APPEARANCE_PROT_POS);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), opt_mnu);
    - gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    +
    + label = add_label(opt_mnu, "P_osition:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    /* create size option menu */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    - label = make_label("Si_ze:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    opt_mnu = make_icon_size_option_menu(gaim_prefs_get_int(GF_PREF_APPEARANCE_PROT_SIZE));
    g_signal_connect(G_OBJECT(opt_mnu), "changed", G_CALLBACK(opt_mnu_cb), GF_PREF_APPEARANCE_PROT_SIZE);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), opt_mnu);
    - gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    +
    + label = add_label(opt_mnu, "Si_ze:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    /* create horz spin */
    spin = make_spin_button_with_label("Ho_rizontal Offset:", GF_PREF_APPEARANCE_PROT_X, sg);
    gtk_label_set_mnemonic_widget(GTK_LABEL(label), spin);
    - gtk_box_pack_start(GTK_BOX(vbox2), spin, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), spin, FALSE, FALSE, 0);
    /* create vert spin */
    spin = make_spin_button_with_label("Ver_tical Offset:", GF_PREF_APPEARANCE_PROT_Y, sg);
    gtk_label_set_mnemonic_widget(GTK_LABEL(label), spin);
    - gtk_box_pack_start(GTK_BOX(vbox2), spin, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), spin, FALSE, FALSE, 0);
    /*******************************************************************
    Messages tab
    @@ -368,87 +325,35 @@
    /* create messages frame */
    frame = gaim_gtk_make_frame(vbox, "Status Messages");
    - /* create messages vbox */
    - vbox2 = gtk_vbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(frame), vbox2);
    -
    - /* create sign on hbox */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    -
    - /* create sign on label */
    - label = make_label("_Sign on:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - /* create sign on edit */
    + /* create sign on line */
    edt_box = make_entry(GF_PREF_MESSAGES_SIGN_ON);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), edt_box);
    - gtk_box_pack_start(GTK_BOX(hbox), edt_box, FALSE, FALSE, 0);
    + label = add_label(edt_box, "_Sign on:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    - /* create sign off hbox */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    -
    - /* create sign off label */
    - label = make_label("Sign _off:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - /* create sign off edit */
    + /* create sign off line */
    edt_box = make_entry(GF_PREF_MESSAGES_SIGN_OFF);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), edt_box);
    - gtk_box_pack_start(GTK_BOX(hbox), edt_box, FALSE, FALSE, 0);
    + label = add_label(edt_box, "Sign _off:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    - /* create away hbox */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    -
    - /* create away label */
    - label = make_label("_Away:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - /* create away edit */
    + /* create away line */
    edt_box = make_entry(GF_PREF_MESSAGES_AWAY);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), edt_box);
    - gtk_box_pack_start(GTK_BOX(hbox), edt_box, FALSE, FALSE, 0);
    -
    - /* create back hbox */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    + label = add_label(edt_box, "_Away:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    - /* create back label */
    - label = make_label("_Back:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - /* create back edit */
    + /* create back line */
    edt_box = make_entry(GF_PREF_MESSAGES_BACK);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), edt_box);
    - gtk_box_pack_start(GTK_BOX(hbox), edt_box, FALSE, FALSE, 0);
    -
    - /* create idle hbox */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    + label = add_label(edt_box, "_Back:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    - /* create idle label */
    - label = make_label("_Idle:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - /* create idle edit */
    + /* create idle line */
    edt_box = make_entry(GF_PREF_MESSAGES_IDLE);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), edt_box);
    - gtk_box_pack_start(GTK_BOX(hbox), edt_box, FALSE, FALSE, 0);
    + label = add_label(edt_box, "_Idle:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    - /* create unidle hbox */
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
    -
    - /* create unidle label */
    - label = make_label("_Unidle:", sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - /* create unidle edit */
    + /* create unidle line */
    edt_box = make_entry(GF_PREF_MESSAGES_UNIDLE);
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), edt_box);
    - gtk_box_pack_start(GTK_BOX(hbox), edt_box, FALSE, FALSE, 0);
    + label = add_label(edt_box, "_Unidle:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    /*******************************************************************
    Advanced tab