Commit 19

- The extension has been ported to `libnautilus-extension-4`
- Emblems have been updated
- Code review

AUTHORS

@@ -1 +1 @@
-madmurphy333 AT gmail DOT com
+"madmurphy" <madmurphy333 AT gmail DOT com>

ChangeLog

@@ -2,6 +2,15 @@ Change Log
 ==========
 
 
+## 0.10.0 (2022-10-31)
+
+Changes:
+
+* The extension has been ported to `libnautilus-extension-4`
+* Emblems have been updated
+* Code review
+
+
 ## 0.9.0 (2022-10-07)
 
 Changes:

INSTALL

@@ -23,15 +23,20 @@ running the `bootstrap` script. Use the `--noconfigure` parameter in order to
 prevent `bootstrap` from running automatically `configure` immediately after
 having generated it. To list different options use `bootstrap --help`.
 
+After installing this extension, do not forget to quit the `nautilus` process
+currently running with
+
+    nautilus -q
+
 
 Dependencies
 ------------
 
-This plugin depends on the following packages:
+This extension depends on the following packages:
 
 * glib2
-* gtksourceview4
-* libnautilus-extension
+* gtksourceview5
+* libnautilus-extension4
 
 Please make sure that they are present before compiling the source code.
 

Makefile.am

@@ -245,4 +245,3 @@ bootstrap-clean: maintainer-clean
 
 
 # EOF
-

NEWS

@@ -2,6 +2,11 @@ NEWS
 ====
 
 
+## 0.10.0
+
+* The extension has been ported to `libnautilus-extension-4`
+
+
 ## 0.9.0
 
 * The `notebook-double-margin` CSS theme, consisting in a symmetric version of

README

@@ -128,4 +128,3 @@ See [COPYING][4] for details.
   [2]: INSTALL
   [3]: https://gitlab.gnome.org/madmurphy/nextgen
   [4]: COPYING
-

configure.ac

