Plugins-Commits September 2009

plugins-commits@lists.geany.org

8 participants
93 discussions

SF.net SVN: geany-plugins:[972] branches/geany-plugins/geany-plugins-0.18/ NEWS
by eht16＠users.sourceforge.net 30 Sep '09

30 Sep '09

Revision: 972 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=972&view=rev Author: eht16 Date: 2009-09-30 19:43:46 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Update NEWS Modified Paths: -------------- branches/geany-plugins/geany-plugins-0.18/NEWS Modified: branches/geany-plugins/geany-plugins-0.18/NEWS =================================================================== --- branches/geany-plugins/geany-plugins-0.18/NEWS 2009-09-30 19:41:19 UTC (rev 971) +++ branches/geany-plugins/geany-plugins-0.18/NEWS 2009-09-30 19:43:46 UTC (rev 972) @@ -2,6 +2,10 @@ General: + Spell Check: + * Allow setting custom dictionary directories if + Enchant >= 1.5.0 is used. + GeanyVC: * Update to most recent version including an entry to editor menu and a check/uncheck all function on commit dialog. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[971] branches/geany-plugins/geany-plugins-0.18/ spellcheck
by eht16＠users.sourceforge.net 30 Sep '09

30 Sep '09

Revision: 971 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=971&view=rev Author: eht16 Date: 2009-09-30 19:41:19 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Merge changes from trunk: Allow setting a custom dictionary directory without reloading the plugin. Add an option to the preference dialog to select a custom directory to look for additional dictionary files. Minor fixes. Remove unused code. Use single header includes. Modified Paths: -------------- branches/geany-plugins/geany-plugins-0.18/spellcheck/ChangeLog branches/geany-plugins/geany-plugins-0.18/spellcheck/src/gui.c branches/geany-plugins/geany-plugins-0.18/spellcheck/src/gui.h branches/geany-plugins/geany-plugins-0.18/spellcheck/src/scplugin.c branches/geany-plugins/geany-plugins-0.18/spellcheck/src/scplugin.h branches/geany-plugins/geany-plugins-0.18/spellcheck/src/speller.c Modified: branches/geany-plugins/geany-plugins-0.18/spellcheck/ChangeLog =================================================================== --- branches/geany-plugins/geany-plugins-0.18/spellcheck/ChangeLog 2009-09-30 19:35:07 UTC (rev 970) +++ branches/geany-plugins/geany-plugins-0.18/spellcheck/ChangeLog 2009-09-30 19:41:19 UTC (rev 971) @@ -1,3 +1,16 @@ +2009-09-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/gui.c, src/gui.h, src/scplugin.c, src/scplugin.h, src/speller.c: + Merge changes from trunk: + Allow setting a custom dictionary directory without reloading + the plugin. + Add an option to the preference dialog to select a custom + directory to look for additional dictionary files. + Minor fixes. + Remove unused code. + Use single header includes. + + 2009-06-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/gui.c: Modified: branches/geany-plugins/geany-plugins-0.18/spellcheck/src/gui.c =================================================================== --- branches/geany-plugins/geany-plugins-0.18/spellcheck/src/gui.c 2009-09-30 19:35:07 UTC (rev 970) +++ branches/geany-plugins/geany-plugins-0.18/spellcheck/src/gui.c 2009-09-30 19:41:19 UTC (rev 971) @@ -23,22 +23,12 @@ */ -#include "geany.h" -#include "support.h" +#include "geanyplugin.h" #include <ctype.h> #include <string.h> -#include "plugindata.h" -#include "document.h" -#include "editor.h" -#include "msgwindow.h" -#include "utils.h" -#include "ui_utils.h" - -#include "geanyfunctions.h" - #include "gui.h" #include "scplugin.h" #include "speller.h" @@ -81,11 +71,6 @@ } -void sc_gui_update_tooltip(void) -{ -} - - void sc_gui_update_toolbar(void) { /* toolbar item is not requested, so remove the item if it exists */ @@ -101,7 +86,6 @@ if (sc_info->toolbar_button == NULL) { sc_info->toolbar_button = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_SPELL_CHECK); - sc_gui_update_tooltip(); plugin_add_toolbar_item(geany_plugin, sc_info->toolbar_button); ui_add_document_sensitive(GTK_WIDGET(sc_info->toolbar_button)); @@ -158,7 +142,7 @@ } -static void menu_addword_item_activate_cd(GtkMenuItem *menuitem, gpointer gdata) +static void menu_addword_item_activate_cb(GtkMenuItem *menuitem, gpointer gdata) { gint startword, endword, i, doc_len; ScintillaObject *sci; @@ -298,12 +282,12 @@ menu_item = image_menu_item_new(GTK_STOCK_ADD, label); gtk_container_add(GTK_CONTAINER(sc_info->edit_menu_sub), menu_item); g_signal_connect(menu_item, "activate", - G_CALLBACK(menu_addword_item_activate_cd), GINT_TO_POINTER(0)); + G_CALLBACK(menu_addword_item_activate_cb), GINT_TO_POINTER(0)); menu_item = image_menu_item_new(GTK_STOCK_REMOVE, _("Ignore All")); gtk_container_add(GTK_CONTAINER(sc_info->edit_menu_sub), menu_item); g_signal_connect(menu_item, "activate", - G_CALLBACK(menu_addword_item_activate_cd), GINT_TO_POINTER(1)); + G_CALLBACK(menu_addword_item_activate_cb), GINT_TO_POINTER(1)); gtk_widget_show(sc_info->edit_menu); gtk_widget_show(sc_info->edit_menu_sep); @@ -459,6 +443,7 @@ { setptr(sc_info->default_language, g_strdup(gdata)); sc_speller_reinit_enchant_dict(); + sc_gui_update_menu(); update_labels(); } @@ -505,48 +490,33 @@ void sc_gui_update_menu(void) { - GtkWidget *child, *menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(sc_info->menu_item)); - GList *l, *children = gtk_container_get_children(GTK_CONTAINER(menu)); - - sc_ignore_callback = TRUE; - for (l = children; l != NULL; l = g_list_next(l)) - { - if ((child = GTK_BIN(l->data)->child) != NULL) - { - if (GTK_IS_LABEL(child)) - { - if (utils_str_equal(sc_info->default_language, gtk_label_get_text(GTK_LABEL(child)))) - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(l->data), TRUE); - } - } - } - sc_ignore_callback = FALSE; - - update_labels(); -} - - -void sc_gui_create_menu(GtkWidget *sp_item) -{ - GtkWidget *menu, *menu_item; + GtkWidget *menu_item; guint i; + static gboolean need_init = TRUE; GSList *group = NULL; gchar *label; - gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), sp_item); + if (need_init) + { + gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), sc_info->menu_item); + need_init = FALSE; + } - menu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(sp_item), menu); + if (sc_info->main_menu != NULL) + gtk_widget_destroy(sc_info->main_menu); + sc_info->main_menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(sc_info->menu_item), sc_info->main_menu); + sc_info->submenu_item_default = gtk_menu_item_new_with_label(NULL); - gtk_container_add(GTK_CONTAINER(menu), sc_info->submenu_item_default); + gtk_container_add(GTK_CONTAINER(sc_info->main_menu), sc_info->submenu_item_default); g_signal_connect(sc_info->submenu_item_default, "activate", G_CALLBACK(menu_item_toggled_cb), NULL); update_labels(); menu_item = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(menu), menu_item); + gtk_container_add(GTK_CONTAINER(sc_info->main_menu), menu_item); sc_ignore_callback = TRUE; for (i = 0; i < sc_info->dicts->len; i++) @@ -556,10 +526,11 @@ group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menu_item)); if (utils_str_equal(sc_info->default_language, label)) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), TRUE); - gtk_container_add(GTK_CONTAINER(menu), menu_item); + gtk_container_add(GTK_CONTAINER(sc_info->main_menu), menu_item); g_signal_connect(menu_item, "toggled", G_CALLBACK(menu_item_toggled_cb), label); } sc_ignore_callback = FALSE; + gtk_widget_show_all(sc_info->main_menu); } Modified: branches/geany-plugins/geany-plugins-0.18/spellcheck/src/gui.h =================================================================== --- branches/geany-plugins/geany-plugins-0.18/spellcheck/src/gui.h 2009-09-30 19:35:07 UTC (rev 970) +++ branches/geany-plugins/geany-plugins-0.18/spellcheck/src/gui.h 2009-09-30 19:41:19 UTC (rev 971) @@ -38,14 +38,12 @@ void sc_gui_create_edit_menu(void); -void sc_gui_create_menu(GtkWidget *sp_item); - void sc_gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, GeanyDocument *doc, gpointer user_data); void sc_gui_update_toolbar(void); -void sc_gui_update_menu(void); +void sc_gui_update_menu(); void sc_gui_init(void); Modified: branches/geany-plugins/geany-plugins-0.18/spellcheck/src/scplugin.c =================================================================== --- branches/geany-plugins/geany-plugins-0.18/spellcheck/src/scplugin.c 2009-09-30 19:35:07 UTC (rev 970) +++ branches/geany-plugins/geany-plugins-0.18/spellcheck/src/scplugin.c 2009-09-30 19:41:19 UTC (rev 971) @@ -23,28 +23,9 @@ */ -#include "geany.h" -#include "support.h" +#include "geanyplugin.h" -#ifdef HAVE_LOCALE_H -# include <locale.h> -#endif -/* -#ifdef G_OS_WIN32 -# include <windows.h> -#endif -*/ - -#include "plugindata.h" - -#include "keybindings.h" -#include "utils.h" -#include "ui_utils.h" -#include "filetypes.h" - -#include "geanyfunctions.h" - #include "scplugin.h" #include "gui.h" #include "speller.h" @@ -55,8 +36,8 @@ GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(132) -PLUGIN_SET_INFO(_("Spell Check"), _("Checks the spelling of the current document."), "0.4", +PLUGIN_VERSION_CHECK(147); +PLUGIN_SET_INFO(_("Spell Check"), _("Checks the spelling of the current document."), VERSION, _("The Geany developer team")) @@ -83,27 +64,23 @@ }; -/* currently unused */ -#ifdef G_OS_WIN32 -#warning TODO check Windows support -/* On Windows we need to find the Aspell installation prefix via the Windows Registry - * and then set the prefix in the Aspell config object. */ -static void set_up_aspell_prefix(AspellConfig *config) +static void populate_dict_combo(GtkComboBox *combo) { - char sTemp[1024]; - HKEY hkey; - DWORD len = sizeof(sTemp); + guint i; + GtkTreeModel *model = gtk_combo_box_get_model(combo); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Aspell"), 0, - KEY_QUERY_VALUE, &hkey) != ERROR_SUCCESS) - return; + gtk_list_store_clear(GTK_LIST_STORE(model)); + for (i = 0; i < sc_info->dicts->len; i++) + { + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), g_ptr_array_index(sc_info->dicts, i)); - if (RegQueryValueEx(hkey, NULL, 0, NULL, (LPBYTE)sTemp, &len) == ERROR_SUCCESS) - aspell_config_replace(config, "prefix", sTemp); - - RegCloseKey(hkey); + if (utils_str_equal(g_ptr_array_index(sc_info->dicts, i), sc_info->default_language)) + gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i); + } + /* if the default language couldn't be selected, select the first available language */ + if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == -1) + gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0); } -#endif static void configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data) @@ -113,9 +90,13 @@ GKeyFile *config = g_key_file_new(); gchar *data; gchar *config_dir = g_path_get_dirname(sc_info->config_file); + GtkComboBox *combo = GTK_COMBO_BOX(g_object_get_data(G_OBJECT(dialog), "combo")); - setptr(sc_info->default_language, gtk_combo_box_get_active_text(GTK_COMBO_BOX( - g_object_get_data(G_OBJECT(dialog), "combo")))); + setptr(sc_info->default_language, gtk_combo_box_get_active_text(combo)); +#ifdef HAVE_ENCHANT_1_5 + setptr(sc_info->dictionary_dir, g_strdup(gtk_entry_get_text(GTK_ENTRY( + g_object_get_data(G_OBJECT(dialog), "dict_dir"))))); +#endif sc_speller_reinit_enchant_dict(); sc_info->check_while_typing = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( @@ -133,9 +114,11 @@ g_key_file_set_boolean(config, "spellcheck", "check_while_typing", sc_info->check_while_typing); g_key_file_set_boolean(config, "spellcheck", "use_msgwin", sc_info->use_msgwin); g_key_file_set_boolean(config, "spellcheck", "show_toolbar_item", sc_info->show_toolbar_item); + g_key_file_set_string(config, "spellcheck", "dictionary_dir", sc_info->dictionary_dir); sc_gui_update_toolbar(); sc_gui_update_menu(); + populate_dict_combo(combo); if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) { @@ -173,6 +156,8 @@ "spellcheck", "check_while_typing", FALSE); sc_info->show_toolbar_item = utils_get_setting_boolean(config, "spellcheck", "show_toolbar_item", TRUE); + sc_info->dictionary_dir = utils_get_setting_string(config, + "spellcheck", "dictionary_dir", NULL); sc_info->use_msgwin = utils_get_setting_boolean(config, "spellcheck", "use_msgwin", FALSE); g_key_file_free(config); g_free(default_lang); @@ -188,7 +173,7 @@ sc_speller_init(); sc_gui_create_edit_menu(); - sc_gui_create_menu(sc_info->menu_item); + sc_gui_update_menu(); gtk_widget_show_all(sc_info->menu_item); sc_info->signal_id = g_signal_connect(geany->main_widgets->window, @@ -203,10 +188,47 @@ } +#ifdef HAVE_ENCHANT_1_5 +static void dictionary_dir_button_clicked_cb(GtkButton *button, gpointer item) +{ + GtkWidget *dialog; + gchar *text; + + /* initialize the dialog */ + dialog = gtk_file_chooser_dialog_new(_("Select Directory"), NULL, + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + + text = utils_get_locale_from_utf8(gtk_entry_get_text(GTK_ENTRY(item))); + if (NZV(text)) + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), text); + + /* run it */ + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + { + gchar *utf8_filename, *tmp; + + tmp = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + utf8_filename = utils_get_utf8_from_locale(tmp); + + gtk_entry_set_text(GTK_ENTRY(item), utf8_filename); + + g_free(utf8_filename); + g_free(tmp); + } + + gtk_widget_destroy(dialog); +} +#endif + + GtkWidget *plugin_configure(GtkDialog *dialog) { GtkWidget *label, *vbox, *combo, *check_type, *check_msgwin, *check_toolbar; - guint i; +#ifdef HAVE_ENCHANT_1_5 + GtkWidget *entry_dir, *hbox, *button, *image; +#endif vbox = gtk_vbox_new(FALSE, 6); @@ -228,24 +250,43 @@ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 3); combo = gtk_combo_box_new_text(); + populate_dict_combo(GTK_COMBO_BOX(combo)); - for (i = 0; i < sc_info->dicts->len; i++) - { - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), g_ptr_array_index(sc_info->dicts, i)); - - if (utils_str_equal(g_ptr_array_index(sc_info->dicts, i), sc_info->default_language)) - gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i); - } - /* if the default language couldn't be selected, select the first available language */ - if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == -1) - gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0); - if (sc_info->dicts->len > 20) gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 3); else if (sc_info->dicts->len > 10) gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 2); gtk_box_pack_start(GTK_BOX(vbox), combo, FALSE, FALSE, 6); +#ifdef HAVE_ENCHANT_1_5 + label = gtk_label_new_with_mnemonic(_("_Directory to look for dictionary files:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); + + entry_dir = gtk_entry_new(); + ui_entry_add_clear_icon(GTK_ENTRY(entry_dir)); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry_dir); + ui_widget_set_tooltip_text(entry_dir, + _("Read additional dictionary files from this directory. " + "For now, this only works with myspell dictionaries.")); + if (NZV(sc_info->dictionary_dir)) + gtk_entry_set_text(GTK_ENTRY(entry_dir), sc_info->dictionary_dir); + + button = gtk_button_new(); + g_signal_connect(button, "clicked", + G_CALLBACK(dictionary_dir_button_clicked_cb), entry_dir); + + image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(button), image); + + hbox = gtk_hbox_new(FALSE, 6); + gtk_box_pack_start_defaults(GTK_BOX(hbox), entry_dir); + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + + g_object_set_data(G_OBJECT(dialog), "dict_dir", entry_dir); +#endif g_object_set_data(G_OBJECT(dialog), "combo", combo); g_object_set_data(G_OBJECT(dialog), "check_type", check_type); g_object_set_data(G_OBJECT(dialog), "check_msgwin", check_msgwin); @@ -279,14 +320,6 @@ void plugin_cleanup(void) { - guint i; - - for (i = 0; i < sc_info->dicts->len; i++) - { - g_free(g_ptr_array_index(sc_info->dicts, i)); - } - g_ptr_array_free(sc_info->dicts, TRUE); - g_signal_handler_disconnect(geany->main_widgets->window, sc_info->signal_id); gtk_widget_destroy(sc_info->edit_menu); @@ -297,6 +330,7 @@ sc_gui_free(); sc_speller_free(); + g_free(sc_info->dictionary_dir); g_free(sc_info->default_language); g_free(sc_info->config_file); gtk_widget_destroy(sc_info->menu_item); Modified: branches/geany-plugins/geany-plugins-0.18/spellcheck/src/scplugin.h =================================================================== --- branches/geany-plugins/geany-plugins-0.18/spellcheck/src/scplugin.h 2009-09-30 19:35:07 UTC (rev 970) +++ branches/geany-plugins/geany-plugins-0.18/spellcheck/src/scplugin.h 2009-09-30 19:41:19 UTC (rev 971) @@ -32,11 +32,13 @@ { gchar *config_file; gchar *default_language; + gchar *dictionary_dir; gboolean use_msgwin; gboolean check_while_typing; gboolean show_toolbar_item; gulong signal_id; GPtrArray *dicts; + GtkWidget *main_menu; GtkWidget *menu_item; GtkWidget *submenu_item_default; GtkWidget *edit_menu; Modified: branches/geany-plugins/geany-plugins-0.18/spellcheck/src/speller.c =================================================================== --- branches/geany-plugins/geany-plugins-0.18/spellcheck/src/speller.c 2009-09-30 19:35:07 UTC (rev 970) +++ branches/geany-plugins/geany-plugins-0.18/spellcheck/src/speller.c 2009-09-30 19:41:19 UTC (rev 971) @@ -23,24 +23,14 @@ */ -#include "geany.h" -#include "support.h" +#include "geanyplugin.h" +#include "scintilla/SciLexer.h" + #include <string.h> #include <ctype.h> #include <enchant.h> -#include "plugindata.h" - -#include "document.h" -#include "editor.h" -#include "msgwindow.h" -#include "utils.h" -#include "ui_utils.h" -#include "scintilla/SciLexer.h" - -#include "geanyfunctions.h" - #include "speller.h" #include "scplugin.h" @@ -252,42 +242,6 @@ } -void sc_speller_reinit_enchant_dict(void) -{ - gchar *lang = sc_info->default_language; - - /* Release a previous dict object */ - if (sc_speller_dict != NULL) - enchant_broker_free_dict(sc_speller_broker, sc_speller_dict); - - /* Check if the stored default dictionary is (still) avaiable, fall back to the first - * one in the list if not */ - if (! check_default_lang()) - { - if (sc_info->dicts->len > 0) - { - lang = g_ptr_array_index(sc_info->dicts, 0); - g_warning("Stored language ('%s') could not be loaded. Falling back to '%s'", - sc_info->default_language, lang); - } - else - g_warning("Stored language ('%s') could not be loaded.", sc_info->default_language); - } - - /* Request new dict object */ - sc_speller_dict = enchant_broker_request_dict(sc_speller_broker, lang); - if (sc_speller_dict == NULL) - { - broker_init_failed(); - gtk_widget_set_sensitive(sc_info->menu_item, FALSE); - } - else - { - gtk_widget_set_sensitive(sc_info->menu_item, TRUE); - } -} - - gchar *sc_speller_get_default_lang(void) { const gchar *lang = g_getenv("LANG"); @@ -343,8 +297,24 @@ } +static void sc_speller_dicts_free(void) +{ + guint i; + if (sc_info->dicts != NULL) + { + for (i = 0; i < sc_info->dicts->len; i++) + { + g_free(g_ptr_array_index(sc_info->dicts, i)); + } + g_ptr_array_free(sc_info->dicts, TRUE); + } +} + + static void create_dicts_array(void) { + sc_speller_dicts_free(); + sc_info->dicts = g_ptr_array_new(); enchant_broker_list_dicts(sc_speller_broker, add_dict_array, sc_info->dicts); @@ -406,18 +376,73 @@ } +void sc_speller_reinit_enchant_dict(void) +{ + gchar *lang = sc_info->default_language; + + /* Release a previous dict object */ + if (sc_speller_dict != NULL) + enchant_broker_free_dict(sc_speller_broker, sc_speller_dict); + +#if HAVE_ENCHANT_1_5 + { + const gchar *old_path; + gchar *new_path; + + /* add custom dictionary path for myspell (primarily used on Windows) */ + old_path = enchant_broker_get_param(sc_speller_broker, "enchant.myspell.dictionary.path"); + if (old_path != NULL) + new_path = g_strconcat( + old_path, G_SEARCHPATH_SEPARATOR_S, sc_info->dictionary_dir, NULL); + else + new_path = sc_info->dictionary_dir; + + enchant_broker_set_param(sc_speller_broker, "enchant.myspell.dictionary.path", new_path); + if (new_path != sc_info->dictionary_dir) + g_free(new_path); + } +#endif + create_dicts_array(); + + /* Check if the stored default dictionary is (still) avaiable, fall back to the first + * one in the list if not */ + if (! check_default_lang()) + { + if (sc_info->dicts->len > 0) + { + lang = g_ptr_array_index(sc_info->dicts, 0); + g_warning("Stored language ('%s') could not be loaded. Falling back to '%s'", + sc_info->default_language, lang); + } + else + g_warning("Stored language ('%s') could not be loaded.", sc_info->default_language); + } + + /* Request new dict object */ + sc_speller_dict = enchant_broker_request_dict(sc_speller_broker, lang); + if (sc_speller_dict == NULL) + { + broker_init_failed(); + gtk_widget_set_sensitive(sc_info->menu_item, FALSE); + } + else + { + gtk_widget_set_sensitive(sc_info->menu_item, TRUE); + } +} + + void sc_speller_init(void) { sc_speller_broker = enchant_broker_init(); - create_dicts_array(); - sc_speller_reinit_enchant_dict(); } void sc_speller_free(void) { + sc_speller_dicts_free(); if (sc_speller_dict != NULL) enchant_broker_free_dict(sc_speller_broker, sc_speller_dict); enchant_broker_free(sc_speller_broker); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[970] branches/geany-plugins/geany-plugins-0.18/ wscript
by eht16＠users.sourceforge.net 30 Sep '09

