Plugins-Commits January 2017

plugins-commits@lists.geany.org

1 participants
19 discussions

[geany/geany-plugins] b1ec04: Merge pull request #514 from frlan/enhancement/automark/prevent_warnings
by Frank Lanitz 05 Jan '17

05 Jan '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Thu, 05 Jan 2017 09:32:48 UTC Commit: b1ec04149df3b27a060b6cc59071f87c76ae035b https://github.com/geany/geany-plugins/commit/b1ec04149df3b27a060b6cc59071f… Log Message: ----------- Merge pull request #514 from frlan/enhancement/automark/prevent_warnings Automark: Don't try to get some selection if line is empty Modified Paths: -------------- automark/src/automark.c Modified: automark/src/automark.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -87,6 +87,9 @@ get_current_word(ScintillaObject *sci) gint start = SSM(sci, SCI_WORDSTARTPOSITION, pos, TRUE); gint end = SSM(sci, SCI_WORDENDPOSITION, pos, TRUE); + if (end == start) + return NULL; + if ((guint)(end - start) >= GEANY_MAX_WORD_LENGTH) end = start + (GEANY_MAX_WORD_LENGTH - 1); return sci_get_contents_range(sci, start, end); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3c3ff8: Automark: Don't try to get some selection if line is empty
by Frank Lanitz 05 Jan '17

05 Jan '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 04 Jan 2017 19:47:03 UTC Commit: 3c3ff8c2a70cc615d26db14387d79587d23bf465 https://github.com/geany/geany-plugins/commit/3c3ff8c2a70cc615d26db14387d79… Log Message: ----------- Automark: Don't try to get some selection if line is empty Modified Paths: -------------- automark/src/automark.c Modified: automark/src/automark.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -87,6 +87,9 @@ get_current_word(ScintillaObject *sci) gint start = SSM(sci, SCI_WORDSTARTPOSITION, pos, TRUE); gint end = SSM(sci, SCI_WORDENDPOSITION, pos, TRUE); + if (end == start) + return NULL; + if ((guint)(end - start) >= GEANY_MAX_WORD_LENGTH) end = start + (GEANY_MAX_WORD_LENGTH - 1); return sci_get_contents_range(sci, start, end); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4cd782: Lipsum: Add a space after lipsum dummy text. Fixes #513
by Frank Lanitz 04 Jan '17

04 Jan '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 04 Jan 2017 18:02:28 UTC Commit: 4cd7826bb9885baf4061e9ed0cc24da91e099d2d https://github.com/geany/geany-plugins/commit/4cd7826bb9885baf4061e9ed0cc24… Log Message: ----------- Lipsum: Add a space after lipsum dummy text. Fixes #513 Modified Paths: -------------- lipsum/src/lipsum.c Modified: lipsum/src/lipsum.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,7 +1,7 @@ /* * lipsum.c * - * Copyright 2008-2016 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2008-2017 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -54,7 +54,7 @@ ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut\ aliquip ex ea commodo consequat. Duis aute irure dolor in\ reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla\ pariatur. Excepteur sint occaecat cupidatat non proident, sunt in\ -culpa qui officia deserunt mollit anim id est laborum."; +culpa qui officia deserunt mollit anim id est laborum. "; /* Doing some basic keybinding stuff */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 8835e1: Small update of German translation
by Frank Lanitz 04 Jan '17

