Commit 25

- Updated Dutch translation (thanks to Heimen Stoffels)
- Stylesheets
- Documentation

ChangeLog

@@ -2,6 +2,15 @@ Change Log
 ==========
 
 
+## 2.0.1 (2022-12-23)
+
+Changes:
+
+* Updated Dutch translation (thanks to Heimen Stoffels)
+* Stylesheets
+* Documentation
+
+
 ## 2.0.0 (2022-12-19)
 
 Changes:

README

@@ -33,13 +33,18 @@ synchronized with the new path.
 Annotations are “per user”. This means that although Alice has the right to
 annotate Bob's files, only Alice will have access to her own annotations.
 
-Emblems are displayed by the extension and will not be shown once the extension
-is uninstalled (the `metadata::emblems` database entry for the file is left
-untouched). The content of the annotations instead is managed by **GIO** and
+Annotation emblems are displayed by the extension and will not be shown once
+the extension is uninstalled (the `metadata::emblems` database entry for the
+file is left untouched). The content of the annotations instead is managed by
+**GIO** and will survive uninstalling the extension.
+
+With version 2.0.0 an emblem picker has been added to the annotations window.
+Differently than the text annotation emblem, this _will_ change the
+`metadata::emblems` database entry for the file and the emblems set in this way
 will survive uninstalling the extension.
 
-Annotations are stored in `~/.local/share/gvfs-metadata`. It is possible to
-access them via command line by launching:
+Emblems and annotations are stored in `~/.local/share/gvfs-metadata`. It is
+possible to access annotations via command line by launching:
 
 ``` sh
 gio info -a metadata::annotation /path/to/file
@@ -57,6 +62,19 @@ To unset an annotation via command line launch:
 gio set -t unset /path/to/file metadata::annotation
 ```
 
+To set the group of emblems via command line launch:
+
+``` sh
+gio set -t stringv /path/to/file metadata::emblems emblem-one emblem-two \
+	emblem-three ... emblem-nth
+```
+
+To unset all emblems via command line launch:
+
+``` sh
+gio set -t unset /path/to/file metadata::emblems
+```
+
 
 Get involved
 ------------

configure.ac

