[Xfce4-commits] [xfce/xfce4-power-manager] 13/63: Use symbolic brightness icon and fix indenting
noreply at xfce.org
noreply at xfce.org
Sun Mar 22 13:02:08 CET 2015
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit 3f6fa63fb005fc94f934549dc740134c3826b84a
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Fri Mar 6 00:58:16 2015 +0100
Use symbolic brightness icon and fix indenting
---
common/xfpm-icons.h | 2 +-
data/icons/scalable/Makefile.am | 92 ++--
.../icons/scalable/display-brightness-symbolic.svg | 40 ++
data/icons/scalable/xfpm-brightness-lcd.svg | 454 --------------------
.../power-manager-plugin/power-manager-button.c | 202 ++++-----
5 files changed, 188 insertions(+), 602 deletions(-)
diff --git a/common/xfpm-icons.h b/common/xfpm-icons.h
index f6418ef..64d47c0 100644
--- a/common/xfpm-icons.h
+++ b/common/xfpm-icons.h
@@ -42,7 +42,7 @@ G_BEGIN_DECLS
#define XFPM_COMPUTER_ICON_PREFIX "computer"
#define XFPM_TABLET_ICON_PREFIX "tablet"
-#define XFPM_DISPLAY_BRIGHTNESS_ICON "xfpm-brightness-lcd"
+#define XFPM_DISPLAY_BRIGHTNESS_ICON "display-brightness-symbolic"
#define XFPM_DISPLAY_BRIGHTNESS_INVALID_ICON "xfpm-brightness-lcd-missing" /* When no hw found */
G_END_DECLS
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index b9060ee..34bb780 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -4,49 +4,49 @@ EXTRA_DIST = \
Datadir = $(datadir)/icons/hicolor/scalable/status
Data_DATA = \
- computer.svg \
- keyboard.svg \
- mouse.svg \
- multimedia-player.svg \
- pda.svg \
- phone.svg \
- tablet.svg \
- video-display.svg \
- xfpm-ac-adapter.svg \
- xfpm-ac-adapter-symbolic.svg \
- xfpm-primary-000.svg \
- xfpm-primary-000-symbolic.svg \
- xfpm-primary-020.svg \
- xfpm-primary-020-symbolic.svg \
- xfpm-primary-040.svg \
- xfpm-primary-040-symbolic.svg \
- xfpm-primary-060.svg \
- xfpm-primary-060-symbolic.svg \
- xfpm-primary-080.svg \
- xfpm-primary-080-symbolic.svg \
- xfpm-primary-100.svg \
- xfpm-primary-100-symbolic.svg \
- xfpm-primary-000-charging.svg \
- xfpm-primary-000-charging-symbolic.svg \
- xfpm-primary-020-charging.svg \
- xfpm-primary-020-charging-symbolic.svg \
- xfpm-primary-040-charging.svg \
- xfpm-primary-040-charging-symbolic.svg \
- xfpm-primary-060-charging.svg \
- xfpm-primary-060-charging-symbolic.svg \
- xfpm-primary-080-charging.svg \
- xfpm-primary-080-charging-symbolic.svg \
- xfpm-primary-100-charging.svg \
- xfpm-primary-100-charging-symbolic.svg \
- xfpm-primary-charged.svg \
- xfpm-primary-charged-symbolic.svg \
- xfpm-primary-missing.svg \
- xfpm-primary-missing-symbolic.svg \
- xfpm-ups-000.svg \
- xfpm-ups-020.svg \
- xfpm-ups-040.svg \
- xfpm-ups-060.svg \
- xfpm-ups-080.svg \
- xfpm-ups-100.svg \
- xfpm-brightness-keyboard.svg \
- xfpm-brightness-lcd.svg
+ computer.svg \
+ display-brightness-symbolic.svg \
+ keyboard.svg \
+ mouse.svg \
+ multimedia-player.svg \
+ pda.svg \
+ phone.svg \
+ tablet.svg \
+ video-display.svg \
+ xfpm-ac-adapter.svg \
+ xfpm-ac-adapter-symbolic.svg \
+ xfpm-primary-000.svg \
+ xfpm-primary-000-symbolic.svg \
+ xfpm-primary-020.svg \
+ xfpm-primary-020-symbolic.svg \
+ xfpm-primary-040.svg \
+ xfpm-primary-040-symbolic.svg \
+ xfpm-primary-060.svg \
+ xfpm-primary-060-symbolic.svg \
+ xfpm-primary-080.svg \
+ xfpm-primary-080-symbolic.svg \
+ xfpm-primary-100.svg \
+ xfpm-primary-100-symbolic.svg \
+ xfpm-primary-000-charging.svg \
+ xfpm-primary-000-charging-symbolic.svg \
+ xfpm-primary-020-charging.svg \
+ xfpm-primary-020-charging-symbolic.svg \
+ xfpm-primary-040-charging.svg \
+ xfpm-primary-040-charging-symbolic.svg \
+ xfpm-primary-060-charging.svg \
+ xfpm-primary-060-charging-symbolic.svg \
+ xfpm-primary-080-charging.svg \
+ xfpm-primary-080-charging-symbolic.svg \
+ xfpm-primary-100-charging.svg \
+ xfpm-primary-100-charging-symbolic.svg \
+ xfpm-primary-charged.svg \
+ xfpm-primary-charged-symbolic.svg \
+ xfpm-primary-missing.svg \
+ xfpm-primary-missing-symbolic.svg \
+ xfpm-ups-000.svg \
+ xfpm-ups-020.svg \
+ xfpm-ups-040.svg \
+ xfpm-ups-060.svg \
+ xfpm-ups-080.svg \
+ xfpm-ups-100.svg \
+ xfpm-brightness-keyboard.svg \
diff --git a/data/icons/scalable/display-brightness-symbolic.svg b/data/icons/scalable/display-brightness-symbolic.svg
new file mode 100644
index 0000000..ac4eb26
--- /dev/null
+++ b/data/icons/scalable/display-brightness-symbolic.svg
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='display-brightness-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.4 r9939' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+ <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>
+ <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='524.57352' inkscape:cy='-152.42645' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscap [...]
+ <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='160.0002px' originy='100px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+ <inkscape:grid color='#000000' empcolor='#000000' empopacity='0' empspacing='4' enabled='true' id='grid5968' opacity='0.1254902' originx='160.0002px' originy='100px' snapvisiblegridlinesonly='true' spacingx='0.5px' spacingy='0.5px' type='xygrid' visible='true'/>
+ </sodipodi:namedview>
+ <title id='title9167'>Gnome Symbolic Icon Theme</title>
+ <defs id='defs7386'/>
+ <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-81,-317)'>
+
+ <rect height='2' id='rect4906-43-6' rx='0.49999836' ry='0.5' 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' width='3.0002' x='81' y='324'/>
+ <rect height='2' id='rect4906-4-6-6' rx='0.4998' ry='0.5' 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' width='2.9998' x='94.000198' y='324'/>
+ <rect height='2' id='rect8386' rx='0.49999836' ry='0.5' 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' transform='matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)' width='3.0002' x='-174.8772' y='291.74222'/>
+ <rect height='2' id='rect8388' rx='0.4998' ry='0.5' 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' transform='matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)' width='2.9998' x='-161.877' y='291.74222'/>
+ <rect height='2' id='rect8390' rx='0.49999836' ry='0.5' 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' transform='matrix(0,-1,1,0,0,0)' width='3.0002' x='-333' y='88.000031'/>
+ <rect height='2' id='rect8392' rx='0.4998' ry='0.5' 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' transform='matrix(0,-1,1,0,0,0)' width='2.9998' x='-319.99982' y='88.000031'/>
+ <rect height='2' id='rect8394' rx='0.49999836' ry='0.5' 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' transform='matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)' width='3.0002' x='-300.74222' y='-167.87718'/>
+ <rect height='2' id='rect8396' rx='0.4998' ry='0.5' 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' transform='matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)' width='2.9998' x='-287.74203' y='-167.87718'/>
+ <path inkscape:connector-curvature='0' d='m 88.988538,321.00774 c -2.197297,0 -3.979304,1.78201 -3.979304,3.9793 0,2.1973 1.782007,4.00857 3.979304,4.00857 2.197297,0 4.008564,-1.81127 4.008564,-4.00857 0,-2.19729 -1.811267,-3.9793 -4.008564,-3.9793 z m 0,1.98965 c 1.116415,0 2.018912,0.87324 2.018912,1.98965 0,1.11642 -0.902497,2.01891 -2.018912,2.01891 -1.116415,0 -1.989652,-0.90249 -1.989652,-2.01891 0,-1.11641 0.873237,-1.98965 1.989652,-1.98965 z' id='path32729' style='font-size [...]
+ </g>
+ <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-81,-317)'/>
+ <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-81,-317)'/>
+ <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-81,-317)'/>
+ <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-81,-317)'/>
+ <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-81,-317)'/>
+ <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-81,-317)'/>
+ <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-81,-317)'/>
+ <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-81,-317)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-brightness-lcd.svg b/data/icons/scalable/xfpm-brightness-lcd.svg
deleted file mode 100644
index aa8e65b..0000000
--- a/data/icons/scalable/xfpm-brightness-lcd.svg
+++ /dev/null
@@ -1,454 +0,0 @@
-<?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:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="48"
- height="48"
- id="svg4666"
- version="1.1"
- inkscape:version="0.48.4 r9939"
- sodipodi:docname="xfpm-brightness-lcd.svg"
- inkscape:export-filename="/home/steinbs3/Dev/xfce4-power-manager/data/icons/48x48/xfpm-brightness-lcd.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs4668">
- <linearGradient
- id="linearGradient10619"
- inkscape:collect="always">
- <stop
- id="stop10621"
- offset="0"
- style="stop-color:#ffffff;stop-opacity:1" />
- <stop
- id="stop10623"
- offset="1"
- style="stop-color:#fce94f;stop-opacity:1" />
- </linearGradient>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient10619"
- id="radialGradient7039"
- cx="24.006342"
- cy="1028.3655"
- fx="24.006342"
- fy="1028.3655"
- r="8.2378702"
- gradientTransform="matrix(2.0628703,-3.9923962e-4,4.464528e-4,2.3068206,-25.974746,-1343.8796)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient10619"
- id="radialGradient7041"
- cx="-731.13226"
- cy="-710.19116"
- fx="-731.13226"
- fy="-710.19116"
- r="3.2498002"
- gradientTransform="matrix(2.5272384,-4.5937031e-5,3.168342e-5,1.7427464,1116.6357,527.45837)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient10619"
- id="radialGradient7043"
- cx="-757.13226"
- cy="-710.19116"
- fx="-757.13226"
- fy="-710.19116"
- r="3.2502003"
- gradientTransform="matrix(2.0416763,0.21750162,-0.18458738,1.7327122,657.59437,685.04322)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient10619"
- id="radialGradient7045"
- cx="-1015.362"
- cy="24.000063"
- fx="-1015.362"
- fy="24.000063"
- r="3.2498002"
- gradientTransform="matrix(2.4616284,4.5313132e-6,-2.8321706e-6,1.5385752,1484.082,-12.92124)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient10619"
- id="radialGradient7047"
- cx="-1041.3621"
- cy="24.000063"
- fx="-1041.3621"
- fy="24.000063"
- r="3.2502003"
- gradientTransform="matrix(2.1536707,4.5853785e-6,-3.2753784e-6,1.5383861,1201.3889,-12.916523)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient10619"
- id="radialGradient7049"
- cx="-697.19098"
- cy="744.13245"
- fx="-697.19098"
- fy="744.13245"
- r="3.2498002"
- gradientTransform="matrix(2.747753,-0.17639823,0.08380992,1.3055057,1156.1519,-350.31994)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient10619"
- id="radialGradient7051"
- cx="-723.19098"
- cy="744.13245"
- fx="-723.19098"
- fy="744.13245"
- r="3.2502003"
- gradientTransform="matrix(2.2545628,0.14441536,-0.08361373,1.3053486,969.50812,-122.77992)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient10619"
- id="radialGradient7053"
- cx="37.000198"
- cy="1028.3622"
- fx="37.000198"
- fy="1028.3622"
- r="3.2498002"
- gradientTransform="matrix(2.1539184,-5.4637405e-5,4.6833294e-5,1.8462643,-42.743373,-870.26423)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient10619"
- id="radialGradient7055"
- cx="11.000202"
- cy="1028.3622"
- fx="11.000202"
- fy="1028.3622"
- r="3.2502003"
- gradientTransform="matrix(2.1536513,-9.8911971e-5,7.0653236e-5,1.5383622,-12.763056,-553.6302)"
- gradientUnits="userSpaceOnUse" />
- <filter
- inkscape:collect="always"
- id="filter7400"
- x="-0.12"
- width="1.24"
- y="-0.12"
- height="1.24">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.31221715"
- id="feGaussianBlur7402" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter7410"
- x="-0.149994"
- width="1.299988"
- y="-0.10000267"
- height="1.2000053">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.24999002"
- id="feGaussianBlur7412" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter7418"
- x="-0.12"
- width="1.24"
- y="-0.12"
- height="1.24">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.31221715"
- id="feGaussianBlur7420" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter7422"
- x="-0.10000267"
- width="1.2000053"
- y="-0.149994"
- height="1.299988">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.24999002"
- id="feGaussianBlur7424" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter7430"
- x="-0.12"
- width="1.24"
- y="-0.12"
- height="1.24">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.31223724"
- id="feGaussianBlur7432" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter7438"
- x="-0.150006"
- width="1.300012"
- y="-0.099997335"
- height="1.1999947">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.25001003"
- id="feGaussianBlur7440" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter7446"
- x="-0.12"
- width="1.24"
- y="-0.12"
- height="1.24">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.31223724"
- id="feGaussianBlur7448" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter7454"
- x="-0.099997335"
- width="1.1999947"
- y="-0.150006"
- height="1.300012">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.25001003"
- id="feGaussianBlur7456" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter7460"
- x="-0.12000022"
- width="1.2400004"
- y="-0.11999978"
- height="1.2399996">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.79878853"
- id="feGaussianBlur7462" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="11.2"
- inkscape:cx="20.2073"
- inkscape:cy="22.755583"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1263"
- inkscape:window-height="775"
- inkscape:window-x="316"
- inkscape:window-y="144"
- inkscape:window-maximized="0">
- <inkscape:grid
- type="xygrid"
- id="grid6567"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata4671">
- <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 />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1004.3622)">
- <rect
- y="1026.3622"
- x="8.0000019"
- width="6.0004005"
- style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter7454)"
- ry="1.0000001"
- rx="0.99999684"
- id="rect7310"
- height="4.0000005" />
- <rect
- height="4.0000005"
- id="rect4906-43-6"
- rx="0.99999684"
- ry="1.0000001"
- style="color:#bebebe;fill:url(#radialGradient7055);fill-opacity:1;fill-rule:nonzero;stroke:#fcaf3e;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- width="6.0004005"
- x="8.0000019"
- y="1026.3622" />
- <rect
- y="1026.3622"
- x="34.000397"
- width="5.9996004"
- style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter7422)"
- ry="1.0000001"
- rx="0.99960011"
- id="rect7312"
- height="4.0000005" />
- <rect
- height="4.0000005"
- id="rect4906-4-6-6"
- rx="0.99960011"
- ry="1.0000001"
- style="color:#bebebe;fill:url(#radialGradient7053);fill-opacity:1;fill-rule:nonzero;stroke:#fcaf3e;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- width="5.9996004"
- x="34.000397"
- y="1026.3622" />
- <rect
- y="742.13245"
- x="-726.19116"
- width="6.0004005"
- transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
- style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter7446)"
- ry="1.0000001"
- rx="0.99999684"
- id="rect7314"
- height="4.0000005" />
- <rect
- height="4.0000005"
- id="rect8386"
- rx="0.99999684"
- ry="1.0000001"
- style="color:#bebebe;fill:url(#radialGradient7051);fill-opacity:1;fill-rule:nonzero;stroke:#fcaf3e;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
- width="6.0004005"
- x="-726.19116"
- y="742.13245" />
- <rect
- y="742.13245"
- x="-700.1908"
- width="5.9996004"
- transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
- style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter7418)"
- ry="1.0000001"
- rx="0.99960011"
- id="rect7316"
- height="4.0000005" />
- <rect
- height="4.0000005"
- id="rect8388"
- rx="0.99960011"
- ry="1.0000001"
- style="color:#bebebe;fill:url(#radialGradient7049);fill-opacity:1;fill-rule:nonzero;stroke:#fcaf3e;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
- width="5.9996004"
- x="-700.1908"
- y="742.13245" />
- <rect
- y="22.000063"
- x="-1044.3622"
- width="6.0004005"
- transform="matrix(0,-1,1,0,0,0)"
- style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter7438)"
- ry="1.0000001"
- rx="0.99999684"
- id="rect7318"
- height="4.0000005" />
- <rect
- height="4.0000005"
- id="rect8390"
- rx="0.99999684"
- ry="1.0000001"
- style="color:#bebebe;fill:url(#radialGradient7047);fill-opacity:1;fill-rule:nonzero;stroke:#fcaf3e;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- transform="matrix(0,-1,1,0,0,0)"
- width="6.0004005"
- x="-1044.3622"
- y="22.000063" />
- <rect
- y="22.000063"
- x="-1018.3618"
- width="5.9996004"
- transform="matrix(0,-1,1,0,0,0)"
- style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter7410)"
- ry="1.0000001"
- rx="0.99960011"
- id="rect7408"
- height="4.0000005" />
- <rect
- height="4.0000005"
- id="rect8392"
- rx="0.99960011"
- ry="1.0000001"
- style="color:#bebebe;fill:url(#radialGradient7045);fill-opacity:1;fill-rule:nonzero;stroke:#fcaf3e;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- transform="matrix(0,-1,1,0,0,0)"
- width="5.9996004"
- x="-1018.3618"
- y="22.000063" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enabl [...]
- id="path7458"
- d="m 23.977081,1020.3776 c -4.394597,0 -7.958611,3.564 -7.958611,7.9586 0,4.3946 3.564014,8.0172 7.958611,8.0172 4.39459,0 8.01713,-3.6226 8.01713,-8.0172 0,-4.3946 -3.62254,-7.9586 -8.01713,-7.9586 z m 0,3.9794 c 2.23283,0 4.03782,1.7464 4.03782,3.9792 0,2.2328 -1.80499,4.0378 -4.03782,4.0378 -2.232833,0 -3.979307,-1.805 -3.979307,-4.0378 0,-2.2328 1.746474,-3.9792 3.979307,-3.9792 z"
- inkscape:connector-curvature="0" />
- <rect
- y="-712.19116"
- x="-760.13245"
- width="6.0004005"
- transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
- style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter7430)"
- ry="1.0000001"
- rx="0.99999684"
- id="rect7322"
- height="4.0000005" />
- <rect
- height="4.0000005"
- id="rect8394"
- rx="0.99999684"
- ry="1.0000001"
- style="color:#bebebe;fill:url(#radialGradient7043);fill-opacity:1;fill-rule:nonzero;stroke:#fcaf3e;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
- width="6.0004005"
- x="-760.13245"
- y="-712.19116" />
- <rect
- y="-712.19116"
- x="-734.13208"
- width="5.9996004"
- transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
- style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter7400)"
- ry="1.0000001"
- rx="0.99960011"
- id="rect7324"
- height="4.0000005" />
- <rect
- height="4.0000005"
- id="rect8396"
- rx="0.99960011"
- ry="1.0000001"
- style="color:#bebebe;fill:url(#radialGradient7041);fill-opacity:1;fill-rule:nonzero;stroke:#fcaf3e;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
- width="5.9996004"
- x="-734.13208"
- y="-712.19116" />
- <path
- inkscape:connector-curvature="0"
- d="m 23.977081,1020.3776 c -4.394597,0 -7.958611,3.564 -7.958611,7.9586 0,4.3946 3.564014,8.0172 7.958611,8.0172 4.39459,0 8.01713,-3.6226 8.01713,-8.0172 0,-4.3946 -3.62254,-7.9586 -8.01713,-7.9586 z m 0,3.9794 c 2.23283,0 4.03782,1.7464 4.03782,3.9792 0,2.2328 -1.80499,4.0378 -4.03782,4.0378 -2.232833,0 -3.979307,-1.805 -3.979307,-4.0378 0,-2.2328 1.746474,-3.9792 3.979307,-3.9792 z"
- id="path32729"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#radialGradient7039);fill-opacity:1;stroke:#fcaf3e;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;ov [...]
- </g>
-</svg>
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index c477454..a2c8947 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -143,7 +143,7 @@ get_display_device (PowerManagerButton *button)
TRACE("entering");
- g_return_val_if_fail ( POWER_MANAGER_IS_BUTTON(button), NULL );
+ g_return_val_if_fail (POWER_MANAGER_IS_BUTTON(button), NULL);
if (button->priv->display_device)
{
@@ -172,9 +172,9 @@ get_display_device (PowerManagerButton *button)
"percentage", &percentage,
NULL);
- if ( type == UP_DEVICE_KIND_BATTERY || type == UP_DEVICE_KIND_UPS)
+ if (type == UP_DEVICE_KIND_BATTERY || type == UP_DEVICE_KIND_UPS)
{
- if ( highest_percentage < percentage )
+ if (highest_percentage < percentage)
{
display_device = battery_device;
highest_percentage = percentage;
@@ -204,7 +204,7 @@ power_manager_button_set_tooltip (PowerManagerButton *button)
button->priv->tooltip = NULL;
}
- if ( display_device )
+ if (display_device)
{
/* if we have something, display it */
if( display_device->details )
@@ -218,7 +218,7 @@ power_manager_button_set_tooltip (PowerManagerButton *button)
}
/* Odds are this is a desktop without any batteries attached */
- button->priv->tooltip = g_strdup(_("Display battery levels for attached devices"));
+ button->priv->tooltip = g_strdup (_("Display battery levels for attached devices"));
gtk_widget_set_tooltip_text (GTK_WIDGET (button), button->priv->tooltip);
/* Tooltip changed! */
g_signal_emit (button, __signals[SIG_TOOLTIP_CHANGED], 0);
@@ -366,32 +366,32 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
TRACE("entering for %s", object_path);
- if ( !POWER_MANAGER_IS_BUTTON (button) )
+ if (!POWER_MANAGER_IS_BUTTON (button))
return;
item = find_device_in_list (button, object_path);
if (item == NULL)
- return;
+ return;
battery_device = item->data;
/* hack, this depends on XFPM_DEVICE_TYPE_* being in sync with UP_DEVICE_KIND_* */
g_object_get (device,
- "kind", &type,
- NULL);
+ "kind", &type,
+ NULL);
icon_name = get_device_icon_name (button->priv->upower, device);
details = get_device_description (button->priv->upower, device);
pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- icon_name,
- 32,
- GTK_ICON_LOOKUP_USE_BUILTIN,
- NULL);
+ icon_name,
+ 32,
+ GTK_ICON_LOOKUP_USE_BUILTIN,
+ NULL);
if (battery_device->details)
- g_free(battery_device->details);
+ g_free (battery_device->details);
battery_device->details = details;
/* If we had an image before, remove it and the callback */
@@ -403,13 +403,13 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
display_device = get_display_device (button);
if ( battery_device == display_device)
{
- DBG("this is the display device, updating");
- /* it is! update the panel button */
- g_free(button->priv->panel_icon_name);
- button->priv->panel_icon_name = icon_name;
- power_manager_button_set_icon (button);
- /* update tooltip */
- power_manager_button_set_tooltip (button);
+ DBG("this is the display device, updating");
+ /* it is! update the panel button */
+ g_free (button->priv->panel_icon_name);
+ button->priv->panel_icon_name = icon_name;
+ power_manager_button_set_icon (button);
+ /* update tooltip */
+ power_manager_button_set_tooltip (button);
}
/* If the menu is being displayed, update it */
@@ -421,19 +421,19 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
/* update the image, keep track of the signal ids and the img
* so we can disconnect it later */
- battery_device->img = gtk_image_new_from_pixbuf(battery_device->pix);
+ battery_device->img = gtk_image_new_from_pixbuf (battery_device->pix);
g_object_ref (battery_device->img);
/* In order to refresh the icon, we get the box inside the menuitem, and then destroy the GtkImage
* inside it. Then we pack the new image in its place. */
box = gtk_bin_get_child (GTK_BIN (battery_device->menu_item));
children = gtk_container_get_children (GTK_CONTAINER (box));
- for(iter = children; iter != NULL; iter = g_list_next (iter))
+ for (iter = children; iter != NULL; iter = g_list_next (iter))
{
if (GTK_IS_IMAGE (GTK_WIDGET(iter->data)))
gtk_widget_destroy(GTK_WIDGET(iter->data));
}
- g_list_free(children);
+ g_list_free (children);
gtk_box_pack_start (GTK_BOX (box), battery_device->img, FALSE, FALSE, 0);
battery_device->expose_signal_id = g_signal_connect_after (G_OBJECT (battery_device->img),
@@ -463,11 +463,11 @@ power_manager_button_add_device (UpDevice *device, PowerManagerButton *button)
TRACE("entering for %s", object_path);
- g_return_if_fail ( POWER_MANAGER_IS_BUTTON (button ) );
+ g_return_if_fail (POWER_MANAGER_IS_BUTTON (button ));
/* don't add the same device twice */
- if ( find_device_in_list (button, object_path) )
- return;
+ if (find_device_in_list (button, object_path))
+ return;
battery_device = g_new0 (BatteryDevice, 1);
@@ -476,7 +476,6 @@ power_manager_button_add_device (UpDevice *device, PowerManagerButton *button)
"kind", &type,
NULL);
-
#if UP_CHECK_VERSION(0, 99, 0)
signal_id = g_signal_connect (device, "notify", G_CALLBACK (device_changed_cb), button);
#else
@@ -497,7 +496,7 @@ power_manager_button_add_device (UpDevice *device, PowerManagerButton *button)
/* If the menu is being shown, add this new device to it */
if (button->priv->menu)
{
- power_manager_button_menu_add_device (button, battery_device, FALSE);
+ power_manager_button_menu_add_device (button, battery_device, FALSE);
}
}
@@ -512,9 +511,9 @@ battery_device_remove_pix (BatteryDevice *battery_device)
if (battery_device == NULL)
return;
- if (G_IS_OBJECT(battery_device->pix))
+ if (G_IS_OBJECT (battery_device->pix))
{
- if (GTK_IS_WIDGET(battery_device->img))
+ if (GTK_IS_WIDGET (battery_device->img))
{
if (battery_device->expose_signal_id != 0)
{
@@ -532,15 +531,15 @@ battery_device_remove_pix (BatteryDevice *battery_device)
static void
remove_battery_device (PowerManagerButton *button, BatteryDevice *battery_device)
{
- g_return_if_fail ( POWER_MANAGER_IS_BUTTON(button) );
- g_return_if_fail ( battery_device != NULL );
+ g_return_if_fail (POWER_MANAGER_IS_BUTTON (button));
+ g_return_if_fail (battery_device != NULL);
/* If it is being shown in the menu, remove it */
if(battery_device->menu_item && button->priv->menu)
- gtk_container_remove(GTK_CONTAINER(button->priv->menu), battery_device->menu_item);
+ gtk_container_remove (GTK_CONTAINER (button->priv->menu), battery_device->menu_item);
- g_free(battery_device->details);
- g_free(battery_device->object_path);
+ g_free (battery_device->details);
+ g_free (battery_device->object_path);
if (battery_device->device != NULL && UP_IS_DEVICE(battery_device->device))
{
@@ -592,7 +591,7 @@ device_removed_cb (UpClient *upower, const gchar *object_path, PowerManagerButto
static void
device_removed_cb (UpClient *upower, UpDevice *device, PowerManagerButton *button)
{
- const gchar *object_path = up_device_get_object_path(device);
+ const gchar *object_path = up_device_get_object_path (device);
power_manager_button_remove_device (button, object_path);
}
#endif
@@ -602,7 +601,7 @@ power_manager_button_add_all_devices (PowerManagerButton *button)
{
#if !UP_CHECK_VERSION(0, 99, 0)
/* the device-add callback is called for each device */
- up_client_enumerate_devices_sync(button->priv->upower, NULL, NULL);
+ up_client_enumerate_devices_sync (button->priv->upower, NULL, NULL);
#else
GPtrArray *array = NULL;
guint i;
@@ -610,11 +609,11 @@ power_manager_button_add_all_devices (PowerManagerButton *button)
button->priv->display_device = up_client_get_display_device (button->priv->upower);
power_manager_button_add_device (button->priv->display_device, button);
- array = up_client_get_devices(button->priv->upower);
+ array = up_client_get_devices (button->priv->upower);
- if ( array )
+ if (array)
{
- for ( i = 0; i < array->len; i++)
+ for (i = 0; i < array->len; i++)
{
UpDevice *device = g_ptr_array_index (array, i);
@@ -632,7 +631,7 @@ power_manager_button_remove_all_devices (PowerManagerButton *button)
TRACE("entering");
- g_return_if_fail ( POWER_MANAGER_IS_BUTTON(button) );
+ g_return_if_fail (POWER_MANAGER_IS_BUTTON (button));
for (item = g_list_first (button->priv->devices); item != NULL; item = g_list_next (item))
{
@@ -685,15 +684,15 @@ power_manager_button_scroll_event (GtkWidget *widget, GdkEventScroll *ev)
hw_found = xfpm_brightness_has_hw (button->priv->brightness);
- if ( !hw_found )
+ if (!hw_found)
return FALSE;
- if ( ev->direction == GDK_SCROLL_UP )
+ if (ev->direction == GDK_SCROLL_UP)
{
brightness_up (button);
return TRUE;
}
- else if ( ev->direction == GDK_SCROLL_DOWN )
+ else if (ev->direction == GDK_SCROLL_DOWN)
{
brightness_down (button);
return TRUE;
@@ -702,7 +701,7 @@ power_manager_button_scroll_event (GtkWidget *widget, GdkEventScroll *ev)
}
static void
-set_brightness_min_level(PowerManagerButton *button, gint32 new_brightness_level)
+set_brightness_min_level (PowerManagerButton *button, gint32 new_brightness_level)
{
gint32 max_level = xfpm_brightness_get_max_level (button->priv->brightness);
@@ -725,27 +724,27 @@ set_brightness_min_level(PowerManagerButton *button, gint32 new_brightness_level
/* update the range if it's being shown */
if (button->priv->range)
{
- gtk_range_set_range (GTK_RANGE(button->priv->range), button->priv->brightness_min_level, max_level);
+ gtk_range_set_range (GTK_RANGE (button->priv->range), button->priv->brightness_min_level, max_level);
}
}
static void
-power_manager_button_set_property(GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+power_manager_button_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
PowerManagerButton *button;
button = POWER_MANAGER_BUTTON (object);
- switch(property_id)
+ switch (property_id)
{
case PROP_BRIGHTNESS_MIN_LEVEL:
- set_brightness_min_level (button, g_value_get_int(value));
+ set_brightness_min_level (button, g_value_get_int (value));
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
@@ -763,10 +762,10 @@ power_manager_button_get_property(GObject *object,
switch(property_id)
{
case PROP_BRIGHTNESS_MIN_LEVEL:
- g_value_set_int(value, button->priv->brightness_min_level);
+ g_value_set_int (value, button->priv->brightness_min_level);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
@@ -786,23 +785,23 @@ power_manager_button_class_init (PowerManagerButtonClass *klass)
g_type_class_add_private (klass, sizeof (PowerManagerButtonPrivate));
- __signals[SIG_TOOLTIP_CHANGED] = g_signal_new("tooltip-changed",
- POWER_MANAGER_TYPE_BUTTON,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(PowerManagerButtonClass,
- tooltip_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-
- __signals[SIG_ICON_NAME_CHANGED] = g_signal_new("icon-name-changed",
- POWER_MANAGER_TYPE_BUTTON,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(PowerManagerButtonClass,
- icon_name_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ __signals[SIG_TOOLTIP_CHANGED] = g_signal_new ("tooltip-changed",
+ POWER_MANAGER_TYPE_BUTTON,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(PowerManagerButtonClass,
+ tooltip_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+ __signals[SIG_ICON_NAME_CHANGED] = g_signal_new ("icon-name-changed",
+ POWER_MANAGER_TYPE_BUTTON,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(PowerManagerButtonClass,
+ icon_name_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
#define XFPM_PARAM_FLAGS (G_PARAM_READWRITE \
| G_PARAM_CONSTRUCT \
@@ -919,9 +918,9 @@ power_manager_button_new (void)
button->priv->plugin = XFCE_PANEL_PLUGIN (g_object_ref (plugin));
#endif
- xfconf_g_property_bind(button->priv->channel,
- PROPERTIES_PREFIX BRIGHTNESS_SLIDER_MIN_LEVEL, G_TYPE_INT,
- G_OBJECT(button), BRIGHTNESS_SLIDER_MIN_LEVEL);
+ xfconf_g_property_bind (button->priv->channel,
+ PROPERTIES_PREFIX BRIGHTNESS_SLIDER_MIN_LEVEL, G_TYPE_INT,
+ G_OBJECT (button), BRIGHTNESS_SLIDER_MIN_LEVEL);
return GTK_WIDGET (button);
}
@@ -942,7 +941,7 @@ power_manager_button_set_icon (PowerManagerButton *button)
button->priv->panel_icon_width, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
pixbuf = gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL);
- if ( pixbuf )
+ if (pixbuf)
{
gtk_image_set_from_pixbuf (GTK_IMAGE (button->priv->panel_icon_image), pixbuf);
/* Notify others the icon name changed */
@@ -982,7 +981,7 @@ power_manager_button_press_event (GtkWidget *widget, GdkEventButton *event)
{
PowerManagerButton *button = POWER_MANAGER_BUTTON (widget);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
power_manager_button_show_menu (button);
return TRUE;
}
@@ -1158,7 +1157,7 @@ power_manager_button_menu_add_device (PowerManagerButton *button, BatteryDevice
/* We need a menu to attach it to */
g_return_val_if_fail (button->priv->menu, FALSE);
- if (UP_IS_DEVICE(battery_device->device))
+ if (UP_IS_DEVICE (battery_device->device))
{
g_object_get (battery_device->device,
"kind", &type,
@@ -1188,7 +1187,7 @@ power_manager_button_menu_add_device (PowerManagerButton *button, BatteryDevice
/* keep track of the menu item in the battery_device so we can update it */
battery_device->menu_item = mi;
- g_signal_connect(G_OBJECT(mi), "destroy", G_CALLBACK(menu_item_destroyed_cb), button);
+ g_signal_connect(G_OBJECT (mi), "destroy", G_CALLBACK (menu_item_destroyed_cb), button);
battery_device->expose_signal_id = g_signal_connect_after (G_OBJECT (battery_device->img),
"draw",
G_CALLBACK (power_manager_button_device_icon_expose),
@@ -1198,11 +1197,11 @@ power_manager_button_menu_add_device (PowerManagerButton *button, BatteryDevice
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menu_item_activate_cb), button);
/* Add it to the menu */
- gtk_widget_show_all(mi);
+ gtk_widget_show_all (mi);
if (append)
- gtk_menu_shell_append(GTK_MENU_SHELL(button->priv->menu), mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL(button->priv->menu), mi);
else
- gtk_menu_shell_prepend(GTK_MENU_SHELL(button->priv->menu), mi);
+ gtk_menu_shell_prepend (GTK_MENU_SHELL(button->priv->menu), mi);
return TRUE;
}
@@ -1234,13 +1233,13 @@ increase_brightness (PowerManagerButton *button)
TRACE("entering");
- if ( !xfpm_brightness_has_hw (button->priv->brightness) )
+ if (!xfpm_brightness_has_hw (button->priv->brightness))
return;
max_level = xfpm_brightness_get_max_level (button->priv->brightness);
xfpm_brightness_get_level (button->priv->brightness, &level);
- if ( level < max_level )
+ if (level < max_level)
{
xfpm_brightness_up (button->priv->brightness, &level);
if (button->priv->range)
@@ -1282,8 +1281,8 @@ range_value_changed_cb (PowerManagerButton *button, GtkWidget *widget)
return;
button->priv->set_level_timeout =
- g_timeout_add(SET_LEVEL_TIMEOUT,
- (GSourceFunc) brightness_set_level_with_timeout, button);
+ g_timeout_add (SET_LEVEL_TIMEOUT,
+ (GSourceFunc) brightness_set_level_with_timeout, button);
}
static void
@@ -1304,13 +1303,13 @@ range_scroll_cb (GtkWidget *widget, GdkEvent *event, PowerManagerButton *button)
static void
range_show_cb (GtkWidget *widget, PowerManagerButton *button)
{
- GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_display_get_default());
+ GdkDeviceManager* manager = gdk_display_get_device_manager (gdk_display_get_default());
GdkDevice* pointer = gdk_device_manager_get_client_pointer (manager);
TRACE("entering");
/* Release these grabs as they will cause a lockup if pkexec is called
* for the brightness helper */
if (pointer)
- gdk_device_ungrab(pointer, GDK_CURRENT_TIME);
+ gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
gtk_grab_remove (widget);
}
@@ -1328,7 +1327,7 @@ power_manager_button_show_menu (PowerManagerButton *button)
g_return_if_fail (POWER_MANAGER_IS_BUTTON (button));
- if(gtk_widget_has_screen(GTK_WIDGET(button)))
+ if (gtk_widget_has_screen (GTK_WIDGET (button)))
gscreen = gtk_widget_get_screen(GTK_WIDGET(button));
else
gscreen = gdk_display_get_default_screen(gdk_display_get_default());
@@ -1353,9 +1352,9 @@ power_manager_button_show_menu (PowerManagerButton *button)
if (show_separator_flag)
{
/* separator */
- mi = gtk_separator_menu_item_new();
- gtk_widget_show(mi);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+ mi = gtk_separator_menu_item_new ();
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
}
/* Display brightness slider - show if there's hardware support for it */
@@ -1363,6 +1362,8 @@ power_manager_button_show_menu (PowerManagerButton *button)
{
GdkPixbuf *pix;
GtkWidget *box;
+ GtkStyleContext *context;
+ GtkIconInfo *info;
max_level = xfpm_brightness_get_max_level (button->priv->brightness);
@@ -1382,11 +1383,10 @@ power_manager_button_show_menu (PowerManagerButton *button)
g_signal_connect (menu, "show", G_CALLBACK (range_show_cb), button);
/* load and display the brightness icon */
- pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- XFPM_DISPLAY_BRIGHTNESS_ICON,
- 32,
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
- NULL);
+ context = GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (menu)));
+ info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), XFPM_DISPLAY_BRIGHTNESS_ICON,
+ 32, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+ pix = gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL);
if (pix)
{
/* Pack the image into the box inside the GtkMenuItem. */
@@ -1410,9 +1410,9 @@ power_manager_button_show_menu (PowerManagerButton *button)
/* Power manager settings */
mi = gtk_menu_item_new_with_mnemonic (_("_Power manager settings..."));
- gtk_widget_show(mi);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
- g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(xfpm_preferences), NULL);
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), mi);
+ g_signal_connect (G_OBJECT(mi), "activate", G_CALLBACK(xfpm_preferences), NULL);
gtk_menu_popup (GTK_MENU (menu),
NULL,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list