bzip + banner

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

diff --git a/data/locale/en_GB.po b/data/locale/en_GB.po
index 80d8fbe..a80cfed 100644 (file)
--- a/data/locale/en_GB.po
+++ b/data/locale/en_GB.po
@@ -263,6 +263,10 @@ msgstr "There is no dictionary available"
 msgid "ws_pb_caching"
 msgstr "Caching ..."
 
+#: ../gui/src/ws_gui_callbacks.c:168
+msgid "ws_pb_extracting"
+msgstr "Extracting..."
+
 #: ../gui/src/ws_gui_callbacks.c:212
 msgid "ws_ni_dictionary_unavailable"
 msgstr "Dictionary unavailable."

diff --git a/data/locale/es.po b/data/locale/es.po
index 5273469..57736af 100644 (file)
--- a/data/locale/es.po
+++ b/data/locale/es.po
@@ -264,6 +264,10 @@ msgstr "No hay ningún diccionario disponible"
 msgid "ws_pb_caching"
 msgstr "Almacenando..."
 
+#: ../gui/src/ws_gui_callbacks.c:168
+msgid "ws_pb_extracting"
+msgstr "Extracting..."
+
 #: ../gui/src/ws_gui_callbacks.c:212
 msgid "ws_ni_dictionary_unavailable"
 msgstr "Diccionario no disponible"

diff --git a/data/locale/pl_PL.po b/data/locale/pl_PL.po
index d60e508..233c2b5 100644 (file)
--- a/data/locale/pl_PL.po
+++ b/data/locale/pl_PL.po
@@ -257,7 +257,11 @@ msgstr "Brak dostępnych słowników."
 
 #: ../gui/src/ws_gui_callbacks.c:168
 msgid "ws_pb_caching"
-msgstr "Optymalizacja ..."
+msgstr "Trwa optymalizacja ..."
+
+#: ../gui/src/ws_gui_callbacks.c:168
+msgid "ws_pb_extracting"
+msgstr "Trwa rozpakowywanie..."
 
 #: ../gui/src/ws_gui_callbacks.c:212
 msgid "ws_ni_dictionary_unavailable"

diff --git a/include/ws_dbus.h b/include/ws_dbus.h
index e136a9e..186c518 100644 (file)
--- a/include/ws_dbus.h
+++ b/include/ws_dbus.h
@@ -100,7 +100,9 @@ typedef enum
         WS_DBUS_BOOKMARKS_REMOVED_FAIL, ///<GUI signal - send if bookmark has not been removed succesfully
        WS_DBUS_LOAD_BOOKMARK_FAILED, ///<GUI signal - blocks bookmarks
        WS_DBUS_BOOKMARK_MODE_ON,
-       WS_DBUS_BOOKMARK_MODE_OFF 
+       WS_DBUS_BOOKMARK_MODE_OFF,
+       WS_DBUS_EXTRACT_FILE,
+       WS_DBUS_EXTRACT_FILE_FINISHED
 
 } WSDBusNotify;
 

diff --git a/src/gui/include/ws_gui.h b/src/gui/include/ws_gui.h
index 95a2313..a78f159 100644 (file)
--- a/src/gui/include/ws_gui.h
+++ b/src/gui/include/ws_gui.h
@@ -201,6 +201,7 @@ struct WSGuiAppData {
        GtkWidget *ws_gui_banner; ///< banner, displays message that searching is in progress
        GtkWidget *ws_gui_banner_caching; ///< banner, displays message that caching is in progress
        gboolean caching_flag; ///< flag; used when caching is being performed
+       GtkWidget *ws_gui_banner_extracting;
        GtkToolItem *ws_gui_toobar_button_hide; ///< button hide, allows to hide/show words list with button placed at find toolbar
        GtkWidget *ws_gui_scrolledwindow_right; ///< right scrolledwindow (placed in right pane), necessary to provide scrollbars)
        GtkWidget *ws_gui_scrolledwindow_left; ///< scrollwindow (placed in left pane), necessary to provide scrollbars)

diff --git a/src/gui/src/ws_gui_callbacks.c b/src/gui/src/ws_gui_callbacks.c
index ab81d98..e28a722 100644 (file)
--- a/src/gui/src/ws_gui_callbacks.c
+++ b/src/gui/src/ws_gui_callbacks.c
@@ -279,6 +279,49 @@ void ws_gui_signal_hander (GError *error, GArray *words, gpointer user_data)
                        
                         break; 
                }
+               case WS_DBUS_EXTRACT_FILE:
+                {
+                        ws_gui_app->ws_gui_banner_extracting =
+                                hildon_banner_show_progress(
+                                   GTK_WIDGET(ws_gui_app->ws_gui_hildon_window),
+                                   NULL,
+                                   _("ws_pb_extracting"));
+
+                       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_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
+                        FALSE);
+
+                       break;
+                }
+
+                case WS_DBUS_EXTRACT_FILE_FINISHED:
+                {
+                       gtk_widget_destroy(
+                                       GTK_WIDGET(ws_gui_app->ws_gui_banner_extracting));
+                       ws_gui_app->caching_flag = FALSE;
+                       
+                       gtk_infoprint(GTK_WINDOW(
+                                      ws_gui_app->ws_gui_hildon_window),
+                                      _("ws_ni_dictionary_added"));
+                       
+                       gtk_widget_set_sensitive(
+                               GTK_WIDGET(ws_gui_app->ws_gui_hildon_find_toolbar),
+                               TRUE);
+                       gtk_widget_set_sensitive(
+                       GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
+                       TRUE);
+
+                        break;
+                }
+
         }
 }
 /**  this function handles signals from dbus; it is called when progress bar
@@ -433,7 +476,8 @@ void ws_dbus_server_return_extracted_bzip(GError *error,
 
         data = g_array_index (words, osso_rpc_t, 0);
        //g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "\n\n!!!GUI!!!\n przyszlo: %s", data.value.s);
-       if (data.value.s[0] == '\0')
+
+       if (data.value.s == NULL)
        {
                gtk_infoprint(GTK_WINDOW(
                                 ws_gui_app->ws_gui_hildon_window),
@@ -443,9 +487,9 @@ void ws_dbus_server_return_extracted_bzip(GError *error,
        {
        if (ws_gui_load_dict(data.value.s, ws_gui_app) == TRUE)
        {
-               gtk_infoprint(GTK_WINDOW(
-                                      ws_gui_app->ws_gui_hildon_window),
-                                      _("ws_ni_dictionary_added"));
+               //gtk_infoprint(GTK_WINDOW(
+                //                      ws_gui_app->ws_gui_hildon_window),
+                //                      _("ws_ni_dictionary_added"));
        }
        }
 }