04 Jan '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 03 Jan 2017 21:56:29 UTC Commit: 8835e1f8242affe3f6f22adf9dfe2d274a87822a https://github.com/geany/geany-plugins/commit/8835e1f8242affe3f6f22adf9dfe2… Log Message: ----------- Small update of German translation Modified Paths: -------------- NEWS po/de.po Modified: NEWS 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -15,14 +15,15 @@ Geany Plugins 1.30 (not yet released) GeanyDoc: * Improve compatibility with Gtk3 + * Allow to use current word as initial text in interactive mode (PR##457 GeanyLua * Remove deprecated GeanyFunctions from interface provided by this plugin (PR##439) * Fix build with latest Scintilla (PR##510) Lineoperations: - * Add support for selections + * Add support for selections (PR##378) Markdown: * Allow exporting Markdown as HTML (PR##502) @@ -42,7 +43,7 @@ Geany Plugins 1.30 (not yet released) * Fix a possible memory leak (PR##478) Internationalization: - * Updated translations: + * Updated translations: de Geany Plugins 1.29 (2016-11-13) Modified: po/de.po 239 lines changed, 139 insertions(+), 100 deletions(-) =================================================================== @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Geany-Plugins 1.29\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-11 16:55+0100\n" +"POT-Creation-Date: 2017-01-03 22:49+0100\n" "PO-Revision-Date: 2016-08-08 22:38+0200\n" "Last-Translator: Dominic Hopf <dmaphy(a)googlemail.com>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" @@ -197,7 +197,7 @@ msgstr "XML-Tagging ausführen" #: ../geanyprj/src/geanyprj.c:173 ../geanyvc/src/geanyvc.c:1849 #: ../geniuspaste/src/geniuspaste.c:318 ../sendmail/src/sendmail.c:128 #: ../sendmail/src/sendmail.c:293 ../spellcheck/src/scplugin.c:157 -#: ../treebrowser/src/treebrowser.c:1937 +#: ../treebrowser/src/treebrowser.c:1938 #: ../updatechecker/src/updatechecker.c:266 msgid "Plugin configuration directory could not be created." msgstr "" @@ -656,15 +656,15 @@ msgstr "" "Bietet eine Schnittstelle über eine Auswahlliste für den schnellen Zugriff " "auf Funktionen, Dateien und mehr." -#: ../commander/src/commander-plugin.c:770 +#: ../commander/src/commander-plugin.c:772 msgid "Show Command Panel" msgstr "Kommandoliste zeigen" -#: ../commander/src/commander-plugin.c:774 +#: ../commander/src/commander-plugin.c:776 msgid "Show Command Panel (Commands Only)" msgstr "Kommandoliste zeigen (nur Kommandos)" -#: ../commander/src/commander-plugin.c:778 +#: ../commander/src/commander-plugin.c:780 msgid "Show Command Panel (Files Only)" msgstr "Kommandoliste zeigen (nur Dateien)" @@ -740,37 +740,37 @@ msgstr "Anzahl der Treffer" msgid "line %i" msgstr "Zeile %i" -#: ../debugger/src/dbm_gdb.c:522 +#: ../debugger/src/dbm_gdb.c:526 #, c-format msgid "Program received signal %s (%s)" msgstr "Programm empfing ein Signal %s (%s)" -#: ../debugger/src/dbm_gdb.c:543 +#: ../debugger/src/dbm_gdb.c:547 #, c-format msgid "Program exited with code \"%i\"" msgstr "Programm beendete mit Code »%i«" -#: ../debugger/src/dbm_gdb.c:733 +#: ../debugger/src/dbm_gdb.c:737 msgid "Failed to spawn gdb process" msgstr "Konnte den gdb-Prozess nicht starten" -#: ../debugger/src/dbm_gdb.c:780 +#: ../debugger/src/dbm_gdb.c:784 msgid "~\"Loading target file.\\n\"" msgstr "~\"Zieldatei laden.\\n\"" -#: ../debugger/src/dbm_gdb.c:780 +#: ../debugger/src/dbm_gdb.c:784 msgid "Error loading file" msgstr "Fehler beim Laden der Datei" #. setting asyncronous mode #. setting null-stop array printing #. enable pretty printing -#: ../debugger/src/dbm_gdb.c:785 ../debugger/src/dbm_gdb.c:788 -#: ../debugger/src/dbm_gdb.c:791 +#: ../debugger/src/dbm_gdb.c:789 ../debugger/src/dbm_gdb.c:792 +#: ../debugger/src/dbm_gdb.c:795 msgid "Error configuring GDB" msgstr "Fehler bei der Konfiguration von GDB" -#: ../debugger/src/dbm_gdb.c:831 +#: ../debugger/src/dbm_gdb.c:835 #, c-format msgid "" "Breakpoint at %s:%i cannot be set\n" @@ -2929,7 +2929,7 @@ msgstr "IBM 852 code page" msgid "Don't set any encoding" msgstr "Keine Zeichenkodierung explizit festlegen" -#: ../geanylua/glspi.h:87 ../geanylua/gsdlg_lua.c:95 +#: ../geanylua/glspi.h:83 ../geanylua/gsdlg_lua.c:95 #: ../geanylua/glspi_kfile.c:54 #, c-format msgid "" @@ -2939,7 +2939,7 @@ msgstr "" "Fehler in Modul »%s« in Funktion %s():\n" "Typ »%s« für Argument #%d erwartet\n" -#: ../geanylua/glspi.h:101 +#: ../geanylua/glspi.h:97 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -2948,7 +2948,7 @@ msgstr "" "Fehler in Modul »%s« in Funktion %s():\n" "Typ »%s« oder »%s« für Argument #%d erwartet\n" -#: ../geanylua/glspi.h:115 ../geanylua/gsdlg_lua.c:108 +#: ../geanylua/glspi.h:111 ../geanylua/gsdlg_lua.c:108 #, c-format msgid "" "Error in module \"%s\" at function %s():\n" @@ -3017,20 +3017,20 @@ msgstr "Fehler beim Öffnen des Skriptes." msgid "Unknown error while loading script file." msgstr "Unbekannter Fehler beim Laden des Skriptes." -#: ../geanylua/glspi_init.c:382 +#: ../geanylua/glspi_init.c:381 msgid "_Lua Scripts" msgstr "_Lua-Skripte" -#: ../geanylua/glspi_init.c:427 +#: ../geanylua/glspi_init.c:425 #, c-format msgid " ==>> %s: Building menu from '%s'\n" msgstr " ==>> %s: Baue Menü von »%s«\n" -#: ../geanylua/glspi_init.c:526 +#: ../geanylua/glspi_init.c:524 msgid "Nothing to configure!" msgstr "Es gibt nichts zu konfigurieren." -#: ../geanylua/glspi_init.c:528 +#: ../geanylua/glspi_init.c:526 #, c-format msgid "" "You can create the script:\n" @@ -3042,31 +3042,31 @@ msgstr "" "Sie können das Script »%s« erstellen, um einen benutzerdefinierten " "Konfigurationsdialog hinzuzufügen." -#: ../geanylua/gsdlg.c:103 ../geanylua/glspi_dlg.c:420 +#: ../geanylua/gsdlg.c:100 ../geanylua/glspi_dlg.c:420 msgid "Open file" msgstr "Datei öffnen" -#: ../geanylua/gsdlg.c:107 +#: ../geanylua/gsdlg.c:104 msgid "Select file" msgstr "Datei auswählen" -#: ../geanylua/gsdlg.c:154 +#: ../geanylua/gsdlg.c:151 msgid "Browse..." msgstr "Durchsuchen..." -#: ../geanylua/gsdlg.c:176 +#: ../geanylua/gsdlg.c:173 msgid "Select Color" msgstr "Farbe auswählen" -#: ../geanylua/gsdlg.c:207 +#: ../geanylua/gsdlg.c:204 msgid "Choose..." msgstr "Auswählen..." -#: ../geanylua/gsdlg.c:228 +#: ../geanylua/gsdlg.c:225 msgid "Select Font" msgstr "Schriftart auswählen" -#: ../geanylua/gsdlg.c:255 +#: ../geanylua/gsdlg.c:252 msgid "Select..." msgstr "Auswählen..." @@ -3155,32 +3155,32 @@ msgstr "" "Fehler in Modul »%s« in Funktion %s():\n" "Erwartete »open« oder »save« als 1. Argument.\n" -#: ../geanylua/geanylua.c:156 +#: ../geanylua/geanylua.c:153 #, c-format msgid "%s: Can't load support library %s!\n" msgstr "%s: Konnte die unterstützende Bibliothek »%s« nicht laden!\n" -#: ../geanylua/geanylua.c:168 +#: ../geanylua/geanylua.c:165 #, c-format msgid "%s: Failed to initialize support library %s!\n" msgstr "%s: Konnte die unterstützende Bibliothek »%s« nicht initialisieren!\n" -#: ../geanylua/geanylua.c:173 +#: ../geanylua/geanylua.c:170 #, c-format msgid "%s: Support library version mismatch: %s for %s (should be %s)!\n" msgstr "%s: Versionskonflikt mit der Bibliothek: %s vs. %s (sollte %s sein)!\n" -#: ../geanylua/geanylua.c:179 +#: ../geanylua/geanylua.c:176 #, c-format msgid "%s: Support library ABI mismatch: %d for %s (should be %d)!\n" msgstr "%s: Versionskonflikt mit der Geany ABI: %d vs. %s (sollte %d sein)!\n" -#: ../geanylua/geanylua.c:208 +#: ../geanylua/geanylua.c:205 #, c-format msgid "%s: Can't find support library %s!\n" msgstr "%s: Konnte die unterstützende Bibliothek »%s« nicht finden!\n" -#: ../geanylua/geanylua.c:227 +#: ../geanylua/geanylua.c:224 #, c-format msgid "" "The %s plugin failed to load properly.\n" @@ -5196,51 +5196,65 @@ msgstr "" "Das grafische Elemente des Plugins konnte nicht korrekt geladen werden.\n" "Bitte überprüfen Sie Ihre Installation. Der Fehler war: %s" -#: ../lineoperations/src/lineoperations.c:67 +#: ../lineoperations/src/lineoperations.c:123 +#, c-format +msgid "Operation successful! %d lines removed." +msgstr "Operation erfolgreich: Es wurden %d Zeilen entfernt." + +#: ../lineoperations/src/lineoperations.c:134 +msgid "Operation successful! No lines removed." +msgstr "Operation erfolgreich: Es wurden keine Zeilen entfern." + +#: ../lineoperations/src/lineoperations.c:142 +#, c-format +msgid "Operation successful! %d lines affected." +msgstr "Operation erfolgreich: Es wurden %d Zeilen geändert." + +#: ../lineoperations/src/lineoperations.c:254 msgid "Remove Duplicate Lines, _Sorted" msgstr "Entferne doppelte Zeilen (Nach _Sortieren)" -#: ../lineoperations/src/lineoperations.c:69 +#: ../lineoperations/src/lineoperations.c:256 msgid "Remove Duplicate Lines, _Ordered" msgstr "Entferne doppelte Zeilen (_Reihenfolge des Auftretens)" -#: ../lineoperations/src/lineoperations.c:71 +#: ../lineoperations/src/lineoperations.c:258 msgid "Remove _Unique Lines" msgstr "Entferne _einzelne Zeilen" -#: ../lineoperations/src/lineoperations.c:74 +#: ../lineoperations/src/lineoperations.c:261 msgid "Remove _Empty Lines" msgstr "Entferne leere Zeilen" -#: ../lineoperations/src/lineoperations.c:76 +#: ../lineoperations/src/lineoperations.c:263 msgid "Remove _Whitespace Lines" msgstr "Entferne Zeilen mit Leerzeichen" -#: ../lineoperations/src/lineoperations.c:79 +#: ../lineoperations/src/lineoperations.c:266 msgid "Sort Lines _Ascending" msgstr "Sortiere Zeilen, _aufsteigend" -#: ../lineoperations/src/lineoperations.c:81 +#: ../lineoperations/src/lineoperations.c:268 msgid "Sort Lines _Descending" msgstr "Sortiere Zeilen, a_bsteigend" -#: ../lineoperations/src/lineoperations.c:85 +#: ../lineoperations/src/lineoperations.c:272 msgid "_Line Operations" msgstr "Zeilenoperationen" -#: ../lineoperations/src/lineoperations.c:127 +#: ../lineoperations/src/lineoperations.c:318 msgid "Line Operations" msgstr "Zeilenoperationen" -#: ../lineoperations/src/lineoperations.c:128 +#: ../lineoperations/src/lineoperations.c:319 msgid "" "Line Operations provides a handful of functions that can be applied to a " -"document such as, removing duplicate lines, removing empty lines, removing " -"lines with only whitespace, and sorting lines." +"document or selection such as, removing duplicate lines, removing empty " +"lines, removing lines with only whitespace, and sorting lines." msgstr "" "Das Plugin bietet eine Reihe von Funktionen, die auf ein auf Zeilenebene auf " -"ein Dokument angewendet werden können. Dazu gehören das Entfernen von " -"doppelten Zeilen, leeren Zeilen oder das Sortieren von Zeilen." +"ein Dokument oder einer Auswahl angewendet werden können. Dazu gehören das Entfernen von " +"doppelten Zeilen oder leerer Zeilen sowie das Sortieren von Zeilen." #: ../lipsum/src/lipsum.c:43 msgid "Lipsum" @@ -5271,8 +5285,8 @@ msgid "" msgstr "" "Plugin-Umbenennung erkannt!\n" "\n" -"GeanyLipsum wurde in Lipsum umbenannt -- wahrscheinlich hast Du das " -"bereits erkannt.\n" +"GeanyLipsum wurde in Lipsum umbenannt -- wahrscheinlich hast Du das bereits " +"erkannt.\n" "Geany kann die alten Plugin-Konfigurationsateien in das neue " "Konfigurationsverzeichnis verschieben.\n" "Fortfahren?" @@ -5287,6 +5301,7 @@ msgstr "" "verschoben." #: ../lipsum/src/lipsum.c:199 +#, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please manually move the directory to the new location." @@ -5349,10 +5364,30 @@ msgstr "Echtzeit Markdown-Vorschau" msgid "Markdown Preview" msgstr "Markdown-Vorschau" -#: ../markdown/src/plugin.c:167 +#: ../markdown/src/plugin.c:102 +msgid "Export Markdown as HTML..." +msgstr "Markdown als HTML exportieren ..." + +#: ../markdown/src/plugin.c:176 msgid "The current document does not have a Markdown filetype." msgstr "Das aktuelle Dokument ist nicht vom Markdown-Dateityp." +#: ../markdown/src/plugin.c:278 +msgid "Save HTML File As" +msgstr "Datei als HTML speichern" + +#: ../markdown/src/plugin.c:306 +msgid "HTML Files" +msgstr "HTML-Dateien" + +#: ../markdown/src/plugin.c:311 +msgid "All Files" +msgstr "Alle Dateien" + +#: ../markdown/src/plugin.c:322 +msgid "Failed to export Markdown HTML to file '%s': %s" +msgstr "Konnte das Markdown nicht in eine HTML-Datei exportieren: »%s«: %s" + #: ../multiterm/src/config.vala:47 #, c-format msgid "Unable to save config file %s: %s" @@ -5427,7 +5462,7 @@ msgstr "Konnte Standardkonfiguration nicht schreiben: %s" msgid "Unable to read value for '%s' key: %s" msgstr "Konnte Wert für »%s«, Schlüssel »%s« nicht lesen" -#: ../multiterm/src/tab-label.vala:62 ../treebrowser/src/treebrowser.c:1962 +#: ../multiterm/src/tab-label.vala:62 ../treebrowser/src/treebrowser.c:1963 msgid "Terminal" msgstr "Terminal" @@ -5591,14 +5626,18 @@ msgstr "" msgid "Overlay" msgstr "Überlagerung" -#: ../pairtaghighlighter/src/pair_tag_highlighter.c:34 +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:40 msgid "Pair Tag Highlighter" msgstr "PairTagHighlighter" -#: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:41 msgid "Finds and highlights matching opening/closing HTML tag" msgstr "Findet und hebt passende öffnende und schließende HTML-Tags hervor" +#: ../pairtaghighlighter/src/pair_tag_highlighter.c:440 +msgid "Go To Matching Tag" +msgstr "Zum Korrospondierenden Tag springen" + #: ../pohelper/data/menus.ui.h:1 msgid "_Translation Helper" msgstr "_Übersetzungshelfer" @@ -7094,30 +7133,30 @@ msgstr "" msgid "Try: " msgstr "Vorschlag: " -#: ../spellcheck/src/speller.c:264 +#: ../spellcheck/src/speller.c:283 msgid "Checking" msgstr "Prüfe" -#: ../spellcheck/src/speller.c:277 +#: ../spellcheck/src/speller.c:296 #, c-format msgid "Checking file \"%s\" (lines %d to %d using %s):" msgstr "Prüfe Datei »%s« (Zeilen %d bis %d mit »%s«):" -#: ../spellcheck/src/speller.c:287 +#: ../spellcheck/src/speller.c:306 #, c-format msgid "Checking file \"%s\" (using %s):" msgstr "Prüfe Datei »%s« (mit »%s«):" -#: ../spellcheck/src/speller.c:308 +#: ../spellcheck/src/speller.c:327 msgid "The checked text is spelled correctly." msgstr "Der geprüfte Text ist fehlerfrei." -#: ../spellcheck/src/speller.c:318 +#: ../spellcheck/src/speller.c:337 #, c-format msgid "The Enchant library couldn't be initialized (%s)." msgstr "Die Enchant-Bibliothek konnte nicht initialisiert werden (%s)." -#: ../spellcheck/src/speller.c:319 +#: ../spellcheck/src/speller.c:338 msgid "unknown error (maybe the chosen language is not available)" msgstr "" "unbekannter Fehler (möglicherweise ist die ausgewählte Sprache nicht " @@ -7370,11 +7409,11 @@ msgstr "" msgid "Do you really want to delete '%s' ?" msgstr "Soll »%s« wirklich gelöscht werden?" -#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 +#: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1739 msgid "Go up" msgstr "Aufwärts" -#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 +#: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1754 msgid "Set path from document" msgstr "Pfad des Dokumentes übernehmen" @@ -7390,8 +7429,8 @@ msgstr "In Terminal ausführen" msgid "Set as root" msgstr "Als Wurzel festlegen" -#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1743 -#: ../treebrowser/src/treebrowser.c:2138 +#: ../treebrowser/src/treebrowser.c:1229 ../treebrowser/src/treebrowser.c:1744 +#: ../treebrowser/src/treebrowser.c:2139 msgid "Refresh" msgstr "Auffrischen" @@ -7433,54 +7472,54 @@ msgstr "_Vollständigen Pfad in die Zwischenablage kopieren" msgid "Collapse all" msgstr "Alle einklappen" -#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2047 +#: ../treebrowser/src/treebrowser.c:1292 ../treebrowser/src/treebrowser.c:2048 msgid "Show bookmarks" msgstr "Lesezeichen anzeigen" -#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1996 +#: ../treebrowser/src/treebrowser.c:1297 ../treebrowser/src/treebrowser.c:1997 msgid "Show hidden files" msgstr "Versteckte Dateien anzeigen" #: ../treebrowser/src/treebrowser.c:1302 msgid "Show toolbars" msgstr "Werkzeugleisten anzeigen" -#: ../treebrowser/src/treebrowser.c:1621 +#: ../treebrowser/src/treebrowser.c:1622 #, c-format msgid "Target file '%s' exists, do you really want to replace it?" msgstr "Zieldatei »%s« existiert bereits. Möchten Sie diese wirklich ersetzen?" -#: ../treebrowser/src/treebrowser.c:1748 +#: ../treebrowser/src/treebrowser.c:1749 msgid "Home" msgstr "Ausgabe" -#: ../treebrowser/src/treebrowser.c:1758 +#: ../treebrowser/src/treebrowser.c:1759 msgid "Track path" msgstr "Pfad aufzeichnen" -#: ../treebrowser/src/treebrowser.c:1763 +#: ../treebrowser/src/treebrowser.c:1764 msgid "Hide bars" msgstr "Leisten verbergen" -#: ../treebrowser/src/treebrowser.c:1773 +#: ../treebrowser/src/treebrowser.c:1774 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" msgstr "Filter (*.c;*.h;*.cpp). Die Nutzung von »!« invertiert das Ergebnis." -#: ../treebrowser/src/treebrowser.c:1781 +#: ../treebrowser/src/treebrowser.c:1782 msgid "Addressbar for example '/projects/my-project'" msgstr "Adressleiste. Zum Beispiel »/projects/my-project«" -#: ../treebrowser/src/treebrowser.c:1806 +#: ../treebrowser/src/treebrowser.c:1807 msgid "Tree Browser" msgstr "Baumnavigator" -#: ../treebrowser/src/treebrowser.c:1949 +#: ../treebrowser/src/treebrowser.c:1950 msgid "External open command" msgstr "Externer Öffnen-Befehl" -#: ../treebrowser/src/treebrowser.c:1954 +#: ../treebrowser/src/treebrowser.c:1955 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -7494,115 +7533,115 @@ msgstr "" "%f wird mit dem Dateinamen ersetzt, der den kompletten Pfad beinhaltet.\n" "%d wird mit dem Pfad des Verzeichnisses der aktuellen Datei ersetzt." -#: ../treebrowser/src/treebrowser.c:1967 +#: ../treebrowser/src/treebrowser.c:1968 msgid "The terminal to use with the command \"Open Terminal\"" msgstr "" "Das Terminal, welches für das Kommando »Terminal öffnen« genutzt werden " "soll. Z. B. »xterm«." -#: ../treebrowser/src/treebrowser.c:1973 +#: ../treebrowser/src/treebrowser.c:1974 msgid "Toolbar" msgstr "Werkzeugleiste:" -#: ../treebrowser/src/treebrowser.c:1975 +#: ../treebrowser/src/treebrowser.c:1976 msgid "Hidden" msgstr "Versteckt" -#: ../treebrowser/src/treebrowser.c:1976 +#: ../treebrowser/src/treebrowser.c:1977 msgid "Top" msgstr "Oben" -#: ../treebrowser/src/treebrowser.c:1977 +#: ../treebrowser/src/treebrowser.c:1978 msgid "Bottom" msgstr "Unten" -#: ../treebrowser/src/treebrowser.c:1982 +#: ../treebrowser/src/treebrowser.c:1983 msgid "If position is changed, the option require plugin restart." msgstr "Bei einer Veränderung der Position muss das Plugin neu geladen werden." -#: ../treebrowser/src/treebrowser.c:1986 +#: ../treebrowser/src/treebrowser.c:1987 msgid "Show icons" msgstr "Symbole anzeigen:" -#: ../treebrowser/src/treebrowser.c:1988 +#: ../treebrowser/src/treebrowser.c:1989 msgid "None" msgstr "Keines" -#: ../treebrowser/src/treebrowser.c:1989 +#: ../treebrowser/src/treebrowser.c:1990 msgid "Base" msgstr "Basis" -#: ../treebrowser/src/treebrowser.c:1990 +#: ../treebrowser/src/treebrowser.c:1991 msgid "Content-type" msgstr "Inhaltsart" -#: ../treebrowser/src/treebrowser.c:2001 +#: ../treebrowser/src/treebrowser.c:2002 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" "Unter Windows versteckt dies nur Dateien, die mit einem ».« (Punkt) " "beginnen. " -#: ../treebrowser/src/treebrowser.c:2003 +#: ../treebrowser/src/treebrowser.c:2004 msgid "Hide object files" msgstr "Objektdateien verbergen" -#: ../treebrowser/src/treebrowser.c:2008 +#: ../treebrowser/src/treebrowser.c:2009 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" msgstr "" "Keine generierten Objektdateien anzeigen. Dies bezieht *.o, *.obj. *.so, *." "dll, *.a, *.lib mit ein." -#: ../treebrowser/src/treebrowser.c:2010 +#: ../treebrowser/src/treebrowser.c:2011 msgid "Reverse filter" msgstr "Filter zurücksetzen" -#: ../treebrowser/src/treebrowser.c:2015 +#: ../treebrowser/src/treebrowser.c:2016 msgid "Follow current document" msgstr "Dem aktuellen Dokument folgen" -#: ../treebrowser/src/treebrowser.c:2020 +#: ../treebrowser/src/treebrowser.c:2021 msgid "Single click, open document and focus it" msgstr "Einzelklick öffnet Dokument und fokussiert es" -#: ../treebrowser/src/treebrowser.c:2025 +#: ../treebrowser/src/treebrowser.c:2026 msgid "Double click open directory" msgstr "Doppelklick öffnet ein Verzeichnis" -#: ../treebrowser/src/treebrowser.c:2030 +#: ../treebrowser/src/treebrowser.c:2031 msgid "On delete file, close it if is opened" msgstr "Datei schließen, wenn sie gelöscht wird" -#: ../treebrowser/src/treebrowser.c:2035 +#: ../treebrowser/src/treebrowser.c:2036 msgid "Focus editor on file open" msgstr "Fokus auf Editor legen beim Öffnen von Dateien" -#: ../treebrowser/src/treebrowser.c:2040 +#: ../treebrowser/src/treebrowser.c:2041 msgid "Show tree lines" msgstr "Leere Zeilen anzeigen" -#: ../treebrowser/src/treebrowser.c:2052 +#: ../treebrowser/src/treebrowser.c:2053 msgid "Open new files" msgstr "Neue Dateien öffnen" -#: ../treebrowser/src/treebrowser.c:2128 +#: ../treebrowser/src/treebrowser.c:2129 msgid "Focus File List" msgstr "Dateiliste fokussieren" -#: ../treebrowser/src/treebrowser.c:2130 +#: ../treebrowser/src/treebrowser.c:2131 msgid "Focus Path Entry" msgstr "Pfadeintrag fokussieren" -#: ../treebrowser/src/treebrowser.c:2132 +#: ../treebrowser/src/treebrowser.c:2133 msgid "Rename Object" msgstr "Objekt umbenennen" -#: ../treebrowser/src/treebrowser.c:2134 +#: ../treebrowser/src/treebrowser.c:2135 msgid "Create New File" msgstr "Neue Datei erstellen" -#: ../treebrowser/src/treebrowser.c:2136 +#: ../treebrowser/src/treebrowser.c:2137 msgid "Create New Directory" msgstr "Neues Verzeichnis erstellen" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c06898: geanydoc: Current word as initial text in interactive mode
by Vasiliy Faronov 04 Jan '17

