2005-01-22 [colin] 1.0.0cvs8.1
[claws.git] / src / gtk / quicksearch.c
index ccafb26ea9951d05b4be6fce7da20b816b098c19..01d5972ff567eb406dc6cec2816c9f9061ce1f09 100644 (file)
@@ -21,6 +21,8 @@
 #  include "config.h"
 #endif
 
+#include <ctype.h>
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -32,6 +34,8 @@
 #include "matcher.h"
 #include "matcher_parser.h"
 #include "quicksearch.h"
+#include "folderview.h"
+#include "folder.h"
 
 struct _QuickSearch
 {
@@ -47,8 +51,15 @@ struct _QuickSearch
 
        QuickSearchExecuteCallback       callback;
        gpointer                         callback_data;
+       gboolean                         running;
+       gboolean                         has_focus;
+       FolderItem                      *root_folder_item;
 };
 
+static void quicksearch_set_running(QuickSearch *quicksearch, gboolean run);
+static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active);
+static void quicksearch_reset_folder_items(QuickSearch *quicksearch, FolderItem *folder_item);
+
 static void prepare_matcher(QuickSearch *quicksearch)
 {
        const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
@@ -59,7 +70,7 @@ static void prepare_matcher(QuickSearch *quicksearch)
        }
 
        if (search_string == NULL || search_string[0] == '\0') {
-               quicksearch->active = FALSE;
+               quicksearch_set_active(quicksearch, FALSE);
                return;
        }
 
@@ -72,7 +83,7 @@ static void prepare_matcher(QuickSearch *quicksearch)
                        g_free(newstr);
                } else {
                        quicksearch->matcher_list = NULL;
-                       quicksearch->active = FALSE;
+                       quicksearch_set_active(quicksearch, FALSE);
 
                        return;
                }
@@ -82,7 +93,7 @@ static void prepare_matcher(QuickSearch *quicksearch)
                quicksearch->search_string = g_strdup(search_string);
        }
 
-       quicksearch->active = TRUE;
+       quicksearch_set_active(quicksearch, TRUE);
 }
 
 static void update_extended_button (QuickSearch *quicksearch)
@@ -100,9 +111,27 @@ static void update_extended_button (QuickSearch *quicksearch)
        
 }
 
