GNOME.org
 

[gnome-power-manager] Use symbolic icon for the keyboard brightness OSD

commit b1fe971666f40aa3aeecdd084361ed87ef07f9fd
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Mar 14 15:01:20 2011 +0000

    Use symbolic icon for the keyboard brightness OSD
    
    Remove the old gpm-brightness-kbd icons, and use the new
    keyboard-brightness-symbolic from Jakub Steiner.

 data/icons/16x16/status/Makefile.am                |    1 -
 data/icons/16x16/status/gpm-brightness-kbd.png     |  Bin 561 -> 0 bytes
 data/icons/22x22/status/Makefile.am                |    1 -
 data/icons/22x22/status/gpm-brightness-kbd.png     |  Bin 1030 -> 0 bytes
 data/icons/24x24/status/Makefile.am                |    1 -
 data/icons/24x24/status/gpm-brightness-kbd.png     |  Bin 1160 -> 0 bytes
 data/icons/32x32/status/Makefile.am                |    1 -
 data/icons/32x32/status/gpm-brightness-kbd.png     |  Bin 1744 -> 0 bytes
 data/icons/48x48/status/Makefile.am                |    1 -
 data/icons/48x48/status/gpm-brightness-kbd.png     |  Bin 2670 -> 0 bytes
 data/icons/scalable/status/Makefile.am             |    5 +-
 data/icons/scalable/status/gpm-brightness-kbd.svg  |  208 --------------------
 .../status/keyboard-brightness-symbolic.svg        |  150 ++++++++++++++
 src/gpm-kbd-backlight.c                            |    4 +-
 14 files changed, 155 insertions(+), 217 deletions(-)
---
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
index 01a2c3a..ec69a83 100644
--- a/data/icons/16x16/status/Makefile.am
+++ b/data/icons/16x16/status/Makefile.am
@@ -6,7 +6,6 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-brightness-kbd.png		\
 	gpm-keyboard-000.png		\
 	gpm-keyboard-020.png		\
 	gpm-keyboard-040.png		\
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
index 08e297a..17c54d9 100644
--- a/data/icons/22x22/status/Makefile.am
+++ b/data/icons/22x22/status/Makefile.am
@@ -6,7 +6,6 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-brightness-kbd.png		\
 	gpm-keyboard-000.png		\
 	gpm-keyboard-020.png		\
 	gpm-keyboard-040.png		\
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
index be42bcb..96069b6 100644
--- a/data/icons/24x24/status/Makefile.am
+++ b/data/icons/24x24/status/Makefile.am
@@ -6,7 +6,6 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-brightness-kbd.png		\
 	gpm-keyboard-000.png		\
 	gpm-keyboard-020.png		\
 	gpm-keyboard-040.png		\
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
index c435fca..897fc0a 100644
--- a/data/icons/32x32/status/Makefile.am
+++ b/data/icons/32x32/status/Makefile.am
@@ -6,7 +6,6 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-brightness-kbd.png		\
 	gpm-keyboard-000.png		\
 	gpm-keyboard-020.png		\
 	gpm-keyboard-040.png		\
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
index 15196bb..208aef1 100644
--- a/data/icons/48x48/status/Makefile.am
+++ b/data/icons/48x48/status/Makefile.am
@@ -6,7 +6,6 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-brightness-kbd.png		\
 	gpm-monitor.png			\
 	gpm-keyboard-000.png		\
 	gpm-keyboard-020.png		\
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
index 7b09e03..4ed7cba 100644
--- a/data/icons/scalable/status/Makefile.am
+++ b/data/icons/scalable/status/Makefile.am
@@ -4,9 +4,7 @@ context = status
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-
 icons_DATA = 			        \
-	gpm-brightness-kbd.svg		\
 	gpm-monitor.svg			\
 	gpm-keyboard-000.svg		\
 	gpm-keyboard-060.svg		\
@@ -41,6 +39,9 @@ icons_DATA = 			        \
 	gpm-ups-100-charging.svg	\
 	gpm-ups-missing.svg
 
