Merge branch 'gtk4'

app

@@ -119,7 +119,7 @@ case $1 in
     echo "  emmet-<bool>      Sets the Emmet build mode to true or false"
     echo "  install           Builds and installs application to the system (requires sudo)"
     echo "  install-deps      Installs missing build dependencies"
-    echo "  run               Builds and runs the application"
+    echo "  run               Builds and runs the application (must run install once before successive calls to this command)"
     echo "  test              Builds and runs testing for the application"
     echo "  test-run          Builds application, runs testing and if successful application is started"
     echo "  uninstall         Removes the application from the system (requires sudo)"

data/css/style.css

@@ -19,6 +19,7 @@
 @define-color textColorPrimary       @BLACK_500;
 @define-color textColorPrimaryShadow #ffe16b;
 
+/*
 .color-button radio,
 .color-button radio.checked {
   border-color: alpha (#000, 0.3);
@@ -37,6 +38,7 @@
     0 1px 0 0 alpha (@bg_highlight_color, 0.3),
     0 0 0 1px alpha (@colorAccent, 0.25);
 }
+*/
 
 list {
   background-color: @bg_color;

meson.build

@@ -64,12 +64,11 @@ dependencies = [
     dependency('gobject-2.0'),
     dependency('glib-2.0'),
     dependency('gee-0.8'),
-    dependency('granite'),
-    dependency('gtk+-3.0'),
+    dependency('granite-7'),
+    dependency('gtk4'),
     dependency('libxml-2.0'),
-    dependency('gtksourceview-4'),
-    dependency('libhandy-1'),
-    dependency('gtkspell3-3.0'),
+    dependency('gtksourceview-5'),
+    dependency('enchant-2'),
     libmarkdown,
     math_dep
 ]
@@ -85,6 +84,9 @@ e = executable('com.github.phase1geo.textshine',
     install : true
 )
 
-#test('tests', e, args : ['--run-tests'])
-
-meson.add_install_script('meson/post_install.py')
+# Perform post install operations
+gnome.post_install(
+  glib_compile_schemas: true,
+  gtk_update_icon_cache: true,
+  update_desktop_database: true
+)

po/POTFILES

@@ -9,8 +9,9 @@ src/functions/case/CaseUpper.vala
 src/functions/convert/ConvertBase64.vala
 src/functions/convert/ConvertChecksum.vala
 src/functions/convert/ConvertHardWrap.vala
+src/functions/convert/ConvertMarkdownTable.vala
 src/functions/convert/ConvertROT13.vala
-src/functions/convert/ConvertURLEncode.vala
+src/functions/convert/ConvertURL.vala
 src/functions/indent/Indent.vala
 src/functions/indent/IndentXML.vala
 src/functions/indent/Unindent.vala
@@ -55,6 +56,7 @@ src/functions/sort/SortReverseChars.vala
 src/MainWindow.vala
 src/SidebarCustom.vala
 src/SidebarFunctions.vala
+src/SpellChecker.vala
 src/TextFunctions.vala
 src/UndoBuffer.vala
 src/UndoCustomBuffer.vala