+static gboolean searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
+                                 QuickSearch *quicksearch)
+{
+       quicksearch->has_focus = (event && event->in);
+       return FALSE;
+}
+
+gboolean quicksearch_has_focus(QuickSearch *quicksearch)
+{
+       return quicksearch->has_focus;
+}
+
 static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
                                  QuickSearch *quicksearch)
 {
+       if (event != NULL && event->keyval == GDK_Escape) {
+               quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
+               gtk_widget_grab_focus(GTK_WIDGET(GTK_COMBO(quicksearch->search_string_entry)->entry));
+               return TRUE;
+       }
+
        if (event != NULL && event->keyval == GDK_Return) {
                const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
 
@@ -116,9 +145,13 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
 
                prepare_matcher(quicksearch);
 
+               quicksearch_set_running(quicksearch, TRUE);
                if (quicksearch->callback != NULL)
                        quicksearch->callback(quicksearch, quicksearch->callback_data);
+               quicksearch_set_running(quicksearch, FALSE);
                g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
+               gtk_widget_grab_focus(GTK_WIDGET(GTK_COMBO(
+                       quicksearch->search_string_entry)->entry));
                return TRUE;
        }
 
@@ -138,8 +171,31 @@ static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
 
        prepare_matcher(quicksearch);
 
+       quicksearch_set_running(quicksearch, TRUE);
        if (quicksearch->callback != NULL)
                quicksearch->callback(quicksearch, quicksearch->callback_data);
+       quicksearch_set_running(quicksearch, FALSE);
+       return TRUE;
+}
+
+static gboolean searchtype_recursive_changed(GtkMenuItem *widget, gpointer data)
+{
+       QuickSearch *quicksearch = (QuickSearch *)data;
+       gboolean checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
+       
+       prefs_common.summary_quicksearch_recurse = checked; 
+
+       /* reselect the search type */
+       gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt), 
+                                   prefs_common.summary_quicksearch_type);
+
+       prepare_matcher(quicksearch);
+
+       quicksearch_set_running(quicksearch, TRUE);
+       if (quicksearch->callback != NULL)
+               quicksearch->callback(quicksearch, quicksearch->callback_data);
+       quicksearch_set_running(quicksearch, FALSE);
+       return TRUE;
 }
 
 /*
@@ -161,12 +217,13 @@ static gchar *search_descr_strings[] = {
        "f S",   N_("messages originating from user S"),
        "F",     N_("forwarded messages"),
        "h S",   N_("messages which contain header S"),
-       "i S",   N_("messages which contain S in Message-Id header"),
+       "i S",   N_("messages which contain S in Message-ID header"),
        "I S",   N_("messages which contain S in inreplyto header"),
        "L",     N_("locked messages"),
        "n S",   N_("messages which are in newsgroup S"),
        "N",     N_("new messages"),
        "O",     N_("old messages"),
+       "p",     N_("incomplete messages (not entirely downloaded)"),
        "r",     N_("messages which have been replied to"),
        "R",     N_("read messages"),
        "s S",   N_("messages which contain S in subject"),
@@ -182,11 +239,13 @@ static gchar *search_descr_strings[] = {
        "x S",   N_("messages which contain S in References header"),
        "X cmd", N_("messages returning 0 when passed to command"),
        "y S",   N_("messages which contain S in X-Label header"),
-        "",     "" ,
+       "",      "" ,
        "&",     N_("logical AND operator"),
        "|",     N_("logical OR operator"),
        "! or ~",       N_("logical NOT operator"),
        "%",     N_("case sensitive search"),
+       "",      "" ,
+       " ",     N_("all filtering expressions are allowed"),
        NULL,    NULL 
 };
  
@@ -211,21 +270,6 @@ static gboolean clear_search_cb(GtkMenuItem *widget, gpointer data)
        return TRUE;
 };
 
-/*
-static void summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
-                                       SummaryView *summaryview)
-{
-       if (event != NULL && event->in)
-               gtk_signal_handler_block_by_func(GTK_OBJECT(summaryview->mainwin->window), 
-                                                GTK_SIGNAL_FUNC(mainwindow_key_pressed),
-                                                summaryview->mainwin);
-       else
-               gtk_signal_handler_unblock_by_func(GTK_OBJECT(summaryview->mainwin->window), 
-                                                  GTK_SIGNAL_FUNC(mainwindow_key_pressed),
-                                                  summaryview->mainwin);
-}
-*/
-
 QuickSearch *quicksearch_new()
 {
        QuickSearch *quicksearch;
@@ -266,6 +310,18 @@ QuickSearch *quicksearch_new()
                         G_CALLBACK(searchtype_changed),
                         quicksearch);
 
+       gtk_menu_shell_append(GTK_MENU_SHELL(search_type), gtk_separator_menu_item_new());
+       
+       menuitem = gtk_check_menu_item_new_with_label(_("Recursive"));
+       gtk_menu_shell_append(GTK_MENU_SHELL(search_type), menuitem);
+       
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                       prefs_common.summary_quicksearch_recurse);
+       
+       g_signal_connect(G_OBJECT(menuitem), "activate",
+                        G_CALLBACK(searchtype_recursive_changed),
+                        quicksearch);
+
        gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
        
        gtk_option_menu_set_history(GTK_OPTION_MENU(search_type_opt), prefs_common.summary_quicksearch_type);
@@ -288,12 +344,15 @@ QuickSearch *quicksearch_new()
 
        gtk_box_set_spacing(GTK_BOX(search_hbbox), 5);
                
