stop button dimmed; "Add bookmark" item dimmed.

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

diff --git a/src/gui/src/ws_gui_callbacks.c b/src/gui/src/ws_gui_callbacks.c
index d5690b1..504453f 100644 (file)
--- a/src/gui/src/ws_gui_callbacks.c
+++ b/src/gui/src/ws_gui_callbacks.c
@@ -1383,6 +1383,10 @@ void ws_gui_search_stop(GtkButton *button, gpointer user_data)
                 gtk_infoprint(
                               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
                               _("ws_ni_search_aborted"));
+
+        gtk_widget_set_sensitive(GTK_WIDGET
+                               (ws_gui_app->ws_gui_toobar_button_stop),
+                               FALSE);
         }
 }
 
@@ -1868,7 +1872,7 @@ void ws_gui_dictionary_add_bookmark(GtkMenuItem *menuitem, gpointer user_data)
        if (ws_gui_app->last_word != NULL)
        {
                ws_gui_add_bookmark_dialog(ws_gui_app);
-       }
+       } 
        else
        {
                gtk_infoprint(
@@ -2092,7 +2096,9 @@ void ws_gui_set_bookmark_menu_items(GtkMenuItem *menuitem, gpointer user_data)
                FALSE);
        }
 
-       if (ws_gui_app->last_word == NULL || ws_gui_app->bookmark_mode == TRUE)
+       if (ws_gui_app->last_word == NULL || 
+           (ws_gui_app->last_word[0] == '\0') ||
+           ws_gui_app->bookmark_mode == TRUE)
        {
               gtk_widget_set_sensitive(
               GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_add_bookmark),

diff --git a/src/gui/src/ws_gui_layout.c b/src/gui/src/ws_gui_layout.c
index b1f1401..ac28613 100644 (file)
--- a/src/gui/src/ws_gui_layout.c
+++ b/src/gui/src/ws_gui_layout.c
@@ -177,6 +177,10 @@ void ws_gui_create_window(gpointer user_data)
                                    NULL,
                                    _("ws_ab_searching"));
        
+       gtk_widget_set_sensitive(GTK_WIDGET
+                       (ws_gui_app->ws_gui_menu->ws_gui_popup_bookmark),
+                       FALSE);
+
        gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_banner));
        g_free(ws_gui_app->welcome_note);
 }
@@ -738,17 +742,21 @@ void ws_gui_create_popup_menu (gpointer user_data)
        }
        else
        {
-               if (ws_gui_app->last_word != NULL)
+               g_strstrip(ws_gui_app->last_word);
+               //g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\nlast_word: %s\n\n", ws_gui_app->last_word);
+               
+               if (ws_gui_app->last_word == NULL || 
+                   (ws_gui_app->last_word[0] == '\0'))
                {
                        gtk_widget_set_sensitive(GTK_WIDGET
                        (ws_gui_app->ws_gui_menu->ws_gui_popup_bookmark),
-                       TRUE);
+                       FALSE);
                }
                else
                {
                        gtk_widget_set_sensitive(GTK_WIDGET
                        (ws_gui_app->ws_gui_menu->ws_gui_popup_bookmark),
-                       FALSE);
+                       TRUE);
                }
        }
        }