The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

New color theme

These changes was commited to the Birdfont repository Fri, 17 Apr 2015 12:12:42 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Fri, 17 Apr 2015 12:12:42 +0000 (14:12 +0200)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Fri, 17 Apr 2015 12:12:42 +0000 (14:12 +0200)
commit a577624e0844bdee5c69fe99cae2a385a70aa004
tree 5d0977ddad994812d3ba77daadcc65501938d6fb
parent d723427bc5bd104e356a5674a6a800357d9a1064
New color theme

25 files changed:
libbirdfont/BackgroundImage.vala
libbirdfont/Expander.vala
libbirdfont/Headline.vala
libbirdfont/KerningRange.vala
libbirdfont/LabelTool.vala
libbirdfont/Menu.vala
libbirdfont/MessageDialog.vala
libbirdfont/MoveTool.vala
libbirdfont/OverViewItem.vala
libbirdfont/Path.vala
libbirdfont/PenTool.vala
libbirdfont/SaveDialog.vala
libbirdfont/SettingsDisplay.vala
libbirdfont/SettingsItem.vala
libbirdfont/SpinButton.vala
libbirdfont/StrokeTool.vala
libbirdfont/TabBar.vala
libbirdfont/TabContent.vala
libbirdfont/TableLayout.vala
libbirdfont/Theme.vala
libbirdfont/Tool.vala
libbirdfont/Toolbox.vala
libbirdfont/ZoomBar.vala
resources/icons.bf
--- a/libbirdfont/BackgroundImage.vala +++ b/libbirdfont/BackgroundImage.vala @@ -589,7 +589,7 @@ double x, y; cr.save (); - Theme.color (cr, "Background 3"); + Theme.color (cr, "Menu Background"); x = img_middle_x - (img_scale_x * get_img ().get_width () / 2); y = img_middle_y - (img_scale_y * get_img ().get_height () / 2); @@ -612,8 +612,8 @@ cr.scale (g.view_zoom, g.view_zoom); if (selected_handle == 2) Theme.color (cr, "Highlighted 1"); - else if (active_handle == 2) Theme.color (cr, "Background 4"); - else Theme.color (cr, "Background 3"); + else if (active_handle == 2) Theme.color (cr, "Default Background"); + else Theme.color (cr, "Menu Background"); x = img_offset_x - g.view_offset_x + (size_margin / 2) * img_scale_x; y = img_offset_y - g.view_offset_y + (size_margin / 2) * img_scale_y; @@ -648,8 +648,8 @@ cr.set_line_width (ivz); if (selected_handle == 1) Theme.color (cr, "Highlighted 1"); - else if (active_handle == 1) Theme.color (cr, "Background 4"); - else Theme.color (cr, "Background 3"); + else if (active_handle == 1) Theme.color (cr, "Default Background"); + else Theme.color (cr, "Menu Background"); size = (8) * s;
--- a/libbirdfont/Expander.vala +++ b/libbirdfont/Expander.vala @@ -228,7 +228,7 @@ title = new Text (); title.set_text ((!) headline); title.use_cache (true); - Theme.text_color (title, "Foreground 2"); + Theme.text_color (title, "Text Foreground"); title.set_font_size (17 * Toolbox.get_scale ()); title.draw_at_baseline (cr, x, yt + HEADLINE_MARGIN + 13 * Toolbox.get_scale ()); }
--- a/libbirdfont/Headline.vala +++ b/libbirdfont/Headline.vala @@ -28,7 +28,7 @@ public override void draw (Context cr) { cr.save (); - Theme.color (cr, "Background 2"); + Theme.color (cr, "Dialog Background"); cr.rectangle (0, widget_y, allocation.width, 40 * MainWindow.units); cr.fill (); cr.restore ();
--- a/libbirdfont/KerningRange.vala +++ b/libbirdfont/KerningRange.vala @@ -143,7 +143,7 @@ label_text = new Text (); label_text.set_text (name); - Theme.text_color (label_text, "Foreground 2"); + Theme.text_color (label_text, "Text Foreground"); label_text.set_font_size (18); label_text.widget_x = x; label_text.widget_y = y;
--- a/libbirdfont/LabelTool.vala +++ b/libbirdfont/LabelTool.vala @@ -56,7 +56,7 @@ // background if (is_selected ()) { cr.save (); - Theme.color (cr, "Background 3"); + Theme.color (cr, "Menu Background"); cr.rectangle (0, y - 2, w, h + 7); cr.fill (); cr.restore (); @@ -69,9 +69,9 @@ text_height = 18; if (is_selected ()) { - Theme.text_color (label_text, "Foreground Inverted"); + Theme.text_color (label_text, "Text Foreground"); } else { - Theme.text_color (label_text, "Foreground 2"); + Theme.text_color (label_text, "Text Foreground"); } label_text.set_font_size (text_height); @@ -81,13 +81,13 @@ // glyph count if (has_counter) { cr.save (); - bgx = Toolbox.allocation_width - counter_box_width - 15; + bgx = Toolbox.allocation_width - counter_box_width - 9; bgy = y + 2; if (is_selected ()) { Theme.color (cr, "Glyph Count Background"); } else { - Theme.color (cr, "Background 3"); + Theme.color (cr, "Menu Background"); } draw_rounded_rectangle (cr, bgx, bgy, counter_box_width, counter_box_height, 3); @@ -103,9 +103,9 @@ center_y = bgy + (counter_box_height / 2.0 + 5); if (is_selected ()) { - Theme.text_color (glyph_count, "Foreground 1"); + Theme.text_color (glyph_count, "Text Foreground"); } else { - Theme.text_color (glyph_count, "Foreground Inverted"); + Theme.text_color (glyph_count, "Text Foreground"); } glyph_count.set_font_size (text_height);
--- a/libbirdfont/Menu.vala +++ b/libbirdfont/Menu.vala @@ -700,7 +700,7 @@ foreach (MenuItem item in current_menu.items) { cr.save (); - Theme.color (cr, "Background 3"); + Theme.color (cr, "Menu Background"); cr.rectangle (x, y, width, height); cr.fill (); cr.restore ();
--- a/libbirdfont/MessageDialog.vala +++ b/libbirdfont/MessageDialog.vala @@ -57,7 +57,7 @@ cr.restore (); cr.save (); - Theme.color (cr, "Background 2"); + Theme.color (cr, "Dialog Background"); draw_rounded_rectangle (cr, cx, cy, width, height, 10 * MainWindow.units); cr.fill (); cr.restore ();
--- a/libbirdfont/MoveTool.vala +++ b/libbirdfont/MoveTool.vala @@ -233,7 +233,7 @@ cr.save (); - Theme.color (cr, "Background 4"); + Theme.color (cr, "Default Background"); cr.set_line_width (2); cr.rectangle (x, y, w, h); cr.stroke ();
--- a/libbirdfont/OverViewItem.vala +++ b/libbirdfont/OverViewItem.vala @@ -117,7 +117,7 @@ cr.restore (); cr.save (); - Theme.color (cr, "Foreground 3"); + Theme.color (cr, "Text Foreground"); cr.rectangle (x, y, width, height); cr.set_line_width (1); cr.stroke ();
--- a/libbirdfont/Path.vala +++ b/libbirdfont/Path.vala @@ -157,7 +157,7 @@ cr.save (); - Theme.color (cr, "Background 4"); + Theme.color (cr, "Default Background"); cr.set_line_width (2); cr.rectangle (x, y, x2 - x, y2 - y); cr.stroke ();
--- a/libbirdfont/PenTool.vala +++ b/libbirdfont/PenTool.vala @@ -98,8 +98,6 @@ press_action.connect ((self, b, x, y) => { // retain path direction - Glyph glyph = MainWindow.get_current_glyph (); - clockwise = new Gee.ArrayList<Path> (); counter_clockwise = new Gee.ArrayList<Path> ();
--- a/libbirdfont/SaveDialog.vala +++ b/libbirdfont/SaveDialog.vala @@ -77,7 +77,7 @@ save_question.widget_x = save_button.widget_x + center; save_question.widget_y = cy + 15 * MainWindow.units; - Theme.text_color (save_question, "Foreground Inverted"); + Theme.text_color (save_question, "Text Foreground"); qh = (question_font_size + 1) * MainWindow.units; @@ -106,13 +106,13 @@ cr.restore (); cr.save (); - Theme.color (cr, "Background 2"); + Theme.color (cr, "Dialog Background"); draw_rounded_rectangle (cr, cx, cy, width, height, 10 * MainWindow.units); cr.fill (); cr.restore (); cr.save (); - Theme.color (cr, "Foreground 1"); + Theme.color (cr, "Button Border 4"); cr.set_line_width (1); draw_rounded_rectangle (cr, cx, cy, width, height, 10 * MainWindow.units); cr.stroke ();
--- a/libbirdfont/SettingsDisplay.vala +++ b/libbirdfont/SettingsDisplay.vala @@ -251,7 +251,7 @@ cr.save (); cr.rectangle (0, 0, allocation.width, allocation.height); cr.set_line_width (0); - Theme.color (cr, "Background 4"); + Theme.color (cr, "Default Background"); cr.fill (); cr.stroke (); cr.restore ();
--- a/libbirdfont/SettingsItem.vala +++ b/libbirdfont/SettingsItem.vala @@ -103,7 +103,7 @@ } else { if (active) { cr.save (); - Theme.color (cr, "Background 3"); + Theme.color (cr, "Menu Background"); cr.rectangle (0, y - 5 * MainWindow.units, allocation.width, 40 * MainWindow.units); cr.fill (); cr.restore (); @@ -118,7 +118,7 @@ } cr.save (); - Theme.text_color (label, "Foreground 2"); + Theme.text_color (label, "Text Foreground"); label.set_font_size (17 * MainWindow.units); label.draw_at_baseline (cr, label_x, y + 20 * MainWindow.units); cr.restore (); @@ -131,7 +131,7 @@ if (active) { Theme.text_color (key_binding_text, "Foreground Inverted"); } else { - Theme.text_color (key_binding_text, "Foreground 2"); + Theme.text_color (key_binding_text, "Text Foreground"); } key_binding_text.set_font_size (17 * MainWindow.units);
--- a/libbirdfont/SpinButton.vala +++ b/libbirdfont/SpinButton.vala @@ -442,9 +442,15 @@ double xt = x + w / 2; double yt = y; - double text_x = -14 * scale; + double text_x = -13 * scale; double text_y = 7 * scale; Text text = new Text (get_short_display_value (), 15); + + if (is_selected ()) { + base.icon_color = "Active Spin Button"; + } else { + base.icon_color = "Spin Button"; + } base.draw (cr);
--- a/libbirdfont/StrokeTool.vala +++ b/libbirdfont/StrokeTool.vala @@ -1842,8 +1842,7 @@ original_path2.remove_points_on_points (); original_path1.remove_deleted_points (); original_path2.remove_deleted_points (); - - int counter; + foreach (Path np in result.paths) { Path p = np.copy (); bool has_direction = true;
--- a/libbirdfont/TabBar.vala +++ b/libbirdfont/TabBar.vala @@ -619,7 +619,7 @@ cr.save (); cr.set_line_width (0); - Theme.color (cr, "Background 4"); + Theme.color (cr, "Default Background"); cr.rectangle (0, 0, width, height); cr.fill (); cr.restore (); @@ -632,14 +632,14 @@ if (has_scroll () && !has_progress_wheel ()) { // left arrow - Theme.text_color (left_arrow, "Foreground 2"); + Theme.text_color (left_arrow, "Text Foreground"); 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, "Foreground 2"); + Theme.text_color (right_arrow, "Text Foreground"); next_tab_x = (has_progress_wheel ()) ? w - (2 * 19 + 3) / scale : w - 19 / scale; next_tab_x-= 32 / scale; @@ -653,7 +653,7 @@ if (has_progress_wheel ()) { double progress_size = 40 / scale; - Theme.text_color (progress_icon, "Foreground 2"); + Theme.text_color (progress_icon, "Text Foreground"); progress_icon.set_font_size (progress_size); progress_icon.widget_x = w - 14 / scale; @@ -737,13 +737,13 @@ cr.restore (); } else if (tab_index == over) { cr.save (); - Theme.color (cr, "Background 7"); + Theme.color (cr, "Default Background"); cr.rectangle (0, 0, tab_width, h); cr.fill (); cr.restore (); } else { cr.save (); - Theme.color (cr, "Background 4"); + Theme.color (cr, "Default Background"); cr.rectangle (0, 0, tab_width, h); cr.fill (); cr.restore (); @@ -758,9 +758,9 @@ close_opacity = (over_close_tab == tab_index) ? 1 : 0.2; if (tab_index == selected) { - Theme.color_opacity (cr, "Foreground 4", close_opacity); + Theme.color_opacity (cr, "Foreground 1", close_opacity); } else { - Theme.color_opacity (cr, "Foreground 2", close_opacity); + Theme.color_opacity (cr, "Text Foreground", close_opacity); } cr.move_to (tab_width - 7 / scale, h / 2.0 - 2.5 / scale); @@ -784,9 +784,9 @@ center_y = (int) (tab_height / 2.0 + 4 / scale); if (tab_index == selected) { - Theme.text_color (label, "Foreground 4"); + Theme.text_color (label, "Foreground Inverted"); } else { - Theme.text_color (label, "Foreground 2"); + Theme.text_color (label, "Text Foreground"); } label.set_font_size (text_height); @@ -796,7 +796,7 @@ if (tab_index != selected) { // don't draw edges for the selected tab if (tab_index + 1 != selected) { cr.save (); - Theme.color (cr, "Foreground 5"); + Theme.color (cr, "Text Foreground"); cr.rectangle (tab_width - 1 / scale, 0, 1 / scale, h); cr.fill (); cr.restore (); @@ -804,7 +804,7 @@ if (tab_index == first_tab) { cr.save (); - Theme.color (cr, "Foreground 5"); + Theme.color (cr, "Text Foreground"); cr.rectangle (0, 0, 1 / scale, h); cr.fill (); cr.restore ();
--- a/libbirdfont/TabContent.vala +++ b/libbirdfont/TabContent.vala @@ -291,7 +291,7 @@ public static void draw_text_input (WidgetAllocation allocation, Context cr) { cr.save (); - Theme.color (cr, "Background 4"); + Theme.color (cr, "Default Background"); cr.rectangle (0, 0, allocation.width, TEXT_INPUT_HEIGHT); cr.fill (); cr.restore ();
--- a/libbirdfont/TableLayout.vala +++ b/libbirdfont/TableLayout.vala @@ -41,7 +41,7 @@ cr.rectangle (0, 0, allocation.width, allocation.height); cr.set_line_width (0); - Theme.color (cr, "Background 4"); + Theme.color (cr, "Default Background"); cr.fill (); cr.stroke ();
--- a/libbirdfont/Theme.vala +++ b/libbirdfont/Theme.vala @@ -103,9 +103,9 @@ 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 ("Background 2", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1); - Theme.set_default_color ("Background 3", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1); - Theme.set_default_color ("Background 4", 51 / 255.0, 54 / 255.0, 59 / 255.0, 1); + Theme.set_default_color ("Dialog Background", 238 / 255.0, 239 / 255.0, 243 / 255.0, 1); + 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 ("Background 5", 0.3, 0.3, 0.3, 1); Theme.set_default_color ("Background 6", 224/255.0, 224/255.0, 224/255.0, 1); Theme.set_default_color ("Background 7", 56 / 255.0, 59 / 255.0, 65 / 255.0, 1); @@ -116,7 +116,7 @@ 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 ("Foreground 2", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1); + Theme.set_default_color ("Text Foreground", 125 / 255.0, 130 / 255.0, 136 / 255.0, 1); Theme.set_default_color ("Foreground 3", 26 / 255.0, 30 / 255.0, 32 / 255.0, 1); Theme.set_default_color ("Foreground 4", 40 / 255.0, 57 / 255.0, 65 / 255.0, 1); Theme.set_default_color ("Foreground 5", 70 / 255.0, 77 / 255.0, 83 / 255.0, 1); @@ -138,24 +138,22 @@ Theme.set_default_color ("Background Glyph", 0.2, 0.2, 0.2, 0.5); - Theme.set_default_color ("Button Border 1", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1); - Theme.set_default_color ("Button Background 1", 14 / 255.0, 16 / 255.0, 17 / 255.0, 1); + Theme.set_default_color ("Button Border 1", 173 / 255.0, 176 / 255.0, 188 / 255.0, 1); + Theme.set_default_color ("Button Background 1", 211 / 255.0, 212 / 255.0, 216 / 255.0, 1); - Theme.set_default_color ("Button Border 2", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1); - Theme.set_default_color ("Button Background 2", 26 / 255.0, 30 / 255.0, 32 / 255.0, 1); + Theme.set_default_color ("Button Border 2", 173 / 255.0, 176 / 255.0, 188 / 255.0, 1); + Theme.set_default_color ("Button Background 2", 211 / 255.0, 212 / 255.0, 216 / 255.0, 1); - Theme.set_default_color ("Button Border 3", 38 / 255.0, 39 / 255.0, 43 / 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 3", 173 / 255.0, 176 / 255.0, 188 / 255.0, 1); + Theme.set_default_color ("Button Background 3", 242 / 255.0, 246 / 255.0, 246 / 255.0, 1); - Theme.set_default_color ("Button Border 4", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1); - Theme.set_default_color ("Button Background 4", 33 / 255.0, 36 / 255.0, 39 / 255.0, 1); + Theme.set_default_color ("Button Border 4", 173 / 255.0, 176 / 255.0, 188 / 255.0, 1); + Theme.set_default_color ("Button Background 4", 242 / 255.0, 246 / 255.0, 246 / 255.0, 1); - Theme.set_default_color ("Button Foreground", 1, 1, 1, 1); - Theme.set_default_color ("Selected Button Foreground", 1, 1, 1, 1); + Theme.set_default_color ("Button Foreground", 125 / 255.0, 130 / 255.0, 136 / 255.0, 1); + Theme.set_default_color ("Selected Button Foreground", 125 / 255.0, 130 / 255.0, 136 / 255.0, 1); - Theme.set_default_color ("Tool Foreground", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1); - Theme.set_default_color ("Selected Tool Foreground", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1); - + Theme.set_default_color ("Tool Foreground", 125 / 255.0, 130 / 255.0, 136 / 255.0, 1); Theme.set_default_color ("Selected Tool Foreground", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1); Theme.set_default_color ("Text Area Background", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1); @@ -169,7 +167,7 @@ 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", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1); + Theme.set_default_color ("Glyph Count Background", 211 / 255.0, 212 / 255.0, 216 / 255.0, 1); Theme.set_default_color ("Dialog Shadow", 0, 0, 0, 0.3); @@ -187,7 +185,10 @@ 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", 101 / 255.0, 108 / 255.0, 116 / 255.0, 0.3); + Theme.set_default_color ("Merge", 167 / 255.0, 170 / 255.0, 178 / 255.0, 0.3); + + Theme.set_default_color ("Spin Button", 164 / 255.0, 167 / 255.0, 175 / 255.0, 1); + Theme.set_default_color ("Active Spin Button", 104 / 255.0, 108 / 255.0, 119 / 255.0, 1); if (BirdFont.has_argument ("--test")) { current_theme = "generated_theme.theme"; @@ -199,9 +200,9 @@ t_("Selected Objects"); t_("Background 1"); - t_("Background 2"); - t_("Background 3"); - t_("Background 4"); + t_("Dialog Background"); + t_("Menu Background"); + t_("Default Background"); t_("Background 5"); t_("Background 6"); t_("Background 7"); @@ -211,7 +212,7 @@ t_("Checkbox Background"); t_("Foreground 1"); - t_("Foreground 2"); + t_("Text Foreground"); t_("Foreground 3"); t_("Foreground 4"); t_("Foreground 5"); @@ -274,6 +275,8 @@ t_("Control Point Handle"); t_("Merge"); + t_("Spin Button"); + t_("Active Spin Button"); } }
--- a/libbirdfont/Tool.vala +++ b/libbirdfont/Tool.vala @@ -28,7 +28,7 @@ public bool active = false; public bool selected = false; - Text icon_font; + public Text icon_font; public signal void select_action (Tool selected); public signal void deselect_action (Tool selected); @@ -79,6 +79,8 @@ bool visible = true; public bool is_tool_modifier = false; + + public string icon_color = ""; /** Create tool with a certain name and load icon "name".png */ public Tool (string? name = null, string tip = "") { @@ -290,14 +292,18 @@ draw_rounded_rectangle (cr, bgx, bgy, 34, 28, 4); cr.stroke (); - iconx = bgx + w / 2 - icon_font.get_sidebearing_extent () / 2; - icony = bgy + h / 2 - icon_font.get_height () / 2; + iconx = bgx + 1 + (w - 1) / 2 - icon_font.get_sidebearing_extent () / 2; + icony = bgy + 1 + (h - 1)/ 2 - icon_font.get_height () / 2; - if (!selected) { - Theme.text_color (icon_font, "Tool Foreground"); + if (icon_color == "") { + if (!selected) { + Theme.text_color (icon_font, "Tool Foreground"); + } else { + Theme.text_color (icon_font, "Selected Tool Foreground"); + } } else { - Theme.text_color (icon_font, "Selected Tool Foreground"); - } + Theme.text_color (icon_font, icon_color); + } icon_font.widget_x = iconx; icon_font.widget_y = icony;
--- a/libbirdfont/Toolbox.vala +++ b/libbirdfont/Toolbox.vala @@ -467,7 +467,7 @@ cr.rectangle (0, 0, w, h); cr.set_line_width (0); - Theme.color (cr, "Background 4"); + Theme.color (cr, "Default Background"); cr.fill (); draw_expanders (w, h, cr);
--- a/libbirdfont/ZoomBar.vala +++ b/libbirdfont/ZoomBar.vala @@ -88,21 +88,21 @@ // filled cr.save (); - Theme.color (cr, "Foreground 3"); + Theme.color (cr, "Button Border 1"); draw_bar (cr); cr.fill (); cr.restore (); // remove non filled parts cr.save (); - Theme.color (cr, "Background 4"); + Theme.color (cr, "Default Background"); cr.rectangle (x + bar_width * zoom_level, y, w, h); cr.fill (); cr.restore (); // border cr.save (); - Theme.color (cr, "Foreground 1"); + Theme.color (cr, "Button Border 1"); cr.set_line_width (0.8); draw_bar (cr); cr.stroke ();
--- a/resources/icons.bf +++ b/resources/icons.bf @@ -281,9 +281,9 @@ <collection name="dropdown_menu"> <selected id="1"/> <glyph id="1" left="-4" right="69.259259259299995"> - <path stroke="0" skew="0" data="S -4.0000000000,8.0633248190 L 69.2592592593,8.0633248190 L 69.2592592593,-3.4022988506 L -4.0000000000,-3.4022988506 L -4.0000000000,8.0633248190" /> - <path stroke="0" skew="0" data="S -4.0000000000,21.0174542359 L -4.0000000000,32.4830779054 L 69.2592592593,32.4830779054 L 69.2592592593,21.0174542359 L -4.0000000000,21.0174542359" /> - <path stroke="0" skew="0" data="S -4.0000000000,57.3281183483 L 69.2592592593,57.3281183483 L 69.2592592593,45.1182418050 L -4.0000000000,45.1182418050 L -4.0000000000,57.3281183483" /> + <path stroke="0" skew="0" data="S -4.0000000000,57.3281183483 L 69.2592592593,57.3281183483 L 69.2592592593,50.3868502192 L -4.0000000000,50.3868502192 L -4.0000000000,57.3281183483" /> + <path stroke="0" skew="0" data="S -3.9469190623,30.2093015249 L 69.3123401970,30.2093015249 L 69.3123401970,23.2680333958 L -3.9469190623,23.2680333958 L -3.9469190623,30.2093015249" /> + <path stroke="0" skew="0" data="S -3.9566264669,3.4617166603 L 69.3026327924,3.4617166603 L 69.3026327924,-3.4795514688 L -3.9566264669,-3.4795514688 L -3.9566264669,3.4617166603" /> </glyph> </collection> <collection unicode="U+65"> @@ -325,9 +325,9 @@ <collection name="flip_vertical"> <selected id="1"/> <glyph id="1" left="-28.616126296005103" right="40.464025466000002"> - <path stroke="0" skew="0" data="B 39.5867747415,30.0974646889 M -27.7611953985,30.0974646889 M -27.7611953985,55.9141643389 M 39.5867747415,30.0974646889" /> - <path stroke="0" skew="0" data="S -26.8034353585,24.3211646889 L 38.6976522937,24.3205002780 D 38.9227237100,24.3000700543 39.3651438879,24.1875663112 39.5584595230,24.0748119023 T D 39.7517751581,23.9620574934 40.0805065676,23.6381388541 40.1960996547,23.4465070986 T D 40.3116927418,23.2548753431 40.4448868264,22.8130077607 40.4544561462,22.5894167957 T D 40.4640254660,22.3658258307 40.3690716683,21.9141939001 40.2702743177,21.7133865919 T D 40.1714769671,21.5125792837 39.8541301928,21.1835652090 39.6886483045,21.0328992336 T D 39.6052567114,20.9569738508 39.3956556538,20.8614401622 39.2903147415,20.8211646889 T M -26.4754605213,-4.3233652999 D -26.6997860313,-4.3507988934 -27.1559774566,-4.3340033741 -27.3687052763,-4.2644953439 T D -27.5814330959,-4.1949873137 -27.9710152361,-3.9475739339 -28.1243775363,-3.7845877493 T D -28.2777398365,-3.6216015647 -28.4744549503,-3.2089729173 -28.5574623773,-3.0011406328 T D -28.5992924631,-2.8964073263 -28.6161262960,-2.6666129025 -28.6159353976,-2.5538353111 T M -28.5728257132,22.9141950272 D -28.5100758370,23.1313055739 -28.3156981392,23.5443552279 -28.1683233459,23.7127748283 T D -28.0209485526,23.8811944287 -27.6293004122,24.1169293871 -27.4304795707,24.2196657707 T D -27.3302874175,24.2714379059 -26.8783778029,24.3282087104 -26.9909353585,24.3211646889 T D -27.0294192875,24.3187563066 -26.8503103585,24.3211651644 -26.8034353585,24.3211646889 T" /> - <path stroke="0" skew="0" data="B -24.9909353585,0.0711646889 M 28.9153147415,20.7274646889 M -24.9909353585,20.7274646889 M -24.9909353585,0.0711646889" /> + <path stroke="0" skew="0" data="B 41.0236679454,30.0974646889 M -26.3243021946,30.0974646889 M -26.3243021946,55.9141643389 M 41.0236679454,30.0974646889" /> + <path stroke="0" skew="0" data="S -25.3665421546,24.3211646889 L 40.1345454976,24.3205002780 D 40.3596169139,24.3000700543 40.8020370918,24.1875663112 40.9953527269,24.0748119023 T D 41.1886683620,23.9620574934 41.5173997715,23.6381388541 41.6329928586,23.4465070986 T D 41.7485859457,23.2548753431 41.8817800303,22.8130077607 41.8913493501,22.5894167957 T D 41.9009186699,22.3658258307 41.8059648722,21.9141939001 41.7071675216,21.7133865919 T D 41.6083701710,21.5125792837 41.2910233967,21.1835652090 41.1255415084,21.0328992336 T D 41.0421499153,20.9569738508 40.8325488577,20.8614401622 40.7272079454,20.8211646889 T M -25.0385673174,-4.3233652999 D -25.2628928274,-4.3507988934 -25.7190842527,-4.3340033741 -25.9318120724,-4.2644953439 T D -26.1445398920,-4.1949873137 -26.5341220322,-3.9475739339 -26.6874843324,-3.7845877493 T D -26.8408466326,-3.6216015647 -27.0375617464,-3.2089729173 -27.1205691734,-3.0011406328 T D -27.1623992592,-2.8964073263 -27.1792330921,-2.6666129025 -27.1790421937,-2.5538353111 T M -27.1359325093,22.9141950272 D -27.0731826331,23.1313055739 -26.8788049353,23.5443552279 -26.7314301420,23.7127748283 T D -26.5840553487,23.8811944287 -26.1924072083,24.1169293871 -25.9935863668,24.2196657707 T D -25.8933942136,24.2714379059 -25.4414845990,24.3282087104 -25.5540421546,24.3211646889 T D -25.5925260836,24.3187563066 -25.4134171546,24.3211651644 -25.3665421546,24.3211646889 T" /> + <path stroke="0" skew="0" data="B -23.5540421546,0.0711646889 M 30.3522079454,20.7274646889 M -23.5540421546,20.7274646889 M -23.5540421546,0.0711646889" /> </glyph> </collection> <collection name="foresight"> @@ -367,9 +367,9 @@ </collection> <collection name="height"> <selected id="1"/> - <glyph id="1" left="-31.811827956989237" right="35.773799855222002"> - <path stroke="0" skew="0" data="B 3.1601702509,65.2308638329 M 4.5351702509,63.8245638329 M 29.6601702509,38.0433638329 M 32.8789202509,34.7308638329 M 28.2851702509,34.7308638329 M 16.9414202509,34.7308638329 M 16.9414202509,20.9183638329 M 27.5976702509,20.8873638329 M 32.1289202509,20.8563638329 M 29.0039202509,17.6063638329 M 4.2226702509,-8.3936361671 M 2.8476702509,-9.8311361671 M 1.4414202509,-8.4249361671 M -24.4023297491,17.3563638329 M -27.6523297491,20.6063638329 M -23.0585797491,20.7003638329 M -13.0273297491,20.8566638329 M -12.9023297491,34.3879638329 M -22.9335797491,34.3879638329 M -27.6210797491,34.3879638329 M -24.3085797491,37.7003638329 M 1.7539202509,63.8253638329 M 3.1601702509,65.2316638329 M 3.1601702509,65.2308638329" /> - <path stroke="0" skew="0" data="B 3.1289202509,59.6994638329 M -18.2460797491,38.2620638329 M -10.9023297491,38.2620638329 M -8.9648297491,38.2620638329 M -8.9648297491,36.3244638329 M -9.1523297491,18.9182638329 M -9.1836297491,17.0120638329 M -11.0586297491,16.9810638329 M -18.4023797491,16.8560638329 M 2.7851202509,-4.2689361671 M 23.0663702509,17.0123638329 M 14.9726202509,17.0433638329 M 13.0351202509,17.0433638329 M 13.0351202509,18.9808638329 M 13.0351202509,36.6683638329 M 13.0351202509,38.6371638329 M 14.9726202509,38.6371638329 M 23.6601202509,38.6371638329 M 3.1288702509,59.6995638329 M 3.1289202509,59.6994638329" /> + <glyph id="1" left="-27.652329749100002" right="32.878920250900002"> + <path stroke="0" skew="0" data="B 3.1601702509,64.6321583313 M 4.5351702509,63.2258583313 M 29.6601702509,37.4446583313 M 32.8789202509,34.1321583313 M 28.2851702509,34.1321583313 M 16.9414202509,34.1321583313 M 16.9414202509,20.3196583313 M 27.5976702509,20.2886583313 M 32.1289202509,20.2576583313 M 29.0039202509,17.0076583313 M 4.2226702509,-8.9923416687 M 2.8476702509,-10.4298416687 M 1.4414202509,-9.0236416687 M -24.4023297491,16.7576583313 M -27.6523297491,20.0076583313 M -23.0585797491,20.1016583313 M -13.0273297491,20.2579583313 M -12.9023297491,33.7892583313 M -22.9335797491,33.7892583313 M -27.6210797491,33.7892583313 M -24.3085797491,37.1016583313 M 1.7539202509,63.2266583313 M 3.1601702509,64.6329583313 M 3.1601702509,64.6321583313" /> + <path stroke="0" skew="0" data="B 3.1289202509,59.1007583313 M -18.2460797491,37.6633583313 M -10.9023297491,37.6633583313 M -8.9648297491,37.6633583313 M -8.9648297491,35.7257583313 M -9.1523297491,18.3195583313 M -9.1836297491,16.4133583313 M -11.0586297491,16.3823583313 M -18.4023797491,16.2573583313 M 2.7851202509,-4.8676416687 M 23.0663702509,16.4136583313 M 14.9726202509,16.4446583313 M 13.0351202509,16.4446583313 M 13.0351202509,18.3821583313 M 13.0351202509,36.0696583313 M 13.0351202509,38.0384583313 M 14.9726202509,38.0384583313 M 23.6601202509,38.0384583313 M 3.1288702509,59.1008583313 M 3.1289202509,59.1007583313" /> </glyph> </collection> <collection name="help_lines"> @@ -396,7 +396,7 @@ <selected id="1"/> <glyph id="1" left="-28" right="33.597883597883616"> <path stroke="0" skew="0" data="B 33.4557723114,27.7602470013 C 33.4557723114,10.8486376087 19.7651712298,-2.8868862385 2.8535762171,-2.8868862385 C -14.0580336070,-2.8868862385 -27.7935573823,10.8486376087 -27.7935573823,27.7602470013 C -27.7935573823,44.6718405761 -14.0580336070,58.4073788032 2.8535762171,58.4073788032 C 19.7651712298,58.4073788032 33.4557723114,44.6718405761 33.4557723114,27.7602470013" /> - <path stroke="0" skew="0" data="B -19.3449867872,27.4928964020 C -19.3449867872,15.1593996989 -9.3504457902,5.1648590316 2.9830509130,5.1648590316 C 15.3165366238,5.1648590316 25.2767374567,15.1593996989 25.2767374567,27.4928964020 C 25.2767374567,39.8263810137 15.3165366238,49.8209326732 2.9830509130,49.8209326732 C -9.3504457902,49.8209326732 -19.3449867872,39.8263810137 -19.3449867872,27.4928964020" /> + <path stroke="0" skew="0" data="B -22.9372197969,27.6712637687 C -22.9372197969,13.3872582207 -11.3620694169,1.8121082225 2.9219361312,1.8121082225 C 17.2059289484,1.8121082225 28.7413083611,13.3872582207 28.7413083611,27.6712637687 C 28.7413083611,41.9552553130 17.2059289484,53.5304180417 2.9219361312,53.5304180417 C -11.3620694169,53.5304180417 -22.9372197969,41.9552553130 -22.9372197969,27.6712637687" /> <path stroke="0" skew="0" data="B -0.7322863839,45.1175621773 M 6.5236640807,45.1175621773 M 6.5236640807,39.7818352495 M 6.5236640807,39.7818352495 C 4.1050139259,39.7818352495 0.6722544235,39.7818352495 -0.7322863839,39.7818352495 C -0.7322863839,41.5604108921 -0.7322863839,43.3389865347 -0.7322863839,45.1175621773 M -0.7322863839,45.1175621773 O" /> <path stroke="0" skew="0" data="B -0.7322863839,35.1331149086 C 0.6722544235,35.1331149086 4.1050139259,35.1331149086 6.5236640807,35.1331149086 M 6.5236640807,9.4849784247 M -0.7322863839,9.4849784247 M -0.7322863839,35.1331149086" /> </glyph> @@ -502,10 +502,10 @@ <path stroke="0" skew="0" data="B 30.1960026856,27.9313762073 M 24.6351526822,24.1302888632 M 24.6351526822,31.7324635516 M 30.1960026856,27.9313762073" /> <path stroke="0" skew="0" data="B 22.6334047735,29.1896422761 M 8.8368655242,29.1896422761 M 8.8368655242,25.8108979701 M 22.6334047735,25.8108979701 M 22.6334047735,29.1896422761" /> </glyph> - <glyph id="2" left="-28" right="44.817675159235684"> - <path stroke="0" skew="0" data="B -20.3541899374,27.2376918110 C -20.3541899374,11.4271085573 -7.6488107461,-1.4103349290 8.1617841845,-1.4103349290 C 23.9723674383,-1.4103349290 36.8097642174,11.4271085573 36.8097642174,27.2376918110 C 36.8097642174,43.0482750648 23.9703065180,56.0089275564 8.1617841845,55.7536542562 T C -6.2195875709,55.5214263381 -20.3541899374,43.0482750648 -20.3541899374,27.2376918110" /> + <glyph id="2" left="-23.75978236398187" right="41.853343651718113"> + <path stroke="0" skew="0" data="B 41.8533436517,27.1358702905 C 41.8533436517,9.0421277454 27.0744966463,-5.7366959064 8.9807774548,-5.7366959064 C -9.1129534136,-5.7366959064 -23.7597823640,9.0421277454 -23.7597823640,27.1358702905 C -23.7597823640,45.2296128356 -9.1129534136,59.8763726596 8.9807774548,59.8763726596 C 27.0744966463,59.8763726596 41.8533436517,45.2296128356 41.8533436517,27.1358702905" /> + <path stroke="0" skew="0" data="B -19.7554844358,27.1179507107 C -19.7554844358,11.3073674570 -7.0501052445,-1.5300760293 8.7604896861,-1.5300760293 C 24.5710729399,-1.5300760293 37.4084697190,11.3073674570 37.4084697190,27.1179507107 C 37.4084697190,42.9285339645 24.5690120196,55.8891864561 8.7604896861,55.6339131559 T C -5.6208820693,55.4016852378 -19.7554844358,42.9285339645 -19.7554844358,27.1179507107" /> <path stroke="0" skew="0" data="B -18.8160147042,26.9466961010 M -16.7746900194,25.5388859735 M -6.5680665952,18.4294448297 M -3.8932273529,16.5992916640 M -3.8932273529,19.8372549571 M -3.8932273529,33.9153562319 M -3.8932273529,37.0829290189 M -6.4976760887,35.3231663594 M -16.7746900194,28.3545062285 M -18.8160147042,26.9466961010" /> - <path stroke="0" skew="0" data="B 41.2546381501,27.2556113908 C 41.2546381501,9.1618688457 26.4757911447,-5.6169548061 8.3820719532,-5.6169548061 C -9.7116589152,-5.6169548061 -24.3584878656,9.1618688457 -24.3584878656,27.2556113908 C -24.3584878656,45.3493539359 -9.7116589152,59.9961137599 8.3820719532,59.9961137599 C 26.4757911447,59.9961137599 41.2546381501,45.3493539359 41.2546381501,27.2556113908" /> <path stroke="0" skew="0" data="B -5.0898659612,25.2573239480 M 8.7066732881,25.2573239480 M 8.7066732881,28.6360682540 M -5.0898659612,28.6360682540 M -5.0898659612,25.2573239480" /> <path stroke="0" skew="0" data="B -12.6524638735,26.5155900166 M -7.0916138699,30.3166773608 M -7.0916138699,22.7145026724 M -12.6524638735,26.5155900166" /> <path stroke="0" skew="0" data="B 9.2171683553,0.0199724029 M 10.6249784828,2.0612970877 M 17.7344196266,12.2679205119 M 19.5645727923,14.9427597542 M 16.3266094991,14.9427597542 M 2.2485082243,14.9427597542 M -0.9190645625,14.9427597542 M 0.8406980968,12.3383110183 M 7.8093582279,2.0612970877 M 9.2171683553,0.0199724029" /> @@ -811,9 +811,9 @@ </collection> <collection name="spin_button"> <selected id="1"/> - <glyph id="1" left="-22.111134617800001" right="49.685975382199999"> - <path stroke="0" skew="0" data="B 14.1079053822,64.9647907735 M 49.3654353822,55.6696307735 M 49.6859753822,50.4824807735 M 36.2240153822,50.4824807735 M 36.2240153822,53.1054507735 M -8.0081446178,53.1054507735 M -8.0081446178,50.8030107735 M -22.1111346178,50.8030107735 M -22.1111346178,56.6312007735 M 14.1079053822,64.9647907735" /> - <path stroke="0" skew="0" data="B -22.1111346178,-2.1662692265 M -22.1111346178,3.6619307735 M -8.0081446178,3.6619307735 M -8.0081446178,1.3594907735 M 36.2240153822,1.3594907735 M 36.2240153822,3.9824507735 M 49.6859753822,3.9824507735 M 49.3654353822,-1.2046992265 M 14.1079053822,-10.4998592265 M -22.1111346178,-2.1662692265" /> + <glyph id="1" left="-22.111134617800001" right="49.367576713691193"> + <path stroke="0" skew="0" data="B 14.1079053822,64.9647907735 M 49.3654353822,55.6696307735 M 49.3675767137,50.4824807735 M 36.2240153822,50.4824807735 M 36.2240153822,53.1054507735 M -8.0081446178,53.1054507735 M -8.0081446178,50.8030107735 M -22.1111346178,50.8030107735 M -22.1111346178,56.6312007735 M 14.1079053822,64.9647907735" /> + <path stroke="0" skew="0" data="B -22.1111346178,-2.1662692265 M -22.1111346178,3.6619307735 M -8.0081446178,3.6619307735 M -8.0081446178,1.3594907735 M 36.2240153822,1.3594907735 M 36.2240153822,3.9824507735 M 49.3675767137,3.9824507735 M 49.3654353822,-1.2046992265 M 14.1079053822,-10.4998592265 M -22.1111346178,-2.1662692265" /> </glyph> </collection> <collection name="symmetric"> @@ -911,8 +911,8 @@ <collection name="width"> <selected id="1"/> <glyph id="1" left="-25.106321839080444" right="50.063218390804607"> - <path stroke="0" skew="0" data="B 4.6571857962,56.8050436763 M 4.6884857962,52.0862436763 M 4.6884857962,40.7425436763 M 19.9072357962,40.7425436763 M 20.3447357962,51.4925436763 M 20.5009857962,55.9612436763 M 23.6572357962,52.8050436763 M 48.5009857962,27.9925436763 M 49.8759857962,26.6175436763 M 48.5009857962,25.2425436763 M 22.7197357962,-0.5699563237 M 19.4697357962,-3.8199563237 M 19.4072357962,0.7738436763 M 19.2197357962,10.8050436763 M 5.6884857962,10.9300436763 M 5.7197857962,0.8988436763 M 5.7197857962,-3.8199563237 M 2.3760357962,-0.4761563237 M -23.7489642038,25.5862436763 M -25.1239642038,26.9612436763 M -23.7489642038,28.3362436763 M 1.3447857962,53.4612436763 M 4.6572857962,56.8050436763 M 4.6571857962,56.8050436763" /> - <path stroke="0" skew="0" data="B 0.7822357962,47.3986436763 M -19.6240142038,26.9610436763 M 1.8134857962,5.5860436763 M 1.8134857962,12.8986436763 M 1.8134857962,14.8673436763 M 3.7822357962,14.8673436763 M 21.1572357962,14.6798436763 M 23.0634857962,14.6488436763 M 23.0947857962,12.7425436763 M 23.2197857962,5.4300436763 M 44.3760357962,26.6175436763 M 24.0635357962,46.8988436763 M 23.7509357962,38.7425436763 M 23.6572357962,36.8675436763 M 21.8134857962,36.8675436763 M 2.7509857962,36.8675436763 M 0.8134857962,36.8675436763 M 0.7821857962,38.8050436763 M 0.7821857962,47.3988436763 M 0.7822357962,47.3986436763" /> + <path stroke="0" skew="0" data="B 5.3756323981,56.0865970744 M 5.4069323981,51.3677970744 M 5.4069323981,40.0240970744 M 20.6256823981,40.0240970744 M 21.0631823981,50.7740970744 M 21.2194323981,55.2427970744 M 24.3756823981,52.0865970744 M 49.2194323981,27.2740970744 M 50.5944323981,25.8990970744 M 49.2194323981,24.5240970744 M 23.4381823981,-1.2884029256 M 20.1881823981,-4.5384029256 M 20.1256823981,0.0553970744 M 19.9381823981,10.0865970744 M 6.4069323981,10.2115970744 M 6.4382323981,0.1803970744 M 6.4382323981,-4.5384029256 M 3.0944823981,-1.1946029256 M -23.0305176019,24.8677970744 M -24.4055176019,26.2427970744 M -23.0305176019,27.6177970744 M 2.0632323981,52.7427970744 M 5.3757323981,56.0865970744 M 5.3756323981,56.0865970744" /> + <path stroke="0" skew="0" data="B 1.5006823981,46.6801970744 M -18.9055676019,26.2425970744 M 2.5319323981,4.8675970744 M 2.5319323981,12.1801970744 M 2.5319323981,14.1488970744 M 4.5006823981,14.1488970744 M 21.8756823981,13.9613970744 M 23.7819323981,13.9303970744 M 23.8132323981,12.0240970744 M 23.9382323981,4.7115970744 M 45.0944823981,25.8990970744 M 24.7819823981,46.1803970744 M 24.4693823981,38.0240970744 M 24.3756823981,36.1490970744 M 22.5319323981,36.1490970744 M 3.4694323981,36.1490970744 M 1.5319323981,36.1490970744 M 1.5006323981,38.0865970744 M 1.5006323981,46.6803970744 M 1.5006823981,46.6801970744" /> </glyph> </collection> <collection unicode="U+78">