* src/prefs_common.c

[claws.git] / src / prefs_scoring.c

diff --git a/src/prefs_scoring.c b/src/prefs_scoring.c
index 7eeddbb4ceeacb30a5e316d83c65f3803733790c..5bac35799907745342743ea80b86bf6c94590855 100644 (file)
--- a/src/prefs_scoring.c
+++ b/src/prefs_scoring.c
@@ -47,6 +47,8 @@
 #include "folder.h"
 #include "scoring.h"
 
+#include "matcher_parser.h"
+
 static struct Scoring {
        GtkWidget *window;
 
@@ -67,11 +69,6 @@ static struct Scoring {
    pointer to the function for widget setting
  */
 
-#define VSPACING               12
-#define VSPACING_NARROW                4
-#define DEFAULT_ENTRY_WIDTH    80
-#define PREFSBUFSIZE           1024
-
 /* widget creating functions */
 static void prefs_scoring_create               (void);
 
@@ -114,7 +111,7 @@ void prefs_scoring_open(FolderItem * item)
        if (prefs_rc_is_readonly(SCORING_RC))
                return;
 
-       inc_autocheck_timer_remove();
+       inc_lock();
 
        if (!scoring.window) {
                prefs_scoring_create();
@@ -132,7 +129,7 @@ void prefs_scoring_open(FolderItem * item)
 
 void prefs_scoring_open_with_scoring(ScoringProp * prop)
 {
-       inc_autocheck_timer_remove();
+       inc_lock();
 
        if (!scoring.window) {
                prefs_scoring_create();
@@ -182,9 +179,9 @@ static void prefs_scoring_create(void)
        GtkWidget *kill_score_entry;
        GtkWidget *kill_score_label;
 
-       gchar *title[] = {_("Registered rules")};
+       gchar *title[1];
 
-       debug_print(_("Creating scoring setting window...\n"));
+       debug_print("Creating scoring setting window...\n");
 
        window = gtk_window_new (GTK_WINDOW_DIALOG);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
@@ -208,10 +205,7 @@ static void prefs_scoring_create(void)
                            GTK_SIGNAL_FUNC(prefs_scoring_deleted), NULL);
        gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
                            GTK_SIGNAL_FUNC(prefs_scoring_key_pressed), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "focus_in_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "focus_out_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT (window);
        gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
                            GTK_SIGNAL_FUNC(prefs_scoring_ok), NULL);
        gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
@@ -306,6 +300,7 @@ static void prefs_scoring_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
+       title[0] = _("Registered rules");
        cond_clist = gtk_clist_new_with_titles(1, title);
        gtk_widget_show (cond_clist);
        gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
@@ -337,7 +332,7 @@ static void prefs_scoring_create(void)
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0);
 
-       kill_score_label = gtk_label_new (_("Kill score"));
+       kill_score_label = gtk_label_new (_("Hide score"));
        gtk_widget_show (kill_score_label);
        gtk_misc_set_alignment (GTK_MISC (kill_score_label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (hbox1), kill_score_label,
@@ -440,7 +435,6 @@ static void prefs_scoring_set_list(void)
        ScoringProp *prop;
        GSList * cur;
        gchar * scoring_str;
-       gchar * tmp;
        GSList * prefs_scoring;
 
        if (cur_item == NULL)
@@ -457,8 +451,7 @@ static void prefs_scoring_set_list(void)
        while (gtk_clist_get_text(GTK_CLIST(scoring.cond_clist),
                                  row, 0, &scoring_str)) {
                if (strcmp(scoring_str, _("(New)")) != 0) {
-                       tmp = scoring_str;
-                       prop = scoringprop_parse(&tmp);
+                       prop = matcher_parser_get_scoring(scoring_str);
                        if (prop != NULL)
                                prefs_scoring = g_slist_append(prefs_scoring,
                                                               prop);
@@ -530,11 +523,8 @@ static void prefs_scoring_condition_define(void)
        cond_str = gtk_entry_get_text(GTK_ENTRY(scoring.cond_entry));
 
        if (*cond_str != '\0') {
-               gchar * tmp;
-               
-               tmp = cond_str;
-               matchers = matcherlist_parse(&tmp);
-               if (tmp == NULL)
+               matchers = matcher_parser_get_cond(cond_str);
+               if (matchers == NULL)
                        alertpanel_error(_("Match string is not valid."));
        }
 
@@ -554,7 +544,6 @@ static void prefs_scoring_register_cb(void)
        gchar * score_str;
        ScoringProp * prop;
        gint score;
-       gchar * tmp;
 
        cond_str = gtk_entry_get_text(GTK_ENTRY(scoring.cond_entry));
        if (*cond_str == '\0') {
@@ -569,10 +558,9 @@ static void prefs_scoring_register_cb(void)
        }
 
        score = atoi(score_str);
-       tmp = cond_str;
-       cond = matcherlist_parse(&tmp);
+       cond = matcher_parser_get_cond(cond_str);
 
-       if (tmp == NULL) {
+       if (cond == NULL) {
                alertpanel_error(_("Match string is not valid."));
                return;
        }
@@ -595,7 +583,6 @@ static void prefs_scoring_substitute_cb(void)
        gchar * score_str;
        ScoringProp * prop;
        gint score;
-       gchar * tmp;
 
        if (!clist->selection) return;
 
@@ -615,10 +602,9 @@ static void prefs_scoring_substitute_cb(void)
        }
 
        score = atoi(score_str);
-       tmp = cond_str;
-       cond = matcherlist_parse(&tmp);
+       cond = matcher_parser_get_cond(cond_str);
 
-       if (tmp == NULL) {
+       if (cond == NULL) {
                alertpanel_error(_("Match string is not valid."));
                return;
        }
@@ -659,6 +645,9 @@ static void prefs_scoring_up(void)
        row = GPOINTER_TO_INT(clist->selection->data);
        if (row > 1) {
                gtk_clist_row_move(clist, row, row - 1);
+               if(gtk_clist_row_is_visible(clist, row - 1) != GTK_VISIBILITY_FULL) {
+                       gtk_clist_moveto(clist, row - 1, 0, 0, 0);
+               } 
        }
 }
 
@@ -672,6 +661,9 @@ static void prefs_scoring_down(void)
        row = GPOINTER_TO_INT(clist->selection->data);
        if (row > 0 && row < clist->rows - 1) {
                gtk_clist_row_move(clist, row, row + 1);
+               if(gtk_clist_row_is_visible(clist, row + 1) != GTK_VISIBILITY_FULL) {
+                       gtk_clist_moveto(clist, row + 1, 0, 1, 0);
+               } 
        }
 }
 
@@ -701,7 +693,6 @@ static void prefs_scoring_select(GtkCList *clist, gint row, gint column,
                                GdkEvent *event)
 {
        ScoringProp * prop;
-       gchar * tmp;
 
        gchar * scoring_str;
 
@@ -714,9 +705,8 @@ static void prefs_scoring_select(GtkCList *clist, gint row, gint column,
                                row, 0, &scoring_str))
                return;
 
-       tmp = scoring_str;
-       prop = scoringprop_parse(&tmp);
-       if (tmp == NULL)
+       prop = matcher_parser_get_scoring(scoring_str);
+       if (prop == NULL)
                return;
 
        prefs_scoring_select_set_dialog(prop);
@@ -740,15 +730,18 @@ static void prefs_scoring_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
 static void prefs_scoring_ok(void)
 {
+       prefs_common_save_config();
        prefs_scoring_set_list();
-       prefs_scoring_write_config();
+       prefs_matcher_write_config();
        if (cur_item != NULL)
                prefs_folder_item_save_config(cur_item);
        gtk_widget_hide(scoring.window);
+       inc_unlock();
 }
 
 static void prefs_scoring_cancel(void)
 {
-       prefs_scoring_read_config();
+       prefs_matcher_read_config();
        gtk_widget_hide(scoring.window);
+       inc_unlock();
 }