diff --git a/lib/aspell.c b/lib/aspell.c
deleted file mode 100644
index 8dba66e91ad79fb6eb9cd7201a038f5a013b0d56..0000000000000000000000000000000000000000
--- a/lib/aspell.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/* $Id$
- *
- * Copyright 2006-2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-
-/* Code to execute the aspell (or ispell or anything command line compatible) binary
- * with a given search term and reads it output. */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#include <libxfcegui4/libxfcegui4.h>
-
-#include "common.h"
-#include "aspell.h"
-#include "gui.h"
-
-
-typedef struct
-{
- DictData *dd;
- gchar *word;
-} iodata;
-
-
-static GIOChannel *set_up_io_channel(gint fd, GIOCondition cond, GIOFunc func, gpointer data)
-{
- GIOChannel *ioc;
-
- ioc = g_io_channel_unix_new(fd);
-
- g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL);
- g_io_channel_set_encoding(ioc, NULL, NULL);
- /* "auto-close" */
- g_io_channel_set_close_on_unref(ioc, TRUE);
-
- g_io_add_watch(ioc, cond, func, (gpointer) data);
- g_io_channel_unref(ioc);
-
- return ioc;
-}
-
-
-static gboolean iofunc_read(GIOChannel *ioc, GIOCondition cond, gpointer data)
-{
- iodata *iod = data;
- if (cond & (G_IO_IN | G_IO_PRI))
- {
- gchar *msg, *tmp;
- DictData *dd = iod->dd;
-
- while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg != NULL)
- {
- if (msg[0] == '&')
- { /* & cmd 17 7: ... */
- gint count;
- tmp = strchr(msg + 2, ' ') + 1;
- count = atoi(tmp);
- dict_gui_status_add(dd, ngettext("%d suggestion found.",
- "%d suggestions found.",
- count), count);
-
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
- tmp = g_strdup_printf(_("Suggestions for \"%s\":"), iod->word);
- gtk_text_buffer_insert_with_tags_by_name(
- dd->main_textbuffer, &dd->textiter, tmp, -1, "bold", NULL);
- g_free(tmp);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
-
- tmp = strchr(msg, ':') + 2;
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, g_strchomp(tmp), -1);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n\n", 2);
- }
- else if (msg[0] == '*')
- {
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
- tmp = g_strdup_printf(_("\"%s\" is spelled correctly."), iod->word);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, tmp, -1);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n\n", 2);
- g_free(tmp);
- }
- else if (msg[0] == '#')
- {
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
- tmp = g_strdup_printf(_("No suggestions could be found for \"%s\"."),
- iod->word);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, tmp, -1);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n\n", 2);
- g_free(tmp);
- }
- g_free(msg);
- }
- }
- if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL))
- {
- g_free(iod->word);
- g_free(iod);
-
- return FALSE;
- }
-
- return TRUE;
-}
-
-
-static gboolean iofunc_read_err(GIOChannel *ioc, GIOCondition cond, gpointer data)
-{
- if (cond & (G_IO_IN | G_IO_PRI))
- {
- gchar *msg;
- DictData *dd = data;
-
- while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg != NULL)
- {
- /* translation hint:
- * Error while executing <spell command, e.g. "aspell"> (<error message>) */
- dict_gui_status_add(dd, _("Error while executing \"%s\" (%s)."),
- dd->spell_bin, g_strstrip(msg));
- g_free(msg);
- }
- }
- if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL))
- return FALSE;
-
- return TRUE;
-}
-
-
-static gboolean iofunc_write(GIOChannel *ioc, GIOCondition cond, gpointer data)
-{
- if (NZV((gchar *) data))
- g_io_channel_write_chars(ioc, (gchar *) data, -1, NULL, NULL);
-
- g_free(data);
-
- return FALSE;
-}
-
-
-void dict_aspell_start_query(DictData *dd, const gchar *word)
-{
- GError *error = NULL;
- gchar **argv;
- gchar *locale_cmd;
- gint stdout_fd;
- gint stderr_fd;
- gint stdin_fd;
- guint i;
- gsize tts_len;
- gchar **tts; /* text to search */
- iodata *iod;
-
- if (! NZV(dd->spell_bin))
- {
- dict_gui_status_add(dd, _("Please set the aspell command in the preferences dialog."));
- return;
- }
-
- if (! NZV(word))
- {
- dict_gui_status_add(dd, _("Invalid input."));
- return;
- }
-
- tts = g_strsplit_set(word, " -_,.", 0);
- tts_len = g_strv_length(tts);
-
- for (i = 0; i < tts_len; i++)
- {
- locale_cmd = g_locale_from_utf8(dd->spell_bin, -1, NULL, NULL, NULL);
- if (locale_cmd == NULL)
- locale_cmd = g_strdup(dd->spell_bin);
-
- argv = g_new0(gchar*, 5);
- argv[0] = locale_cmd;
- argv[1] = g_strdup("-a");
- argv[2] = g_strdup("-l");
- argv[3] = g_strdup(dd->spell_dictionary);
- argv[4] = NULL;
-
- if (g_spawn_async_with_pipes(NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL,
- &stdin_fd, &stdout_fd, &stderr_fd, &error))
- {
- iod = g_new(iodata, 1);
- iod->dd = dd;
- iod->word = g_strdup(tts[i]);
-
- set_up_io_channel(stdin_fd, G_IO_OUT, iofunc_write, g_strdup(tts[i]));
- set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_HUP|G_IO_ERR|G_IO_NVAL, iofunc_read, iod);
- set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_HUP|G_IO_ERR|G_IO_NVAL, iofunc_read_err, dd);
- dict_gui_status_add(dd, _("Ready."));
- }
- else
- {
- dict_gui_status_add(dd, _("Process failed (%s)"), error->message);
- g_error_free(error);
- error = NULL;
- }
-
- g_strfreev(argv);
- }
-
- g_strfreev(tts);
-}
diff --git a/lib/aspell.h b/lib/aspell.h
deleted file mode 100644
index c5ab85a30e84e75cba5975d5c85b9ca9bf05e5be..0000000000000000000000000000000000000000
--- a/lib/aspell.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $Id$
- *
- * Copyright 2006-2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef ASPELL_H
-#define ASPELL_H 1
-
-void dict_aspell_start_query(DictData *dd, const gchar *word);
-
-
-#endif
diff --git a/lib/prefs.c b/lib/prefs.c
index 9dbbcfd542dda4037a828f2e773c48219fc781ef..cb9e7375d69823df7cb32038acc0a12d1e9804eb 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -214,12 +214,60 @@ const gchar *dict_prefs_get_web_url_label(DictData *dd)
}
-void color_set_cb(GtkColorButton *widget, GdkColor *color)
+static void color_set_cb(GtkColorButton *widget, GdkColor *color)
{
gtk_color_button_get_color(widget, color);
}
+static void button_dict_refresh_cb(GtkWidget *button, DictData *dd)
+{
+ GtkWidget *combo = g_object_get_data(G_OBJECT(button), "spell_combo");
+
+ dict_spell_get_dictionaries(dd, combo);
+}
+
+
+static gboolean spell_entry_focus_cb(GtkEntry *entry, GdkEventFocus *ev, GtkWidget *icon)
+{
+ gchar *path = g_find_program_in_path(gtk_entry_get_text(entry));
+
+ if (path != NULL)
+ {
+ gtk_image_set_from_stock(GTK_IMAGE(icon), GTK_STOCK_YES, GTK_ICON_SIZE_BUTTON);
+ g_free(path);
+ }
+ else
+ gtk_image_set_from_stock(GTK_IMAGE(icon), GTK_STOCK_STOP, GTK_ICON_SIZE_BUTTON);
+
+ return FALSE;
+}
+
+
+static void spell_entry_activate_cb(GtkEntry *entry, DictData *dd)
+{
+ GtkWidget *combo = g_object_get_data(G_OBJECT(entry), "spell_combo");
+ GtkWidget *icon = g_object_get_data(G_OBJECT(entry), "icon");
+
+ spell_entry_focus_cb(entry, NULL, icon);
+ dict_spell_get_dictionaries(dd, combo);
+}
+
+
+static void spell_combo_changed_cb(GtkComboBox *widget, DictData *dd)
+{
+ GtkTreeIter iter;
+
+ if (gtk_combo_box_get_active_iter(widget, &iter))
+ {
+ gchar *text;
+ gtk_tree_model_get(gtk_combo_box_get_model(widget), &iter, 0, &text, -1);
+ g_free(dd->spell_dictionary);
+ dd->spell_dictionary = text;
+ }
+}
+
+
GtkWidget *dict_prefs_dialog_show(GtkWidget *parent, DictData *dd)
{
GtkWidget *dialog, *inner_vbox, *notebook, *notebook_vbox;
@@ -564,7 +612,9 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent, DictData *dd)
*/
#define PAGE_SPELL /* only for navigation in Geany's symbol list ;-) */
{
- GtkWidget *table, *spell_entry, *spell_combo;
+ GtkWidget *table, *label_help, *spell_entry, *spell_combo, *button_refresh, *image, *icon;
+ GtkListStore *store;
+ GtkCellRenderer *renderer;
notebook_vbox = gtk_vbox_new(FALSE, 5);
gtk_widget_show(notebook_vbox);
@@ -577,45 +627,88 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent, DictData *dd)
label1 = gtk_label_new_with_mnemonic(_("Spell Check Program:"));
gtk_widget_show(label1);
+ icon = gtk_image_new();
+ gtk_widget_show(icon);
+
spell_entry = gtk_entry_new();
gtk_entry_set_max_length(GTK_ENTRY(spell_entry), 256);
if (dd->spell_bin != NULL)
{
gtk_entry_set_text(GTK_ENTRY(spell_entry), dd->spell_bin);
}
+ g_signal_connect(spell_entry, "focus-out-event", G_CALLBACK(spell_entry_focus_cb), icon);
+ g_signal_connect(spell_entry, "activate", G_CALLBACK(spell_entry_activate_cb), dd);
gtk_widget_show(spell_entry);
+ label_help = wrap_label_new(_(
+ "<i>The spell check program can be 'enchant', 'aspell', 'ispell' or any other spell check "
+ "program which is compatible to the ispell command.\nThe icon shows whether the entered "
+ "command exists.</i>"));
+ gtk_label_set_use_markup(GTK_LABEL(label_help), TRUE);
+ gtk_widget_show(label_help);
+
label2 = gtk_label_new_with_mnemonic(_("Dictionary:"));
gtk_widget_show(label2);
- spell_combo = gtk_combo_box_new_text();
+ store = gtk_list_store_new(1, G_TYPE_STRING);
+ spell_combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
+ g_object_set_data(G_OBJECT(spell_combo), "spell_entry", spell_entry);
+
+ renderer = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(spell_combo), renderer, TRUE);
+ gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(spell_combo), renderer, "text", 0);
+
dict_spell_get_dictionaries(dd, spell_combo);
+ g_signal_connect(spell_combo, "changed", G_CALLBACK(spell_combo_changed_cb), dd);
gtk_widget_show(spell_combo);
+ button_refresh = gtk_button_new();
+ image = gtk_image_new_from_stock("gtk-refresh", GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image(GTK_BUTTON(button_refresh), image);
+ gtk_widget_show(button_refresh);
+ g_object_set_data(G_OBJECT(button_refresh), "spell_combo", spell_combo);
+ g_signal_connect(button_refresh, "clicked", G_CALLBACK(button_dict_refresh_cb), dd);
+
+ g_object_set_data(G_OBJECT(spell_entry), "icon", icon);
+ g_object_set_data(G_OBJECT(spell_entry), "spell_combo", spell_combo);
g_object_set_data(G_OBJECT(dialog), "spell_combo", spell_combo);
g_object_set_data(G_OBJECT(dialog), "spell_entry", spell_entry);
+ g_object_unref(store);
+ spell_entry_focus_cb(GTK_ENTRY(spell_entry), NULL, icon); /* initially set the icon */
- table = gtk_table_new(2, 2, FALSE);
+ table = gtk_table_new(3, 3, FALSE);
gtk_widget_show(table);
gtk_table_set_row_spacings(GTK_TABLE(table), 5);
gtk_table_set_col_spacings(GTK_TABLE(table), 5);
- gtk_table_attach(GTK_TABLE(table), label1, 0, 1, 0, 1,
+ gtk_table_attach(GTK_TABLE(table), label_help, 0, 3, 0, 1,
+ (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
+ (GtkAttachOptions) (0), 5, 5);
+
+ gtk_table_attach(GTK_TABLE(table), label1, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 5, 5);
gtk_misc_set_alignment(GTK_MISC(label1), 1, 0);
- gtk_table_attach(GTK_TABLE(table), spell_entry, 1, 2, 0, 1,
+ gtk_table_attach(GTK_TABLE(table), spell_entry, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
(GtkAttachOptions) (0), 5, 5);
- gtk_table_attach(GTK_TABLE(table), label2, 0, 1, 1, 2,
+ gtk_table_attach(GTK_TABLE(table), icon, 2, 3, 1, 2,
+ (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
+ (GtkAttachOptions) (0), 5, 5);
+
+ gtk_table_attach(GTK_TABLE(table), label2, 0, 1, 2, 3,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 5, 0);
gtk_misc_set_alignment(GTK_MISC(label2), 1, 0);
- gtk_table_attach(GTK_TABLE(table), spell_combo, 1, 2, 1, 2,
+ gtk_table_attach(GTK_TABLE(table), spell_combo, 1, 2, 2, 3,
+ (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
+ (GtkAttachOptions) (0), 5, 5);
+
+ gtk_table_attach(GTK_TABLE(table), button_refresh, 2, 3, 2, 3,
(GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
(GtkAttachOptions) (0), 5, 5);
diff --git a/lib/spell.c b/lib/spell.c
index b68ba81285e6638b2e6982fb940545a5ac9b31ce..0ff7e2dcb530755454373c170241d2ea88ca806b 100644
--- a/lib/spell.c
+++ b/lib/spell.c
@@ -300,18 +300,27 @@ static gchar **get_aspell_dicts(const gchar *str)
void dict_spell_get_dictionaries(DictData *dd, GtkWidget *spell_combo)
{
- if (NZV(dd->spell_bin))
+ const gchar *entry_cmd = gtk_entry_get_text(
+ GTK_ENTRY(g_object_get_data(G_OBJECT(spell_combo), "spell_entry")));
+
+ if (*entry_cmd != '\0')
{
- gchar *tmp = NULL, *cmd, *locale_cmd;
+ gchar *tmp = NULL;
+ gchar *cmd, *locale_cmd;
gboolean use_enchant = FALSE;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ model = gtk_combo_box_get_model(GTK_COMBO_BOX(spell_combo));
+ gtk_list_store_clear(GTK_LIST_STORE(model));
- if (strstr(dd->spell_bin, "enchant") != NULL)
+ if (strstr(entry_cmd, "enchant") != NULL)
{
cmd = g_strdup("enchant-lsmod -list-dicts");
use_enchant = TRUE;
}
else
- cmd = g_strconcat(dd->spell_bin, " dump dicts", NULL);
+ cmd = g_strconcat(entry_cmd, " dump dicts", NULL);
locale_cmd = g_locale_from_utf8(cmd, -1, NULL, NULL, NULL);
if (locale_cmd == NULL)
@@ -330,9 +339,10 @@ void dict_spell_get_dictionaries(DictData *dd, GtkWidget *spell_combo)
{
if (NZV(list[i]))
{
- gtk_combo_box_append_text(GTK_COMBO_BOX(spell_combo), list[i]);
+ gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter, 0, list[i], -1);
if (strcmp(dd->spell_dictionary, list[i]) == 0)
- gtk_combo_box_set_active(GTK_COMBO_BOX(spell_combo), i);
+ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(spell_combo), &iter);
}
}
g_strfreev(list);