grim/guifications1

conf code almost done, still needs some major cleaning, and all that jaz. It's using the new gf_gtkutils though, so it's a start

2003-12-28, grim
8ecab3048084
Parents 7a7788435540
Children f2b2f9ce98c8
conf code almost done, still needs some major cleaning, and all that jaz. It's using the new gf_gtkutils though, so it's a start
1 files changed, 42 insertions(+), 23 deletions(-)
  • +42 -23
    gf_conf.c
    • --- a/gf_conf.c Sun Dec 28 16:27:50 2003 +0000
    +++ b/gf_conf.c Sun Dec 28 17:41:12 2003 +0000
    @@ -132,74 +132,81 @@
    /* create position frame */
    frame = gaim_gtk_make_frame(vbox, "Position");
    - /* create position 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(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(vbox2), opt_mnu, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    /* create vertical check */
    chk_btn = make_check_button(GF_PREF_BEHAVIOR_WINDOW_VERTICAL, "_Vertical", 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 display frame */
    frame = gaim_gtk_make_frame(vbox, "Display");
    - /* create display vbox */
    - vbox2 = gtk_vbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(frame), vbox2);
    -
    /* create display spin */
    spin = make_spin_button_with_label("Display _time:", GF_PREF_BEHAVIOR_TIMEOUT, sg);
    gtk_label_set_mnemonic_widget(GTK_LABEL(label), spin);
    label = make_label("seconds", NULL);
    - gtk_box_pack_start(GTK_BOX( spin ), label, FALSE, FALSE, 0);
    - gtk_box_pack_start(GTK_BOX(vbox2), spin, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(spin), label, FALSE, FALSE, 0);
    + 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(vbox2), opt_mnu, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    /* create alias check */
    chk_btn = make_check_button(GF_PREF_BEHAVIOR_ALIAS, "S_how alias if set", NULL);
    - gtk_box_pack_start(GTK_BOX(vbox2), chk_btn, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(frame), chk_btn, FALSE, FALSE, 0);
    /* snakez */
    /* show if away check */
    chk_btn = make_check_button(GF_PREF_BEHAVIOR_SHOWAWAY, "Sho_w Guifications while away", NULL);
    - 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 mouse frame */
    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(frame), opt_mnu, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, 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(frame), opt_mnu, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    /* create mouse3 option */
    - make_label("_Right Button:", sg);
    + 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(frame), opt_mnu, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    /*******************************************************************
    appearance tab
    @@ -281,18 +288,24 @@
    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(vbox2), opt_mnu, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, 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(vbox2), opt_mnu, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    /* create horz spin */
    spin = make_spin_button_with_label("_Horizontal Offset:", GF_PREF_APPEARANCE_TEXT_X, sg);
    @@ -312,18 +325,24 @@
    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(vbox2), opt_mnu, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, 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(vbox2), opt_mnu, FALSE, FALSE, 0);
    + gtk_box_pack_start(GTK_BOX(hbox), opt_mnu, FALSE, FALSE, 0);
    /* create horz spin */
    spin = make_spin_button_with_label("Ho_rizontal Offset:", GF_PREF_APPEARANCE_PROT_X, sg);