Norka2

README.md

@@ -66,19 +66,7 @@ Text editor built for GNOME on top of [PyGObject](https://pygobject.readthedocs.
 Build time requirements:
 
 - meson (>= 0.49)
-- python3 (>= 3.6)
-- intltool
-- libgranite-dev
-- libgtk-3-dev (>= 3.10)
-- libgspell-1-dev
-- libgtksourceview-4.0-dev (>= 3.24.3)
-- libwebkit2gtk-4.0
-- python3-gi
-- python3-gi-cairo
-- gir1.2-gspell-1
-- gir1.2-gtksource-3.0
-- gir1.2-granite-1.0
-- gir1.2-webkit2-4.0
+- python3 (>= 3.12)
 
 
 Run meson build to configure the build environment. Change to the build directory and run `ninja` to build:

bin/meson.build

@@ -1,5 +1,5 @@
 configure_file(
-  input: meson.project_name() + '.in',
+  input: meson.project_name() + '.py',
   output: meson.project_name(),
   configuration: conf,
   install: true,

bin/norka.in → bin/norka.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# norka.in
+# norka.py
 #
 # Copyright 2020-2021 Andrey Maksimov
 #
@@ -34,28 +34,27 @@
 import gettext
 import locale
 
-
 VERSION = '@VERSION@'
-pkgdatadir = '@PKGDATA_DIR@'
-localedir = '@LOCALE_DIR@'
-project_name = '@PROJECT_NAME@'
-appid = '@appid@'
+PKGDATADIR = '@PKGDATA_DIR@'
+LOCALEDIR = '@LOCALE_DIR@'
+PROJECT_NAME = '@PROJECT_NAME@'
+PROFILE = '@PROFILE@'
+APP_ID = '@APP_ID@'
 
 sys.path.insert(1, '@PYTHON_DIR@')
 signal.signal(signal.SIGINT, signal.SIG_DFL)
 
-locale.textdomain(project_name)
-locale.bindtextdomain(project_name, localedir)
-gettext.textdomain(project_name)
-gettext.bindtextdomain(project_name, localedir)
+locale.textdomain(PROJECT_NAME)
+locale.bindtextdomain(PROJECT_NAME, LOCALEDIR)
+gettext.textdomain(PROJECT_NAME)
+gettext.bindtextdomain(PROJECT_NAME, LOCALEDIR)
 
 
 if __name__ == '__main__':
     import gi
-
     from gi.repository import Gio
-    resource = Gio.Resource.load(os.path.join(pkgdatadir, appid + '.gresource'))
-    Gio.Resource._register(resource)
+    resource = Gio.Resource.load(os.path.join(PKGDATADIR, APP_ID + '.gresource'))
+    Gio.resources_register(resource)
 
     from norka import main
-    sys.exit(main.main(VERSION))
+    sys.exit(main.main(VERSION, PROFILE))

data/application.css

@@ -0,0 +1,55 @@
+/* @define-color suggested_bg_color #3584e4; */
+
+/* @binding-set editor-bindings { */
+/*   bind "<ctl>i" { "insert-italic" () }; */
+/*   bind "<ctl>b" { "insert-bold" () }; */
+/*   bind "<ctl><shift>c" { "insert-code" () }; */
+/*   bind "<ctl><alt>c" { "insert-code-block" () }; */
+/*   bind "<ctl>1" { "insert-h1" () }; */
+/*   bind "<ctl>2" { "insert-h2" () }; */
+/*   bind "<ctl>3" { "insert-h3" () }; */
+/*   bind "<ctl>l" { "insert-list" () }; */
+/*   bind "<ctl><shift>l" { "insert-ordered-list" () }; */
+/*   bind "<ctl>t" { "insert-quote" () }; */
+/*   bind "<ctl>k" { "insert-link" () }; */
+/*   bind "<ctl><shift>k" { "insert-image" () }; */
+/* } */
+
+/* Fix AdwHeaderBar padding when AdwTabBar placed inside */
+#editor-tabs-view-header box {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+#editor-container {
+  background-color: var(--window-bg-color);
+  padding-left: var(--window-radius);
+  padding-right: var(--window-radius);
+  padding-bottom: var(--window-radius);
+}
+
+#scrolled {
+  border-radius: calc(var(--window-radius) - (var(--window-radius) / 2));
+  background-color: var(--view-bg-color);
+}
+
+#sourceview text {
+  background-color: var(--view-bg-color);
+}
+
+#sourceview {
+  color: var(--view-fg-color);
+  background-color: var(--view-bg-color);
+  padding: calc(var(--window-radius) * 2);
+  border-radius: var(--window-radius);
+  font-family: 'IBM Plex Sans', monospace;
+}
+
+treeexpander {
+    transition: margin 200ms ease-out;
+}
+
+/* Style scheme previews in Preferences */
+GtkSourceStyleSchemePreview {
+  border-radius: calc(var(--window-radius) * 0.5);
+}

