copy function is blocked if there is no selection made;

banner that copy process have been completed - added;

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

diff --git a/data/locale/en_GB.po b/data/locale/en_GB.po
index c2d454f..0e79d30 100644 (file)
--- a/data/locale/en_GB.po
+++ b/data/locale/en_GB.po
@@ -320,3 +320,15 @@ msgstr "Fullscreen off"
 #: ../gui/src/ws_gui_callbacks.c:1157
 msgid "ws_ib_zoom_default"
 msgstr "Default Zoom"
+
+#: ../gui/src/ws_gui_callbacks.c:1069
+msgid "ws_ib_copied"
+msgstr "Copied."
+
+#: ../gui/src/ws_gui_callbacks.c:1096
+msgid "ws_ib_pasted"
+msgstr "Pasted."
+
+#: ../gui/src/ws_gui_callbacks.c:1083
+msgid "ws_ib_unable_copy"
+msgstr "Unable to copy."

diff --git a/data/locale/es.po b/data/locale/es.po
index 58f85c6..2415b83 100644 (file)
--- a/data/locale/es.po
+++ b/data/locale/es.po
@@ -320,3 +320,15 @@ msgstr "Fullscreen off"
 #: ../gui/src/ws_gui_callbacks.c:1157
 msgid "ws_ib_zoom_default"
 msgstr "Default Zoom"
+
+#: ../gui/src/ws_gui_callbacks.c:1069
+msgid "ws_ib_copied"
+msgstr "Copied."
+
+#: ../gui/src/ws_gui_callbacks.c:1096
+msgid "ws_ib_pasted"
+msgstr "Pasted."
+
+#: ../gui/src/ws_gui_callbacks.c:1083
+msgid "ws_ib_unable_copy"
+msgstr "Unable to copy."

diff --git a/data/locale/pl_PL.po b/data/locale/pl_PL.po
index 17da4de..4a4a801 100644 (file)
--- a/data/locale/pl_PL.po
+++ b/data/locale/pl_PL.po
@@ -315,3 +315,15 @@ msgstr "Pełen ekran wyłączony"
 #: ../gui/src/ws_gui_callbacks.c:1157
 msgid "ws_ib_zoom_default"
 msgstr "Domyślna wartość powiększenia"
+
+#: ../gui/src/ws_gui_callbacks.c:1069
+msgid "ws_ib_copied"
+msgstr "Skopiowano."
+
+#: ../gui/src/ws_gui_callbacks.c:1096
+msgid "ws_ib_pasted"
+msgstr "Wklejono."
+
+#: ../gui/src/ws_gui_callbacks.c:1083
+msgid "ws_ib_unable_copy"
+msgstr "Kopiowanie nie powiodło się."

