Plugins-Commits October 2008

plugins-commits@lists.geany.org

4 participants
67 discussions

SF.net SVN: geany-plugins:[226] trunk/geanyvc/geanyvc.c
by yurand＠users.sourceforge.net 21 Oct '08

21 Oct '08

Revision: 226 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=226&view=rev Author: yurand Date: 2008-10-21 09:12:12 +0000 (Tue, 21 Oct 2008) Log Message: ----------- geanyVC: Reload current document after update. Sometimes geany is unable to detect that current documet was changed after update. I belive that this happend because current document is saved just before update. So it's modification time and modification time after update can be equal. Modified Paths: -------------- trunk/geanyvc/geanyvc.c Modified: trunk/geanyvc/geanyvc.c =================================================================== --- trunk/geanyvc/geanyvc.c 2008-10-21 09:10:58 UTC (rev 225) +++ trunk/geanyvc/geanyvc.c 2008-10-21 09:12:12 UTC (rev 226) @@ -937,6 +937,8 @@ set_add_confirmation); if (ret) { + p_document->reload_file(doc, NULL); + if (NZV(text)) show_output(text, "*VC-UPDATE*", NULL); if (text) 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:[225] trunk/geanyvc/geanyvc.c
by yurand＠users.sourceforge.net 21 Oct '08

21 Oct '08

Revision: 225 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=225&view=rev Author: yurand Date: 2008-10-21 09:10:58 +0000 (Tue, 21 Oct 2008) Log Message: ----------- geanyVC: fprintf(stderr, are changed to g_warning Modified Paths: -------------- trunk/geanyvc/geanyvc.c Modified: trunk/geanyvc/geanyvc.c =================================================================== --- trunk/geanyvc/geanyvc.c 2008-10-20 20:06:55 UTC (rev 224) +++ trunk/geanyvc/geanyvc.c 2008-10-21 09:10:58 UTC (rev 225) @@ -443,7 +443,7 @@ } if (error) { - fprintf(stderr, "geanyvc: s_spawn_sync error: %s\n", error->message); + g_warning("geanyvc: s_spawn_sync error: %s", error->message); p_ui->set_statusbar(FALSE, _("geanyvc: s_spawn_sync error: %s"), error->message); g_error_free(error); @@ -525,7 +525,7 @@ } else { - fprintf(stderr, "geanyvc: unknown startdir type: %d\n", vc->commands[cmd].startdir); + g_warning("geanyvc: unknown startdir type: %d", vc->commands[cmd].startdir); } ret = execute_custom_command(dir, vc->commands[cmd].command, vc->commands[cmd].env, std_out, @@ -579,10 +579,9 @@ if (g_rename(localename, new) != 0) { - fprintf(stderr, - _ - ("geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'\n"), - localename, new); + g_warning(_ + ("geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'"), + localename, new); goto end; } @@ -591,10 +590,9 @@ if (g_rename(localename, old) != 0) { - fprintf(stderr, - _ - ("geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'\n"), - localename, old); + g_warning(_ + ("geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'"), + localename, old); g_rename(new, localename); goto end; } @@ -1031,7 +1029,7 @@ } else { - fprintf(stderr, "error: geanyvc: get_commit_diff_foreach: empty diff output\n"); + g_warning("error: geanyvc: get_commit_diff_foreach: empty diff output"); } g_free(filename); return FALSE; 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:[216] trunk/geanyvc/po
by frlan＠users.sourceforge.net 20 Oct '08

20 Oct '08

Revision: 216 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=216&view=rev Author: frlan Date: 2008-10-20 18:36:56 +0000 (Mon, 20 Oct 2008) Log Message: ----------- geanyVC: Update of German translation Modified Paths: -------------- trunk/geanyvc/po/ChangeLog trunk/geanyvc/po/de.po Modified: trunk/geanyvc/po/ChangeLog =================================================================== --- trunk/geanyvc/po/ChangeLog 2008-10-20 10:22:30 UTC (rev 215) +++ trunk/geanyvc/po/ChangeLog 2008-10-20 18:36:56 UTC (rev 216) @@ -1,3 +1,8 @@ +2008-10-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Update of Gemran translation. + + 2008-09-01 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po, LINGUAS: Added a patch of Enrico that added a German Modified: trunk/geanyvc/po/de.po =================================================================== --- trunk/geanyvc/po/de.po 2008-10-20 10:22:30 UTC (rev 215) +++ trunk/geanyvc/po/de.po 2008-10-20 18:36:56 UTC (rev 216) @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: geanyvc 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-01 14:09+0200\n" -"PO-Revision-Date: 2008-09-01 14:59+0100\n" -"Last-Translator: Enrico Tröger <enrico.troeger(a)uvena.de>\n" +"POT-Creation-Date: 2008-10-20 20:17+0200\n" +"PO-Revision-Date: 2008-10-20 20:32+0100\n" +"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -19,254 +19,290 @@ "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Language: German\n" -#: ../geanyvc.c:60 +#: ../geanyvc.c:63 msgid "VC" msgstr "VC" -#: ../geanyvc.c:60 +#: ../geanyvc.c:63 msgid "Interface to different Version Control systems." msgstr "Oberfläche für verschiedene Versionskontrollsysteme." -#: ../geanyvc.c:61 +#: ../geanyvc.c:64 msgid "" "Yura Siamashka <yurand2(a)gmail.com>,\n" "Frank Lanitz <frank(a)frank.uvena.de>" -msgstr "Yura Siamashka <yurand2(a)gmail.com>, Frank Lanitz <frank(a)frank.uvena.de>" +msgstr "" +"Yura Siamashka <yurand2(a)gmail.com>, Frank Lanitz <frank(a)frank.uvena.de>" -#: ../geanyvc.c:363 +#: ../geanyvc.c:387 msgid "Could not parse the output of command" -msgstr "Kann die Ausgabe von des Befehls nicht einlesen." +msgstr "Kann die Ausgabe des Befehls nicht einlesen." -#: ../geanyvc.c:431 +#: ../geanyvc.c:447 #, c-format msgid "geanyvc: s_spawn_sync error: %s" msgstr "geanyvc: s_spawn_sync error: %s" -#: ../geanyvc.c:550 -#: ../geanyvc.c:562 +#: ../geanyvc.c:584 ../geanyvc.c:596 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'\n" msgstr "geanyvc: vcdiff_file_activated: Kann »%s« nicht in »%s« umbenennen.\n" -#: ../geanyvc.c:588 -#: ../geanyvc.c:623 -#: ../geanyvc.c:664 +#: ../geanyvc.c:622 ../geanyvc.c:657 ../geanyvc.c:701 msgid "No changes were made." msgstr "Es wurden keine Änderungen vorgenommen." -#: ../geanyvc.c:689 +#: ../geanyvc.c:727 msgid "No history avaible" msgstr "Keine Historie verfügbar" -#: ../geanyvc.c:855 +#: ../geanyvc.c:892 #, c-format -msgid "Do you really want to revert: %s" +msgid "Do you really want to revert: %s?" msgstr "Möchten Sie wirklich »%s« zurücksetzen?" -#: ../geanyvc.c:867 +#: ../geanyvc.c:904 #, c-format -msgid "Do you really want to add: %s" +msgid "Do you really want to add: %s?" msgstr "Möchten Sie wirklich »%s« hinzufügen?" -#: ../geanyvc.c:876 +#: ../geanyvc.c:913 #, c-format -msgid "Do you really want to remove: %s" +msgid "Do you really want to remove: %s?" msgstr "Möchten Sie wirklich »%s« entfernen?" -#: ../geanyvc.c:1154 +#: ../geanyvc.c:938 +msgid "Do you really want to update?" +msgstr "Möchten Sie wirklich »%s« aktualisieren?" + +#: ../geanyvc.c:1218 msgid "Commit" msgstr "Commit" -#: ../geanyvc.c:1225 +#: ../geanyvc.c:1289 msgid "<b>Commit message:</b>" msgstr "<b>Commitnachricht:</b>" #. Commit -#: ../geanyvc.c:1238 -#: ../geanyvc.c:1914 +#: ../geanyvc.c:1302 ../geanyvc.c:2010 msgid "_Commit" msgstr "_Commit" -#: ../geanyvc.c:1308 +#: ../geanyvc.c:1372 msgid "Nothing to commit." msgstr "Nichts zum Committen." -#: ../geanyvc.c:1354 +#: ../geanyvc.c:1418 #, c-format msgid "Error initializing spell checking: %s" msgstr "Fehler beim Initialisieren der Rechtschreibprüfung: %s" -#: ../geanyvc.c:1366 +#: ../geanyvc.c:1430 #, c-format -msgid "Error while setting up language for spellchecking. Please check configuration. Error message was: %s" -msgstr "Fehler beim Auswählen der Sprache für die Rechtschreibprüfung. Bitte überprüfen Sie Ihre Konfiguration. Fehlermeldung: %s" +msgid "" +"Error while setting up language for spellchecking. Please check " +"configuration. Error message was: %s" +msgstr "" +"Fehler beim Auswählen der Sprache für die Rechtschreibprüfung. Bitte " +"überprüfen Sie Ihre Konfiguration. Fehlermeldung: %s" -#: ../geanyvc.c:1538 +#: ../geanyvc.c:1598 msgid "Plugin configuration directory could not be created." msgstr "Plugin-Konfigurationsverzeichnis konnte nicht erstellt werden." -#: ../geanyvc.c:1571 +#: ../geanyvc.c:1631 msgid "Set Changed-flag for document tabs created by the plugin" -msgstr "" +msgstr "Markiere die Dokumente der Pluginausgabe als geändert" -#: ../geanyvc.c:1574 -msgid "If this option is activated, every new by the VC-plugin created document tab will be marked as changed. Even this option is useful in some cases, it could cause a big number of annoying \"Do you want to save\"-dialogs." +#: ../geanyvc.c:1634 +msgid "" +"If this option is activated, every new by the VC-plugin created document tab " +"will be marked as changed. Even this option is useful in some cases, it " +"could cause a big number of annoying \"Do you want to save\"-dialogs." msgstr "" +"Wenn diese Option aktiviert ist, werden alle Dokumente die durch das Plugin " +"erzeugt werden als geändert markiert, so dass z.B. beim Schließen der Datei " +"der speichern Dialog geöffnet wird. Auch wenn diese Option von Zeit zu Zeit " +"sehr nützlich sein kann, kann Sie ab und an einfach nur stören." -#: ../geanyvc.c:1582 +#: ../geanyvc.c:1642 msgid "Confirm adding new files to a VCS" -msgstr "Hinzufügen von Dateien zu einem VCS immer bestätigen" +msgstr "Hinzufügen von Dateien zur Versionsverwaltung immer bestätigen" -#: ../geanyvc.c:1585 +#: ../geanyvc.c:1645 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." -msgstr "Zeigt einen Bestätigungsdialog wenn Dateien zu einem Versionskontrollsystem hinzugefügt werden sollen." +msgstr "" +"Zeigt einen Bestätigungsdialog wenn Dateien zu einem Versionskontrollsystem " +"hinzugefügt werden sollen." -#: ../geanyvc.c:1592 +#: ../geanyvc.c:1652 msgid "Maximize commit dialog" msgstr "Commit-Dialog maximieren" -#: ../geanyvc.c:1593 +#: ../geanyvc.c:1653 msgid "Show commit dialog maximize." msgstr "Commit-Dialog beim Anzeigen maximieren" -#: ../geanyvc.c:1600 +#: ../geanyvc.c:1660 msgid "Use external diff viewer" msgstr "Externes Diff-Programm benutzen" -#: ../geanyvc.c:1602 +#: ../geanyvc.c:1662 msgid "Use external diff viewer for file diff." msgstr "Externes Diff-Programm benutzen zum Vergleich von zwei Dateien." -#: ../geanyvc.c:1608 +#: ../geanyvc.c:1668 msgid "Enable CVS" msgstr "CVS aktivieren" -#: ../geanyvc.c:1613 +#: ../geanyvc.c:1673 msgid "Enable GIT" msgstr "GIT aktivieren" -#: ../geanyvc.c:1618 +#: ../geanyvc.c:1678 msgid "Enable SVN" msgstr "SVN aktivieren" -#: ../geanyvc.c:1623 +#: ../geanyvc.c:1683 msgid "Enable SVK" msgstr "SVK aktivieren" -#: ../geanyvc.c:1628 +#: ../geanyvc.c:1688 msgid "Enable Bazaar" msgstr "Bazaar aktivieren" -#: ../geanyvc.c:1633 +#: ../geanyvc.c:1693 msgid "Enable Mercurial" msgstr "Mercurial aktivieren" -#: ../geanyvc.c:1639 +#: ../geanyvc.c:1699 msgid "Spellcheck language" msgstr "Sprache" -#: ../geanyvc.c:1798 +#: ../geanyvc.c:1886 msgid "_VC" msgstr "_VC" #. Single file -#: ../geanyvc.c:1807 +#: ../geanyvc.c:1895 msgid "Diff From Current File" msgstr "Diff von der aktuellen Datei" -#: ../geanyvc.c:1810 +#: ../geanyvc.c:1898 msgid "Make a diff from the current active file" msgstr "Erstellt ein Diff für die aktuelle Datei." #. Directory -#: ../geanyvc.c:1816 +#: ../geanyvc.c:1904 msgid "Diff From Current Directory" msgstr "Diff vom aktuellen Verzeichnis" -#: ../geanyvc.c:1819 +#: ../geanyvc.c:1907 msgid "Make a diff from the directory of the current active file" msgstr "Erstellt ein Diff für das Verzeichnis der aktuellen Datei." -#. Project -#: ../geanyvc.c:1825 -msgid "Diff From Current Project" -msgstr "Diff vom aktuellen Projekt" +#. Base directory +#: ../geanyvc.c:1913 +msgid "Diff From Base Directory" +msgstr "Diff vom aktuellen Grundverzeichnis" -#: ../geanyvc.c:1828 -msgid "Make a diff from the current project's base path" -msgstr "Erstellt ein Diff für das aktuell geöffnete Projekt." +#: ../geanyvc.c:1916 +msgid "Make a diff from the top VC directory" +msgstr "Erstellt ein Diff für die gesamte Arbeitskopie" #. Blame for current file -#: ../geanyvc.c:1836 +#: ../geanyvc.c:1924 msgid "Blame From Current File" msgstr "Blame von aktueller Datei" -#: ../geanyvc.c:1839 +#: ../geanyvc.c:1927 msgid "Shows the changes made at one file per revision and author." -msgstr "" +msgstr "Zeigt alle Änderungen einer Datei nach Autor und Revision." #. Log -#: ../geanyvc.c:1847 +#: ../geanyvc.c:1935 msgid "Log Of Current File" msgstr "Historie der aktuellen Datei" -#: ../geanyvc.c:1850 +#: ../geanyvc.c:1938 msgid "Shows the log of the current file" msgstr "Zeigt die Versionshistorie der aktuellen Datei an." -#: ../geanyvc.c:1855 +#: ../geanyvc.c:1943 msgid "Log Of Current Directory" msgstr "Historie vom aktuellen Verzeichnis" -#: ../geanyvc.c:1858 +#: ../geanyvc.c:1946 msgid "Shows the log of the current directory" msgstr "Zeigt die Versionshistorie für das aktuelle Verzeichnis." -#: ../geanyvc.c:1863 -msgid "Log Of Current Project" -msgstr "Historie vom aktuellen Projekt" +#: ../geanyvc.c:1951 +msgid "Log Of Base Directory" +msgstr "Versionsgeschichte vom aktuellen Grundverzeichnis" -#: ../geanyvc.c:1866 -msgid "Shows the log of the current project" -msgstr "Zeigt die Versionshistorie vom aktuellen Projekt." +#: ../geanyvc.c:1954 +msgid "Shows the log of the top VC directory" +msgstr "Zeigt die Versionsgeschichte für die gesamte Arbeitskopie" #. Status -#: ../geanyvc.c:1874 +#: ../geanyvc.c:1962 msgid "_Status" msgstr "_Status" -#: ../geanyvc.c:1876 +#: ../geanyvc.c:1964 msgid "Show status." msgstr "Zeigt den Status der Arbeitskopie." #. Revert file -#: ../geanyvc.c:1884 +#: ../geanyvc.c:1972 msgid "_Revert File" msgstr "Datei-Änderungen _verwerfen" -#: ../geanyvc.c:1887 +#: ../geanyvc.c:1975 msgid "Restore pristine working copy file (undo local edits)." -msgstr "Stellt den ursprünglichen Zustand der Datei wieder her (verwirft lokale Änderungen)." +msgstr "" +"Stellt den ursprünglichen Zustand der Datei wieder her (verwirft lokale " +"Änderungen)." #. Add file -#: ../geanyvc.c:1895 +#: ../geanyvc.c:1983 msgid "_Add File" msgstr "Datei _hinzufügen" -#: ../geanyvc.c:1897 +#: ../geanyvc.c:1985 msgid "Add file to repository." msgstr "Fügt eine Datei zum Repositorium _hinzu." #. Remove file -#: ../geanyvc.c:1903 +#: ../geanyvc.c:1991 msgid "Remove File" msgstr "Datei entfernen" -#: ../geanyvc.c:1906 +#: ../geanyvc.c:1994 msgid "Remove file from repository." msgstr "Entfernt eine Datei aus dem Repositorium." -#: ../geanyvc.c:1916 +#. Update +#: ../geanyvc.c:2002 +msgid "Update" +msgstr "Aktualisieren" + +#: ../geanyvc.c:2004 +msgid "Update from remote repositary." +msgstr "Aus dem Repository aktualisieren" + +#: ../geanyvc.c:2012 msgid "Commit changes." msgstr "Änderungen committen." +#~ msgid "Diff From Current Project" +#~ msgstr "Diff vom aktuellen Projekt" + +#~ msgid "Make a diff from the current project's base path" +#~ msgstr "Erstellt ein Diff für das aktuell geöffnete Projekt." + +#~ msgid "Log Of Current Project" +#~ msgstr "Historie vom aktuellen Projekt" + +#~ msgid "Shows the log of the current project" +#~ msgstr "Zeigt die Versionshistorie vom aktuellen Projekt." 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:[215] trunk/geanyvc/geanyvc.c
by yurand＠users.sourceforge.net 20 Oct '08

