Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Wed, 05 Dec 2018 16:20:41 UTC
Commit: 74113324380585a0783fdf278b60707c4f35b08c
https://github.com/geany/geany/commit/74113324380585a0783fdf278b60707c4f35b…
Log Message:
-----------
Remvoe a fuzzy string from da.po
Modified Paths:
--------------
po/da.po
Modified: po/da.po
42 lines changed, 22 insertions(+), 20 deletions(-)
===================================================================
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: geany 1.34\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-04 02:36+0000\n"
+"POT-Creation-Date: 2018-12-05 17:19+0100\n"
"PO-Revision-Date: 2018-12-04 22:46+0200\n"
"Last-Translator: scootergrisen\n"
"Language-Team: Danish\n"
@@ -104,11 +104,11 @@ msgstr "_Søg"
msgid "Open Selected F_ile"
msgstr "Åbn _valgte fil"
-#: ../data/geany.glade.h:19 ../src/symbols.c:2596
+#: ../data/geany.glade.h:19 ../src/symbols.c:2605
msgid "Find _Usage"
msgstr "Find _anvendelse"
-#: ../data/geany.glade.h:20 ../src/symbols.c:2601
+#: ../data/geany.glade.h:20 ../src/symbols.c:2610
msgid "Find _Document Usage"
msgstr "Find _dokumentanvendelse"
@@ -1060,8 +1060,8 @@ msgid ""
"greater than 0 to specify the column where it should appear."
msgstr ""
"Markøren til lang linje er en tynd lodret linje i editoren, den hjælper med "
-"at mærke lange linjer, eller som et hint til at bryde linjen. Indstil værdien "
-"til en værdi større end 0 for at angive kolonnen hvor den skal vises."
+"at mærke lange linjer, eller som et hint til at bryde linjen. Indstil "
+"værdien til en værdi større end 0 for at angive kolonnen hvor den skal vises."
#: ../data/geany.glade.h:221
msgid "Line"
@@ -1305,7 +1305,7 @@ msgid "Tools"
msgstr "Værktøjer"
#: ../data/geany.glade.h:273
-msgid "email address of the developer"
+msgid "Email address of the developer"
msgstr "Udviklerens e-mailadresse"
#: ../data/geany.glade.h:274
@@ -1775,7 +1775,7 @@ msgstr "Find _næste"
msgid "Find _Previous"
msgstr "Find f_orrige"
-#: ../data/geany.glade.h:381 ../src/symbols.c:2606
+#: ../data/geany.glade.h:381 ../src/symbols.c:2615
msgid "Find in F_iles..."
msgstr "Find i f_iler..."
@@ -2519,7 +2519,8 @@ msgstr "Indtast linjen du vil gå til:"
#: ../src/callbacks.c:1002 ../src/callbacks.c:1028
msgid ""
"Please set the filetype for the current file before using this function."
-msgstr "Indstil venligst filtypen for den nuværende fil inden funktionen bruges."
+msgstr ""
+"Indstil venligst filtypen for den nuværende fil inden funktionen bruges."
#: ../src/callbacks.c:1318 ../src/callbacks.c:1326
msgid "No more message items."
@@ -2695,7 +2696,7 @@ msgstr ""
#: ../src/dialogs.c:1204 ../src/dialogs.c:1205 ../src/dialogs.c:1206
#: ../src/dialogs.c:1212 ../src/dialogs.c:1213 ../src/dialogs.c:1214
-#: ../src/symbols.c:2410 ../src/symbols.c:2426 ../src/ui_utils.c:289
+#: ../src/symbols.c:2419 ../src/symbols.c:2435 ../src/ui_utils.c:289
msgid "unknown"
msgstr "ukendt"
@@ -3765,8 +3766,8 @@ msgid ""
"Set initial column number to COLUMN for the first opened file (useful in "
"conjunction with --line)"
msgstr ""
-"Indstil indledende kolonnenummer til KOLONNE til filen som åbnes først (nyttig "
-"sammen med --line)"
+"Indstil indledende kolonnenummer til KOLONNE til filen som åbnes først "
+"(nyttig sammen med --line)"
#: ../src/libmain.c:122
msgid "COLUMN"
@@ -4054,11 +4055,11 @@ msgstr "Indfang tast"
msgid "Press the combination of the keys you want to use for \"%s\"."
msgstr "Tryk kombinationen af taster som du vil bruge til \"%s\"."
-#: ../src/prefs.c:227 ../src/symbols.c:2564 ../src/sidebar.c:752
+#: ../src/prefs.c:227 ../src/symbols.c:2573 ../src/sidebar.c:752
msgid "_Expand All"
msgstr "_Udfold alle"
-#: ../src/prefs.c:232 ../src/symbols.c:2569 ../src/sidebar.c:758
+#: ../src/prefs.c:232 ../src/symbols.c:2578 ../src/sidebar.c:758
msgid "_Collapse All"
msgstr "_Sammenfold alle"
@@ -4101,7 +4102,8 @@ msgid ""
"Set the information to be used in templates. See the documentation for "
"details."
msgstr ""
-"Indstil informationen som bruges i skabeloner. Se dokumentationen for detaljer."
+"Indstil informationen som bruges i skabeloner. Se dokumentationen for "
+"detaljer."
#. page Keybindings
#: ../src/prefs.c:1708
@@ -4967,32 +4969,32 @@ msgid "Could not load tags file '%s'."
msgstr "Kunne ikke indlæse tags-filen '%s'."
#. For translators: it's the filename and line number of a symbol in the goto-symbol popup menu
-#: ../src/symbols.c:1949
+#: ../src/symbols.c:1957
#, c-format
msgid "<b>%s: %lu</b>"
msgstr "<b>%s: %lu</b>"
#. For translators: it's the filename and line number of a symbol in the goto-symbol popup menu
-#: ../src/symbols.c:1952
+#: ../src/symbols.c:1960
#, c-format
msgid "%s: %lu"
msgstr "%s: %lu"
-#: ../src/symbols.c:2161
+#: ../src/symbols.c:2170
#, c-format
msgid "Forward declaration \"%s\" not found."
msgstr "Forward-deklarationen \"%s\" blev ikke fundet."
-#: ../src/symbols.c:2163
+#: ../src/symbols.c:2172
#, c-format
msgid "Definition of \"%s\" not found."
msgstr "Definitionen af \"%s\" blev ikke fundet."
-#: ../src/symbols.c:2579
+#: ../src/symbols.c:2588
msgid "Sort by _Name"
msgstr "Sortér efter _navn"
-#: ../src/symbols.c:2586
+#: ../src/symbols.c:2595
msgid "Sort by _Appearance"
msgstr "Sortér efter _udseende"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: scootergrisen <scootergrisen(a)gmail.com>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Wed, 05 Dec 2018 16:04:05 UTC
Commit: c2f48e4219f4f715989b2c1b3e5c5b82c5303c7a
https://github.com/geany/geany/commit/c2f48e4219f4f715989b2c1b3e5c5b82c5303…
Log Message:
-----------
Update da.po to 1.34 (#2006)
Modified Paths:
--------------
po/da.po
Modified: po/da.po
89 lines changed, 41 insertions(+), 48 deletions(-)
===================================================================
@@ -4,10 +4,10 @@
# scootergrisen, 2018.
msgid ""
msgstr ""
-"Project-Id-Version: geany master\n"
+"Project-Id-Version: geany 1.34\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 21:05+0100\n"
-"PO-Revision-Date: 2018-08-19 15:00+0200\n"
+"POT-Creation-Date: 2018-12-04 02:36+0000\n"
+"PO-Revision-Date: 2018-12-04 22:46+0200\n"
"Last-Translator: scootergrisen\n"
"Language-Team: Danish\n"
"Language: da\n"
@@ -54,7 +54,7 @@ msgstr "_Indsæt"
#: ../data/geany.glade.h:6
msgid "Insert _ChangeLog Entry"
-msgstr "Indsæt _ChangeLog-post"
+msgstr "Indsæt _ændringslogpost"
#: ../data/geany.glade.h:7
msgid "Insert _Function Description"
@@ -203,7 +203,7 @@ msgstr "Gemmer vinduets størrelse og gendanner den ved opstart"
#: ../data/geany.glade.h:40
msgid "Save window position"
-msgstr "Gem vindues placering"
+msgstr "Gem vinduets placering"
#: ../data/geany.glade.h:41
msgid "Saves the window position and restores it at the start"
@@ -739,18 +739,16 @@ msgstr ""
"indstillingerne på alle nuværende åbne dokumenter."
#: ../data/geany.glade.h:151
-#, fuzzy
msgid "_Width:"
-msgstr "Bredde:"
+msgstr "_Bredde:"
#: ../data/geany.glade.h:152
msgid "The width in chars of a single indent"
msgstr "Bredden i tegn på én indrykning"
#: ../data/geany.glade.h:153
-#, fuzzy
msgid "Auto-indent _mode:"
-msgstr "Tilstand for automatisk indrykning:"
+msgstr "_Tilstand for automatisk indrykning:"
#: ../data/geany.glade.h:154
msgid "Detect type from file"
@@ -805,9 +803,8 @@ msgid "Type:"
msgstr "Type:"
#: ../data/geany.glade.h:165
-#, fuzzy
msgid "Tab _key indents"
-msgstr "Indrykning med tabulatortast"
+msgstr "Indrykninger med _tabulatortast"
#: ../data/geany.glade.h:166
msgid ""
@@ -1063,7 +1060,7 @@ msgid ""
"greater than 0 to specify the column where it should appear."
msgstr ""
"Markøren til lang linje er en tynd lodret linje i editoren, den hjælper med "
-"at mærke lange linjer, eller som et hint til at bryde linjen. Sæt værdien "
+"at mærke lange linjer, eller som et hint til at bryde linjen. Indstil værdien "
"til en værdi større end 0 for at angive kolonnen hvor den skal vises."
#: ../data/geany.glade.h:221
@@ -1948,27 +1945,27 @@ msgstr "Skriv _unicode-BOM"
#: ../data/geany.glade.h:423
msgid "Set File_type"
-msgstr "Sæt _filtype"
+msgstr "Indstil _filtype"
#: ../data/geany.glade.h:424
msgid "Set _Encoding"
-msgstr "Sæt _kodning"
+msgstr "Indstil _kodning"
#: ../data/geany.glade.h:425
msgid "Set Line E_ndings"
-msgstr "Sæt _linjeskift"
+msgstr "Indstil _linjeskift"
#: ../data/geany.glade.h:426
msgid "Convert and Set to _CR/LF (Windows)"
-msgstr "Konvertér og sæt til _CR/LF (Windows)"
+msgstr "Konvertér og indstil til _CR/LF (Windows)"
#: ../data/geany.glade.h:427
msgid "Convert and Set to _LF (Unix)"
-msgstr "Konvertér og sæt til _LF (Unix)"
+msgstr "Konvertér og indstil til _LF (Unix)"
#: ../data/geany.glade.h:428
msgid "Convert and Set to CR (Classic _Mac)"
-msgstr "Konvertér og sæt til CR (klassisk _Mac)"
+msgstr "Konvertér og indstil til CR (klassisk _Mac)"
#: ../data/geany.glade.h:429 ../src/keybindings.c:668
msgid "_Clone"
@@ -2116,24 +2113,20 @@ msgid "Filename:"
msgstr "Filnavn:"
#: ../data/geany.glade.h:465
-#, fuzzy
msgid "_Name:"
-msgstr "Navn:"
+msgstr "_Navn:"
#: ../data/geany.glade.h:466
-#, fuzzy
msgid "_Description:"
-msgstr "Beskrivelse:"
+msgstr "_Beskrivelse:"
#: ../data/geany.glade.h:467
-#, fuzzy
msgid "_Base path:"
-msgstr "Grundsti:"
+msgstr "_Grundsti:"
#: ../data/geany.glade.h:468
-#, fuzzy
msgid "File _patterns:"
-msgstr "Filmønstre:"
+msgstr "_Filmønstre:"
#: ../data/geany.glade.h:469
msgid ""
@@ -2392,7 +2385,7 @@ msgstr "_Forrige fejl"
#. arguments
#: ../src/build.c:1312 ../src/build.c:2720
msgid "_Set Build Commands"
-msgstr "_Sæt byggekommandoer"
+msgstr "_Indstil byggekommandoer"
#: ../src/build.c:1587 ../src/toolbar.c:376
msgid "Build the current file"
@@ -2421,7 +2414,7 @@ msgstr "Ikke flere byggefejl."
#: ../src/build.c:1760 ../src/build.c:1762
msgid "Set menu item label"
-msgstr "Sæt menupunktets etiket"
+msgstr "Indstil menupunktets etiket"
#: ../src/build.c:1787 ../src/symbols.c:522 ../src/tools.c:397
msgid "Label"
@@ -2479,7 +2472,7 @@ msgstr ""
#: ../src/build.c:2181
msgid "Set Build Commands"
-msgstr "Sæt byggekommandoer"
+msgstr "Indstil byggekommandoer"
#: ../src/build.c:2396
msgid "_Compile"
@@ -2526,7 +2519,7 @@ msgstr "Indtast linjen du vil gå til:"
#: ../src/callbacks.c:1002 ../src/callbacks.c:1028
msgid ""
"Please set the filetype for the current file before using this function."
-msgstr "Sæt venligst filtypen for den nuværende fil inden funktionen bruges."
+msgstr "Indstil venligst filtypen for den nuværende fil inden funktionen bruges."
#: ../src/callbacks.c:1318 ../src/callbacks.c:1326
msgid "No more message items."
@@ -2559,7 +2552,7 @@ msgstr "Ingen konteksthandling sat."
#: ../src/document.c:2375
#, c-format
msgid "\"%s\" was not found."
-msgstr "Fandt ikke \"%s\"."
+msgstr "\"%s\" blev ikke fundet."
#. auto-detect
#: ../src/dialogs.c:223 ../src/encodings.c:531
@@ -2589,7 +2582,7 @@ msgstr "Vis _skjulte filer"
#: ../src/dialogs.c:326
msgid "Set encoding:"
-msgstr "Sæt kodning:"
+msgstr "Indstil kodning:"
#: ../src/dialogs.c:335
msgid ""
@@ -2608,7 +2601,7 @@ msgstr ""
#. line 2 with filetype combo
#: ../src/dialogs.c:342
msgid "Set filetype:"
-msgstr "Sæt filtype:"
+msgstr "Indstil filtype:"
#: ../src/dialogs.c:351
msgid ""
@@ -3772,7 +3765,7 @@ msgid ""
"Set initial column number to COLUMN for the first opened file (useful in "
"conjunction with --line)"
msgstr ""
-"Sæt indledende kolonnenummer til KOLONNE til filen som åbnes først (nyttig "
+"Indstil indledende kolonnenummer til KOLONNE til filen som åbnes først (nyttig "
"sammen med --line)"
#: ../src/libmain.c:122
@@ -3819,7 +3812,7 @@ msgstr "Returner en liste over åbne dokumenter i en kørende Geany-instans"
#: ../src/libmain.c:132
msgid "Set initial line number to LINE for the first opened file"
-msgstr "Sæt indledende linjenummer til LINJE for filen som åbnes først"
+msgstr "Indstil indledende linjenummer til LINJE for filen som åbnes først"
#: ../src/libmain.c:132
msgid "LINE"
@@ -4108,7 +4101,7 @@ msgid ""
"Set the information to be used in templates. See the documentation for "
"details."
msgstr ""
-"Sæt informationen som bruges i skabeloner. Se dokumentationen for detaljer."
+"Indstil informationen som bruges i skabeloner. Se dokumentationen for detaljer."
#. page Keybindings
#: ../src/prefs.c:1708
@@ -4169,7 +4162,7 @@ msgstr "Udskrivning af %s mislykkedes (%s)."
#: ../src/printing.c:592
msgid "Please set a print command in the preferences dialog first."
-msgstr "Sæt venligst først en udskrivningskommando i præferencer-dialogen."
+msgstr "Indstil venligst først en udskrivningskommando i præferencer-dialogen."
#: ../src/printing.c:600
#, c-format
@@ -4988,12 +4981,12 @@ msgstr "%s: %lu"
#: ../src/symbols.c:2161
#, c-format
msgid "Forward declaration \"%s\" not found."
-msgstr "Fandt ikke forward-deklarationen \"%s\"."
+msgstr "Forward-deklarationen \"%s\" blev ikke fundet."
#: ../src/symbols.c:2163
#, c-format
msgid "Definition of \"%s\" not found."
-msgstr "Fandt ikke definitionen af \"%s\"."
+msgstr "Definitionen af \"%s\" blev ikke fundet."
#: ../src/symbols.c:2579
msgid "Sort by _Name"
@@ -5204,7 +5197,7 @@ msgstr ""
#: ../src/tools.c:357 ../src/tools.c:626
msgid "Set Custom Commands"
-msgstr "Sæt brugerdefinerede kommandoer"
+msgstr "Indstil brugerdefinerede kommandoer"
#: ../src/tools.c:365
msgid ""
@@ -5395,7 +5388,7 @@ msgstr "Datoformatstreng kunne ikke konverteres (muligvis for lang)."
#: ../src/ui_utils.c:828
msgid "_Set Custom Date Format"
-msgstr "_Sæt brugerdefineret datoformat"
+msgstr "_Indstil brugerdefineret datoformat"
#: ../src/ui_utils.c:2016
msgid "Select Folder"
@@ -5464,7 +5457,7 @@ msgstr "ugyldigt VTE-bibliotek \"%s\": manglende symbol \"%s\""
#: ../src/vte.c:766
msgid "_Set Path From Document"
-msgstr "_Sæt sti fra dokument"
+msgstr "_Indstil sti fra dokument"
#: ../src/vte.c:771
msgid "_Restart Terminal"
@@ -5679,7 +5672,7 @@ msgstr "HTML (navn)"
#: ../plugins/htmlchars.c:738
msgid "_Insert Special HTML Characters..."
-msgstr "_Indsæt special-HTML-tegn..."
+msgstr "_Indsæt specielle HTML-tegn..."
#. Add menuitem for html replacement functions
#: ../plugins/htmlchars.c:753
@@ -5803,7 +5796,7 @@ msgstr "Hjem"
#: ../plugins/filebrowser.c:934
msgid "Set path from document"
-msgstr "Sæt sti fra dokument"
+msgstr "Indstil sti fra dokument"
#: ../plugins/filebrowser.c:948
msgid "Filter:"
@@ -5876,18 +5869,18 @@ msgstr ""
#: ../plugins/saveactions.c:175
#, c-format
msgid "Backup Copy: Directory could not be created (%s)."
-msgstr "Sikkerhedskopi: Mappen kunne ikke oprettes (%s)."
+msgstr "Sikkerhedskopiering: Mappen kunne ikke oprettes (%s)."
#. it's unlikely that this happens
#: ../plugins/saveactions.c:209
#, c-format
msgid "Backup Copy: File could not be read (%s)."
-msgstr "Sikkerhedskopi: Filen kunne ikke læses (%s)."
+msgstr "Sikkerhedskopiering: Filen kunne ikke læses (%s)."
#: ../plugins/saveactions.c:234
#, c-format
msgid "Backup Copy: File could not be saved (%s)."
-msgstr "Sikkerhedskopi: Filen kunne ikke gemmes (%s)."
+msgstr "Sikkerhedskopiering: Filen kunne ikke gemmes (%s)."
#: ../plugins/saveactions.c:371
#, c-format
@@ -5949,7 +5942,7 @@ msgstr "_Filtype som skal bruges til nyligt åbnede filer:"
#: ../plugins/saveactions.c:720
msgid "Backup Copy"
-msgstr "Sikkerhedskopi"
+msgstr "Sikkerhedskopiering"
#: ../plugins/saveactions.c:730
msgid "_Directory to save backup files in:"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Tue, 04 Dec 2018 21:43:18 UTC
Commit: 9cc18f9143a50bb7402bbbd499ec7081d009f931
https://github.com/geany/geany/commit/9cc18f9143a50bb7402bbbd499ec7081d009f…
Log Message:
-----------
Merge pull request #1445 from kugel-/fix-1069
Improve goto-symbols popup
Modified Paths:
--------------
doc/Doxyfile.in
scripts/gen-api-gtkdoc.py
src/symbols.c
src/utils.c
src/utils.h
Modified: doc/Doxyfile.in
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -262,6 +262,8 @@ ALIASES += "optional=\noop \xmlonly <simplesect kind=\"geany:optio
ALIASES += "cb=\noop \xmlonly <simplesect kind=\"geany:scope\">notified</simplesect>\endxmlonly"
ALIASES += "cbdata=\noop \xmlonly <simplesect kind=\"geany:closure\"></simplesect>\endxmlonly"
ALIASES += "cbfree=\noop \xmlonly <simplesect kind=\"geany:destroy\"></simplesect>\endxmlonly"
+ALIASES += "array=\noop \xmlonly <simplesect kind=\"geany:array\"></simplesect>\endxmlonly"
+ALIASES += "array{1}=\noop \xmlonly <simplesect kind=\"geany:array\">\1</simplesect>\endxmlonly"
# This tag can be used to specify a number of word-keyword mappings (TCL only).
Modified: scripts/gen-api-gtkdoc.py
7 lines changed, 5 insertions(+), 2 deletions(-)
===================================================================
@@ -75,11 +75,14 @@ def cb(self, type, str):
"geany:closure",
"geany:destroy"):
self.annot.append(type.split(":")[1])
- elif type in ("geany:transfer",
+ elif type in ("geany:array",
+ "geany:transfer",
"geany:element-type",
"geany:scope"):
type = type.split(":")[1]
- self.annot.append("%s %s" % (type, str))
+ if len(str):
+ str = " " + str
+ self.annot.append("%s%s" % (type, str))
elif (type == "see"):
return "See " + str
elif type in ("a", "c") and str in ("NULL", "TRUE", "FALSE"):
Modified: src/symbols.c
13 lines changed, 11 insertions(+), 2 deletions(-)
===================================================================
@@ -1933,15 +1933,23 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b
GdkEventButton *button_event = NULL;
TMTag *tmtag;
guint i;
-
+ gchar **short_names, **file_names;
menu = gtk_menu_new();
+ /* If popup would show multiple files present a smart file list that allows
+ * to easily distinguish the files while avoiding the file paths in their entirety */
+ file_names = g_new(gchar *, tags->len);
+ foreach_ptr_array(tmtag, i, tags)
+ file_names[i] = tmtag->file->file_name;
+ short_names = utils_strv_shorten_file_list(file_names, tags->len);
+ g_free(file_names);
+
foreach_ptr_array(tmtag, i, tags)
{
GtkWidget *item;
GtkWidget *label;
GtkWidget *image;
- gchar *fname = g_path_get_basename(tmtag->file->file_name);
+ gchar *fname = short_names[i];
gchar *text;
if (! first && have_best)
@@ -1964,6 +1972,7 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b
g_free(text);
g_free(fname);
}
+ g_free(short_names);
gtk_widget_show_all(menu);
Modified: src/utils.c
201 lines changed, 201 insertions(+), 0 deletions(-)
===================================================================
@@ -2044,6 +2044,207 @@ gchar **utils_strv_join(gchar **first, gchar **second)
return strv;
}
+/* * Returns the common prefix in a list of strings.
+ *
+ * The size of the list may be given explicitely, but defaults to @c g_strv_length(strv).
+ *
+ * @param strv The list of strings to process.
+ * @param strv_len The number of strings contained in @a strv. Can be -1 if it's terminated by @c NULL.
+ *
+ * @return The common prefix that is part of all strings (maybe empty), or NULL if an empty list
+ * was passed in.
+ */
+static gchar *utils_strv_find_common_prefix(gchar **strv, gssize strv_len)
+{
+ gsize num;
+
+ if (!NZV(strv))
+ return NULL;
+
+ num = (strv_len == -1) ? g_strv_length(strv) : (gsize) strv_len;
+
+ for (gsize i = 0; strv[0][i]; i++)
+ {
+ for (gsize j = 1; j < num; j++)
+ {
+ if (strv[j][i] != strv[0][i])
+ {
+ /* return prefix on first mismatch */
+ return g_strndup(strv[0], i);
+ }
+ }
+ }
+
+ return g_strdup(strv[0]);
+}
+
+
+/* * Returns the longest common substring in a list of strings.
+ *
+ * The size of the list may be given explicitely, but defaults to @c g_strv_length(strv).
+ *
+ * @param strv The list of strings to process.
+ * @param strv_len The number of strings contained in @a strv. Can be -1 if it's terminated by @c NULL.
+ *
+ * @return The common prefix that is part of all strings.
+ */
+static gchar *utils_strv_find_lcs(gchar **strv, gssize strv_len)
+{
+ gchar *first, *_sub, *sub;
+ gsize num;
+ gsize n_chars;
+ gsize len;
+ gsize max = 0;
+ char *lcs;
+ gsize found;
+
+ num = (strv_len == -1) ? g_strv_length(strv) : (gsize) strv_len;
+ if (num < 1)
+ return NULL;
+
+ first = strv[0];
+ len = strlen(first);
+
+ /* sub is the working area where substrings from first are copied to */
+ sub = g_malloc(len+1);
+ lcs = g_strdup("");
+ foreach_str(_sub, first)
+ {
+ gsize chars_left = len - (_sub - first);
+ /* No point in continuing if the remainder is too short */
+ if (max > chars_left)
+ break;
+ for (n_chars = 1; n_chars <= chars_left; n_chars++)
+ {
+ g_strlcpy(sub, _sub, n_chars+1);
+ found = 1;
+ for (gsize i = 1; i < num; i++)
+ {
+ if (strstr(strv[i], sub) == NULL)
+ break;
+ found++;
+ }
+ if (found == num && n_chars > max)
+ {
+ max = n_chars;
+ SETPTR(lcs, g_strdup(sub));
+ }
+ }
+ }
+ g_free(sub);
+
+ return lcs;
+}
+
+
+/** Transform file names in a list to be shorter.
+ *
+ * This function takes a list of file names (probably with absolute paths), and
+ * transforms the paths such that they are short but still unique. This is intended
+ * for dialogs which present the file list to the user, where the base name may result
+ * in duplicates (showing the full path might be inappropriate).
+ *
+ * The algorthm strips the common prefix (e-g. the user's home directory) and
+ * replaces the longest common substring with an ellipsis ("...").
+ *
+ * @param file_names @array{length=file_names_len} The list of strings to process.
+ * @param file_names_len The number of strings contained in @a file_names. Can be -1 if it's
+ * terminated by @c NULL.
+ * @return @transfer{full} A newly-allocated array of transformed paths strings, terminated by
+ @c NULL. Use @c g_strfreev() to free it.
+ *
+ * @since 1.34 (API 239)
+ */
+GEANY_API_SYMBOL
+gchar **utils_strv_shorten_file_list(gchar **file_names, gssize file_names_len)
+{
+ gsize num;
+ gsize i;
+ gchar *prefix, *substring, *lcs;
+ gchar *start, *end;
+ gchar **names;
+ gsize prefix_len, lcs_len;
+
+ /* We don't dereference file_names if file_names_len == 0. */
+ g_return_val_if_fail(file_names_len == 0 || file_names != NULL, NULL);
+
+ /* The return value shall have exactly the same size as the input. If the input is a
+ * GStrv (last element is NULL), the output will follow suit. */
+ num = (file_names_len == -1) ? g_strv_length(file_names) : (gsize) file_names_len;
+ /* Always include a terminating NULL, enables easy freeing with g_strfreev() */
+ names = g_new0(gchar *, num + 1);
+
+ prefix = utils_strv_find_common_prefix(file_names, num);
+ /* First: determine the common prefix, that will be stripped.
+ * Don't strip single-letter prefixes, such as '/' */
+ prefix_len = 0;
+ if (NZV(prefix) && prefix[1])
+ {
+ /* Only strip directory components, include trailing '/' */
+ start = strrchr(prefix, G_DIR_SEPARATOR);
+ if (start)
+ prefix_len = start - prefix + 1;
+ }
+
+ /* Second: determine the longest common substring (lcs), that will be ellipsized. Look
+ * only at the directory parts since we don't want the file name to be detected as the lcs.
+ * Also, the first component cannot be common (since it would be part of the common prefix),
+ * so ignore that as well.
+ * Surround with dir separators so that we can easily determine the boundaries for ellipsizing. */
+ for (i = 0; i < num; i++) {
+ start = strchr(file_names[i] + prefix_len, G_DIR_SEPARATOR);
+ end = start ? strrchr(start+1, G_DIR_SEPARATOR) : NULL;
+ /* Breaking out early will also skip looking for lcs (wouldn't succeed anyway). */
+ if (!start || !end)
+ break;
+ names[i] = g_strndup(start, end-start+1);
+ }
+
+ lcs_len = 0;
+ substring = (i == num) ? utils_strv_find_lcs(names, num) : NULL;
+ if (NZV(substring))
+ {
+ /* Strip leading component. */
+ start = strchr(substring, G_DIR_SEPARATOR);
+ if (start)
+ {
+ lcs = start + 1;
+ /* Strip trailing components (perhaps empty). */
+ end = strrchr(lcs, G_DIR_SEPARATOR);
+ if (end)
+ {
+ *end = '\0';
+ lcs_len = strlen(lcs);
+ /* Don't bother for tiny common parts (which are often just "." or "/"). */
+ if (lcs_len < 5)
+ lcs_len = 0;
+ }
+ }
+ }
+
+ /* Finally build the shortened list of unique file names */
+ for (i = 0; i < num; i++)
+ {
+ start = file_names[i] + prefix_len;
+ if (lcs_len == 0)
+ { /* no lcs, copy without prefix */
+ SETPTR(names[i], g_strdup(start));
+ }
+ else
+ {
+ const gchar *lcs_start = strstr(start, lcs);
+ const gchar *lcs_end = lcs_start + lcs_len;
+ /* Maybe replace with unicode's "…" ? */
+ SETPTR(names[i], g_strdup_printf("%.*s...%s", (int)(lcs_start - start), start, lcs_end));
+ }
+ }
+
+ g_free(substring);
+ g_free(prefix);
+
+ return names;
+}
+
/* Try to parse a date using g_date_set_parse(). It doesn't take any format hint,
* obviously g_date_set_parse() uses some magic.
Modified: src/utils.h
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -301,6 +301,8 @@ gchar **utils_strv_new(const gchar *first, ...) G_GNUC_NULL_TERMINATED;
gchar **utils_strv_join(gchar **first, gchar **second) G_GNUC_WARN_UNUSED_RESULT;
+gchar **utils_strv_shorten_file_list(gchar **file_names, gssize file_names_len);
+
GSList *utils_get_config_files(const gchar *subdir);
gchar *utils_get_help_url(const gchar *suffix);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).