[Goodies-commits] r7519 - in xfce4-power-manager/trunk: . doc/C src
Ali Abdallah
aliov at xfce.org
Tue Jun 9 23:04:48 CEST 2009
Author: aliov
Date: 2009-06-09 21:04:48 +0000 (Tue, 09 Jun 2009)
New Revision: 7519
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/configure.ac.in
xfce4-power-manager/trunk/doc/C/xfce4-power-manager.html
xfce4-power-manager/trunk/doc/C/xfce4-power-manager.xml.in
xfce4-power-manager/trunk/src/xfpm-button-hal.c
Log:
*: Updating documentation
*: Don't accept any event for non mapped buttons
*: 0.8.0 release.
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-06-09 20:43:09 UTC (rev 7518)
+++ xfce4-power-manager/trunk/ChangeLog 2009-06-09 21:04:48 UTC (rev 7519)
@@ -1,3 +1,8 @@
+2009-06-09: 11:00 Ali aliov at xfce.org
+ *: Updating documentation
+ *: Don't accept any event for non mapped buttons
+ *: 0.8.0 release.
+
2009-06-04: 15:00 Ali aliov at xfce.org
*: Use the channel in the private data.
*: Don't show popup message if xfmp is already running and
Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in 2009-06-09 20:43:09 UTC (rev 7518)
+++ xfce4-power-manager/trunk/configure.ac.in 2009-06-09 21:04:48 UTC (rev 7519)
@@ -3,7 +3,7 @@
m4_define([xfpm_version_minor], [8])
m4_define([xfpm_version_micro], [0])
m4_define([xfpm_version_build], [])
-m4_define([xfpm_version_tag],[r at REVISION@])
+m4_define([xfpm_version_tag],[])
m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [svn], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
Modified: xfce4-power-manager/trunk/doc/C/xfce4-power-manager.html
===================================================================
--- xfce4-power-manager/trunk/doc/C/xfce4-power-manager.html 2009-06-09 20:43:09 UTC (rev 7518)
+++ xfce4-power-manager/trunk/doc/C/xfce4-power-manager.html 2009-06-09 21:04:48 UTC (rev 7519)
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Xfce 4 Power Manager</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.2"><link rel="start" href="#xfce4-power-manager" title="Xfce 4 Power Manager"><link rel="next" href="#xfpm-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="xfce4-power-manager"></a>Xfce 4 Power Manager</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Ali</span> <span class="surname">Abdallah</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:aliov at xfce.org">aliov at xfce.org</a>></code></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/trans
itional" class="releaseinfo">This manual describes <strong xmlns="" class="application"><code>xfce4-power-manager</code></strong> version 0.8.0r07445
-<br></br></span></div><div><p class="copyright">Copyright © 2008 Ali Abdallah</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#xfpm-intro">Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-started">Getting Started</a></span></dt><dt><span class="sect2"><a href="#xfmp-usage">Usage</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm">Power Manager</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-command-line">Command line options</a></span></dt><dt><span class="sect2"><a href="#xfpm-menu">Context menu</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm-configuration">Power Manager Configuration</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-general">General options</a></span></dt><dt><span class="sect2"><a href="#xfpm-on-ac">Running on AC power</a></span></dt><dt><span class="sect2"><a href="#xfpm-on-battery">Running on battery power</a></
span></dt><dt><span class="sect2"><a href="#xfpm-extended">Extended options</a></span></dt><dt><span class="sect2"><a href="#xfpm-hidden-options">Hidden options</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm-plugins"> Panel plugins </a></span></dt><dt><span class="sect1"><a href="#xfpm-faq">FAQ</a></span></dt><dt><span class="sect1"><a href="#xfpm-technical">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Xfce 4 Power Manager</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.2"><link rel="start" href="#xfce4-power-manager" title="Xfce 4 Power Manager"><link rel="next" href="#xfpm-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="xfce4-power-manager"></a>Xfce 4 Power Manager</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Ali</span> <span class="surname">Abdallah</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:aliov at xfce.org">aliov at xfce.org</a>></code></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/trans
itional" class="releaseinfo">This manual describes <strong xmlns="" class="application"><code>xfce4-power-manager</code></strong> version 0.8.0
+<br></br></span></div><div><p class="copyright">Copyright © 2008 Ali Abdallah</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#xfpm-intro">Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-started">Getting Started</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm">Power Manager</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-command-line">Command line options</a></span></dt><dt><span class="sect2"><a href="#xfpm-menu">Context menu</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm-configuration">Power Manager Configuration</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-general">General options</a></span></dt><dt><span class="sect2"><a href="#xfpm-on-ac">Running on AC power</a></span></dt><dt><span class="sect2"><a href="#xfpm-on-battery">Running on battery power</a></span></dt><dt><span class="sect2"><a href="#xfpm-extended">Extended
options</a></span></dt><dt><span class="sect2"><a href="#xfpm-hidden-options">Hidden options</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm-plugins"> Panel plugins </a></span></dt><dt><span class="sect1"><a href="#xfpm-faq">FAQ</a></span></dt><dt><span class="sect1"><a href="#xfpm-technical">
Technical information
</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfpm-dbus">DBus interfaces</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfpm-about">About <strong class="application"><code>xfce4-power-manager</code></strong></a></span></dt></dl></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-intro"></a>Introduction</h2></div></div></div>
This software is a power manager for the Xfce desktop, Xfce power manager manages the power sources on the computer and the devices that can
@@ -8,130 +8,125 @@
they can adjust their power consumption, and it provides the inhibit interface which allows applications to prevent automatic sleep actions via the power manager;
as an example, the operating system’s package manager should make use of this interface while it is performing update operations.
- <div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-started"></a>Getting Started</h3></div></div></div><p>If your distribution doesn't come with a default installation of <strong class="application"><code>xfce4-power-manager</code></strong> usually when you install it, it will be started next time you log into your Xfce desktop,
- in order to start it manually you just need to run the following command <strong class="application"><code>xfce4-power-manager</code></strong> from your terminal emulator, please not that running this <strong class="application"><code>xfce4-power-manager</code></strong> command
- will cause the power manager to run in daemon mode, you can optionally add --no-daemon as a command line argument to disable this behaviour,
- this can be useful if you want to see debugging outputs from your terminal emulator.
- </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfmp-usage"></a>Usage</h3></div></div></div><p>
- The main idea behind a power manager is to control the power sources on mobile computers, such as laptops, on desktops or servers a power manager is basically less useful.
- </p></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm"></a>Power Manager</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-command-line"></a>Command line options</h3></div></div></div><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>--no-daemon</strong></span></span></dt><dd><p>
+ <div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-started"></a>Getting Started</h3></div></div></div><p>If your distribution doesn't come with a default installation of <strong class="application"><code>xfce4-power-manager</code></strong> usually when you install it, it will be started next time you log into your Xfce desktop.
+ In order to start it manually you just need to run the following command <strong class="application"><code>xfce4-power-manager</code></strong> from your terminal emulator. Please note that running this <strong class="application"><code>xfce4-power-manager</code></strong> command
+ will cause the power manager to run in daemon mode. You can optionally add --no-daemon as a command line argument to disable this behaviour,
+ This can be useful if you want to see debugging outputs from your terminal emulator.
+ </p></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm"></a>Power Manager</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-command-line"></a>Command line options</h3></div></div></div><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>--no-daemon</strong></span></span></dt><dd><p>
Starts the power manager in non-daemon mode: useful for debugging.
</p></dd><dt><span class="term"><span class="keycap"><strong>--restart</strong></span></span></dt><dd><p>
- Causes the running power manager to restart.
+ Restarts the power manager.
</p></dd><dt><span class="term"><span class="keycap"><strong>--quit</strong></span></span></dt><dd><p>
Causes any running instance of the power manager to exit.
- </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-menu"></a>Context menu</h3></div></div></div><div class="figure"><a name="id2866779"></a><p class="title"><b>Figure 1. Context menu</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-context-menu.png" alt="Context menu"></div></div></div></div><p><br class="figure-break"></p><p>
-The context menu is popped up when you click on the icon placed in your notification area, say a battery or an adapter icon, it contains some useful options like suspend/hibernate,
-display information of the battery device open the settings dialog, it contains as well option to inhibit the power manager, if enabled, the power manager will not attempt
+ </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-menu"></a>Context menu</h3></div></div></div><div class="figure"><a name="id2924856"></a><p class="title"><b>Figure 1. Context menu</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-context-menu.png" alt="Context menu"></div></div></div></div><p><br class="figure-break"></p><p>
+The context menu pops up when you click on the icon placed in your notification area for example a battery or an adapter icon. It contains some useful options like suspend/hibernate,
+display information of the battery device and open the settings dialog. It contains as well option to inhibit the power manager. If enabled, the power manager will not attempt
to dim the screen or switch off the monitor.
</p><div class="note" style="text-align: left;"><h3 class="title">Note</h3><p>If the inhibit option is selected and the computer is in idle for a long time the power manager will not put the system in suspend or hibernate, even
-if it is enabled in the settings dialog, only critical actions are processed.</p></div><p>
+if it is enabled in the settings dialog. Only critical actions are processed.</p></div><p>
</p></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-configuration"></a>Power Manager Configuration</h2></div></div></div><p>
- In this section we will explain in details the possible configuration of the power manager running on laptop computer, please note that the configurations are different when
- the power manager is running on a desktop computer, for example you will not have LCD brightness or so.
- </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-general"></a>General options</h3></div></div></div><div class="figure"><a name="id2871710"></a><p class="title"><b>Figure 2. General settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-general-settings.png" alt="General settings"></div></div></div></div><p><br class="figure-break"></p><p>
+ In this section we will explain in details the possible configuration of the power manager running on laptop computer. Please note that the configurations are different when
+ the power manager is running on a desktop computer, for example you will not have LCD brightness etc.
+ </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-general"></a>General options</h3></div></div></div><div class="figure"><a name="id2929788"></a><p class="title"><b>Figure 2. General settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-general-settings.png" alt="General settings"></div></div></div></div><p><br class="figure-break"></p><p>
-</p><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>Notification area:</strong></span></span></dt><dd><p>The notification area settings allows you to control the behaviour of the icon placed in your notification are, you can set it to be always visible, for battery devices
+</p><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>Notification area:</strong></span></span></dt><dd><p>The notification area settings allow you to control the behaviour of the icon placed in your notification area. You can set it to be always visible. For battery devices,
you can select the icon to be visible only when your are running on battery for example.</p></dd><dt><span class="term"><span class="keycap"><strong>Keyboard special keys:</strong></span></span></dt><dd><p>
- Enables you to specify which key will trigger which action, these keys are not found on all the systems, in the screen shot for example the hibernate key is missing,
+ Enable you to specify which key will trigger which action. These keys are not found on all the systems. For example, in the screen shot the hibernate key is missing
since the screen shot was taken on a computer which doesn't have this key.
The default action of all these keys is set to do nothing.
- </p></dd><dt><span class="term"><span class="keycap"><strong>Monitor power management control:</strong></span></span></dt><dd><p>Enable/Disable Display Power Management Signaling (DPMS).</p></dd><dt><span class="term"><span class="keycap"><strong>Power manager Notification:</strong></span></span></dt><dd><p>If the notification of a battery status change are annoying you, you can always disable them by unselecting the checkbox, please note this
- doesn't apply on the notification that the power manager sends to notify the user of error or when the system is running out of power,
- so it is safe to disable them.</p></dd></dl></div><p>
+ </p></dd><dt><span class="term"><span class="keycap"><strong>Monitor power management control:</strong></span></span></dt><dd><p>Enable/Disable the Display Power Management Signaling (DPMS).</p></dd><dt><span class="term"><span class="keycap"><strong>Power manager Notification:</strong></span></span></dt><dd><p>If the notification of a battery status change are annoying you, you can always disable them by unselecting the checkbox. Please note this
+ doesn't apply on the notification that the power manager sends notifying the user of errors or that the system is running out of power.
+ </p></dd></dl></div><p>
</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-on-ac"></a>Running on AC power</h3></div></div></div><p>
- The on AC power tab contains self explanatory options such as lid close system idle and monitor sleep configurations.
+ The on AC power tab contains self explanatory options such as lid close, system idle and monitor sleep configurations.
</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-on-battery"></a>Running on battery power</h3></div></div></div><p>
-The on battery tab is only shown on systems that have battery devices, it contains the same options as the AC power tabs plus two other important options
+The on battery tab is only shown on systems that have battery devices. It contains the same options as the AC power tabs plus two other important options:
</p><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>Power is critical</strong></span></span></dt><dd><p>
- With this option you can specify the action taken by the power manager in case the system is running on low power, if this option is disabled and the computer
+ With this option you can specify the action taken by the power manager in case the system is running on low power. If this option is disabled and the computer
is running on low battery power, the power manager will display a warning message.
</p></dd><dt><span class="term"><span class="keycap"><strong>Prefer power savings over performance:</strong></span></span></dt><dd><p>
- This is the power profile when running on battery, with this option you battery will last more when running on battery power,
- having this option enabled is always a good idea.
+ This is the power profile when running on battery. With this option your battery will last more when running on battery power.
+ Enabling this option is always a good idea.
</p></dd></dl></div><p>
-</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-extended"></a>Extended options</h3></div></div></div><div class="figure"><a name="id2867074"></a><p class="title"><b>Figure 3. Extended settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-extended-settings.png" alt="Extended settings"></div></div></div></div><p><br class="figure-break"></p><p>
-</p><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>Inactivity sleep mode:</strong></span></span></dt><dd><p>You can select the inactivity sleep action to be taken by the power manger when the system is idle for a interval of time specified by you,
- either on ac power or on battery power, expired. Of course if you disable idle timeout those settings will have no effects.</p></dd><dt><span class="term"><span class="keycap"><strong>Monitor sleep mode:</strong></span></span></dt><dd><p>
- DPMS sleep modes before switching off the monitor, standby and suspend, they are technically different, this option is provided for convenience.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-extended"></a>Extended options</h3></div></div></div><div class="figure"><a name="id2925152"></a><p class="title"><b>Figure 3. Extended settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-extended-settings.png" alt="Extended settings"></div></div></div></div><p><br class="figure-break"></p><p>
+</p><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term"><span class="keycap"><strong>Inactivity sleep mode:</strong></span></span></dt><dd><p>You can select the inactivity sleep action to be taken by the power manger when the system is idle for a interval of time set by you
+ either on ac power or on battery power. Of course if you disable idle timeout those settings will have no effects.</p></dd><dt><span class="term"><span class="keycap"><strong>Monitor sleep mode:</strong></span></span></dt><dd><p>
+ DPMS sleep modes before switching off the monitor are either standby or suspend. They are technically different and provided for convenience.
</p></dd><dt><span class="term"><span class="keycap"><strong>Computer on low power level:</strong></span></span></dt><dd><p>
- Ideally when the battery giving the main power to the computer reaches 10 percent of charge the computer can be considered on low power, but for some broken or old
- batteries between 10 percent and a power cut there is a matter of minutes if not seconds, so you can adjust the level at which your computer will be considered on low power.
+ Ideally when the battery giving the main power to the computer reaches 10 percent of charge, the computer can be considered on low power. However, for some broken or old
+ batteries the interval of time between 10 percent and a power cut is a matter of minutes if not seconds. You can adjust the level at which your computer will be considered on low power.
</p><div class="note" style="text-align: left;"><h3 class="title">Note</h3><p>This option might disappear in future releases.</p></div><p>
</p></dd><dt><span class="term"><span class="keycap"><strong>CPU Frequency control:</strong></span></span></dt><dd><p>
- Unselecting this checkbox you tell the power manager to don't attempt to play with the CPU frequency.
+ Unselecting this checkbox, the power manager don't attempt to play with the CPU frequency.
</p></dd><dt><span class="term"><span class="keycap"><strong>Lock screen when going for suspend/hibernate:</strong></span></span></dt><dd><p>
- Just tell your power manager if it should lock the screen before suspending the computer, it is enabled by default.
+ Just tell your power manager if it should lock the screen before suspending or hibernating the computer. It is enabled by default.
</p></dd></dl></div><p>
</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-hidden-options"></a>Hidden options</h3></div></div></div><p>
-Hidden options are the options that in normal situations one should not play with, but these options are provided in case of misbehaviour of the backend
-the power manager is relying on.
+Hidden options are the options that in normal situations one should not be changed, but these options are provided in case of misbehaviour of the backend
+that the power manager is relying on.
</p><p>
-Since <strong class="application"><code>xfce4-power-manager</code></strong> relies on xfconf to store and retreive configuration you can change any settings by using xfconf-query or by using your Xfce settings editor.
+Since <strong class="application"><code>xfce4-power-manager</code></strong> relies on xfconf to store and retreive configurations, you can change any settings by using xfconf-query or by using your Xfce settings editor.
</p><div class="variablelist"><p class="title"><b></b></p><dl><dt><span class="term">LCD Brightness</span></dt><dd><p>
- The <strong class="application"><code>xfce4-power-manager</code></strong> detects brightness key events and interact with the backend to update the brightness level, this might be problematic on some systems, for this the key
- "/xfce4-power-manager/change-brightness-on-key-events" is provided, just set this key to false if you have any problem related to this, please refer
+ The <strong class="application"><code>xfce4-power-manager</code></strong> detects brightness key events and interacts with the backend to update the brightness level. This might be problematic on some systems therefore the key
+ "/xfce4-power-manager/change-brightness-on-key-events" is provided. Just set this key to false if you have any such problem. Please refer
to the xfconf-query manual, but as an example you can disable this property by running the following command.
</p><pre class="programlisting">xfconf-query -c <strong class="application"><code>xfce4-power-manager</code></strong> -n -p "/<strong class="application"><code>xfce4-power-manager</code></strong>/change-brightness-on-key-events" -t bool -s false</pre><p>
</p></dd><dt><span class="term">Disabling Brightness popup</span></dt><dd><p>
- If you want, for some reason, to disable the brightness popup indicator (the one which popup to disblay the brightness level), just run the following command
+ If you want for some reason to disable the brightness popup indicator (the one which popup to display the brightness level), just run the following command
in your terminal.
</p><pre class="programlisting">xfconf-query -c <strong class="application"><code>xfce4-power-manager</code></strong> -n -p "/<strong class="application"><code>xfce4-power-manager</code></strong>/show-brightness-popup" -t bool -s false</pre><p>
- </p></dd></dl></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-plugins"></a> Panel plugins </h2></div></div></div><div class="figure"><a name="id2871283"></a><p class="title"><b>Figure 4. Brightness plugin</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-brightness-plugin.png" alt="Brightness plugin"></div></div></div></div><p><br class="figure-break"></p><p>
-<strong class="application"><code>xfce4-power-manager</code></strong> version 0.8.0r07445 includes one panel plugin for LCD brightness control, possible other plugins might be added for future releases, the usage of the brightness plugin
-is simple, just add the plugin to the panel same way you add any other plugin, then click on the plugin it will pop up a slider that you move/scroll on it to change
-the brightness level of your screen, of course the plugin will not work on a system with no back light panel.
-</p></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-faq"></a>FAQ</h2></div></div></div><div class="variablelist"><dl><dt><span class="term">Q: Why the icons look very similar to the icon of gnome power manager?</span></dt><dd><p>A: No, they are not similar, they are the same, just there is no point of re-drawing icons,
- gnome power manager icons are good enough. Not all the gnome power manager icons are used. please note that
- for version 0.8.0r07445 the icons are renamed to avoid possible conflicts with a gnome power manager installation.
+ </p></dd></dl></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-plugins"></a> Panel plugins </h2></div></div></div><div class="figure"><a name="id2929360"></a><p class="title"><b>Figure 4. Brightness plugin</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/xfpm-brightness-plugin.png" alt="Brightness plugin"></div></div></div></div><p><br class="figure-break"></p><p>
+<strong class="application"><code>xfce4-power-manager</code></strong> version 0.8.0 includes one panel plugin for LCD brightness control (possible other plugins might be added for future releases). The usage of the brightness plugin
+is simple; just add the plugin to the panel same way as the one used to add any other plugin; then click on the plugin; a slider will pop up that you move/scroll on it to change
+the brightness level of your screen. Of course the plugin will not work on a system with no back light panel.
+</p></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-faq"></a>FAQ</h2></div></div></div><div class="variablelist"><dl><dt><span class="term">Q: Why the icons look very similar to the icon of gnome power manager?</span></dt><dd><p>A: No, they are not similar; they are the same. Just there is no point of re-drawing icons.
+ gnome power manager icons are good enough. Not all the gnome power manager icons are used. Please note that
+ for version 0.8.0 the icons are renamed to avoid possible conflicts with a gnome power manager installation.
</p></dd><dt><span class="term">Q: What is the difference between suspend and hibernate?</span></dt><dd><p>A: Suspend is a power save feature. When suspending, the computer is still using power,
since the running applications are kept in the memory, but it is the lowest power level that the computer
can use. While Hibernate saves the system state on the hard drive and turns off the power, when you start up your
computer again those data will be loaded and the system back up.
</p></dd><dt><span class="term">Q: Why the options of suspend/hibernate are not there or I can not select them?</span></dt><dd><p>A: Many possible reasons, for example your kernel is not compiled with suspend/hibernate options.
- Another possible reason is the fact that you are not allowed to use them.
- </p></dd><dt><span class="term">Q: I had put my computer into suspend or hibernate mode, but the computer is not waking up.</span></dt><dd><p>A: This was subject for many bug reports, please note that the power manager has nothing to do with these problems, since the kernel
- is responsible of these tasks, the kernel team are puting a lot of efforts into fixing these kind of problems, if you still have troubles please
+ Another possible reason is the fact that you don't have engough premission to use them.
+ </p></dd><dt><span class="term">Q: I had put my computer into suspend or hibernate mode, but the computer is not waking up?</span></dt><dd><p>A: This was subject for many bug reports, please note that the power manager has nothing to do with these problems, since the kernel
+ is responsible of these tasks. The kernel team are puting a lot of efforts into fixing these kind of problems, if you still have troubles please
report a bug to your distribution provider, they can contact the kernel team and possibly they can provide you a work-around.
- </p></dd><dt><span class="term">Q: If the power manager puts the computer in hibernate because my battery charge is critical what will happen
- if I turn it on again without plugging my adapter?</span></dt><dd><p>A: Nothing actually, the power manager had taken the action defined by the user already.
- In the best cases, it will display a warning pop up with different options.
- </p></dd><dt><span class="term">Q: I'm not able to control my laptop brightness and/or my brightness pluing is reporting no device found.</span></dt><dd><p>A: One possible reason is the fact that the correct kernel driver is missing or doesn't exist for your laptop brightness panel, you can debug this fact by running this
+ </p></dd><dt><span class="term">Q: I'm not able to control my laptop brightness and/or my brightness plug in is reporting no device found?</span></dt><dd><p>A: One possible reason is the fact that the correct kernel driver is missing or doesn't exist for your laptop brightness panel, you can debug this fact by running this
command:
</p><pre class="programlisting">lshal > output.txt</pre><p>
then search in output.txt for "laptop_panel", if you don't find this key this means a driver problem, but in the other hand if you find it then come to us complaining.
</p></dd></dl></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-technical"></a>
Technical information
</h2></div></div></div><p>
-Ideally these details should go in a technical guide not the user guide but we need someplace to keep these informations, please
+Ideally these details should go in a technical guide not the user guide, but we need someplace to keep this information, please
ignore if these is not what you are looking for.
</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-dbus"></a>DBus interfaces</h3></div></div></div><p>
in this section the DBus interfaces provided by <strong class="application"><code>xfce4-power-manager</code></strong> are expanded, those interfaces listed here are freedesktop compliant power
- management interfaces, this section might be useful if you are developing an application and wishing to use these interfaces, or they
+ management interfaces. This section might be useful if you are developing an application and wishing to use these interfaces, or they
can be useful for debugging purpose.
</p><span class="keycap"><strong>Power management DBus interface.</strong></span><p>
-</p><div class="table"><a name="id2914645"></a><p class="title"><b>Table 1. Standard methods (org.freedesktop.PowerManagement):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard methods (org.freedesktop.PowerManagement):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns=""><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Input parameter</th><th align="left">Return Values</th><th align="left">Errors</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">CanHibernate</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is able to hibernate</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">CanSuspend</th><th align="left">
</th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is able to suspend</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetOnBattery</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is running on battery</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetLowBattery</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is running on low battery</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Hibernate</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Suspend</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead><thead xmlns=""><tr><th colspan=
"2" align="center">Shutdown</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead></table></div></div><p><br class="table-break">
+</p><div class="table"><a name="id2929581"></a><p class="title"><b>Table 1. Standard methods (org.freedesktop.PowerManagement):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard methods (org.freedesktop.PowerManagement):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns=""><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Input parameter</th><th align="left">Return Values</th><th align="left">Errors</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">CanHibernate</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is able to hibernate</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">CanSuspend</th><th align="left">
</th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is able to suspend</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetOnBattery</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is running on battery</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetLowBattery</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">whether the system is running on low battery</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Hibernate</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Suspend</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead><thead xmlns=""><tr><th colspan=
"2" align="center">Shutdown</th><th align="left"> </th><th align="left"> </th><th align="left">PermissionDenied, NotSupported</th><th align="left"> </th></tr></thead></table></div></div><p><br class="table-break">
- </p><div class="table"><a name="id2914898"></a><p class="title"><b>Table 2. Standard signals (org.freedesktop.PowerManagement):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard signals (org.freedesktop.PowerManagement):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Values</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">OnBatteryChanged</th><th align="left">bool</th><th align="left">whether on battery status changed</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">LowBatteryChanged</th><th align="left">bool</th><th align="left">whether on low battery status changed</th></tr></thead></table></div></div><p><br class="table-break">
+ </p><div class="table"><a name="id2972958"></a><p class="title"><b>Table 2. Standard signals (org.freedesktop.PowerManagement):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard signals (org.freedesktop.PowerManagement):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Values</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">OnBatteryChanged</th><th align="left">bool</th><th align="left">whether on battery status changed</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">LowBatteryChanged</th><th align="left">bool</th><th align="left">whether on low battery status changed</th></tr></thead></table></div></div><p><br class="table-break">
</p><span class="keycap"><strong>Power management DBus inhibit interface.</strong></span><p>
-</p><div class="table"><a name="id2915007"></a><p class="title"><b>Table 3. Standard methods (org.freedesktop.PowerManagement.Inhibit):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard methods (org.freedesktop.PowerManagement.Inhibit):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns=""><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Input parameter</th><th align="left">Return Values</th><th align="left">Errors</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Inhibit</th><th align="left">string application name, string reason</th><th align="left">uint32 (random cookie)</th><th align="left"> </th><th align="left">Inhibit the power manager.</th></tr></thead><thead xmlns=""><tr><th colspan
="2" align="center">UnInhibit</th><th align="left">uint32 cookie</th><th align="left"> </th><th align="left">InvalidCookie</th><th align="left">Unihibit the power manager.</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">HasInhibit</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">Whether the power manager is currently inhibited or not.</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetInhibitors</th><th align="left"> </th><th align="left">Array of strings</th><th align="left"> </th><th align="left">List all the applications currently inhibiting the power manager (Not standard, use just for debugging)</th></tr></thead></table></div></div><p><br class="table-break">
+</p><div class="table"><a name="id2973067"></a><p class="title"><b>Table 3. Standard methods (org.freedesktop.PowerManagement.Inhibit):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard methods (org.freedesktop.PowerManagement.Inhibit):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns=""><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Input parameter</th><th align="left">Return Values</th><th align="left">Errors</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">Inhibit</th><th align="left">string application name, string reason</th><th align="left">uint32 (random cookie)</th><th align="left"> </th><th align="left">Inhibit the power manager.</th></tr></thead><thead xmlns=""><tr><th colspan
="2" align="center">UnInhibit</th><th align="left">uint32 cookie</th><th align="left"> </th><th align="left">InvalidCookie</th><th align="left">Unihibit the power manager.</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">HasInhibit</th><th align="left"> </th><th align="left">bool</th><th align="left"> </th><th align="left">Whether the power manager is currently inhibited or not.</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">GetInhibitors</th><th align="left"> </th><th align="left">Array of strings</th><th align="left"> </th><th align="left">List all the applications currently inhibiting the power manager (Not standard, use just for debugging)</th></tr></thead></table></div></div><p><br class="table-break">
- </p><div class="table"><a name="id2915186"></a><p class="title"><b>Table 4. Standard signals (org.freedesktop.PowerManagement.Inhibit):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard signals (org.freedesktop.PowerManagement.Inhibit):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Values</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">HasInhibitChanged</th><th align="left">bool</th><th align="left">whether the inhibit status changed.</th></tr></thead></table></div></div><p><br class="table-break">
+ </p><div class="table"><a name="id2973246"></a><p class="title"><b>Table 4. Standard signals (org.freedesktop.PowerManagement.Inhibit):</b></p><div class="table-contents"><table xmlns="http://www.w3.org/TR/xhtml1/transitional" bgcolor="#F8F9FD" cellspacing="0" cellpadding="4" summary="Standard signals (org.freedesktop.PowerManagement.Inhibit):" border="1"><colgroup><col xmlns="" align="left"><col xmlns="" align="left"><col xmlns="" align="left"></colgroup><thead xmlns=""><tr><th colspan="2" align="center">Name</th><th align="left">Values</th><th align="left">Description</th></tr></thead><thead xmlns=""><tr><th colspan="2" align="center">HasInhibitChanged</th><th align="left">bool</th><th align="left">whether the inhibit status changed.</th></tr></thead></table></div></div><p><br class="table-break">
</p><p>
In addition, <strong class="application"><code>xfce4-power-manager</code></strong> has other interfaces, but those interfaces are mainly used internally, for example the settings application uses such interface to
Modified: xfce4-power-manager/trunk/doc/C/xfce4-power-manager.xml.in
===================================================================
--- xfce4-power-manager/trunk/doc/C/xfce4-power-manager.xml.in 2009-06-09 20:43:09 UTC (rev 7518)
+++ xfce4-power-manager/trunk/doc/C/xfce4-power-manager.xml.in 2009-06-09 21:04:48 UTC (rev 7519)
@@ -59,21 +59,15 @@
<sect2 id="xfpm-started">
<title>Getting Started</title>
- <para>If your distribution doesn't come with a default installation of &app; usually when you install it, it will be started next time you log into your Xfce desktop,
- in order to start it manually you just need to run the following command &app; from your terminal emulator, please not that running this &app; command
- will cause the power manager to run in daemon mode, you can optionally add --no-daemon as a command line argument to disable this behaviour,
- this can be useful if you want to see debugging outputs from your terminal emulator.
+ <para>If your distribution doesn't come with a default installation of &app; usually when you install it, it will be started next time you log into your Xfce desktop.
+ In order to start it manually you just need to run the following command &app; from your terminal emulator. Please note that running this &app; command
+ will cause the power manager to run in daemon mode. You can optionally add --no-daemon as a command line argument to disable this behaviour,
+ This can be useful if you want to see debugging outputs from your terminal emulator.
</para>
</sect2>
- <sect2 id="xfmp-usage">
- <title>Usage</title>
- <para>
- The main idea behind a power manager is to control the power sources on mobile computers, such as laptops, on desktops or servers a power manager is basically less useful.
- </para>
- </sect2>
-
+
</sect1>
<!-- extra space -->
@@ -98,7 +92,7 @@
<varlistentry><term><keycap>--restart</keycap></term>
<listitem>
<para>
- Causes the running power manager to restart.
+ Restarts the power manager.
</para>
</listitem>
</varlistentry>
@@ -131,12 +125,12 @@
</figure></para>
<para>
-The context menu is popped up when you click on the icon placed in your notification area, say a battery or an adapter icon, it contains some useful options like suspend/hibernate,
-display information of the battery device open the settings dialog, it contains as well option to inhibit the power manager, if enabled, the power manager will not attempt
+The context menu pops up when you click on the icon placed in your notification area for example a battery or an adapter icon. It contains some useful options like suspend/hibernate,
+display information of the battery device and open the settings dialog. It contains as well option to inhibit the power manager. If enabled, the power manager will not attempt
to dim the screen or switch off the monitor.
<note><para>If the inhibit option is selected and the computer is in idle for a long time the power manager will not put the system in suspend or hibernate, even
-if it is enabled in the settings dialog, only critical actions are processed.</para></note>
+if it is enabled in the settings dialog. Only critical actions are processed.</para></note>
</para>
@@ -148,8 +142,8 @@
<sect1 id="xfpm-configuration">
<title>Power Manager Configuration</title>
<para>
- In this section we will explain in details the possible configuration of the power manager running on laptop computer, please note that the configurations are different when
- the power manager is running on a desktop computer, for example you will not have LCD brightness or so.
+ In this section we will explain in details the possible configuration of the power manager running on laptop computer. Please note that the configurations are different when
+ the power manager is running on a desktop computer, for example you will not have LCD brightness etc.
</para>
<sect2 id="xfpm-general">
@@ -174,7 +168,7 @@
<varlistentry>
<term><keycap>Notification area:</keycap></term>
<listitem>
- <para>The notification area settings allows you to control the behaviour of the icon placed in your notification are, you can set it to be always visible, for battery devices
+ <para>The notification area settings allow you to control the behaviour of the icon placed in your notification area. You can set it to be always visible. For battery devices,
you can select the icon to be visible only when your are running on battery for example.</para>
</listitem>
</varlistentry>
@@ -183,7 +177,7 @@
<term><keycap>Keyboard special keys:</keycap></term>
<listitem>
<para>
- Enables you to specify which key will trigger which action, these keys are not found on all the systems, in the screen shot for example the hibernate key is missing,
+ Enable you to specify which key will trigger which action. These keys are not found on all the systems. For example, in the screen shot the hibernate key is missing
since the screen shot was taken on a computer which doesn't have this key.
The default action of all these keys is set to do nothing.
</para>
@@ -193,16 +187,16 @@
<varlistentry>
<term><keycap>Monitor power management control:</keycap></term>
<listitem>
- <para>Enable/Disable Display Power Management Signaling (DPMS).</para>
+ <para>Enable/Disable the Display Power Management Signaling (DPMS).</para>
</listitem>
</varlistentry>
<varlistentry>
<term><keycap>Power manager Notification:</keycap></term>
<listitem>
- <para>If the notification of a battery status change are annoying you, you can always disable them by unselecting the checkbox, please note this
- doesn't apply on the notification that the power manager sends to notify the user of error or when the system is running out of power,
- so it is safe to disable them.</para>
+ <para>If the notification of a battery status change are annoying you, you can always disable them by unselecting the checkbox. Please note this
+ doesn't apply on the notification that the power manager sends notifying the user of errors or that the system is running out of power.
+ </para>
</listitem>
</varlistentry>
@@ -215,7 +209,7 @@
<title>Running on AC power</title>
<para>
- The on AC power tab contains self explanatory options such as lid close system idle and monitor sleep configurations.
+ The on AC power tab contains self explanatory options such as lid close, system idle and monitor sleep configurations.
</para>
</sect2>
@@ -224,14 +218,14 @@
<title>Running on battery power</title>
<para>
-The on battery tab is only shown on systems that have battery devices, it contains the same options as the AC power tabs plus two other important options
+The on battery tab is only shown on systems that have battery devices. It contains the same options as the AC power tabs plus two other important options:
<variablelist><title></title>
<varlistentry><term><keycap>Power is critical</keycap></term>
<listitem>
<para>
- With this option you can specify the action taken by the power manager in case the system is running on low power, if this option is disabled and the computer
+ With this option you can specify the action taken by the power manager in case the system is running on low power. If this option is disabled and the computer
is running on low battery power, the power manager will display a warning message.
</para></listitem>
</varlistentry>
@@ -239,8 +233,8 @@
<varlistentry><term><keycap>Prefer power savings over performance:</keycap></term>
<listitem>
<para>
- This is the power profile when running on battery, with this option you battery will last more when running on battery power,
- having this option enabled is always a good idea.
+ This is the power profile when running on battery. With this option your battery will last more when running on battery power.
+ Enabling this option is always a good idea.
</para></listitem>
</varlistentry>
@@ -270,8 +264,8 @@
<varlistentry>
<term><keycap>Inactivity sleep mode:</keycap></term>
<listitem>
- <para>You can select the inactivity sleep action to be taken by the power manger when the system is idle for a interval of time specified by you,
- either on ac power or on battery power, expired. Of course if you disable idle timeout those settings will have no effects.</para>
+ <para>You can select the inactivity sleep action to be taken by the power manger when the system is idle for a interval of time set by you
+ either on ac power or on battery power. Of course if you disable idle timeout those settings will have no effects.</para>
</listitem>
</varlistentry>
@@ -279,7 +273,7 @@
<term><keycap>Monitor sleep mode:</keycap></term>
<listitem>
<para>
- DPMS sleep modes before switching off the monitor, standby and suspend, they are technically different, this option is provided for convenience.
+ DPMS sleep modes before switching off the monitor are either standby or suspend. They are technically different and provided for convenience.
</para>
</listitem>
</varlistentry>
@@ -288,8 +282,8 @@
<term><keycap>Computer on low power level:</keycap></term>
<listitem>
<para>
- Ideally when the battery giving the main power to the computer reaches 10 percent of charge the computer can be considered on low power, but for some broken or old
- batteries between 10 percent and a power cut there is a matter of minutes if not seconds, so you can adjust the level at which your computer will be considered on low power.
+ Ideally when the battery giving the main power to the computer reaches 10 percent of charge, the computer can be considered on low power. However, for some broken or old
+ batteries the interval of time between 10 percent and a power cut is a matter of minutes if not seconds. You can adjust the level at which your computer will be considered on low power.
<note><para>This option might disappear in future releases.</para></note>
</para>
@@ -300,7 +294,7 @@
<term><keycap>CPU Frequency control:</keycap></term>
<listitem>
<para>
- Unselecting this checkbox you tell the power manager to don't attempt to play with the CPU frequency.
+ Unselecting this checkbox, the power manager don't attempt to play with the CPU frequency.
</para>
</listitem>
</varlistentry>
@@ -309,7 +303,7 @@
<term><keycap>Lock screen when going for suspend/hibernate:</keycap></term>
<listitem>
<para>
- Just tell your power manager if it should lock the screen before suspending the computer, it is enabled by default.
+ Just tell your power manager if it should lock the screen before suspending or hibernating the computer. It is enabled by default.
</para>
</listitem>
</varlistentry>
@@ -325,12 +319,12 @@
<title>Hidden options</title>
<para>
-Hidden options are the options that in normal situations one should not play with, but these options are provided in case of misbehaviour of the backend
-the power manager is relying on.
+Hidden options are the options that in normal situations one should not be changed, but these options are provided in case of misbehaviour of the backend
+that the power manager is relying on.
</para>
<para>
-Since &app; relies on xfconf to store and retreive configuration you can change any settings by using xfconf-query or by using your Xfce settings editor.
+Since &app; relies on xfconf to store and retreive configurations, you can change any settings by using xfconf-query or by using your Xfce settings editor.
</para>
<variablelist><title></title>
@@ -339,8 +333,8 @@
<listitem>
<para>
- The &app; detects brightness key events and interact with the backend to update the brightness level, this might be problematic on some systems, for this the key
- "/xfce4-power-manager/change-brightness-on-key-events" is provided, just set this key to false if you have any problem related to this, please refer
+ The &app; detects brightness key events and interacts with the backend to update the brightness level. This might be problematic on some systems therefore the key
+ "/xfce4-power-manager/change-brightness-on-key-events" is provided. Just set this key to false if you have any such problem. Please refer
to the xfconf-query manual, but as an example you can disable this property by running the following command.
<programlisting>xfconf-query -c &app; -n -p "/&app;/change-brightness-on-key-events" -t bool -s false</programlisting>
@@ -355,7 +349,7 @@
<listitem>
<para>
- If you want, for some reason, to disable the brightness popup indicator (the one which popup to disblay the brightness level), just run the following command
+ If you want for some reason to disable the brightness popup indicator (the one which popup to display the brightness level), just run the following command
in your terminal.
<programlisting>xfconf-query -c &app; -n -p "/&app;/show-brightness-popup" -t bool -s false</programlisting>
@@ -390,9 +384,9 @@
</figure></para>
<para>
-&app; version &appversion; includes one panel plugin for LCD brightness control, possible other plugins might be added for future releases, the usage of the brightness plugin
-is simple, just add the plugin to the panel same way you add any other plugin, then click on the plugin it will pop up a slider that you move/scroll on it to change
-the brightness level of your screen, of course the plugin will not work on a system with no back light panel.
+&app; version &appversion; includes one panel plugin for LCD brightness control (possible other plugins might be added for future releases). The usage of the brightness plugin
+is simple; just add the plugin to the panel same way as the one used to add any other plugin; then click on the plugin; a slider will pop up that you move/scroll on it to change
+the brightness level of your screen. Of course the plugin will not work on a system with no back light panel.
</para>
</sect1>
@@ -407,8 +401,8 @@
<varlistentry>
<term>Q: Why the icons look very similar to the icon of gnome power manager?</term>
<listitem>
- <para>A: No, they are not similar, they are the same, just there is no point of re-drawing icons,
- gnome power manager icons are good enough. Not all the gnome power manager icons are used. please note that
+ <para>A: No, they are not similar; they are the same. Just there is no point of re-drawing icons.
+ gnome power manager icons are good enough. Not all the gnome power manager icons are used. Please note that
for version &appversion; the icons are renamed to avoid possible conflicts with a gnome power manager installation.
</para>
</listitem>
@@ -429,35 +423,25 @@
<term>Q: Why the options of suspend/hibernate are not there or I can not select them?</term>
<listitem>
<para>A: Many possible reasons, for example your kernel is not compiled with suspend/hibernate options.
- Another possible reason is the fact that you are not allowed to use them.
+ Another possible reason is the fact that you don't have engough premission to use them.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>Q: I had put my computer into suspend or hibernate mode, but the computer is not waking up.</term>
+ <term>Q: I had put my computer into suspend or hibernate mode, but the computer is not waking up?</term>
<listitem>
<para>A: This was subject for many bug reports, please note that the power manager has nothing to do with these problems, since the kernel
- is responsible of these tasks, the kernel team are puting a lot of efforts into fixing these kind of problems, if you still have troubles please
+ is responsible of these tasks. The kernel team are puting a lot of efforts into fixing these kind of problems, if you still have troubles please
report a bug to your distribution provider, they can contact the kernel team and possibly they can provide you a work-around.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>Q: If the power manager puts the computer in hibernate because my battery charge is critical what will happen
- if I turn it on again without plugging my adapter?</term>
+ <term>Q: I'm not able to control my laptop brightness and/or my brightness plug in is reporting no device found?</term>
<listitem>
- <para>A: Nothing actually, the power manager had taken the action defined by the user already.
- In the best cases, it will display a warning pop up with different options.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Q: I'm not able to control my laptop brightness and/or my brightness pluing is reporting no device found.</term>
- <listitem>
-
<para>A: One possible reason is the fact that the correct kernel driver is missing or doesn't exist for your laptop brightness panel, you can debug this fact by running this
command:
<programlisting>lshal > output.txt</programlisting>
@@ -479,7 +463,7 @@
</title>
<para>
-Ideally these details should go in a technical guide not the user guide but we need someplace to keep these informations, please
+Ideally these details should go in a technical guide not the user guide, but we need someplace to keep this information, please
ignore if these is not what you are looking for.
</para>
@@ -488,7 +472,7 @@
<para>
in this section the DBus interfaces provided by &app; are expanded, those interfaces listed here are freedesktop compliant power
- management interfaces, this section might be useful if you are developing an application and wishing to use these interfaces, or they
+ management interfaces. This section might be useful if you are developing an application and wishing to use these interfaces, or they
can be useful for debugging purpose.
</para>
Modified: xfce4-power-manager/trunk/src/xfpm-button-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button-hal.c 2009-06-09 20:43:09 UTC (rev 7518)
+++ xfce4-power-manager/trunk/src/xfpm-button-hal.c 2009-06-09 21:04:48 UTC (rev 7519)
@@ -69,18 +69,27 @@
if ( xfpm_strequal (detail, "power") )
{
- TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
- g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_POWER_OFF);
+ if ( bt->priv->mapped_keys & POWER_KEY )
+ {
+ TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
+ g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_POWER_OFF);
+ }
}
- else if ( xfpm_strequal (detail, "sleep") && !(bt->priv->keys & SLEEP_KEY) )
+ else if ( ( xfpm_strequal (detail, "sleep") || xfpm_strequal (detail, "suspend") ) && !(bt->priv->keys & SLEEP_KEY) )
{
- TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
- g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_SLEEP);
+ if ( bt->priv->mapped_keys & SLEEP_KEY )
+ {
+ TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
+ g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_SLEEP);
+ }
}
else if ( xfpm_strequal (detail, "hibernate") && !(bt->priv->keys & HIBERNATE_KEY) )
{
- TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
- g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_HIBERNATE);
+ if ( bt->priv->mapped_keys & HIBERNATE_KEY )
+ {
+ TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
+ g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_HIBERNATE);
+ }
}
else if ( xfpm_strequal (detail, "brightness-up") && !(bt->priv->keys & BRIGHTNESS_KEY) )
{
@@ -174,10 +183,10 @@
if ( xfpm_strequal (button_type, "lid") )
bt->priv->mapped_keys |= LID_KEY;
+ else if ( xfpm_strequal (button_type, "sleep") )
+ bt->priv->mapped_keys |= SLEEP_KEY;
else if ( xfpm_strequal (button_type, "suspend") )
bt->priv->mapped_keys |= SLEEP_KEY;
- else if ( xfpm_strequal (button_type, "sleep") )
- bt->priv->mapped_keys |= SLEEP_KEY;
else if ( xfpm_strequal (button_type, "hibernate") )
bt->priv->mapped_keys |= HIBERNATE_KEY;
else if ( xfpm_strequal (button_type, "power") )
More information about the Goodies-commits
mailing list