break;
}
+ 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));
+ break;
+ }
+
+ case WS_DBUS_TRANSLATION_FINISHED:
+ {
+ gtk_widget_hide(ws_gui_app->ws_gui_banner_translation_loading);
+ break;
+ }
+
+ case WS_DBUS_WORDS_LIST_STARTED:
+ {
+ gtk_widget_show(GTK_WIDGET(ws_gui_app->ws_gui_banner_list_searching));
+ break;
+ }
+
+ case WS_DBUS_TRANSLATION_STARTED:
+ {
+ gtk_widget_show(ws_gui_app->ws_gui_banner_translation_loading);
+ break;
+ }
+
}
}
+
+
+/* added by Dariusz Wiechecki - HISA */
+void ws_gui_search_home_handler(GError *error, GArray *word, gpointer user_data)
+{
+ g_debug("->%s", __FUNCTION__);
+ WSGuiApp *data = (WSGuiApp*) user_data;
+ osso_rpc_t* osso_data = NULL;
+
+ //get the word passed by dbus
+ osso_data = &g_array_index (word, osso_rpc_t, 0);
+
+ //free memory used by last searched word
+ gchar* tmp = NULL;
+ tmp = g_strdup(osso_data->value.s + 11);
+
+ g_object_set(G_OBJECT(data->ws_gui_hildon_find_toolbar),
+ "prefix",
+ tmp,
+ NULL);
+ ws_gui_search(NULL, data);
+}
+
/** this function handles signals from dbus; it is called when progress bar
status has been changed
*
* @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");
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");
tmp = gtk_list_store_remove(list, &iter);
}
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),
G_CALLBACK (ws_gui_view_cursor_changed),
g_array_append_val(tmp, tmp_word);
}
- g_assert(ws_gui_app->ws_gui_banner);
- gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_banner));
+ //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->ws_gui_banner_flag = FALSE;
- gtk_widget_set_sensitive(
- GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_stop),
- FALSE);
- gtk_widget_set_sensitive(
- GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_stop),
- FALSE);
+ ws_gui_app->loading = FALSE;
+ ws_gui_set_toolbar_avail(ws_gui_app);
+
+ //ws_gui_app->ws_gui_banner_flag = FALSE;
- 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->ws_gui_w_list->ws_gui_model =
}
- if (tmp->len == 0)
+/* 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 )
{
gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
_("ws_ni_no_words_found"));
- ws_gui_fill_html(" ", ws_gui_app);
- ws_gui_app->html_flag = FALSE;
+ //ws_gui_fill_html(" ", ws_gui_app);
+ //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(
G_CALLBACK (ws_gui_view_cursor_changed),
ws_gui_app);
-
-
for (i=0;i<tmp->len;++i)
{
g_free(g_array_index(tmp, gchar* , i));
osso_rpc_t data;
data = g_array_index (words, osso_rpc_t, 0);
-
+
html_content = format_html(data.value.s, ws_gui_app);
ws_gui_fill_html(html_content, ws_gui_app);
g_free(html_content);
ws_gui_app->html_flag = TRUE;
+
+ //gtk_widget_hide(ws_gui_app->ws_gui_banner_translation_loading);
+ ws_gui_app->loading = FALSE;
+ ws_gui_set_toolbar_avail(ws_gui_app);
}
pango_font_description_free(ws_gui_app->p);
+ g_free(ws_gui_app->welcome_note);
+ ws_gui_app->welcome_note = NULL;
+
g_string_free(ws_gui_app->raw_translation, TRUE);
g_free(ws_gui_app->last_word);
g_free(ws_gui_app->ws_gui_w_list);
if (gtk_check_menu_item_get_active(
GTK_CHECK_MENU_ITEM(ws_gui_app->ws_gui_menu->ws_gui_menu_hide_list)))
{
- gtk_widget_hide(ws_gui_app->ws_gui_scrolledwindow_left);
+ gtk_widget_hide(ws_gui_app->ws_gui_list_vbox);
gtk_toggle_tool_button_set_active(
GTK_TOGGLE_TOOL_BUTTON(ws_gui_app->ws_gui_toobar_button_hide),
TRUE);
}
else
{
- gtk_widget_show(ws_gui_app->ws_gui_scrolledwindow_left);
+ gtk_widget_show(ws_gui_app->ws_gui_list_vbox);
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
ws_gui_app->ws_gui_toobar_button_hide),
FALSE);
if (gtk_toggle_tool_button_get_active(
GTK_TOGGLE_TOOL_BUTTON(ws_gui_app->ws_gui_toobar_button_hide)))
{
- gtk_widget_hide(ws_gui_app->ws_gui_scrolledwindow_left);
+ gtk_widget_hide(ws_gui_app->ws_gui_list_vbox);
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
ws_gui_app->ws_gui_toobar_button_hide),
TRUE);
}
else
{
- gtk_widget_show(ws_gui_app->ws_gui_scrolledwindow_left);
+ gtk_widget_show(ws_gui_app->ws_gui_list_vbox);
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
ws_gui_app->ws_gui_toobar_button_hide),
FALSE);
ws_gui_app->ws_gui_history_cur_pos - 1;
-
-
g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
"prefix",
(g_array_index(ws_gui_app->ws_gui_history_list,
gchar*,
ws_gui_app->ws_gui_history_cur_pos))
);
+ //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);
}
else
{
- gtk_widget_set_sensitive (
- GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_back),
- FALSE);
- gtk_widget_set_sensitive(
- GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_find_prev),
- FALSE);
+ ws_gui_app->loading = FALSE;
+ ws_gui_set_toolbar_avail(ws_gui_app);
}
ws_gui_check_history(ws_gui_app);
gchar*,
ws_gui_app->ws_gui_history_cur_pos))
);
-
+
+ //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);
}
else
{
guint i = 0;
gchar *tmp = g_strdup(g_array_index(words_list, gchar*, i));
+ if (tmp != NULL)
+ {
+ ws_gui_clear_list(ws_gui_app->ws_gui_w_list->ws_gui_store, ws_gui_app);
+ }
+
gboolean valid;
valid = gtk_tree_model_get_iter_first(
GTK_TREE_MODEL(ws_gui_app->ws_gui_w_list->ws_gui_store),
if (ws_gui_app->history_flag == FALSE && tmp != NULL)
{
+ //gtk_widget_show(ws_gui_app->ws_gui_banner_translation_loading);
ws_dbus_client_find_translation(ws_gui_app->dbus_data, tmp);
ws_gui_history_add(tmp, ws_gui_app);
temp,
NULL);
ws_dbus_client_find_word (ws_gui_app->dbus_data, temp);
- }
+ //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
+ }
else
{
hildon_banner_show_information(
void ws_gui_search(GtkWidget * widget, gpointer user_data)
{
WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
+
+ ws_gui_app->stop_clicked = FALSE;
- if (ws_gui_app->ws_gui_banner_flag == FALSE)
- {
+ // if (ws_gui_app->ws_gui_banner_flag == FALSE)
+ //{
gchar* ws_gui_text = NULL;
g_object_get(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
"prefix",
if (ws_gui_app->bookmark_mode == FALSE)
{
+ if (ws_gui_app->first_run == TRUE)
+ {
+ ws_gui_app->first_run = FALSE;
+ }
+
g_free(ws_gui_app->last_searched);
ws_gui_app->last_searched = NULL;
ws_gui_app->last_searched = g_strdup(ws_gui_text);
g_strstrip(ws_gui_text);
if (strlen(ws_gui_text) != 0)
{
- gtk_widget_show(ws_gui_app->ws_gui_banner);
+ //gtk_widget_show(ws_gui_app->ws_gui_banner_list_searching);
- gtk_widget_set_sensitive(
- GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_stop),
- TRUE);
- gtk_widget_set_sensitive(
- GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_stop),
- TRUE);
+ ws_gui_app->loading = TRUE;
+ ws_gui_set_toolbar_avail(ws_gui_app);
- ws_gui_app->ws_gui_banner_flag = TRUE;
- ws_gui_fill_html(" ", ws_gui_app);
- ws_gui_app->html_flag = FALSE;
+ //ws_gui_app->ws_gui_banner_flag = TRUE;
+ //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));
+
g_free(ws_gui_text);
}
else
}
g_free(ws_gui_app->last_word);
ws_gui_app->last_word=NULL;
- }
+ //}
}
/** stop search process
void ws_gui_search_stop(GtkButton *button, gpointer user_data)
{
WSGuiApp* ws_gui_app = (WSGuiApp *)user_data;
- if (ws_gui_app->ws_gui_banner_flag == TRUE)
+ ws_gui_app->stop_clicked = TRUE;
+ // if (ws_gui_app->ws_gui_banner_flag == TRUE || ws_gui_app->loading == TRUE)
+ if (ws_gui_app->loading == TRUE)
{
- gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_banner));
- ws_gui_app->ws_gui_banner_flag = FALSE;
+ //gtk_widget_hide(GTK_WIDGET(ws_gui_app->ws_gui_banner_list_searching));
+
+ ws_gui_app->loading = FALSE;
+ ws_gui_set_toolbar_avail(ws_gui_app);
+
+ //ws_gui_app->ws_gui_banner_flag = FALSE;
+
ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_INFO_STOP_SEARCH);
- gtk_infoprint(
- GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+ 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);
}
}
void ws_gui_fill_html(char *html_context, gpointer user_data)
{
WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
- gtk_html_set_editable (GTK_HTML(ws_gui_app->ws_gui_html), FALSE);
-
+
+ gtk_html_set_editable (GTK_HTML(ws_gui_app->ws_gui_html), FALSE);
+ if (ws_gui_app->first_run == TRUE && ws_gui_app->bookmark_mode==FALSE)
+ {
+ gtk_html_load_from_string(GTK_HTML(ws_gui_app->ws_gui_html),
+ ws_gui_app->welcome_note,
+ -1);
+ g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
+ "prefix",
+ "",
+ NULL);
+ }
+ else
+ {
gtk_html_load_from_string(GTK_HTML(ws_gui_app->ws_gui_html),
html_context,
-1);
+ }
}
/** read adjustment of left scrollwindow, which is necessary to navigate with
14);
str_final = g_string_insert(str_final,
(long)(tmp - str_final->str),
- "<html><head></head><body><center><table width=\"400px\"><tr>"
+ "<html><head></head><body><center><table width=\"95%\"><tr>"
"<td><table border=1 width=100%><tr>"
"<th background=\"file:/usr/share/pixmaps/ws_top.png\">"
"<img align=left src=\"file:/usr/share/pixmaps/"
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_app);
g_free(ws_gui_app->last_word);
ws_gui_app->last_word = NULL;
ws_gui_app->ws_gui_history_cur_pos = -1;
}
ws_gui_check_history(ws_gui_app);
-
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_search(NULL, ws_gui_app);
+ gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
+ ws_gui_search(NULL, ws_gui_app);
}
/** closes bookmarks database
ws_gui_check_history(ws_gui_app);
ws_gui_fill_html(" ", ws_gui_app);
- ws_gui_app->html_flag = FALSE;
- g_strstrip(ws_gui_app->last_searched);
- if (ws_gui_app->last_searched != NULL)
+ ws_gui_app->html_flag = TRUE;
+ //g_strstrip(ws_gui_app->last_searched);
+ if (g_strstrip(ws_gui_app->last_searched) != NULL && ws_gui_app->first_run == FALSE)
{
g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
"prefix",
}
else
{
+ gtk_list_store_clear(ws_gui_app->ws_gui_w_list->ws_gui_store);
+ }
+/* else if (ws_gui_app->first_run == FALSE)
+ {
g_object_set(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
- "prefix",
+ "prefix",
"\0",
NULL);
GArray *tmp;
ws_gui_app->ws_gui_w_list->ws_gui_model =
create_and_fill_model(tmp, ws_gui_app);
- //ws_dbus_client_find_word(ws_gui_app->dbus_data, ws_gui_app->last_searched);
+ 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
{
ws_gui_remove_bookmark_dialog(ws_gui_app);
+ 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);
}
else
-1);
if (string != NULL)
{
-
+ //gtk_widget_show(ws_gui_app->ws_gui_banner_translation_loading);
+ ws_gui_app->loading = TRUE;
+ ws_gui_set_toolbar_avail(ws_gui_app);
+
ws_dbus_client_find_translation(ws_gui_app->dbus_data, string);
}
+
+void ws_gui_set_toolbar_avail(gpointer user_data) {
+
+ WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+
+ if (ws_gui_app->loading == TRUE)
+ {
+ gtk_widget_set_sensitive(
+ GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_stop),
+ TRUE);
+
+ gtk_widget_set_sensitive(
+ GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
+ FALSE);
+
+ }
+ else
+ {
+ gtk_widget_set_sensitive(
+ GTK_WIDGET(ws_gui_app->ws_gui_toobar_button_stop),
+ FALSE);
+
+ gtk_widget_set_sensitive(
+ GTK_WIDGET(ws_gui_app->ws_gui_menu->ws_gui_menu_search),
+ TRUE);
+ }
+}
+
+void ws_refresh_search_results(gpointer user_data) {
+
+ WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
+
+ //refreshing the words list and translation pane
+ gchar *temp;
+ g_object_get(G_OBJECT(ws_gui_app->ws_gui_hildon_find_toolbar),
+ "prefix",
+ &temp,
+ NULL);
+
+ if (ws_gui_app->first_run == FALSE)
+ {
+ ws_dbus_client_find_word (ws_gui_app->dbus_data, temp);
+ }
+ //gtk_widget_hide(ws_gui_app->ws_gui_list_hbox);
+ //-----------------------------------------------
+}
projects / mdictionary / blobdiff