Plugins-Commits April 2017

plugins-commits@lists.geany.org

1 participants
49 discussions

[geany/geany-plugins] c33a51: Improve the error message on attempting to run gdb
by Dimitar Toshkov Zhekov 16 Apr '17

16 Apr '17

Branch: refs/heads/master Author: Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com> Date: Sun, 16 Apr 2017 15:33:15 UTC Commit: c33a51f8aafc7153c0225a427b8c82a9c2e187a6 https://github.com/geany/geany-plugins/commit/c33a51f8aafc7153c0225a427b8c8… Log Message: ----------- Improve the error message on attempting to run gdb On failure to run gdb, Scope displays only the generic error message, such as "The system cannot find the file specified", giving the impression that the executable to be debugged is missing or has some other problem. This patch changes the message to "<gdb name>: <error>", for example "gdb: The system cannot find the file specified" (unlikely under *nix, but gdb may be missing from the PATH under Windows). Modified Paths: -------------- scope/src/debug.c Modified: scope/src/debug.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -458,7 +458,7 @@ static void load_program(void) } else { - show_error(_("%s."), gerror->message); + show_error(_("%s: %s."), pref_gdb_executable, gerror->message); g_error_free(gerror); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] b8fd44: Update of German translation
by Frank Lanitz 12 Apr '17