+symiconsdir = $(datadir)/icons/gnome/scalable/status/
+symicons_DATA = keyboard-brightness-symbolic.svg
+
 noinst_DATA = 
 
 EXTRA_DIST =		\
diff --git a/data/icons/scalable/status/keyboard-brightness-symbolic.svg b/data/icons/scalable/status/keyboard-brightness-symbolic.svg
new file mode 100644
index 0000000..bb9e828
--- /dev/null
+++ b/data/icons/scalable/status/keyboard-brightness-symbolic.svg
@@ -0,0 +1,150 @@
+<?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="16px"
+   height="16px"
+   id="svg6268"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="New document 4">
+  <defs
+     id="defs6270" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="9.1334146"
+     inkscape:cy="7.3023314"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="474"
+     inkscape:window-height="409"
+     inkscape:window-x="1042"
+     inkscape:window-y="392"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid6305"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6273">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       style="display:inline"
+       id="g5428"
+       inkscape:label="keyboard-brightness"
+       transform="translate(-81.0002,-277)">
+      <rect
+         width="16"
+         height="16"
+         x="81"
+         y="277"
+         id="rect5430"
+         style="color:#bebebe;fill:none;stroke:none;stroke-width:1.78100002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+      <g
+         id="g5432"
+         style="display:inline"
+         transform="translate(0,3)">
+        <rect
+           style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+           id="rect5434"
+           width="2.9722719"
+           height="2"
+           x="81"
+           y="284"
+           rx="0.5625"
+           ry="0.5625" />
+        <rect
+           style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+           id="rect5436"
+           width="3.0164659"
+           height="2"
+           x="93.983536"
+           y="284"
+           rx="0.5625"
+           ry="0.5625" />
+      </g>
+      <g
+         style="display:inline"
+         id="g5438"
+         transform="matrix(0.70710678,-0.70710679,0.70710679,0.70710678,-175.45794,149.40707)">
+        <rect
+           ry="0.5625"
+           rx="0.5625"
+           y="284"
+           x="93.983536"
+           height="2"
+           width="3.0164659"
+           id="rect5442"
+           style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+      </g>
+      <g
+         transform="matrix(0,-1,1,0,-196,377)"
+         id="g5444"
+         style="display:inline">
+        <rect
+           style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+           id="rect5448"
+           width="3.0164659"
+           height="2"
+           x="93.983536"
+           y="284"
+           rx="0.5625"
+           ry="0.5625" />
+      </g>
+      <g
+         style="display:inline"
+         id="g5450"
+         transform="matrix(-0.70710679,-0.70710678,0.70710678,-0.70710679,-49.592928,552.45794)">
+        <rect
+           ry="0.5625"
+           rx="0.5625"
+           y="284"
+           x="93.983536"
+           height="2"
+           width="3.0164659"
+           id="rect5454"
+           style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+      </g>
+      <path
+         style="color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 86.0627,289 1.05136,-2.97398 c 1.35033,0.40659 3.02991,0.2522 3.88614,0 l 1.08336,2.98514 z"
+         id="path5458"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c
index 3e06f35..102150e 100644
--- a/src/gpm-kbd-backlight.c
+++ b/src/gpm-kbd-backlight.c
@@ -484,7 +484,7 @@ gpm_kbd_backlight_button_pressed_cb (GpmButton *button,
 		}
 	}
 	if (ret) {
-		gpm_osd_dialog_init (&backlight->priv->popup, "gpm-brightness-kbd");
+		gpm_osd_dialog_init (&backlight->priv->popup, "keyboard-brightness-symbolic");
 		gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
 							backlight->priv->brightness_percent);
 		gpm_osd_dialog_show (backlight->priv->popup);
@@ -722,7 +722,7 @@ noerr:
 	gpm_idle_set_timeout_dim (backlight->priv->idle, backlight->priv->idle_dim_timeout);
 
 	/* use a visual widget */
-	gpm_osd_dialog_init(&backlight->priv->popup, "gpm-brightness-kbd");
+	gpm_osd_dialog_init(&backlight->priv->popup, "keyboard-brightness-symbolic");
 
 	/* make sure we turn the keyboard backlight back on after resuming */
 	backlight->priv->control = gpm_control_new ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]