-       clear_search = gtk_button_new_with_label(_("Clear"));
-       gtk_box_pack_start(GTK_BOX(search_hbbox), clear_search, 
-                          TRUE, TRUE, 0);
-       gtk_widget_set_size_request(clear_search, 120, -1);
-       
-       gtk_widget_show(clear_search);
+       if (prefs_common.summary_quicksearch_sticky) {
+               clear_search = gtk_button_new_with_label(_("Clear"));
+               gtk_box_pack_start(GTK_BOX(search_hbbox), clear_search,
+                                  FALSE, FALSE, 0);
+               gtk_widget_set_usize(clear_search, 120, -1);
+               g_signal_connect(G_OBJECT(clear_search), "clicked",
+                                G_CALLBACK(clear_search_cb), quicksearch);
+               gtk_widget_show(clear_search);
+       }
 
        search_description = gtk_button_new_with_label(_("Extended Symbols"));
        gtk_box_pack_start(GTK_BOX(search_hbbox), search_description,
@@ -302,27 +361,30 @@ QuickSearch *quicksearch_new()
                
        g_signal_connect(G_OBJECT(search_description), "clicked",
                         G_CALLBACK(search_description_cb), NULL);
-       g_signal_connect(G_OBJECT(clear_search), "clicked",
-                        G_CALLBACK(clear_search_cb), quicksearch);
+
        gtk_box_pack_start(GTK_BOX(hbox_search), search_hbbox, FALSE, FALSE, 2);                                
        gtk_widget_show(search_hbbox);
+       if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED)
+               gtk_widget_show(search_description);
+       else
+               gtk_widget_hide(search_description);
        
-       gtk_signal_connect(GTK_OBJECT(GTK_COMBO(search_string_entry)->entry), 
+       g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry), 
                           "key_press_event",
-                          GTK_SIGNAL_FUNC(searchbar_pressed),
+                          G_CALLBACK(searchbar_pressed),
                           quicksearch);
 
-       /*
-       gtk_signal_connect(GTK_OBJECT(GTK_COMBO(search_string_entry)->entry), 
-                          "focus_in_event",
-                          GTK_SIGNAL_FUNC(searchbar_focus_evt),
-                          quicksearch);
+       
+       g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
+                        "focus_in_event",
+                        G_CALLBACK(searchbar_focus_evt),
+                        quicksearch);
 
-       gtk_signal_connect(GTK_OBJECT(GTK_COMBO(search_string_entry)->entry), 
-                          "focus_out_event",
-                          GTK_SIGNAL_FUNC(searchbar_focus_evt),
-                          quicksearch);
-       */
+       g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
+                        "focus_out_event",
+                        G_CALLBACK(searchbar_focus_evt),
+                        quicksearch);
+       
 
        quicksearch->hbox_search = hbox_search;
        quicksearch->search_type = search_type;
@@ -331,7 +393,8 @@ QuickSearch *quicksearch_new()
        quicksearch->search_description = search_description;
        quicksearch->matcher_list = NULL;
        quicksearch->active = FALSE;
-
+       quicksearch->running = FALSE;
+       
        update_extended_button(quicksearch);
        
        return quicksearch;
@@ -351,7 +414,7 @@ void quicksearch_show(QuickSearch *quicksearch)
 
 void quicksearch_hide(QuickSearch *quicksearch)
 {
-       quicksearch->active = FALSE;
+       quicksearch_set_active(quicksearch, FALSE);
        gtk_widget_hide(quicksearch->hbox_search);
 }
 
@@ -366,8 +429,10 @@ void quicksearch_set(QuickSearch *quicksearch, QuickSearchType type,
 
        prepare_matcher(quicksearch);
 
+       quicksearch_set_running(quicksearch, TRUE);
        if (quicksearch->callback != NULL)
                quicksearch->callback(quicksearch, quicksearch->callback_data); 
+       quicksearch_set_running(quicksearch, FALSE);
 }
 
 gboolean quicksearch_is_active(QuickSearch *quicksearch)
@@ -375,6 +440,14 @@ gboolean quicksearch_is_active(QuickSearch *quicksearch)
        return quicksearch->active;
 }
 