12 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 12 Apr 2017 21:17:38 UTC Commit: b8fd44cd25e4092845a84515a5ac4301d87b50a8 https://github.com/geany/geany-plugins/commit/b8fd44cd25e4092845a84515a5ac4… Log Message: ----------- Update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 137 lines changed, 70 insertions(+), 67 deletions(-) =================================================================== @@ -1,5 +1,5 @@ # German translation for geany-plugins -# Copyright (C) 2009-2016 THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2009-2017 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany-plugins package. # Andrew Janke <a.janke(a)gmail.com>, 2009 # Fabian Nowak <timystery(a)arcor.de>, 2012 @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Geany-Plugins 1.30\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-22 18:17+0100\n" +"POT-Creation-Date: 2017-04-12 23:12+0200\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" @@ -195,7 +195,7 @@ msgstr "XML-Tagging ausführen" #: ../addons/src/addons.c:453 ../autoclose/src/autoclose.c:884 #: ../codenav/src/codenavigation.c:292 ../geanylatex/src/geanylatex.c:240 #: ../geanyprj/src/geanyprj.c:173 ../geanyvc/src/geanyvc.c:1849 -#: ../geniuspaste/src/geniuspaste.c:318 ../sendmail/src/sendmail.c:128 +#: ../geniuspaste/src/geniuspaste.c:326 ../sendmail/src/sendmail.c:128 #: ../sendmail/src/sendmail.c:293 ../spellcheck/src/scplugin.c:157 #: ../treebrowser/src/treebrowser.c:1941 #: ../updatechecker/src/updatechecker.c:266 @@ -1335,28 +1335,28 @@ msgid "_Match type:" msgstr "_Typ:" #: ../geanyctags/src/geanyctags.c:552 -#: ../projectorganizer/src/prjorg-sidebar.c:476 +#: ../projectorganizer/src/prjorg-sidebar.c:483 msgid "exact" msgstr "exakt" #: ../geanyctags/src/geanyctags.c:553 -#: ../projectorganizer/src/prjorg-sidebar.c:477 +#: ../projectorganizer/src/prjorg-sidebar.c:484 msgid "prefix" msgstr "Präfix" #: ../geanyctags/src/geanyctags.c:554 -#: ../projectorganizer/src/prjorg-sidebar.c:478 +#: ../projectorganizer/src/prjorg-sidebar.c:485 msgid "pattern" msgstr "Muster" #: ../geanyctags/src/geanyctags.c:563 -#: ../projectorganizer/src/prjorg-sidebar.c:155 -#: ../projectorganizer/src/prjorg-sidebar.c:499 +#: ../projectorganizer/src/prjorg-sidebar.c:162 +#: ../projectorganizer/src/prjorg-sidebar.c:506 msgid "C_ase sensitive" msgstr "_Groß-/Kleinschreibung beachten" #: ../geanyctags/src/geanyctags.c:566 -#: ../projectorganizer/src/prjorg-sidebar.c:502 +#: ../projectorganizer/src/prjorg-sidebar.c:509 msgid "_Declaration" msgstr "_Deklaration" @@ -3818,7 +3818,7 @@ msgstr "_OK" #: ../geanymacro/src/geanymacro.c:1394 ../geanymacro/src/geanymacro.c:1537 #: ../geanymacro/src/geanymacro.c:1827 -#: ../projectorganizer/src/prjorg-sidebar.c:299 +#: ../projectorganizer/src/prjorg-sidebar.c:306 msgid "_Cancel" msgstr "_Abbrechen" @@ -3836,8 +3836,8 @@ msgid "Search for contents of clipboard" msgstr "Suchen nach Inhalten aus der Zwischenablage" #: ../geanymacro/src/geanymacro.c:1424 -#: ../projectorganizer/src/prjorg-sidebar.c:127 -#: ../projectorganizer/src/prjorg-sidebar.c:453 +#: ../projectorganizer/src/prjorg-sidebar.c:134 +#: ../projectorganizer/src/prjorg-sidebar.c:460 msgid "Search for:" msgstr "Suchen nach:" @@ -4589,11 +4589,11 @@ msgstr "Im Projekt suchen" msgid "Remove File" msgstr "Datei entfernen" -#: ../geanyprj/src/sidebar.c:240 ../projectorganizer/src/prjorg-sidebar.c:1484 +#: ../geanyprj/src/sidebar.c:240 ../projectorganizer/src/prjorg-sidebar.c:1498 msgid "H_ide Sidebar" msgstr "Seitenleiste _verstecken" -#: ../geanyprj/src/sidebar.c:456 ../projectorganizer/src/prjorg-sidebar.c:1506 +#: ../geanyprj/src/sidebar.c:456 ../projectorganizer/src/prjorg-sidebar.c:1520 msgid "Project" msgstr "Projekt" @@ -4996,25 +4996,25 @@ msgstr "Ein_tragen (commit)" msgid "Commit changes." msgstr "Änderungen eintragen." -#: ../geniuspaste/src/geniuspaste.c:93 +#: ../geniuspaste/src/geniuspaste.c:101 msgid "Paste your code on your favorite pastebin" msgstr "Quelltexte bei bevorzugter Code-Ablagestelle hinterlegen" -#: ../geniuspaste/src/geniuspaste.c:114 +#: ../geniuspaste/src/geniuspaste.c:122 #, c-format msgid "Group \"%s\" not found." msgstr "Gruppe »%s« konnte nicht gefunden werden." -#: ../geniuspaste/src/geniuspaste.c:133 +#: ../geniuspaste/src/geniuspaste.c:141 #, c-format msgid "Group \"%s\" has no key \"%s\"." msgstr "Gruppe »%s« hat keinen Eintrag »%s«." -#: ../geniuspaste/src/geniuspaste.c:678 +#: ../geniuspaste/src/geniuspaste.c:781 msgid "Invalid pastebin service." msgstr "Ungültiger Dienst" -#: ../geniuspaste/src/geniuspaste.c:679 +#: ../geniuspaste/src/geniuspaste.c:782 #, c-format msgid "" "Unknown pastebin service \"%s\". Select an existing pastebin service in the " @@ -5024,15 +5024,15 @@ msgstr "" "Dienst in den Einstellungen oder erstelle eine neue Konfiguration und " "versuche es erneut." -#: ../geniuspaste/src/geniuspaste.c:691 +#: ../geniuspaste/src/geniuspaste.c:794 msgid "Refusing to create blank paste" msgstr "Ein leeres Dokument kann nicht hochgeladen werden." -#: ../geniuspaste/src/geniuspaste.c:711 +#: ../geniuspaste/src/geniuspaste.c:814 msgid "Failed to paste the code" msgstr "Konnten die Inhalte nicht senden" -#: ../geniuspaste/src/geniuspaste.c:712 +#: ../geniuspaste/src/geniuspaste.c:815 #, c-format msgid "" "Error pasting the code to the pastebin service %s.\n" @@ -5045,29 +5045,29 @@ msgstr "" "\n" "%s" -#: ../geniuspaste/src/geniuspaste.c:716 +#: ../geniuspaste/src/geniuspaste.c:819 msgid "Check your connection or the pastebin configuration and retry." msgstr "" "Überprüfen Sie Ihre Internet-Verbindung sowie die Konfiguration und " "versuchen es erneut." -#: ../geniuspaste/src/geniuspaste.c:718 +#: ../geniuspaste/src/geniuspaste.c:821 msgid "" "Wait for the service to come back and retry, or retry with another pastebin " "service." msgstr "" "Warten Sie, bis der Dienst wieder verfügbar ist, oder versuchen Sie einen " "anderen Dienst." -#: ../geniuspaste/src/geniuspaste.c:720 ../geniuspaste/src/geniuspaste.c:737 +#: ../geniuspaste/src/geniuspaste.c:823 ../geniuspaste/src/geniuspaste.c:840 msgid "Check the pastebin configuration and retry." msgstr "Bitte überprüfen Sie die Konfigurationen und versuchen Sie es erneut." -#: ../geniuspaste/src/geniuspaste.c:731 +#: ../geniuspaste/src/geniuspaste.c:834 msgid "Failed to obtain paste URL." msgstr "Konnte die URL des Pastebin-Dienstes nicht herausfinden." -#: ../geniuspaste/src/geniuspaste.c:732 +#: ../geniuspaste/src/geniuspaste.c:835 #, c-format msgid "" "The code was successfully pasted on %s, but an error occurred trying to " @@ -5080,15 +5080,15 @@ msgstr "" "\n" "%s" -#: ../geniuspaste/src/geniuspaste.c:736 +#: ../geniuspaste/src/geniuspaste.c:839 msgid "Unexpected response from the pastebin service." msgstr "Unerwartete Antwort des Pastebin-Dienstes." -#: ../geniuspaste/src/geniuspaste.c:749 +#: ../geniuspaste/src/geniuspaste.c:852 msgid "Paste Successful" msgstr "Das Hochladen war erfolgreich." -#: ../geniuspaste/src/geniuspaste.c:750 +#: ../geniuspaste/src/geniuspaste.c:853 #, c-format msgid "" "Your paste can be found here:\n" @@ -5097,29 +5097,29 @@ msgstr "" "Der gesendete Inhalt kann jetzt hier betrachtet werden: <a href=\"%s\" title=" "\"Klicken, um im Browser betrachtet zu werden\">%s</a>" -#: ../geniuspaste/src/geniuspaste.c:768 +#: ../geniuspaste/src/geniuspaste.c:871 msgid "There are no opened documents. Open one and retry.\n" msgstr "" "Momentan sind keine Dokumente geöffnet. Öffnen Sie eines und versuchen Sie " "es erneut.\n" -#: ../geniuspaste/src/geniuspaste.c:781 +#: ../geniuspaste/src/geniuspaste.c:884 msgid "The author name field is empty!" msgstr "Der Autorenname ist leer" -#: ../geniuspaste/src/geniuspaste.c:801 +#: ../geniuspaste/src/geniuspaste.c:904 msgid "Select a pastebin:" msgstr "Code-Ablagestelle:" -#: ../geniuspaste/src/geniuspaste.c:804 +#: ../geniuspaste/src/geniuspaste.c:907 msgid "Enter the author name:" msgstr "Autorenname:" -#: ../geniuspaste/src/geniuspaste.c:825 +#: ../geniuspaste/src/geniuspaste.c:928 msgid "Show your paste in a new browser tab" msgstr "Code-Ablage in einem neuen Reiter im Browser zeigen" -#: ../geniuspaste/src/geniuspaste.c:846 +#: ../geniuspaste/src/geniuspaste.c:949 msgid "_Paste it!" msgstr "Zu _Pastebin senden" @@ -5221,33 +5221,37 @@ msgstr "Entferne doppelte Zeilen (_Reihenfolge des Auftretens)" #: ../lineoperations/src/lineoperations.c:258 msgid "Remove _Unique Lines" -msgstr "Entferne _einzelne Zeilen" +msgstr "Entferne _einmalige Zeilen" -#: ../lineoperations/src/lineoperations.c:261 +#: ../lineoperations/src/lineoperations.c:260 +msgid "Keep _Unique Lines" +msgstr "Einmalige Zeilen _behalten" + +#: ../lineoperations/src/lineoperations.c:263 msgid "Remove _Empty Lines" msgstr "Entferne leere Zeilen" -#: ../lineoperations/src/lineoperations.c:263 +#: ../lineoperations/src/lineoperations.c:265 msgid "Remove _Whitespace Lines" msgstr "Entferne Zeilen mit Leerzeichen" -#: ../lineoperations/src/lineoperations.c:266 +#: ../lineoperations/src/lineoperations.c:268 msgid "Sort Lines _Ascending" msgstr "Sortiere Zeilen, _aufsteigend" -#: ../lineoperations/src/lineoperations.c:268 +#: ../lineoperations/src/lineoperations.c:270 msgid "Sort Lines _Descending" msgstr "Sortiere Zeilen, a_bsteigend" -#: ../lineoperations/src/lineoperations.c:272 +#: ../lineoperations/src/lineoperations.c:274 msgid "_Line Operations" msgstr "Zeilenoperationen" -#: ../lineoperations/src/lineoperations.c:318 +#: ../lineoperations/src/lineoperations.c:320 msgid "Line Operations" msgstr "Zeilenoperationen" -#: ../lineoperations/src/lineoperations.c:319 +#: ../lineoperations/src/lineoperations.c:321 msgid "" "Line Operations provides a handful of functions that can be applied to a " "document or selection such as, removing duplicate lines, removing empty " @@ -6053,85 +6057,85 @@ msgstr "" "Datei-Muster innerhalb des Projekt-Reiters -- auch für den »In Dateien " "suchen«-Dialog eingeschränkt werden." -#: ../projectorganizer/src/prjorg-sidebar.c:116 +#: ../projectorganizer/src/prjorg-sidebar.c:123 msgid "Find File" msgstr "Datei suchen" -#: ../projectorganizer/src/prjorg-sidebar.c:143 -#: ../projectorganizer/src/prjorg-sidebar.c:487 +#: ../projectorganizer/src/prjorg-sidebar.c:150 +#: ../projectorganizer/src/prjorg-sidebar.c:494 msgid "Search inside:" msgstr "Suchen in:" -#: ../projectorganizer/src/prjorg-sidebar.c:158 +#: ../projectorganizer/src/prjorg-sidebar.c:165 msgid "Search in full path" msgstr "Im vollen Pfad suchen" -#: ../projectorganizer/src/prjorg-sidebar.c:169 -#: ../projectorganizer/src/prjorg-sidebar.c:650 +#: ../projectorganizer/src/prjorg-sidebar.c:176 +#: ../projectorganizer/src/prjorg-sidebar.c:657 msgid "project or external directory" msgstr "Projekt oder externen Verzeichnis" -#: ../projectorganizer/src/prjorg-sidebar.c:297 +#: ../projectorganizer/src/prjorg-sidebar.c:304 msgid "Add External Directory" msgstr "Externes Verzeichnis hinzufügen" -#: ../projectorganizer/src/prjorg-sidebar.c:300 +#: ../projectorganizer/src/prjorg-sidebar.c:307 msgid "Add" msgstr "Hinzufügen" -#: ../projectorganizer/src/prjorg-sidebar.c:442 +#: ../projectorganizer/src/prjorg-sidebar.c:449 msgid "Find Symbol" msgstr "Symbol finden" -#: ../projectorganizer/src/prjorg-sidebar.c:471 +#: ../projectorganizer/src/prjorg-sidebar.c:478 msgid "Match type:" msgstr "Typ:" -#: ../projectorganizer/src/prjorg-sidebar.c:1061 +#: ../projectorganizer/src/prjorg-sidebar.c:1068 msgid "Set file patterns under Project->Properties" msgstr "Dateimuster unter Projekt->Eigenschaften definieren" -#: ../projectorganizer/src/prjorg-sidebar.c:1341 +#: ../projectorganizer/src/prjorg-sidebar.c:1355 msgid "Reload all" msgstr "Alle neuladen" -#: ../projectorganizer/src/prjorg-sidebar.c:1350 +#: ../projectorganizer/src/prjorg-sidebar.c:1364 msgid "Add external directory" msgstr "Externes Verzeichnis hinzufügen" -#: ../projectorganizer/src/prjorg-sidebar.c:1360 +#: ../projectorganizer/src/prjorg-sidebar.c:1374 msgid "Expand all" msgstr "Alle ausklappen" -#: ../projectorganizer/src/prjorg-sidebar.c:1367 +#: ../projectorganizer/src/prjorg-sidebar.c:1381 msgid "Collapse to project root" msgstr "Zusammenfalten bis Projektwurzel" -#: ../projectorganizer/src/prjorg-sidebar.c:1378 +#: ../projectorganizer/src/prjorg-sidebar.c:1392 msgid "Follow active editor" msgstr "Aktiven Editor folgen" -#: ../projectorganizer/src/prjorg-sidebar.c:1424 +#: ../projectorganizer/src/prjorg-sidebar.c:1438 msgid "Open a project to start using the plugin" msgstr "Ein Projekt zum Starten des Plugins öffnen" -#: ../projectorganizer/src/prjorg-sidebar.c:1433 +#: ../projectorganizer/src/prjorg-sidebar.c:1447 msgid "Expand All" msgstr "Alle ausklappen" -#: ../projectorganizer/src/prjorg-sidebar.c:1442 +#: ../projectorganizer/src/prjorg-sidebar.c:1456 msgid "Find in Files..." msgstr "In Dateien finden..." -#: ../projectorganizer/src/prjorg-sidebar.c:1451 +#: ../projectorganizer/src/prjorg-sidebar.c:1465 msgid "Find File..." msgstr "Datei suchen..." -#: ../projectorganizer/src/prjorg-sidebar.c:1460 +#: ../projectorganizer/src/prjorg-sidebar.c:1474 msgid "Find Symbol..." msgstr "Symbol finden..." -#: ../projectorganizer/src/prjorg-sidebar.c:1473 +#: ../projectorganizer/src/prjorg-sidebar.c:1487 msgid "Remove External Directory" msgstr "Externes Verzeichnis entfernen" @@ -7667,7 +7671,6 @@ msgid "Create New Directory" msgstr "Neues Verzeichnis erstellen" #: ../treebrowser/src/treebrowser.c:2148 -#, fuzzy msgid "Track Current" msgstr "Pfad aufzeichnen" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 408d15: Merge pull request #560 from lschw/keep-unique-lines
by Frank Lanitz 12 Apr '17