04 Jan '17

Branch: refs/heads/master Author: Vasiliy Faronov <vfaronov(a)gmail.com> Committer: Vasiliy Faronov <vfaronov(a)gmail.com> Date: Sat, 09 Jul 2016 12:26:37 UTC Commit: c06898de822bb6c0535a325bcbc8679f90176255 https://github.com/geany/geany-plugins/commit/c06898de822bb6c0535a325bcbc86… Log Message: ----------- geanydoc: Current word as initial text in interactive mode This makes the plugin more useful for namespaced languages like Python, where you often want to tweak the words a bit (e.g. "xyzzy" -> "somelib.xyzzy") before looking them up. Modified Paths: -------------- geanydoc/src/geanydoc.c Modified: geanydoc/src/geanydoc.c 11 lines changed, 7 insertions(+), 4 deletions(-) =================================================================== @@ -58,7 +58,7 @@ enum KB_COUNT }; -GtkWidget *create_Interactive(void); +GtkWidget *create_Interactive(const gchar * default_word); static gboolean word_check_left(gchar c) { @@ -221,11 +221,12 @@ kb_doc(G_GNUC_UNUSED guint key_id) static void kb_doc_ask(G_GNUC_UNUSED guint key_id) { - gchar *word = NULL; + gchar *word = NULL, *default_word = current_word(); GtkWidget *dialog, *entry; /* example configuration dialog */ - dialog = create_Interactive(); + dialog = create_Interactive(default_word); + g_free(default_word); /* run the dialog and check for the response code */ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) @@ -290,7 +291,7 @@ on_comboboxType_changed(GtkComboBox * combobox, G_GNUC_UNUSED gpointer user_data g_object_set_data (G_OBJECT (component), name, widget) GtkWidget * -create_Interactive(void) +create_Interactive(const gchar * default_word) { GtkWidget *dialog_vbox1; GtkWidget *entry_word; @@ -306,6 +307,8 @@ create_Interactive(void) dialog_vbox1 = GTK_DIALOG(dialog)->vbox; entry_word = gtk_entry_new(); + if (default_word) + gtk_entry_set_text(GTK_ENTRY(entry_word), default_word); gtk_widget_show(entry_word); gtk_box_pack_start(GTK_BOX(dialog_vbox1), entry_word, TRUE, TRUE, 0); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3f4de1: Merge pull request #457 from vfaronov/geanydoc/interactive-current-word
by Frank Lanitz 04 Jan '17