30 Sep '09

Revision: 970 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=970&view=rev Author: eht16 Date: 2009-09-30 19:35:07 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Merge changes from trunk Modified Paths: -------------- branches/geany-plugins/geany-plugins-0.18/wscript Modified: branches/geany-plugins/geany-plugins-0.18/wscript =================================================================== --- branches/geany-plugins/geany-plugins-0.18/wscript 2009-09-30 19:26:03 UTC (rev 969) +++ branches/geany-plugins/geany-plugins-0.18/wscript 2009-09-30 19:35:07 UTC (rev 970) @@ -32,12 +32,22 @@ need to check for library packages (using pkg-config), please ask Enrico before committing changes. Thanks. +The code of this file itself loosely follows PEP 8 with some exceptions +(line width 100 characters and some other minor things). + Requires WAF 1.5.7 and Python 2.4 (or later). """ -import Build, Options, Utils, preproc -import glob, os, sys, tempfile +import glob +import os +import sys +import tempfile +from distutils import version +import Build +import Options +import Utils +import preproc APPNAME = 'geany-plugins' @@ -66,9 +76,7 @@ Plugin('addons', None, [ 'addons/src' ]), Plugin('geanylatex', None, [ 'geanylatex/src']), Plugin('geanylipsum', None, [ 'geanylipsum/src']), - Plugin('geanysendmail', - [ 'geanysendmail/src/geanysendmail.c' ], - [ 'geanysendmail/src' ]), + Plugin('geanysendmail', None, [ 'geanysendmail/src' ]), Plugin('geanyvc', None, [ 'geanyvc/src/'], [ [ 'gtkspell-2.0', '2.0', False ] ]), Plugin('shiftcolumn', None, [ 'shiftcolumn/src']), Plugin('spellcheck', None, [ 'spellcheck/src' ], [ [ 'enchant', '1.3', True ] ]), @@ -79,7 +87,7 @@ 'gdb-ui-frame.c', 'gdb-ui-locn.c', 'gdb-ui-main.c', 'geanydebug.c']), # source files [ 'geanygdb', 'geanygdb/src' ], # include dirs - [ [ 'elf.h', '', True ] ] + [ [ 'elf.h', '', False ], [ 'elf_abi.h', '', False ] ] ), Plugin('geanylua', [ 'geanylua/geanylua.c' ], # the other source files are listed in build_lua() @@ -94,15 +102,6 @@ [ 'externdbg/src/dbg.c' ], # source files [ 'externdbg', 'externdbg/src' ] # include dirs ), - Plugin('geanydoc', - [ 'geanydoc/src/config.c', 'geanydoc/src/geanydoc.c' ], # source files - [ 'geanydoc', 'geanydoc/src' ] # include dirs - ), - Plugin('geanyprj', - [ 'geanyprj/src/geanyprj.c', 'geanyprj/src/menu.c', 'geanyprj/src/project.c', - 'geanyprj/src/sidebar.c', 'geanyprj/src/utils.c', 'geanyprj/src/xproject.c' ], - [ 'geanyprj', 'geanyprj/src' ] # include dirs - ), Plugin('geany-mini-script', [ 'geany-mini-script/src/gms.c', 'geany-mini-script/src/gms_gui.c' ], # source files [ 'geany-mini-script', 'geany-mini-script/src' ] # include dirs @@ -200,7 +199,13 @@ if not is_win32: set_lib_dir() + # libexec (e.g. for geanygdb) + if Options.options.libexecdir: + conf.define('LIBEXECDIR', Options.options.libexecdir, 1) + else: + conf.define('LIBEXECDIR', conf.env['PREFIX'] + '/libexec', 1) + conf.check_cfg(package='gtk+-2.0', atleast_version='2.8.0', uselib_store='GTK', mandatory=True, args='--cflags --libs') conf.check_cfg(package='geany', atleast_version='0.18', mandatory=True, args='--cflags --libs') @@ -242,6 +247,11 @@ if l[2]: enabled_plugins.remove(p.name) + if 'geanygdb' in enabled_plugins: + if not conf.env['HAVE_ELF_H'] and not conf.env['HAVE_ELF_ABI_H']: + enabled_plugins.remove('geanygdb') + else: + conf.define('TTYHELPERDIR', conf.env['LIBEXECDIR'] + '/geany-plugins/geanygdb', 1) # Windows specials if is_win32: @@ -266,10 +276,15 @@ if conf.env['HAVE_GTKSPELL_2_0']: conf.define('USE_GTKSPELL', 1); + if conf.env['HAVE_ENCHANT']: + enchant_version = conf.check_cfg(modversion="enchant") + if version.LooseVersion(enchant_version) >= version.LooseVersion('1.5.0'): + conf.define('HAVE_ENCHANT_1_5', 1); if is_win32: conf.define('PREFIX', '', 1) conf.define('LIBDIR', '', 1) + conf.define('LIBEXECDIR', '', 1) conf.define('DOCDIR', 'doc', 1) conf.define('LOCALEDIR', 'share/locale', 1) # DATADIR is defined in objidl.h, so we remove it from config.h @@ -292,18 +307,20 @@ print_message(conf, 'Using Geany version', geany_version) if svn_rev != '-1': print_message(conf, 'Compiling Subversion revision', svn_rev) - conf.env.append_value('CCFLAGS', '-g -O0 -DDEBUG'.split()) # -DGEANY_DISABLE_DEPRECATED') + conf.env.append_value('CCFLAGS', '-g -O0 -DDEBUG'.split()) # -DGEANY_DISABLE_DEPRECATED print_message(conf, 'Plugins to compile', ' '.join(enabled_plugins)) conf.env.append_value('enabled_plugins', enabled_plugins) conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H'.split()) - if is_win32: # convenience script (script content copied from the original waf.bat) + # convenience script (script content copied from the original waf.bat) + if is_win32: f = open('waf.bat', 'wb') f.write('@python -x %~dp0waf %* & exit /b') f.close - else: # write a simple Makefile + # write a simple Makefile + else: f = open('Makefile', 'w') f.write(makefile_template) f.close @@ -316,6 +333,8 @@ # Paths opt.add_option('--libdir', type='string', default='', help='object code libraries', dest='libdir') + opt.add_option('--libexecdir', type='string', default='', + help='program executables', dest='libexecdir') # Actions opt.add_option('--update-po', action='store_true', default=False, help='update the message catalogs for translation', dest='update_po') @@ -369,7 +388,7 @@ includes = '. %s' % p.includes, target = 'ttyhelper', uselib = libs, - install_path = '${LIBDIR}/geany' + install_path = '${TTYHELPERDIR}' ) def install_docs(bld, pname, files): @@ -378,7 +397,7 @@ for file in files: if os.path.exists(os.path.join(p.name, file)): bld.install_as( - '%s/%s%s' % (docdir, ucFirst(file, is_win32), ext), + '%s/%s%s' % (docdir, uc_first(file, is_win32), ext), '%s/%s' % (pname, file)) if pname == 'geanylatex': bld.install_files('%s' % docdir, 'geanylatex/doc/geanylatex.*') @@ -496,7 +515,7 @@ conf.check_message_2(result, color) -def ucFirst(s, is_win32): +def uc_first(s, is_win32): if is_win32: return s.title() return s This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[969] trunk/geany-plugins/spellcheck
by eht16＠users.sourceforge.net 30 Sep '09

30 Sep '09

Revision: 969 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=969&view=rev Author: eht16 Date: 2009-09-30 19:26:03 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Allow setting a custom dictionary directory without reloading the plugin. Minor fixes. Modified Paths: -------------- trunk/geany-plugins/spellcheck/ChangeLog trunk/geany-plugins/spellcheck/src/gui.c trunk/geany-plugins/spellcheck/src/gui.h trunk/geany-plugins/spellcheck/src/scplugin.c trunk/geany-plugins/spellcheck/src/scplugin.h trunk/geany-plugins/spellcheck/src/speller.c Modified: trunk/geany-plugins/spellcheck/ChangeLog =================================================================== --- trunk/geany-plugins/spellcheck/ChangeLog 2009-09-30 19:16:56 UTC (rev 968) +++ trunk/geany-plugins/spellcheck/ChangeLog 2009-09-30 19:26:03 UTC (rev 969) @@ -1,3 +1,11 @@ +2009-09-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/scplugin.c, src/scplugin.h, src/gui.c, src/gui.h, src/speller.c: + Allow setting a custom dictionary directory without reloading + the plugin. + Minor fixes. + + 2009-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/scplugin.c, src/speller.c, src/scplugin.h: Modified: trunk/geany-plugins/spellcheck/src/gui.c =================================================================== --- trunk/geany-plugins/spellcheck/src/gui.c 2009-09-30 19:16:56 UTC (rev 968) +++ trunk/geany-plugins/spellcheck/src/gui.c 2009-09-30 19:26:03 UTC (rev 969) @@ -142,7 +142,7 @@ } -static void menu_addword_item_activate_cd(GtkMenuItem *menuitem, gpointer gdata) +static void menu_addword_item_activate_cb(GtkMenuItem *menuitem, gpointer gdata) { gint startword, endword, i, doc_len; ScintillaObject *sci; @@ -282,12 +282,12 @@ menu_item = image_menu_item_new(GTK_STOCK_ADD, label); gtk_container_add(GTK_CONTAINER(sc_info->edit_menu_sub), menu_item); g_signal_connect(menu_item, "activate", - G_CALLBACK(menu_addword_item_activate_cd), GINT_TO_POINTER(0)); + G_CALLBACK(menu_addword_item_activate_cb), GINT_TO_POINTER(0)); menu_item = image_menu_item_new(GTK_STOCK_REMOVE, _("Ignore All")); gtk_container_add(GTK_CONTAINER(sc_info->edit_menu_sub), menu_item); g_signal_connect(menu_item, "activate", - G_CALLBACK(menu_addword_item_activate_cd), GINT_TO_POINTER(1)); + G_CALLBACK(menu_addword_item_activate_cb), GINT_TO_POINTER(1)); gtk_widget_show(sc_info->edit_menu); gtk_widget_show(sc_info->edit_menu_sep); @@ -443,6 +443,7 @@ { setptr(sc_info->default_language, g_strdup(gdata)); sc_speller_reinit_enchant_dict(); + sc_gui_update_menu(); update_labels(); } @@ -489,48 +490,33 @@ void sc_gui_update_menu(void) { - GtkWidget *child, *menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(sc_info->menu_item)); - GList *l, *children = gtk_container_get_children(GTK_CONTAINER(menu)); - - sc_ignore_callback = TRUE; - for (l = children; l != NULL; l = g_list_next(l)) - { - if ((child = GTK_BIN(l->data)->child) != NULL) - { - if (GTK_IS_LABEL(child)) - { - if (utils_str_equal(sc_info->default_language, gtk_label_get_text(GTK_LABEL(child)))) - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(l->data), TRUE); - } - } - } - sc_ignore_callback = FALSE; - - update_labels(); -} - - -void sc_gui_create_menu(GtkWidget *sp_item) -{ - GtkWidget *menu, *menu_item; + GtkWidget *menu_item; guint i; + static gboolean need_init = TRUE; GSList *group = NULL; gchar *label; - gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), sp_item); + if (need_init) + { + gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), sc_info->menu_item); + need_init = FALSE; + } - menu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(sp_item), menu); + if (sc_info->main_menu != NULL) + gtk_widget_destroy(sc_info->main_menu); + sc_info->main_menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(sc_info->menu_item), sc_info->main_menu); + sc_info->submenu_item_default = gtk_menu_item_new_with_label(NULL); - gtk_container_add(GTK_CONTAINER(menu), sc_info->submenu_item_default); + gtk_container_add(GTK_CONTAINER(sc_info->main_menu), sc_info->submenu_item_default); g_signal_connect(sc_info->submenu_item_default, "activate", G_CALLBACK(menu_item_toggled_cb), NULL); update_labels(); menu_item = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(menu), menu_item); + gtk_container_add(GTK_CONTAINER(sc_info->main_menu), menu_item); sc_ignore_callback = TRUE; for (i = 0; i < sc_info->dicts->len; i++) @@ -540,10 +526,11 @@ group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menu_item)); if (utils_str_equal(sc_info->default_language, label)) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), TRUE); - gtk_container_add(GTK_CONTAINER(menu), menu_item); + gtk_container_add(GTK_CONTAINER(sc_info->main_menu), menu_item); g_signal_connect(menu_item, "toggled", G_CALLBACK(menu_item_toggled_cb), label); } sc_ignore_callback = FALSE; + gtk_widget_show_all(sc_info->main_menu); } Modified: trunk/geany-plugins/spellcheck/src/gui.h =================================================================== --- trunk/geany-plugins/spellcheck/src/gui.h 2009-09-30 19:16:56 UTC (rev 968) +++ trunk/geany-plugins/spellcheck/src/gui.h 2009-09-30 19:26:03 UTC (rev 969) @@ -38,14 +38,12 @@ void sc_gui_create_edit_menu(void); -void sc_gui_create_menu(GtkWidget *sp_item); - void sc_gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, GeanyDocument *doc, gpointer user_data); void sc_gui_update_toolbar(void); -void sc_gui_update_menu(void); +void sc_gui_update_menu(); void sc_gui_init(void); Modified: trunk/geany-plugins/spellcheck/src/scplugin.c =================================================================== --- trunk/geany-plugins/spellcheck/src/scplugin.c 2009-09-30 19:16:56 UTC (rev 968) +++ trunk/geany-plugins/spellcheck/src/scplugin.c 2009-09-30 19:26:03 UTC (rev 969) @@ -64,6 +64,25 @@ }; +static void populate_dict_combo(GtkComboBox *combo) +{ + guint i; + GtkTreeModel *model = gtk_combo_box_get_model(combo); + + gtk_list_store_clear(GTK_LIST_STORE(model)); + for (i = 0; i < sc_info->dicts->len; i++) + { + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), g_ptr_array_index(sc_info->dicts, i)); + + if (utils_str_equal(g_ptr_array_index(sc_info->dicts, i), sc_info->default_language)) + gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i); + } + /* if the default language couldn't be selected, select the first available language */ + if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == -1) + gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0); +} + + static void configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data) { if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) @@ -71,11 +90,13 @@ GKeyFile *config = g_key_file_new(); gchar *data; gchar *config_dir = g_path_get_dirname(sc_info->config_file); + GtkComboBox *combo = GTK_COMBO_BOX(g_object_get_data(G_OBJECT(dialog), "combo")); - setptr(sc_info->default_language, gtk_combo_box_get_active_text(GTK_COMBO_BOX( - g_object_get_data(G_OBJECT(dialog), "combo")))); + setptr(sc_info->default_language, gtk_combo_box_get_active_text(combo)); +#ifdef HAVE_ENCHANT_1_5 setptr(sc_info->dictionary_dir, g_strdup(gtk_entry_get_text(GTK_ENTRY( g_object_get_data(G_OBJECT(dialog), "dict_dir"))))); +#endif sc_speller_reinit_enchant_dict(); sc_info->check_while_typing = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( @@ -97,6 +118,7 @@ sc_gui_update_toolbar(); sc_gui_update_menu(); + populate_dict_combo(combo); if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) { @@ -151,7 +173,7 @@ sc_speller_init(); sc_gui_create_edit_menu(); - sc_gui_create_menu(sc_info->menu_item); + sc_gui_update_menu(); gtk_widget_show_all(sc_info->menu_item); sc_info->signal_id = g_signal_connect(geany->main_widgets->window, @@ -207,7 +229,6 @@ #ifdef HAVE_ENCHANT_1_5 GtkWidget *entry_dir, *hbox, *button, *image; #endif - guint i; vbox = gtk_vbox_new(FALSE, 6); @@ -229,18 +250,8 @@ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 3); combo = gtk_combo_box_new_text(); + populate_dict_combo(GTK_COMBO_BOX(combo)); - for (i = 0; i < sc_info->dicts->len; i++) - { - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), g_ptr_array_index(sc_info->dicts, i)); - - if (utils_str_equal(g_ptr_array_index(sc_info->dicts, i), sc_info->default_language)) - gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i); - } - /* if the default language couldn't be selected, select the first available language */ - if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == -1) - gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0); - if (sc_info->dicts->len > 20) gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 3); else if (sc_info->dicts->len > 10) @@ -253,6 +264,7 @@ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); entry_dir = gtk_entry_new(); + ui_entry_add_clear_icon(GTK_ENTRY(entry_dir)); gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry_dir); ui_widget_set_tooltip_text(entry_dir, _("Read additional dictionary files from this directory. " @@ -308,14 +320,6 @@ void plugin_cleanup(void) { - guint i; - - for (i = 0; i < sc_info->dicts->len; i++) - { - g_free(g_ptr_array_index(sc_info->dicts, i)); - } - g_ptr_array_free(sc_info->dicts, TRUE); - g_signal_handler_disconnect(geany->main_widgets->window, sc_info->signal_id); gtk_widget_destroy(sc_info->edit_menu); Modified: trunk/geany-plugins/spellcheck/src/scplugin.h =================================================================== --- trunk/geany-plugins/spellcheck/src/scplugin.h 2009-09-30 19:16:56 UTC (rev 968) +++ trunk/geany-plugins/spellcheck/src/scplugin.h 2009-09-30 19:26:03 UTC (rev 969) @@ -38,6 +38,7 @@ gboolean show_toolbar_item; gulong signal_id; GPtrArray *dicts; + GtkWidget *main_menu; GtkWidget *menu_item; GtkWidget *submenu_item_default; GtkWidget *edit_menu; Modified: trunk/geany-plugins/spellcheck/src/speller.c =================================================================== --- trunk/geany-plugins/spellcheck/src/speller.c 2009-09-30 19:16:56 UTC (rev 968) +++ trunk/geany-plugins/spellcheck/src/speller.c 2009-09-30 19:26:03 UTC (rev 969) @@ -242,42 +242,6 @@ } -void sc_speller_reinit_enchant_dict(void) -{ - gchar *lang = sc_info->default_language; - - /* Release a previous dict object */ - if (sc_speller_dict != NULL) - enchant_broker_free_dict(sc_speller_broker, sc_speller_dict); - - /* Check if the stored default dictionary is (still) avaiable, fall back to the first - * one in the list if not */ - if (! check_default_lang()) - { - if (sc_info->dicts->len > 0) - { - lang = g_ptr_array_index(sc_info->dicts, 0); - g_warning("Stored language ('%s') could not be loaded. Falling back to '%s'", - sc_info->default_language, lang); - } - else - g_warning("Stored language ('%s') could not be loaded.", sc_info->default_language); - } - - /* Request new dict object */ - sc_speller_dict = enchant_broker_request_dict(sc_speller_broker, lang); - if (sc_speller_dict == NULL) - { - broker_init_failed(); - gtk_widget_set_sensitive(sc_info->menu_item, FALSE); - } - else - { - gtk_widget_set_sensitive(sc_info->menu_item, TRUE); - } -} - - gchar *sc_speller_get_default_lang(void) { const gchar *lang = g_getenv("LANG"); @@ -333,8 +297,24 @@ } +static void sc_speller_dicts_free(void) +{ + guint i; + if (sc_info->dicts != NULL) + { + for (i = 0; i < sc_info->dicts->len; i++) + { + g_free(g_ptr_array_index(sc_info->dicts, i)); + } + g_ptr_array_free(sc_info->dicts, TRUE); + } +} + + static void create_dicts_array(void) { + sc_speller_dicts_free(); + sc_info->dicts = g_ptr_array_new(); enchant_broker_list_dicts(sc_speller_broker, add_dict_array, sc_info->dicts); @@ -396,35 +376,73 @@ } -void sc_speller_init(void) +void sc_speller_reinit_enchant_dict(void) { - sc_speller_broker = enchant_broker_init(); + gchar *lang = sc_info->default_language; + + /* Release a previous dict object */ + if (sc_speller_dict != NULL) + enchant_broker_free_dict(sc_speller_broker, sc_speller_dict); + #if HAVE_ENCHANT_1_5 { const gchar *old_path; - gchar *new_path, *dict_dir; + gchar *new_path; /* add custom dictionary path for myspell (primarily used on Windows) */ - dict_dir = sc_info->dictionary_dir; old_path = enchant_broker_get_param(sc_speller_broker, "enchant.myspell.dictionary.path"); if (old_path != NULL) - new_path = g_strconcat(old_path, G_SEARCHPATH_SEPARATOR_S, dict_dir, NULL); + new_path = g_strconcat( + old_path, G_SEARCHPATH_SEPARATOR_S, sc_info->dictionary_dir, NULL); else - new_path = dict_dir; + new_path = sc_info->dictionary_dir; enchant_broker_set_param(sc_speller_broker, "enchant.myspell.dictionary.path", new_path); - if (new_path != dict_dir) + if (new_path != sc_info->dictionary_dir) g_free(new_path); } #endif create_dicts_array(); + /* Check if the stored default dictionary is (still) avaiable, fall back to the first + * one in the list if not */ + if (! check_default_lang()) + { + if (sc_info->dicts->len > 0) + { + lang = g_ptr_array_index(sc_info->dicts, 0); + g_warning("Stored language ('%s') could not be loaded. Falling back to '%s'", + sc_info->default_language, lang); + } + else + g_warning("Stored language ('%s') could not be loaded.", sc_info->default_language); + } + + /* Request new dict object */ + sc_speller_dict = enchant_broker_request_dict(sc_speller_broker, lang); + if (sc_speller_dict == NULL) + { + broker_init_failed(); + gtk_widget_set_sensitive(sc_info->menu_item, FALSE); + } + else + { + gtk_widget_set_sensitive(sc_info->menu_item, TRUE); + } +} + + +void sc_speller_init(void) +{ + sc_speller_broker = enchant_broker_init(); + sc_speller_reinit_enchant_dict(); } void sc_speller_free(void) { + sc_speller_dicts_free(); if (sc_speller_dict != NULL) enchant_broker_free_dict(sc_speller_broker, sc_speller_dict); enchant_broker_free(sc_speller_broker); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[968] branches/geany-plugins/geany-plugins-0.18/ wscript
by eht16＠users.sourceforge.net 30 Sep '09

30 Sep '09

Revision: 968 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=968&view=rev Author: eht16 Date: 2009-09-30 19:16:56 +0000 (Wed, 30 Sep 2009) Log Message: ----------- We need the dot for proper building (e.g. on Windows). Modified Paths: -------------- branches/geany-plugins/geany-plugins-0.18/wscript Modified: branches/geany-plugins/geany-plugins-0.18/wscript =================================================================== --- branches/geany-plugins/geany-plugins-0.18/wscript 2009-09-30 19:15:29 UTC (rev 967) +++ branches/geany-plugins/geany-plugins-0.18/wscript 2009-09-30 19:16:56 UTC (rev 968) @@ -343,7 +343,7 @@ bld.new_task_gen( features = 'cc cshlib', source = lua_sources, - includes = p.includes, + includes = '. %s' % p.includes, target = 'libgeanylua', uselib = libs, install_path = '${G_PREFIX}/lib/geany-plugins/geanylua' if is_win32 @@ -366,7 +366,7 @@ bld.new_task_gen( features = 'cc cprogram', source = [ 'geanygdb/src/ttyhelper.c' ], - includes = p.includes, + includes = '. %s' % p.includes, target = 'ttyhelper', uselib = libs, install_path = '${LIBDIR}/geany' @@ -402,7 +402,7 @@ t = bld.new_task_gen( features = 'cc cshlib', source = p.sources, - includes = p.includes, + includes = '. %s' % p.includes, target = p.name, uselib = libs, install_path = '${G_PREFIX}/lib' if is_win32 else '${LIBDIR}/geany/' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[967] trunk/geany-plugins/wscript
by eht16＠users.sourceforge.net 30 Sep '09

30 Sep '09

Revision: 967 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=967&view=rev Author: eht16 Date: 2009-09-30 19:15:29 +0000 (Wed, 30 Sep 2009) Log Message: ----------- We need the dot for proper building (e.g. on Windows). Modified Paths: -------------- trunk/geany-plugins/wscript Modified: trunk/geany-plugins/wscript =================================================================== --- trunk/geany-plugins/wscript 2009-09-30 19:14:01 UTC (rev 966) +++ trunk/geany-plugins/wscript 2009-09-30 19:15:29 UTC (rev 967) @@ -366,7 +366,7 @@ bld.new_task_gen( features = 'cc cshlib', source = lua_sources, - includes = p.includes, + includes = '. %s' % p.includes, target = 'libgeanylua', uselib = libs, install_path = '${G_PREFIX}/lib/geany-plugins/geanylua' if is_win32 @@ -389,7 +389,7 @@ bld.new_task_gen( features = 'cc cprogram', source = [ 'geanygdb/src/ttyhelper.c' ], - includes = p.includes, + includes = '. %s' % p.includes, target = 'ttyhelper', uselib = libs, install_path = '${TTYHELPERDIR}' @@ -425,7 +425,7 @@ t = bld.new_task_gen( features = 'cc cshlib', source = p.sources, - includes = p.includes, + includes = '. %s' % p.includes, target = p.name, uselib = libs, install_path = '${G_PREFIX}/lib' if is_win32 else '${LIBDIR}/geany/' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[966] branches/geany-plugins/geany-plugins-0.18/ configure.ac
by eht16＠users.sourceforge.net 30 Sep '09

30 Sep '09

Revision: 966 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=966&view=rev Author: eht16 Date: 2009-09-30 19:14:01 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Fix version number Modified Paths: -------------- branches/geany-plugins/geany-plugins-0.18/configure.ac Modified: branches/geany-plugins/geany-plugins-0.18/configure.ac =================================================================== --- branches/geany-plugins/geany-plugins-0.18/configure.ac 2009-09-30 16:06:54 UTC (rev 965) +++ branches/geany-plugins/geany-plugins-0.18/configure.ac 2009-09-30 19:14:01 UTC (rev 966) @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) -AC_INIT([geany-plugins], [0.17.1]) +AC_INIT([geany-plugins], [0.18]) AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[965] trunk/geanylatex/wscript
by frlan＠users.sourceforge.net 30 Sep '09

30 Sep '09

Revision: 965 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=965&view=rev Author: frlan Date: 2009-09-30 16:06:54 +0000 (Wed, 30 Sep 2009) Log Message: ----------- GeanyLaTeX: Update waf to only install *.html, css, pdf and images as documentation Modified Paths: -------------- trunk/geanylatex/wscript Modified: trunk/geanylatex/wscript =================================================================== --- trunk/geanylatex/wscript 2009-09-30 15:43:23 UTC (rev 964) +++ trunk/geanylatex/wscript 2009-09-30 16:06:54 UTC (rev 965) @@ -252,7 +252,10 @@ if os.path.exists(file): bld.install_as( '%s/%s%s' % (docdir, uc_first(file, is_win32), ext), file) - bld.install_files('%s' % docdir, 'doc/geanylatex.*') + bld.install_files('%s' % docdir, 'doc/geanylatex.tex') + bld.install_files('%s' % docdir, 'doc/*.html') + bld.install_files('%s' % docdir, 'doc/geanylatex.css') + bld.install_files('%s' % docdir, 'doc/geanylatex.pdf') bld.install_files('%s/img' % docdir, 'doc/img/*.png') bld.new_task_gen( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[964] trunk/geany-plugins
by frlan＠users.sourceforge.net 30 Sep '09

30 Sep '09

Revision: 964 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=964&view=rev Author: frlan Date: 2009-09-30 15:43:23 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Update version number to 0.19 and set Geany dependency also to 0.19 as some of the plugins already require current devel version of Geany Modified Paths: -------------- trunk/geany-plugins/configure.ac trunk/geany-plugins/wscript Modified: trunk/geany-plugins/configure.ac =================================================================== --- trunk/geany-plugins/configure.ac 2009-09-29 19:09:33 UTC (rev 963) +++ trunk/geany-plugins/configure.ac 2009-09-30 15:43:23 UTC (rev 964) @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) -AC_INIT([geany-plugins], [0.17.1]) +AC_INIT([geany-plugins], [0.19]) AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -17,7 +17,7 @@ GP_I18N dnl common checks -GP_CHECK_GEANY(0.18) +GP_CHECK_GEANY(0.19) GP_CHECK_UNITTESTS(0.9.4) dnl plugin checks Modified: trunk/geany-plugins/wscript =================================================================== --- trunk/geany-plugins/wscript 2009-09-29 19:09:33 UTC (rev 963) +++ trunk/geany-plugins/wscript 2009-09-30 15:43:23 UTC (rev 964) @@ -51,7 +51,7 @@ APPNAME = 'geany-plugins' -VERSION = '0.17' +VERSION = '0.19' srcdir = '.' blddir = '_build_' @@ -212,7 +212,7 @@ conf.check_cfg(package='gtk+-2.0', atleast_version='2.8.0', uselib_store='GTK', mandatory=True, args='--cflags --libs') - conf.check_cfg(package='geany', atleast_version='0.17', mandatory=True, args='--cflags --libs') + conf.check_cfg(package='geany', atleast_version='0.19', mandatory=True, args='--cflags --libs') gtk_version = conf.check_cfg(modversion='gtk+-2.0') or 'Unknown' geany_version = conf.check_cfg(modversion='geany') or 'Unknown' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 30 Sep '09

30 Sep '09

Plugins GTK 2.8 build test failed at: waf build See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details. Error messages: ../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate': ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function) ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.) ... ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.) ../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned ../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0' ../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code Build failed -> task failed (err #1): {task: cc codenavigation.c -> codenavigation_2.o} http://nightly.geany.org/

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits September 2009