inital gtk2 patch

[claws.git] / src / prefs_scoring.c

diff --git a/src/prefs_scoring.c b/src/prefs_scoring.c
index 5f389f97bd7069304b1244bac6e4ae7dd2ecba71..5987dbaf196b48175d4bc8b3dd289f8b2842be68 100644 (file)
--- a/src/prefs_scoring.c
+++ b/src/prefs_scoring.c
@@ -33,7 +33,7 @@
 
 #include "intl.h"
 #include "main.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
 #include "prefs_matcher.h"
 #include "prefs_scoring.h"
 #include "prefs_common.h"
@@ -183,7 +183,7 @@ static void prefs_scoring_create(void)
 
        debug_print("Creating scoring configuration window...\n");
 
-       window = gtk_window_new (GTK_WINDOW_DIALOG);
+       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal (GTK_WINDOW (window), TRUE);
@@ -391,19 +391,10 @@ static void prefs_scoring_set_dialog(ScoringProp * cond)
                cur_important_score = prefs_common.important_score;
                gtk_widget_show(scoring.kill_score_label);
                gtk_widget_show(scoring.kill_score_entry);
-       }
-       else {
+       } else {
                prefs_scoring = cur_item->prefs->scoring;
                cur_kill_score = cur_item->prefs->kill_score;
                cur_important_score = cur_item->prefs->important_score;
-               if (cur_item->folder->type != F_NEWS) {
-                       gtk_widget_hide(scoring.kill_score_label);
-                       gtk_widget_hide(scoring.kill_score_entry);
-               }
-               else {
-                       gtk_widget_show(scoring.kill_score_label);
-                       gtk_widget_show(scoring.kill_score_entry);
-               }
        }
 
        for(cur = prefs_scoring ; cur != NULL ;
@@ -517,7 +508,7 @@ static void prefs_scoring_condition_define_done(MatcherList * matchers)
 
 static void prefs_scoring_condition_define(void)
 {
-       gchar * cond_str;
+       const gchar * cond_str;
        MatcherList * matchers = NULL;
 
        cond_str = gtk_entry_get_text(GTK_ENTRY(scoring.cond_entry));
@@ -540,8 +531,8 @@ static void prefs_scoring_condition_define(void)
 static void prefs_scoring_register_cb(void)
 {
        MatcherList * cond;
-       gchar * cond_str;
-       gchar * score_str;
+       const gchar * cond_str;
+       const gchar * score_str;
        ScoringProp * prop;
        gint score;
 
@@ -579,8 +570,8 @@ static void prefs_scoring_substitute_cb(void)
        GtkCList *clist = GTK_CLIST(scoring.cond_clist);
        gint row;
        MatcherList * cond;
-       gchar * cond_str;
-       gchar * score_str;
+       const gchar * cond_str;
+       const gchar * score_str;
        ScoringProp * prop;
        gint score;
 
@@ -730,11 +721,55 @@ static void prefs_scoring_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
 static void prefs_scoring_ok(void)
 {
+       MatcherList * cond;
+       const gchar * cond_str;
+       const gchar * score_str;
+       gchar * scoring_str;
+       gchar * str;
+       ScoringProp * prop;
+       gint score;
+       gint row = 1;
+        AlertValue val;
+
+       cond_str = gtk_entry_get_text(GTK_ENTRY(scoring.cond_entry));
+       score_str = gtk_entry_get_text(GTK_ENTRY(scoring.score_entry));
+       if (*cond_str != '\0' && *score_str != '\0') {
+               score = atoi(score_str);
+               cond = matcher_parser_get_cond(cond_str);
+
+               if (cond == NULL) {
+                       prefs_common_save_config();
+                       prefs_scoring_set_list();
+                       prefs_matcher_write_config();
+                       if (cur_item != NULL)
+                               folder_item_prefs_save_config(cur_item);
+                       gtk_widget_hide(scoring.window);
+                       inc_unlock();
+                       return;
+               }
+               prop = scoringprop_new(cond, score);
+               str = scoringprop_to_string(prop);
+               while (gtk_clist_get_text(GTK_CLIST(scoring.cond_clist),
+                                 row, 0, &scoring_str)) {
+                       if (strcmp(scoring_str, str) == 0) break;
+                       row++;
+               }
+                if (strcmp(scoring_str, str) != 0) {
+                        val = alertpanel(_("Entry not saved"),
+                                 _("The entry was not saved\nHave you really finished?"),
+                                 _("Yes"), _("No"), NULL);
+                        if (G_ALERTDEFAULT != val) {
+                                g_free(str);
+                                return;
+                        }
+                }
+               g_free(str);
+       }
        prefs_common_save_config();
        prefs_scoring_set_list();
        prefs_matcher_write_config();
        if (cur_item != NULL)
-               prefs_folder_item_save_config(cur_item);
+               folder_item_prefs_save_config(cur_item);
        gtk_widget_hide(scoring.window);
        inc_unlock();
 }