04 Jan '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 03 Jan 2017 21:48:17 UTC Commit: 3f4de15159afc379a3fbf4d2a3da5a54379e6c62 https://github.com/geany/geany-plugins/commit/3f4de15159afc379a3fbf4d2a3da5… Log Message: ----------- Merge pull request #457 from vfaronov/geanydoc/interactive-current-word geanydoc: Current word as initial text in interactive mode Modified Paths: -------------- geanydoc/src/geanydoc.c Modified: geanydoc/src/geanydoc.c 11 lines changed, 7 insertions(+), 4 deletions(-) =================================================================== @@ -58,7 +58,7 @@ enum KB_COUNT }; -GtkWidget *create_Interactive(void); +GtkWidget *create_Interactive(const gchar * default_word); static gboolean word_check_left(gchar c) { @@ -221,11 +221,12 @@ kb_doc(G_GNUC_UNUSED guint key_id) static void kb_doc_ask(G_GNUC_UNUSED guint key_id) { - gchar *word = NULL; + gchar *word = NULL, *default_word = current_word(); GtkWidget *dialog, *entry; /* example configuration dialog */ - dialog = create_Interactive(); + dialog = create_Interactive(default_word); + g_free(default_word); /* run the dialog and check for the response code */ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) @@ -290,7 +291,7 @@ on_comboboxType_changed(GtkComboBox * combobox, G_GNUC_UNUSED gpointer user_data g_object_set_data (G_OBJECT (component), name, widget) GtkWidget * -create_Interactive(void) +create_Interactive(const gchar * default_word) { GtkWidget *dialog_vbox1; GtkWidget *entry_word; @@ -306,6 +307,8 @@ create_Interactive(void) dialog_vbox1 = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); entry_word = gtk_entry_new(); + if (default_word) + gtk_entry_set_text(GTK_ENTRY(entry_word), default_word); gtk_widget_show(entry_word); gtk_box_pack_start(GTK_BOX(dialog_vbox1), entry_word, TRUE, TRUE, 0); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d31f43: Small update of NEWS
by Frank Lanitz 04 Jan '17