20 Oct '08

Revision: 215 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=215&view=rev Author: yurand Date: 2008-10-20 10:22:30 +0000 (Mon, 20 Oct 2008) Log Message: ----------- VC: removed debug printf Modified Paths: -------------- trunk/geanyvc/geanyvc.c Modified: trunk/geanyvc/geanyvc.c =================================================================== --- trunk/geanyvc/geanyvc.c 2008-10-20 10:20:44 UTC (rev 214) +++ trunk/geanyvc/geanyvc.c 2008-10-20 10:22:30 UTC (rev 215) @@ -412,7 +412,6 @@ GSList *cur; GSList *largv = get_cmd(argv, dir, filename, list, message); GError *error = NULL; - printf("%s\n", __FUNCTION__); if (std_out) *std_out = NULL; 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:[214] trunk/geanyvc
by yurand＠users.sourceforge.net 20 Oct '08

20 Oct '08

Revision: 214 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=214&view=rev Author: yurand Date: 2008-10-20 10:20:44 +0000 (Mon, 20 Oct 2008) Log Message: ----------- VC: Added update command Modified Paths: -------------- trunk/geanyvc/geanyvc.c trunk/geanyvc/geanyvc.h trunk/geanyvc/vc_bzr.c trunk/geanyvc/vc_cvs.c trunk/geanyvc/vc_git.c trunk/geanyvc/vc_hg.c trunk/geanyvc/vc_svk.c trunk/geanyvc/vc_svn.c Modified: trunk/geanyvc/geanyvc.c =================================================================== --- trunk/geanyvc/geanyvc.c 2008-10-17 15:39:57 UTC (rev 213) +++ trunk/geanyvc/geanyvc.c 2008-10-20 10:20:44 UTC (rev 214) @@ -838,10 +838,8 @@ } static gboolean -command_with_question_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata, - gint cmd, const gchar * question, gboolean ask) +command_with_question_activated(gchar ** text, gint cmd, const gchar * question, gboolean ask) { - gchar *text; GtkWidget *dialog; gint result; gchar *dir; @@ -876,18 +874,14 @@ vc = find_vc(dir); g_return_val_if_fail(vc, FALSE); - execute_command(vc, &text, NULL, doc->file_name, cmd, NULL, NULL); - if (text) - { - g_free(text); - } + execute_command(vc, text, NULL, doc->file_name, cmd, NULL, NULL); g_free(dir); } return (result == GTK_RESPONSE_YES) ? TRUE : FALSE; } static void -vcrevert_activated(GtkMenuItem * menuitem, gpointer gdata) +vcrevert_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) { gboolean ret; GeanyDocument *doc; @@ -895,8 +889,8 @@ doc = p_document->get_current(); g_return_if_fail(doc != NULL && doc->file_name != NULL); - ret = command_with_question_activated(menuitem, gdata, VC_COMMAND_REVERT_FILE, - _("Do you really want to revert: %s"), TRUE); + ret = command_with_question_activated(NULL, VC_COMMAND_REVERT_FILE, + _("Do you really want to revert: %s?"), TRUE); if (ret) { p_document->reload_file(doc, NULL); @@ -905,19 +899,19 @@ static void -vcadd_activated(GtkMenuItem * menuitem, gpointer gdata) +vcadd_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) { - command_with_question_activated(menuitem, gdata, VC_COMMAND_ADD, - _("Do you really want to add: %s"), set_add_confirmation); + command_with_question_activated(NULL, VC_COMMAND_ADD, + _("Do you really want to add: %s?"), set_add_confirmation); } static void -vcremove_activated(GtkMenuItem * menuitem, gpointer gdata) +vcremove_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) { gboolean ret; - ret = command_with_question_activated(menuitem, gdata, VC_COMMAND_REMOVE, - _("Do you really want to remove: %s"), TRUE); + ret = command_with_question_activated(NULL, VC_COMMAND_REMOVE, + _("Do you really want to remove: %s?"), TRUE); if (ret) { p_document-> @@ -926,6 +920,33 @@ } } +static void +vcupdate_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + gchar *text = NULL; + GeanyDocument *doc; + gboolean ret; + + doc = p_document->get_current(); + g_return_if_fail(doc != NULL && doc->file_name != NULL); + + if (doc->changed) + { + p_document->save_file(doc, FALSE); + } + + ret = command_with_question_activated(&text, VC_COMMAND_UPDATE, + _("Do you really want to update?"), + set_add_confirmation); + if (ret) + { + if (NZV(text)) + show_output(text, "*VC-UPDATE*", NULL); + if (text) + g_free(text); + } +} + enum { COLUMN_COMMIT, @@ -1452,6 +1473,7 @@ static GtkWidget *menu_vc_revert_file = NULL; static GtkWidget *menu_vc_add_file = NULL; static GtkWidget *menu_vc_remove_file = NULL; +static GtkWidget *menu_vc_update = NULL; static GtkWidget *menu_vc_commit = NULL; static void @@ -1496,6 +1518,7 @@ gtk_widget_set_sensitive(menu_vc_remove_file, f_have_vc); gtk_widget_set_sensitive(menu_vc_add_file, d_have_vc && !f_have_vc); + gtk_widget_set_sensitive(menu_vc_update, d_have_vc); gtk_widget_set_sensitive(menu_vc_commit, d_have_vc); } @@ -1976,6 +1999,14 @@ gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new()); + // Update + menu_vc_update = gtk_menu_item_new_with_mnemonic(_("Update")); + gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_update); + gtk_tooltips_set_tip(tooltips, menu_vc_update, _("Update from remote repositary."), NULL); + + g_signal_connect((gpointer) menu_vc_update, "activate", + G_CALLBACK(vcupdate_activated), NULL); + // Commit menu_vc_commit = gtk_menu_item_new_with_mnemonic(_("_Commit")); gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_commit); Modified: trunk/geanyvc/geanyvc.h =================================================================== --- trunk/geanyvc/geanyvc.h 2008-10-17 15:39:57 UTC (rev 213) +++ trunk/geanyvc/geanyvc.h 2008-10-20 10:20:44 UTC (rev 214) @@ -35,6 +35,7 @@ VC_COMMAND_COMMIT, VC_COMMAND_BLAME, VC_COMMAND_SHOW, + VC_COMMAND_UPDATE, VC_COMMAND_COUNT }; Modified: trunk/geanyvc/vc_bzr.c =================================================================== --- trunk/geanyvc/vc_bzr.c 2008-10-17 15:39:57 UTC (rev 213) +++ trunk/geanyvc/vc_bzr.c 2008-10-20 10:20:44 UTC (rev 214) @@ -45,6 +45,7 @@ static const gchar *BZR_CMD_COMMIT[] = { "bzr", "commit", "-m", MESSAGE, FILE_LIST, NULL }; static const gchar *BZR_CMD_BLAME[] = { "bzr", "blame", "--all", "--long", BASENAME, NULL }; static const gchar *BZR_CMD_SHOW[] = { "bzr", "cat", BASENAME, NULL }; +static const gchar *BZR_CMD_UPDATE[] = { "bzr", "pull", NULL }; static const VC_COMMAND commands[] = { { @@ -101,6 +102,11 @@ .startdir = VC_COMMAND_STARTDIR_FILE, .command = BZR_CMD_SHOW, .env = NULL, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_BASE, + .command = BZR_CMD_UPDATE, + .env = NULL, .function = NULL} }; Modified: trunk/geanyvc/vc_cvs.c =================================================================== --- trunk/geanyvc/vc_cvs.c 2008-10-17 15:39:57 UTC (rev 213) +++ trunk/geanyvc/vc_cvs.c 2008-10-20 10:20:44 UTC (rev 214) @@ -42,6 +42,7 @@ static const gchar *CVS_CMD_COMMIT[] = { "cvs", NULL }; static const gchar *CVS_CMD_BLAME[] = { "cvs", "annotate", BASE_FILENAME, NULL }; static const gchar *CVS_CMD_SHOW[] = { "cvs", NULL }; +static const gchar *CVS_CMD_UPDATE[] = { "cvs", "up", "-d", NULL }; static const VC_COMMAND commands[] = { { @@ -98,6 +99,11 @@ .startdir = VC_COMMAND_STARTDIR_FILE, .command = CVS_CMD_SHOW, .env = NULL, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_BASE, + .command = CVS_CMD_UPDATE, + .env = NULL, .function = NULL} }; Modified: trunk/geanyvc/vc_git.c =================================================================== --- trunk/geanyvc/vc_git.c 2008-10-17 15:39:57 UTC (rev 213) +++ trunk/geanyvc/vc_git.c 2008-10-20 10:20:44 UTC (rev 214) @@ -98,6 +98,7 @@ static const gchar *GIT_CMD_LOG_FILE[] = { "git", "log", "--", BASENAME, NULL }; static const gchar *GIT_CMD_LOG_DIR[] = { "git", "log", NULL }; static const gchar *GIT_CMD_BLAME[] = { "git", "blame", "--", BASENAME, NULL }; +static const gchar *GIT_CMD_UPDATE[] = { "git", "pull", NULL }; static const gchar *GIT_ENV_DIFF_FILE[] = { "PAGER=cat", NULL }; static const gchar *GIT_ENV_DIFF_DIR[] = { "PAGER=cat", NULL }; @@ -108,6 +109,7 @@ static const gchar *GIT_ENV_LOG_FILE[] = { "PAGER=cat", NULL }; static const gchar *GIT_ENV_LOG_DIR[] = { "PAGER=cat", NULL }; static const gchar *GIT_ENV_BLAME[] = { "PAGER=cat", NULL }; +static const gchar *GIT_ENV_UPDATE[] = { "PAGER=cat", NULL }; static const VC_COMMAND commands[] = { { @@ -164,7 +166,12 @@ .startdir = VC_COMMAND_STARTDIR_FILE, .command = NULL, .env = GIT_ENV_SHOW, - .function = git_show} + .function = git_show}, + { + .startdir = VC_COMMAND_STARTDIR_BASE, + .command = GIT_CMD_UPDATE, + .env = GIT_ENV_UPDATE, + .function = NULL} }; static gboolean Modified: trunk/geanyvc/vc_hg.c =================================================================== --- trunk/geanyvc/vc_hg.c 2008-10-17 15:39:57 UTC (rev 213) +++ trunk/geanyvc/vc_hg.c 2008-10-20 10:20:44 UTC (rev 214) @@ -45,6 +45,7 @@ static const gchar *HG_CMD_COMMIT[] = { "hg", "commit", "-m", MESSAGE, FILE_LIST, NULL }; static const gchar *HG_CMD_BLAME[] = { "hg", "annotate", BASENAME, NULL }; static const gchar *HG_CMD_SHOW[] = { "hg", "cat", BASENAME, NULL }; +static const gchar *HG_CMD_UPDATE[] = { "hg", "pull", CMD_SEPARATOR, "hg", "update", NULL }; static const VC_COMMAND commands[] = { { @@ -101,6 +102,11 @@ .startdir = VC_COMMAND_STARTDIR_FILE, .command = HG_CMD_SHOW, .env = NULL, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_BASE, + .command = HG_CMD_UPDATE, + .env = NULL, .function = NULL} }; Modified: trunk/geanyvc/vc_svk.c =================================================================== --- trunk/geanyvc/vc_svk.c 2008-10-17 15:39:57 UTC (rev 213) +++ trunk/geanyvc/vc_svk.c 2008-10-20 10:20:44 UTC (rev 214) @@ -45,8 +45,8 @@ static const gchar *SVK_CMD_COMMIT[] = { "svk", "commit", "-m", MESSAGE, FILE_LIST, NULL }; static const gchar *SVK_CMD_BLAME[] = { "svk", "blame", BASENAME, NULL }; static const gchar *SVK_CMD_SHOW[] = { "svk", "cat", BASENAME, NULL }; +static const gchar *SVK_CMD_UPDATE[] = { "svk", "up", NULL }; - static const VC_COMMAND commands[] = { { .startdir = VC_COMMAND_STARTDIR_FILE, @@ -102,6 +102,11 @@ .startdir = VC_COMMAND_STARTDIR_FILE, .command = SVK_CMD_SHOW, .env = NULL, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_BASE, + .command = SVK_CMD_UPDATE, + .env = NULL, .function = NULL} }; Modified: trunk/geanyvc/vc_svn.c =================================================================== --- trunk/geanyvc/vc_svn.c 2008-10-17 15:39:57 UTC (rev 213) +++ trunk/geanyvc/vc_svn.c 2008-10-20 10:20:44 UTC (rev 214) @@ -47,6 +47,7 @@ { "svn", "commit", "--non-interactive", "-m", MESSAGE, FILE_LIST, NULL }; static const gchar *SVN_CMD_BLAME[] = { "svn", "blame", BASENAME, NULL }; static const gchar *SVN_CMD_SHOW[] = { "svn", "cat", BASENAME, NULL }; +static const gchar *SVN_CMD_UPDATE[] = { "svn", "up", NULL }; static const VC_COMMAND commands[] = { { @@ -103,6 +104,11 @@ .startdir = VC_COMMAND_STARTDIR_FILE, .command = SVN_CMD_SHOW, .env = NULL, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_BASE, + .command = SVN_CMD_UPDATE, + .env = NULL, .function = NULL} }; 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:[213] trunk/spellcheck
by eht16＠users.sourceforge.net 17 Oct '08