12 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 12 Apr 2017 21:10:38 UTC Commit: 408d153da89e256a14a637f6c82aa4b3d40b5847 https://github.com/geany/geany-plugins/commit/408d153da89e256a14a637f6c82aa… Log Message: ----------- Merge pull request #560 from lschw/keep-unique-lines Add Keep Unique Lines feature resolves #516 Modified Paths: -------------- lineoperations/README lineoperations/src/linefunctions.c lineoperations/src/linefunctions.h lineoperations/src/lineoperations.c Modified: lineoperations/README 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ Features * Remove Duplicate Lines, sorted * Remove Duplicate Lines, ordered * Remove Unique Lines +* Keep Unique Lines * Remove Empty Lines * Remove Whitespace Lines * Sort Lines Ascending @@ -113,6 +114,32 @@ Removes all lines that appear only once. Line 1 Line 2 + +Keep Unique Lines +------------------- + +Keep all lines that appear only once. + + Example: Suppose a file has the following lines. (#comments added for + clarity) + + :: + + Line 4 + Line 1 #removed + Line 2 #removed + Line 3 + Line 1 #removed + Line 2 #removed + + The **Keep Unique Lines** will change the file into this: + + :: + + Line 4 + Line 3 + + Remove Empty Lines ------------------ Modified: lineoperations/src/linefunctions.c 44 lines changed, 44 insertions(+), 0 deletions(-) =================================================================== @@ -159,6 +159,50 @@ rmunqln(gchar **lines, gint num_lines, gchar *new_file) } +/* Keep Unique Lines */ +gint +kpunqln(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; /* to 'mark' which lines to remove */ + gint changed = 0; /* number of lines removed */ + + + /* allocate and set *to_remove to all FALSE + * to_remove[i] represents whether lines[i] should be removed */ + to_remove = g_malloc(sizeof(gboolean) * num_lines); + for(i = 0; i < num_lines; i++) + to_remove[i] = FALSE; + + /* find all non unique lines and set them to TRUE (to be removed) */ + for(i = 0; i < num_lines; i++) + /* make sure that the line is not already determined to be non unique */ + if(!to_remove[i]) + for(j = (i+1); j < num_lines; j++) + if(!to_remove[j] && strcmp(lines[i], lines[j]) == 0) + { + to_remove[i] = TRUE; + to_remove[j] = TRUE; + } + + /* 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 */ gint rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num) Modified: lineoperations/src/linefunctions.h 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -45,6 +45,11 @@ gint rmunqln(gchar **lines, gint num_lines, gchar *new_file); +/* Keep Unique Lines */ +gint +kpunqln(gchar **lines, gint num_lines, gchar *new_file); + + /* Remove Empty Lines */ gint rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num); Modified: lineoperations/src/lineoperations.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -257,6 +257,8 @@ lo_init(GeanyPlugin *plugin, gpointer gdata) G_CALLBACK(action_indir_manip_item), (gpointer) rmdupln }, { N_("Remove _Unique Lines"), G_CALLBACK(action_indir_manip_item), (gpointer) rmunqln }, + { N_("Keep _Unique Lines"), + G_CALLBACK(action_indir_manip_item), (gpointer) kpunqln }, { NULL }, { N_("Remove _Empty Lines"), G_CALLBACK(action_sci_manip_item), (gpointer) rmemtyln }, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 62314d: Add Keep Unique Lines feature resolves #516
by Lukas Schwarz 12 Apr '17