04 Jan '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 03 Jan 2017 21:47:05 UTC Commit: d31f43a980ab592cb5659ec75481fc6a145ce306 https://github.com/geany/geany-plugins/commit/d31f43a980ab592cb5659ec75481f… Log Message: ----------- Small update of NEWS Modified Paths: -------------- NEWS Modified: NEWS 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -21,6 +21,9 @@ Geany Plugins 1.30 (not yet released) plugin (PR##439) * Fix build with latest Scintilla (PR##510) + Lineoperations: + * Add support for selections + Markdown: * Allow exporting Markdown as HTML (PR##502) * Fix relative paths (PR##501) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 867ffb: lineoperations: added some ui changes
by Sylvan Mostert 04 Jan '17

04 Jan '17

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Fri, 09 Sep 2016 05:47:54 UTC Commit: 867ffbd11e63975a89ace2fdfa8c93a03b79de2b https://github.com/geany/geany-plugins/commit/867ffbd11e63975a89ace2fdfa8c9… Log Message: ----------- lineoperations: added some ui changes Added a message to statusbar to display number of lines changed. Changed some variable names for clarity, added some spacing. Modified Paths: -------------- lineoperations/src/linefunctions.c lineoperations/src/linefunctions.h lineoperations/src/lineoperations.c Modified: lineoperations/src/linefunctions.c 36 lines changed, 19 insertions(+), 17 deletions(-) =================================================================== @@ -41,7 +41,7 @@ compare_desc(const void * a, const void * b) /* Remove Duplicate Lines, sorted */ void -rmdupst(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) +rmdupst(gchar **lines, gint num_lines, gchar *new_file) { gchar *nf_end = new_file; /* points to last char of new_file */ gchar *lineptr = (gchar *)""; /* temporary line pointer */ @@ -64,7 +64,7 @@ rmdupst(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) /* Remove Duplicate Lines, ordered */ void -rmdupln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) +rmdupln(gchar **lines, gint num_lines, gchar *new_file) { gchar *nf_end = new_file; /* points to last char of new_file */ gint i = 0; /* iterator */ @@ -105,7 +105,7 @@ rmdupln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) /* Remove Unique Lines */ void -rmunqln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) +rmunqln(gchar **lines, gint num_lines, gchar *new_file) { gchar *nf_end = new_file; /* points to last char of new_file */ gint i = 0; /* iterator */ @@ -142,7 +142,7 @@ rmunqln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) /* Remove Empty Lines */ void -rmemtyln(GeanyDocument *doc, gint line_num, gint end_line_num) +rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num) { while(line_num <= end_line_num) /* loop through lines */ @@ -151,10 +151,11 @@ rmemtyln(GeanyDocument *doc, gint line_num, gint end_line_num) if(sci_get_position_from_line(sci, line_num) == sci_get_line_end_position (sci, line_num)) { - scintilla_send_message(doc->editor->sci, + scintilla_send_message(sci, SCI_DELETERANGE, - sci_get_position_from_line(doc->editor->sci, line_num), - sci_get_line_length(doc->editor->sci, line_num)); + sci_get_position_from_line(sci, line_num), + sci_get_line_length(sci, line_num)); + line_num--; end_line_num--; } @@ -165,26 +166,27 @@ rmemtyln(GeanyDocument *doc, gint line_num, gint end_line_num) /* Remove Whitespace Lines */ void -rmwhspln(GeanyDocument *doc, gint line_num, gint end_line_num) +rmwhspln(ScintillaObject *sci, gint line_num, gint end_line_num) { gint indent; /* indent position */ while(line_num <= end_line_num) /* loop through lines */ { - indent = scintilla_send_message(doc->editor->sci, + indent = scintilla_send_message(sci, SCI_GETLINEINDENTPOSITION, line_num, 0); /* check if the posn of indentation is also the end of line posn */ if(indent - - sci_get_position_from_line(doc->editor->sci, line_num) == - sci_get_line_end_position (doc->editor->sci, line_num)- - sci_get_position_from_line(doc->editor->sci, line_num)) + sci_get_position_from_line(sci, line_num) == + sci_get_line_end_position (sci, line_num) - + sci_get_position_from_line(sci, line_num)) { - scintilla_send_message(doc->editor->sci, + scintilla_send_message(sci, SCI_DELETERANGE, - sci_get_position_from_line(doc->editor->sci, line_num), - sci_get_line_length(doc->editor->sci, line_num)); + sci_get_position_from_line(sci, line_num), + sci_get_line_length(sci, line_num)); + line_num--; end_line_num--; } @@ -196,7 +198,7 @@ rmwhspln(GeanyDocument *doc, gint line_num, gint end_line_num) /* Sort Lines Ascending */ void -sortlnsasc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) +sortlnsasc(gchar **lines, gint num_lines, gchar *new_file) { gchar *nf_end = new_file; /* points to last char of new_file */ gint i; @@ -211,7 +213,7 @@ sortlnsasc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) /* Sort Lines Descending */ void -sortlndesc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) +sortlndesc(gchar **lines, gint num_lines, gchar *new_file) { gchar *nf_end = new_file; /* points to last char of new_file */ gint i; Modified: lineoperations/src/linefunctions.h 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -31,37 +31,37 @@ /* Remove Duplicate Lines, sorted */ -void +gint rmdupst(gchar **lines, gint num_lines, gchar *new_file); /* Remove Duplicate Lines, ordered */ -void +gint rmdupln(gchar **lines, gint num_lines, gchar *new_file); /* Remove Unique Lines */ -void +gint rmunqln(gchar **lines, gint num_lines, gchar *new_file); /* Remove Empty Lines */ -void +gint rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num); /* Remove Whitespace Lines */ -void +gint rmwhspln(ScintillaObject *sci, gint line_num, gint end_line_num); /* Sort Lines Ascending */ -void +gint sortlnsasc(gchar **lines, gint num_lines, gchar *new_file); /* Sort Lines Descending */ -void +gint sortlndesc(gchar **lines, gint num_lines, gchar *new_file); #endif Modified: lineoperations/src/lineoperations.c 117 lines changed, 81 insertions(+), 36 deletions(-) =================================================================== @@ -31,25 +31,25 @@ static GtkWidget *main_menu_item = NULL; -/* represents lines that will have Operation applied to */ +/* represents a selection of lines that will have Operation applied to */ struct lo_lines { gboolean is_selection; - gint start_posn_line; - gint end_posn_line; + gint start_line; + gint end_line; }; -/* selects lines in document (based of lo_lines struct parameter) */ +/* selects lines in document (based off of lo_lines struct parameter) */ static void select_lines(GeanyEditor *editor, struct lo_lines sel) { /* set the selection to beginning of first line */ sci_set_selection_start(editor->sci, - sci_get_position_from_line(editor->sci, sel.start_posn_line)); + sci_get_position_from_line(editor->sci, sel.start_line)); /* set the selection to end of last line */ sci_set_selection_end(editor->sci, - sci_get_line_end_position(editor->sci, sel.end_posn_line) + + sci_get_line_end_position(editor->sci, sel.end_line) + editor_get_eol_char_len(editor)); } @@ -70,11 +70,11 @@ get_current_sel_lines(ScintillaObject *sci) end_posn = sci_get_selection_end (sci); /* get the line number of those positions */ - sel.start_posn_line = scintilla_send_message(sci, + sel.start_line = scintilla_send_message(sci, SCI_LINEFROMPOSITION, start_posn, 0); - sel.end_posn_line = scintilla_send_message(sci, + sel.end_line = scintilla_send_message(sci, SCI_LINEFROMPOSITION, end_posn, 0); @@ -83,9 +83,9 @@ get_current_sel_lines(ScintillaObject *sci) else { /* if there is no selection, start at first line */ - sel.start_posn_line = 0; + sel.start_line = 0; /* and end at last one */ - sel.end_posn_line = (sci_get_line_count(sci) - 1); + sel.end_line = (sci_get_line_count(sci) - 1); sel.is_selection = FALSE; } @@ -96,44 +96,89 @@ get_current_sel_lines(ScintillaObject *sci) /* altered from geany/src/editor.c, ensure new line at file end */ static void -ensure_final_newline(GeanyEditor *editor, gint max_lines) +ensure_final_newline(GeanyEditor *editor, gint *num_lines, struct lo_lines *sel) { - gint end_document = sci_get_position_from_line(editor->sci, max_lines); + gint end_document = sci_get_position_from_line(editor->sci, (*num_lines)); gboolean append_newline = end_document > - sci_get_position_from_line(editor->sci, max_lines - 1); + sci_get_position_from_line(editor->sci, ((*num_lines) - 1)); if (append_newline) { const gchar *eol = editor_get_eol_char(editor); sci_insert_text(editor->sci, end_document, eol); + (*num_lines)++; + (*sel).end_line++; + } +} + + +/* set statusbar with message and select altered lines */ +static void +user_indicate(GeanyEditor *editor, gint lines_affected, struct lo_lines sel) +{ + if(lines_affected < 0) + { + ui_set_statusbar(FALSE, _("Operation successful! %d lines removed."), + -lines_affected); + + /* select lines to indicate to user what lines were altered */ + sel.end_line += lines_affected; + + if(sel.is_selection) + select_lines(editor, sel); + } + else if(lines_affected == 0) + { + ui_set_statusbar(FALSE, _("Operation successful! No lines removed.")); + + /* select lines to indicate to user what lines were altered */ + if(sel.is_selection) + select_lines(editor, sel); + } + else + { + ui_set_statusbar(FALSE, _("Operation successful! %d lines affected."), + lines_affected); + + /* select lines to indicate to user what lines were altered */ + if(sel.is_selection) + select_lines(editor, sel); } } /* * Menu action for functions with indirect scintilla manipulation - * e.g. functions requiring **lines array, *new_file... + * e.g. functions requiring **lines array, num_lines, *new_file */ static void action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) { - /* function pointer to gdata -- function to be used */ - void (*func)(gchar **lines, gint num_lines, gchar *new_file) = gdata; + /* function pointer to function to be used */ + gint (*func)(gchar **lines, gint num_lines, gchar *new_file) = gdata; + GeanyDocument *doc = document_get_current(); - GeanyDocument *doc = document_get_current(); - struct lo_lines sel = get_current_sel_lines(doc->editor->sci); - gint num_chars = 0; - gint num_lines = (sel.end_posn_line - sel.start_posn_line) + 1; - gchar **lines = g_malloc(sizeof(gchar *) * num_lines); - gint i = 0; + struct lo_lines sel = get_current_sel_lines(doc->editor->sci); + gint num_lines = (sel.end_line - sel.start_line) + 1; + + gint num_chars = 0; + gint i = 0; + gint lines_affected = 0; + + + /* if last line within selection ensure that the file ends with newline */ + if((sel.end_line + 1) == sci_get_line_count(doc->editor->sci)) + ensure_final_newline(doc->editor, &num_lines, &sel); /* get num_chars and **lines */ + gchar **lines = g_malloc(sizeof(gchar *) * num_lines); for(i = 0; i < num_lines; i++) { num_chars += (sci_get_line_length(doc->editor->sci, - (i + sel.start_posn_line))); + (i + sel.start_line))); + lines[i] = sci_get_line(doc->editor->sci, - (i + sel.start_posn_line)); + (i + sel.start_line)); } gchar *new_file = g_malloc(sizeof(gchar) * (num_chars + 1)); @@ -144,21 +189,19 @@ action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) sci_start_undo_action(doc->editor->sci); - /* if file is not empty, ensure that the file ends with newline */ - if((!sel.is_selection && num_lines != 1) || (sel.is_selection && - sel.end_posn_line == (sci_get_line_count(doc->editor->sci) - 1))) - { - ensure_final_newline(doc->editor, num_lines); - } - if(doc) func(lines, num_lines, new_file); + if(doc) + lines_affected = func(lines, num_lines, new_file); + /* set new document */ if(sci_has_selection(doc->editor->sci)) sci_replace_sel(doc->editor->sci, new_file); else sci_set_text(doc->editor->sci, new_file); + user_indicate(doc->editor, lines_affected, sel); + sci_end_undo_action(doc->editor->sci); /* free used memory */ @@ -178,17 +221,19 @@ static void action_sci_manip_item(GtkMenuItem *menuitem, gpointer gdata) { /* function pointer to gdata -- function to be used */ - void (*func)(ScintillaObject *, gint, gint) = gdata; + gint (*func)(ScintillaObject *, gint, gint) = gdata; GeanyDocument *doc = document_get_current(); struct lo_lines sel = get_current_sel_lines(doc->editor->sci); + gint lines_affected = 0; - /* select lines to indicate to user what lines were altered */ - if(sel.is_selection) - select_lines(doc->editor, sel); sci_start_undo_action(doc->editor->sci); - if(doc) func(doc->editor->sci, sel.start_posn_line, sel.end_posn_line); + if(doc) + lines_affected = func(doc->editor->sci, sel.start_line, sel.end_line); + + /* put message in ui_statusbar, and highlight lines that were affected */ + user_indicate(doc->editor, lines_affected, sel); sci_end_undo_action(doc->editor->sci); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 11800f: lineoperations: minor formatting
by Sylvan Mostert 04 Jan '17