17 Oct '08

Revision: 213 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=213&view=rev Author: eht16 Date: 2008-10-17 15:39:57 +0000 (Fri, 17 Oct 2008) Log Message: ----------- Add some notes about known problems, especially with the Zemberek provider. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/README Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2008-10-17 15:20:12 UTC (rev 212) +++ trunk/spellcheck/ChangeLog 2008-10-17 15:39:57 UTC (rev 213) @@ -4,6 +4,9 @@ src/scplugin.h, src/gui.h, src/speller.h, src/Makefile.am, po/POTFILES.in: Split spellcheck.c into three source files. + * README: + Add some notes about known problems, especially with the + Zemberek provider. 2008-10-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/spellcheck/README =================================================================== --- trunk/spellcheck/README 2008-10-17 15:20:12 UTC (rev 212) +++ trunk/spellcheck/README 2008-10-17 15:39:57 UTC (rev 213) @@ -40,7 +40,7 @@ Get the code from: - svn checkout http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/spellc… + svn checkout http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/spellc… Requirements @@ -56,8 +56,8 @@ from the sources, you should be ready to go. If you used a preprared package e.g. from your distribution you probably need to install an additional package, this might be called geany-dev or geany-devel. -Please note that in order to compile and use this plugin, you need a current SVN -version of Geany, at least SVN >= 2715. +Please note that in order to compile and use this plugin, you need Geany 0.15 +or later. Furthermore you need, of course, a C compiler and the Make tool. The GNU versions of these tools are recommended. @@ -85,6 +85,33 @@ spell check. +Known issues +------------ + * Spell checking with some languages like Hindi might be incorrect, i.e. some + words are incorrectly marked as correctly spelled or marked incorrectly + as misspelled. + * Crashes of Geany when loading the Spell Check plugin after it was unloaded. + This can happen when you are using a dictionary from the Zemberek provider + of Enchant (mostly Turkish dictionaries). + It can also happen when you tried to use a non-existing + dictionary and the Zemberek provider is installed on your system. + To avoid these crashes you have the following options: + + * Do not load the plugin after it was unloaded, restart Geany first + * Do not use any of the dictionaries provided by the Zemberek provider + * Update your Enchant version at least to 1.4.3 (once it is released) + * Uninstall the Zemberek provider + + Background: + These crashes are all related to the Zemberek provider in Enchant. + In version 1.4.2 and prior of Enchant, this provider/backend always + claimed to support any given invalid dictionary name and so it was + active and caused these crashes on load after unload of the plugin. + This provider is DBus-based and uses the GObject type + registration system which is not really capable of being unloaded and + loaded again. + + License ------- spellcheck is distributed under the terms of the GNU General Public License 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:[212] trunk/spellcheck
by eht16＠users.sourceforge.net 17 Oct '08

17 Oct '08

