Merge pull request #39 from ptomato/refactor

Improvements around extensions and search
ptomato · Oct 27, 2024 · 49ef8fe · 49ef8fe
2 parents 0eb3537 + 3166999
commit 49ef8fe
Show file tree

Hide file tree

Showing 16 changed files with 312 additions and 296 deletions.
diff --git a/data/styles/dark.xml b/data/styles/dark.xml
@@ -33,7 +33,7 @@ SPDX-FileCopyrightText: 2022 Philip Chimento <[email protected]>
   <style name="secondary-cursor"  foreground="main_text"/>
 
   <!-- I7 core types -->
-  <style name="inform7:plain"     foreground="main_text" background="source_paper"/>
+  <style name="inform7x:plain"    foreground="main_text" background="extension_paper"/>
   <style name="inform7:string"    foreground="quoted_text" bold="true"/>
   <style name="inform7:markup"    foreground="text_substitution" bold="false" italic="true"/>
   <style name="inform7:comment"   foreground="comment" bold="false" italic="true"/>

diff --git a/data/styles/light.xml b/data/styles/light.xml
@@ -33,7 +33,7 @@ SPDX-FileCopyrightText: 2022 Philip Chimento <[email protected]>
   <style name="secondary-cursor"  foreground="main_text"/>
 
   <!-- I7 core types -->
-  <style name="inform7:plain"     foreground="main_text" background="source_paper"/>
+  <style name="inform7x:plain"    foreground="main_text" background="extension_paper"/>
   <style name="inform7:string"    foreground="quoted_text" bold="true"/>
   <style name="inform7:markup"    foreground="text_substitution" bold="false" italic="true"/>
   <style name="inform7:comment"   foreground="comment" bold="false" italic="true"/>

diff --git a/data/styles/sevenseas.xml b/data/styles/sevenseas.xml
@@ -33,7 +33,7 @@ SPDX-FileCopyrightText: 2022 Philip Chimento <[email protected]>
   <style name="secondary-cursor"  foreground="main_text"/>
 
   <!-- I7 core types -->
-  <style name="inform7:plain"     foreground="main_text" background="source_paper"/>
+  <style name="inform7x:plain"    foreground="main_text" background="extension_paper"/>
   <style name="inform7:string"    foreground="quoted_text" bold="true"/>
   <style name="inform7:markup"    foreground="text_substitution" bold="false" italic="true"/>
   <style name="inform7:comment"   foreground="comment" bold="false" italic="true"/>

diff --git a/data/styles/traditional.xml b/data/styles/traditional.xml
@@ -13,7 +13,8 @@ SPDX-FileCopyrightText: 2008, 2022 Philip Chimento <[email protected]>
   <!-- The scheme tries to look like the original macOS scheme -->
 
   <!-- Palette -->
-  <color name="background"        value="#FFFFFF"/>
+  <color name="source_paper"      value="#FFFFFF"/>
+  <color name="extension_paper"   value="#ffffe4"/>
   <color name="text"              value="#000000"/>
   <color name="string"            value="#004D99"/>
   <color name="string_markup"     value="#3E9EFF"/>
@@ -30,15 +31,15 @@ SPDX-FileCopyrightText: 2008, 2022 Philip Chimento <[email protected]>
   <color name="i6_escape"         value="#66664C"/>
 
   <!-- GtkSourceView appearance styles-->
-  <style name="text"              foreground="text" background="background"/>
+  <style name="text"              foreground="text" background="source_paper"/>
   <style name="bracket-match"     bold="true"/>
-  <style name="bracket-mismatch"  foreground="background" background="error" bold="true"/>
+  <style name="bracket-mismatch"  foreground="source_paper" background="error" bold="true"/>
   <style name="search-match"      foreground="text" background="highlight"/>
   <style name="cursor"           foreground="text"/>
   <style name="secondary-cursor" foreground="text"/>
 
   <!-- I7 core types -->
-  <style name="inform7:plain"     foreground="text" background="background"/>
+  <style name="inform7x:plain"    foreground="text" background="extension_paper"/>
   <style name="inform7:string"    foreground="string" bold="true"/>
   <style name="inform7:markup"    foreground="string_markup" bold="false" italic="true"/>
   <style name="inform7:comment"   foreground="comment" bold="false" italic="true"/>

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -27,7 +27,6 @@ src/story-index.c
 src/story-settings.c
 src/story-skein.c
 src/ui/document.ui
-src/ui/app.ui
 src/ui/newdialog.ui
 src/ui/panel.ui
 src/ui/searchwindow.ui

diff --git a/src/actions.c b/src/actions.c
@@ -70,7 +70,7 @@ action_open_recent(GSimpleAction *action, GVariant *parameter, I7App *app)
 static void
 install_extensions_and_free(GFile *file, I7App *app)
 {
-	i7_app_install_extension(app, file);
+	i7_app_install_extension(app, file);  /* ignore success value */
 	g_object_unref(file);
 }