list dimmed when caching in progress

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

diff --git a/src/gui/include/ws_gui.h b/src/gui/include/ws_gui.h
index effbd87..b013b1b 100644 (file)
--- a/src/gui/include/ws_gui.h
+++ b/src/gui/include/ws_gui.h
@@ -179,8 +179,6 @@ struct WSGuiList {
        GtkTreeModel* ws_gui_model; ///< model of GtkTree
        GtkWidget* ws_gui_view; ///< variable responsible for view of GtkTree
        GtkTreeSelection* ws_gui_selection; ///< variable necessary to read selection (from words list)
-       GtkTreePath *path;
-
 };
 
 /** \brief struct which contains all components of application

diff --git a/src/gui/src/ws_gui_callbacks.c b/src/gui/src/ws_gui_callbacks.c
index 69d57c9..bdd58eb 100644 (file)
--- a/src/gui/src/ws_gui_callbacks.c
+++ b/src/gui/src/ws_gui_callbacks.c
@@ -178,20 +178,27 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
                         GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
                         FALSE);
 
+                      gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_w_list->ws_gui_view),
+                       FALSE);
+
                        break;
                 }
 
                 case WS_DBUS_INFO_CACHING_FINISHED:
                 {
-                        gtk_widget_destroy(
+                       gtk_widget_destroy(
                                  GTK_WIDGET(ws_gui_app->ws_gui_banner_caching));
-                        ws_gui_app->caching_flag = FALSE;
-                        gtk_widget_set_sensitive(
+                       ws_gui_app->caching_flag = FALSE;
+                       gtk_widget_set_sensitive(
                              GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
                              TRUE);
-                        gtk_widget_set_sensitive(
+                       gtk_widget_set_sensitive(
                        GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
                        TRUE);
+                       gtk_widget_set_sensitive(
+                        GTK_WIDGET(ws_gui_app->ws_gui_w_list->ws_gui_view),
+                        TRUE);
 
                         break;
                 }
@@ -244,7 +251,7 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
                                         _("ws_ni_bookmark_not_added"));
                break;
                }
-        
+
                case WS_DBUS_BOOKMARKS_REMOVED_FAIL:
                {
                        gtk_infoprint(GTK_WINDOW(
@@ -289,12 +296,9 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
 
                        ws_gui_app->caching_flag = TRUE;
                        
-                       //hildon_banner_set_fraction(
-                       //      HILDON_BANNER(ws_gui_app->ws_gui_banner_extracting),
-                       //      0.0);
                        gtk_widget_set_sensitive(
-                               GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
-                               FALSE);
+                          GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
+                          FALSE);
                        gtk_widget_set_sensitive(
                        GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
                         FALSE);
@@ -441,8 +445,6 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
 
                if (strcmp(((gchar *)g_value_get_string (&value)), pattern) == 0)
                {
-                       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\nTRAFIONO!!! za pierwszym razem: WYRAZY: %s = %s\n", (gchar *)g_value_get_string (&value), pattern);
-
                        gtk_tree_selection_select_iter(
                                ws_gui_app->ws_gui_w_list->ws_gui_selection,
                                &tmp_iter);
@@ -452,8 +454,6 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
                {
                while (gtk_tree_model_iter_next(GTK_TREE_MODEL(ws_gui_app->ws_gui_w_list->ws_gui_model), &tmp_iter) == TRUE && keep_searching == TRUE)
                {
-                       g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\n(while) WYRAZY: %s = %s\n", (gchar *)g_value_get_string (&value), pattern);
-
                        gtk_tree_model_get_value(GTK_TREE_MODEL(
                                ws_gui_app->ws_gui_w_list->ws_gui_model), 
                                &tmp_iter, 
@@ -464,20 +464,19 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
                                {
                                gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL(
                                ws_gui_app->ws_gui_w_list->ws_gui_model),
-                                                        &tmp_iter,
-                                                        g_array_index(ws_gui_app->ws_gui_history_iter,
-                                                       gchar*, 
-                                                       ws_gui_app->ws_gui_history_cur_pos));;
+                                        &tmp_iter,
+                                        g_array_index(
+                                       ws_gui_app->ws_gui_history_iter,
+                                       gchar*, 
+                                       ws_gui_app->ws_gui_history_cur_pos));
 
                                gtk_tree_selection_select_iter(
                                                ws_gui_app->ws_gui_w_list->ws_gui_selection,
                                                &tmp_iter);
-                               
-                               g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\njestem pewna ze jestem tutaj\nTRAFIONO TRAFIONO TRAFIONO!!! %s = %s\n\n", (gchar *)g_value_get_string (&value), pattern);
-                               
+                                                               
                                keep_searching = FALSE;
                                }
-               }
+                       }
                }
        }
        g_free(pattern);
@@ -487,7 +486,8 @@ void ws_gui_dbus_return_words (GError *error, GArray *words, gpointer user_data)
                                g_array_index(ws_gui_app->ws_gui_history,
                                gchar*, 
                                ws_gui_app->ws_gui_history_cur_pos));
-       ws_gui_app->html_flag = FALSE;
+       
+       ws_gui_app->html_flag = TRUE;
        }
        
        
@@ -817,7 +817,8 @@ void ws_gui_history_add(char *new_word, gpointer user_data)
                                           i);
                tmp_iter = gtk_tree_model_get_string_from_iter (GTK_TREE_MODEL(ws_gui_app->ws_gui_w_list->ws_gui_model), &ws_gui_app->ws_gui_w_list->ws_gui_iter);
        
-               if (previous_word != NULL && strcmp(previous_word, new_word) != 0)
+               if (previous_word != NULL && 
+                   strcmp(previous_word, new_word) != 0)
                {
                        while (tmp != NULL) 
                        {
@@ -842,10 +843,9 @@ void ws_gui_history_add(char *new_word, gpointer user_data)
                i = 0;
                ws_gui_app->ws_gui_history_cur_pos ++;
        
-               
                if (ws_gui_app->bookmark_mode == FALSE)
                {
-               tmp_last_searched = g_strdup(ws_gui_app->last_searched);
+                       tmp_last_searched = g_strdup(ws_gui_app->last_searched);
                }
                else
                {
@@ -877,8 +877,7 @@ void ws_gui_history_add(char *new_word, gpointer user_data)
                }
                
        }
-               
-       ws_gui_app->ws_gui_w_list->path = gtk_tree_model_get_path(GTK_TREE_MODEL(ws_gui_app->ws_gui_w_list->ws_gui_model), &ws_gui_app->ws_gui_w_list->ws_gui_iter);
+
         ws_gui_check_history(ws_gui_app);
 }
 
@@ -2186,7 +2185,7 @@ void ws_gui_view_cursor_changed(GtkTreeView *treeview, gpointer user_data)
                                    COL_WORD,
                                    &string,
                                   -1);
-       if (string != NULL )
+       if (string != NULL)
                {
                
                ws_dbus_client_find_translation(ws_gui_app->dbus_data, string);

diff --git a/src/gui/src/ws_gui_layout.c b/src/gui/src/ws_gui_layout.c
index 6b99a09..6341125 100644 (file)
--- a/src/gui/src/ws_gui_layout.c
+++ b/src/gui/src/ws_gui_layout.c
@@ -109,7 +109,6 @@ void ws_gui_create_window(gpointer user_data)
 
         ws_gui_app->ws_gui_w_list->ws_gui_view = 
                 create_view_and_model(array_tmp, ws_gui_app);
-       ws_gui_app->ws_gui_w_list->path = gtk_tree_path_new();
 
         gtk_widget_show_all(GTK_WIDGET(ws_gui_app->ws_gui_w_list->ws_gui_view));