data/com.github.tenderowl.norka.appdata.xml.in → data/com.github.tenderowl.norka.appdata.xml

@@ -20,7 +20,7 @@
             <li>Don't like the default theme - choose differently.</li>
         </ul>
     </description>
-    <update_contact>andrey_AT_tenderowl.com</update_contact>
+    <update_contact>andrey@tenderowl.com</update_contact>
 
     <launchable type="desktop-id">com.github.tenderowl.norka.desktop</launchable>
     <translation type="gettext">com.github.tenderowl.norka</translation>
@@ -47,6 +47,13 @@
     </screenshots>
 
     <releases>
+        <release date="2025-06-01" version="2.0.0">
+            <description translate="no">
+                <p>Norka 2.0 🎉️!
+                </p>
+                <p>Download the new version right now and try it yourself!</p>
+            </description>
+        </release>
         <release date="2023-06-06" version="1.1.0">
             <description translate="no">
                 <p>Hooray 🎉️! A new version of the Norka text editor has been released, in which you will find many

data/com.github.tenderowl.norka.gresource.xml

@@ -1,23 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-	<gresource prefix="/com/github/tenderowl/norka/">
-		<file compressed="true">css/application.css</file>
-		<file preprocess="xml-stripblanks">ui/app_menu.xml</file>
-		<file preprocess="xml-stripblanks">ui/shortcuts.ui</file>
-		<file preprocess="xml-stripblanks">ui/documents_grid_context_menu.ui</file>
-		<file preprocess="xml-stripblanks">ui/main_window.ui</file>
-		<file preprocess="xml-stripblanks">ui/preview_window.ui</file>
-		<file preprocess="xml-stripblanks">ui/headerbar.ui</file>
-		<file preprocess="xml-stripblanks">ui/stats.ui</file>
-		<file preprocess="xml-stripblanks">ui/format_shortcuts_window.ui</file>
-		<file preprocess="xml-stripblanks">ui/preferences_window.ui</file>
-		<file>icons/com.github.tenderowl.norka.svg</file>
-		<file>icons/folder.svg</file>
-		<file>icons/folder-open.svg</file>
-		<file>icons/text.svg</file>
-		<file>icons/text-html.svg</file>
-		<file>icons/text-markdown.svg</file>
-		<file>icons/application-msword.svg</file>
-		<file>icons/application-pdf.svg</file>
-	</gresource>
+    <gresource prefix="/com/github/tenderowl/norka/">
+        <file compressed="true">application.css</file>
+        <file preprocess="xml-stripblanks">ui/app_menu.xml</file>
+        <file preprocess="xml-stripblanks">ui/shortcuts.ui</file>
+        <file preprocess="xml-stripblanks">ui/documents_grid_context_menu.ui</file>
+        <file preprocess="xml-stripblanks">ui/main_window.ui</file>
+        <file preprocess="xml-stripblanks">ui/welcome_page.ui</file>
+        <file preprocess="xml-stripblanks">ui/content_page.ui</file>
+        <file preprocess="xml-stripblanks">ui/editor_tabs_view.ui</file>
+        <file preprocess="xml-stripblanks">ui/editor.ui</file>
+        <file preprocess="xml-stripblanks">ui/notes_sidebar.ui</file>
+        <file preprocess="xml-stripblanks">ui/notes_column.ui</file>
+        <file preprocess="xml-stripblanks">ui/notes_tree.ui</file>
+        <file preprocess="xml-stripblanks">ui/preview_window.ui</file>
+        <file preprocess="xml-stripblanks">ui/headerbar.ui</file>
+        <file preprocess="xml-stripblanks">ui/stats.ui</file>
+        <file preprocess="xml-stripblanks">ui/format_shortcuts_window.ui</file>
+        <file preprocess="xml-stripblanks">ui/preferences_window.ui</file>
+        <file preprocess="xml-stripblanks">ui/preferences_general_page.ui</file>
+        <file preprocess="xml-stripblanks">ui/preferences_interface_page.ui</file>
+        <file preprocess="xml-stripblanks">ui/preferences_export_page.ui</file>
+        <file>icons/com.github.tenderowl.norka.svg</file>
+        <file>icons/folder.svg</file>
+        <file>icons/folder-open.svg</file>
+        <file>icons/text.svg</file>
+        <file>icons/text-html.svg</file>
+        <file>icons/text-markdown.svg</file>
+        <file>icons/application-msword.svg</file>
+        <file>icons/application-pdf.svg</file>
+        <file>icons/otter.png</file>
+    </gresource>
+    <gresource prefix="/com/github/tenderowl/norka/appdata/">
+        <file preprocess="xml-stripblanks">com.github.tenderowl.norka.appdata.xml</file>
+    </gresource>
 </gresources>

