[Xfce4-commits] [xfce/xfce4-power-manager] 01/02: Use the online docs for help
noreply at xfce.org
noreply at xfce.org
Mon Apr 7 19:32:21 CEST 2014
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch eric/bugzilla-patches
in repository xfce/xfce4-power-manager.
commit 12356fad8820256d3d2bb4bda75cfc5a5e3abe66
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Mon Apr 7 20:15:45 2014 +0300
Use the online docs for help
Point to the online docs for xfpm's help. This also fixes it where
the help button was causing the preferences dialog to quit. Now
xfpm will also display the help page when plugged into the settings
dialog. This patch removes the old local docs as well.
---
Makefile.am | 6 +-
common/xfpm-common.c | 6 -
common/xfpm-common.h | 2 -
configure.ac.in | 4 -
data/interfaces/xfpm-settings.ui | 4 +-
doc/C/Makefile.am | 21 -
doc/C/images/Makefile.am | 10 -
doc/C/images/xfpm-brightness-plugin.png | Bin 3629 -> 0 bytes
doc/C/images/xfpm-context-menu.png | Bin 12777 -> 0 bytes
doc/C/images/xfpm-extended-settings.png | Bin 39242 -> 0 bytes
doc/C/images/xfpm-general-settings.png | Bin 36129 -> 0 bytes
doc/C/xfce4-power-manager.html | 149 ----
doc/C/xfce4-power-manager.xml.in | 797 ----------------------
doc/Makefile.am | 7 -
doc/xfce-nochunk.xsl | 270 --------
settings/xfce4-power-manager-settings.desktop.in | 3 +-
settings/xfpm-settings.c | 3 +-
src/xfpm-power.c | 9 +-
18 files changed, 15 insertions(+), 1276 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 1c42d91..96a6738 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,7 @@ SUBDIRS = \
src \
settings \
$(plugins_dir) \
- po \
- doc
+ po
EXTRA_DIST = \
@@ -41,9 +40,6 @@ dist-hook: ChangeLog
distclean-local:
rm -rf *.cache
-html: Makefile
- make -C doc html
-
dist-bz2: dist
zcat $(PACKAGE)-$(VERSION).tar.gz | \
bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
diff --git a/common/xfpm-common.c b/common/xfpm-common.c
index ecfc6c9..b859f16 100644
--- a/common/xfpm-common.c
+++ b/common/xfpm-common.c
@@ -112,12 +112,6 @@ xfpm_preferences (void)
g_spawn_command_line_async ("xfce4-power-manager-settings", NULL);
}
-void
-xfpm_help (void)
-{
- g_spawn_command_line_async ("xfhelp4 xfce4-power-manager.html", NULL);
-}
-
void
xfpm_quit (void)
{
diff --git a/common/xfpm-common.h b/common/xfpm-common.h
index 2dce854..d5b181e 100644
--- a/common/xfpm-common.h
+++ b/common/xfpm-common.h
@@ -44,8 +44,6 @@ void xfpm_lock_screen (void);
void xfpm_preferences (void);
-void xfpm_help (void);
-
void xfpm_quit (void);
void xfpm_about (GtkWidget *widget,
diff --git a/configure.ac.in b/configure.ac.in
index 633b340..affba31 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -235,10 +235,6 @@ data/icons/scalable/Makefile
data/icons/scalable/status/Makefile
data/icons/scalable/actions/Makefile
data/interfaces/Makefile
-doc/Makefile
-doc/C/Makefile
-doc/C/xfce4-power-manager.xml
-doc/C/images/Makefile
po/Makefile.in
])
diff --git a/data/interfaces/xfpm-settings.ui b/data/interfaces/xfpm-settings.ui
index 98f8710..fa8f72d 100644
--- a/data/interfaces/xfpm-settings.ui
+++ b/data/interfaces/xfpm-settings.ui
@@ -1425,8 +1425,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">help-button</action-widget>
- <action-widget response="0">close-button</action-widget>
+ <action-widget response="-11">help-button</action-widget>
+ <action-widget response="-3">close-button</action-widget>
</action-widgets>
</object>
<object class="GtkAdjustment" id="adjustment10">
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
deleted file mode 100644
index 4fc661b..0000000
--- a/doc/C/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-SUBDIRS = \
- images
-
-noinst_DATA = \
- xfce4-power-manager.xml
-
-docdir=$(datadir)/xfce4/doc/C
-
-doc_DATA= \
- xfce4-power-manager.html
-
-EXTRA_DIST = $(noinst_DATA) $(doc_DATA)
-
-if MAINTAINER_MODE
-if HAVE_XSLTPROC
-
-xfce4-power-manager.html: $(srcdir)/xfce4-power-manager.xml
- $(XSLTPROC) $(top_srcdir)/doc/xfce-nochunk.xsl $(srcdir)/xfce4-power-manager.xml
-
-endif
-endif
diff --git a/doc/C/images/Makefile.am b/doc/C/images/Makefile.am
deleted file mode 100644
index cfc3b3b..0000000
--- a/doc/C/images/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-imagesdir = $(datadir)/xfce4/doc/C/images
-
-images_DATA = xfpm-general-settings.png \
- xfpm-extended-settings.png \
- xfpm-context-menu.png \
- xfpm-brightness-plugin.png
-
-EXTRA_DIST = $(images_DATA)
-
-
diff --git a/doc/C/images/xfpm-brightness-plugin.png b/doc/C/images/xfpm-brightness-plugin.png
deleted file mode 100644
index 463390b..0000000
Binary files a/doc/C/images/xfpm-brightness-plugin.png and /dev/null differ
diff --git a/doc/C/images/xfpm-context-menu.png b/doc/C/images/xfpm-context-menu.png
deleted file mode 100644
index 381045c..0000000
Binary files a/doc/C/images/xfpm-context-menu.png and /dev/null differ
diff --git a/doc/C/images/xfpm-extended-settings.png b/doc/C/images/xfpm-extended-settings.png
deleted file mode 100644
index 8c567bf..0000000
Binary files a/doc/C/images/xfpm-extended-settings.png and /dev/null differ
diff --git a/doc/C/images/xfpm-general-settings.png b/doc/C/images/xfpm-general-settings.png
deleted file mode 100644
index 9c13d64..0000000
Binary files a/doc/C/images/xfpm-general-settings.png and /dev/null differ
diff --git a/doc/C/xfce4-power-manager.html b/doc/C/xfce4-power-manager.html
deleted file mode 100644
index 8ba38b2..0000000
--- a/doc/C/xfce4-power-manager.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<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 [...]
-<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> [...]
- 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
- be controlled to reduce their power consumption (such as LCD brightness level, monitor sleep, CPU frequency scaling).
- In addition, xfce4-power-manager provides a set of freedesktop-compliant DBus interfaces to inform other applications about current power level so that
- 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 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>
- 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="id2615335"></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>
-
-</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 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="id2620267"></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 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>
- 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 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.
- </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:
-
-</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
- 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 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="id2615631"></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. 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, 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 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 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 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 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 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="id2619839"></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-bre [...]
-<strong class="application"><code>xfce4-power-manager</code></strong> version 0.8.3.1 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.3.1 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 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: 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 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
- can be useful for debugging purpose.
-
- </p><span class="keycap"><strong>Power management DBus interface.</strong></span><p>
-
-</p><div class="table"><a name="id2620060"></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 [...]
-
-
- </p><div class="table"><a name="id2663544"></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="c [...]
-
-</p><span class="keycap"><strong>Power management DBus inhibit interface.</strong></span><p>
-
-</p><div class="table"><a name="id2663653"></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"></ [...]
-
-
- </p><div class="table"><a name="id2663833"></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 cols [...]
-
-</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
-get information about the current status of the running instance of the power manager.
-</p></div></div><p>�</p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-about"></a>About <strong class="application"><code>xfce4-power-manager</code></strong></h2></div></div></div><p>
- This power manager was written following the philosophy of Xfce, having light weight application that does
- what the user is expecting from it.
- </p><p>To report a bug or make a suggestion regarding this application or
- this manual, use the bug tracking system at <a class="ulink" href="http://bugzilla.xfce.org/" target="_top">http://bugzilla.xfce.org/</a>.
- </p><p>If you have questions about the use or installation of this package,
- please ask on the <a class="ulink" href="http://lunar-linux.org/mailman/listinfo/xfce" target="_top">xfce</a> mailing list. Development discussion takes
- place on the <a class="ulink" href="http://lunar-linux.org/mailman/listinfo/xfce4-dev" target="_top">xfce4-dev</a> mailing list
- or on <a class="ulink" href="http://lunar-linux.org/mailman/listinfo/xfce4-goodies-dev" target="_top">xfce4-goodies-dev</a> mailing list.
- </p></div><p>�</p><p> This program is distributed under the terms of the
- GNU General Public License as published by the Free Software Foundation;
- either version 2 of the License, or (at your option) any later version.
- </p><p>You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- </p></div></body></html>
diff --git a/doc/C/xfce4-power-manager.xml.in b/doc/C/xfce4-power-manager.xml.in
deleted file mode 100644
index 5c7c292..0000000
--- a/doc/C/xfce4-power-manager.xml.in
+++ /dev/null
@@ -1,797 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY date "October 2008">
- <!ENTITY appversion "@PACKAGE_VERSION@">
- <!ENTITY app "<application>@PACKAGE_NAME@</application>">
-]>
-
-<article id="xfce4-power-manager" lang="en">
-<!-- Header -->
-<articleinfo>
-
- <title>Xfce 4 Power Manager</title>
-
- <copyright>
- <year>2008</year> <holder>Ali Abdallah</holder>
- </copyright>
-
-
-<authorgroup>
-
- <author>
- <firstname>Ali</firstname> <surname>Abdallah</surname>
- <affiliation>
- <address><email>aliov at xfce.org</email></address>
- </affiliation>
- </author>
-
-<!-- This is appropriate place for other contributors: translators,
-maintainers, etc. Commented out by default.
-
- <othercredit role="translator">
- <firstname>Latin</firstname> <surname>Translator 1</surname>
- <affiliation>
- <orgname>Latin Translation Team</orgname>
- <address><email>translator at gnome.org</email> </address>
- </affiliation> <contrib>Latin translation</contrib>
- </othercredit>
--->
-
-</authorgroup>
-
-<releaseinfo>This manual describes &app; version &appversion;
-</releaseinfo>
-
-</articleinfo>
-
- <!-- extra space -->
- <para> </para>
-
-<sect1 id="xfpm-intro">
- <title>Introduction</title>
- 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
- be controlled to reduce their power consumption (such as LCD brightness level, monitor sleep, CPU frequency scaling).
- In addition, xfce4-power-manager provides a set of freedesktop-compliant DBus interfaces to inform other applications about current power level so that
- 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.
-
- <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 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>
-
-
-</sect1>
-
- <!-- extra space -->
- <para> </para>
-
- <sect1 id="xfpm">
- <title>Power Manager</title>
-
-<sect2 id="xfpm-command-line">
-<title>Command line options</title>
-
-<variablelist><title></title>
-
- <varlistentry><term><keycap>--no-daemon</keycap></term>
- <listitem>
- <para>
- Starts the power manager in non-daemon mode: useful for debugging.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry><term><keycap>--restart</keycap></term>
- <listitem>
- <para>
- Restarts the power manager.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry><term><keycap>--quit</keycap></term>
- <listitem>
- <para>
- Causes any running instance of the power manager to exit.
- </para>
- </listitem>
- </varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2 id="xfpm-menu">
-<title>Context menu</title>
-
-<para><figure float="0">
- <title>Context menu</title>
- <screenshot><mediaobject>
- <imageobject>
- <imagedata fileref="images/xfpm-context-menu.png" format="png"/>
- </imageobject>
- <textobject>
- <phrase></phrase>
- </textobject>
- </mediaobject></screenshot>
-</figure></para>
-
-<para>
-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>
-
-</para>
-
-</sect2>
- </sect1>
-
- <!--- Xfpm configurations -->
-
-<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 etc.
- </para>
-
- <sect2 id="xfpm-general">
- <title>General options</title>
-
-<para><figure float="0">
- <title>General settings</title>
- <screenshot><mediaobject>
- <imageobject>
- <imagedata fileref="images/xfpm-general-settings.png" format="png"/>
- </imageobject>
- <textobject>
- <phrase></phrase>
- </textobject>
- </mediaobject></screenshot>
-</figure></para>
-
-<para>
-
-<variablelist><title></title>
-
- <varlistentry>
- <term><keycap>Notification area:</keycap></term>
- <listitem>
- <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>
-
- <varlistentry>
- <term><keycap>Keyboard special keys:</keycap></term>
- <listitem>
- <para>
- 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>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><keycap>Monitor power management control:</keycap></term>
- <listitem>
- <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 notifying the user of errors or that the system is running out of power.
- </para>
- </listitem>
- </varlistentry>
-
-</variablelist>
-</para>
-
- </sect2>
-
- <sect2 id="xfpm-on-ac">
- <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.
- </para>
-
- </sect2>
-
- <sect2 id="xfpm-on-battery">
- <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:
-
-<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
- is running on low battery power, the power manager will display a warning message.
- </para></listitem>
- </varlistentry>
-
- <varlistentry><term><keycap>Prefer power savings over performance:</keycap></term>
- <listitem>
- <para>
- 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>
-
-</variablelist>
-</para>
-
- </sect2>
-
- <sect2 id="xfpm-extended">
- <title>Extended options</title>
-
- <para><figure float="0">
- <title>Extended settings</title>
- <screenshot><mediaobject>
- <imageobject>
- <imagedata fileref="images/xfpm-extended-settings.png" format="png"/>
- </imageobject>
- <textobject>
- <phrase></phrase>
- </textobject>
- </mediaobject></screenshot>
-</figure></para>
-
-<para>
-<variablelist><title></title>
-
- <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 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>
-
- <varlistentry>
- <term><keycap>Monitor sleep mode:</keycap></term>
- <listitem>
- <para>
- DPMS sleep modes before switching off the monitor are either standby or suspend. They are technically different and provided for convenience.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <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. 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>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><keycap>CPU Frequency control:</keycap></term>
- <listitem>
- <para>
- Unselecting this checkbox, the power manager don't attempt to play with the CPU frequency.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <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 or hibernating the computer. It is enabled by default.
- </para>
- </listitem>
- </varlistentry>
-
-</variablelist>
-
-</para>
-
-</sect2>
-
-<!-- Hidden options -->
-<sect2 id="xfpm-hidden-options">
-<title>Hidden options</title>
-
-<para>
-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 configurations, you can change any settings by using xfconf-query or by using your Xfce settings editor.
-</para>
-
-<variablelist><title></title>
-
- <varlistentry><term>LCD Brightness</term>
- <listitem>
-
- <para>
- 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>
-
- </para>
-
- </listitem>
-
- </varlistentry>
-
-<varlistentry><term>Disabling Brightness popup</term>
- <listitem>
-
- <para>
- 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>
-
- </para>
-
- </listitem>
-
- </varlistentry>
-
-</variablelist>
-
-</sect2>
-
-
-</sect1>
-
-<!-- Panel Plugins -->
-<sect1 id="xfpm-plugins">
-<title> Panel plugins </title>
-
-<para><figure float="0">
- <title>Brightness plugin</title>
- <screenshot><mediaobject>
- <imageobject>
- <imagedata fileref="images/xfpm-brightness-plugin.png" format="png"/>
- </imageobject>
- <textobject>
- <phrase></phrase>
- </textobject>
- </mediaobject></screenshot>
-</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 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>
-
- <!-- extra space -->
- <para> </para>
-
-<sect1 id="xfpm-faq">
- <title>FAQ</title>
- <variablelist>
-
- <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
- for version &appversion; the icons are renamed to avoid possible conflicts with a gnome power manager installation.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Q: What is the difference between suspend and hibernate?</term>
- <listitem>
- <para>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.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <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 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>
- <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
- 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: I'm not able to control my laptop brightness and/or my brightness plug in 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>
- 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.
- </para>
-
- </listitem>
- </varlistentry>
-
-</variablelist>
-
-</sect1>
-
-
-<!-- Technical stuff -->
-<sect1 id="xfpm-technical">
- <title>
- Technical information
- </title>
-
-<para>
-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>
-
- <sect2 id="xfpm-dbus">
- <title>DBus interfaces</title>
-
- <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
- can be useful for debugging purpose.
-
- </para>
-
-<keycap>Power management DBus interface.</keycap>
-
-<para>
-
-<table frame='all'><title>Standard methods (org.freedesktop.PowerManagement):</title>
-<tgroup cols='5' align='left' colsep='1' rowsep='1'>
-<colspec colname='c1'/>
-<colspec colname='c2'/>
-<colspec colname='c3'/>
-<colspec colnum='5' colname='c5'/>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">Name</entry>
- <entry>Input parameter</entry>
- <entry>Return Values</entry>
- <entry>Errors</entry>
- <entry>Description</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">CanHibernate</entry>
- <entry></entry>
- <entry>bool</entry>
- <entry></entry>
- <entry>whether the system is able to hibernate</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">CanSuspend</entry>
- <entry></entry>
- <entry>bool</entry>
- <entry></entry>
- <entry>whether the system is able to suspend</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">CanReboot</entry>
- <entry></entry>
- <entry>bool</entry>
- <entry></entry>
- <entry>whether the system is able to reboot</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">CanShutdown</entry>
- <entry></entry>
- <entry>bool</entry>
- <entry></entry>
- <entry>whether the system is able to shutdown</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">GetOnBattery</entry>
- <entry></entry>
- <entry>bool</entry>
- <entry></entry>
- <entry>whether the system is running on battery</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">GetLowBattery</entry>
- <entry></entry>
- <entry>bool</entry>
- <entry></entry>
- <entry>whether the system is running on low battery</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">GetPowerSaveStatus</entry>
- <entry></entry>
- <entry>bool</entry>
- <entry></entry>
- <entry>whether the system is running in power save mode.</entry>
-</row>
-</thead>
-
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">Hibernate</entry>
- <entry></entry>
- <entry></entry>
- <entry>PermissionDenied, NoHardwareSupport</entry>
- <entry></entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">Suspend</entry>
- <entry></entry>
- <entry></entry>
- <entry>PermissionDenied, NoHardwareSupport</entry>
- <entry></entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">Reboot</entry>
- <entry></entry>
- <entry></entry>
- <entry>PermissionDenied, NoHardwareSupport</entry>
- <entry></entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">Shutdown</entry>
- <entry></entry>
- <entry></entry>
- <entry>PermissionDenied, NoHardwareSupport</entry>
- <entry></entry>
-</row>
-</thead>
-
-</tgroup>
-</table>
-
-<!-- Signals -->
- <table frame='all'><title>Standard signals (org.freedesktop.PowerManagement):</title>
-<tgroup cols='3' align='left' colsep='1' rowsep='1'>
-<colspec colname='c1'/>
-<colspec colname='c2'/>
-<colspec colname='c3'/>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">Name</entry>
- <entry>Values</entry>
- <entry>Description</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">OnBatteryChanged</entry>
- <entry>bool</entry>
- <entry>whether on battery status changed</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">LowBatteryChanged</entry>
- <entry>bool</entry>
- <entry>whether on low battery status changed</entry>
-</row>
-</thead>
-
-</tgroup>
-</table>
-
-</para>
-
- <keycap>Power management DBus inhibit interface.</keycap>
-
-<para>
-
-<table frame='all'><title>Standard methods (org.freedesktop.PowerManagement.Inhibit):</title>
-<tgroup cols='5' align='left' colsep='1' rowsep='1'>
-<colspec colname='c1'/>
-<colspec colname='c2'/>
-<colspec colname='c3'/>
-<colspec colnum='5' colname='c5'/>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">Name</entry>
- <entry>Input parameter</entry>
- <entry>Return Values</entry>
- <entry>Errors</entry>
- <entry>Description</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">Inhibit</entry>
- <entry>string application name, string reason</entry>
- <entry>uint32 (random cookie)</entry>
- <entry></entry>
- <entry>Inhibit the power manager.</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">UnInhibit</entry>
- <entry>uint32 cookie</entry>
- <entry></entry>
- <entry>InvalidCookie</entry>
- <entry>Unihibit the power manager.</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">HasInhibit</entry>
- <entry></entry>
- <entry>bool</entry>
- <entry></entry>
- <entry>Whether the power manager is currently inhibited or not.</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">GetInhibitors</entry>
- <entry></entry>
- <entry>Array of strings</entry>
- <entry></entry>
- <entry>List all the applications currently inhibiting the power manager (Not standard, use just for debugging)</entry>
-</row>
-</thead>
-
-</tgroup>
-</table>
-
-<!-- Signals -->
- <table frame='all'><title>Standard signals (org.freedesktop.PowerManagement.Inhibit):</title>
-<tgroup cols='3' align='left' colsep='1' rowsep='1'>
-<colspec colname='c1'/>
-<colspec colname='c2'/>
-<colspec colname='c3'/>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">Name</entry>
- <entry>Values</entry>
- <entry>Description</entry>
-</row>
-</thead>
-
-<thead>
-<row>
- <entry namest="c1" nameend="c2" align="center">HasInhibitChanged</entry>
- <entry>bool</entry>
- <entry>whether the inhibit status changed.</entry>
-</row>
-</thead>
-
-</tgroup>
-</table>
-
-</para>
-
-
-<para>
-In addition, &app; has other interfaces, but those interfaces are mainly used internally, for example the settings application uses such interface to
-get information about the current status of the running instance of the power manager.
-</para>
-
-</sect2>
-
-</sect1>
-
-
-<!-- ABOUT -->
-
- <!-- extra space -->
- <para> </para>
-<sect1 id="xfpm-about">
- <title>About &app;</title>
- <para>
- This power manager was written following the philosophy of Xfce, having light weight application that does
- what the user is expecting from it.
- </para>
-
- <para>To report a bug or make a suggestion regarding this application or
- this manual, use the bug tracking system at <ulink
- url="http://bugzilla.xfce.org/"
- type="http">http://bugzilla.xfce.org/</ulink>.
- </para>
-
- <para>If you have questions about the use or installation of this package,
- please ask on the <ulink
- url="http://lunar-linux.org/mailman/listinfo/xfce"
- type="http">xfce</ulink> mailing list. Development discussion takes
- place on the <ulink
- url="http://lunar-linux.org/mailman/listinfo/xfce4-dev"
- type="http">xfce4-dev</ulink> mailing list
- or on <ulink
- url="http://lunar-linux.org/mailman/listinfo/xfce4-goodies-dev"
- type="http">xfce4-goodies-dev</ulink> mailing list.
- </para>
-
-</sect1>
-
- <!-- extra space -->
- <para> </para>
- <para> This program is distributed under the terms of the
- GNU General Public License as published by the Free Software Foundation;
- either version 2 of the License, or (at your option) any later version.
- </para>
-
- <para>You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- </para>
-
-</article>
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index b951679..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = \
- C
-
-noinst_DATA = \
- xfce-nochunk.xsl
-
-EXTRA_DIST = $(noinst_DATA)
\ No newline at end of file
diff --git a/doc/xfce-nochunk.xsl b/doc/xfce-nochunk.xsl
deleted file mode 100644
index 3dae476..0000000
--- a/doc/xfce-nochunk.xsl
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
-
-<!-- Load onechunk.xsl stylesheet
- TODO: how can I put a location independent link here?
-This should work. The url can be translated to a local one in the catalog
-file"
--->
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/onechunk.xsl"/>
-
-<xsl:param name="suppress.navigation">1</xsl:param>
-
-<!-- Use stylesheet -->
-<xsl:param name="html.stylesheet" select="'../xfce.css'"/>
-
-<!-- labels and numbering -->
-<xsl:param name="autotoc.label.separator" select="'. '"/>
-<xsl:param name="chapter.autolabel" select="1"/>
-
-<!-- Don't force the use of index.html as root filename -->
-<xsl:param name="root.filename" select="''"/>
-
-<!-- Use element id (if present) as file name -->
-<xsl:variable name="use.id.as.filename">1</xsl:variable>
-
-<xsl:template match="releaseinfo" mode="titlepage.mode">
- <span class="{name(.)}">
- <xsl:apply-templates mode="titlepage.mode"/>
- <br/>
- </span>
-</xsl:template>
-
-<!-- Use graphics in admonitions (note, warning, etc) -->
-<xsl:variable name="admon.graphics">0</xsl:variable>
-
-<xsl:param name="admon.style">
- <xsl:text>text-align: left;</xsl:text></xsl:param>
-
-<xsl:variable name="admon.graphics.path">stylesheet-images/</xsl:variable>
-
-<xsl:variable name="admon.graphics.extension">.gif</xsl:variable>
-
-<xsl:param name="table.border.thickness" select="'0.2pt'"/>
-
-<xsl:param name="graphic.default.extension" select="png"/>
-
-<xsl:attribute-set name="shade.verbatim.style">
- <xsl:attribute name="border">0</xsl:attribute>
- <xsl:attribute name="bgcolor">#F3F4F8</xsl:attribute>
- <xsl:attribute name="width">100%</xsl:attribute>
-</xsl:attribute-set>
-
-<!-- Addition by Jasper Huijsmans to be able to set background color -->
-<!-- and cell attributes. -->
-<!-- This requires an adapted template for tgroup (see end of stylesheet) -->
-<xsl:attribute-set name="table.style">
- <xsl:attribute name="bgcolor">#F8F9FD</xsl:attribute>
- <xsl:attribute name="cellspacing">0</xsl:attribute>
- <xsl:attribute name="cellpadding">4</xsl:attribute>
-</xsl:attribute-set>
-
-
-<xsl:param name="generate.legalnotice.link" select="0"/>
-
-<xsl:param name="shade.verbatim" select="1"/>
-
-<!-- set font styles for various tags -->
-<xsl:template match="guibutton">
-<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guiicon">
-<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guilabel">
-<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guimenu">
-<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guimenuitem">
-<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guisubmenu">
-<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="application">
-<xsl:call-template name="inline.boldmonoseq"/>
-</xsl:template>
-
-<xsl:template match="caption">
-<xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<!-- Adapted template for tgroup. The only change is the addition of -->
-<!-- table.style attributes -->
-<xsl:template match="tgroup">
- <table xsl:use-attribute-sets="table.style">
- <xsl:choose>
- <!-- If there's a <?dbhtml table-summary="foo"?> PI, use it for
- the HTML table summary attribute -->
- <xsl:when test="processing-instruction('dbhtml')">
- <xsl:variable name="summary">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis"
- select="processing-instruction('dbhtml')[1]"/>
- <xsl:with-param name="attribute" select="'table-summary'"/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:if test="$summary != ''">
- <xsl:attribute name="summary">
- <xsl:value-of select="$summary"/>
- </xsl:attribute>
- </xsl:if>
- </xsl:when>
- <!-- Otherwise, if there's a title, use that -->
- <xsl:when test="../title">
- <xsl:attribute name="summary">
- <xsl:value-of select="string(../title)"/>
- </xsl:attribute>
- </xsl:when>
- <!-- Otherwise, forget the whole idea -->
- <xsl:otherwise><!-- nevermind --></xsl:otherwise>
- </xsl:choose>
-
- <xsl:if test="../@pgwide=1">
- <xsl:attribute name="width">100%</xsl:attribute>
- </xsl:if>
-
- <xsl:choose>
- <xsl:when test="../@frame='none'">
- <xsl:attribute name="border">0</xsl:attribute>
- </xsl:when>
- <xsl:when test="$table.borders.with.css != 0">
- <xsl:attribute name="border">0</xsl:attribute>
- <xsl:choose>
- <xsl:when test="../@frame='topbot' or ../@frame='top'">
- <xsl:attribute name="style">
- <xsl:call-template name="border">
- <xsl:with-param name="side" select="'top'"/>
- </xsl:call-template>
- </xsl:attribute>
- </xsl:when>
- <xsl:when test="../@frame='sides'">
- <xsl:attribute name="style">
- <xsl:call-template name="border">
- <xsl:with-param name="side" select="'left'"/>
- </xsl:call-template>
- <xsl:call-template name="border">
- <xsl:with-param name="side" select="'right'"/>
- </xsl:call-template>
- </xsl:attribute>
- </xsl:when>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="border">1</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
-
- <xsl:variable name="colgroup">
- <colgroup>
- <xsl:call-template name="generate.colgroup">
- <xsl:with-param name="cols" select="@cols"/>
- </xsl:call-template>
- </colgroup>
- </xsl:variable>
-
- <xsl:variable name="explicit.table.width">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis"
- select="../processing-instruction('dbhtml')[1]"/>
- <xsl:with-param name="attribute" select="'table-width'"/>
- </xsl:call-template>
- </xsl:variable>
-
- <xsl:variable name="table.width">
- <xsl:choose>
- <xsl:when test="$explicit.table.width != ''">
- <xsl:value-of select="$explicit.table.width"/>
- </xsl:when>
- <xsl:when test="$default.table.width = ''">
- <xsl:text>100%</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$default.table.width"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:if test="$default.table.width != ''
- or $explicit.table.width != ''">
- <xsl:attribute name="width">
- <xsl:choose>
- <xsl:when test="contains($table.width, '%')">
- <xsl:value-of select="$table.width"/>
- </xsl:when>
- <xsl:when test="$use.extensions != 0
- and $tablecolumns.extension != 0">
- <xsl:choose>
- <xsl:when test="function-available('stbl:convertLength')">
- <xsl:value-of select="stbl:convertLength($table.width)"/>
- </xsl:when>
- <xsl:when test="function-available('xtbl:convertLength')">
- <xsl:value-of select="xtbl:convertLength($table.width)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:message terminate="yes">
- <xsl:text>No convertLength function available.</xsl:text>
- </xsl:message>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$table.width"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- </xsl:if>
-
- <xsl:choose>
- <xsl:when test="$use.extensions != 0
- and $tablecolumns.extension != 0">
- <xsl:choose>
- <xsl:when test="function-available('stbl:adjustColumnWidths')">
- <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
- </xsl:when>
- <xsl:when test="function-available('xtbl:adjustColumnWidths')">
- <xsl:copy-of select="xtbl:adjustColumnWidths($colgroup)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:message terminate="yes">
- <xsl:text>No adjustColumnWidths function available.</xsl:text>
- </xsl:message>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="$colgroup"/>
- </xsl:otherwise>
- </xsl:choose>
-
- <xsl:apply-templates select="thead"/>
- <xsl:apply-templates select="tbody"/>
- <xsl:apply-templates select="tfoot"/>
-
- <xsl:if test=".//footnote">
- <tbody class="footnotes">
- <tr>
- <td colspan="{@cols}">
- <xsl:apply-templates select=".//footnote"
- mode="table.footnote.mode"/>
- </td>
- </tr>
- </tbody>
- </xsl:if>
- </table>
-</xsl:template>
-
-
-</xsl:stylesheet>
-
diff --git a/settings/xfce4-power-manager-settings.desktop.in b/settings/xfce4-power-manager-settings.desktop.in
index 65d97e3..e42f581 100644
--- a/settings/xfce4-power-manager-settings.desktop.in
+++ b/settings/xfce4-power-manager-settings.desktop.in
@@ -11,4 +11,5 @@ Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-Hardwa
OnlyShowIn=XFCE;
StartupNotify=true
X-XfcePluggable=true
-X-XfceHelpFile=xfce4-power-manager
+X-XfceHelpComponent=xfce4-power-manager
+X-XfceHelpPage=start
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index 513503a..123ef5b 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -1620,10 +1620,11 @@ settings_quit (GtkWidget *widget, XfconfChannel *channel)
static void dialog_response_cb (GtkDialog *dialog, gint response, XfconfChannel *channel)
{
+ DBG("response %d", response);
switch(response)
{
case GTK_RESPONSE_HELP:
- xfpm_help();
+ xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-power-manager", "start", NULL);
break;
default:
settings_quit (GTK_WIDGET (dialog), channel);
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index febac1d..dd952bd 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -474,6 +474,13 @@ xfpm_power_presentation_mode_cb (XfpmPower *power)
}
static void
+xfpm_power_help_cb (GtkMenuItem *menuitem, gpointer user_data)
+{
+ XfpmPower *power = XFPM_POWER (user_data);
+ xfce_dialog_show_help (GTK_WINDOW (power->priv->dialog), "xfce4-power-manager", "start", NULL);
+}
+
+static void
xfpm_power_show_tray_menu (XfpmPower *power,
GtkStatusIcon *icon,
guint button,
@@ -589,7 +596,7 @@ xfpm_power_show_tray_menu (XfpmPower *power,
mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_HELP, NULL);
gtk_widget_set_sensitive (mi, TRUE);
gtk_widget_show (mi);
- g_signal_connect (mi, "activate", G_CALLBACK (xfpm_help), NULL);
+ g_signal_connect (mi, "activate", G_CALLBACK (xfpm_power_help_cb), power);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list