12 Apr '17

Branch: refs/heads/master Author: Lukas Schwarz <lukas(a)localhost.localdomain> Committer: Lukas Schwarz <lukas(a)localhost.localdomain> Date: Wed, 12 Apr 2017 20:32:43 UTC Commit: 62314d1117a6c6655f046650ee76e76f82e7f3a1 https://github.com/geany/geany-plugins/commit/62314d1117a6c6655f046650ee76e… Log Message: ----------- Add Keep Unique Lines feature resolves #516 Modified Paths: -------------- lineoperations/README lineoperations/src/linefunctions.c lineoperations/src/linefunctions.h lineoperations/src/lineoperations.c Modified: lineoperations/README 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ Features * Remove Duplicate Lines, sorted * Remove Duplicate Lines, ordered * Remove Unique Lines +* Keep Unique Lines * Remove Empty Lines * Remove Whitespace Lines * Sort Lines Ascending @@ -113,6 +114,32 @@ Removes all lines that appear only once. Line 1 Line 2 + +Keep Unique Lines +------------------- + +Keep all lines that appear only once. + + Example: Suppose a file has the following lines. (#comments added for + clarity) + + :: + + Line 4 + Line 1 #removed + Line 2 #removed + Line 3 + Line 1 #removed + Line 2 #removed + + The **Keep Unique Lines** will change the file into this: + + :: + + Line 4 + Line 3 + + Remove Empty Lines ------------------ Modified: lineoperations/src/linefunctions.c 44 lines changed, 44 insertions(+), 0 deletions(-) =================================================================== @@ -159,6 +159,50 @@ rmunqln(gchar **lines, gint num_lines, gchar *new_file) } +/* Keep Unique Lines */ +gint +kpunqln(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; /* to 'mark' which lines to remove */ + gint changed = 0; /* number of lines removed */ + + + /* allocate and set *to_remove to all FALSE + * to_remove[i] represents whether lines[i] should be removed */ + to_remove = g_malloc(sizeof(gboolean) * num_lines); + for(i = 0; i < num_lines; i++) + to_remove[i] = FALSE; + + /* find all non unique lines and set them to TRUE (to be removed) */ + for(i = 0; i < num_lines; i++) + /* make sure that the line is not already determined to be non unique */ + if(!to_remove[i]) + for(j = (i+1); j < num_lines; j++) + if(!to_remove[j] && strcmp(lines[i], lines[j]) == 0) + { + to_remove[i] = TRUE; + to_remove[j] = TRUE; + } + + /* 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 */ gint rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num) Modified: lineoperations/src/linefunctions.h 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -45,6 +45,11 @@ gint rmunqln(gchar **lines, gint num_lines, gchar *new_file); +/* Keep Unique Lines */ +gint +kpunqln(gchar **lines, gint num_lines, gchar *new_file); + + /* Remove Empty Lines */ gint rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num); Modified: lineoperations/src/lineoperations.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -257,6 +257,8 @@ lo_init(GeanyPlugin *plugin, gpointer gdata) G_CALLBACK(action_indir_manip_item), (gpointer) rmdupln }, { N_("Remove _Unique Lines"), G_CALLBACK(action_indir_manip_item), (gpointer) rmunqln }, + { N_("Keep _Unique Lines"), + G_CALLBACK(action_indir_manip_item), (gpointer) kpunqln }, { NULL }, { N_("Remove _Empty Lines"), G_CALLBACK(action_sci_manip_item), (gpointer) rmemtyln }, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] fd94a0: Merge pull request #559 from techee/prjorg_crash_fix2
by Frank Lanitz 10 Apr '17