Revision: 212 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=212&view=rev Author: eht16 Date: 2008-10-17 15:20:12 +0000 (Fri, 17 Oct 2008) Log Message: ----------- Split spellcheck.c into three source files. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/po/POTFILES.in trunk/spellcheck/src/Makefile.am Added Paths: ----------- trunk/spellcheck/src/gui.c trunk/spellcheck/src/gui.h trunk/spellcheck/src/scplugin.c trunk/spellcheck/src/scplugin.h trunk/spellcheck/src/speller.c trunk/spellcheck/src/speller.h Removed Paths: ------------- trunk/spellcheck/src/spellcheck.c Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2008-10-16 16:21:41 UTC (rev 211) +++ trunk/spellcheck/ChangeLog 2008-10-17 15:20:12 UTC (rev 212) @@ -1,3 +1,11 @@ +2008-10-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/spellcheck.c, src/scplugin.c, src/gui.c, src/speller.c, + src/scplugin.h, src/gui.h, src/speller.h, src/Makefile.am, + po/POTFILES.in: + Split spellcheck.c into three source files. + + 2008-10-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/spellcheck.c: Modified: trunk/spellcheck/po/POTFILES.in =================================================================== --- trunk/spellcheck/po/POTFILES.in 2008-10-16 16:21:41 UTC (rev 211) +++ trunk/spellcheck/po/POTFILES.in 2008-10-17 15:20:12 UTC (rev 212) @@ -1,3 +1,5 @@ # List of source files containing translatable strings. -src/spellcheck.c +src/scplugin.c +src/gui.c +src/speller.c Modified: trunk/spellcheck/src/Makefile.am =================================================================== --- trunk/spellcheck/src/Makefile.am 2008-10-16 16:21:41 UTC (rev 211) +++ trunk/spellcheck/src/Makefile.am 2008-10-17 15:20:12 UTC (rev 212) @@ -1,6 +1,6 @@ lib_LTLIBRARIES = spellcheck.la -spellcheck_la_SOURCES = spellcheck.c +spellcheck_la_SOURCES = speller.c speller.h scplugin.c scplugin.h gui.c gui.h spellcheck_la_LDFLAGS = -module -avoid-version spellcheck_la_LIBADD = @GEANY_LIBS@ $(INTLLIBS) @ENCHANT_LIBS@ Added: trunk/spellcheck/src/gui.c =================================================================== --- trunk/spellcheck/src/gui.c (rev 0) +++ trunk/spellcheck/src/gui.c 2008-10-17 15:20:12 UTC (rev 212) @@ -0,0 +1,377 @@ +/* + * gui.c - this file is part of Spellcheck, a Geany plugin + * + * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * + * 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 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. + * + * $Id$ + */ + + +#include "geany.h" +#include "support.h" + + +#include "plugindata.h" + +#include "document.h" +#include "editor.h" +#include "msgwindow.h" +#include "utils.h" +#include "ui_utils.h" + +#include "pluginmacros.h" + +#include "gui.h" +#include "scplugin.h" +#include "speller.h" + + + +/* Flag to indicate that a callback function will be triggered by generating the appropriate event + * but the callback should be ignored. */ +static gboolean ignore_sc_callback = FALSE; + + + +void gui_perform_check(GeanyDocument *doc) +{ + p_editor->clear_indicators(doc->editor); + if (sc->use_msgwin) + { + p_msgwindow->clear_tab(MSG_MESSAGE); + p_msgwindow->switch_tab(MSG_MESSAGE, FALSE); + } + + speller_check_document(doc); +} + + +static void toolbar_item_toggled_cb(GtkToggleToolButton *button, gpointer user_data) +{ + if (ignore_sc_callback) + return; + + sc->check_while_typing = gtk_toggle_tool_button_get_active(button); + + p_ui->set_statusbar(FALSE, _("Spell checking while typing is now %s"), + (sc->check_while_typing) ? _("enabled") : _("disabled")); +} + + +void gui_toolbar_update(void) +{ + /* toolbar item is not requested, so remove the item if it exists */ + if (! sc->show_toolbar_item) + { + if (sc->toolbar_button != NULL) + { + gtk_widget_destroy(GTK_WIDGET(sc->toolbar_button)); + sc->toolbar_button = NULL; + } + } + else + { + if (sc->toolbar_button == NULL) + { + sc->toolbar_button = gtk_toggle_tool_button_new_from_stock("gtk-spell-check"); +#if GTK_CHECK_VERSION(2, 12, 0) + gtk_widget_set_tooltip_text(GTK_WIDGET(sc->toolbar_button), + _("Toggle spell check while typing.")); +#endif + gtk_widget_show(GTK_WIDGET(sc->toolbar_button)); + p_plugin->add_toolbar_item(geany_plugin, sc->toolbar_button); + p_ui->add_document_sensitive(GTK_WIDGET(sc->toolbar_button)); + + g_signal_connect(sc->toolbar_button, "toggled", + G_CALLBACK(toolbar_item_toggled_cb), NULL); + } + + ignore_sc_callback = TRUE; + gtk_toggle_tool_button_set_active( + GTK_TOGGLE_TOOL_BUTTON(sc->toolbar_button), sc->check_while_typing); + ignore_sc_callback = FALSE; + } +} + + +static void clear_indicators_on_range(GeanyDocument *doc, gint start, gint len) +{ + g_return_if_fail(doc != NULL); + + if (len > 0) + { + p_sci->indicator_clear(doc->editor->sci, start, start + len); + } +} + + +static void clear_indicators_on_line(GeanyDocument *doc, gint line_number) +{ + gint start_pos, length; + + g_return_if_fail(doc != NULL); + + start_pos = p_sci->get_position_from_line(doc->editor->sci, line_number); + length = p_sci->get_line_length(doc->editor->sci, line_number); + + clear_indicators_on_range(doc, start_pos, length); +} + + + +static void menu_suggestion_item_activate_cb(GtkMenuItem *menuitem, gpointer gdata) +{ + gchar *sugg = gdata; + gint startword, endword; + + if (clickinfo.doc == NULL || clickinfo.pos == -1) + { + g_free(sugg); + return; + } + + startword = p_sci->send_message( + clickinfo.doc->editor->sci, SCI_WORDSTARTPOSITION, clickinfo.pos, 0); + endword = p_sci->send_message( + clickinfo.doc->editor->sci, SCI_WORDENDPOSITION, clickinfo.pos, 0); + + if (startword != endword) + { + p_sci->set_selection_start(clickinfo.doc->editor->sci, startword); + p_sci->set_selection_end(clickinfo.doc->editor->sci, endword); + p_sci->replace_sel(clickinfo.doc->editor->sci, sugg); + + clear_indicators_on_range(clickinfo.doc, startword, endword - startword); + } +} + + +static void on_menu_addword_item_activate(GtkMenuItem *menuitem, gpointer gdata) +{ + gint startword, endword; + + if (clickinfo.doc == NULL || clickinfo.word == NULL || clickinfo.pos == -1) + return; + + /** TODO re-check the whole document */ + speller_add_word(clickinfo.word); + + startword = p_sci->send_message( + clickinfo.doc->editor->sci, SCI_WORDSTARTPOSITION, clickinfo.pos, 0); + endword = p_sci->send_message( + clickinfo.doc->editor->sci, SCI_WORDENDPOSITION, clickinfo.pos, 0); + if (startword != endword) + { + clear_indicators_on_range(clickinfo.doc, startword, endword - startword); + } +} + + +void gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, + GeanyDocument *doc, gpointer user_data) +{ + gsize n_suggs, i; + gchar **tmp_suggs; + + g_return_if_fail(doc != NULL && doc->is_valid); + + /* hide the submenu in any case, we will reshow it again if we actually found something */ + gtk_widget_hide(sc->edit_menu); + gtk_widget_hide(sc->edit_menu_sep); + + if (! NZV(word) || speller_dict_check(word) == 0) + return; + + tmp_suggs = speller_dict_suggest(word, &n_suggs); + + if (tmp_suggs != NULL) + { + GtkWidget *menu_item, *image; + gchar *label; + + clickinfo.pos = pos; + clickinfo.doc = doc; + setptr(clickinfo.word, g_strdup(word)); + + if (GTK_IS_WIDGET(sc->edit_menu_sub)) + gtk_widget_destroy(sc->edit_menu_sub); + + sc->edit_menu_sub = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(sc->edit_menu), sc->edit_menu_sub); + + /* TODO do we need more than 10 suggestions? gtkspell offers additional suggestions + * in another sub menu, should we too? */ + for (i = 0; i < MIN(n_suggs, MAX_MENU_SUGGESTIONS); i++) + { + /* keep the suggestions in a static array for the callback function */ + g_free(clickinfo.suggs[i]); + clickinfo.suggs[i] = g_strdup(tmp_suggs[i]); + + menu_item = gtk_menu_item_new_with_label(clickinfo.suggs[i]); + gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); + g_signal_connect((gpointer) menu_item, "activate", + G_CALLBACK(menu_suggestion_item_activate_cb), clickinfo.suggs[i]); + } + menu_item = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); + + image = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU); + + label = g_strdup_printf(_("Add \"%s\" to Dictionary"), word); + menu_item = gtk_image_menu_item_new_with_label(label); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image); + gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); + g_signal_connect((gpointer) menu_item, "activate", + G_CALLBACK(on_menu_addword_item_activate), NULL); + + gtk_widget_show(sc->edit_menu); + gtk_widget_show(sc->edit_menu_sep); + gtk_widget_show_all(sc->edit_menu_sub); + + speller_dict_free_string_list(tmp_suggs); + + g_free(label); + } +} + + +/* Checks only the last word before the current cursor position -> check as you type. */ +gboolean gui_key_release_cb(GtkWidget *widget, GdkEventKey *ev, gpointer user_data) +{ + gint line_number; + GString *str = g_string_sized_new(256); + gchar *line; + GeanyDocument *doc; + static time_t time_prev = 0; + time_t time_now = time(NULL); + GtkWidget *focusw; + + if (! sc->check_while_typing) + return FALSE; + /* check only once a second */ + if (time_now == time_prev) + return FALSE; + /* set current time for the next key press */ + time_prev = time_now; + + doc = p_document->get_current(); + /* bail out if we don't have a document or if we are not in the editor widget */ + focusw = gtk_window_get_focus(GTK_WINDOW(geany->main_widgets->window)); + if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) + return FALSE; + + if (ev->keyval == '\r' && + p_sci->send_message(doc->editor->sci, SCI_GETEOLMODE, 0, 0) == SC_EOL_CRLF) + { /* prevent double line checking */ + return FALSE; + } + + line_number = p_sci->get_current_line(doc->editor->sci); + if (ev->keyval == '\n' || ev->keyval == '\r') + line_number--; /* check previous line if we start a new one */ + line = p_sci->get_line(doc->editor->sci, line_number); + + clear_indicators_on_line(doc, line_number); + if (speller_process_line(doc, line_number, line) != 0) + { + if (sc->use_msgwin) + p_msgwindow->switch_tab(MSG_MESSAGE, FALSE); + } + + g_string_free(str, TRUE); + g_free(line); + + return FALSE; +} + + +static void menu_item_activate_cb(GtkMenuItem *menuitem, gpointer gdata) +{ + GeanyDocument *doc; + + doc = p_document->get_current(); + + /* Another language was chosen from the menu item, so make it default for this session. */ + if (gdata != NULL) + setptr(sc->default_language, g_strdup(gdata)); + + speller_reinit_enchant_dict(); + + p_editor->clear_indicators(doc->editor); + if (sc->use_msgwin) + { + p_msgwindow->clear_tab(MSG_MESSAGE); + p_msgwindow->switch_tab(MSG_MESSAGE, FALSE); + } + + speller_check_document(doc); +} + + +void gui_kb_activate_cb(guint key_id) +{ + menu_item_activate_cb(NULL, NULL); +} + + +void gui_create_edit_menu(void) +{ + sc->edit_menu = gtk_image_menu_item_new_from_stock(GTK_STOCK_SPELL_CHECK, NULL); + gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), sc->edit_menu); + gtk_menu_reorder_child(GTK_MENU(geany->main_widgets->editor_menu), sc->edit_menu, 0); + + sc->edit_menu_sep = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), sc->edit_menu_sep); + gtk_menu_reorder_child(GTK_MENU(geany->main_widgets->editor_menu), sc->edit_menu_sep, 1); + + gtk_widget_show_all(sc->edit_menu); +} + + +GtkWidget *gui_create_menu(GtkWidget *sp_item) +{ + GtkWidget *menu, *subitem; + guint i; + + gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), sp_item); + + menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(sp_item), menu); + + subitem = gtk_menu_item_new_with_mnemonic(_("Default")); + gtk_container_add(GTK_CONTAINER(menu), subitem); + g_signal_connect((gpointer) subitem, "activate", G_CALLBACK(menu_item_activate_cb), NULL); + + subitem = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(menu), subitem); + + for (i = 0; i < sc->dicts->len; i++) + { + GtkWidget *menu_item; + + menu_item = gtk_menu_item_new_with_label(g_ptr_array_index(sc->dicts, i)); + gtk_container_add(GTK_CONTAINER(menu), menu_item); + g_signal_connect((gpointer) menu_item, "activate", + G_CALLBACK(menu_item_activate_cb), g_ptr_array_index(sc->dicts, i)); + } + + return sp_item; +} + + Property changes on: trunk/spellcheck/src/gui.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/spellcheck/src/gui.h =================================================================== --- trunk/spellcheck/src/gui.h (rev 0) +++ trunk/spellcheck/src/gui.h 2008-10-17 15:20:12 UTC (rev 212) @@ -0,0 +1,48 @@ +/* + * gui.h - this file is part of Spellcheck, a Geany plugin + * + * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * + * 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 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. + * + * $Id$ + */ + + +#ifndef SC_GUI_H +#define SC_GUI_H 1 + + + +void gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, + GeanyDocument *doc, gpointer user_data); + +gboolean gui_key_release_cb(GtkWidget *widget, GdkEventKey *ev, gpointer user_data); + +void gui_kb_activate_cb(guint key_id); + + +void gui_create_edit_menu(void); + +GtkWidget *gui_create_menu(GtkWidget *sp_item); + +void gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, + GeanyDocument *doc, gpointer user_data); + +void gui_toolbar_update(void); + +#endif Property changes on: trunk/spellcheck/src/gui.h ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/spellcheck/src/scplugin.c =================================================================== --- trunk/spellcheck/src/scplugin.c (rev 0) +++ trunk/spellcheck/src/scplugin.c 2008-10-17 15:20:12 UTC (rev 212) @@ -0,0 +1,312 @@ +/* + * scplugin.c - this file is part of Spellcheck, a Geany plugin + * + * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * + * 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 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. + * + * $Id$ + */ + + +#include "geany.h" +#include "support.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 "pluginmacros.h" + +#include "scplugin.h" +#include "gui.h" +#include "speller.h" + + +GeanyPlugin *geany_plugin; +GeanyData *geany_data; +GeanyFunctions *geany_functions; + + +PLUGIN_VERSION_CHECK(100) +PLUGIN_SET_INFO(_("Spell Check"), _("Checks the spelling of the current document."), "0.2", + _("The Geany developer team")) + + +SpellCheck *sc = NULL; +SpellClickInfo clickinfo; + + + +/* Keybinding(s) */ +enum +{ + KB_SPELL_CHECK, + KB_COUNT +}; +PLUGIN_KEY_GROUP(spellcheck, KB_COUNT) + + + +PluginCallback plugin_callbacks[] = +{ + { "update-editor-menu", (GCallback) &gui_update_editor_menu_cb, FALSE, NULL }, + { NULL, NULL, FALSE, NULL } +}; + + +/* 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) +{ + char sTemp[1024]; + HKEY hkey; + DWORD len = sizeof(sTemp); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Aspell"), 0, + KEY_QUERY_VALUE, &hkey) != ERROR_SUCCESS) + return; + + if (RegQueryValueEx(hkey, NULL, 0, NULL, (LPBYTE)sTemp, &len) == ERROR_SUCCESS) + aspell_config_replace(config, "prefix", sTemp); + + RegCloseKey(hkey); +} +#endif + + +static void locale_init(void) +{ +#ifdef ENABLE_NLS + gchar *locale_dir = NULL; + +#ifdef HAVE_LOCALE_H + setlocale(LC_ALL, ""); +#endif + +#ifdef G_OS_WIN32 + gchar *install_dir = g_win32_get_package_installation_directory("geany", NULL); + /* e.g. C:\Program Files\geany\lib\locale */ + locale_dir = g_strconcat(install_dir, "\\share\\locale", NULL); + g_free(install_dir); +#else + locale_dir = g_strdup(LOCALEDIR); +#endif + + bindtextdomain(GETTEXT_PACKAGE, locale_dir); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + textdomain(GETTEXT_PACKAGE); + g_free(locale_dir); +#endif +} + + +static void configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data) +{ + if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) + { + GKeyFile *config = g_key_file_new(); + gchar *data; + gchar *config_dir = g_path_get_dirname(sc->config_file); + + setptr(sc->default_language, gtk_combo_box_get_active_text(GTK_COMBO_BOX( + g_object_get_data(G_OBJECT(dialog), "combo")))); + speller_reinit_enchant_dict(); + + sc->check_while_typing = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + g_object_get_data(G_OBJECT(dialog), "check_type")))); + + sc->use_msgwin = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + g_object_get_data(G_OBJECT(dialog), "check_msgwin")))); + + sc->show_toolbar_item = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + g_object_get_data(G_OBJECT(dialog), "check_toolbar")))); + + g_key_file_load_from_file(config, sc->config_file, G_KEY_FILE_NONE, NULL); + if (sc->default_language != NULL) /* lang may be NULL */ + g_key_file_set_string(config, "spellcheck", "language", sc->default_language); + g_key_file_set_boolean(config, "spellcheck", "check_while_typing", sc->check_while_typing); + g_key_file_set_boolean(config, "spellcheck", "use_msgwin", sc->use_msgwin); + g_key_file_set_boolean(config, "spellcheck", "show_toolbar_item", sc->show_toolbar_item); + + gui_toolbar_update(); + + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && p_utils->mkdir(config_dir, TRUE) != 0) + { + p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, + _("Plugin configuration directory could not be created.")); + } + else + { + /* write config to file */ + data = g_key_file_to_data(config, NULL, NULL); + p_utils->write_file(sc->config_file, data); + g_free(data); + } + g_free(config_dir); + g_key_file_free(config); + } +} + + +void plugin_init(GeanyData *data) +{ + GtkWidget *sp_item; + GKeyFile *config = g_key_file_new(); + guint i; + + sc = g_new0(SpellCheck, 1); + + sc->config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, + "spellcheck", G_DIR_SEPARATOR_S, "spellcheck.conf", NULL); + + g_key_file_load_from_file(config, sc->config_file, G_KEY_FILE_NONE, NULL); + sc->default_language = p_utils->get_setting_string(config, + "spellcheck", "language", speller_get_default_lang()); + sc->check_while_typing = p_utils->get_setting_boolean(config, + "spellcheck", "check_while_typing", FALSE); + sc->show_toolbar_item = p_utils->get_setting_boolean(config, + "spellcheck", "show_toolbar_item", TRUE); + sc->use_msgwin = p_utils->get_setting_boolean(config, "spellcheck", "use_msgwin", FALSE); + g_key_file_free(config); + + locale_init(); + + sc->menu_item = gtk_image_menu_item_new_from_stock("gtk-spell-check", NULL); + p_ui->add_document_sensitive(sc->menu_item); + + gui_toolbar_update(); + + speller_init(); + + for (i = 0; i < MAX_MENU_SUGGESTIONS; i++) + { + clickinfo.suggs[i] = NULL; + } + clickinfo.word = NULL; + + gui_create_edit_menu(); + sp_item = gui_create_menu(sc->menu_item); + gtk_widget_show_all(sp_item); + + sc->signal_id = g_signal_connect(geany->main_widgets->window, + "key-release-event", G_CALLBACK(gui_key_release_cb), NULL); + + /* setup keybindings */ + p_keybindings->set_item(plugin_key_group, KB_SPELL_CHECK, gui_kb_activate_cb, + 0, 0, "spell_check", _("Run Spell Check"), NULL); +} + + +GtkWidget *plugin_configure(GtkDialog *dialog) +{ + GtkWidget *label, *vbox, *combo, *check_type, *check_msgwin, *check_toolbar; + guint i; + + vbox = gtk_vbox_new(FALSE, 6); + + check_type = gtk_check_button_new_with_label(_("Check spelling while typing")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_type), sc->check_while_typing); + gtk_box_pack_start(GTK_BOX(vbox), check_type, FALSE, FALSE, 6); + + check_toolbar = gtk_check_button_new_with_label(_("Show toolbar item to toggle spell checking")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_toolbar), sc->show_toolbar_item); + gtk_box_pack_start(GTK_BOX(vbox), check_toolbar, FALSE, FALSE, 3); + + check_msgwin = gtk_check_button_new_with_label( + _("Print misspelled words and suggestions in the messages window")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_msgwin), sc->use_msgwin); + gtk_box_pack_start(GTK_BOX(vbox), check_msgwin, FALSE, FALSE, 3); + + label = gtk_label_new(_("Language to use for the spell check:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 3); + + combo = gtk_combo_box_new_text(); + + for (i = 0; i < sc->dicts->len; i++) + { + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), g_ptr_array_index(sc->dicts, i)); + + if (p_utils->str_equal(g_ptr_array_index(sc->dicts, i), sc->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->dicts->len > 20) + gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 3); + else if (sc->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); + + 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); + g_object_set_data(G_OBJECT(dialog), "check_toolbar", check_toolbar); + g_signal_connect(dialog, "response", G_CALLBACK(configure_response_cb), NULL); + + gtk_widget_show_all(vbox); + + return vbox; +} + + +void plugin_cleanup(void) +{ + guint i; + for (i = 0; i < MAX_MENU_SUGGESTIONS; i++) + { + clickinfo.suggs[i] = NULL; + } + g_free(clickinfo.word); + for (i = 0; i < sc->dicts->len; i++) + { + g_free(g_ptr_array_index(sc->dicts, i)); + } + g_ptr_array_free(sc->dicts, TRUE); + + g_signal_handler_disconnect(geany->main_widgets->window, sc->signal_id); + + gtk_widget_destroy(sc->edit_menu); + gtk_widget_destroy(sc->edit_menu_sep); + if (sc->toolbar_button != NULL) + gtk_widget_destroy(GTK_WIDGET(sc->toolbar_button)); + + speller_free(); + + g_free(sc->default_language); + g_free(sc->config_file); + gtk_widget_destroy(sc->menu_item); + g_free(sc); +} Property changes on: trunk/spellcheck/src/scplugin.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/spellcheck/src/scplugin.h =================================================================== --- trunk/spellcheck/src/scplugin.h (rev 0) +++ trunk/spellcheck/src/scplugin.h 2008-10-17 15:20:12 UTC (rev 212) @@ -0,0 +1,67 @@ +/* + * scplugin.h - this file is part of Spellcheck, a Geany plugin + * + * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * + * 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 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. + * + * $Id$ + */ + + +#ifndef SC_PLUGIN_H +#define SC_PLUGIN_H 1 + + + +typedef struct +{ + gchar *config_file; + gchar *default_language; + gboolean use_msgwin; + gboolean check_while_typing; + gboolean show_toolbar_item; + gulong signal_id; + GPtrArray *dicts; + GtkWidget *menu_item; + GtkWidget *edit_menu; + GtkWidget *edit_menu_sep; + GtkWidget *edit_menu_sub; + GtkToolItem *toolbar_button; +} SpellCheck; + + +#define MAX_MENU_SUGGESTIONS 10 + +typedef struct +{ + gint pos; + GeanyDocument *doc; + /* static array to keep suggestions for use as callback user data for the editing menu items */ + gchar *suggs[MAX_MENU_SUGGESTIONS]; + /* static storage for the misspelled word under the cursor when using the editing menu */ + gchar *word; +} SpellClickInfo; + + +extern SpellCheck *sc; +extern SpellClickInfo clickinfo; +extern GeanyPlugin *geany_plugin; +extern GeanyData *geany_data; +extern GeanyFunctions *geany_functions; + +#endif Property changes on: trunk/spellcheck/src/scplugin.h ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/spellcheck/src/spellcheck.c =================================================================== --- trunk/spellcheck/src/spellcheck.c 2008-10-16 16:21:41 UTC (rev 211) +++ trunk/spellcheck/src/spellcheck.c 2008-10-17 15:20:12 UTC (rev 212) @@ -1,934 +0,0 @@ -/* - * spellcheck.c - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * - * 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 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. - * - * $Id$ - */ - - -#include "geany.h" -#include "support.h" - -#ifdef HAVE_LOCALE_H -# include <locale.h> -#endif - -#ifdef G_OS_WIN32 -# include <windows.h> -#endif - -#include <string.h> -#include <ctype.h> -#include <enchant.h> - -#include "plugindata.h" - -#include "document.h" -#include "editor.h" -#include "msgwindow.h" -#include "keybindings.h" -#include "utils.h" -#include "ui_utils.h" - -#include "pluginmacros.h" - - -GeanyPlugin *geany_plugin; -GeanyData *geany_data; -GeanyFunctions *geany_functions; - - -PLUGIN_VERSION_CHECK(100) -PLUGIN_SET_INFO(_("Spell Check"), _("Checks the spelling of the current document."), "0.2", - _("The Geany developer team")) - - -typedef struct -{ - gchar *config_file; - gchar *default_language; - gboolean use_msgwin; - gboolean check_while_typing; - gboolean show_toolbar_item; - gulong signal_id; - GPtrArray *dicts; - GtkWidget *menu_item; - GtkWidget *edit_menu; - GtkWidget *edit_menu_sep; - GtkWidget *edit_menu_sub; - GtkToolItem *toolbar_button; - EnchantBroker *broker; - EnchantDict *dict; -} SpellCheck; -static SpellCheck *sc; - - -#define MAX_MENU_SUGGESTIONS 10 -typedef struct -{ - gint pos; - GeanyDocument *doc; - /* static array to keep suggestions for use as callback user data for the editing menu items */ - gchar *suggs[MAX_MENU_SUGGESTIONS]; - /* static storage for the misspelled word under the cursor when using the editing menu */ - gchar *word; -} SpellClickInfo; -static SpellClickInfo clickinfo; - - -/* Flag to indicate that a callback function will be triggered by generating the appropriate event - * but the callback should be ignored. */ -static gboolean ignore_sc_callback = FALSE; - - -static void on_update_editor_menu(GObject *obj, const gchar *word, gint pos, - GeanyDocument *doc, gpointer user_data); - -/* Keybinding(s) */ -enum -{ - KB_SPELL_CHECK, - KB_COUNT -}; -PLUGIN_KEY_GROUP(spellcheck, KB_COUNT) - - - -PluginCallback plugin_callbacks[] = -{ - { "update-editor-menu", (GCallback) &on_update_editor_menu, FALSE, NULL }, - { NULL, NULL, FALSE, NULL } -}; - - -/* 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) -{ - char sTemp[1024]; - HKEY hkey; - DWORD len = sizeof(sTemp); - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Aspell"), 0, - KEY_QUERY_VALUE, &hkey) != ERROR_SUCCESS) - return; - - if (RegQueryValueEx(hkey, NULL, 0, NULL, (LPBYTE)sTemp, &len) == ERROR_SUCCESS) - aspell_config_replace(config, "prefix", sTemp); - - RegCloseKey(hkey); -} -#endif - - -static void toolbar_item_toggled_cb(GtkToggleToolButton *button, gpointer user_data) -{ - if (ignore_sc_callback) - return; - - sc->check_while_typing = gtk_toggle_tool_button_get_active(button); - - p_ui->set_statusbar(FALSE, _("Spell checking while typing is now %s"), - (sc->check_while_typing) ? _("enabled") : _("disabled")); -} - - -static void toolbar_update(void) -{ - /* toolbar item is not requested, so remove the item if it exists */ - if (! sc->show_toolbar_item) - { - if (sc->toolbar_button != NULL) - { - gtk_widget_destroy(GTK_WIDGET(sc->toolbar_button)); - sc->toolbar_button = NULL; - } - } - else - { - if (sc->toolbar_button == NULL) - { - sc->toolbar_button = gtk_toggle_tool_button_new_from_stock("gtk-spell-check"); - #if GTK_CHECK_VERSION(2, 12, 0) - gtk_widget_set_tooltip_text(GTK_WIDGET(sc->toolbar_button), - _("Toggle spell check while typing.")); - #endif - gtk_widget_show(GTK_WIDGET(sc->toolbar_button)); - p_plugin->add_toolbar_item(geany_plugin, sc->toolbar_button); - p_ui->add_document_sensitive(GTK_WIDGET(sc->toolbar_button)); - - g_signal_connect(sc->toolbar_button, "toggled", - G_CALLBACK(toolbar_item_toggled_cb), NULL); - } - - ignore_sc_callback = TRUE; - gtk_toggle_tool_button_set_active( - GTK_TOGGLE_TOOL_BUTTON(sc->toolbar_button), sc->check_while_typing); - ignore_sc_callback = FALSE; - } -} - - -static void clear_indicators_on_range(GeanyDocument *doc, gint start, gint len) -{ - g_return_if_fail(doc != NULL); - - if (len > 0) - { - p_sci->indicator_clear(doc->editor->sci, start, start + len); - } -} - - -static void clear_indicators_on_line(GeanyDocument *doc, gint line_number) -{ - gint start_pos, length; - - g_return_if_fail(doc != NULL); - - start_pos = p_sci->get_position_from_line(doc->editor->sci, line_number); - length = p_sci->get_line_length(doc->editor->sci, line_number); - - clear_indicators_on_range(doc, start_pos, length); -} - - - -static void on_menu_suggestion_item_activate(GtkMenuItem *menuitem, gpointer gdata) -{ - gchar *sugg = gdata; - gint startword, endword; - - if (clickinfo.doc == NULL || clickinfo.pos == -1) - { - g_free(sugg); - return; - } - - startword = p_sci->send_message( - clickinfo.doc->editor->sci, SCI_WORDSTARTPOSITION, clickinfo.pos, 0); - endword = p_sci->send_message( - clickinfo.doc->editor->sci, SCI_WORDENDPOSITION, clickinfo.pos, 0); - - if (startword != endword) - { - p_sci->set_selection_start(clickinfo.doc->editor->sci, startword); - p_sci->set_selection_end(clickinfo.doc->editor->sci, endword); - p_sci->replace_sel(clickinfo.doc->editor->sci, sugg); - - clear_indicators_on_range(clickinfo.doc, startword, endword - startword); - } -} - - -static void on_menu_addword_item_activate(GtkMenuItem *menuitem, gpointer gdata) -{ - gint startword, endword; - - if (clickinfo.doc == NULL || clickinfo.word == NULL || clickinfo.pos == -1) - return; - - enchant_dict_add_to_pwl(sc->dict, clickinfo.word, -1); - - startword = p_sci->send_message( - clickinfo.doc->editor->sci, SCI_WORDSTARTPOSITION, clickinfo.pos, 0); - endword = p_sci->send_message( - clickinfo.doc->editor->sci, SCI_WORDENDPOSITION, clickinfo.pos, 0); - if (startword != endword) - { - clear_indicators_on_range(clickinfo.doc, startword, endword - startword); - } -} - - -static void on_update_editor_menu(GObject *obj, const gchar *word, gint pos, - GeanyDocument *doc, gpointer user_data) -{ - gsize n_suggs, i; - gchar **tmp_suggs; - - g_return_if_fail(doc != NULL && doc->is_valid); - - /* hide the submenu in any case, we will reshow it again if we actually found something */ - gtk_widget_hide(sc->edit_menu); - gtk_widget_hide(sc->edit_menu_sep); - - if (! NZV(word) || enchant_dict_check(sc->dict, word, -1) == 0) - return; - - tmp_suggs = enchant_dict_suggest(sc->dict, word, -1, &n_suggs); - - if (tmp_suggs != NULL) - { - GtkWidget *menu_item, *image; - gchar *label; - - clickinfo.pos = pos; - clickinfo.doc = doc; - setptr(clickinfo.word, g_strdup(word)); - - if (GTK_IS_WIDGET(sc->edit_menu_sub)) - gtk_widget_destroy(sc->edit_menu_sub); - - sc->edit_menu_sub = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(sc->edit_menu), sc->edit_menu_sub); - - /* TODO do we need more than 10 suggestions? gtkspell offers additional suggestions - * in another sub menu, should we too? */ - for (i = 0; i < MIN(n_suggs, MAX_MENU_SUGGESTIONS); i++) - { - /* keep the suggestions in a static array for the callback function */ - g_free(clickinfo.suggs[i]); - clickinfo.suggs[i] = g_strdup(tmp_suggs[i]); - - menu_item = gtk_menu_item_new_with_label(clickinfo.suggs[i]); - gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); - g_signal_connect((gpointer) menu_item, "activate", - G_CALLBACK(on_menu_suggestion_item_activate), clickinfo.suggs[i]); - } - menu_item = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); - - image = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU); - - label = g_strdup_printf(_("Add \"%s\" to Dictionary"), word); - menu_item = gtk_image_menu_item_new_with_label(label); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image); - gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); - g_signal_connect((gpointer) menu_item, "activate", - G_CALLBACK(on_menu_addword_item_activate), NULL); - - gtk_widget_show(sc->edit_menu); - gtk_widget_show(sc->edit_menu_sep); - gtk_widget_show_all(sc->edit_menu_sub); - - enchant_dict_free_string_list(sc->dict, tmp_suggs); - g_free(label); - } -} - - -static void dict_describe(const gchar* const lang, const gchar* const name, - const gchar* const desc, const gchar* const file, void *target) -{ - gchar **result = (gchar**) target; - *result = g_strdup_printf("\"%s\" (%s)", lang, name); -} - - -static gint check_word(GeanyDocument *doc, gint line_number, const gchar *word, - gint start_pos, gint end_pos) -{ - gsize j; - gsize n_suggs = 0; - gchar **suggs; - GString *str = g_string_sized_new(256); - - /* ignore numbers or words starting with digits */ - if (isdigit(*word)) - return 0; - - /* early out if the word is spelled correctly */ - if (enchant_dict_check(sc->dict, word, -1) == 0) - return 0; - - suggs = enchant_dict_suggest(sc->dict, word, -1, &n_suggs); - - if (suggs != NULL) - { - g_string_append_printf(str, "line %d: %s | ", line_number + 1, word); - - g_string_append(str, _("Try: ")); - - /* Now find the misspellings in the line, limit suggestions to a maximum of 15 (for now) */ - for (j = 0; j < MIN(n_suggs, 15); j++) - { - g_string_append(str, suggs[j]); - g_string_append_c(str, ' '); - } - - if (start_pos == -1) - start_pos = end_pos - strlen(word); - - p_editor->set_indicator(doc->editor, start_pos, end_pos); - if (sc->use_msgwin) - p_msgwindow->msg_add(COLOR_RED, line_number + 1, doc, "%s", str->str); - - if (suggs != NULL && n_suggs) - enchant_dict_free_string_list(sc->dict, suggs); - } - g_string_free(str, TRUE); - - return n_suggs; -} - - -static gint process_line(GeanyDocument *doc, gint line_number, const gchar *line) -{ - gint pos_start, pos_end; - gint wstart, wend; - GString *str = g_string_sized_new(256); - gint suggestions_found = 0; - gchar c; - - pos_start = p_sci->get_position_from_line(doc->editor->sci, line_number); - /* TODO use SCI_GETLINEENDPOSITION */ - pos_end = p_sci->get_position_from_line(doc->editor->sci, line_number + 1); - - while (pos_start < pos_end) - { - wstart = p_sci->send_message(doc->editor->sci, SCI_WORDSTARTPOSITION, pos_start, TRUE); - wend = p_sci->send_message(doc->editor->sci, SCI_WORDENDPOSITION, wstart, FALSE); - if (wstart == wend) - break; - c = p_sci->get_char_at(doc->editor->sci, wstart); - /* hopefully it's enough to check for these both */ - if (ispunct(c) || isspace(c)) - { - pos_start++; - continue; - } - - /* ensure the string has enough allocated memory */ - if (str->len < (guint)(wend - wstart)) - g_string_set_size(str, wend - wstart); - - p_sci->get_text_range(doc->editor->sci, wstart, wend, str->str); - - suggestions_found += check_word(doc, line_number, str->str, wstart, wend); - - pos_start = wend + 1; - } - - g_string_free(str, TRUE); - return suggestions_found; -} - - -static void check_document(GeanyDocument *doc) -{ - gchar *line; - gint i; - gint first_line, last_line; - gchar *dict_string = NULL; - gint suggestions_found = 0; - - enchant_dict_describe(sc->dict, dict_describe, &dict_string); - - if (p_sci->has_selection(doc->editor->sci)) - { - first_line = p_sci->get_line_from_position( - doc->editor->sci, p_sci->get_selection_start(doc->editor->sci)); - last_line = p_sci->get_line_from_position( - doc->editor->sci, p_sci->get_selection_end(doc->editor->sci)); - - if (sc->use_msgwin) - p_msgwindow->msg_add(COLOR_BLUE, -1, NULL, - _("Checking file \"%s\" (lines %d to %d using %s):"), - DOC_FILENAME(doc), first_line + 1, last_line + 1, dict_string); - g_message("Checking file \"%s\" (lines %d to %d using %s):", - DOC_FILENAME(doc), first_line + 1, last_line + 1, dict_string); - } - else - { - first_line = 0; - last_line = p_sci->get_line_count(doc->editor->sci); - if (sc->use_msgwin) - p_msgwindow->msg_add(COLOR_BLUE, -1, NULL, _("Checking file \"%s\" (using %s):"), - DOC_FILENAME(doc), dict_string); - g_message("Checking file \"%s\" (using %s):", DOC_FILENAME(doc), dict_string); - } - g_free(dict_string); - - for (i = first_line; i < last_line; i++) - { - line = p_sci->get_line(doc->editor->sci, i); - - suggestions_found += process_line(doc, i, line); - - g_free(line); - } - - if (suggestions_found == 0 && sc->use_msgwin) - p_msgwindow->msg_add(COLOR_BLUE, -1, NULL, _("The checked text is spelled correctly.")); -} - - -static void perform_check(GeanyDocument *doc) -{ - p_editor->clear_indicators(doc->editor); - if (sc->use_msgwin) - { - p_msgwindow->clear_tab(MSG_MESSAGE); - p_msgwindow->switch_tab(MSG_MESSAGE, FALSE); - } - - check_document(doc); -} - - -/* Checks only the last word before the current cursor position -> check as you type. */ -static gboolean on_key_release(GtkWidget *widget, GdkEventKey *ev, gpointer user_data) -{ - gint line_number; - GString *str = g_string_sized_new(256); - gchar *line; - GeanyDocument *doc; - static time_t time_prev = 0; - time_t time_now = time(NULL); - GtkWidget *focusw; - - if (! sc->check_while_typing) - return FALSE; - /* check only once a second */ - if (time_now == time_prev) - return FALSE; - /* set current time for the next key press */ - time_prev = time_now; - - doc = p_document->get_current(); - /* bail out if we don't have a document or if we are not in the editor widget */ - focusw = gtk_window_get_focus(GTK_WINDOW(geany->main_widgets->window)); - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) - return FALSE; - - if (ev->keyval == '\r' && - p_sci->send_message(doc->editor->sci, SCI_GETEOLMODE, 0, 0) == SC_EOL_CRLF) - { /* prevent double line checking */ - return FALSE; - } - - line_number = p_sci->get_current_line(doc->editor->sci); - if (ev->keyval == '\n' || ev->keyval == '\r') - line_number--; /* check previous line if we start a new one */ - line = p_sci->get_line(doc->editor->sci, line_number); - - clear_indicators_on_line(doc, line_number); - if (process_line(doc, line_number, line) != 0) - { - if (sc->use_msgwin) - p_msgwindow->switch_tab(MSG_MESSAGE, FALSE); - } - - g_string_free(str, TRUE); - g_free(line); - - return FALSE; -} - - -static void broker_init_failed(void) -{ - const gchar *err = enchant_broker_get_error(sc->broker); - p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, - _("The Enchant library couldn't be initialized (%s)."), - (err != NULL) ? err : _("unknown error (maybe the chosen language is not available)")); -} - - -static void dict_compare(gpointer data, gpointer user_data) -{ - gboolean *supported = user_data; - - if (p_utils->str_equal(sc->default_language, data)) - *supported = TRUE; -} - - -static gboolean check_default_lang(void) -{ - gboolean supported = FALSE; - - g_ptr_array_foreach(sc->dicts, dict_compare, &supported); - - return supported; -} - - -static void init_enchant_dict(void) -{ - gchar *lang = sc->default_language; - - /* Release a previous dict object */ - if (sc->dict != NULL) - enchant_broker_free_dict(sc->broker, sc->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()) - { - lang = g_ptr_array_index(sc->dicts, 0); - g_warning("Stored language ('%s') could not be loaded. Falling back to '%s'", - sc->default_language, lang); - } - - /* Request new dict object */ - sc->dict = enchant_broker_request_dict(sc->broker, lang); - if (sc->dict == NULL) - { - broker_init_failed(); - gtk_widget_set_sensitive(sc->menu_item, FALSE); - } - else - { - gtk_widget_set_sensitive(sc->menu_item, TRUE); - } -} - - -static void on_menu_item_activate(GtkMenuItem *menuitem, gpointer gdata) -{ - GeanyDocument *doc; - - if (sc->dict == NULL) - return; - - doc = p_document->get_current(); - - /* Another language was chosen from the menu item, so make it default for this session. */ - if (gdata != NULL) - setptr(sc->default_language, g_strdup(gdata)); - - init_enchant_dict(); - - perform_check(doc); -} - - -static void kb_activate(guint key_id) -{ - on_menu_item_activate(NULL, NULL); -} - - -static void locale_init(void) -{ -#ifdef ENABLE_NLS - gchar *locale_dir = NULL; - -#ifdef HAVE_LOCALE_H - setlocale(LC_ALL, ""); -#endif - -#ifdef G_OS_WIN32 - gchar *install_dir = g_win32_get_package_installation_directory("geany", NULL); - /* e.g. C:\Program Files\geany\lib\locale */ - locale_dir = g_strconcat(install_dir, "\\share\\locale", NULL); - g_free(install_dir); -#else - locale_dir = g_strdup(LOCALEDIR); -#endif - - bindtextdomain(GETTEXT_PACKAGE, locale_dir); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - textdomain(GETTEXT_PACKAGE); - g_free(locale_dir); -#endif -} - - -static const gchar *get_default_lang(void) -{ - const gchar *lang = g_getenv("LANG"); - if (NZV(lang)) - { - if (g_ascii_strncasecmp(lang, "C", 1) == 0) - lang = "en"; - } - else - lang = "en"; - - return lang; -} - - -static void add_dict_array(const gchar* const lang_tag, const gchar* const provider_name, - const gchar* const provider_desc, const gchar* const provider_file, - gpointer user_data) -{ - guint i; - gchar *result = g_strdup(lang_tag); - - /* sometimes dictionaries are named lang-LOCALE instead of lang_LOCALE, so replace the - * hyphen by a dash, enchant seems to not care about it. */ - for (i = 0; i < strlen(result); i++) - { - if (result[i] == '-') - result[i] = '_'; - } - - /* find duplicates and skip them */ - for (i = 0; i < sc->dicts->len; i++) - { - if (p_utils->str_equal(g_ptr_array_index(sc->dicts, i), result)) - return; - } - - g_ptr_array_add(sc->dicts, result); -} - - -static void on_configure_response(GtkDialog *dialog, gint response, gpointer user_data) -{ - if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) - { - GKeyFile *config = g_key_file_new(); - gchar *data; - gchar *config_dir = g_path_get_dirname(sc->config_file); - - setptr(sc->default_language, gtk_combo_box_get_active_text(GTK_COMBO_BOX( - g_object_get_data(G_OBJECT(dialog), "combo")))); - init_enchant_dict(); - - sc->check_while_typing = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - g_object_get_data(G_OBJECT(dialog), "check_type")))); - - sc->use_msgwin = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - g_object_get_data(G_OBJECT(dialog), "check_msgwin")))); - - sc->show_toolbar_item = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( - g_object_get_data(G_OBJECT(dialog), "check_toolbar")))); - - g_key_file_load_from_file(config, sc->config_file, G_KEY_FILE_NONE, NULL); - if (sc->default_language != NULL) /* lang may be NULL */ - g_key_file_set_string(config, "spellcheck", "language", sc->default_language); - g_key_file_set_boolean(config, "spellcheck", "check_while_typing", sc->check_while_typing); - g_key_file_set_boolean(config, "spellcheck", "use_msgwin", sc->use_msgwin); - g_key_file_set_boolean(config, "spellcheck", "show_toolbar_item", sc->show_toolbar_item); - - toolbar_update(); - - if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && p_utils->mkdir(config_dir, TRUE) != 0) - { - p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, - _("Plugin configuration directory could not be created.")); - } - else - { - /* write config to file */ - data = g_key_file_to_data(config, NULL, NULL); - p_utils->write_file(sc->config_file, data); - g_free(data); - } - g_free(config_dir); - g_key_file_free(config); - } -} - - -static gint sort_dicts(gconstpointer a, gconstpointer b) -{ /* casting mania ;-) */ - return strcmp((gchar*)((GPtrArray*)a)->pdata, (gchar*)((GPtrArray*)b)->pdata); -} - - -static void create_dicts_array(void) -{ - sc->dicts = g_ptr_array_new(); - - enchant_broker_list_dicts(sc->broker, add_dict_array, sc->dicts); - - g_ptr_array_sort(sc->dicts, sort_dicts); -} - - -static void create_edit_menu(void) -{ - sc->edit_menu = gtk_image_menu_item_new_from_stock(GTK_STOCK_SPELL_CHECK, NULL); - gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), sc->edit_menu); - gtk_menu_reorder_child(GTK_MENU(geany->main_widgets->editor_menu), sc->edit_menu, 0); - - sc->edit_menu_sep = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), sc->edit_menu_sep); - gtk_menu_reorder_child(GTK_MENU(geany->main_widgets->editor_menu), sc->edit_menu_sep, 1); - - gtk_widget_show_all(sc->edit_menu); -} - - -static GtkWidget *create_menu(GtkWidget *sp_item) -{ - GtkWidget *menu, *subitem; - guint i; - - gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), sp_item); - - menu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(sp_item), menu); - - subitem = gtk_menu_item_new_with_mnemonic(_("Default")); - gtk_container_add(GTK_CONTAINER(menu), subitem); - g_signal_connect((gpointer) subitem, "activate", G_CALLBACK(on_menu_item_activate), NULL); - - subitem = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(menu), subitem); - - for (i = 0; i < sc->dicts->len; i++) - { - GtkWidget *menu_item; - - menu_item = gtk_menu_item_new_with_label(g_ptr_array_index(sc->dicts, i)); - gtk_container_add(GTK_CONTAINER(menu), menu_item); - g_signal_connect((gpointer) menu_item, "activate", - G_CALLBACK(on_menu_item_activate), g_ptr_array_index(sc->dicts, i)); - } - - return sp_item; -} - - -void plugin_init(GeanyData *data) -{ - GtkWidget *sp_item; - GKeyFile *config = g_key_file_new(); - guint i; - - sc = g_new0(SpellCheck, 1); - - sc->config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, - "spellcheck", G_DIR_SEPARATOR_S, "spellcheck.conf", NULL); - - g_key_file_load_from_file(config, sc->config_file, G_KEY_FILE_NONE, NULL); - sc->default_language = p_utils->get_setting_string(config, - "spellcheck", "language", get_default_lang()); - sc->check_while_typing = p_utils->get_setting_boolean(config, - "spellcheck", "check_while_typing", FALSE); - sc->show_toolbar_item = p_utils->get_setting_boolean(config, - "spellcheck", "show_toolbar_item", TRUE); - sc->use_msgwin = p_utils->get_setting_boolean(config, "spellcheck", "use_msgwin", FALSE); - g_key_file_free(config); - - locale_init(); - - sc->menu_item = gtk_image_menu_item_new_from_stock("gtk-spell-check", NULL); - p_ui->add_document_sensitive(sc->menu_item); - - toolbar_update(); - - sc->broker = enchant_broker_init(); - create_dicts_array(); - init_enchant_dict(); - - for (i = 0; i < MAX_MENU_SUGGESTIONS; i++) - { - clickinfo.suggs[i] = NULL; - } - clickinfo.word = NULL; - - create_edit_menu(); - sp_item = create_menu(sc->menu_item); - gtk_widget_show_all(sp_item); - - sc->signal_id = g_signal_connect(geany->main_widgets->window, - "key-release-event", G_CALLBACK(on_key_release), NULL); - - /* setup keybindings */ - p_keybindings->set_item(plugin_key_group, KB_SPELL_CHECK, kb_activate, - 0, 0, "spell_check", _("Run Spell Check"), NULL); -} - - -GtkWidget *plugin_configure(GtkDialog *dialog) -{ - GtkWidget *label, *vbox, *combo, *check_type, *check_msgwin, *check_toolbar; - guint i; - - vbox = gtk_vbox_new(FALSE, 6); - - check_type = gtk_check_button_new_with_label(_("Check spelling while typing")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_type), sc->check_while_typing); - gtk_box_pack_start(GTK_BOX(vbox), check_type, FALSE, FALSE, 6); - - check_toolbar = gtk_check_button_new_with_label(_("Show toolbar item to toggle spell checking")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_toolbar), sc->show_toolbar_item); - gtk_box_pack_start(GTK_BOX(vbox), check_toolbar, FALSE, FALSE, 3); - - check_msgwin = gtk_check_button_new_with_label( - _("Print misspelled words and suggestions in the messages window")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_msgwin), sc->use_msgwin); - gtk_box_pack_start(GTK_BOX(vbox), check_msgwin, FALSE, FALSE, 3); - - label = gtk_label_new(_("Language to use for the spell check:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 3); - - combo = gtk_combo_box_new_text(); - - for (i = 0; i < sc->dicts->len; i++) - { - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), g_ptr_array_index(sc->dicts, i)); - - if (p_utils->str_equal(g_ptr_array_index(sc->dicts, i), sc->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->dicts->len > 20) - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 3); - else if (sc->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); - - 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); - g_object_set_data(G_OBJECT(dialog), "check_toolbar", check_toolbar); - g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), NULL); - - gtk_widget_show_all(vbox); - - return vbox; -} - - -void plugin_cleanup(void) -{ - guint i; - for (i = 0; i < MAX_MENU_SUGGESTIONS; i++) - { - clickinfo.suggs[i] = NULL; - } - g_free(clickinfo.word); - for (i = 0; i < sc->dicts->len; i++) - { - g_free(g_ptr_array_index(sc->dicts, i)); - } - g_ptr_array_free(sc->dicts, TRUE); - - g_signal_handler_disconnect(geany->main_widgets->window, sc->signal_id); - - gtk_widget_destroy(sc->edit_menu); - gtk_widget_destroy(sc->edit_menu_sep); - if (sc->toolbar_button != NULL) - gtk_widget_destroy(GTK_WIDGET(sc->toolbar_button)); - - enchant_broker_free_dict(sc->broker, sc->dict); - enchant_broker_free(sc->broker); - - g_free(sc->default_language); - g_free(sc->config_file); - gtk_widget_destroy(sc->menu_item); - g_free(sc); -} Added: trunk/spellcheck/src/speller.c =================================================================== --- trunk/spellcheck/src/speller.c (rev 0) +++ trunk/spellcheck/src/speller.c 2008-10-17 15:20:12 UTC (rev 212) @@ -0,0 +1,352 @@ +/* + * speller.c - this file is part of Spellcheck, a Geany plugin + * + * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * + * 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 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. + * + * $Id$ + */ + + +#include "geany.h" +#include "support.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 "pluginmacros.h" + +#include "speller.h" +#include "scplugin.h" + + + +static EnchantBroker *speller_broker = NULL; +static EnchantDict *speller_dict = NULL; + + + +static void dict_describe(const gchar* const lang, const gchar* const name, + const gchar* const desc, const gchar* const file, void *target) +{ + gchar **result = (gchar**) target; + *result = g_strdup_printf("\"%s\" (%s)", lang, name); +} + + +gint speller_check_word(GeanyDocument *doc, gint line_number, const gchar *word, + gint start_pos, gint end_pos) +{ + gsize j; + gsize n_suggs = 0; + gchar **suggs; + GString *str = g_string_sized_new(256); + + /* ignore numbers or words starting with digits */ + if (isdigit(*word)) + return 0; + + /* early out if the word is spelled correctly */ + if (enchant_dict_check(speller_dict, word, -1) == 0) + return 0; + + suggs = enchant_dict_suggest(speller_dict, word, -1, &n_suggs); + + if (suggs != NULL) + { + g_string_append_printf(str, "line %d: %s | ", line_number + 1, word); + + g_string_append(str, _("Try: ")); + + /* Now find the misspellings in the line, limit suggestions to a maximum of 15 (for now) */ + for (j = 0; j < MIN(n_suggs, 15); j++) + { + g_string_append(str, suggs[j]); + g_string_append_c(str, ' '); + } + + if (start_pos == -1) + start_pos = end_pos - strlen(word); + + p_editor->set_indicator(doc->editor, start_pos, end_pos); + if (sc->use_msgwin) + p_msgwindow->msg_add(COLOR_RED, line_number + 1, doc, "%s", str->str); + + if (suggs != NULL && n_suggs) + enchant_dict_free_string_list(speller_dict, suggs); + } + g_string_free(str, TRUE); + + return n_suggs; +} + + +gint speller_process_line(GeanyDocument *doc, gint line_number, const gchar *line) +{ + gint pos_start, pos_end; + gint wstart, wend; + GString *str = g_string_sized_new(256); + gint suggestions_found = 0; + gchar c; + + pos_start = p_sci->get_position_from_line(doc->editor->sci, line_number); + /* TODO use SCI_GETLINEENDPOSITION */ + pos_end = p_sci->get_position_from_line(doc->editor->sci, line_number + 1); + + while (pos_start < pos_end) + { + wstart = p_sci->send_message(doc->editor->sci, SCI_WORDSTARTPOSITION, pos_start, TRUE); + wend = p_sci->send_message(doc->editor->sci, SCI_WORDENDPOSITION, wstart, FALSE); + if (wstart == wend) + break; + c = p_sci->get_char_at(doc->editor->sci, wstart); + /* hopefully it's enough to check for these both */ + if (ispunct(c) || isspace(c)) + { + pos_start++; + continue; + } + + /* ensure the string has enough allocated memory */ + if (str->len < (guint)(wend - wstart)) + g_string_set_size(str, wend - wstart); + + p_sci->get_text_range(doc->editor->sci, wstart, wend, str->str); + + suggestions_found += speller_check_word(doc, line_number, str->str, wstart, wend); + + pos_start = wend + 1; + } + + g_string_free(str, TRUE); + return suggestions_found; +} + + +void speller_check_document(GeanyDocument *doc) +{ + gchar *line; + gint i; + gint first_line, last_line; + gchar *dict_string = NULL; + gint suggestions_found = 0; + + enchant_dict_describe(speller_dict, dict_describe, &dict_string); + + if (p_sci->has_selection(doc->editor->sci)) + { + first_line = p_sci->get_line_from_position( + doc->editor->sci, p_sci->get_selection_start(doc->editor->sci)); + last_line = p_sci->get_line_from_position( + doc->editor->sci, p_sci->get_selection_end(doc->editor->sci)); + + if (sc->use_msgwin) + p_msgwindow->msg_add(COLOR_BLUE, -1, NULL, + _("Checking file \"%s\" (lines %d to %d using %s):"), + DOC_FILENAME(doc), first_line + 1, last_line + 1, dict_string); + g_message("Checking file \"%s\" (lines %d to %d using %s):", + DOC_FILENAME(doc), first_line + 1, last_line + 1, dict_string); + } + else + { + first_line = 0; + last_line = p_sci->get_line_count(doc->editor->sci); + if (sc->use_msgwin) + p_msgwindow->msg_add(COLOR_BLUE, -1, NULL, _("Checking file \"%s\" (using %s):"), + DOC_FILENAME(doc), dict_string); + g_message("Checking file \"%s\" (using %s):", DOC_FILENAME(doc), dict_string); + } + g_free(dict_string); + + for (i = first_line; i < last_line; i++) + { + line = p_sci->get_line(doc->editor->sci, i); + + suggestions_found += speller_process_line(doc, i, line); + + g_free(line); + } + + if (suggestions_found == 0 && sc->use_msgwin) + p_msgwindow->msg_add(COLOR_BLUE, -1, NULL, _("The checked text is spelled correctly.")); +} + + +static void broker_init_failed(void) +{ + const gchar *err = enchant_broker_get_error(speller_broker); + p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, + _("The Enchant library couldn't be initialized (%s)."), + (err != NULL) ? err : _("unknown error (maybe the chosen language is not available)")); +} + + +static void dict_compare(gpointer data, gpointer user_data) +{ + gboolean *supported = user_data; + + if (p_utils->str_equal(sc->default_language, data)) + *supported = TRUE; +} + + +static gboolean check_default_lang(void) +{ + gboolean supported = FALSE; + + g_ptr_array_foreach(sc->dicts, dict_compare, &supported); + + return supported; +} + + +void speller_reinit_enchant_dict(void) +{ + gchar *lang = sc->default_language; + + /* Release a previous dict object */ + if (speller_dict != NULL) + enchant_broker_free_dict(speller_broker, 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()) + { + lang = g_ptr_array_index(sc->dicts, 0); + g_warning("Stored language ('%s') could not be loaded. Falling back to '%s'", + sc->default_language, lang); + } + + /* Request new dict object */ + speller_dict = enchant_broker_request_dict(speller_broker, lang); + if (speller_dict == NULL) + { + broker_init_failed(); + gtk_widget_set_sensitive(sc->menu_item, FALSE); + } + else + { + gtk_widget_set_sensitive(sc->menu_item, TRUE); + } +} + + +const gchar *speller_get_default_lang(void) +{ + const gchar *lang = g_getenv("LANG"); + if (NZV(lang)) + { + if (g_ascii_strncasecmp(lang, "C", 1) == 0) + lang = "en"; + } + else + lang = "en"; + + return lang; +} + + +static void add_dict_array(const gchar* const lang_tag, const gchar* const provider_name, + const gchar* const provider_desc, const gchar* const provider_file, + gpointer user_data) +{ + guint i; + gchar *result = g_strdup(lang_tag); + + /* sometimes dictionaries are named lang-LOCALE instead of lang_LOCALE, so replace the + * hyphen by a dash, enchant seems to not care about it. */ + for (i = 0; i < strlen(result); i++) + { + if (result[i] == '-') + result[i] = '_'; + } + + /* find duplicates and skip them */ + for (i = 0; i < sc->dicts->len; i++) + { + if (p_utils->str_equal(g_ptr_array_index(sc->dicts, i), result)) + return; + } + + g_ptr_array_add(sc->dicts, result); +} + + +static gint sort_dicts(gconstpointer a, gconstpointer b) +{ /* casting mania ;-) */ + return strcmp((gchar*)((GPtrArray*)a)->pdata, (gchar*)((GPtrArray*)b)->pdata); +} + + +static void create_dicts_array(void) +{ + sc->dicts = g_ptr_array_new(); + + enchant_broker_list_dicts(speller_broker, add_dict_array, sc->dicts); + + g_ptr_array_sort(sc->dicts, sort_dicts); +} + + +void speller_dict_free_string_list(gchar **tmp_suggs) +{ + enchant_dict_free_string_list(speller_dict, tmp_suggs); +} + + +void speller_add_word(const gchar *word) +{ + enchant_dict_add_to_pwl(speller_dict, clickinfo.word, -1); + +} + +gboolean speller_dict_check(const gchar *word) +{ + return enchant_dict_check(speller_dict, word, -1); +} + + +gchar **speller_dict_suggest(const gchar *word, gsize *n_suggs) +{ + return enchant_dict_suggest(speller_dict, word, -1, n_suggs); +} + + +void speller_init(void) +{ + speller_broker = enchant_broker_init(); + + create_dicts_array(); + + speller_reinit_enchant_dict(); +} + + +void speller_free(void) +{ + enchant_broker_free_dict(speller_broker, speller_dict); + enchant_broker_free(speller_broker); +} Property changes on: trunk/spellcheck/src/speller.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/spellcheck/src/speller.h =================================================================== --- trunk/spellcheck/src/speller.h (rev 0) +++ trunk/spellcheck/src/speller.h 2008-10-17 15:20:12 UTC (rev 212) @@ -0,0 +1,53 @@ +/* + * speller.h - this file is part of Spellcheck, a Geany plugin + * + * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * + * 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 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. + * + * $Id$ + */ + + +#ifndef SC_SPELLER_H +#define SC_SPELLER_H 1 + + +gint speller_check_word(GeanyDocument *doc, gint line_number, const gchar *word, + gint start_pos, gint end_pos); + +gint speller_process_line(GeanyDocument *doc, gint line_number, const gchar *line); + +void speller_check_document(GeanyDocument *doc); + +void speller_reinit_enchant_dict(void); + +const gchar *speller_get_default_lang(void); + +void speller_dict_free_string_list(gchar **tmp_suggs); + +void speller_add_word(const gchar *word); + +gboolean speller_dict_check(const gchar *word); + +gchar **speller_dict_suggest(const gchar *word, gsize *n_suggs); + +void speller_init(void); + +void speller_free(void); + +#endif Property changes on: trunk/spellcheck/src/speller.h ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native 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:[211] trunk
by eht16＠users.sourceforge.net 16 Oct '08

