label "too many words" does not dissapear when "no words found" banner appeared;

git-svn-id: file:///svnroot/mdictionary/trunk@172 5bde0345-f819-0410-ac75-e5045f9217cc

diff --git a/include/ws_dbus.h b/include/ws_dbus.h
index f2d02e8..072c136 100644 (file)
--- a/include/ws_dbus.h
+++ b/include/ws_dbus.h
@@ -122,7 +122,8 @@ typedef enum
        WS_DBUS_TRANSLATION_STARTED,
        WS_DBUS_WORDS_LIST_FINISHED,
        WS_DBUS_TRANSLATION_FINISHED,
-       WS_DBUS_WORDS_LIST_FULL
+       WS_DBUS_WORDS_LIST_FULL,
+       WS_DBUS_WORDS_LIST_FILLED_NOT_FULL
 
 } WSDBusNotify;
 

diff --git a/src/gui/include/ws_gui.h b/src/gui/include/ws_gui.h
index d80b07e..a4c8102 100644 (file)
--- a/src/gui/include/ws_gui.h
+++ b/src/gui/include/ws_gui.h
@@ -267,6 +267,7 @@ struct WSGuiAppData {
        gchar *last_searched_in_book;
        gdouble zoom;
        gboolean html_flag;
+       gboolean no_words_found;
        
        gboolean first_run;
 

diff --git a/src/gui/include/ws_gui_callbacks.h b/src/gui/include/ws_gui_callbacks.h
index b87dd9f..d0f7daf 100644 (file)
--- a/src/gui/include/ws_gui_callbacks.h
+++ b/src/gui/include/ws_gui_callbacks.h
@@ -55,7 +55,7 @@ void ws_dbus_progress_bar(GError *error, GArray *words, gpointer user_data);
 /** \brief clean words list
  *
  */
-void ws_gui_clear_list (GtkListStore* list);
+void ws_gui_clear_list (GtkListStore* list, gpointer user_data);
 
 /** \brief handle dbus signal and transfer words to the words list
  *

diff --git a/src/gui/src/ws_gui_callbacks.c b/src/gui/src/ws_gui_callbacks.c
index 69a3cdd..68a7aba 100644 (file)
--- a/src/gui/src/ws_gui_callbacks.c
+++ b/src/gui/src/ws_gui_callbacks.c
@@ -334,11 +334,16 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
 
                case  WS_DBUS_WORDS_LIST_FULL:
                {
-
                        gtk_widget_show(GTK_WIDGET(ws_gui_app->ws_gui_list_hbox));
                break;
                }
 
+               case  WS_DBUS_WORDS_LIST_FILLED_NOT_FULL:
+               {
+                       gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_list_hbox));
+               break;
+               }
+
                case  WS_DBUS_WORDS_LIST_FINISHED:
                {
                        gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_banner_list_searching));
@@ -415,21 +420,20 @@ void ws_dbus_progress_bar(GError *error, GArray *words, gpointer user_data)
  * @param list - GtkListStore to be remoeved
  * @return
  */
-void ws_gui_clear_list (GtkListStore* list) 
+void ws_gui_clear_list (GtkListStore* list, gpointer user_data) 
 {
+       //WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
        GtkTreeIter iter;
        gboolean tmp;
-
-       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\nws_gui_clear_list\n\n");     
+       
+       //g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\nws_gui_clear_list\n\n");   
        tmp = gtk_tree_model_get_iter_first(
                         GTK_TREE_MODEL(list),
-                        &iter);
-       
-       
+                        &iter);        
 
        while (tmp == TRUE)
        {
-               g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\nws_gui_clear_list2\n\n");
+       //      g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\nws_gui_clear_list2\n\n");
                tmp = gtk_list_store_remove(list, &iter);
                
        }
@@ -451,6 +455,7 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
         osso_rpc_t data;
 
         WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+       ws_gui_app->no_words_found = FALSE;
        
        g_signal_handlers_block_by_func(G_OBJECT 
                        (ws_gui_app->ws_gui_w_list->ws_gui_view),
@@ -469,7 +474,7 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
                 g_array_append_val(tmp, tmp_word);
         }
        
-       g_assert(ws_gui_app->ws_gui_banner_list_searching);
+       //g_assert(ws_gui_app->ws_gui_banner_list_searching);
         //gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_banner_list_searching));
 
        ws_gui_app->loading = FALSE;
@@ -561,8 +566,8 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
        }
        
        
-       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "Dlugosc tempa to: %d", tmp->len);
-       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "w tempie mamy: %s", tmp_word);
+/*     g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "Dlugosc tempa to: %d", tmp->len);
+       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "w tempie mamy: %s", tmp_word);*/
         //if (&& ws_gui_app->stop_clicked != TRUE )
        
        if ((tmp->len == 0 || tmp_word == NULL) && ws_gui_app->stop_clicked != TRUE )
@@ -574,6 +579,7 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
                //ws_gui_app->html_flag = FALSE;
                g_free(ws_gui_app->last_word);
                ws_gui_app->last_word = NULL;
+               ws_gui_app->no_words_found = TRUE;
         }
 
        g_signal_handlers_unblock_by_func(G_OBJECT(
@@ -1023,7 +1029,7 @@ void ws_gui_history_back(GtkButton *button, gpointer user_data)
                                                gchar*, 
                                        ws_gui_app->ws_gui_history_cur_pos))
                                        );
-               gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
+               //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
                //gtk_widget_show(ws_gui_app->ws_gui_banner_translation_loading);
                ws_gui_app->loading = TRUE;
                ws_gui_set_toolbar_avail(ws_gui_app);
@@ -1075,7 +1081,7 @@ void ws_gui_history_next(GtkButton *button, gpointer user_data)
                                                ws_gui_app->ws_gui_history_cur_pos))
                                        );
                