@@ -9,7 +9,7 @@ dnl  **************************************************************************
 AC_PREREQ([2.69])
 
 AC_INIT([Nautilus Annotations],
-	[2.0.0],
+	[2.0.1],
 	[madmurphy333@gmail.com],
 	[nautilus-annotations],
 	[https://gitlab.gnome.org/madmurphy/nautilus-annotations])

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nautilus-annotations",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"description": "Annotate files and directories",
 	"homepage": "https://gitlab.gnome.org/madmurphy/nautilus-annotations",
 	"author": "madmurphy333@gmail.com",

po/it.po

@@ -1,15 +1,15 @@
 # Italian translations for Nautilus Annotations.
-# Copyright (C) 2021 <madmurphy333@gmail.com>
+# Copyright (C) 2021-2022 <madmurphy333@gmail.com>
 # This file is distributed under the same license as the Nautilus Annotations
 # package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nautilus-annotations 1.0.0\n"
+"Project-Id-Version: nautilus-annotations 2.0.1\n"
 "Report-Msgid-Bugs-To: madmurphy333@gmail.com\n"
-"POT-Creation-Date: 2022-12-18 02:41+0000\n"
-"PO-Revision-Date: 2021-05-22 14:39+0200\n"
+"POT-Creation-Date: 2022-12-23 01:09+0100\n"
+"PO-Revision-Date: 2022-12-23 01:09+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -24,7 +24,7 @@ msgstr "Impossibile eliminare le annotazioni dal file"
 
 #: src/nautilus-annotations.c:281 src/nautilus-annotations.c:385
 #: src/nautilus-annotations.c:427 src/nautilus-annotations.c:445
-#: src/nautilus-annotations.c:1089 src/emblem-picker/gnui-emblem-picker.c:1404
+#: src/nautilus-annotations.c:1089 src/emblem-picker/gnui-emblem-picker.c:1405
 msgid "unknown location"
 msgstr "percorso sconosciuto"
 
@@ -176,22 +176,23 @@ msgstr[1] "Allega un'annotazione agli oggetti selezionati"
 msgid "Annotations attached to the object"
 msgstr "Annotazioni allegate all'oggetto"
 
-#: src/emblem-picker/gnui-emblem-picker.c:1403
+#: src/emblem-picker/gnui-emblem-picker.c:1404
 msgid "Could not read file's emblems"
 msgstr "Impossibile leggere gli emblemi del file"
 
-#: src/emblem-picker/gnui-emblem-picker.c:2519
-#: src/emblem-picker/gnui-emblem-picker.c:2537
+#. TRANSLATORS: Please keep this text below 21 characters
+#: src/emblem-picker/gnui-emblem-picker.c:2522
+#: src/emblem-picker/gnui-emblem-picker.c:2541
 msgid "Unsupported emblems"
 msgstr "Emblemi non supportati"
 
 #. TRANSLATORS: Please keep this text below 30 characters
-#: src/emblem-picker/gnui-emblem-picker.c:2521
-#: src/emblem-picker/gnui-emblem-picker.c:2539
+#: src/emblem-picker/gnui-emblem-picker.c:2524
+#: src/emblem-picker/gnui-emblem-picker.c:2543
 msgid "We coudn't render those :-("
 msgstr "Ci dispiace :-("
 
-#: src/emblem-picker/gnui-emblem-picker.c:2659
+#: src/emblem-picker/gnui-emblem-picker.c:2663
 #, c-format
 msgid ""
 "gnui_emblem_picker_save() - No files were passed to GnuiEmblemPicker widget "

po/nl.po

@@ -1,14 +1,14 @@
 # Dutch translations for Nautilus Annotations.
-# Copyright (C) 2021 madmurphy333@gmail.com
+# Copyright (C) 2021-2022 madmurphy333@gmail.com
 # This file is distributed under the same license as the Nautilus Annotations
 # package.
-# Heimen Stoffels <vistausss AT fastmail DOT com>, 2021.
+# Heimen Stoffels <vistausss AT fastmail DOT com>, 2021-2022.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nautilus-annotations 1.0.0\n"
+"Project-Id-Version: nautilus-annotations 2.0.1\n"
 "Report-Msgid-Bugs-To: madmurphy333@gmail.com\n"
-"POT-Creation-Date: 2022-12-18 02:41+0000\n"
+"POT-Creation-Date: 2022-12-20 11:01+0100\n"
 "PO-Revision-Date: 2022-12-20 11:01+0100\n"
 "Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
 "Language-Team: \n"
@@ -25,9 +25,9 @@ msgstr "De aantekeningen kunnen niet worden gewist"
 
 #: src/nautilus-annotations.c:281 src/nautilus-annotations.c:385
 #: src/nautilus-annotations.c:427 src/nautilus-annotations.c:445
-#: src/nautilus-annotations.c:1089 src/emblem-picker/gnui-emblem-picker.c:1404
+#: src/nautilus-annotations.c:1089 src/emblem-picker/gnui-emblem-picker.c:1405
 msgid "unknown location"
-msgstr "Onbekende locatie"
+msgstr "onbekende locatie"
 
 #: src/nautilus-annotations.c:384
 msgid "Could not save file's annotations"
@@ -177,22 +177,23 @@ msgstr[1] "Voeg een aantekening toe aan de items"
 msgid "Annotations attached to the object"
 msgstr "Bijgevoegde aantekeningen"
 
-#: src/emblem-picker/gnui-emblem-picker.c:1403
+#: src/emblem-picker/gnui-emblem-picker.c:1404
 msgid "Could not read file's emblems"
 msgstr "De aantekeningen kunnen niet worden uitgelezen"
 
-#: src/emblem-picker/gnui-emblem-picker.c:2519
-#: src/emblem-picker/gnui-emblem-picker.c:2537
+#. TRANSLATORS: Please keep this text below 21 characters
+#: src/emblem-picker/gnui-emblem-picker.c:2522
+#: src/emblem-picker/gnui-emblem-picker.c:2541
 msgid "Unsupported emblems"
 msgstr "Onbekende emblemen"
 
 #. TRANSLATORS: Please keep this text below 30 characters
-#: src/emblem-picker/gnui-emblem-picker.c:2521
-#: src/emblem-picker/gnui-emblem-picker.c:2539
+#: src/emblem-picker/gnui-emblem-picker.c:2524
+#: src/emblem-picker/gnui-emblem-picker.c:2543
 msgid "We coudn't render those :-("
-msgstr "Deze zijn niet geladen. :-("
+msgstr "Deze zijn niet geladen :-("
 
-#: src/emblem-picker/gnui-emblem-picker.c:2659
+#: src/emblem-picker/gnui-emblem-picker.c:2663
 #, c-format
 msgid ""
 "gnui_emblem_picker_save() - No files were passed to GnuiEmblemPicker widget "

src/Makefile.am

@@ -29,7 +29,9 @@ CLEANFILES = \
 
 EXTRA_DIST = \
 	emblem-picker \
-	resources
+	icons \
+	nautilus-annotations.gresources.xml \
+	style.css
 
 
 nautilus_extensiondir = $(NAUTILUS_EXTENSION_DIR)
@@ -65,15 +67,13 @@ libnautilus_annotations_la_CPPFLAGS = \
 	'-DGNUISANCE_CONST_BUILD_FLAG_NO_ENVIRONMENT'
 
 
-nautilus-annotations.gresources.c: \
- resources/nautilus-annotations.gresources.xml
-	glib-compile-resources --sourcedir='resources' --target='$@' \
+nautilus-annotations.gresources.c: nautilus-annotations.gresources.xml
+	glib-compile-resources --target='$@' \
 	--c-name gnui_emblem_picker --generate-source '$<';
 
 
-nautilus-annotations.gresources.h: \
- resources/nautilus-annotations.gresources.xml
-	glib-compile-resources --sourcedir='resources' --target='$@' \
+nautilus-annotations.gresources.h: nautilus-annotations.gresources.xml
+	glib-compile-resources --target='$@' \
 	--c-name gnui_emblem_picker --generate-header '$<';
 
 

src/emblem-picker/gnui-definitions.h

@@ -459,7 +459,7 @@ static inline GList * gnui_list_prepend_llink (
                 to the member to remove and which after the call will be set to
                 the next member in the list
 
-    Like `gnui_list_detach_and_move_to_next()`, but the `::prev` `::next`
+    Like `gnui_list_detach_and_move_to_next()`, but the `.prev` and `.next`
     members of the removed element are not set to `NULL` (please use it only if
     you know what you are doing)
 

src/emblem-picker/gnui-emblem-picker.c

@@ -75,7 +75,7 @@
     The emblem view's minimum width
 
 **/
-#define GNUI_EMBLEM_PICKER_PAGE_MIN_WIDTH 256
+#define GNUI_EMBLEM_PICKER_PAGE_MIN_WIDTH 250
 
 
 /**
@@ -85,7 +85,7 @@
     The emblem view's minimum height
 
 **/
-#define GNUI_EMBLEM_PICKER_PAGE_MIN_HEIGHT 256
+#define GNUI_EMBLEM_PICKER_PAGE_MIN_HEIGHT 250
 
 
 /**
@@ -211,7 +211,7 @@ static const GtkStateFlags GNUI_EMBLEM_PICKER_STATE_TRANSLATIONS[] =
 
     GnuiEmblemPickerPageNum:
 
-    The two page identifiers of the emblem picker's leaflet
+    The page identifiers of the emblem picker's leaflet
 
 **/
 typedef enum _GnuiEmblemPickerPageNum {
@@ -566,6 +566,7 @@ static gboolean gnui_emblem_picker_filter_emblem_cell (
 }
 
 
+
 /*  Implementation  */
 
 
@@ -2536,6 +2537,7 @@ static void gnui_emblem_picker_init (
 	gtk_box_append(
 		GTK_BOX(page_2_of_2),
 		gnui_emblem_picker_build_action_button(
+			/*  TRANSLATORS: Please keep this text below 21 characters  */
 			_("Unsupported emblems"),
 			/*  TRANSLATORS: Please keep this text below 30 characters  */
 			_("We coudn't render those :-("),

src/emblem-picker/gnui-emblem-picker.h

@@ -193,8 +193,8 @@ typedef enum GnuiEmblemPickerSaveResult {
     @saved_state:           (auto): The last saved state of the emblem
     @current_state:         (auto): The current state of the emblem
     @inconsistent_group:    (auto) (transfer none) (nullable): The inconsistent
-                            group of files that can have the emblem assigned
-                            independently of the other files
+                            group of `GFile` handles that can have the emblem
+                            assigned independently of the other files
     @user_data:             (auto) (nullable) (closure): The custom data
                             provided by the user
 
@@ -216,7 +216,8 @@ typedef gboolean (* GnuiEmblemPickerForeachFunc) (
 /**
 
     GnuiEmblemPickerForeachSavedFileFunc:
-    @self:              (auto) (not nullable): The emblem picker
+    @location:          (auto) (not nullable): The file for which the function
+                        is being called
     @added_emblems:     (auto) (transfer none) (nullable): The emblems added to
                         the file, or `NULL`
     @removed_emblems:   (auto) (transfer none) (nullable): The emblems removed
@@ -233,7 +234,7 @@ typedef gboolean (* GnuiEmblemPickerForeachFunc) (
 
 **/
 typedef gboolean (* GnuiEmblemPickerForeachSavedFileFunc) (
-    GFile * self,
+    GFile * location,
     const gchar * const * added_emblems,
     const gchar * const * removed_emblems,
     GnuiEmblemPickerSaveResult result,
@@ -368,7 +369,7 @@ extern gboolean gnui_emblem_picker_set_emblem_state (
 
     Get the `const` list of the files mapped by an emblem picker
 
-    Returns:    (transfer none): A `GList` containing `GFile` pointers (do not
+    Returns:    (transfer none): A `GList` containing `GFile` handles (do not
                 free or modify it)
 
 **/
@@ -399,7 +400,7 @@ extern GList * gnui_emblem_picker_get_mapped_files (
     gnui_emblem_picker_set_mapped_files: (set-property mapped-files)
     @self:              (not nullable): The emblem picker
     @file_selection:    (transfer none) (nullable): A `GList` containing
-                        pointers to `GFile` handles to map for their emblems
+                        `GFile` handles to map for their emblems
 
     Set the list of the files mapped by an emblem picker
 
@@ -633,9 +634,9 @@ extern void gnui_emblem_picker_set_all_selections (
     @saved_state:                   (auto) The last saved state of the emblem
     @current_state:                 (auto) The current state of the emblem
     @inconsistent_group:            (auto) (transfer none) (nullable): The
-                                    inconsistent group of files that can have
-                                    the emblem assigned independently from the
-                                    other files or `NULL`
+                                    inconsistent group of `GFile` handles that
+                                    can have the emblem assigned independently
+                                    from the other files, or `NULL`
     @user_data:                     (auto) (nullable) (closure): The custom
                                     data passed to the signal
 

src/resources/emblem-picker/style.css → src/emblem-picker/style.css

@@ -1,9 +1,10 @@
 emblempicker flowbox {
-	padding: 6px;
+	padding: 7px;
 }
 
 emblempicker emblem.supported {
 	border-radius: 9px;
+	margin: 1px;
 }
 
 emblempicker emblem.unsupported:first-child {