10 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Mon, 10 Apr 2017 17:16:43 UTC Commit: fd94a04db16a50e0f5021b3adbcdf43801a08c41 https://github.com/geany/geany-plugins/commit/fd94a04db16a50e0f5021b3adbcdf… Log Message: ----------- Merge pull request #559 from techee/prjorg_crash_fix2 Fix crash in projectorganizer's crash-fix Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 32 lines changed, 23 insertions(+), 9 deletions(-) =================================================================== @@ -48,6 +48,13 @@ typedef enum MATCH_PATTERN } MatchType; +typedef struct +{ + GeanyProject *project; + GPtrArray *expanded_paths; +} ExpandData; + + static GdkColor s_external_color; static GtkWidget *s_toolbar = NULL; static gboolean s_pending_reload = FALSE; @@ -1210,22 +1217,27 @@ static gboolean expand_path(gchar *utf8_expanded_path, gboolean select) } -static gboolean expand_on_idle(gpointer ptr) +static gboolean expand_on_idle(ExpandData *expand_data) { GeanyDocument *doc = document_get_current(); - if (ptr) + if (!prj_org) + return FALSE; + + if (geany_data->app->project == expand_data->project && + expand_data->expanded_paths) { - GPtrArray *expanded_paths = ptr; gchar *item; guint i; - foreach_ptr_array(item, i, expanded_paths) + foreach_ptr_array(item, i, expand_data->expanded_paths) expand_path(item, FALSE); - g_ptr_array_free(expanded_paths, TRUE); + g_ptr_array_free(expand_data->expanded_paths, TRUE); } - if (!s_follow_editor || !doc || !doc->file_name || !geany_data->app->project || !prj_org) + g_free(expand_data); + + if (!s_follow_editor || !doc || !doc->file_name) return FALSE; expand_path(doc->file_name, TRUE); @@ -1281,11 +1293,13 @@ static GPtrArray *get_expanded_paths(void) void prjorg_sidebar_update(gboolean reload) { - GPtrArray *expanded_paths = NULL; + ExpandData *expand_data = g_new0(ExpandData, 1); + + expand_data->project = geany_data->app->project; if (reload) { - expanded_paths = get_expanded_paths(); + expand_data->expanded_paths = get_expanded_paths(); load_project(); /* we get color information only after the sidebar is realized - @@ -1295,7 +1309,7 @@ void prjorg_sidebar_update(gboolean reload) } /* perform on idle - avoids unnecessary jumps on project load */ - plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expanded_paths); + plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expand_data); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4f1352: Merge pull request #557 from geany/revert-555-prjorg_crash_fix
by Frank Lanitz 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 08 Apr 2017 14:55:01 UTC Commit: 4f1352f41ddefbc29377ca94599944cb400e4b84 https://github.com/geany/geany-plugins/commit/4f1352f41ddefbc29377ca9459994… Log Message: ----------- Merge pull request #557 from geany/revert-555-prjorg_crash_fix Revert "projectorganizer: Make sure project is open before trying to expand the tree" Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 29 lines changed, 9 insertions(+), 20 deletions(-) =================================================================== @@ -48,13 +48,6 @@ typedef enum MATCH_PATTERN } MatchType; -typedef struct -{ - GeanyProject *project; - GPtrArray *expanded_paths; -} ExpandData; - - static GdkColor s_external_color; static GtkWidget *s_toolbar = NULL; static gboolean s_pending_reload = FALSE; @@ -1217,24 +1210,22 @@ static gboolean expand_path(gchar *utf8_expanded_path, gboolean select) } -static gboolean expand_on_idle(ExpandData *expand_data) +static gboolean expand_on_idle(gpointer ptr) { GeanyDocument *doc = document_get_current(); - if (prj_org && geany_data->app->project == expand_data->project && - expand_data->expanded_paths) + if (ptr) { + GPtrArray *expanded_paths = ptr; gchar *item; guint i; - foreach_ptr_array(item, i, expand_data->expanded_paths) + foreach_ptr_array(item, i, expanded_paths) expand_path(item, FALSE); - g_ptr_array_free(expand_data->expanded_paths, TRUE); + g_ptr_array_free(expanded_paths, TRUE); } - g_free(expand_data); - - if (!s_follow_editor || !doc || !doc->file_name) + if (!s_follow_editor || !doc || !doc->file_name || !geany_data->app->project || !prj_org) return FALSE; expand_path(doc->file_name, TRUE); @@ -1290,13 +1281,11 @@ static GPtrArray *get_expanded_paths(void) void prjorg_sidebar_update(gboolean reload) { - ExpandData *expand_data = g_new0(ExpandData, 1); - - expand_data->project = geany_data->app->project; + GPtrArray *expanded_paths = NULL; if (reload) { - expand_data->expanded_paths = get_expanded_paths(); + expanded_paths = get_expanded_paths(); load_project(); /* we get color information only after the sidebar is realized - @@ -1306,7 +1295,7 @@ void prjorg_sidebar_update(gboolean reload) } /* perform on idle - avoids unnecessary jumps on project load */ - plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expand_data); + plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expanded_paths); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7d40df: Revert "projectorganizer: Make sure project is open before trying to expand the tree"
by Frank Lanitz 08 Apr '17