16 Oct '08

Revision: 211 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=211&view=rev Author: eht16 Date: 2008-10-16 16:21:41 +0000 (Thu, 16 Oct 2008) Log Message: ----------- Update Waf once more. Modified Paths: -------------- trunk/waf trunk/wscript Modified: trunk/waf =================================================================== --- trunk/waf 2008-10-16 16:14:21 UTC (rev 210) +++ trunk/waf 2008-10-16 16:21:41 UTC (rev 211) @@ -38,10 +38,10 @@ except:pass VERSION="1.5.0" -REVISION="aef3b995245315d03255e279726e8ad6" +REVISION="a28f28ae2e5fe099ce722d07de417940" INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local' -C1='#/' -C2='#(' +C1='#)' +C2='#%' cwd = os.getcwd() join = os.path.join @@ -127,5 +127,5 @@ Scripting.prepare(t, cwd, VERSION, wafdir) #==> @@ Diff output truncated at 100000 characters. @@ 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:[210] trunk/spellcheck
by eht16＠users.sourceforge.net 16 Oct '08

16 Oct '08

Revision: 210 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=210&view=rev Author: eht16 Date: 2008-10-16 16:14:21 +0000 (Thu, 16 Oct 2008) Log Message: ----------- Test whether stored language is (still) available in enchant and fall back to the first supported language if not. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/src/spellcheck.c Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2008-10-15 18:32:51 UTC (rev 209) +++ trunk/spellcheck/ChangeLog 2008-10-16 16:14:21 UTC (rev 210) @@ -1,3 +1,10 @@ +2008-10-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/spellcheck.c: + Test whether stored language is (still) available in enchant and fall + back to the first supported language if not. + + 2008-10-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/spellcheck.c: Modified: trunk/spellcheck/src/spellcheck.c =================================================================== --- trunk/spellcheck/src/spellcheck.c 2008-10-15 18:32:51 UTC (rev 209) +++ trunk/spellcheck/src/spellcheck.c 2008-10-16 16:14:21 UTC (rev 210) @@ -93,7 +93,7 @@ static SpellClickInfo clickinfo; -/* Flag to indicate that a callback function will be triggered by generating the appropiate event +/* Flag to indicate that a callback function will be triggered by generating the appropriate event * but the callback should be ignored. */ static gboolean ignore_sc_callback = FALSE; @@ -537,7 +537,7 @@ } -static void broker_init_failed() +static void broker_init_failed(void) { const gchar *err = enchant_broker_get_error(sc->broker); p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, @@ -546,14 +546,44 @@ } -static void init_enchant_dict() +static void dict_compare(gpointer data, gpointer user_data) { + gboolean *supported = user_data; + + if (p_utils->str_equal(sc->default_language, data)) + *supported = TRUE; +} + + +static gboolean check_default_lang(void) +{ + gboolean supported = FALSE; + + g_ptr_array_foreach(sc->dicts, dict_compare, &supported); + + return supported; +} + + +static void init_enchant_dict(void) +{ + gchar *lang = sc->default_language; + /* Release a previous dict object */ if (sc->dict != NULL) enchant_broker_free_dict(sc->broker, sc->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()) + { + lang = g_ptr_array_index(sc->dicts, 0); + g_warning("Stored language ('%s') could not be loaded. Falling back to '%s'", + sc->default_language, lang); + } + /* Request new dict object */ - sc->dict = enchant_broker_request_dict(sc->broker, sc->default_language); + sc->dict = enchant_broker_request_dict(sc->broker, lang); if (sc->dict == NULL) { broker_init_failed(); @@ -620,10 +650,6 @@ static const gchar *get_default_lang(void) { const gchar *lang = g_getenv("LANG"); - /** TODO check whether the returned lang is actually provided by enchant and - * choose something else if not - * N.B. this is not really possible/reasonable with enchant < 1.4.3 because of a - * bug in the Zemberek provider which always reports it has the requested dict */ if (NZV(lang)) { if (g_ascii_strncasecmp(lang, "C", 1) == 0) @@ -716,7 +742,7 @@ } -static void create_dicts_array() +static void create_dicts_array(void) { sc->dicts = g_ptr_array_new(); @@ -726,7 +752,7 @@ } -static void create_edit_menu() +static void create_edit_menu(void) { sc->edit_menu = gtk_image_menu_item_new_from_stock(GTK_STOCK_SPELL_CHECK, NULL); gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), sc->edit_menu); @@ -800,6 +826,7 @@ toolbar_update(); sc->broker = enchant_broker_init(); + create_dicts_array(); init_enchant_dict(); for (i = 0; i < MAX_MENU_SUGGESTIONS; i++) @@ -808,8 +835,6 @@ } clickinfo.word = NULL; - create_dicts_array(); - create_edit_menu(); sp_item = create_menu(sc->menu_item); gtk_widget_show_all(sp_item); 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:[209] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 15 Oct '08

15 Oct '08

Revision: 209 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=209&view=rev Author: frlan Date: 2008-10-15 18:32:51 +0000 (Wed, 15 Oct 2008) Log Message: ----------- GeanyLaTeX: Some more code clean up. Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2008-10-15 14:19:30 UTC (rev 208) +++ trunk/geanylatex/src/geanylatex.c 2008-10-15 18:32:51 UTC (rev 209) @@ -762,17 +762,6 @@ gtk_widget_destroy(dialog); } -static void -update_menu_items() -{ - p_ui->add_document_sensitive(menu_latex_menu_special_char); - p_ui->add_document_sensitive(menu_latex_ref); - p_ui->add_document_sensitive(menu_latex_label); - - gtk_widget_set_sensitive(menu_latex_wizzard, TRUE); - -} - static void kblabel_insert(G_GNUC_UNUSED guint key_id) { insert_label_activated(NULL, NULL); @@ -830,7 +819,6 @@ menu_latex = gtk_menu_item_new_with_mnemonic(_("_LaTeX")); gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_latex); - g_signal_connect((gpointer) menu_latex, "activate", G_CALLBACK(update_menu_items), NULL); menu_latex_menu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_latex), menu_latex_menu); @@ -871,6 +859,12 @@ 0, 0, "insert_latex_label", kblabel_insert_label, menu_latex_wizzard); p_keybindings->set_item(plugin_key_group, LATEX_INSERT_REF_KB, kbref_insert, 0, 0, "insert_latex_ref", kblabel_insert_ref, menu_latex_wizzard); + + p_ui->add_document_sensitive(menu_latex_menu_special_char); + p_ui->add_document_sensitive(menu_latex_ref); + p_ui->add_document_sensitive(menu_latex_label); + + gtk_widget_set_sensitive(menu_latex_wizzard, TRUE); gtk_widget_show_all(menu_latex); main_menu_item = menu_latex; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits October 2008