-               gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
+               //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
                //gtk_widget_show(ws_gui_app->ws_gui_banner_translation_loading);
                ws_gui_app->loading = TRUE;
                ws_gui_set_toolbar_avail(ws_gui_app);
@@ -1170,7 +1176,7 @@ GtkTreeModel * create_and_fill_model (GArray *words_list, gpointer user_data)
 
        if (tmp != NULL)
        {
-               ws_gui_clear_list(ws_gui_app->ws_gui_w_list->ws_gui_store);
+               ws_gui_clear_list(ws_gui_app->ws_gui_w_list->ws_gui_store, ws_gui_app);
        }
 
        gboolean valid;
@@ -1313,8 +1319,8 @@ void ws_gui_popup_search(GtkMenuItem *menuitem, gpointer user_data)
                                       temp,
                                       NULL);
                 ws_dbus_client_find_word (ws_gui_app->dbus_data, temp);
-               gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
-        }
+               //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
+       }
         else
         {
                 hildon_banner_show_information(
@@ -1501,7 +1507,8 @@ void ws_gui_search(GtkWidget * widget, gpointer user_data)
                 //ws_gui_fill_html(" ", ws_gui_app);
                //ws_gui_app->html_flag = FALSE;
                 ws_dbus_client_find_word (ws_gui_app->dbus_data, ws_gui_text);
-               gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_list_hbox));
+               //gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_list_hbox));
+               
                g_free(ws_gui_text);
                }
                else 
@@ -1944,7 +1951,7 @@ void ws_gui_dictionary_open_bookmark(GtkMenuItem *menuitem, gpointer user_data)
        ws_gui_read_active_dictionaries(ws_gui_app);
        
        /*list has to be cleared if we're gonna use a completely different dict*/
-       ws_gui_clear_list(ws_gui_app->ws_gui_w_list->ws_gui_store);
+       ws_gui_clear_list(ws_gui_app->ws_gui_w_list->ws_gui_store, ws_gui_app);
        g_free(ws_gui_app->last_word);
        ws_gui_app->last_word = NULL;
 
@@ -1968,6 +1975,7 @@ void ws_gui_dictionary_open_bookmark(GtkMenuItem *menuitem, gpointer user_data)
        ws_gui_app->html_flag = FALSE;
        ws_dbus_client_find_word(ws_gui_app->dbus_data, "*");
        gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
+       
        ws_gui_search(NULL, ws_gui_app);
 }
 
@@ -2011,7 +2019,7 @@ void ws_gui_dictionary_close_bookmark(GtkMenuItem *menuitem, gpointer user_data)
        //ws_dbus_client_find_word(ws_gui_app->dbus_data, ws_gui_app->last_searched);
        ws_gui_search(NULL, ws_gui_app);
        }
-       else if (ws_gui_app->first_run == FALSE) 
+/*     else if (ws_gui_app->first_run == FALSE) 
        {
                g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
                                     "prefix",
@@ -2026,7 +2034,7 @@ void ws_gui_dictionary_close_bookmark(GtkMenuItem *menuitem, gpointer user_data)
                ws_dbus_client_find_word(ws_gui_app->dbus_data, ws_gui_app->last_searched);
                gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
                ws_gui_search(NULL, ws_gui_app);        
-       }
+       }*/
 }
 
 /** adds bookmark to bookmarks database 
@@ -2066,14 +2074,14 @@ void ws_gui_dictionary_remove_bookmark(GtkMenuItem *menuitem,
        {
                ws_gui_remove_bookmark_dialog(ws_gui_app);
 
-               ws_gui_clear_list(ws_gui_app->ws_gui_w_list->ws_gui_store);
+               ws_gui_clear_list(ws_gui_app->ws_gui_w_list->ws_gui_store, ws_gui_app);
                gchar *temp;
                g_object_get(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
                                       "prefix",
                                       &temp,
                                       NULL);
                ws_dbus_client_find_word (ws_gui_app->dbus_data, temp);
-               gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
+               //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
                
        }
        else
@@ -2386,6 +2394,6 @@ void ws_refresh_search_results(gpointer user_data) {
                                &temp,
                                NULL);
        ws_dbus_client_find_word (ws_gui_app->dbus_data, temp);
-       gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
+       //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
        //-----------------------------------------------
 }

diff --git a/src/gui/src/ws_gui_layout.c b/src/gui/src/ws_gui_layout.c
index ff8216a..756bb39 100644 (file)
--- a/src/gui/src/ws_gui_layout.c
+++ b/src/gui/src/ws_gui_layout.c
@@ -57,6 +57,7 @@ void ws_gui_create_window(gpointer user_data)
        ws_gui_app->loading = FALSE;
        ws_gui_app->stop_clicked = FALSE;
        ws_gui_app->first_run = TRUE; //if dictionary is just run
+       ws_gui_app->no_words_found = TRUE;
 
        ws_gui_app->zoom = ZOOM_DEFAULT;
 

diff --git a/src/manager/src/ws_mng_searching_threads.c b/src/manager/src/ws_mng_searching_threads.c
index 51c5a0a..a34c955 100644 (file)
--- a/src/manager/src/ws_mng_searching_threads.c
+++ b/src/manager/src/ws_mng_searching_threads.c
@@ -289,6 +289,10 @@ void ws_remove_multiple_words(WSMngSearchAtom* user_data)
        if (search->word_list->len < 256) 
        {
                temp = search->word_list->len;
+               if (temp >0)
+               {       
+                       ws_dbus_notify(search->data->dbus_data, WS_DBUS_WORDS_LIST_FILLED_NOT_FULL);
+               }
        }
        else
        {