grim/guifications1

getting there on new code base....

2003-12-27, grim
7124a5c002dc
Parents 970133777d26
Children 74b8d6dfd0ca
getting there on new code base....
5 files changed, 58 insertions(+), 485 deletions(-)
  • +33 -459
    gf_conf.c
  • +2 -2
    gf_gtkutils.c
  • +2 -2
    gf_gtkutils.h
  • +10 -10
    gf_prefs.c
  • +11 -12
    guifications.c
    • --- a/gf_conf.c Sat Dec 27 16:44:38 2003 +0000
    +++ b/gf_conf.c Sat Dec 27 17:20:58 2003 +0000
    @@ -25,10 +25,12 @@
    #include "prefs.h"
    #include "debug.h"
    +#include "guifications.h"
    #include "gf_types.h"
    #include "gf_conf.h"
    #include "gf_prefs.h"
    #include "gf_pngs.h"
    +#include "gf_gtkutils.h"
    /***********************************************************************
    Globals
    ***********************************************************************/
    @@ -46,20 +48,6 @@
    static GtkWidget *make_entry( const gchar *pref );
    static GtkWidget *make_button( gchar *text );
    static GtkWidget *make_spin_button_with_label( gchar *text, const gchar *pref, GtkSizeGroup *sg );
    -static GtkWidget *make_gfpos_option_menu_with_label( const gchar *pref, gchar *text, GtkSizeGroup *sg );
    -static GtkWidget *make_gfpos_menu_item(gf_window_position pos);
    -static GtkWidget *make_clip_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg );
    -static GtkWidget *make_clip_menu_item(gf_clip clip);
    -static GtkWidget *make_tpos_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg );
    -static GtkWidget *make_tpos_menu_item(gf_item_position pos);
    -static GtkWidget *make_ipos_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg );
    -static GtkWidget *make_ipos_menu_item(gf_item_position pos);
    -static GtkWidget *make_icon_size_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg );
    -static GtkWidget *make_icon_size_menu_item(gf_icon_size isize);
    -static GtkWidget *make_zoom_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg);
    -static GtkWidget *make_zoom_menu_item(gf_zoom zoom);
    -static GtkWidget *make_mouse_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg);
    -static GtkWidget *make_mouse_menu_item(gf_mouse mouse);
    static void make_color_preview( GtkWidget *image, const gchar *color );
    /* callbacks */
    @@ -149,7 +137,9 @@
    gtk_container_add(GTK_CONTAINER(frame), vbox2);
    /* create position option menu */
    - opt_mnu = make_gfpos_option_menu_with_label(GF_PREF_BEHAVIOR_WINDOW_POS, "_Position:", sg);
    + label = make_label("_Position:", sg);
    + 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);
    @@ -172,7 +162,10 @@
    gtk_box_pack_start(GTK_BOX(vbox2), spin, FALSE, FALSE, 0);
    /* create zoom option menu */
    - opt_mnu = make_zoom_option_menu_with_label(GF_PREF_BEHAVIOR_ZOOM, "_Zoom:", sg);
    + label = make_label("_Zoom:", sg);
    + 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);
    /* create alias check */
    @@ -188,15 +181,24 @@
    frame = gaim_gtk_make_frame(vbox, "Mouse");
    /* create mouse1 option */
    - opt_mnu = make_mouse_option_menu_with_label(GF_PREF_BEHAVIOR_MOUSE1, "_Left Button:", sg);
    + label = make_label("_Left Button:", sg);
    + 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);
    /* create mouse2 option */
    - opt_mnu = make_mouse_option_menu_with_label(GF_PREF_BEHAVIOR_MOUSE2, "_Middle Button:", sg);
    + label = make_label("_Middle Button:", sg);
    + 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);
    /* create mouse3 option */
    - opt_mnu = make_mouse_option_menu_with_label(GF_PREF_BEHAVIOR_MOUSE3, "_Right Button:", sg);
    + make_label("_Right Button:", sg);
    + 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);
    /*******************************************************************
    @@ -279,12 +281,16 @@
    gtk_box_pack_start(GTK_BOX(hbox), evt_color, FALSE, FALSE, 0);
    /* create clipping option menu */
    - opt_mnu = make_clip_option_menu_with_label(GF_PREF_APPEARANCE_TEXT_CLIPPING, "Clippin_g:", sg);
    + label = make_label("Clippin_g:", sg);
    + 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);
    /* create position option menu */
    - opt_mnu = make_tpos_option_menu_with_label(GF_PREF_APPEARANCE_TEXT_POS, "_Position:", sg);
    + label = make_label("_Position:", sg);
    + 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);
    @@ -306,12 +312,16 @@
    gtk_container_add(GTK_CONTAINER(frame), vbox2);
    /* create position option menu */
    - opt_mnu = make_ipos_option_menu_with_label(GF_PREF_APPEARANCE_PROT_POS, "P_osition:", sg);
    + label = make_label("P_osition:", sg);
    + 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);
    /* create size option menu */
    - opt_mnu = make_icon_size_option_menu_with_label(GF_PREF_APPEARANCE_PROT_SIZE, "Si_ze:", sg);
    + label = make_label("Si_ze:", sg);
    + 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);
    @@ -569,442 +579,6 @@
    return hbox;
    }
    -/**********************************************************************/
    -static GtkWidget *
    -make_gfpos_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg) {
    - GtkWidget *hbox, *label, *option_menu, *menu;
    - gint i;
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    -
    - label = make_label(text, sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - option_menu = gtk_option_menu_new();
    - menu = gtk_menu_new();
    -
    - for (i = 0; i < 4; i++)
    - gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_gfpos_menu_item(i));
    -
    - gtk_widget_show_all(menu);
    - gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
    - gtk_option_menu_set_history( GTK_OPTION_MENU(option_menu), gaim_prefs_get_int(pref));
    - g_signal_connect(G_OBJECT(option_menu), "changed", G_CALLBACK(opt_mnu_cb), (gpointer)pref);
    -
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), option_menu, FALSE, FALSE, 0);
    -
    - return hbox;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_gfpos_menu_item(gf_window_pos pos) {
    - GtkWidget *item, *hbox, *label = NULL, *image;
    - GdkPixbuf *pixbuf = NULL;
    -
    - item = gtk_menu_item_new();
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(item), hbox);
    -
    - pixbuf = get_window_image(pos);
    -
    - switch (pos)
    - {
    - case window_pos_nw: label = gtk_label_new("Top Left"); break;
    - case window_pos_ne: label = gtk_label_new("Top Right"); break;
    - case window_pos_sw: label = gtk_label_new("Bottom Left"); break;
    - case window_pos_se: label = gtk_label_new("Bottom Right"); break;
    - }
    -
    - image = gtk_image_new_from_pixbuf(pixbuf);
    -
    - if (pixbuf != NULL)
    - g_object_unref(pixbuf);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
    - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
    - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5 );
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - return item;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_clip_option_menu_with_label( const gchar *pref, gchar *text, GtkSizeGroup *sg ) {
    - GtkWidget *hbox, *label, *option_menu, *menu;
    - gint i;
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    -
    - label = make_label(text, sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - option_menu = gtk_option_menu_new();
    - menu = gtk_menu_new();
    -
    - for (i = 0; i < 4; i++)
    - gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_clip_menu_item(i));
    -
    - gtk_widget_show_all(menu);
    - gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
    - gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), gaim_prefs_get_int(pref));
    - g_signal_connect(G_OBJECT(option_menu), "changed", G_CALLBACK(opt_mnu_cb), (gpointer)pref);
    -
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), option_menu, FALSE, FALSE, 0);
    -
    - return hbox;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_clip_menu_item(gf_clip clip) {
    - GtkWidget *item, *hbox, *label = NULL, *image;
    - GdkPixbuf *pixbuf = NULL;
    -
    - item = gtk_menu_item_new();
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(item), hbox);
    -
    - pixbuf = get_clipping_image(clip);
    -
    - switch (clip)
    - {
    - case clip_truncate: label = gtk_label_new("Truncate"); break;
    - case clip_elipse_start: label = gtk_label_new("Elipse at the beginning"); break;
    - case clip_elipse_middle: label = gtk_label_new("Elipse in the middle"); break;
    - case clip_elipse_end: label = gtk_label_new("Elipse at the end"); break;
    - }
    -
    - image = gtk_image_new_from_pixbuf(pixbuf);
    -
    - if (pixbuf != NULL)
    - g_object_unref(pixbuf);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
    - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
    - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - return item;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_tpos_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg) {
    - GtkWidget *hbox, *label, *option_menu, *menu;
    - gint i;
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    -
    - label = make_label(text, sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - option_menu = gtk_option_menu_new();
    - menu = gtk_menu_new();
    -
    - for (i = 0; i < 9; i++)
    - gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_tpos_menu_item(i));
    -
    - gtk_widget_show_all(menu);
    - gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
    - gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), gaim_prefs_get_int(pref));
    - g_signal_connect(G_OBJECT(option_menu), "changed", G_CALLBACK(opt_mnu_cb), (gpointer)pref);
    -
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), option_menu, FALSE, FALSE, 0);
    -
    - return hbox;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_tpos_menu_item(gf_tpos pos) {
    - GtkWidget *item, *hbox, *label = NULL, *image;
    - GdkPixbuf *pixbuf = NULL;
    -
    - item = gtk_menu_item_new();
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(item), hbox);
    -
    - pixbuf = get_text_position_image(pos);
    -
    - switch (pos)
    - {
    - case tpos_nw: label = gtk_label_new("Top Left"); break;
    - case tpos_n: label = gtk_label_new("Top"); break;
    - case tpos_ne: label = gtk_label_new("Top Right"); break;
    - case tpos_w: label = gtk_label_new("Left"); break;
    - case tpos_c: label = gtk_label_new("Center"); break;
    - case tpos_e: label = gtk_label_new("Right"); break;
    - case tpos_sw: label = gtk_label_new("Bottom Left"); break;
    - case tpos_s: label = gtk_label_new("Bottom"); break;
    - case tpos_se: label = gtk_label_new("Bottom Right"); break;
    - }
    -
    - image = gtk_image_new_from_pixbuf(pixbuf);
    -
    - if (pixbuf != NULL)
    - g_object_unref(pixbuf);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
    - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
    - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - return item;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_ipos_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg) {
    - GtkWidget *hbox, *label, *option_menu, *menu;
    - gint i;
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    -
    - label = make_label(text, sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - option_menu = gtk_option_menu_new();
    - menu = gtk_menu_new();
    -
    - for (i = 0; i < 10; i++)
    - gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_ipos_menu_item(i));
    -
    - gtk_widget_show_all(menu);
    - gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
    - gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), gaim_prefs_get_int(pref));
    - g_signal_connect(G_OBJECT(option_menu), "changed", G_CALLBACK(opt_mnu_cb), (gpointer)pref);
    -
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), option_menu, FALSE, FALSE, 0);
    -
    - return hbox;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_ipos_menu_item(gf_ipos pos) {
    - GtkWidget *item, *hbox, *label = NULL, *image;
    - GdkPixbuf *pixbuf = NULL;
    -
    - item = gtk_menu_item_new();
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(item), hbox);
    -
    - pixbuf = get_icon_position_image(pos);
    -
    - switch (pos)
    - {
    - case ipos_none: label = gtk_label_new("None"); break;
    - case ipos_nw: label = gtk_label_new("Top Left"); break;
    - case ipos_n: label = gtk_label_new("Top"); break;
    - case ipos_ne: label = gtk_label_new("Top Right"); break;
    - case ipos_w: label = gtk_label_new("Left"); break;
    - case ipos_c: label = gtk_label_new("Center"); break;
    - case ipos_e: label = gtk_label_new("Right"); break;
    - case ipos_sw: label = gtk_label_new("Bottom Left"); break;
    - case ipos_s: label = gtk_label_new("Bottom"); break;
    - case ipos_se: label = gtk_label_new("Bottom Right"); break;
    - }
    -
    - image = gtk_image_new_from_pixbuf(pixbuf);
    -
    - if (pixbuf != NULL)
    - g_object_unref(pixbuf);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
    - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
    - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - return item;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_icon_size_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg) {
    - GtkWidget *hbox, *label, *option_menu, *menu;
    - gint i;
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    -
    - label = make_label(text, sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - option_menu = gtk_option_menu_new();
    - menu = gtk_menu_new();
    -
    - for (i = 0; i < 5; i++)
    - gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_icon_size_menu_item(i));
    -
    - gtk_widget_show_all(menu);
    - gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
    - gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), gaim_prefs_get_int(pref));
    - g_signal_connect(G_OBJECT(option_menu), "changed", G_CALLBACK(opt_mnu_cb), (gpointer)pref);
    -
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), option_menu, FALSE, FALSE, 0);
    -
    - return hbox;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_icon_size_menu_item(gf_icon_size isize) {
    - GtkWidget *item, *hbox, *label = NULL, *image;
    - GdkPixbuf *pixbuf = NULL;
    -
    - item = gtk_menu_item_new();
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(item), hbox);
    -
    - pixbuf = get_icon_size_image(isize);
    -
    - switch (isize)
    - {
    - case isize_tiny: label = gtk_label_new("Tiny (16x16)"); break;
    - case isize_small: label = gtk_label_new("Small (24x24)"); break;
    - case isize_normal: label = gtk_label_new("Normal (48x48)"); break;
    - case isize_large: label = gtk_label_new("Large (96x96)"); break;
    - case isize_huge: label = gtk_label_new("Huge (144x144)"); break;
    - }
    -
    - image = gtk_image_new_from_pixbuf(pixbuf);
    -
    - if (pixbuf != NULL)
    - g_object_unref(pixbuf);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
    - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
    - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - return item;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_zoom_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg) {
    - GtkWidget *hbox, *option_menu, *menu, *label;
    - gint i;
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    -
    - label = make_label(text, sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - option_menu = gtk_option_menu_new();
    - menu = gtk_menu_new();
    -
    - for (i = 0; i < 8; i++)
    - gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_zoom_menu_item(i));
    -
    - gtk_widget_show_all(menu);
    - gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
    - gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), gaim_prefs_get_int(pref));
    - g_signal_connect(G_OBJECT(option_menu), "changed", G_CALLBACK(opt_mnu_cb), (gpointer)pref);
    -
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), option_menu, FALSE, FALSE, 0);
    -
    - return hbox;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_zoom_menu_item(gf_zoom zoom) {
    - GtkWidget *hbox, *item, *label = NULL, *image;
    - GdkPixbuf *pixbuf = NULL;
    -
    - item = gtk_menu_item_new();
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(item), hbox);
    -
    - pixbuf = get_zoom_image(zoom);
    -
    - switch(zoom) {
    - case zoom_200: label = gtk_label_new("200%"); break;
    - case zoom_175: label = gtk_label_new("175%"); break;
    - case zoom_150: label = gtk_label_new("150%"); break;
    - case zoom_125: label = gtk_label_new("125%"); break;
    - case zoom_100: label = gtk_label_new("100%"); break;
    - case zoom_75: label = gtk_label_new("75%"); break;
    - case zoom_50: label = gtk_label_new("50%"); break;
    - case zoom_25: label = gtk_label_new("25%"); break;
    - }
    -
    - image = gtk_image_new_from_pixbuf(pixbuf);
    -
    - if (pixbuf != NULL)
    - g_object_unref(pixbuf);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
    - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
    - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - return item;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_mouse_option_menu_with_label(const gchar *pref, gchar *text, GtkSizeGroup *sg)
    -{
    - GtkWidget *hbox, *option_menu, *menu, *label;
    - gint i;
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    -
    - label = make_label(text, sg);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - option_menu = gtk_option_menu_new();
    - menu = gtk_menu_new();
    -
    - for (i = 0; i < mouse_count; i++)
    - gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_mouse_menu_item(i));
    -
    - gtk_widget_show_all(menu);
    - gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
    - gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), gaim_prefs_get_int(pref));
    - g_signal_connect(G_OBJECT(option_menu), "changed", G_CALLBACK(opt_mnu_cb), (gpointer)pref );
    -
    - gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu);
    -
    - gtk_box_pack_start(GTK_BOX(hbox), option_menu, FALSE, FALSE, 0);
    -
    - return hbox;
    -}
    -/**********************************************************************/
    -static GtkWidget *
    -make_mouse_menu_item(gf_mouse mouse) {
    - GtkWidget *hbox, *item, *label = NULL;
    -
    - item = gtk_menu_item_new();
    -
    - hbox = gtk_hbox_new(FALSE, 4);
    - gtk_container_add(GTK_CONTAINER(item), hbox);
    -
    - switch(mouse)
    - {
    - case mouse_destroy: label = gtk_label_new("Close Window"); break;
    - case mouse_info: label = gtk_label_new("Buddy Info"); break;
    - case mouse_conversation: label = gtk_label_new("Open Conversation"); break;
    - case mouse_log: label = gtk_label_new("View Log"); break;
    - case mouse_context: label = gtk_label_new("Context Menu"); break;
    - case mouse_count: return NULL; break;
    - }
    -
    - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
    - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
    - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    -
    - return item;
    -}
    /***********************************************************************
    Callbacks
    ***********************************************************************/
    --- a/gf_gtkutils.c Sat Dec 27 16:44:38 2003 +0000
    +++ b/gf_gtkutils.c Sat Dec 27 17:20:58 2003 +0000
    @@ -295,7 +295,7 @@
    }
    GtkWidget *
    -make_icon_size_option_menu(gf_icon icon) {
    +make_icon_size_option_menu(gf_icon_size size) {
    GtkWidget *option_menu, *menu;
    gint i;
    @@ -307,7 +307,7 @@
    gtk_widget_show_all(menu);
    gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
    - gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), position);
    + gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), size);
    gtk_widget_show(option_menu);
    return option_menu;
    --- a/gf_gtkutils.h Sat Dec 27 16:44:38 2003 +0000
    +++ b/gf_gtkutils.h Sat Dec 27 17:20:58 2003 +0000
    @@ -10,7 +10,7 @@
    GtkWidget *make_window_zoom_option_menu(gf_window_zoom zoom);
    GtkWidget *make_window_mouse_option_menu(gf_window_mouse mouse);
    GtkWidget *make_item_position_option_menu(gf_item_position position);
    -GtkWidget *make_text_clipping_option_menu(gf_clipping clipping);
    -GtkWidget *make_icon_size_option_menu(gf_icon icon);
    +GtkWidget *make_text_clipping_option_menu(gf_text_clipping clipping);
    +GtkWidget *make_icon_size_option_menu(gf_icon_size size);
    #endif
    --- a/gf_prefs.c Sat Dec 27 16:44:38 2003 +0000
    +++ b/gf_prefs.c Sat Dec 27 17:20:58 2003 +0000
    @@ -19,7 +19,7 @@
    #include "prefs.h"
    #include "debug.h"
    -#include "guifications.h"
    +#include "gf_types.h"
    #include "gf_prefs.h"
    /**********************************************************************/
    @@ -37,15 +37,15 @@
    gaim_prefs_add_bool(GF_PREF_BEHAVIOR_SHOW_BACK, TRUE);
    gaim_prefs_add_bool(GF_PREF_BEHAVIOR_SHOW_IDLE, TRUE);
    gaim_prefs_add_bool(GF_PREF_BEHAVIOR_SHOW_UNIDLE, TRUE);
    - gaim_prefs_add_int(GF_PREF_BEHAVIOR_WINDOW_POS, gfpos_se);
    + gaim_prefs_add_int(GF_PREF_BEHAVIOR_WINDOW_POS, window_position_se);
    gaim_prefs_add_bool(GF_PREF_BEHAVIOR_WINDOW_VERTICAL, TRUE);
    gaim_prefs_add_int(GF_PREF_BEHAVIOR_TIMEOUT, 6);
    - gaim_prefs_add_int(GF_PREF_BEHAVIOR_ZOOM, zoom_100);
    + gaim_prefs_add_int(GF_PREF_BEHAVIOR_ZOOM, window_zoom_100);
    gaim_prefs_add_bool(GF_PREF_BEHAVIOR_ALIAS, TRUE);
    gaim_prefs_add_bool(GF_PREF_BEHAVIOR_SHOWAWAY, TRUE); /* snakez */
    - gaim_prefs_add_int(GF_PREF_BEHAVIOR_MOUSE1, mouse_conversation);
    - gaim_prefs_add_int(GF_PREF_BEHAVIOR_MOUSE2, mouse_destroy);
    - gaim_prefs_add_int(GF_PREF_BEHAVIOR_MOUSE3, mouse_context);
    + gaim_prefs_add_int(GF_PREF_BEHAVIOR_MOUSE1, window_mouse_conversation);
    + gaim_prefs_add_int(GF_PREF_BEHAVIOR_MOUSE2, window_mouse_destroy);
    + gaim_prefs_add_int(GF_PREF_BEHAVIOR_MOUSE3, window_mouse_context);
    /* add appearance tree */
    gaim_prefs_add_none(GF_PREF_APPEARANCE_ROOT);
    @@ -54,12 +54,12 @@
    gaim_prefs_add_bool(GF_PREF_APPEARANCE_FONT, FALSE);
    gaim_prefs_add_string(GF_PREF_APPEARANCE_FONT_FACE, "");
    gaim_prefs_add_bool(GF_PREF_APPEARANCE_COLOR, FALSE);
    - gaim_prefs_add_int(GF_PREF_APPEARANCE_TEXT_POS, tpos_c);
    - gaim_prefs_add_int(GF_PREF_APPEARANCE_TEXT_CLIPPING, clip_elipse_middle);
    + gaim_prefs_add_int(GF_PREF_APPEARANCE_TEXT_POS, item_position_c);
    + gaim_prefs_add_int(GF_PREF_APPEARANCE_TEXT_CLIPPING, text_clipping_elipse_middle);
    gaim_prefs_add_int(GF_PREF_APPEARANCE_TEXT_X, 0);
    gaim_prefs_add_int(GF_PREF_APPEARANCE_TEXT_Y, 0);
    - gaim_prefs_add_int(GF_PREF_APPEARANCE_PROT_POS, ipos_sw);
    - gaim_prefs_add_int(GF_PREF_APPEARANCE_PROT_SIZE, isize_small);
    + gaim_prefs_add_int(GF_PREF_APPEARANCE_PROT_POS, item_position_sw);
    + gaim_prefs_add_int(GF_PREF_APPEARANCE_PROT_SIZE, icon_size_small);
    gaim_prefs_add_int(GF_PREF_APPEARANCE_PROT_X, 5);
    gaim_prefs_add_int(GF_PREF_APPEARANCE_PROT_Y, 5);
    --- a/guifications.c Sat Dec 27 16:44:38 2003 +0000
    +++ b/guifications.c Sat Dec 27 17:20:58 2003 +0000
    @@ -218,22 +218,22 @@
    vertical = gaim_prefs_get_bool(GF_PREF_BEHAVIOR_WINDOW_VERTICAL);
    switch (gaim_prefs_get_int(GF_PREF_BEHAVIOR_WINDOW_POS)) {
    - case window_pos_nw:
    + case window_position_nw:
    gtk_box_pack_start(GTK_BOX(gf_box), new_guification_box, FALSE, FALSE, 0);
    break;
    - case window_pos_ne:
    + case window_position_ne:
    if (vertical)
    gtk_box_pack_start(GTK_BOX(gf_box), new_guification_box, FALSE, FALSE, 0);
    else
    gtk_box_pack_end(GTK_BOX(gf_box), new_guification_box, FALSE, FALSE, 0);
    break;
    - case window_pos_sw:
    + case window_position_sw:
    if (vertical)
    gtk_box_pack_end(GTK_BOX(gf_box), new_guification_box, FALSE, FALSE, 0);
    else
    gtk_box_pack_start(GTK_BOX(gf_box), new_guification_box, FALSE, FALSE, 0);
    break;
    - case window_pos_se:
    + case window_position_se:
    gtk_box_pack_end(GTK_BOX(gf_box), new_guification_box, FALSE, FALSE, 0);
    break;
    }
    @@ -418,32 +418,32 @@
    gboolean destroy = FALSE;
    GaimPluginProtocolInfo *prplinfo = NULL;
    - gf_mouse action;
    + gf_window_mouse action;
    switch (event_button->button) {
    case 1: action = gaim_prefs_get_int(GF_PREF_BEHAVIOR_MOUSE1); break;
    case 2: action = gaim_prefs_get_int(GF_PREF_BEHAVIOR_MOUSE2); break;
    case 3: action = gaim_prefs_get_int(GF_PREF_BEHAVIOR_MOUSE3); break;
    - default: action = mouse_destroy; break;
    + default: action = window_mouse_destroy; break;
    }
    switch (action) {
    - case mouse_destroy:
    + case window_mouse_destroy:
    destroy = TRUE;
    break;
    - case mouse_info:
    + case window_mouse_info:
    serv_get_info(buddy->account->gc, buddy->name);
    destroy = TRUE;
    break;
    - case mouse_conversation:
    + case window_mouse_conversation:
    gf_show_conv(buddy);
    destroy = TRUE;
    break;
    - case mouse_log:
    + case window_mouse_log:
    gaim_gtk_log_show(buddy->name, buddy->account);
    destroy = TRUE;
    break;
    - case mouse_context:
    + case window_mouse_context:
    prplinfo = GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol(buddy->account)));
    menu = gtk_menu_new();
    @@ -480,7 +480,6 @@
    destroy = FALSE;
    break;
    - case mouse_count:
    default:
    destroy = TRUE;
    break;