@@ -9,7 +9,7 @@ dnl  **************************************************************************
 AC_PREREQ([2.69])
 
 AC_INIT([Nautilus Annotations],
-	[0.9.0],
+	[0.10.0],
 	[madmurphy333@gmail.com],
 	[nautilus-annotations],
 	[https://gitlab.gnome.org/madmurphy/nautilus-annotations])
@@ -40,7 +40,7 @@ AS_IF([test "x${HAVE_PKGCONFIG}" = xno],
 	[AC_MSG_ERROR([you need to have pkgconfig installed!])])
 
 PKG_CHECK_MODULES([NAUTILUS_ANNOTATIONS],
-	[glib-2.0 libnautilus-extension gtksourceview-4])
+	[glib-2.0 gtk4 gtksourceview-5 libnautilus-extension-4])
 
 AC_ARG_VAR([FIND], [Unix find utility])
 
@@ -108,18 +108,18 @@ dnl  **************************************************************************
 
 AC_ARG_WITH([nautilus-libdir],
 	[AS_HELP_STRING([--without-nautilus-libdir],
-		[ignore the <libdir> variable used by libnautilus-extension and
-		and use the current <libdir> instead @<:@default=no@:>@])],
+		[ignore the <libdir> variable used by libnautilus-extension-4
+		and and use the current <libdir> instead @<:@default=no@:>@])],
 	[:],
 	[AS_VAR_SET([with_nautilus_libdir], ['yes'])])
 
 AS_IF([test "x${with_nautilus_libdir}" = xno],
 	[AS_VAR_SET([NAUTILUS_EXTENSION_DIR], m4_normalize(["$(
 		"${PKG_CONFIG}" --define-variable='libdir=${libdir}'
-			--variable=extensiondir libnautilus-extension
+			--variable=extensiondir libnautilus-extension-4
 	)"]))],
 	[AS_VAR_SET([NAUTILUS_EXTENSION_DIR], m4_normalize(["$(
-		"${PKG_CONFIG}" --variable=extensiondir libnautilus-extension
+		"${PKG_CONFIG}" --variable=extensiondir libnautilus-extension-4
 	)"]))])
 
 AC_SUBST([NAUTILUS_EXTENSION_DIR])

docs/shortcuts.md

@@ -11,4 +11,3 @@ Keyboard shortcuts
 * `Ctrl` + `S`: Save the current annotations
 * `Esc`: Save the current annotations and exit
 * `Shift` + `Esc`: Discard the current annotations and exit
-

docs/styling.md

@@ -1,9 +1,10 @@
 Styling
 =======
 
-**Nautilus Annotations** declares three unique CSS classes:
+**Nautilus Annotations** declares four unique CSS classes:
 
-* `dialog.nautilus-annotations-dialog` (the annotations window)
+* `window.nautilus-annotations-dialog` (the annotations window)
+* `scrolledwindow.nautilus-annotations-scrollable` (the scrollable area)
 * `textview.nautilus-annotations-view` (the annotations text area)
 * `button.nautilus-annotations-discard` (the button for discarding the current
    changes)
@@ -13,9 +14,9 @@ These are meant to be used in the first place by the extension's main CSS
 or overridden by user-given style sheets.
 
 Widgets without a class can be styled via CSS inheritance. The
-`.nautilus-annotations-dialog` window is populated with the following DOM tree:
+`.nautilus-annotations-dialog` window is populated by the following DOM tree:
 
-	dialog.nautilus-annotations-dialog
+	window.nautilus-annotations-dialog
 	│
 	├── headerbar.titlebar
 	│   │
@@ -35,7 +36,7 @@ Widgets without a class can be styled via CSS inheritance. The
 	│
 	╰── box.dialog-vbox
 	    │
-	    ╰── scrolledwindow
+	    ╰── scrolledwindow.nautilus-annotations-scrollable
 	        │
 	        ╰── textview.view.sourceview.nautilus-annotations-view
 
@@ -51,34 +52,40 @@ For example, by pasting the following style sheet into **GtkInspector**'s “CSS
 tab, the annotations will be styled as yellow sticky notes:
 
 ``` css
-dialog.nautilus-annotations-dialog,
-dialog.nautilus-annotations-dialog .titlebar {
+window.nautilus-annotations-dialog {
 	border: none;
 	background-image: none;
 	background-color: #fff394;
+}
+
+window.nautilus-annotations-dialog .titlebar {
+	border: none;
+	background-image: none;
+	background-color: transparent;
 	color: #ad5f00;
+	box-shadow: none;
 }
 
-dialog.nautilus-annotations-dialog selection {
+window.nautilus-annotations-dialog selection {
 	background-image: none;
 	background-color: #ad5f00;
 	color: #fff394;
 }
 
-dialog.nautilus-annotations-dialog text,
-dialog.nautilus-annotations-dialog button {
+window.nautilus-annotations-dialog text,
+window.nautilus-annotations-dialog button {
 	background-image: none;
 	background-color: transparent;
 	color: #ad5f00;
 }
 
-dialog.nautilus-annotations-dialog button.close {
+window.nautilus-annotations-dialog button.close {
 	color: #cc0000;
 	border: none;
 	box-shadow: none;
 }
 
-dialog.nautilus-annotations-dialog button.nautilus-annotations-discard {
+window.nautilus-annotations-dialog button.nautilus-annotations-discard {
 	padding: 0 6px;
 	background-color: #ad5f00;
 	color: #fff394;
@@ -89,6 +96,9 @@ dialog.nautilus-annotations-dialog button.nautilus-annotations-discard {
 textview.nautilus-annotations-view {
 	font-family: monospace;
 	padding: 0;
+	background-image: none;
+	background-color: transparent;
+	color: #ad5f00;
 }
 ```
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nautilus-annotations",
-	"version": "0.9.0",
+	"version": "0.10.0",
 	"description": "Annotate files and directories",
 	"homepage": "https://gitlab.gnome.org/madmurphy/nautilus-annotations",
 	"author": "madmurphy333@gmail.com",
@@ -11,8 +11,8 @@
 	},
 	"dependencies": {
 		"glib2": "*",
-		"libnautilus-extension": "*",
-		"gtksourceview4": "*",
+		"libnautilus-extension": ">=4",
+		"gtksourceview5": "*",
 	},
 	"devDependencies": {
 		"gettext": ">=0.19",