[gnome-shell] PopupSwitchMenuItem: use SVG switches
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] PopupSwitchMenuItem: use SVG switches
- Date: Wed, 22 Sep 2010 15:13:09 +0000 (UTC)
commit d188a7b32a4a01f1caa88136065587cce6c3f830
Author: Dan Winship <danw gnome org>
Date: Tue Sep 21 09:32:09 2010 -0400
PopupSwitchMenuItem: use SVG switches
https://bugzilla.gnome.org/show_bug.cgi?id=629954
data/Makefile.am | 4 +
data/theme/gnome-shell.css | 24 ++++---
data/theme/toggle-off-intl.svg | 126 ++++++++++++++++++++++++++++++++++++
data/theme/toggle-off-us.svg | 138 ++++++++++++++++++++++++++++++++++++++++
data/theme/toggle-on-intl.svg | 122 +++++++++++++++++++++++++++++++++++
data/theme/toggle-on-us.svg | 128 +++++++++++++++++++++++++++++++++++++
js/ui/popupMenu.js | 35 ++++------
7 files changed, 546 insertions(+), 31 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index d282e83..68dcc1d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -43,6 +43,10 @@ dist_theme_DATA = \
theme/separator-white.png \
theme/single-view-active.svg \
theme/single-view.svg \
+ theme/toggle-off-us.svg \
+ theme/toggle-off-intl.svg \
+ theme/toggle-on-us.svg \
+ theme/toggle-on-intl.svg \
theme/ws-switch-arrow-left.svg \
theme/ws-switch-arrow-right.svg
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index e9c7fe5..cd70ec3 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -149,17 +149,23 @@ StTooltip {
}
/* Switches (to be used in menus) */
-.switch {
- border-radius: 5px;
- padding: 0px 0.2em;
+.toggle-switch {
+ width: 4.5em;
+ height: 1.5em;
}
-.switch-label {
- font-size: 0.8em;
- padding: 2px 0.1em; /* account for border if checked */
+
+.toggle-switch-us {
+ background-image: url("toggle-off-us.svg");
+}
+.toggle-switch-us:checked {
+ background-image: url("toggle-on-us.svg");
+}
+
+.toggle-switch-intl {
+ background-image: url("toggle-off-intl.svg");
}
-.switch-label:checked {
- border-radius: 4px;
- padding: 0px 0.3em;
+.toggle-switch-intl:checked {
+ background-image: url("toggle-on-intl.svg");
}
/* Panel */
diff --git a/data/theme/toggle-off-intl.svg b/data/theme/toggle-off-intl.svg
new file mode 100644
index 0000000..b3d9ada
--- /dev/null
+++ b/data/theme/toggle-off-intl.svg
@@ -0,0 +1,126 @@
+<?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";
+ width="64"
+ height="22"
+ id="svg3273"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="New document 14">
+ <defs
+ id="defs3275">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective3281" />
+ <inkscape:perspective
+ id="perspective3261"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="32.000004"
+ inkscape:cy="10.999997"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="609"
+ inkscape:window-height="501"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata3278">
+ <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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-343,-521.36218)">
+ <g
+ id="g17454"
+ transform="translate(-453,448.36218)"
+ style="display:inline">
+ <rect
+ transform="scale(-1,1)"
+ ry="4"
+ rx="4"
+ y="74.5"
+ x="-859.5"
+ height="19"
+ width="63.000004"
+ id="rect17456"
+ style="color:#000000;fill:none;stroke:#2e3436;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ transform="scale(-1,1)"
+ ry="4"
+ rx="4"
+ y="74"
+ x="-828"
+ height="20"
+ width="31"
+ id="rect17458"
+ style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ <g
+ transform="matrix(-1,0,0,1,1619.1239,-33.986291)"
+ id="g17460"
+ style="display:inline">
+ <path
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 803.6322,115.48629 0,4.29495"
+ id="path17462"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+ d="m 806.62805,115.48629 0,4.29495"
+ id="path17464"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+ d="m 809.6239,115.48629 0,4.29495"
+ id="path17466"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.96875012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path18722"
+ sodipodi:cx="47.6875"
+ sodipodi:cy="11.5625"
+ sodipodi:rx="3.9375"
+ sodipodi:ry="3.9375"
+ d="m 51.625,11.5625 c 0,2.174621 -1.762879,3.9375 -3.9375,3.9375 -2.174621,0 -3.9375,-1.762879 -3.9375,-3.9375 0,-2.1746212 1.762879,-3.9375 3.9375,-3.9375 2.174621,0 3.9375,1.7628788 3.9375,3.9375 z"
+ transform="matrix(1.0158729,0,0,1.0158729,795.55556,72.25399)" />
+ </g>
+ </g>
+</svg>
diff --git a/data/theme/toggle-off-us.svg b/data/theme/toggle-off-us.svg
new file mode 100644
index 0000000..12167d6
--- /dev/null
+++ b/data/theme/toggle-off-us.svg
@@ -0,0 +1,138 @@
+<?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";
+ width="64"
+ height="22"
+ id="svg3012"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="New document 6">
+ <defs
+ id="defs3014">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective3020" />
+ <inkscape:perspective
+ id="perspective2997"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="32.000004"
+ inkscape:cy="10.999997"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="609"
+ inkscape:window-height="501"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata3017">
+ <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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-343,-521.36218)">
+ <g
+ id="g17454"
+ transform="translate(-453,448.36218)"
+ style="display:inline">
+ <rect
+ transform="scale(-1,1)"
+ ry="4"
+ rx="4"
+ y="74.5"
+ x="-859.5"
+ height="19"
+ width="63.000004"
+ id="rect17456"
+ style="color:#000000;fill:none;stroke:#2e3436;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ transform="scale(-1,1)"
+ ry="4"
+ rx="4"
+ y="74"
+ x="-828"
+ height="20"
+ width="31"
+ id="rect17458"
+ style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ <g
+ transform="matrix(-1,0,0,1,1619.1239,-33.986291)"
+ id="g17460"
+ style="display:inline">
+ <path
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 803.6322,115.48629 0,4.29495"
+ id="path17462"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+ d="m 806.62805,115.48629 0,4.29495"
+ id="path17464"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+ d="m 809.6239,115.48629 0,4.29495"
+ id="path17466"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ style="font-size:8.95877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+ id="text17468"
+ transform="translate(0.34375,0)">
+ <path
+ d="m 837.28518,80.750726 c 0.63282,6e-6 1.19566,0.123947 1.68852,0.371824 0.49284,0.247888 0.8807,0.609505 1.16359,1.084851 0.28287,0.472439 0.42431,1.022155 0.42431,1.649149 0,0.635748 -0.13853,1.200045 -0.41556,1.692892 -0.27706,0.489934 -0.66638,0.870507 -1.16797,1.141719 -0.5016,0.271213 -1.07756,0.406819 -1.72789,0.406819 -0.42869,0 -0.83551,-0.06562 -1.22045,-0.196848 -0.38495,-0.134148 -0.73053,-0.32808 -1.03674,-0.581795 -0.30329,-0.256631 -0.54534,-0.589085 -0.72615,-0.997363 -0.17789,-0.408276 -0.26684,-0.869045 -0.26683,-1.382311 -10e-6,-0.638658 0.13997,-1.200039 0.41994,-1.684144 0.27996,-0.487011 0.66782,-0.858835 1.16359,-1.115472 0.49576,-0.259541 1.06297,-0.389315 1.70164,-0.389321 m 0.57305,1.089225 c -0.20123,-0.05249 -0.40683,-0.07873 -0.61679,-0.07874 -0.20998,5e-6 -0.41412,0.02625 -0.61242,0.07874 -0.19831,0.04958 -0.38933,0.129779 -0.57305,0.240592 -0.18081,0.107907 -0.33974,0.242055 -0.47681,0.402445 -0.13706,0.160399 -0.24642,0.358705 -0.3
2808,0.594918 -0.0816,0.233306 -0.12248,0.491395 -0.12248,0.774269 0,0.67366 0.20851,1.214627 0.62554,1.622903 0.41702,0.408278 0.93758,0.612416 1.56166,0.612416 0.25954,0 0.51034,-0.04229 0.7524,-0.126858 0.24496,-0.08457 0.47097,-0.20997 0.67803,-0.376198 0.20705,-0.166226 0.37328,-0.392236 0.49868,-0.678032 0.12539,-0.285792 0.18809,-0.610956 0.1881,-0.975492 -10e-6,-0.297455 -0.0437,-0.568668 -0.13123,-0.813638 -0.0875,-0.247878 -0.20415,-0.453475 -0.34995,-0.61679 -0.14291,-0.163307 -0.31059,-0.301829 -0.50306,-0.415568 -0.18956,-0.11373 -0.38641,-0.195385 -0.59054,-0.244967"
+ style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+ id="path18599"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 843.5362,81.831203 0,1.17917 2.94834,0 0,1.014861 -2.94834,0 0,3.00713 -1.10673,0 0,-6.216022 4.31754,0 0,1.014861 -3.21081,0"
+ style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+ id="path18601"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccc" />
+ <path
+ d="m 849.71285,81.831203 0,1.17917 2.94834,0 0,1.014861 -2.94834,0 0,3.00713 -1.10672,0 0,-6.216022 4.31753,0 0,1.014861 -3.21081,0"
+ style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+ id="path18603"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccc" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/data/theme/toggle-on-intl.svg b/data/theme/toggle-on-intl.svg
new file mode 100644
index 0000000..409fd73
--- /dev/null
+++ b/data/theme/toggle-on-intl.svg
@@ -0,0 +1,122 @@
+<?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";
+ width="65"
+ height="22"
+ id="svg3199"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="New document 11">
+ <defs
+ id="defs3201">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective3207" />
+ <inkscape:perspective
+ id="perspective3187"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="32.500004"
+ inkscape:cy="10.999997"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="609"
+ inkscape:window-height="501"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata3204">
+ <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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-342.5,-521.36218)">
+ <g
+ style="display:inline"
+ transform="translate(-453.5,448.36218)"
+ id="g16453">
+ <rect
+ style="color:#000000;fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect16256-9-4"
+ width="63.000004"
+ height="19"
+ x="-859.5"
+ y="74.5"
+ rx="4"
+ ry="4"
+ transform="scale(-1,1)" />
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="rect16258-5-4"
+ width="31"
+ height="20"
+ x="-860"
+ y="74"
+ rx="4"
+ ry="4"
+ transform="scale(-1,1)" />
+ <g
+ style="display:inline"
+ id="g16298-3-6"
+ transform="matrix(-1,0,0,1,1651.1322,-33.986291)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path16265-3-5"
+ d="m 803.6322,115.48629 0,4.29495"
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path16265-0-2-0"
+ d="m 806.62805,115.48629 0,4.29495"
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path16265-8-7-1"
+ d="m 809.6239,115.48629 0,4.29495"
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ </g>
+ <path
+ style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 16,27.9375 0,10.125"
+ id="path19232"
+ inkscape:connector-curvature="0"
+ transform="translate(796,51.00002)" />
+ </g>
+ </g>
+</svg>
diff --git a/data/theme/toggle-on-us.svg b/data/theme/toggle-on-us.svg
new file mode 100644
index 0000000..807d85e
--- /dev/null
+++ b/data/theme/toggle-on-us.svg
@@ -0,0 +1,128 @@
+<?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";
+ width="65"
+ height="22"
+ id="svg2857"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="New document 2">
+ <defs
+ id="defs2859">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2865" />
+ <inkscape:perspective
+ id="perspective2843"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="-69.642856"
+ inkscape:cy="42.428569"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="609"
+ inkscape:window-height="501"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata2862">
+ <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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-444.64286,-781.36218)">
+ <g
+ style="display:inline"
+ transform="translate(-351.35714,708.36218)"
+ id="g16453">
+ <rect
+ style="color:#000000;fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect16256-9-4"
+ width="63.000004"
+ height="19"
+ x="-859.5"
+ y="74.5"
+ rx="4"
+ ry="4"
+ transform="scale(-1,1)" />
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="rect16258-5-4"
+ width="31"
+ height="20"
+ x="-860"
+ y="74"
+ rx="4"
+ ry="4"
+ transform="scale(-1,1)" />
+ <g
+ style="display:inline"
+ id="g16298-3-6"
+ transform="matrix(-1,0,0,1,1651.1322,-33.986291)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path16265-3-5"
+ d="m 803.6322,115.48629 0,4.29495"
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path16265-0-2-0"
+ d="m 806.62805,115.48629 0,4.29495"
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path16265-8-7-1"
+ d="m 809.6239,115.48629 0,4.29495"
+ style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ </g>
+ <g
+ style="font-size:8.95877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+ id="text42229-3-0">
+ <path
+ d="m 808.01473,80.573953 c 0.63283,6e-6 1.19567,0.123947 1.68852,0.371824 0.49284,0.247888 0.88071,0.609505 1.16359,1.084851 0.28287,0.472439 0.42431,1.022155 0.42432,1.649149 -10e-6,0.635748 -0.13853,1.200045 -0.41557,1.692892 -0.27705,0.489934 -0.66637,0.870506 -1.16796,1.141719 -0.50161,0.271212 -1.07757,0.406819 -1.72789,0.406819 -0.4287,0 -0.83552,-0.06562 -1.22046,-0.196848 -0.38495,-0.134148 -0.73053,-0.32808 -1.03673,-0.581795 -0.3033,-0.256631 -0.54535,-0.589085 -0.72615,-0.997363 -0.1779,-0.408276 -0.26684,-0.869045 -0.26684,-1.382311 0,-0.638658 0.13998,-1.200039 0.41994,-1.684144 0.27996,-0.487011 0.66782,-0.858835 1.16359,-1.115472 0.49576,-0.259541 1.06298,-0.389315 1.70164,-0.389321 m 0.57305,1.089225 c -0.20123,-0.05249 -0.40682,-0.07873 -0.61679,-0.07874 -0.20998,5e-6 -0.41411,0.02625 -0.61242,0.07874 -0.19831,0.04958 -0.38932,0.129779 -0.57304,0.240592 -0.18081,0.107907 -0.33975,0.242055 -0.47681,0.402445 -0.13707,0.160399 -0.24643,0.358705 -0.32
808,0.594918 -0.0817,0.233305 -0.12249,0.491395 -0.12249,0.774269 0,0.67366 0.20851,1.214627 0.62554,1.622902 0.41703,0.408279 0.93758,0.612417 1.56166,0.612416 0.25955,10e-7 0.51035,-0.04228 0.7524,-0.126857 0.24496,-0.08457 0.47097,-0.20997 0.67803,-0.376199 0.20705,-0.166225 0.37328,-0.392236 0.49868,-0.678031 0.1254,-0.285792 0.1881,-0.610956 0.1881,-0.975492 0,-0.297455 -0.0437,-0.568668 -0.13123,-0.813638 -0.0875,-0.247878 -0.20414,-0.453475 -0.34995,-0.61679 -0.1429,-0.163307 -0.31059,-0.301829 -0.50306,-0.415568 -0.18956,-0.11373 -0.38641,-0.195385 -0.59054,-0.244967"
+ style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+ id="path18606" />
+ <path
+ d="m 813.15903,80.639569 1.21608,0 3.4689,4.776844 0,-4.776844 1.10235,0 0,6.216022 -1.22921,0 -3.45577,-4.785594 0,4.785594 -1.10235,0 0,-6.216022"
+ style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+ id="path18608" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 491e501..6423268 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -23,30 +23,21 @@ function Switch() {
Switch.prototype = {
_init: function(state) {
- this.actor = new St.BoxLayout({ style_class: 'switch' });
- // Translators: the "ON" and "OFF" strings are used in the
- // toggle switches in the status area menus, and must be SHORT.
- // If you don't have suitable short words, consider initials,
- // "0"/"1", "â?ª"/"â?«", etc.
- this._on = new St.Label({ style_class: 'switch-label', text: _("ON") });
- this._off = new St.Label({ style_class: 'switch-label', text: _("OFF") });
- this.actor.add(this._on, { fill: true });
- this.actor.add(this._off, { fill: true });
+ this.actor = new St.Bin({ style_class: 'toggle-switch' });
+ // Translators: this MUST be either "toggle-switch-us"
+ // (for toggle switches containing the English words
+ // "ON" and "OFF") or "toggle-switch-intl" (for toggle
+ // switches containing "â?¯" and "|"). Other values will
+ // simply result in invisible toggle switches.
+ this.actor.add_style_class_name(_("toggle-switch-us"));
this.setToggleState(state);
},
setToggleState: function(state) {
- if (state) {
- this._on.remove_style_pseudo_class('checked');
- this._on.text = _("ON");
- this._off.add_style_pseudo_class('checked');
- this._off.text = ' ';
- } else {
- this._off.remove_style_pseudo_class('checked');
- this._off.text = _("OFF");
- this._on.add_style_pseudo_class('checked');
- this._on.text = ' ';
- }
+ if (state)
+ this.actor.add_style_pseudo_class('checked');
+ else
+ this.actor.remove_style_pseudo_class('checked');
this.state = state;
},
@@ -188,8 +179,8 @@ PopupSwitchMenuItem.prototype = {
this._switch = new Switch(this.active);
this._box = new St.BoxLayout({ style_class: 'popup-switch-menu-item' });
- this._box.add(this.label,{ expand: true });
- this._box.add(this._switch.actor);
+ this._box.add(this.label, { expand: true, y_fill: false });
+ this._box.add(this._switch.actor, { y_fill: false });
this.actor.set_child(this._box);
this.connect('activate', Lang.bind(this,function(from) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