08 Apr '17

Branch: refs/heads/revert-555-prjorg_crash_fix Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 08 Apr 2017 14:54:41 UTC Commit: 7d40df646aeac326d341742543824f832a08a252 https://github.com/geany/geany-plugins/commit/7d40df646aeac326d341742543824… Log Message: ----------- Revert "projectorganizer: Make sure project is open before trying to expand the tree" Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 29 lines changed, 9 insertions(+), 20 deletions(-) =================================================================== @@ -48,13 +48,6 @@ typedef enum MATCH_PATTERN } MatchType; -typedef struct -{ - GeanyProject *project; - GPtrArray *expanded_paths; -} ExpandData; - - static GdkColor s_external_color; static GtkWidget *s_toolbar = NULL; static gboolean s_pending_reload = FALSE; @@ -1217,24 +1210,22 @@ static gboolean expand_path(gchar *utf8_expanded_path, gboolean select) } -static gboolean expand_on_idle(ExpandData *expand_data) +static gboolean expand_on_idle(gpointer ptr) { GeanyDocument *doc = document_get_current(); - if (prj_org && geany_data->app->project == expand_data->project && - expand_data->expanded_paths) + if (ptr) { + GPtrArray *expanded_paths = ptr; gchar *item; guint i; - foreach_ptr_array(item, i, expand_data->expanded_paths) + foreach_ptr_array(item, i, expanded_paths) expand_path(item, FALSE); - g_ptr_array_free(expand_data->expanded_paths, TRUE); + g_ptr_array_free(expanded_paths, TRUE); } - g_free(expand_data); - - if (!s_follow_editor || !doc || !doc->file_name) + if (!s_follow_editor || !doc || !doc->file_name || !geany_data->app->project || !prj_org) return FALSE; expand_path(doc->file_name, TRUE); @@ -1290,13 +1281,11 @@ static GPtrArray *get_expanded_paths(void) void prjorg_sidebar_update(gboolean reload) { - ExpandData *expand_data = g_new0(ExpandData, 1); - - expand_data->project = geany_data->app->project; + GPtrArray *expanded_paths = NULL; if (reload) { - expand_data->expanded_paths = get_expanded_paths(); + expanded_paths = get_expanded_paths(); load_project(); /* we get color information only after the sidebar is realized - @@ -1306,7 +1295,7 @@ void prjorg_sidebar_update(gboolean reload) } /* perform on idle - avoids unnecessary jumps on project load */ - plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expand_data); + plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expanded_paths); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7d40df: Revert "projectorganizer: Make sure project is open before trying to expand the tree"
by Frank Lanitz 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 08 Apr 2017 14:54:41 UTC Commit: 7d40df646aeac326d341742543824f832a08a252 https://github.com/geany/geany-plugins/commit/7d40df646aeac326d341742543824… Log Message: ----------- Revert "projectorganizer: Make sure project is open before trying to expand the tree" Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 29 lines changed, 9 insertions(+), 20 deletions(-) =================================================================== @@ -48,13 +48,6 @@ typedef enum MATCH_PATTERN } MatchType; -typedef struct -{ - GeanyProject *project; - GPtrArray *expanded_paths; -} ExpandData; - - static GdkColor s_external_color; static GtkWidget *s_toolbar = NULL; static gboolean s_pending_reload = FALSE; @@ -1217,24 +1210,22 @@ static gboolean expand_path(gchar *utf8_expanded_path, gboolean select) } -static gboolean expand_on_idle(ExpandData *expand_data) +static gboolean expand_on_idle(gpointer ptr) { GeanyDocument *doc = document_get_current(); - if (prj_org && geany_data->app->project == expand_data->project && - expand_data->expanded_paths) + if (ptr) { + GPtrArray *expanded_paths = ptr; gchar *item; guint i; - foreach_ptr_array(item, i, expand_data->expanded_paths) + foreach_ptr_array(item, i, expanded_paths) expand_path(item, FALSE); - g_ptr_array_free(expand_data->expanded_paths, TRUE); + g_ptr_array_free(expanded_paths, TRUE); } - g_free(expand_data); - - if (!s_follow_editor || !doc || !doc->file_name) + if (!s_follow_editor || !doc || !doc->file_name || !geany_data->app->project || !prj_org) return FALSE; expand_path(doc->file_name, TRUE); @@ -1290,13 +1281,11 @@ static GPtrArray *get_expanded_paths(void) void prjorg_sidebar_update(gboolean reload) { - ExpandData *expand_data = g_new0(ExpandData, 1); - - expand_data->project = geany_data->app->project; + GPtrArray *expanded_paths = NULL; if (reload) { - expand_data->expanded_paths = get_expanded_paths(); + expanded_paths = get_expanded_paths(); load_project(); /* we get color information only after the sidebar is realized - @@ -1306,7 +1295,7 @@ void prjorg_sidebar_update(gboolean reload) } /* perform on idle - avoids unnecessary jumps on project load */ - plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expand_data); + plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expanded_paths); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9bd3cd: Add travis status to README
by Frank Lanitz 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <fl(a)flyingcircus.io> Date: Tue, 07 Mar 2017 06:09:18 UTC Commit: 9bd3cd57ea93d99b40db2ebbb22809882cc688a8 https://github.com/geany/geany-plugins/commit/9bd3cd57ea93d99b40db2ebbb2280… Log Message: ----------- Add travis status to README Modified Paths: -------------- README Modified: README 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,12 @@ Geany-Plugins =============== +Status +------ + +.. image:: https://travis-ci.org/geany/geany-plugins.svg?branch=master + :target: https://travis-ci.org/geany/geany-plugins + Installation ------------ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 2f1865: Merge pull request #543 from frlan/master
by Frank Lanitz 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 08 Apr 2017 14:40:42 UTC Commit: 2f1865f30c4c9d66f1fb720163c1ee5738c0f0d2 https://github.com/geany/geany-plugins/commit/2f1865f30c4c9d66f1fb720163c1e… Log Message: ----------- Merge pull request #543 from frlan/master Add travis status to README Modified Paths: -------------- README Modified: README 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,12 @@ Geany-Plugins =============== +Status +------ + +.. image:: https://travis-ci.org/geany/geany-plugins.svg?branch=master + :target: https://travis-ci.org/geany/geany-plugins + Installation ------------ -------------- 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 April 2017