Commit 9dfa115
Bright and dark themes
Changed files (14)
modifiedinstall.pymodifiedlibbirdfont/CutBackgroundTool.valamodifiedlibbirdfont/Expander.valamodifiedlibbirdfont/LabelTool.valamodifiedlibbirdfont/OverView.valamodifiedlibbirdfont/SaveDialog.valamodifiedlibbirdfont/SettingsItem.valamodifiedlibbirdfont/TabBar.valamodifiedlibbirdfont/Theme.valamodifiedlibbirdfont/ThemeTab.valamodifiedlibbirdfont/Toolbox.valaaddedresources/bright.themeaddedresources/dark.themedeletedresources/default.theme
Diff
@@ -85,7 +85,8 @@ for file in os.listdir('./icons'): install ('icons/' + file, '/share/birdfont/icons', 644) install ('resources/icons.bf', '/share/birdfont', 644)-install ('resources/default.theme', '/share/birdfont', 644)+install ('resources/bright.theme', '/share/birdfont', 644)+install ('resources/dark.theme', '/share/birdfont', 644) install ('resources/high_contrast.theme', '/share/birdfont', 644) install ('resources/key_bindings.xml', '/share/birdfont', 644) install ('resources/roboto.bf', '/share/birdfont', 644)@@ -170,7 +170,7 @@ public class CutBackgroundTool : Tool { wc = bg.get_margin_width (); hc = bg.get_margin_height (); - Theme.color (cg, "Background 1");+ Theme.color (cg, "Canvas Background"); cg.rectangle (0, 0, bg.size_margin, bg.size_margin); cg.fill (); @@ -203,7 +203,7 @@ public class CutBackgroundTool : Tool { sr = new Surface.similar (sg, img.get_content (), (int) (w / bg.img_scale_x), (int) (h / bg.img_scale_y)); cr = new Context (sr); - Theme.color (cr, "Background 1");+ Theme.color (cr, "Canvas Background"); cr.rectangle (0, 0, w, h); cr.fill (); @@ -230,7 +230,7 @@ public class Expander : GLib.Object { title = new Text (); title.set_text ((!) headline); title.use_cache (true);- Theme.text_color (title, "Text Foreground");+ Theme.text_color (title, "Text Tool Box"); title.set_font_size (17 * Toolbox.get_scale ()); title.draw_at_baseline (cr, x, yt + HEADLINE_MARGIN + 13 * Toolbox.get_scale ()); }@@ -69,9 +69,9 @@ public class LabelTool : Tool { text_height = 18; if (is_selected ()) {- Theme.text_color (label_text, "Text Foreground");+ Theme.text_color (label_text, "Text Tool Box"); } else {- Theme.text_color (label_text, "Text Foreground");+ Theme.text_color (label_text, "Text Tool Box"); } label_text.set_font_size (text_height);@@ -485,7 +485,7 @@ public class OverView : FontDisplay { t = new Text (t_("No glyphs in this view."), 24); Theme.text_color (t, "Text Foreground"); t.widget_x = 40;- t.widget_y = 40;+ t.widget_y = 30; t.draw (cr); cr.restore (); }@@ -77,7 +77,7 @@ public class SaveDialog : Dialog { save_question.widget_x = save_button.widget_x + center; save_question.widget_y = cy + 15 * MainWindow.units;- Theme.text_color (save_question, "Text Foreground");+ Theme.text_color (save_question, "Text Tool Box"); qh = (question_font_size + 1) * MainWindow.units; @@ -118,7 +118,7 @@ public class SettingsItem : GLib.Object { } cr.save ();- Theme.text_color (label, "Text Foreground");+ Theme.text_color (label, "Text Tool Box"); label.set_font_size (17 * MainWindow.units); label.draw_at_baseline (cr, label_x, y + 20 * MainWindow.units); cr.restore ();@@ -131,7 +131,7 @@ public class SettingsItem : GLib.Object { if (active) { Theme.text_color (key_binding_text, "Foreground Inverted"); } else {- Theme.text_color (key_binding_text, "Text Foreground");+ Theme.text_color (key_binding_text, "Text Tool Box"); } key_binding_text.set_font_size (17 * MainWindow.units);@@ -632,14 +632,14 @@ public class TabBar : GLib.Object { if (has_scroll () && !has_progress_wheel ()) { // left arrow- Theme.text_color (left_arrow, "Text Foreground");+ Theme.text_color (left_arrow, "Text Tab Bar"); left_arrow.set_font_size (40 / scale); left_arrow.widget_x = 2 / scale; left_arrow.widget_y = h / 2.0 - (40 / scale ) / 2; left_arrow.draw (cr); // right arrow- Theme.text_color (right_arrow, "Text Foreground");+ Theme.text_color (right_arrow, "Text Tab Bar"); next_tab_x = (has_progress_wheel ()) ? w - (2 * 19 + 3) / scale : w - 19 / scale; next_tab_x-= 32 / scale; @@ -653,7 +653,7 @@ public class TabBar : GLib.Object { if (has_progress_wheel ()) { double progress_size = 40 / scale; - Theme.text_color (progress_icon, "Text Foreground");+ Theme.text_color (progress_icon, "Text Tab Bar"); progress_icon.set_font_size (progress_size); progress_icon.widget_x = w - 14 / scale;@@ -671,7 +671,7 @@ public class TabBar : GLib.Object { // menu icon if (MainWindow.get_menu ().show_menu) { Theme.color (cr, "Menu Background");- cr.rectangle (w - 33 / scale, 0, 33 / scale, h);+ cr.rectangle (w - 40 / scale, 0, 40 / scale, h); cr.fill (); } @@ -682,7 +682,7 @@ public class TabBar : GLib.Object { } menu_icon.set_font_size (40 / scale);- menu_icon.widget_x = (int) (w - 25 / scale);+ menu_icon.widget_x = (int) (w - 27 / scale); menu_icon.widget_y = (int) (h / 2.0 - 20 / scale); menu_icon.draw (cr); }@@ -786,7 +786,7 @@ public class TabBar : GLib.Object { if (tab_index == selected) { Theme.text_color (label, "Selected Tab Foreground"); } else {- Theme.text_color (label, "Text Foreground");+ Theme.text_color (label, "Text Tab Bar"); } label.set_font_size (text_height);@@ -90,13 +90,14 @@ public class Theme : GLib.Object { } public static void set_default_colors () {- current_theme = "default.theme";+ current_theme = "dark.theme"; color_list = new Gee.ArrayList<string> (); colors = new Gee.HashMap<string, Color> (); themes = new Gee.ArrayList<string> (); add_theme_files (); + // Bright theme Theme.set_default_color ("Canvas Background", 1, 1, 1, 1); Theme.set_default_color ("Stroke Color", 0, 0, 0, 1); Theme.set_default_color ("Handle Color", 0, 0, 0, 1);@@ -108,12 +109,17 @@ public class Theme : GLib.Object { Theme.set_default_color ("Menu Background", 222 / 255.0, 221 / 255.0, 226 / 255.0, 1); Theme.set_default_color ("Default Background", 238 / 255.0, 239 / 255.0, 243 / 255.0, 1); Theme.set_default_color ("Headline Background", 110 / 255.0, 113 / 255.0, 130 / 255.0, 1);- Theme.set_default_color ("Empty Tool Box", 110 / 255.0, 113 / 255.0, 130 / 255.0, 1); Theme.set_default_color ("Checkbox Background", 255 / 255.0, 255 / 255.0, 255 / 255.0, 1); Theme.set_default_color ("Foreground 1", 0, 0, 0, 1);+ Theme.set_default_color ("Text Foreground", 3 / 255.0, 16 / 255.0, 24 / 255.0, 1);+ Theme.set_default_color ("Text Tool Box", 3 / 255.0, 16 / 255.0, 24 / 255.0, 1);+ Theme.set_default_color ("Text Tab Bar", 3 / 255.0, 16 / 255.0, 24 / 255.0, 1);+ Theme.set_default_color ("Selected Tab Foreground", 0, 0, 0, 1);+ Theme.set_default_color ("Menu Foreground", 3 / 255.0, 16 / 255.0, 24 / 255.0, 1);+ Theme.set_default_color ("Table Border", 26 / 255.0, 30 / 255.0, 32 / 255.0, 1); Theme.set_default_color ("Selection Border", 40 / 255.0, 57 / 255.0, 65 / 255.0, 1); Theme.set_default_color ("Overview Glyph", 219 / 255.0, 221 / 255.0, 233 / 255.0, 1);@@ -121,16 +127,12 @@ public class Theme : GLib.Object { Theme.set_default_color ("Table Background 1", 238 / 255.0, 239 / 255.0, 243 / 255.0, 1); Theme.set_default_color ("Table Background 2", 225 / 255.0, 227 / 255.0, 233 / 255.0, 1); - Theme.set_default_color ("Selected Tab Foreground", 0, 0, 0, 1); Theme.set_default_color ("Tab Separator", 207 / 255.0, 210 / 255.0, 215 / 255.0, 1); Theme.set_default_color ("Foreground Inverted", 1, 1, 1, 1);- Theme.set_default_color ("Menu Foreground", 3 / 255.0, 16 / 255.0, 24 / 255.0, 1); - // FIXME: DELETE Theme.set_default_color ("Highlighted 1", 234 / 255.0, 77 / 255.0, 26 / 255.0, 1); Theme.set_default_color ("Highlighted 1", 159 / 255.0, 165 / 255.0, 192 / 255.0, 1); - Theme.set_default_color ("Highlighted Guide", 0, 0, 0.3, 1); Theme.set_default_color ("Guide 1", 0.7, 0.7, 0.8, 1); Theme.set_default_color ("Guide 2", 0.7, 0, 0, 0.5);@@ -198,7 +200,114 @@ public class Theme : GLib.Object { if (BirdFont.has_argument ("--test")) { current_theme = "generated_theme.theme"; write_theme ();- + }+ + // Dark theme+ Theme.set_default_color ("Canvas Background", 1, 1, 1, 1);+ Theme.set_default_color ("Stroke Color", 0, 0, 0, 1);+ Theme.set_default_color ("Handle Color", 0, 0, 0, 1);+ Theme.set_default_color ("Fill Color", 0.5, 0.5, 0.5, 1);+ Theme.set_default_color ("Selected Objects", 35 / 255.0, 131 / 255.0, 194 / 255.0, 1);+ + Theme.set_default_color ("Background 1", 1, 1, 1, 1);+ Theme.set_default_color ("Dialog Background", 55 / 255.0, 56 / 255.0, 62 / 255.0, 1);+ Theme.set_default_color ("Menu Background", 43 / 255.0, 42 / 255.0, 47 / 255.0, 1);+ Theme.set_default_color ("Default Background", 55 / 255.0, 56 / 255.0, 62 / 255.0, 1);+ Theme.set_default_color ("Headline Background", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1);+ + Theme.set_default_color ("Checkbox Background", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1);+ + Theme.set_default_color ("Foreground 1", 0, 0, 0, 1);+ + Theme.set_default_color ("Text Foreground", 0 / 255.0, 0 / 255.0, 0 / 255.0, 1);+ Theme.set_default_color ("Text Tool Box", 128 / 255.0, 130 / 255.0, 136 / 255.0, 1);+ Theme.set_default_color ("Text Tab Bar", 128 / 255.0, 130 / 255.0, 136 / 255.0, 1);+ Theme.set_default_color ("Selected Tab Foreground", 38 / 255.0, 36 / 255.0, 39 / 255.0, 1);+ Theme.set_default_color ("Menu Foreground", 128 / 255.0, 130 / 255.0, 136 / 255.0, 1);+ + Theme.set_default_color ("Table Border", 26 / 255.0, 30 / 255.0, 32 / 255.0, 1);+ Theme.set_default_color ("Selection Border", 40 / 255.0, 57 / 255.0, 65 / 255.0, 1);+ Theme.set_default_color ("Overview Glyph", 219 / 255.0, 221 / 255.0, 233 / 255.0, 1);+ + Theme.set_default_color ("Table Background 1", 238 / 255.0, 239 / 255.0, 243 / 255.0, 1);+ Theme.set_default_color ("Table Background 2", 225 / 255.0, 227 / 255.0, 233 / 255.0, 1);+ + Theme.set_default_color ("Tab Separator", 123 / 255.0, 127 / 255.0, 132 / 255.0, 1);+ + Theme.set_default_color ("Foreground Inverted", 1, 1, 1, 1);+ + Theme.set_default_color ("Highlighted 1", 234 / 255.0, 77 / 255.0, 26 / 255.0, 1);++ Theme.set_default_color ("Highlighted Guide", 0, 0, 0.3, 1);+ Theme.set_default_color ("Guide 1", 0.7, 0.7, 0.8, 1);+ Theme.set_default_color ("Guide 2", 0.7, 0, 0, 0.5);+ Theme.set_default_color ("Guide 3", 120 / 255.0, 68 / 255.0, 120 / 255.0, 120 / 255.0);+ + Theme.set_default_color ("Grid",0.2, 0.6, 0.2, 0.2);+ + Theme.set_default_color ("Background Glyph", 0.2, 0.2, 0.2, 0.5);+ + Theme.set_default_color ("Button Border 1", 39 / 255.0, 40 / 255.0, 44 / 255.0, 1);+ Theme.set_default_color ("Button Background 1", 25 / 255.0, 28 / 255.0, 30 / 255.0, 1);++ Theme.set_default_color ("Button Border 2", 39 / 255.0, 40 / 255.0, 44 / 255.0, 1);+ Theme.set_default_color ("Button Background 2", 25 / 255.0, 28 / 255.0, 30 / 255.0, 1);++ Theme.set_default_color ("Button Border 3", 39 / 255.0, 40 / 255.0, 44 / 255.0, 1);+ Theme.set_default_color ("Button Background 3", 44 / 255.0, 47 / 255.0, 51 / 255.0, 1);++ Theme.set_default_color ("Button Border 4", 39 / 255.0, 40 / 255.0, 44 / 255.0, 1);+ Theme.set_default_color ("Button Background 4", 44 / 255.0, 47 / 255.0, 51 / 255.0, 1);+ + Theme.set_default_color ("Button Foreground", 107 / 255.0, 112 / 255.0, 122 / 255.0, 1);+ Theme.set_default_color ("Selected Button Foreground", 107 / 255.0, 112 / 255.0, 122 / 255.0, 1);++ Theme.set_default_color ("Tool Foreground", 123 / 255.0, 127 / 255.0, 132 / 255.0, 1);+ Theme.set_default_color ("Selected Tool Foreground", 123 / 255.0, 127 / 255.0, 132 / 255.0, 1);+ + Theme.set_default_color ("Text Area Background", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1);++ Theme.set_default_color ("Overview Item Border", 207 / 255.0, 210 / 255.0, 215 / 255.0, 1);+ + Theme.set_default_color ("Selected Overview Item", 211 / 255.0, 212 / 255.0, 216 / 255.0, 1);+ Theme.set_default_color ("Overview Item 1", 236 / 255.0, 236 / 255.0, 236 / 255.0, 1);+ Theme.set_default_color ("Overview Item 2", 246 / 255.0, 246 / 255.0, 246 / 255.0, 1);+ + Theme.set_default_color ("Overview Selected Foreground", 45 / 255.0, 45 / 255.0, 45 / 255.0, 1);+ Theme.set_default_color ("Overview Foreground", 45 / 255.0, 45 / 255.0, 45 / 255.0, 1);+ + Theme.set_default_color ("Glyph Count Background 1", 92 / 255.0, 106 / 255.0, 117 / 255.0, 1);+ Theme.set_default_color ("Glyph Count Background 2", 92 / 255.0, 106 / 255.0, 117 / 255.0, 1);+ + Theme.set_default_color ("Dialog Shadow", 0, 0, 0, 0.3);+ + Theme.set_default_color ("Selected Active Cubic Control Point", 0, 0, 0, 1);+ Theme.set_default_color ("Selected Cubic Control Point", 0, 0, 0, 1);+ Theme.set_default_color ("Active Cubic Control Point", 70 / 255.0, 70 / 255.0, 70 / 255.0, 1);+ Theme.set_default_color ("Cubic Control Point", 116 / 255.0, 116 / 255.0, 116 / 255.0, 1);++ Theme.set_default_color ("Selected Active Quadratic Control Point", 0, 0, 0, 1);+ Theme.set_default_color ("Selected Quadratic Control Point", 0, 0, 0, 1);+ Theme.set_default_color ("Active Quadratic Control Point", 85 / 255.0, 115 / 255.0, 149 / 255.0, 1);+ Theme.set_default_color ("Quadratic Control Point", 123 / 255.0, 151 / 255.0, 184 / 255.0, 1);++ Theme.set_default_color ("Selected Control Point Handle", 0, 0, 0, 1);+ Theme.set_default_color ("Active Control Point Handle", 81 / 255.0, 147 / 255.0, 90 / 255.0, 1);+ Theme.set_default_color ("Control Point Handle", 81 / 255.0, 147 / 255.0, 90 / 255.0, 1);+ + Theme.set_default_color ("Merge", 167 / 255.0, 170 / 255.0, 178 / 255.0, 0.3);+ + Theme.set_default_color ("Spin Button", 107 / 255.0, 112 / 255.0, 122 / 255.0, 1);+ Theme.set_default_color ("Active Spin Button", 107 / 255.0, 112 / 255.0, 122 / 255.0, 1);+ Theme.set_default_color ("Zoom Bar Border", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1);+ Theme.set_default_color ("Font Name", 234 / 255.0, 77 / 255.0, 26 / 255.0, 1);+ + if (BirdFont.has_argument ("--test")) {+ current_theme = "generated_dark_theme.theme";+ write_theme ();+ }+ + if (BirdFont.has_argument ("--test")) { t_("Canvas Background"); t_("Stroke Color"); t_("Handle Color");@@ -293,7 +402,8 @@ public class Theme : GLib.Object { dir = BirdFont.get_settings_directory (); themes.clear ();- themes.add ("default.theme");+ themes.add ("dark.theme");+ themes.add ("bright.theme"); themes.add ("high_contrast.theme"); try {@@ -319,7 +429,7 @@ public class Theme : GLib.Object { colors.set (name, new Color (r, g, b, a)); write_theme (); }-+ public static void load_theme (string theme_file) { File default_theme; File user_theme;@@ -352,14 +462,17 @@ public class Theme : GLib.Object { return; } - if (current_theme == "default.theme" || current_theme == "high_contrast.theme") {+ if (current_theme == "dark.theme" + || current_theme == "bright.theme"+ || current_theme == "high_contrast.theme") {+ current_theme = "custom.theme"; file = get_child (BirdFont.get_settings_directory (), current_theme); i = 2; base_name = "custom"; while (file.query_exists ()) {- current_theme = @"$(base_name)_theme_$(i).theme";+ current_theme = @"$(base_name)_$(i).theme"; file = get_child (BirdFont.get_settings_directory (), current_theme); i++; }@@ -409,7 +522,7 @@ public class Theme : GLib.Object { XmlParser parser; try {- FileUtils.get_contents((!) f.get_path (), out xml_data);+ FileUtils.get_contents ((!) f.get_path (), out xml_data); parser = new XmlParser (xml_data); parse_colors (parser.get_root_tag ()); } catch (GLib.Error e) {@@ -485,7 +598,9 @@ public class Theme : GLib.Object { return_val_if_fail (!is_null (current_theme), "icons.bf".dup ()); return_val_if_fail (current_theme != "", "icons.bf".dup ()); - if (current_theme == "default.theme" || current_theme == "high_contrast.theme") {+ if (current_theme == "dark.theme" + || current_theme == "bright.theme"+ || current_theme == "high_contrast.theme") { return "icons.bf".dup (); } @@ -62,8 +62,10 @@ public class ThemeTab : SettingsDisplay { select_theme.set_icon ("theme"); - if (theme == "default.theme") {- label = t_("Default theme");+ if (theme == "dark.theme") {+ label = t_("Dark theme");+ } else if (theme == "bright.theme") {+ label = t_("Bright theme"); } else if (theme == "high_contrast.theme") { label = t_("High contrast theme"); } else if (theme == "custom.theme") {@@ -457,12 +457,8 @@ public class Toolbox : GLib.Object { public void draw (int w, int h, Context cr) { cr.save (); - if (current_set is EmptySet) {- Theme.color (cr, "Empty Tool Box");- } else {- Theme.color (cr, "Default Background");- }-+ Theme.color (cr, "Default Background");+ cr.rectangle (0, 0, w, h); cr.set_line_width (0); cr.fill ();new file mode 100644@@ -0,0 +1,72 @@+<?xml version="1.0" encoding="utf-8" standalone="yes"?>+<theme>+ <color name="Highlighted 1" red="0.62352941176470589" green="0.6470588235294118" blue="0.75294117647058822" alpha="1"/>+ <color name="Guide 1" red="0.69999999999999996" green="0.69999999999999996" blue="0.80000000000000004" alpha="1"/>+ <color name="Overview Item Border" red="0.81176470588235294" green="0.82352941176470584" blue="0.84313725490196079" alpha="1"/>+ <color name="Active Quadratic Control Point" red="0.33333333333333331" green="0.45098039215686275" blue="0.58431372549019611" alpha="1"/>+ <color name="Background 1" red="1" green="1" blue="1" alpha="1"/>+ <color name="Guide 2" red="0.69999999999999996" green="0" blue="0" alpha="0.5"/>+ <color name="Guide 3" red="0.47058823529411764" green="0.26666666666666666" blue="0.47058823529411764" alpha="0.47058823529411764"/>+ <color name="Tab Separator" red="0.81176470588235294" green="0.82352941176470584" blue="0.84313725490196079" alpha="1"/>+ <color name="Overview Glyph" red="0.85882352941176465" green="0.8666666666666667" blue="0.9137254901960784" alpha="1"/>+ <color name="Dialog Shadow" red="0" green="0" blue="0" alpha="0.29999999999999999"/>+ <color name="Selected Active Cubic Control Point" red="0" green="0" blue="0" alpha="1"/>+ <color name="Selected Cubic Control Point" red="0" green="0" blue="0" alpha="1"/>+ <color name="Selected Tab Foreground" red="0" green="0" blue="0" alpha="1"/>+ <color name="Control Point Handle" red="0.31764705882352939" green="0.57647058823529407" blue="0.35294117647058826" alpha="1"/>+ <color name="Text Tab Bar" red="0.011764705882352941" green="0.062745098039215685" blue="0.094117647058823528" alpha="1"/>+ <color name="Zoom Bar Border" red="0.47843137254901963" green="0.51372549019607838" blue="0.56862745098039214" alpha="1"/>+ <color name="Text Foreground" red="0.011764705882352941" green="0.062745098039215685" blue="0.094117647058823528" alpha="1"/>+ <color name="Fill Color" red="0.5" green="0.5" blue="0.5" alpha="1"/>+ <color name="Table Background 1" red="0.93333333333333335" green="0.93725490196078431" blue="0.95294117647058818" alpha="1"/>+ <color name="Stroke Color" red="0" green="0" blue="0" alpha="1"/>+ <color name="Menu Background" red="0.87058823529411766" green="0.8666666666666667" blue="0.88627450980392153" alpha="1"/>+ <color name="Table Background 2" red="0.88235294117647056" green="0.8901960784313725" blue="0.9137254901960784" alpha="1"/>+ <color name="Selected Tool Foreground" red="0.011764705882352941" green="0.062745098039215685" blue="0.094117647058823528" alpha="1"/>+ <color name="Selected Control Point Handle" red="0" green="0" blue="0" alpha="1"/>+ <color name="Font Name" red="0" green="0" blue="0" alpha="1"/>+ <color name="Button Foreground" red="0.011764705882352941" green="0.062745098039215685" blue="0.094117647058823528" alpha="1"/>+ <color name="Grid" red="0.20000000000000001" green="0.59999999999999998" blue="0.20000000000000001" alpha="0.20000000000000001"/>+ <color name="Text Area Background" red="1" green="1" blue="1" alpha="1"/>+ <color name="Button Background 1" red="0.82745098039215681" green="0.83137254901960789" blue="0.84705882352941175" alpha="1"/>+ <color name="Glyph Count Background 1" red="1" green="1" blue="1" alpha="1"/>+ <color name="Button Border 1" red="0.67843137254901964" green="0.69019607843137254" blue="0.73725490196078436" alpha="1"/>+ <color name="Button Background 2" red="0.82745098039215681" green="0.83137254901960789" blue="0.84705882352941175" alpha="1"/>+ <color name="Glyph Count Background 2" red="1" green="1" blue="1" alpha="1"/>+ <color name="Button Border 2" red="0.67843137254901964" green="0.69019607843137254" blue="0.73725490196078436" alpha="1"/>+ <color name="Button Background 3" red="0.94901960784313721" green="0.96470588235294119" blue="0.96470588235294119" alpha="1"/>+ <color name="Selection Border" red="0.15686274509803921" green="0.22352941176470589" blue="0.25490196078431371" alpha="1"/>+ <color name="Button Border 3" red="0.67843137254901964" green="0.69019607843137254" blue="0.73725490196078436" alpha="1"/>+ <color name="Button Background 4" red="0.94901960784313721" green="0.96470588235294119" blue="0.96470588235294119" alpha="1"/>+ <color name="Background Glyph" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="0.5"/>+ <color name="Default Background" red="0.93333333333333335" green="0.93725490196078431" blue="0.95294117647058818" alpha="1"/>+ <color name="Handle Color" red="0" green="0" blue="0" alpha="1"/>+ <color name="Button Border 4" red="0.67843137254901964" green="0.69019607843137254" blue="0.73725490196078436" alpha="1"/>+ <color name="Highlighted Guide" red="0" green="0" blue="0.29999999999999999" alpha="1"/>+ <color name="Overview Item 1" red="0.92549019607843142" green="0.92549019607843142" blue="0.92549019607843142" alpha="1"/>+ <color name="Cubic Control Point" red="0.45490196078431372" green="0.45490196078431372" blue="0.45490196078431372" alpha="1"/>+ <color name="Selected Active Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/>+ <color name="Overview Item 2" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1"/>+ <color name="Selected Button Foreground" red="0.011764705882352941" green="0.062745098039215685" blue="0.094117647058823528" alpha="1"/>+ <color name="Active Spin Button" red="0.40784313725490196" green="0.42352941176470588" blue="0.46666666666666667" alpha="1"/>+ <color name="Menu Foreground" red="0.011764705882352941" green="0.062745098039215685" blue="0.094117647058823528" alpha="1"/>+ <color name="Dialog Background" red="0.93333333333333335" green="0.93725490196078431" blue="0.95294117647058818" alpha="1"/>+ <color name="Table Border" red="0.10196078431372549" green="0.11764705882352941" blue="0.12549019607843137" alpha="1"/>+ <color name="Spin Button" red="0.64313725490196083" green="0.65490196078431373" blue="0.68627450980392157" alpha="1"/>+ <color name="Text Tool Box" red="0.011764705882352941" green="0.062745098039215685" blue="0.094117647058823528" alpha="1"/>+ <color name="Overview Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/>+ <color name="Selected Objects" red="0.13725490196078433" green="0.51372549019607838" blue="0.76078431372549016" alpha="1"/>+ <color name="Tool Foreground" red="0.011764705882352941" green="0.062745098039215685" blue="0.094117647058823528" alpha="1"/>+ <color name="Selected Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/>+ <color name="Checkbox Background" red="1" green="1" blue="1" alpha="1"/>+ <color name="Active Cubic Control Point" red="0.27450980392156865" green="0.27450980392156865" blue="0.27450980392156865" alpha="1"/>+ <color name="Foreground 1" red="0" green="0" blue="0" alpha="1"/>+ <color name="Active Control Point Handle" red="0.31764705882352939" green="0.57647058823529407" blue="0.35294117647058826" alpha="1"/>+ <color name="Merge" red="0.65490196078431373" green="0.66666666666666663" blue="0.69803921568627447" alpha="0.29999999999999999"/>+ <color name="Headline Background" red="0.43137254901960786" green="0.44313725490196076" blue="0.50980392156862742" alpha="1"/>+ <color name="Overview Selected Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/>+ <color name="Canvas Background" red="1" green="1" blue="1" alpha="1"/>+ <color name="Foreground Inverted" red="1" green="1" blue="1" alpha="1"/>+ <color name="Selected Overview Item" red="0.82745098039215681" green="0.83137254901960789" blue="0.84705882352941175" alpha="1"/>+ <color name="Quadratic Control Point" red="0.4823529411764706" green="0.59215686274509804" blue="0.72156862745098038" alpha="1"/>+</theme>new file mode 100644@@ -0,0 +1,72 @@+<?xml version="1.0" encoding="utf-8" standalone="yes"?>+<theme>+ <color name="Highlighted 1" red="0.91764705882352937" green="0.30196078431372547" blue="0.10196078431372549" alpha="1"/>+ <color name="Guide 1" red="0.69999999999999996" green="0.69999999999999996" blue="0.80000000000000004" alpha="1"/>+ <color name="Overview Item Border" red="0.81176470588235294" green="0.82352941176470584" blue="0.84313725490196079" alpha="1"/>+ <color name="Active Quadratic Control Point" red="0.33333333333333331" green="0.45098039215686275" blue="0.58431372549019611" alpha="1"/>+ <color name="Background 1" red="1" green="1" blue="1" alpha="1"/>+ <color name="Guide 2" red="0.69999999999999996" green="0" blue="0" alpha="0.5"/>+ <color name="Guide 3" red="0.47058823529411764" green="0.26666666666666666" blue="0.47058823529411764" alpha="0.47058823529411764"/>+ <color name="Tab Separator" red="0.4823529411764706" green="0.49803921568627452" blue="0.51764705882352946" alpha="1"/>+ <color name="Overview Glyph" red="0.85882352941176465" green="0.8666666666666667" blue="0.9137254901960784" alpha="1"/>+ <color name="Dialog Shadow" red="0" green="0" blue="0" alpha="0.29999999999999999"/>+ <color name="Selected Active Cubic Control Point" red="0" green="0" blue="0" alpha="1"/>+ <color name="Selected Cubic Control Point" red="0" green="0" blue="0" alpha="1"/>+ <color name="Selected Tab Foreground" red="0.14901960784313725" green="0.14117647058823529" blue="0.15294117647058825" alpha="1"/>+ <color name="Control Point Handle" red="0.31764705882352939" green="0.57647058823529407" blue="0.35294117647058826" alpha="1"/>+ <color name="Text Tab Bar" red="0.50196078431372548" green="0.50980392156862742" blue="0.53333333333333333" alpha="1"/>+ <color name="Zoom Bar Border" red="0.14901960784313725" green="0.15294117647058825" blue="0.16862745098039217" alpha="1"/>+ <color name="Text Foreground" red="0" green="0" blue="0" alpha="1"/>+ <color name="Fill Color" red="0.5" green="0.5" blue="0.5" alpha="1"/>+ <color name="Table Background 1" red="0.93333333333333335" green="0.93725490196078431" blue="0.95294117647058818" alpha="1"/>+ <color name="Stroke Color" red="0" green="0" blue="0" alpha="1"/>+ <color name="Menu Background" red="0.16862745098039217" green="0.16470588235294117" blue="0.18431372549019609" alpha="1"/>+ <color name="Table Background 2" red="0.88235294117647056" green="0.8901960784313725" blue="0.9137254901960784" alpha="1"/>+ <color name="Selected Tool Foreground" red="0.4823529411764706" green="0.49803921568627452" blue="0.51764705882352946" alpha="1"/>+ <color name="Selected Control Point Handle" red="0" green="0" blue="0" alpha="1"/>+ <color name="Font Name" red="0.91764705882352937" green="0.30196078431372547" blue="0.10196078431372549" alpha="1"/>+ <color name="Button Foreground" red="0.41960784313725491" green="0.4392156862745098" blue="0.47843137254901963" alpha="1"/>+ <color name="Grid" red="0.20000000000000001" green="0.59999999999999998" blue="0.20000000000000001" alpha="0.20000000000000001"/>+ <color name="Text Area Background" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>+ <color name="Button Background 1" red="0.098039215686274508" green="0.10980392156862745" blue="0.11764705882352941" alpha="1"/>+ <color name="Glyph Count Background 1" red="0.36078431372549019" green="0.41568627450980394" blue="0.45882352941176469" alpha="1"/>+ <color name="Button Border 1" red="0.15294117647058825" green="0.15686274509803921" blue="0.17254901960784313" alpha="1"/>+ <color name="Button Background 2" red="0.098039215686274508" green="0.10980392156862745" blue="0.11764705882352941" alpha="1"/>+ <color name="Glyph Count Background 2" red="0.36078431372549019" green="0.41568627450980394" blue="0.45882352941176469" alpha="1"/>+ <color name="Button Border 2" red="0.15294117647058825" green="0.15686274509803921" blue="0.17254901960784313" alpha="1"/>+ <color name="Button Background 3" red="0.17254901960784313" green="0.18431372549019609" blue="0.20000000000000001" alpha="1"/>+ <color name="Selection Border" red="0.15686274509803921" green="0.22352941176470589" blue="0.25490196078431371" alpha="1"/>+ <color name="Button Border 3" red="0.15294117647058825" green="0.15686274509803921" blue="0.17254901960784313" alpha="1"/>+ <color name="Button Background 4" red="0.17254901960784313" green="0.18431372549019609" blue="0.20000000000000001" alpha="1"/>+ <color name="Background Glyph" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="0.5"/>+ <color name="Default Background" red="0.21568627450980393" green="0.2196078431372549" blue="0.24313725490196078" alpha="1"/>+ <color name="Handle Color" red="0" green="0" blue="0" alpha="1"/>+ <color name="Button Border 4" red="0.15294117647058825" green="0.15686274509803921" blue="0.17254901960784313" alpha="1"/>+ <color name="Highlighted Guide" red="0" green="0" blue="0.29999999999999999" alpha="1"/>+ <color name="Overview Item 1" red="0.92549019607843142" green="0.92549019607843142" blue="0.92549019607843142" alpha="1"/>+ <color name="Cubic Control Point" red="0.45490196078431372" green="0.45490196078431372" blue="0.45490196078431372" alpha="1"/>+ <color name="Selected Active Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/>+ <color name="Overview Item 2" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1"/>+ <color name="Selected Button Foreground" red="0.41960784313725491" green="0.4392156862745098" blue="0.47843137254901963" alpha="1"/>+ <color name="Active Spin Button" red="0.41960784313725491" green="0.4392156862745098" blue="0.47843137254901963" alpha="1"/>+ <color name="Menu Foreground" red="0.50196078431372548" green="0.50980392156862742" blue="0.53333333333333333" alpha="1"/>+ <color name="Dialog Background" red="0.21568627450980393" green="0.2196078431372549" blue="0.24313725490196078" alpha="1"/>+ <color name="Table Border" red="0.10196078431372549" green="0.11764705882352941" blue="0.12549019607843137" alpha="1"/>+ <color name="Spin Button" red="0.41960784313725491" green="0.4392156862745098" blue="0.47843137254901963" alpha="1"/>+ <color name="Text Tool Box" red="0.50196078431372548" green="0.50980392156862742" blue="0.53333333333333333" alpha="1"/>+ <color name="Overview Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/>+ <color name="Selected Objects" red="0.13725490196078433" green="0.51372549019607838" blue="0.76078431372549016" alpha="1"/>+ <color name="Tool Foreground" red="0.4823529411764706" green="0.49803921568627452" blue="0.51764705882352946" alpha="1"/>+ <color name="Selected Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/>+ <color name="Checkbox Background" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>+ <color name="Active Cubic Control Point" red="0.27450980392156865" green="0.27450980392156865" blue="0.27450980392156865" alpha="1"/>+ <color name="Foreground 1" red="0" green="0" blue="0" alpha="1"/>+ <color name="Active Control Point Handle" red="0.31764705882352939" green="0.57647058823529407" blue="0.35294117647058826" alpha="1"/>+ <color name="Merge" red="0.65490196078431373" green="0.66666666666666663" blue="0.69803921568627447" alpha="0.29999999999999999"/>+ <color name="Headline Background" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>+ <color name="Overview Selected Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/>+ <color name="Canvas Background" red="1" green="1" blue="1" alpha="1"/>+ <color name="Foreground Inverted" red="1" green="1" blue="1" alpha="1"/>+ <color name="Selected Overview Item" red="0.82745098039215681" green="0.83137254901960789" blue="0.84705882352941175" alpha="1"/>+ <color name="Quadratic Control Point" red="0.4823529411764706" green="0.59215686274509804" blue="0.72156862745098038" alpha="1"/>+</theme>deleted file mode 100644@@ -1,68 +0,0 @@-<?xml version="1.0" encoding="utf-8" standalone="yes"?>-<theme>- <color name="Highlighted 1" red="0.91764705882352937" green="0.30196078431372547" blue="0.10196078431372549" alpha="1"/>- <color name="Guide 1" red="0.69999999999999996" green="0.69999999999999996" blue="0.80000000000000004" alpha="1"/>- <color name="Foreground 6" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/>- <color name="Active Quadratic Control Point" red="0.33333333333333331" green="0.45098039215686275" blue="0.58431372549019611" alpha="1"/>- <color name="Background 1" red="1" green="1" blue="1" alpha="1"/>- <color name="Guide 2" red="0.69999999999999996" green="0" blue="0" alpha="0.5"/>- <color name="Foreground 7" red="0.85882352941176465" green="0.8666666666666667" blue="0.9137254901960784" alpha="1"/>- <color name="Background 2" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>- <color name="Guide 3" red="0.47058823529411764" green="0.26666666666666666" blue="0.47058823529411764" alpha="0.47058823529411764"/>- <color name="Selected Overview Item 1" red="0.81568627450980391" green="0.81568627450980391" blue="0.81568627450980391" alpha="1"/>- <color name="Background 3" red="0.14901960784313725" green="0.15294117647058825" blue="0.16862745098039217" alpha="1"/>- <color name="Selected Overview Item 2" red="0.89803921568627454" green="0.89803921568627454" blue="0.89803921568627454" alpha="1"/>- <color name="Background 4" red="0.20000000000000001" green="0.21176470588235294" blue="0.23137254901960785" alpha="1"/>- <color name="Dialog Shadow" red="0" green="0" blue="0" alpha="0.29999999999999999"/>- <color name="Background 5" red="0.29999999999999999" green="0.29999999999999999" blue="0.29999999999999999" alpha="1"/>- <color name="Glyph Count Background" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>- <color name="Background 6" red="0.8784313725490196" green="0.8784313725490196" blue="0.8784313725490196" alpha="1"/>- <color name="Selected Active Cubic Control Point" red="0" green="0" blue="0" alpha="1"/>- <color name="Selected Cubic Control Point" red="0" green="0" blue="0" alpha="1"/>- <color name="Background 7" red="0.2196078431372549" green="0.23137254901960785" blue="0.25490196078431371" alpha="1"/>- <color name="Control Point Handle" red="0.31764705882352939" green="0.57647058823529407" blue="0.35294117647058826" alpha="1"/>- <color name="Background 8" red="0.21568627450980393" green="0.21568627450980393" blue="0.21568627450980393" alpha="1"/>- <color name="Fill Color" red="0.5" green="0.5" blue="0.5" alpha="1"/>- <color name="Foreground Inverted Table" red="1" green="1" blue="1" alpha="1"/>- <color name="Background 9" red="0.28235294117647058" green="0.28235294117647058" blue="0.28235294117647058" alpha="1"/>- <color name="Stroke Color" red="0" green="0" blue="0" alpha="1"/>- <color name="Selected Tool Foreground" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>- <color name="Selected Control Point Handle" red="0" green="0" blue="0" alpha="1"/>- <color name="Button Foreground" red="1" green="1" blue="1" alpha="1"/>- <color name="Grid" red="0.20000000000000001" green="0.59999999999999998" blue="0.20000000000000001" alpha="0.20000000000000001"/>- <color name="Text Area Background" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>- <color name="Background 10" red="0.87450980392156863" green="0.87450980392156863" blue="0.87450980392156863" alpha="1"/>- <color name="Button Background 1" red="0.054901960784313725" green="0.062745098039215685" blue="0.066666666666666666" alpha="1"/>- <color name="Button Border 1" red="0.14901960784313725" green="0.15294117647058825" blue="0.16862745098039217" alpha="1"/>- <color name="Button Background 2" red="0.10196078431372549" green="0.11764705882352941" blue="0.12549019607843137" alpha="1"/>- <color name="Button Border 2" red="0.14901960784313725" green="0.15294117647058825" blue="0.16862745098039217" alpha="1"/>- <color name="Button Background 3" red="0.17254901960784313" green="0.18431372549019609" blue="0.20000000000000001" alpha="1"/>- <color name="Button Border 3" red="0.14901960784313725" green="0.15294117647058825" blue="0.16862745098039217" alpha="1"/>- <color name="Button Background 4" red="0.12941176470588237" green="0.14117647058823529" blue="0.15294117647058825" alpha="1"/>- <color name="Background Glyph" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="0.5"/>- <color name="Handle Color" red="0" green="0" blue="0" alpha="1"/>- <color name="Button Border 4" red="0.14901960784313725" green="0.15294117647058825" blue="0.16862745098039217" alpha="1"/>- <color name="Highlighted Guide" red="0" green="0" blue="0.29999999999999999" alpha="1"/>- <color name="Overview Item 1" red="0.92549019607843142" green="0.92549019607843142" blue="0.92549019607843142" alpha="1"/>- <color name="Cubic Control Point" red="0.45490196078431372" green="0.45490196078431372" blue="0.45490196078431372" alpha="1"/>- <color name="Selected Active Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/>- <color name="Overview Item 2" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1"/>- <color name="Selected Button Foreground" red="1" green="1" blue="1" alpha="1"/>- <color name="Menu Foreground" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>- <color name="Overview Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/>- <color name="Selected Objects" red="0.13725490196078433" green="0.51372549019607838" blue="0.76078431372549016" alpha="1"/>- <color name="Tool Foreground" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>- <color name="Selected Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/>- <color name="Checkbox Background" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>- <color name="Active Cubic Control Point" red="0.27450980392156865" green="0.27450980392156865" blue="0.27450980392156865" alpha="1"/>- <color name="Foreground 1" red="0" green="0" blue="0" alpha="1"/>- <color name="Active Control Point Handle" red="0.31764705882352939" green="0.57647058823529407" blue="0.35294117647058826" alpha="1"/>- <color name="Merge" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="0.29999999999999999"/>- <color name="Foreground 2" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>- <color name="Foreground 3" red="0.10196078431372549" green="0.11764705882352941" blue="0.12549019607843137" alpha="1"/>- <color name="Overview Selected Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/>- <color name="Foreground 4" red="0.15686274509803921" green="0.22352941176470589" blue="0.25490196078431371" alpha="1"/>- <color name="Foreground Inverted" red="1" green="1" blue="1" alpha="1"/>- <color name="Foreground 5" red="0.27450980392156865" green="0.30196078431372547" blue="0.32549019607843138" alpha="1"/>- <color name="Quadratic Control Point" red="0.4823529411764706" green="0.59215686274509804" blue="0.72156862745098038" alpha="1"/>-</theme>