grim/guifications1

The long awaited offsets for guifications...

2004-05-25, grim
1d8839c7f089
Parents f7c7ac771684
Children 99ff3d3e81c8
The long awaited offsets for guifications...
4 files changed, 23 insertions(+), 4 deletions(-)
  • +11 -0
    src/gf_conf.c
  • +2 -0
    src/gf_prefs.c
  • +2 -0
    src/gf_prefs.h
  • +8 -4
    src/gf_utils.c
    • --- a/src/gf_conf.c Mon May 24 19:35:27 2004 +0000
    +++ b/src/gf_conf.c Tue May 25 19:37:00 2004 +0000
    @@ -146,6 +146,17 @@
    label = gf_add_label(opt_mnu, "_Position:", sg);
    gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    + /* create offset spin buttons */
    + spin = gf_make_spin_button(gaim_prefs_get_int(GF_PREF_BEHAVIOR_X), 0, 255, TRUE);
    + g_signal_connect(G_OBJECT(spin), "changed", G_CALLBACK(spn_btn_cb), (gpointer)GF_PREF_BEHAVIOR_X);
    + label = gf_add_label(spin, "_Horizontal offset:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    +
    + spin = gf_make_spin_button(gaim_prefs_get_int(GF_PREF_BEHAVIOR_Y), 0, 255, TRUE);
    + g_signal_connect(G_OBJECT(spin), "changed", G_CALLBACK(spn_btn_cb), (gpointer)GF_PREF_BEHAVIOR_Y);
    + label = gf_add_label(spin, "_Horizontal offset:", sg);
    + gtk_box_pack_start(GTK_BOX(frame), label, FALSE, FALSE, 0);
    +
    /* create vertical check */
    chk_btn = gf_make_check_button(gaim_prefs_get_bool(GF_PREF_BEHAVIOR_WINDOW_VERTICAL), "_Vertical", sg);
    g_signal_connect(G_OBJECT(chk_btn), "clicked", G_CALLBACK(chk_box_cb), (gpointer)GF_PREF_BEHAVIOR_WINDOW_VERTICAL);
    --- a/src/gf_prefs.c Mon May 24 19:35:27 2004 +0000
    +++ b/src/gf_prefs.c Tue May 25 19:37:00 2004 +0000
    @@ -39,6 +39,8 @@
    gaim_prefs_add_bool(GF_PREF_BEHAVIOR_SHOW_UNIDLE, TRUE);
    gaim_prefs_add_bool(GF_PREF_BEHAVIOR_SHOW_RECEIVE_MESSAGES, TRUE);
    gaim_prefs_add_int(GF_PREF_BEHAVIOR_WINDOW_POS, window_position_se);
    + gaim_prefs_add_int(GF_PREF_BEHAVIOR_X, 0);
    + gaim_prefs_add_int(GF_PREF_BEHAVIOR_Y, 0);
    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, window_zoom_100);
    --- a/src/gf_prefs.h Mon May 24 19:35:27 2004 +0000
    +++ b/src/gf_prefs.h Tue May 25 19:37:00 2004 +0000
    @@ -33,6 +33,8 @@
    #define GF_PREF_BEHAVIOR_SHOW_UNIDLE "/plugins/gtk/amc_grim/guifications/behavior/unidle"
    #define GF_PREF_BEHAVIOR_SHOW_RECEIVE_MESSAGES "/plugins/gtk/amc_grim/guifications/behavior/rcvmsg"
    #define GF_PREF_BEHAVIOR_WINDOW_POS "/plugins/gtk/amc_grim/guifications/behavior/pos"
    +#define GF_PREF_BEHAVIOR_X "/plugins/gtk/amc_grim/guifications/behavior/x"
    +#define GF_PREF_BEHAVIOR_Y "/plugins/gtk/amc_grim/guifications/behavior/y"
    #define GF_PREF_BEHAVIOR_WINDOW_VERTICAL "/plugins/gtk/amc_grim/guifications/behavior/vertical"
    #define GF_PREF_BEHAVIOR_TIMEOUT "/plugins/gtk/amc_grim/guifications/behavior/timeout"
    #define GF_PREF_BEHAVIOR_ZOOM "/plugins/gtk/amc_grim/guifications/behavior/zoom"
    --- a/src/gf_utils.c Mon May 24 19:35:27 2004 +0000
    +++ b/src/gf_utils.c Tue May 25 19:37:00 2004 +0000
    @@ -54,10 +54,12 @@
    switch(gaim_prefs_get_int(GF_PREF_BEHAVIOR_WINDOW_POS)) {
    case window_position_nw:
    case window_position_sw:
    - return 0;
    + return gaim_prefs_get_int(GF_PREF_BEHAVIOR_X);;
    + break;
    case window_position_ne:
    case window_position_se:
    - return gdk_screen_width() - req.width;
    + return gdk_screen_width() - (req.width + gaim_prefs_get_int(GF_PREF_BEHAVIOR_X));
    + break;
    }
    return 0;
    }
    @@ -71,10 +73,12 @@
    switch(gaim_prefs_get_int(GF_PREF_BEHAVIOR_WINDOW_POS)) {
    case window_position_ne:
    case window_position_nw:
    - return 0;
    + return gaim_prefs_get_int(GF_PREF_BEHAVIOR_Y);
    + break;
    case window_position_se:
    case window_position_sw:
    - return gdk_screen_height() - req.height;
    + return gdk_screen_height() - (req.height + gaim_prefs_get_int(GF_PREF_BEHAVIOR_Y));
    + break;
    }
    return 0;
    }