data/com.github.tenderowl.norka.gschema.xml

@@ -64,6 +64,11 @@
             <summary>Prefer dark theme</summary>
             <description>Whether the application prefers to use a dark theme</description>
         </key>
+        <key name="theme-mode" type="s">
+            <default>"system"</default>
+            <summary>Theme Mode</summary>
+            <description>Whether the application prefers to use a dark, light or system theme</description>
+        </key>
         <key name="stylescheme" type="s">
             <default>"norka"</default>
             <summary>Editor style scheme</summary>

data/icons/meson.build

@@ -1,4 +1,11 @@
+dir_48 = join_paths('hicolor', '48x48', 'apps')
 install_data(
-	'@0@.svg'.format(appid),
-	install_dir: datadir / 'icons' / 'hicolor' / 'scalable' / 'apps'
+  join_paths(dir_48, ('@0@.png').format(appid)),
+  install_dir: join_paths(get_option('datadir'), 'icons', dir_48)
+)
+
+dir_256 = join_paths('hicolor', '256x256', 'apps')
+install_data(
+  join_paths(dir_256, ('@0@.png').format(appid)),
+  install_dir: join_paths(get_option('datadir'), 'icons', dir_256)
 )

data/meson.build

@@ -1,7 +1,33 @@
 message('Compiling resources')
 
+blueprints = custom_target('blueprints',
+  input: files(
+    'ui/documents_grid_context_menu.blp',
+    'ui/shortcuts.blp',
+    'ui/format_shortcuts_window.blp',
+    'ui/headerbar.blp',
+    'ui/main_window.blp',
+    'ui/welcome_page.blp',
+    'ui/content_page.blp',
+    'ui/editor_tabs_view.blp',
+    'ui/editor.blp',
+    'ui/notes_sidebar.blp',
+    'ui/notes_column.blp',
+    'ui/notes_tree.blp',
+    'ui/preferences_window.blp',
+    'ui/preferences_general_page.blp',
+    'ui/preferences_interface_page.blp',
+    'ui/preferences_export_page.blp',
+    'ui/preview_window.blp',
+    'ui/stats.blp',
+  ),
+  output: '.',
+  command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
+)
+
 gnome.compile_resources(appid,
   appid + '.gresource.xml',
+  dependencies: blueprints,
   gresource_bundle: true,
   install: true,
   install_dir: pkgdatadir,
@@ -32,7 +58,7 @@ if desktop_utils.found()
 endif
 
 appstream_file = i18n.merge_file(
-  input: appid + '.appdata.xml.in',
+  input: appid + '.appdata.xml',
   output: appid  + '.appdata.xml',
   po_dir: '../po',
   install: true,
@@ -66,7 +92,7 @@ color_schemes = ['norka-dark', 'norka-sepia', 'norka']
 foreach i : color_schemes
     install_data(
         join_paths('schemes', i + '.xml'),
-       install_dir: join_paths(get_option('datadir'), 'gtksourceview-4', 'styles')
+       install_dir: join_paths(get_option('datadir'), 'gtksourceview-5', 'styles')
     )
 endforeach
 
@@ -76,8 +102,7 @@ install_subdir(
     join_paths('fonts', 'IBMPlexMono'),
     install_dir :join_paths('share','fonts')
 )
-
 install_subdir(
-    join_paths('fonts', 'iA Writer Duospace'),
-    install_dir : join_paths('share','fonts')
+    join_paths('fonts', 'IBMPlexSans'),
+    install_dir :join_paths('share','fonts')
 )

data/ui/content_page.blp

@@ -0,0 +1,20 @@
+using Gtk 4.0;
+using Adw 1;
+
+template $ContentPage: Adw.NavigationPage {
+  Adw.ViewStack screens {
+    Adw.ViewStackPage {
+      name: "welcome-page";
+      title: _("Norka");
+
+      child: $WelcomePage welcome_page {};
+    }
+
+    Adw.ViewStackPage {
+      name: "content-page";
+      title: _("Content");
+
+      child: $EditorTabsView editor_tabs_view {};
+    }
+  }
+}