diff --git a/src/gui/src/ws_gui_callbacks.c b/src/gui/src/ws_gui_callbacks.c
index e4fba67..31bb3bd 100644 (file)
--- a/src/gui/src/ws_gui_callbacks.c
+++ b/src/gui/src/ws_gui_callbacks.c
@@ -1064,7 +1064,9 @@ void ws_gui_html_select_all(GtkMenuItem *menuitem, gpointer user_data)
 void ws_gui_html_copy(GtkMenuItem *menuitem, gpointer user_data) 
 {
         WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
-        gtk_html_copy(GTK_HTML(ws_gui_app->ws_gui_html));
+       gtk_html_copy(GTK_HTML(ws_gui_app->ws_gui_html));
+       gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                                 _("ws_ib_copied"));
 }
 
 /** paste copied text into toolbar entry
@@ -1090,6 +1092,8 @@ void ws_gui_html_paste(GtkMenuItem *menuitem, gpointer user_data)
                      "prefix",
                      temp,
                      NULL);
+       gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                                 _("ws_ib_pasted"));
 }
 
 /** zoom in text in translation (html) area
@@ -1472,6 +1476,22 @@ void ws_gui_check_clipboard (GtkWidget *widget, gpointer user_data)
                          GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_paste),
                          FALSE);
         }
+
+       struct _GtkHTML *tmp = (struct _GtkHTML *)(ws_gui_app->ws_gui_html);
+
+       if (html_engine_is_selection_active(tmp->engine) == TRUE)
+       {
+               gtk_widget_set_sensitive(GTK_WIDGET
+                               (ws_gui_app->ws_gui_menu->ws_gui_menu_copy),
+                               TRUE);
+       }
+       else 
+       {
+               gtk_widget_set_sensitive(GTK_WIDGET
+                               (ws_gui_app->ws_gui_menu->ws_gui_menu_copy),
+                               FALSE);
+       }
+
 }
 
 /** gets received string (with translation), formats it and sends it to be 

diff --git a/src/gui/src/ws_gui_layout.c b/src/gui/src/ws_gui_layout.c
index 66c5222..481e1dd 100644 (file)
--- a/src/gui/src/ws_gui_layout.c
+++ b/src/gui/src/ws_gui_layout.c
@@ -74,7 +74,7 @@ void ws_gui_create_window(gpointer user_data)
         hildon_program_add_window(ws_gui_app->ws_gui_hildon_program,
                                   ws_gui_app->ws_gui_hildon_window);
 
-        ws_gui_create_main_menu(ws_gui_app);
+       ws_gui_create_main_menu(ws_gui_app);
         ws_gui_create_find_toolbar(ws_gui_app);
 
         ws_gui_app->ws_gui_hpane = gtk_hpaned_new();
@@ -164,15 +164,10 @@ void ws_gui_create_window(gpointer user_data)
        gtk_tree_selection_set_mode(
                                    ws_gui_app->ws_gui_w_list->ws_gui_selection,
                                    GTK_SELECTION_SINGLE);
-
        
        ws_gui_app->directories = g_slist_alloc();
-       //ws_gui_app->directories_last = gconf_client_all_dirs(
-       //                                              ws_gui_app->client, 
-       //                                              GCONF_PATH, NULL);
        ws_gui_set_bookmarks_sensitivity(ws_gui_app);
 
-
        ws_gui_app->ws_gui_banner = hildon_banner_show_animation(
                                    GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
                                    NULL,
@@ -564,6 +559,8 @@ void ws_gui_create_main_menu (gpointer user_data)
                                (ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev),
                                FALSE);
 
+       
+       
         gtk_widget_show_all(ws_gui_app->ws_gui_menu->ws_gui_main_menu);
 }
 
@@ -582,28 +579,12 @@ void ws_gui_create_popup_menu (gpointer user_data)
        ws_gui_app->ws_gui_menu->ws_gui_separator = 
                                                gtk_separator_menu_item_new();
        
-       struct _GtkHTML *tmp = (struct _GtkHTML *)(ws_gui_app->ws_gui_html);
-       
        ws_gui_app->ws_gui_menu->ws_gui_popup_search = 
                gtk_menu_item_new_with_label(_("ws_mp_search"));
        gtk_menu_append((ws_gui_app->ws_gui_menu->ws_gui_popup_menu),
                        ws_gui_app->ws_gui_menu->ws_gui_popup_search);
        gtk_menu_append ((ws_gui_app->ws_gui_menu->ws_gui_popup_menu),
                        gtk_separator_menu_item_new());
-       
-       if (html_engine_is_selection_active(tmp->engine) == TRUE)
-       {
-               gtk_widget_set_sensitive(GTK_WIDGET
-                               (ws_gui_app->ws_gui_menu->ws_gui_popup_search),
-                               TRUE);
-       }
-       else 
-       {
-               gtk_widget_set_sensitive(GTK_WIDGET
-                               (ws_gui_app->ws_gui_menu->ws_gui_popup_search),
-                               FALSE);
-       }
-       
        ws_gui_app->ws_gui_menu->ws_gui_popup_bookmark = 
                gtk_menu_item_new_with_label(_("ws_mp_add_bookmark"));
        gtk_menu_append ((ws_gui_app->ws_gui_menu->ws_gui_popup_menu),
@@ -626,8 +607,8 @@ void ws_gui_create_popup_menu (gpointer user_data)
        
        gtk_widget_show_all(ws_gui_app->ws_gui_menu->ws_gui_popup_submenu);
        
-               ws_gui_app->ws_gui_menu->ws_gui_popup_edit = 
-               gtk_menu_item_new_with_label (_("ws_mp_edit"));
+       ws_gui_app->ws_gui_menu->ws_gui_popup_edit = 
+                       gtk_menu_item_new_with_label (_("ws_mp_edit"));
        gtk_menu_append ((ws_gui_app->ws_gui_menu->ws_gui_popup_menu),
                        ws_gui_app->ws_gui_menu->ws_gui_popup_edit);
        
@@ -644,10 +625,35 @@ void ws_gui_create_popup_menu (gpointer user_data)
        gtk_menu_append ((ws_gui_app->ws_gui_menu->ws_gui_popup_menu),
                        ws_gui_app->ws_gui_menu->ws_gui_popup_zoom_out);
        
-       gtk_widget_show_all(ws_gui_app->ws_gui_menu->ws_gui_popup_menu);
        gtk_menu_item_set_submenu(GTK_MENU_ITEM
                                (ws_gui_app->ws_gui_menu->ws_gui_popup_edit),
                                ws_gui_app->ws_gui_menu->ws_gui_popup_submenu);
+
+       struct _GtkHTML *tmp = (struct _GtkHTML *)(ws_gui_app->ws_gui_html);
+
+       if (html_engine_is_selection_active(tmp->engine) == TRUE)
+       {
+               gtk_widget_set_sensitive(GTK_WIDGET
+                               (ws_gui_app->ws_gui_menu->ws_gui_popup_search),
+                               TRUE);
+               gtk_widget_set_sensitive(GTK_WIDGET
+                               (ws_gui_app->ws_gui_menu->ws_gui_popup_copy),
+                               TRUE);
+       }
+       else 
+       {
+               gtk_widget_set_sensitive(GTK_WIDGET
+                               (ws_gui_app->ws_gui_menu->ws_gui_popup_search),
+                               FALSE);
+               gtk_widget_set_sensitive(GTK_WIDGET
+                               (ws_gui_app->ws_gui_menu->ws_gui_popup_copy),
+                               FALSE);
+       }
+       
+       
+       
+       gtk_widget_show_all(ws_gui_app->ws_gui_menu->ws_gui_popup_menu);
+       
        
        g_signal_connect(G_OBJECT
                        (ws_gui_app->ws_gui_menu->ws_gui_popup_search),