+static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
+{
+       quicksearch->active = active;
+       if (!active) {
+               quicksearch_reset_cur_folder_item(quicksearch);
+       }
+}
+
 void quicksearch_set_execute_callback(QuickSearch *quicksearch,
                                      QuickSearchExecuteCallback callback,
                                      gpointer data)
@@ -407,11 +480,299 @@ gboolean quicksearch_match(QuickSearch *quicksearch, MsgInfo *msginfo)
                break;
        }
 
-       if (prefs_common.summary_quicksearch_type != QUICK_SEARCH_EXTENDED && quicksearch->search_string &&
+       if (prefs_common.summary_quicksearch_type != QUICK_SEARCH_EXTENDED && 
+           quicksearch->search_string &&
             searched_header && strcasestr(searched_header, quicksearch->search_string) != NULL)
                return TRUE;
-       else if ((quicksearch->matcher_list != NULL) && matcherlist_match(quicksearch->matcher_list, msginfo))
+       else if ((quicksearch->matcher_list != NULL) && 
+                matcherlist_match(quicksearch->matcher_list, msginfo))
                return TRUE;
 
        return FALSE;
 }
+
+/* allow Mutt-like patterns in quick search */
+gchar *expand_search_string(const gchar *search_string)
+{
+       int i = 0;
+       gchar term_char, save_char;
+       gchar *cmd_start, *cmd_end;
+       GString *matcherstr;
+       gchar *returnstr = NULL;
+       gchar *copy_str;
+       gboolean casesens, dontmatch;
+       /* list of allowed pattern abbreviations */
+       struct {
+               gchar           *abbreviated;   /* abbreviation */
+               gchar           *command;       /* actual matcher command */ 
+               gint            numparams;      /* number of params for cmd */
+               gboolean        qualifier;      /* do we append regexpcase */
+               gboolean        quotes;         /* do we need quotes */
+       }
+       cmds[] = {
+               { "a",  "all",                          0,      FALSE,  FALSE },
+               { "ag", "age_greater",                  1,      FALSE,  FALSE },
+               { "al", "age_lower",                    1,      FALSE,  FALSE },
+               { "b",  "body_part",                    1,      TRUE,   TRUE  },
+               { "B",  "message",                      1,      TRUE,   TRUE  },
+               { "c",  "cc",                           1,      TRUE,   TRUE  },
+               { "C",  "to_or_cc",                     1,      TRUE,   TRUE  },
+               { "D",  "deleted",                      0,      FALSE,  FALSE },
+               { "e",  "header \"Sender\"",            1,      TRUE,   TRUE  },
+               { "E",  "execute",                      1,      FALSE,  TRUE  },
+               { "f",  "from",                         1,      TRUE,   TRUE  },
+               { "F",  "forwarded",                    0,      FALSE,  FALSE },
+               { "h",  "headers_part",                 1,      TRUE,   TRUE  },
+               { "i",  "header \"Message-ID\"",        1,      TRUE,   TRUE  },
+               { "I",  "inreplyto",                    1,      TRUE,   TRUE  },
+               { "L",  "locked",                       0,      FALSE,  FALSE },
+               { "n",  "newsgroups",                   1,      TRUE,   TRUE  },
+               { "N",  "new",                          0,      FALSE,  FALSE },
+               { "O",  "~new",                         0,      FALSE,  FALSE },
+               { "r",  "replied",                      0,      FALSE,  FALSE },
+               { "R",  "~unread",                      0,      FALSE,  FALSE },
+               { "s",  "subject",                      1,      TRUE,   TRUE  },
+               { "se", "score_equal",                  1,      FALSE,  FALSE },
+               { "sg", "score_greater",                1,      FALSE,  FALSE },
+               { "sl", "score_lower",                  1,      FALSE,  FALSE },
+               { "Se", "size_equal",                   1,      FALSE,  FALSE },
+               { "Sg", "size_greater",                 1,      FALSE,  FALSE },
+               { "Ss", "size_smaller",                 1,      FALSE,  FALSE },
+               { "t",  "to",                           1,      TRUE,   TRUE  },
+               { "T",  "marked",                       0,      FALSE,  FALSE },
+               { "U",  "unread",                       0,      FALSE,  FALSE },
+               { "x",  "header \"References\"",        1,      TRUE,   TRUE  },
+               { "X",  "test",                         1,      FALSE,  FALSE }, 
+               { "y",  "header \"X-Label\"",           1,      TRUE,   TRUE  },
+               { "&",  "&",                            0,      FALSE,  FALSE },
+               { "|",  "|",                            0,      FALSE,  FALSE },
+               { "p",  "partial",                      0,      FALSE,  FALSE },
+               { NULL, NULL,                           0,      FALSE,  FALSE }
+       };
+
+       if (search_string == NULL)
+               return NULL;
+
+       copy_str = g_strdup(search_string);
+
+       matcherstr = g_string_sized_new(16);
+       cmd_start = copy_str;
+       while (cmd_start && *cmd_start) {
+               /* skip all white spaces */
+               while (*cmd_start && isspace((guchar)*cmd_start))
+                       cmd_start++;
+               cmd_end = cmd_start;
+
+               /* extract a command */
+               while (*cmd_end && !isspace((guchar)*cmd_end))
+                       cmd_end++;
+
+               /* save character */
+               save_char = *cmd_end;
+               *cmd_end = '\0';
+
+               dontmatch = FALSE;
+               casesens = FALSE;
+
+               /* ~ and ! mean logical NOT */
+               if (*cmd_start == '~' || *cmd_start == '!')
+               {
+                       dontmatch = TRUE;
+                       cmd_start++;
+               }
+               /* % means case sensitive match */
+               if (*cmd_start == '%')
+               {
+                       casesens = TRUE;
+                       cmd_start++;
+               }
+
+               /* find matching abbreviation */
+               for (i = 0; cmds[i].command; i++) {
+                       if (!strcmp(cmd_start, cmds[i].abbreviated)) {
+                               /* restore character */
+                               *cmd_end = save_char;
+
+                               /* copy command */
+                               if (matcherstr->len > 0) {
+                                       g_string_append(matcherstr, " ");
+                               }
+                               if (dontmatch)
+                                       g_string_append(matcherstr, "~");
+                               g_string_append(matcherstr, cmds[i].command);
+                               g_string_append(matcherstr, " ");
+
+                               /* stop if no params required */
+                               if (cmds[i].numparams == 0)
+                                       break;
+
+                               /* extract a parameter, allow quotes */
+                               while (*cmd_end && isspace((guchar)*cmd_end))
+                                       cmd_end++;
+
+                               cmd_start = cmd_end;
+                               if (*cmd_start == '"') {
+                                       term_char = '"';
+                                       cmd_end++;
+                               }
+                               else
+                                       term_char = ' ';
+
+                               /* extract actual parameter */
+                               while ((*cmd_end) && (*cmd_end != term_char))
+                                       cmd_end++;
+
+                               if (*cmd_end == '"')
+                                       cmd_end++;
+
+                               save_char = *cmd_end;
+                               *cmd_end = '\0';
+
+                               if (cmds[i].qualifier) {
+                                       if (casesens)
+                                               g_string_append(matcherstr, "regexp ");
+                                       else
+                                               g_string_append(matcherstr, "regexpcase ");
+                               }
+
+                               /* do we need to add quotes ? */
+                               if (cmds[i].quotes && term_char != '"')
+                                       g_string_append(matcherstr, "\"");
+
+                               /* copy actual parameter */
+                               g_string_append(matcherstr, cmd_start);
+
+                               /* do we need to add quotes ? */
+                               if (cmds[i].quotes && term_char != '"')
+                                       g_string_append(matcherstr, "\"");
+
+                               /* restore original character */
+                               *cmd_end = save_char;
+
+                               break;
+                       }
+               }
+
+               if (*cmd_end)
+                       cmd_end++;
+               cmd_start = cmd_end;
+       }
+
+       g_free(copy_str);
+
+       /* return search string if no match is found to allow 
+          all available filtering expressions in quicksearch */
+       if (matcherstr->len > 0) returnstr = matcherstr->str;
+       else returnstr = g_strdup(search_string);
+
+       g_string_free(matcherstr, FALSE);
+       return returnstr;
+}
+
+static void quicksearch_set_running(QuickSearch *quicksearch, gboolean run)
+{
+       quicksearch->running = run;
+}
+
+gboolean quicksearch_is_running(QuickSearch *quicksearch) 
+{
+       return quicksearch->running;
+}
+
+void quicksearch_pass_key(QuickSearch *quicksearch, guint val, GdkModifierType mod)
+{
+       GtkEntry *entry = GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry);
+       gint curpos = gtk_editable_get_position(GTK_EDITABLE(entry));
+       char *str = g_strdup(gtk_entry_get_text(entry));
+       char *begin = str;
+       char *end = NULL;
+       char *new = NULL;
+       
+       if (mod == GDK_SHIFT_MASK)
+               val = toupper(val);
+       
+       if (curpos < strlen(str)-1) {
+               end = g_strdup(str+curpos);
+               *(str+curpos) = '\0';
+               new = g_strdup_printf("%s%c%s", begin, val, end);
+               gtk_entry_set_text(entry, new);
+               g_free(end);
+       } else {
+               new = g_strdup_printf("%s%c", begin, val);
+               gtk_entry_set_text(entry, new);
+       }
+       g_free(str);
+       g_free(new);
+       gtk_editable_set_position(GTK_EDITABLE(entry), curpos+1);
+       
+}
+
+static gboolean quicksearch_match_subfolder(QuickSearch *quicksearch, 
+                                FolderItem *src)
+{
+       GSList *msglist = folder_item_get_msg_list(src);
+       GSList *cur;
+       gboolean result = FALSE;
+       
+       for (cur = msglist; cur != NULL; cur = cur->next) {
+               MsgInfo *msg = (MsgInfo *)cur->data;
+               if (quicksearch_match(quicksearch, msg)) {
+                       procmsg_msginfo_free(msg);
+                       result = TRUE;
+                       break;
+               }
+               procmsg_msginfo_free(msg);
+       }
+
+       g_slist_free(msglist);
+       return result;
+}
+
+void quicksearch_search_subfolders(QuickSearch *quicksearch, 
+                                  FolderView *folderview,
+                                  FolderItem *folder_item)
+{
+       FolderItem *cur = NULL;
+       GNode *node = folder_item->node->children;
+       
+       if (!prefs_common.summary_quicksearch_recurse)
+               return;
+
+       for (; node != NULL; node = node->next) {
+               cur = FOLDER_ITEM(node->data);
+               if (quicksearch_match_subfolder(quicksearch, cur)) {
+                       folderview_update_search_icon(cur, TRUE);
+               } else {
+                       folderview_update_search_icon(cur, FALSE);
+               }
+               if (cur->node->children)
+                       quicksearch_search_subfolders(quicksearch,
+                                                     folderview,
+                                                     cur);
+       }
+       quicksearch->root_folder_item = folder_item;
+}
+
+static void quicksearch_reset_folder_items(QuickSearch *quicksearch,
+                                   FolderItem *folder_item)
+{
+       FolderItem *cur = NULL;
+       GNode *node = folder_item->node->children;
+       
+       for (; node != NULL; node = node->next) {
+               cur = FOLDER_ITEM(node->data);
+               folderview_update_search_icon(cur, FALSE);
+               if (cur->node->children)
+                       quicksearch_reset_folder_items(quicksearch,
+                                                      cur);
+       }
+}
+
+void quicksearch_reset_cur_folder_item(QuickSearch *quicksearch)
+{
+       if (quicksearch->root_folder_item)
+               quicksearch_reset_folder_items(quicksearch, 
+                                              quicksearch->root_folder_item);
+       
+       quicksearch->root_folder_item = NULL;
+}