[geary/wip/714793-orientation2: 4/6] Add orientation icons
- From: Robert Schroll <rschroll src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/714793-orientation2: 4/6] Add orientation icons
- Date: Sun, 22 Feb 2015 04:52:14 +0000 (UTC)
commit eb9e8ba5f54f9a165d55a27554c08a94d98b88a1
Author: Robert Schroll <rschroll gmail com>
Date: Fri Feb 20 17:28:12 2015 -0500
Add orientation icons
Also, reduce padding around the orientation button and set relief off,
to mimic the conversation find bar.
icons/CMakeLists.txt | 2 +
icons/layout-horizontal-symbolic.svg | 90 ++++++++++++++++++++++++++++++++
icons/layout-vertical-symbolic.svg | 89 +++++++++++++++++++++++++++++++
src/client/components/main-window.vala | 8 +++-
src/client/components/status-bar.vala | 3 +
5 files changed, 191 insertions(+), 1 deletions(-)
---
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index f974ff7..bf3a56c 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -7,6 +7,8 @@ set(ICON_FILES
text-x-generic-symbolic.svg
edit-symbolic.svg
format-text-remove-symbolic.svg
+ layout-horizontal-symbolic.svg
+ layout-vertical-symbolic.svg
mail-forward-symbolic.svg
mail-forward-rtl-symbolic.svg
mail-inbox-symbolic.svg
diff --git a/icons/layout-horizontal-symbolic.svg b/icons/layout-horizontal-symbolic.svg
new file mode 100644
index 0000000..e19c877
--- /dev/null
+++ b/icons/layout-horizontal-symbolic.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ width="16.084999"
+ height="16.024"
+ id="svg7384"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="layout-horizontal-symbolic.svg">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1226"
+ inkscape:window-height="991"
+ id="namedview10"
+ showgrid="true"
+ inkscape:zoom="41.656814"
+ inkscape:cx="6.4794955"
+ inkscape:cy="7.879961"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="layer12">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3018"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <title
+ id="title9167">Gnome Symbolic Icon Theme</title>
+ <defs
+ id="defs17" />
+ <metadata
+ id="metadata90">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>Gnome Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(-60.952,-646.98)"
+ id="layer12">
+ <path
+ style="fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="m 3,1.03125 c -1,0 -2,1 -2,2 l 0,10 c 0,1 0.9999998,2 2,2 l 10,0 c 1,0 2,-1 2,-2 l 0,-10 c 0,-1
-1,-2 -2,-2 z m 1,12 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 2.6666667,0 5.3333333,0 8,0
0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1"
+ transform="translate(60.952,646.98)"
+ id="rect3819"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssssssssscssccssc" />
+ <rect
+ style="fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="rect3870"
+ width="1"
+ height="8"
+ x="5"
+ y="4.0240002"
+ transform="translate(60.952,646.98)"
+ ry="0" />
+ <rect
+ ry="0"
+ y="651.00403"
+ x="69.952003"
+ height="8"
+ width="1"
+ id="rect4380"
+ style="fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ </g>
+</svg>
diff --git a/icons/layout-vertical-symbolic.svg b/icons/layout-vertical-symbolic.svg
new file mode 100644
index 0000000..b1d7f08
--- /dev/null
+++ b/icons/layout-vertical-symbolic.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ width="16.084999"
+ height="16.024"
+ id="svg7384"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="layout-vertical-symbolic.svg">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1226"
+ inkscape:window-height="991"
+ id="namedview10"
+ showgrid="true"
+ inkscape:zoom="41.656814"
+ inkscape:cx="6.4794955"
+ inkscape:cy="7.879961"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="layer12">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3018"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <title
+ id="title9167">Gnome Symbolic Icon Theme</title>
+ <defs
+ id="defs17" />
+ <metadata
+ id="metadata90">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>Gnome Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(-60.952,-646.98)"
+ id="layer12">
+ <path
+ style="fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="m 3,1.03125 c -1,0 -2,1 -2,2 l 0,10 c 0,1 0.9999998,2 2,2 l 10,0 c 1,0 2,-1 2,-2 l 0,-10 c 0,-1
-1,-2 -2,-2 z m 1,12 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 2.6666667,0 5.3333333,0 8,0
0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1"
+ transform="translate(60.952,646.98)"
+ id="rect3819"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssssssssscssccssc" />
+ <rect
+ style="fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="rect3870"
+ width="4.9444599"
+ height="1"
+ x="64.952003"
+ y="654.00403"
+ ry="0" />
+ <rect
+ ry="0"
+ y="651.00403"
+ x="68.952003"
+ height="8"
+ width="1"
+ id="rect4380"
+ style="fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ </g>
+</svg>
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index d994bc9..52e0799 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -210,6 +210,8 @@ public class MainWindow : Gtk.ApplicationWindow {
spinner.set_size_request(STATUS_BAR_HEIGHT - 2, -1);
status_bar.add(spinner);
+ orientation_button.margin_right = 10;
+ orientation_button.relief = Gtk.ReliefStyle.NONE;
status_bar.pack_start(orientation_button, false, false, 0);
status_bar.reorder_child(orientation_button, 0);
@@ -347,7 +349,11 @@ public class MainWindow : Gtk.ApplicationWindow {
private void on_orientation_changed() {
bool horizontal = (folder_paned.orientation == Gtk.Orientation.HORIZONTAL);
- orientation_button.label = horizontal ? "H" : "I";
+ Gtk.Image image = new Gtk.Image.from_icon_name(
+ horizontal ? "layout-vertical-symbolic" : "layout-horizontal-symbolic",
+ Gtk.IconSize.MENU);
+ image.set_pixel_size(16);
+ orientation_button.image = image;
// Cancels previous binding
GearyApplication.instance.config.bind(
horizontal ? Configuration.FOLDER_LIST_PANE_POSITION_KEY
diff --git a/src/client/components/status-bar.vala b/src/client/components/status-bar.vala
index 95cfb7c..ed05dda 100644
--- a/src/client/components/status-bar.vala
+++ b/src/client/components/status-bar.vala
@@ -60,6 +60,9 @@ public class StatusBar : Gtk.Statusbar {
public StatusBar() {
set_context_id(Context.OUTBOX);
+ margin_top = 2;
+ margin_bottom = 2;
+ margin_left = 0;
}
private void set_context_id(Context context) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
