[gnome-builder] styles: move style schemes to data/styles

From: Christian Hergert <chergert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-builder] styles: move style schemes to data/styles
Date: Tue, 12 Jul 2022 06:39:04 +0000 (UTC)
commit 53d837ee53b9e500dd6f95b69ba6686cf780497c
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jul 11 15:50:23 2022 -0700

    styles: move style schemes to data/styles

 data/meson.build                                   |   2 +-
 data/style-schemes/Adwaita-dark.style-scheme.xml   | 182 -----------------
 data/style-schemes/Adwaita.style-scheme.xml        | 178 ----------------
 data/style-schemes/builder-dark.style-scheme.xml   | 206 -------------------
 data/style-schemes/meson.build                     |   6 -
 data/styles/builder-dark.xml                       | 224 +++++++++++++++++++++
 .../builder.xml}                                   | 112 +++++------
 .../{style-schemes => styles}/its/style-scheme.its |   0
 .../{style-schemes => styles}/its/style-scheme.loc |   0
 data/styles/meson.build                            |   6 +
 10 files changed, 278 insertions(+), 638 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 5afb6f81d..a5eea109a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,7 @@ subdir('appdata')
 subdir('fonts')
 subdir('gsettings')
 subdir('icons')
-subdir('style-schemes')
+subdir('styles')
 
 # Desktop launcher and description file.
 desktop_file = i18n.merge_file(
diff --git a/data/styles/builder-dark.xml b/data/styles/builder-dark.xml
new file mode 100644
index 000000000..d48b21c1d
--- /dev/null
+++ b/data/styles/builder-dark.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ This file is part of GtkSourceView
+
+ Copyright (C) 2007 GtkSourceView team
+ Author: Paolo Borelli <pborelli gnome org>
+
+ GtkSourceView is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ GtkSourceView is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+-->
+
+<style-scheme id="builder-dark" name="Builder Dark" version="1.0">
+
+  <author>Paolo Borelli, Christian Hergert</author>
+  <description>Dark color scheme for Builder using the Tango color palette</description>
+
+  <metadata>
+    <property name="variant">dark</property>
+    <property name="light-variant">builder</property>
+    <property name="accent_bg_color">#4186A8</property>
+    <property name="accent_fg_color">#eeeeec</property>
+  </metadata>
+
+  <!-- Tango Palette -->
+  <color name="butter1"                     value="#fce94f"/>
+  <color name="butter2"                     value="#edd400"/>
+  <color name="butter3"                     value="#c4a000"/>
+  <color name="chameleon1"                  value="#8ae234"/>
+  <color name="chameleon2"                  value="#73d216"/>
+  <color name="chameleon3"                  value="#4e9a06"/>
+  <color name="orange1"                     value="#fcaf3e"/>
+  <color name="orange2"                     value="#f57900"/>
+  <color name="orange3"                     value="#ce5c00"/>
+  <color name="skyblue1"                    value="#729fcf"/>
+  <color name="skyblue2"                    value="#3465a4"/>
+  <color name="skyblue3"                    value="#204a87"/>
+  <color name="plum1"                       value="#ad7fa8"/>
+  <color name="plum2"                       value="#75507b"/>
+  <color name="plum3"                       value="#5c3566"/>
+  <color name="chocolate1"                  value="#e9b96e"/>
+  <color name="chocolate2"                  value="#c17d11"/>
+  <color name="chocolate3"                  value="#8f5902"/>
+  <color name="scarletred1"                 value="#ef2929"/>
+  <color name="scarletred2"                 value="#cc0000"/>
+  <color name="scarletred3"                 value="#a40000"/>
+  <color name="aluminium1"                  value="#eeeeec"/>
+  <color name="aluminium2"                  value="#d3d7cf"/>
+  <color name="aluminium3"                  value="#babdb6"/>
+  <color name="aluminium4"                  value="#888a85"/>
+  <color name="aluminium5"                  value="#555753"/>
+  <color name="aluminium6"                  value="#2e3436"/>
+  <color name="white"                       value="#ffffff"/>
+  <color name="pink1"                       value="#dd4a68"/>
+  <color name="red1"                        value="#ff0000"/>
+
+  <color name="dark1"                       value="#1e1e1e"/>
+  <color name="dark2"                       value="#303030"/>
+
+  <color name="transparent"                 value="#rgba(0,0,0,0)"/>
+
+  <!-- Global Settings -->
+  <style name="text"                        foreground="aluminium3" background="dark1"/>
+  <style name="selection"                   foreground="transparent" background="#rgba(136,138,133,.3)"/>
+  <style name="cursor"                      foreground="aluminium2"/>
+  <style name="current-line"                background="dark2"/>
+  <style name="current-line-number"         background="dark2"/>
+  <style name="line-numbers"                foreground="aluminium5" background="dark1"/>
+  <style name="draw-spaces"                 foreground="aluminium5"/>
+  <style name="background-pattern"          background="#202020"/>
+  <style name="map-overlay"                 background="#rgba(136,138,133,0.25)"/>
+  <style name="snippet-focus"               background="orange3" foreground="aluminium6"/>
+
+  <!-- Builder Overrides -->
+  <style name="-Builder:deprecated"         underline="error" underline-color="aluminium3"/>
+  <style name="-Builder:unused"             underline="error" underline-color="chocolate2"/>
+  <style name="-Builder:error"              underline="error" underline-color="red1"/>
+  <style name="-Builder:note"               underline="error" underline-color="skyblue1"/>
+  <style name="-Builder:warning"            underline="error" underline-color="orange1"/>
+  <style name="-Builder:current-breakpoint" foreground="#2e3436" line-background="#fcaf3e"/>
+  <style name="-Builder:breakpoint"         foreground="#ffffff" line-background="#204a87"/>
+  <style name="-Builder:hover-definition"   background="#41464c" underline="true"/>
+  <style name="-Builder:label"              foreground="#000000" background="#D5E7FC"/>
+  <style name="-Builder:id"                 foreground="#000000" background="#D9E7BD"/>
+  <style name="-Builder:style-class"        foreground="#000000" background="#DFCD9B"/>
+  <style name="-Builder:type"               foreground="#000000" background="#F4DAC3"/>
+  <style name="-Builder:parent"             foreground="#000000" background="#DEBECF"/>
+  <style name="-Builder:class"              foreground="#000000" background="#FFEF98"/>
+  <style name="-Builder:attribute"          foreground="#000000" background="#F0E68C"/>
+
+  <!-- Bracket Matching -->
+  <style name="bracket-match"               foreground="chocolate2" bold="true"/>
+  <style name="bracket-mismatch"            foreground="aluminium1" background="scarletred2" bold="true"/>
+
+  <!-- Right Margin -->
+  <style name="right-margin"                foreground="#484749" background="#484749"/>
+
+  <!-- Search Matching -->
+  <style name="search-match"                foreground="aluminium1" background="chameleon3"/>
+  <style name="quick-highlight-match"       background="#rgba(78,154,6,.25)"/>
+
+  <!-- Search Shadow -->
+  <style name="search-shadow"               background="#rgba(0,0,0,0.4)"/>
+
+  <!-- Spellchecker Matching -->
+  <style name="misspelled-match"            foreground="#000000" background="#b3d4fc"/>
+
+  <!-- Comments -->
+  <style name="def:comment"                 foreground="aluminium4"/>
+  <style name="def:shebang"                 foreground="aluminium4" bold="true"/>
+  <style name="def:doc-comment-element"     italic="true"/>
+
+  <!-- Constants -->
+  <style name="def:constant"                foreground="butter2"/>
+  <style name="def:string"                  foreground="#0077aa"/>
+  <style name="def:special-char"            foreground="#dd4a68"/>
+  <style name="def:special-constant"        foreground="plum1"/>
+  <style name="def:floating-point"          foreground="orange3"/>
+  <style name="def:function"                foreground="#4186A8"/>
+
+  <!-- Identifiers -->
+  <style name="def:identifier"              foreground="skyblue1"/>
+
+  <!-- Statements -->
+  <style name="def:statement"               foreground="white" bold="true"/>
+
+  <!-- Types -->
+  <style name="def:type"                    foreground="chameleon1" bold="true"/>
+
+  <!-- Markup -->
+  <style name="def:emphasis"                italic="true"/>
+  <style name="def:strong-emphasis"         foreground="white" bold="true"/>
+  <style name="def:inline-code"             foreground="skyblue1"/>
+  <style name="def:insertion"               underline="single"/>
+  <style name="def:deletion"                strikethrough="true"/>
+  <style name="def:link-text"               foreground="aluminium4"/>
+  <style name="def:link-symbol"             foreground="aluminium4" bold="true"/>
+  <style name="def:link-destination"        italic="true" underline="true"/>
+  <style name="def:heading"                 foreground="chameleon1" bold="true"/>
+  <style name="def:thematic-break"          foreground="chameleon1" bold="true"/>
+  <style name="def:preformatted-section"    foreground="skyblue1"/>
+  <style name="def:list-marker"             foreground="white" bold="true"/>
+
+  <!-- Others -->
+  <style name="def:preprocessor"            foreground="#dd4a68"/>
+  <style name="def:error"                   foreground="aluminium1" background="scarletred2" bold="true"/>
+  <style name="def:warning"                 foreground="aluminium1" background="plum1"/>
+  <style name="def:note"                    background="butter1" foreground="aluminium4" bold="true"/>
+  <style name="def:net-address"             italic="true" underline="true"/>
+
+  <!-- Heading styles, uncomment to enable -->
+  <!--
+  <style name="def:heading0"                scale="5.0"/>
+  <style name="def:heading1"                scale="2.5"/>
+  <style name="def:heading2"                scale="2.0"/>
+  <style name="def:heading3"                scale="1.7"/>
+  <style name="def:heading4"                scale="1.5"/>
+  <style name="def:heading5"                scale="1.3"/>
+  <style name="def:heading6"                scale="1.2"/>
+  -->
+
+  <!-- Language specific -->
+  <style name="c:comment"                   foreground="#8b9eab"/>
+  <style name="c:preprocessor"              foreground="#8194a6" bold="false"/>
+  <style name="c:boolean"                   foreground="#0077aa"/>
+  <style name="c:keyword"                   foreground="#0077aa" bold="true"/>
+  <style name="c:string"                    foreground="#669900"/>
+  <style name="c:included-file"             foreground="orange3"/>
+  <style name="c:storage-class"             foreground="orange3" bold="true"/>
+  <style name="c:type"                      foreground="#669900" bold="true"/>
+  <style name="c:macro-name"                foreground="#677685" bold="false"/>
+  <style name="c:enum-name"                 foreground="#dd4a68" bold="false"/>
+
+  <style name="diff:added-line"             foreground="chameleon2"/>
+  <style name="diff:removed-line"           foreground="plum1"/>
+  <style name="diff:diff-file"              foreground="chameleon1" bold="true"/>
+  <style name="diff:location"               foreground="chameleon1"/>
+  <style name="diff:special-case"           foreground="white" bold="true"/>
+
+  <!-- GTK Doc -->
+  <style name="gtk-doc:function-name"       bold="true"/>
+  <style name="gtk-doc:function"            bold="true"/>
+  <style name="gtk-doc:parameter"           bold="true"/>
+  <style name="gtk-doc:constant"            bold="true"/>
+  <style name="gtk-doc:type"                bold="true"/>
+  <style name="gtk-doc:since"               bold="true"/>
+  <style name="gtk-doc:return"              bold="true"/>
+  <style name="gtk-doc:deprecated"          bold="true"/>
+  <style name="gtk-doc:signal-name"         bold="true"/>
+  <style name="gtk-doc:property-name"       bold="true"/>
+
+  <style name="gutter:added-line"           foreground="chameleon2"/>
+  <style name="gutter:changed-line"         foreground="butter3"/>
+  <style name="gutter:removed-line"         foreground="scarletred3"/>
+
+  <style name="js:built-in-constructor"     foreground="pink1"/>
+  <style name="js:keyword"                  foreground="#2b85aa"/>
+  <style name="js:string"                   foreground="#669900"/>
+  <style name="js:template-literal"         foreground="#669900"/>
+  <style name="js:built-in-function"        foreground="pink1"/>
+  <style name="js:built-in-method"          foreground="pink1"/>
+
+  <style name="latex:command"               foreground="chameleon1" bold="true"/>
+  <style name="latex:include"               use-style="def:preprocessor"/>
+
+  <style name="xml:comment"                 foreground="#8b9eab"/>
+  <style name="xml:attribute-name"          foreground="#orange3" bold="false"/>
+  <style name="xml:attribute-value"         foreground="#669900"/>
+  <style name="xml:tag-match"               background="#rgba(114,159,207,.20)"/>
+
+</style-scheme>
+
diff --git a/data/style-schemes/builder.style-scheme.xml b/data/styles/builder.xml
similarity index 72%
rename from data/style-schemes/builder.style-scheme.xml
rename to data/styles/builder.xml
index 340576988..702c792b9 100644
--- a/data/style-schemes/builder.style-scheme.xml
+++ b/data/styles/builder.xml
@@ -1,53 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- This file is part of Builder
-
-  Copyright (C) 2014 Christian Hergert <christian hergert me>
-                                                                      
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-                                                                      
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-                                                                      
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
--->
-<style-scheme id="builder" name="Builder" version="1.0">
-  <author>Christian Hergert</author>
-  <description>The default color scheme for Builder</description>
-
-  <!-- Diagnostics Underlining -->
-  <style name="diagnostician::deprecated"   underline="error" underline-color="aluminium3"/>
-  <style name="diagnostician::unused"       underline="error" underline-color="chocolate3"/>
-  <style name="diagnostician::error"        underline="error" underline-color="red1"/>
-  <style name="diagnostician::note"         underline="error" underline-color="blue1"/>
-  <style name="diagnostician::warning"      underline="error" underline-color="orange1"/>
+  Copyright 2022 Christian Hergert
 
-  <!-- Debugger -->
-  <style name="debugger::breakpoint"        background="#4a90d9" foreground="#ffffff"/>
+  GtkSourceView is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
 
-  <!-- Snippets -->
-  <style name="snippet::tab-stop"           background="#fcaf3e" foreground="text1"/>
-  <style name="snippet::area"               background="#rgba(32,74,135,.1)"/>
+  GtkSourceView is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
 
-  <!-- Hover links -->
-  <style name="action::hover-definition"    background="#d2e0e8" underline="true"/>
-  <style name="quick-highlight-match"       background="#rgba(221,74,104,0.15)"/>
-  <!-- Search Shadow -->
-  <style name="search-shadow"               background="#rgba(0,0,0,0.2)"/>
-  <!-- Spellchecker Matching -->
-  <style name="misspelled-match"            foreground="#000000" background="selection1"/>
+  You should have received a copy of the GNU Lesser General Public License
+  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
-  <!-- Quick Highlight Plugin -->
-  <style name="quick-highlight"             background="#rgba(221,74,104,.15)"/>
+-->
+<style-scheme id="builder" _name="Builder" version="1.0">
+  <author>Christian Hergert</author>
+  <_description>The default color scheme for Builder</_description>
 
+  <metadata>
+    <property name="variant">light</property>
+    <property name="dark-variant">builder-dark</property>
+    <property name="accent_bg_color">#0077aa</property>
+  </metadata>
 
   <!-- Named Colors -->
   <color name="aluminium1"                value="#EEEEEC"/>
@@ -93,16 +71,17 @@
   <color name="skyblue3"                  value="#204A87"/>
   <color name="text1"                     value="#4D4E53"/>
   <color name="white"                     value="#FFFFFF"/>
+  <color name="black"                     value="#000000"/>
   <color name="yellow1"                   value="#FFF9E5"/>
 
   <!-- Global Styles -->
-  <style name="background-pattern"        background="#F4F4F4"/>
+  <style name="background-pattern"        background="#F3F3F3"/>
   <style name="bracket-match"             background="aluminium3" foreground="text1" bold="true"/>
   <style name="bracket-mismatch"          background="scarletred3" foreground="aluminium1" bold="true"/>
   <style name="current-line"              background="aluminium1"/>
   <style name="current-line-number"       background="aluminium1" foreground="aluminium4" bold="true"/>
-  <style name="cursor"                    foreground="aluminium5"/>
-  <style name="draw-spaces"               foreground="aluminium2"/>
+  <style name="cursor"                    foreground="aluminium4"/>
+  <style name="draw-spaces"               foreground="aluminium3"/>
   <style name="line-numbers"              background="#FAFAFA" foreground="aluminium3"/>
   <style name="map-overlay"               background="#rgba(193,203,210,0.55)"/>
   <style name="misspelled-match"          background="selection1" foreground="#000000"/>
@@ -112,8 +91,30 @@
   <style name="search-match"              background="pink1" foreground="white"/>
   <style name="search-shadow"             background="#rgba(0,0,0,0.2)"/>
   <style name="selection"                 background="selection1"/>
+  <style name="snippet-focus"             background="orange1" foreground="text1"/>
   <style name="text"                      background="#FAFAFA" foreground="text1"/>
 
+  <!-- Builder Overrides -->
+  <style name="-Builder:added-line"       foreground="chameleon1"/>
+  <style name="-Builder:changed-line"     foreground="orange1"/>
+  <style name="-Builder:removed-line"     foreground="scarletred1"/>
+  <style name="-Builder:current-breakpoint" line-background="#f5c211" foreground="black"/>
+  <style name="-Builder:breakpoint"         line-background="#4A90D9" foreground="white"/>
+  <style name="-Builder:deprecated"       underline="error" underline-color="aluminium3"/>
+  <style name="-Builder:error"            underline="error" underline-color="red1"/>
+  <style name="-Builder:note"             underline="error" underline-color="blue1"/>
+  <style name="-Builder:unused"           underline="error" underline-color="chocolate3"/>
+  <style name="-Builder:warning"          underline="error" underline-color="orange1"/>
+  <style name="-Builder:hover-definition" background="#D2E0E8" underline="single"/>
+  <style name="-Builder:area"             background="#rgba(32,74,135,0.1)"/>
+  <style name="-Builder:attribute"        background="#F0E68C" foreground="#000000"/>
+  <style name="-Builder:class"            background="#FFEF98" foreground="#000000"/>
+  <style name="-Builder:id"               background="#D9E7BD" foreground="#000000"/>
+  <style name="-Builder:label"            background="#D5E7FC" foreground="#000000"/>
+  <style name="-Builder:parent"           background="#DEBECF" foreground="#000000"/>
+  <style name="-Builder:style-class"      background="#DFCD9B" foreground="#000000"/>
+  <style name="-Builder:type"             background="#F4DAC3" foreground="#000000"/>
+
   <!-- Defaults -->
   <style name="def:base-n-integer"        foreground="blue2"/>
   <style name="def:boolean"               foreground="pink1"/>
@@ -149,7 +150,6 @@
   <style name="def:thematic-break"        foreground="gr1" bold="true"/>
   <style name="def:type"                  foreground="gr1" bold="true"/>
   <style name="def:warning"               background="yellow1"/>
-  <style name="action::hover-definition"  background="#D2E0E8" underline="single"/>
 
   <!-- C -->
   <style name="c:boolean"                 foreground="blue2"/>
@@ -162,12 +162,6 @@
   <style name="c:storage-class"           foreground="orange3" bold="true"/>
   <style name="c:string"                  foreground="green1"/>
   <style name="c:type"                    foreground="green1" bold="true"/>
-  <style name="debugger::breakpoint"      background="#4A90D9" foreground="white"/>
-  <style name="diagnostician::deprecated" underline="error" underline-color="aluminium3"/>
-  <style name="diagnostician::error"      underline="error" underline-color="red1"/>
-  <style name="diagnostician::note"       underline="error" underline-color="blue1"/>
-  <style name="diagnostician::unused"     underline="error" underline-color="chocolate3"/>
-  <style name="diagnostician::warning"    underline="error" underline-color="orange1"/>
 
   <!-- Diff -->
   <style name="diff:added-line"           foreground="chameleon3"/>
@@ -188,9 +182,6 @@
   <style name="gtk-doc:signal-name"       bold="true"/>
   <style name="gtk-doc:since"             bold="true"/>
   <style name="gtk-doc:type"              bold="true"/>
-  <style name="gutter:added-line"         foreground="chameleon1"/>
-  <style name="gutter:changed-line"       foreground="orange1"/>
-  <style name="gutter:removed-line"       foreground="scarletred1"/>
 
   <!-- JavaScript -->
   <style name="js:built-in-constructor"   foreground="pink1"/>
@@ -215,19 +206,10 @@
   <!-- sh -->
   <style name="sh:variable"               foreground="plum3"/>
   <style name="sh:variable-definition"    foreground="chameleon3"/>
-  <style name="snippet::area"             background="#rgba(32,74,135,0.1)"/>
-  <style name="snippet::tab-stop"         background="orange1" foreground="text1"/>
-  <style name="symboltree::attribute"     background="#F0E68C" foreground="#000000"/>
-  <style name="symboltree::class"         background="#FFEF98" foreground="#000000"/>
-  <style name="symboltree::id"            background="#D9E7BD" foreground="#000000"/>
-  <style name="symboltree::label"         background="#D5E7FC" foreground="#000000"/>
-  <style name="symboltree::parent"        background="#DEBECF" foreground="#000000"/>
-  <style name="symboltree::style-class"   background="#DFCD9B" foreground="#000000"/>
-  <style name="symboltree::type"          background="#F4DAC3" foreground="#000000"/>
 
   <!-- XML -->
   <style name="xml:namespace"             bold="true"/>
   <style name="xml:tag-match"             background="#rgba(153,0,85,0.07)"/>
   <style name="xml:tags"                  foreground="chameleon3"/>
 
-</style-scheme>
\ No newline at end of file
+</style-scheme>
diff --git a/data/style-schemes/its/style-scheme.its b/data/styles/its/style-scheme.its
similarity index 100%
rename from data/style-schemes/its/style-scheme.its
rename to data/styles/its/style-scheme.its
diff --git a/data/style-schemes/its/style-scheme.loc b/data/styles/its/style-scheme.loc
similarity index 100%
rename from data/style-schemes/its/style-scheme.loc
rename to data/styles/its/style-scheme.loc
diff --git a/data/styles/meson.build b/data/styles/meson.build
new file mode 100644
index 000000000..fd4860ee1
--- /dev/null
+++ b/data/styles/meson.build
@@ -0,0 +1,6 @@
+install_data([
+  'builder.xml',
+  'builder-dark.xml',
+  'peninsula.xml',
+  'peninsula-dark.xml',
+], install_dir: join_paths(get_option('datadir'), 'gnome-builder/styles'))
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]