04 Jan '17

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Fri, 09 Sep 2016 05:48:18 UTC Commit: 11800f4889bf0a060d8b00a3b8e7fd47910fe6f4 https://github.com/geany/geany-plugins/commit/11800f4889bf0a060d8b00a3b8e7f… Log Message: ----------- lineoperations: minor formatting Removed unreachable sci operation. Modified Paths: -------------- lineoperations/src/linefunctions.c lineoperations/src/lineoperations.c Modified: lineoperations/src/linefunctions.c 63 lines changed, 48 insertions(+), 15 deletions(-) =================================================================== @@ -40,12 +40,13 @@ compare_desc(const void * a, const void * b) /* Remove Duplicate Lines, sorted */ -void +gint rmdupst(gchar **lines, gint num_lines, gchar *new_file) { - gchar *nf_end = new_file; /* points to last char of new_file */ - gchar *lineptr = (gchar *)""; /* temporary line pointer */ - gint i = 0; /* iterator */ + gchar *nf_end = new_file; /* points to last char of new_file */ + gchar *lineptr = (gchar *)" "; /* temporary line pointer */ + gint i = 0; /* iterator */ + gint changed = 0; /* number of lines removed */ /* sort **lines ascending */ qsort(lines, num_lines, sizeof(gchar *), compare_asc); @@ -55,21 +56,26 @@ rmdupst(gchar **lines, gint num_lines, gchar *new_file) { if(strcmp(lines[i], lineptr) != 0) { - lineptr = lines[i]; - nf_end = g_stpcpy(nf_end, lines[i]); + changed++; /* number of lines kept */ + lineptr = lines[i]; + nf_end = g_stpcpy(nf_end, lines[i]); } } + + /* return the number of lines deleted */ + return -(num_lines - changed); } /* Remove Duplicate Lines, ordered */ -void +gint rmdupln(gchar **lines, gint num_lines, gchar *new_file) { gchar *nf_end = new_file; /* points to last char of new_file */ gint i = 0; /* iterator */ gint j = 0; /* iterator */ gboolean *to_remove = NULL; /* flag to 'mark' which lines to remove */ + gint changed = 0; /* number of lines removed */ /* allocate and set *to_remove to all FALSE @@ -96,21 +102,28 @@ rmdupln(gchar **lines, gint num_lines, gchar *new_file) /* copy **lines into 'new_file' if it is not FALSE (not duplicate) */ for(i = 0; i < num_lines; i++) if(!to_remove[i]) - nf_end = g_stpcpy(nf_end, lines[i]); + { + changed++; /* number of lines kept */ + nf_end = g_stpcpy(nf_end, lines[i]); + } /* free used memory */ g_free(to_remove); + + /* return the number of lines deleted */ + return -(num_lines - changed); } /* Remove Unique Lines */ -void +gint rmunqln(gchar **lines, gint num_lines, gchar *new_file) { gchar *nf_end = new_file; /* points to last char of new_file */ - gint i = 0; /* iterator */ - gint j = 0; /* iterator */ + gint i = 0; /* iterator */ + gint j = 0; /* iterator */ gboolean *to_remove = NULL; /* to 'mark' which lines to remove */ + gint changed = 0; /* number of lines removed */ /* allocate and set *to_remove to all TRUE @@ -133,17 +146,24 @@ rmunqln(gchar **lines, gint num_lines, gchar *new_file) /* copy **lines into 'new_file' if it is not FALSE(not duplicate) */ for(i = 0; i < num_lines; i++) if(!to_remove[i]) + { + changed++; /* number of lines kept */ nf_end = g_stpcpy(nf_end, lines[i]); + } /* free used memory */ g_free(to_remove); + + /* return the number of lines deleted */ + return -(num_lines - changed); } /* Remove Empty Lines */ -void +gint rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num) { + gint changed = 0; /* number of lines removed */ while(line_num <= end_line_num) /* loop through lines */ { @@ -158,17 +178,22 @@ rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num) line_num--; end_line_num--; + changed++; } line_num++; } + + /* return the number of lines deleted */ + return -changed; } /* Remove Whitespace Lines */ -void +gint rmwhspln(ScintillaObject *sci, gint line_num, gint end_line_num) { gint indent; /* indent position */ + gint changed = 0; /* number of lines removed */ while(line_num <= end_line_num) /* loop through lines */ { @@ -189,15 +214,19 @@ rmwhspln(ScintillaObject *sci, gint line_num, gint end_line_num) line_num--; end_line_num--; + changed++; } line_num++; } + + /* return the number of lines deleted */ + return -changed; } /* Sort Lines Ascending */ -void +gint sortlnsasc(gchar **lines, gint num_lines, gchar *new_file) { gchar *nf_end = new_file; /* points to last char of new_file */ @@ -208,11 +237,13 @@ sortlnsasc(gchar **lines, gint num_lines, gchar *new_file) /* join **lines into one string (new_file) */ for(i = 0; i < num_lines; i++) nf_end = g_stpcpy(nf_end, lines[i]); + + return num_lines; } /* Sort Lines Descending */ -void +gint sortlndesc(gchar **lines, gint num_lines, gchar *new_file) { gchar *nf_end = new_file; /* points to last char of new_file */ @@ -223,4 +254,6 @@ sortlndesc(gchar **lines, gint num_lines, gchar *new_file) /* join **lines into one string (new_file) */ for(i = 0; i < num_lines; i++) nf_end = g_stpcpy(nf_end, lines[i]); + + return num_lines; } Modified: lineoperations/src/lineoperations.c 22 lines changed, 11 insertions(+), 11 deletions(-) =================================================================== @@ -58,18 +58,18 @@ select_lines(GeanyEditor *editor, struct lo_lines sel) static struct lo_lines get_current_sel_lines(ScintillaObject *sci) { - struct lo_lines sel = { 0, 0 }; + struct lo_lines sel = { FALSE, 0, 0 }; gint start_posn = 0; /* position of selection start */ gint end_posn = 0; /* position of selection end */ /* check for selection */ if(sci_has_selection(sci)) { - /* get the start and end positions */ + /* get the start and end *positions* */ start_posn = sci_get_selection_start(sci); end_posn = sci_get_selection_end (sci); - /* get the line number of those positions */ + /* get the *line number* of those positions */ sel.start_line = scintilla_send_message(sci, SCI_LINEFROMPOSITION, start_posn, 0); @@ -106,6 +106,8 @@ ensure_final_newline(GeanyEditor *editor, gint *num_lines, struct lo_lines *sel) { const gchar *eol = editor_get_eol_char(editor); sci_insert_text(editor->sci, end_document, eol); + + /* re-adjust the selection */ (*num_lines)++; (*sel).end_line++; } @@ -123,9 +125,9 @@ user_indicate(GeanyEditor *editor, gint lines_affected, struct lo_lines sel) /* select lines to indicate to user what lines were altered */ sel.end_line += lines_affected; - + if(sel.is_selection) - select_lines(editor, sel); + select_lines(editor, sel); } else if(lines_affected == 0) { @@ -142,7 +144,7 @@ user_indicate(GeanyEditor *editor, gint lines_affected, struct lo_lines sel) /* select lines to indicate to user what lines were altered */ if(sel.is_selection) - select_lines(editor, sel); + select_lines(editor, sel); } } @@ -184,7 +186,7 @@ action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) gchar *new_file = g_malloc(sizeof(gchar) * (num_chars + 1)); new_file[0] = '\0'; - /* select lines to indicate to user what lines were altered */ + /* select lines that will be replaced with array */ select_lines(doc->editor, sel); sci_start_undo_action(doc->editor->sci); @@ -195,11 +197,9 @@ action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) /* set new document */ - if(sci_has_selection(doc->editor->sci)) - sci_replace_sel(doc->editor->sci, new_file); - else - sci_set_text(doc->editor->sci, new_file); + sci_replace_sel(doc->editor->sci, new_file); + /* select affected lines and set statusbar message */ user_indicate(doc->editor, lines_affected, sel); sci_end_undo_action(doc->editor->sci); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9b690f: lineoperations: removed unnecessary parameters
by Sylvan Mostert 04 Jan '17

04 Jan '17

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Fri, 09 Sep 2016 05:47:12 UTC Commit: 9b690f10775776fac556d33af705fd1bb580c7bf https://github.com/geany/geany-plugins/commit/9b690f10775776fac556d33af705f… Log Message: ----------- lineoperations: removed unnecessary parameters Most functions did not need GeanyDocument* passed in so it was removed. For functions that did need GeanyDocument*, it was reduced to either GeanyEditor* or ScintillaObject*. Modified Paths: -------------- lineoperations/src/linefunctions.c lineoperations/src/linefunctions.h lineoperations/src/lineoperations.c Modified: lineoperations/src/linefunctions.c 35 lines changed, 22 insertions(+), 13 deletions(-) =================================================================== @@ -1,5 +1,6 @@ /* - * linefunctions.c - Line operations, remove duplicate lines, empty lines, lines with only whitespace, sort lines. + * linefunctions.c - Line operations, remove duplicate lines, empty lines, + * lines with only whitespace, sort lines. * * Copyright 2015 Sylvan Mostert <smostert.dev(a)gmail.com> * @@ -23,14 +24,16 @@ /* comparison function to be used in qsort */ -static gint compare_asc(const void * a, const void * b) +static gint +compare_asc(const void * a, const void * b) { return strcmp(*(const gchar **) a, *(const gchar **) b); } /* comparison function to be used in qsort */ -static gint compare_desc(const void * a, const void * b) +static gint +compare_desc(const void * a, const void * b) { return strcmp(*(const gchar **) b, *(const gchar **) a); } @@ -85,12 +88,12 @@ rmdupln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) for(j = (i+1); j < num_lines; j++) { if(!to_remove[j] && strcmp(lines[i], lines[j]) == 0) - to_remove[j] = TRUE; /* line is duplicate, mark to remove */ + to_remove[j] = TRUE; /* line is duplicate, mark to remove */ } } } - /* copy **lines into 'new_file' if it is not FALSE(not duplicate) */ + /* copy **lines into 'new_file' if it is not FALSE (not duplicate) */ for(i = 0; i < num_lines; i++) if(!to_remove[i]) nf_end = g_stpcpy(nf_end, lines[i]); @@ -145,8 +148,8 @@ rmemtyln(GeanyDocument *doc, gint line_num, gint end_line_num) while(line_num <= end_line_num) /* loop through lines */ { /* check if the first posn of the line is also the end of line posn */ - if(sci_get_position_from_line(doc->editor->sci, i) == - sci_get_line_end_position(doc->editor->sci, i)) + if(sci_get_position_from_line(sci, line_num) == + sci_get_line_end_position (sci, line_num)) { scintilla_send_message(doc->editor->sci, SCI_DELETERANGE, @@ -155,6 +158,7 @@ rmemtyln(GeanyDocument *doc, gint line_num, gint end_line_num) line_num--; end_line_num--; } + line_num++; } } @@ -169,13 +173,13 @@ rmwhspln(GeanyDocument *doc, gint line_num, gint end_line_num) { indent = scintilla_send_message(doc->editor->sci, SCI_GETLINEINDENTPOSITION, - i, 0); + line_num, 0); /* check if the posn of indentation is also the end of line posn */ if(indent - - sci_get_position_from_line(doc->editor->sci, i) == - sci_get_line_end_position(doc->editor->sci, i)- - sci_get_position_from_line(doc->editor->sci, i)) + sci_get_position_from_line(doc->editor->sci, line_num) == + sci_get_line_end_position (doc->editor->sci, line_num)- + sci_get_position_from_line(doc->editor->sci, line_num)) { scintilla_send_message(doc->editor->sci, SCI_DELETERANGE, @@ -184,13 +188,16 @@ rmwhspln(GeanyDocument *doc, gint line_num, gint end_line_num) line_num--; end_line_num--; } + line_num++; } } /* Sort Lines Ascending */ -void sortlinesasc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) { +void +sortlnsasc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) +{ gchar *nf_end = new_file; /* points to last char of new_file */ gint i; @@ -203,7 +210,9 @@ void sortlinesasc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_ /* Sort Lines Descending */ -void sortlinesdesc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) { +void +sortlndesc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) +{ gchar *nf_end = new_file; /* points to last char of new_file */ gint i; Modified: lineoperations/src/linefunctions.h 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -32,36 +32,36 @@ /* Remove Duplicate Lines, sorted */ void -rmdupst(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); +rmdupst(gchar **lines, gint num_lines, gchar *new_file); /* Remove Duplicate Lines, ordered */ void -rmdupln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); +rmdupln(gchar **lines, gint num_lines, gchar *new_file); /* Remove Unique Lines */ void -rmunqln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); +rmunqln(gchar **lines, gint num_lines, gchar *new_file); /* Remove Empty Lines */ void -rmemtyln(GeanyDocument *doc, gint line_num, gint end_line_num); +rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num); /* Remove Whitespace Lines */ void -rmwhspln(GeanyDocument *doc, gint line_num, gint end_line_num); +rmwhspln(ScintillaObject *sci, gint line_num, gint end_line_num); /* Sort Lines Ascending */ void -sortlnsasc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); +sortlnsasc(gchar **lines, gint num_lines, gchar *new_file); /* Sort Lines Descending */ void -sortlndesc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); +sortlndesc(gchar **lines, gint num_lines, gchar *new_file); #endif Modified: lineoperations/src/lineoperations.c 48 lines changed, 23 insertions(+), 25 deletions(-) =================================================================== @@ -39,42 +39,42 @@ struct lo_lines { }; -/* select lines in document based on lo_lines struct parameter */ +/* selects lines in document (based of lo_lines struct parameter) */ static void -select_lines(GeanyDocument *doc, struct lo_lines sel) +select_lines(GeanyEditor *editor, struct lo_lines sel) { /* set the selection to beginning of first line */ - sci_set_selection_start(doc->editor->sci, - sci_get_position_from_line(doc->editor->sci, sel.start_posn_line)); + sci_set_selection_start(editor->sci, + sci_get_position_from_line(editor->sci, sel.start_posn_line)); /* set the selection to end of last line */ - sci_set_selection_end(doc->editor->sci, - sci_get_line_end_position(doc->editor->sci, sel.end_posn_line) + - editor_get_eol_char_len(doc->editor)); + sci_set_selection_end(editor->sci, + sci_get_line_end_position(editor->sci, sel.end_posn_line) + + editor_get_eol_char_len(editor)); } /* get lo_lines struct based off of document */ static struct lo_lines -get_current_sel_lines(GeanyDocument *doc) +get_current_sel_lines(ScintillaObject *sci) { struct lo_lines sel = { 0, 0 }; gint start_posn = 0; /* position of selection start */ gint end_posn = 0; /* position of selection end */ /* check for selection */ - if(sci_has_selection(doc->editor->sci)) + if(sci_has_selection(sci)) { /* get the start and end positions */ - start_posn = sci_get_selection_start(doc->editor->sci); - end_posn = sci_get_selection_end (doc->editor->sci); + start_posn = sci_get_selection_start(sci); + end_posn = sci_get_selection_end (sci); /* get the line number of those positions */ - sel.start_posn_line = scintilla_send_message(doc->editor->sci, + sel.start_posn_line = scintilla_send_message(sci, SCI_LINEFROMPOSITION, start_posn, 0); - sel.end_posn_line = scintilla_send_message(doc->editor->sci, + sel.end_posn_line = scintilla_send_message(sci, SCI_LINEFROMPOSITION, end_posn, 0); @@ -85,7 +85,7 @@ get_current_sel_lines(GeanyDocument *doc) /* if there is no selection, start at first line */ sel.start_posn_line = 0; /* and end at last one */ - sel.end_posn_line = (sci_get_line_count(doc->editor->sci) - 1); + sel.end_posn_line = (sci_get_line_count(sci) - 1); sel.is_selection = FALSE; } @@ -118,13 +118,10 @@ static void action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) { /* function pointer to gdata -- function to be used */ - void (*func)(GeanyDocument * doc, - gchar **lines, - gint num_lines, - gchar *new_file) = gdata; + void (*func)(gchar **lines, gint num_lines, gchar *new_file) = gdata; GeanyDocument *doc = document_get_current(); - struct lo_lines sel = get_current_sel_lines(doc); + struct lo_lines sel = get_current_sel_lines(doc->editor->sci); gint num_chars = 0; gint num_lines = (sel.end_posn_line - sel.start_posn_line) + 1; gchar **lines = g_malloc(sizeof(gchar *) * num_lines); @@ -143,7 +140,7 @@ action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) new_file[0] = '\0'; /* select lines to indicate to user what lines were altered */ - select_lines(doc, sel); + select_lines(doc->editor, sel); sci_start_undo_action(doc->editor->sci); @@ -154,7 +151,7 @@ action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) ensure_final_newline(doc->editor, num_lines); } - if(doc) func(doc, lines, num_lines, new_file); + if(doc) func(lines, num_lines, new_file); /* set new document */ if(sci_has_selection(doc->editor->sci)) @@ -181,16 +178,17 @@ static void action_sci_manip_item(GtkMenuItem *menuitem, gpointer gdata) { /* function pointer to gdata -- function to be used */ - void (*func)(GeanyDocument *, gint, gint) = gdata; + void (*func)(ScintillaObject *, gint, gint) = gdata; GeanyDocument *doc = document_get_current(); - struct lo_lines sel = get_current_sel_lines(doc); + struct lo_lines sel = get_current_sel_lines(doc->editor->sci); /* select lines to indicate to user what lines were altered */ - select_lines(doc, sel); + if(sel.is_selection) + select_lines(doc->editor, sel); sci_start_undo_action(doc->editor->sci); - if(doc) func(doc, sel.start_posn_line, sel.end_posn_line); + if(doc) func(doc->editor->sci, sel.start_posn_line, sel.end_posn_line); sci_end_undo_action(doc->editor->sci); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits January 2017