[Goodies-commits] r2394 - in xfce4-battery-plugin/trunk: . icons icons/16x16 icons/22x22 icons/24x24 icons/32x32 icons/scalable panel-plugin
Nick Schermer
nick at xfce.org
Wed Jan 17 18:40:47 CET 2007
Author: nick
Date: 2007-01-17 17:40:47 +0000 (Wed, 17 Jan 2007)
New Revision: 2394
Added:
xfce4-battery-plugin/trunk/icons/
xfce4-battery-plugin/trunk/icons/16x16/
xfce4-battery-plugin/trunk/icons/16x16/Makefile.am
xfce4-battery-plugin/trunk/icons/16x16/battery.png
xfce4-battery-plugin/trunk/icons/22x22/
xfce4-battery-plugin/trunk/icons/22x22/Makefile.am
xfce4-battery-plugin/trunk/icons/22x22/battery.png
xfce4-battery-plugin/trunk/icons/24x24/
xfce4-battery-plugin/trunk/icons/24x24/Makefile.am
xfce4-battery-plugin/trunk/icons/24x24/battery.png
xfce4-battery-plugin/trunk/icons/32x32/
xfce4-battery-plugin/trunk/icons/32x32/Makefile.am
xfce4-battery-plugin/trunk/icons/32x32/battery.png
xfce4-battery-plugin/trunk/icons/Makefile.am
xfce4-battery-plugin/trunk/icons/scalable/
xfce4-battery-plugin/trunk/icons/scalable/Makefile.am
xfce4-battery-plugin/trunk/icons/scalable/battery.svg
Removed:
xfce4-battery-plugin/trunk/panel-plugin/battery.h
xfce4-battery-plugin/trunk/panel-plugin/battery.png
Modified:
xfce4-battery-plugin/trunk/AUTHORS
xfce4-battery-plugin/trunk/ChangeLog
xfce4-battery-plugin/trunk/Makefile.am
xfce4-battery-plugin/trunk/autogen.sh
xfce4-battery-plugin/trunk/configure.in.in
xfce4-battery-plugin/trunk/panel-plugin/Makefile.am
xfce4-battery-plugin/trunk/panel-plugin/battery.c
xfce4-battery-plugin/trunk/panel-plugin/battmon.desktop.in.in
Log:
* Remove the inline icon and add Tango icons.
* Improve Makefile.am and configure files.
* Use the battery icon in the desktop file.
* Fix LDADD to prevent linker problems.
* Bump version to 0.5.0 for release with Xfce 4.4.0
Modified: xfce4-battery-plugin/trunk/AUTHORS
===================================================================
--- xfce4-battery-plugin/trunk/AUTHORS 2007-01-17 16:06:58 UTC (rev 2393)
+++ xfce4-battery-plugin/trunk/AUTHORS 2007-01-17 17:40:47 UTC (rev 2394)
@@ -1,6 +1,7 @@
Eduard Roccatello <eduard at xfce.org
Nick Penwarden <toth64 at yahoo.com>
-Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
-edscott wilson garcia <edscott at users.sourceforge.net>
+Benedikt Meurer <benny at xfce.org>
+Edscott Wilson Garcia <edscott at users.sourceforge.net>
Rickard E. Faith <faith at acm.org>
Noberasco Michele <2001s098 at educ.disi.unige.it>
+Nick Schermer <nick at xfce.org>
Modified: xfce4-battery-plugin/trunk/ChangeLog
===================================================================
--- xfce4-battery-plugin/trunk/ChangeLog 2007-01-17 16:06:58 UTC (rev 2393)
+++ xfce4-battery-plugin/trunk/ChangeLog 2007-01-17 17:40:47 UTC (rev 2394)
@@ -1,9 +1,19 @@
-2006-12-20 17:45 nick
+2007-01-17 Nick Schermer <nick at xfce.org>
+
+ * Remove the inline icon and add Tango icons.
+ * Improve Makefile.am and configure files.
+ * Use the battery icon in the desktop file.
+ * Fix LDADD to prevent linker problems.
+ * Bump version to 0.5.0 for release with Xfce 4.4.0
+
+2006-12-20 Nick Schermer <nick at xfce.org>
+
* panel-plugin/battery.c: Add help button with exo-open
to battery wiki page.
* po/*.po: Merge new string
-2006-10-22 20:28 nick
+2006-10-22 Nick Schermer <nick at xfce.org>
+
* Regenerated po files
* Applied atch from Tim Baga <tim.baga at gmail dot com>
* Fixed update_apm_status() to allow plugin display correct
@@ -18,7 +28,7 @@
appropriate labels when battery is charging, and it's charge >= 99%.
* Changed default low/critical battery action to "Display a warning message".
-2006-09-06 11:43 nick
+2006-09-06 Nick Schermer <nick at xfce.org>
* Added $Id$ using svn:keywords
* Added COPYING.LIB for libacpi and libapm
@@ -26,31 +36,31 @@
* Regenerated po files
* Some improvements in build files
-2006-09-02 20:17 nick
+2006-09-02 Nick Schermer <nick at xfce.org>
* configure.in.in, Makefile.am, panel-plugin/Makefile.am: Improvements
in build files. This also makes building with as-needed possible.
* libapm.c, libapm.h, battery.c: Rename files
-2006-09-01 14:00 nick
+2006-09-01 Nick Schermer <nick at xfce.org>
* Bumped version to 0.4.90.2 for release.
-2006-09-01 13:30 nick
+2006-09-01 Nick Schermer <nick at xfce.org>
* panel-plugin/battmon.c, panel-plugin/libacpi.c: Applied patches (or
parts of it) from Bug #1261, Bug #1475
* panel-plugin/battmon.c, panel-plugin/libacpi.c: NetBSD patch from
Stefan Sperling <stsp at stsp.in-berlin.de>
-2006-09-01 12:11 nick
+2006-09-01 Nick Schermer <nick at xfce.org>
* configure.ac, autogen.sh, po/LINGUAS: Switch to linguas support,
rename configure.in to configure.in.in
* po/xfce4-battery-plugin.pot: Addded file
* po/*.po: Regenerated po files
-2006-09-01 11:33 nick
+2006-09-01 Nick Schermer <nick at xfce.org>
* panel-plugin/libacpi.c: Apply patch from Giuseppe Ciotta to
remove hardcoded battery paths.
@@ -68,16 +78,16 @@
beta 2.
* panel-plugin/battmon.c: Couple of small fixes, improvement, memleaks etc.
-2003-07-18 17:59 huysmans
+2003-07-18 Jasper Huijsmans <jasper at xfce.org>
* panel-plugin/battmon.c: Change panel API again to prevent old
plugins to crash the panel
-2003-07-17 20:31 benny
+2003-07-17 Benedikt Meurer <benny at xfce.org>
* ChangeLog: Updated ChangeLog.
-2003-07-17 20:30 benny
+2003-07-17 Benedikt Meurer <benny at xfce.org>
* compile, depcomp, README, aclocal.m4, ltmain.sh, configure,
configure.ac, config.guess, install-sh, AUTHORS, COPYING,
@@ -89,7 +99,7 @@
panel-plugin/apmlib.c, panel-plugin/battmon.c,
panel-plugin/libbattmon_la-apmlib.loT: Initial revision
-2003-07-17 20:30 benny
+2003-07-17 Benedikt Meurer <benny at xfce.org>
* compile, depcomp, README, aclocal.m4, ltmain.sh, configure,
configure.ac, config.guess, install-sh, AUTHORS, COPYING,
Modified: xfce4-battery-plugin/trunk/Makefile.am
===================================================================
--- xfce4-battery-plugin/trunk/Makefile.am 2007-01-17 16:06:58 UTC (rev 2393)
+++ xfce4-battery-plugin/trunk/Makefile.am 2007-01-17 17:40:47 UTC (rev 2394)
@@ -2,12 +2,9 @@
SUBDIRS = \
panel-plugin \
+ icons \
po
-AUTOMAKE_OPTIONS = \
- 1.8 \
- dist-bzip2
-
distclean-local:
rm -rf *.cache *~
@@ -26,3 +23,5 @@
intltool-merge \
intltool-update
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+
Modified: xfce4-battery-plugin/trunk/autogen.sh
===================================================================
--- xfce4-battery-plugin/trunk/autogen.sh 2007-01-17 16:06:58 UTC (rev 2393)
+++ xfce4-battery-plugin/trunk/autogen.sh 2007-01-17 17:40:47 UTC (rev 2394)
@@ -24,7 +24,7 @@
# substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%04d\n", $2}'`
sed -e "s/@LINGUAS@/${linguas}/g" \
-e "s/@REVISION@/${revision}/g" \
< "configure.in.in" > "configure.in"
Modified: xfce4-battery-plugin/trunk/configure.in.in
===================================================================
--- xfce4-battery-plugin/trunk/configure.in.in 2007-01-17 16:06:58 UTC (rev 2393)
+++ xfce4-battery-plugin/trunk/configure.in.in 2007-01-17 17:40:47 UTC (rev 2394)
@@ -2,52 +2,91 @@
dnl
dnl xfce4-battery-plugin - Battery monitor for the Xfce4 panel
dnl
-dnl 2003 Benedikt Meurer <benny at xfce.org>
+dnl 2003 Benedikt Meurer <benny at xfce.org>
+dnl 2006-2007 Nick Schermer <nick at xfce.org>
dnl
-m4_define([battmon_version], [0.4.90.3])
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
+m4_define([battery_version_major], [0])
+m4_define([battery_version_minor], [5])
+m4_define([battery_version_micro], [0])
+m4_define([battery_version_build], [r at REVISION@])
+m4_define([battery_version_tag], [svn])
+m4_define([battery_version], [battery_version_major().battery_version_minor().battery_version_micro()ifelse(battery_version_tag(), [svn], [battery_version_tag()-battery_version_build()], [battery_version_tag()])])
-AC_INIT([xfce4-battery-plugin], [battmon_version()],
- [goodies-dev at xfce.org])
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (c) 2006-2007
+ The Xfce development team. All rights reserved.])
+AC_INIT([xfce4-battery-plugin], [battery_version()], [http://bugzilla.xfce.org/], [xfce4-battery-plugin])
+AC_PREREQ([2.50])
+AC_CANONICAL_TARGET()
+AC_REVISION([$Id$])
-
-BATTMON_VERSION=battmon_version()
-AM_INIT_AUTOMAKE([xfce4-battery-plugin], [$BATTMON_VERSION])
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE()
-dnl Check for UNIX variants
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
-
-dnl Check for basic programs
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
+AC_PROG_LD()
+AC_PROG_INSTALL()
AC_PROG_INTLTOOL()
-dnl Check for standard header files
-AC_HEADER_STDC
-AC_CHECK_FUNCS([sysctl])
+dnl **********************************
+dnl *** Check for standard headers ***
+dnl **********************************
AC_CHECK_HEADERS([dirent.h stdio.h stdlib.h unistd.h string.h fcntl.h \
ctype.h sys/stat.h sys/time.h sys/ioctl.h sys/types.h])
-dnl required packages
+dnl ************************************
+dnl *** Check for standard functions ***
+dnl ************************************
+AC_CHECK_FUNCS([sysctl])
+
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
+XDT_I18N([@LINGUAS@])
+
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
-
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2])
-XDT_I18N([@LINGUAS@])
-
-dnl Check for debugging support
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
XDT_FEATURE_DEBUG()
AC_OUTPUT([
Makefile
panel-plugin/Makefile
+icons/Makefile
+icons/16x16/Makefile
+icons/22x22/Makefile
+icons/24x24/Makefile
+icons/32x32/Makefile
+icons/scalable/Makefile
po/Makefile.in
])
+dnl ***************************
+dnl *** Print configuration ***
+dnl ***************************
+echo
+echo "Build Configuration:"
+echo
+echo "* Debug Support: $enable_debug"
+echo
\ No newline at end of file
Added: xfce4-battery-plugin/trunk/icons/16x16/Makefile.am
===================================================================
--- xfce4-battery-plugin/trunk/icons/16x16/Makefile.am (rev 0)
+++ xfce4-battery-plugin/trunk/icons/16x16/Makefile.am 2007-01-17 17:40:47 UTC (rev 2394)
@@ -0,0 +1,10 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/16x16/devices
+icons_DATA = \
+ battery.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-battery-plugin/trunk/icons/16x16/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xfce4-battery-plugin/trunk/icons/16x16/battery.png
===================================================================
(Binary files differ)
Property changes on: xfce4-battery-plugin/trunk/icons/16x16/battery.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-battery-plugin/trunk/icons/22x22/Makefile.am
===================================================================
--- xfce4-battery-plugin/trunk/icons/22x22/Makefile.am (rev 0)
+++ xfce4-battery-plugin/trunk/icons/22x22/Makefile.am 2007-01-17 17:40:47 UTC (rev 2394)
@@ -0,0 +1,10 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/22x22/devices
+icons_DATA = \
+ battery.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-battery-plugin/trunk/icons/22x22/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xfce4-battery-plugin/trunk/icons/22x22/battery.png
===================================================================
(Binary files differ)
Property changes on: xfce4-battery-plugin/trunk/icons/22x22/battery.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-battery-plugin/trunk/icons/24x24/Makefile.am
===================================================================
--- xfce4-battery-plugin/trunk/icons/24x24/Makefile.am (rev 0)
+++ xfce4-battery-plugin/trunk/icons/24x24/Makefile.am 2007-01-17 17:40:47 UTC (rev 2394)
@@ -0,0 +1,10 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/24x24/devices
+icons_DATA = \
+ battery.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-battery-plugin/trunk/icons/24x24/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xfce4-battery-plugin/trunk/icons/24x24/battery.png
===================================================================
(Binary files differ)
Property changes on: xfce4-battery-plugin/trunk/icons/24x24/battery.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-battery-plugin/trunk/icons/32x32/Makefile.am
===================================================================
--- xfce4-battery-plugin/trunk/icons/32x32/Makefile.am (rev 0)
+++ xfce4-battery-plugin/trunk/icons/32x32/Makefile.am 2007-01-17 17:40:47 UTC (rev 2394)
@@ -0,0 +1,10 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/32x32/devices
+icons_DATA = \
+ battery.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-battery-plugin/trunk/icons/32x32/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xfce4-battery-plugin/trunk/icons/32x32/battery.png
===================================================================
(Binary files differ)
Property changes on: xfce4-battery-plugin/trunk/icons/32x32/battery.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-battery-plugin/trunk/icons/Makefile.am
===================================================================
--- xfce4-battery-plugin/trunk/icons/Makefile.am (rev 0)
+++ xfce4-battery-plugin/trunk/icons/Makefile.am 2007-01-17 17:40:47 UTC (rev 2394)
@@ -0,0 +1,23 @@
+# $Id$
+
+SUBDIRS = \
+ 16x16 \
+ 22x22 \
+ 24x24 \
+ 32x32 \
+ scalable
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. Remember to run:"; \
+ echo "***"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ echo "***"; \
+ fi
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-battery-plugin/trunk/icons/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xfce4-battery-plugin/trunk/icons/scalable/Makefile.am
===================================================================
--- xfce4-battery-plugin/trunk/icons/scalable/Makefile.am (rev 0)
+++ xfce4-battery-plugin/trunk/icons/scalable/Makefile.am 2007-01-17 17:40:47 UTC (rev 2394)
@@ -0,0 +1,10 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/scalable/devices
+icons_DATA = \
+ battery.svg
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-battery-plugin/trunk/icons/scalable/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xfce4-battery-plugin/trunk/icons/scalable/battery.svg
===================================================================
--- xfce4-battery-plugin/trunk/icons/scalable/battery.svg (rev 0)
+++ xfce4-battery-plugin/trunk/icons/scalable/battery.svg 2007-01-17 17:40:47 UTC (rev 2394)
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ sodipodi:docname="battery.svg"
+ sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/devices"
+ inkscape:version="0.43+devel"
+ sodipodi:version="0.32"
+ id="svg1328"
+ height="48px"
+ width="48px"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3">
+ <linearGradient
+ id="linearGradient6932">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop6934" />
+ <stop
+ style="stop-color:#e7e6ae;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop6936" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6924"
+ inkscape:collect="always">
+ <stop
+ id="stop6926"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop6928"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4206">
+ <stop
+ id="stop4208"
+ offset="0.0000000"
+ style="stop-color:#7d4b01;stop-opacity:1.0000000;" />
+ <stop
+ id="stop4210"
+ offset="1.0000000"
+ style="stop-color:#535353;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4176"
+ inkscape:collect="always">
+ <stop
+ id="stop4178"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4180"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4162">
+ <stop
+ id="stop4164"
+ offset="0.0000000"
+ style="stop-color:#f79403;stop-opacity:1.0000000;" />
+ <stop
+ style="stop-color:#fdb343;stop-opacity:1.0000000;"
+ offset="0.18691589"
+ id="stop4170" />
+ <stop
+ id="stop4172"
+ offset="0.43008122"
+ style="stop-color:#fdb74f;stop-opacity:1.0000000;" />
+ <stop
+ id="stop4166"
+ offset="1.0000000"
+ style="stop-color:#8f5601;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4134">
+ <stop
+ id="stop4136"
+ offset="0.0000000"
+ style="stop-color:#7e807a;stop-opacity:1.0000000;" />
+ <stop
+ style="stop-color:#babbb8;stop-opacity:1.0000000;"
+ offset="0.25000000"
+ id="stop4148" />
+ <stop
+ style="stop-color:#a5a6a3;stop-opacity:1.0000000;"
+ offset="0.50000000"
+ id="stop4142" />
+ <stop
+ id="stop4138"
+ offset="1.0000000"
+ style="stop-color:#333432;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4126"
+ inkscape:collect="always">
+ <stop
+ id="stop4128"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop4130"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.500000,-7.259031e-15,20.00000)"
+ r="17.142857"
+ fy="40.000000"
+ fx="23.857143"
+ cy="40.000000"
+ cx="23.857143"
+ id="radialGradient4132"
+ xlink:href="#linearGradient4126"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-1.142857e-6,-1.714284)"
+ gradientUnits="userSpaceOnUse"
+ y2="26.718750"
+ x2="38.826412"
+ y1="26.718750"
+ x1="9.3030529"
+ id="linearGradient4140"
+ xlink:href="#linearGradient4134"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="13.284962"
+ x2="24.000000"
+ y1="16.525082"
+ x1="24.000000"
+ id="linearGradient4160"
+ xlink:href="#linearGradient6932"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-1.142857e-6,-1.714284)"
+ gradientUnits="userSpaceOnUse"
+ y2="17.511776"
+ x2="38.013393"
+ y1="17.511776"
+ x1="10.116071"
+ id="linearGradient4168"
+ xlink:href="#linearGradient4162"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-1.142857e-6,-1.714284)"
+ gradientUnits="userSpaceOnUse"
+ y2="56.575912"
+ x2="37.969398"
+ y1="14.004482"
+ x1="17.160095"
+ id="linearGradient4182"
+ xlink:href="#linearGradient4176"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-1.142857e-6,-1.714284)"
+ gradientUnits="userSpaceOnUse"
+ y2="25.428572"
+ x2="25.207588"
+ y1="21.857143"
+ x1="25.064732"
+ id="linearGradient4198"
+ xlink:href="#linearGradient4206"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-0.142857,0.928571)"
+ gradientUnits="userSpaceOnUse"
+ y2="30.000000"
+ x2="15.785715"
+ y1="19.500000"
+ x1="16.071430"
+ id="linearGradient6930"
+ xlink:href="#linearGradient6924"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="13.284962"
+ x2="24.000000"
+ y1="16.525082"
+ x1="24.000000"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6942"
+ xlink:href="#linearGradient6932"
+ inkscape:collect="always" />
+ <radialGradient
+ r="17.142857"
+ fy="40.000000"
+ fx="23.857143"
+ cy="40.000000"
+ cx="23.857143"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.500000,-4.403648e-15,20.00000)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient6946"
+ xlink:href="#linearGradient4126"
+ inkscape:collect="always" />
+ </defs>
+ <sodipodi:namedview
+ stroke="#a40000"
+ inkscape:window-y="229"
+ inkscape:window-x="201"
+ inkscape:window-height="644"
+ inkscape:window-width="882"
+ fill="#cc0000"
+ inkscape:showpageshadow="false"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showgrid="false"
+ inkscape:current-layer="layer1"
+ inkscape:cy="23.637033"
+ inkscape:cx="28.540224"
+ inkscape:zoom="9.8994949"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="0.25490196"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Battery</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>battery</rdf:li>
+ <rdf:li>apm</rdf:li>
+ <rdf:li>acpi</rdf:li>
+ <rdf:li>power management</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Attribution" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ inkscape:label="Battery"
+ id="layer1">
+ <path
+ transform="matrix(1.058752,0.000000,0.000000,1.151259,-1.115944,-10.27691)"
+ d="M 41.000000 40.000000 A 17.142857 8.5714283 0 1 1 6.7142868,40.000000 A 17.142857 8.5714283 0 1 1 41.000000 40.000000 z"
+ sodipodi:ry="8.5714283"
+ sodipodi:rx="17.142857"
+ sodipodi:cy="40.000000"
+ sodipodi:cx="23.857143"
+ id="path3366"
+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient4132);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="csszssz"
+ id="path3068"
+ d="M 23.937499,7.1919650 C 16.078072,7.1919650 9.6874997,9.9944659 9.6874987,13.441966 C 9.6874987,13.689351 9.6874987,36.309326 9.6874987,36.566966 C 9.6874987,40.014467 16.078071,42.816966 23.937499,42.816966 C 31.796927,42.816966 38.441965,40.014466 38.441963,36.566966 C 38.441963,36.362905 38.441963,13.646027 38.441963,13.441966 C 38.441963,9.9944649 31.796926,7.1919650 23.937499,7.1919650 z "
+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient4140);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient4198);stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
+ <path
+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient4168);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:0.76899999;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ d="M 23.941292,7.4484874 C 16.316147,7.4484874 10.116071,10.167450 10.116070,13.512182 C 10.116070,13.752193 10.116070,19.820066 10.116070,20.070026 C 10.116070,23.414760 16.316146,25.717924 23.941292,25.717924 C 31.566438,25.717924 38.013394,23.414760 38.013392,20.070026 C 38.013392,19.872048 38.013392,13.710160 38.013392,13.512182 C 38.013392,10.167449 31.566437,7.4484874 23.941292,7.4484874 z "
+ id="path4152"
+ sodipodi:nodetypes="csszssz" />
+ <path
+ style="opacity:0.54430377;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient4182);stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ d="M 23.946122,7.9712859 C 16.618364,7.9712859 10.660096,10.584206 10.660095,13.798491 C 10.660095,14.029142 10.660095,35.684551 10.660095,35.924762 C 10.660095,39.139049 16.618363,41.751967 23.946122,41.751967 C 31.273880,41.751967 37.469399,39.139048 37.469397,35.924762 C 37.469397,35.734506 37.469397,13.988749 37.469397,13.798491 C 37.469397,10.584205 31.273879,7.9712859 23.946122,7.9712859 z "
+ id="path4174"
+ sodipodi:nodetypes="csszssz" />
+ <path
+ transform="matrix(1.037291,0.000000,0.000000,0.954619,-0.894979,-7.572056e-2)"
+ d="M 36.857142 14.071428 A 12.857142 5.5000000 0 1 1 11.142858,14.071428 A 12.857142 5.5000000 0 1 1 36.857142 14.071428 z"
+ sodipodi:ry="5.5000000"
+ sodipodi:rx="12.857142"
+ sodipodi:cy="14.071428"
+ sodipodi:cx="24.000000"
+ id="path3364"
+ style="opacity:1.0000000;color:#000000;fill:#fed496;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient4160);stroke-width:1.0049270;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="overflow:visible;display:block;visibility:visible;stroke-opacity:1.0000000;stroke-dashoffset:0.0000000;stroke-dasharray:none;stroke-miterlimit:10.000000;marker-end:none;marker-mid:none;marker-start:none;marker:none;stroke-linejoin:miter;stroke-linecap:butt;stroke-width:1.0000000;stroke:none;fill-rule:nonzero;fill-opacity:1.0000000;fill:url(#radialGradient6946);color:#000000;opacity:0.65822785"
+ id="path6944"
+ sodipodi:cx="23.857143"
+ sodipodi:cy="40.000000"
+ sodipodi:rx="17.142857"
+ sodipodi:ry="8.5714283"
+ d="M 41.000000 40.000000 A 17.142857 8.5714283 0 1 1 6.7142868,40.000000 A 17.142857 8.5714283 0 1 1 41.000000 40.000000 z"
+ transform="matrix(0.363430,0.000000,0.000000,0.363430,15.47247,-4.118577)" />
+ <path
+ style="opacity:1.0000000;color:#000000;fill:#fcaf3e;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#b46c02;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ d="M 23.889443,6.4653480 C 21.886649,6.4653480 19.258159,7.1795010 19.258159,8.0580170 C 19.258159,8.1210570 19.258159,10.622022 19.258159,10.687676 C 19.258159,11.566192 21.886649,12.280345 23.889443,12.280345 C 25.892238,12.280345 28.299859,11.566192 28.299858,10.687676 C 28.299858,10.635676 28.299858,8.1100170 28.299858,8.0580170 C 28.299858,7.1795000 25.892238,6.4653480 23.889443,6.4653480 z "
+ id="path3362"
+ sodipodi:nodetypes="csszssz" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path6922"
+ d="M 13.642858,17.999999 L 14.000000,34.785714 L 18.571429,36.071428 L 18.428572,19.357142 C 18.428572,19.357142 20.500000,19.357142 23.857143,19.142856 C 18.641400,18.909783 12.673770,16.668176 10.642858,15.214285 C 12.059757,17.306461 13.642858,17.999999 13.642858,17.999999 z "
+ style="opacity:0.49367085;color:#000000;fill:url(#linearGradient6930);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1.0000000;color:#000000;fill:#fed496;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient6942);stroke-width:4.1198664;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="path6940"
+ sodipodi:cx="24.000000"
+ sodipodi:cy="14.071428"
+ sodipodi:rx="12.857142"
+ sodipodi:ry="5.5000000"
+ d="M 36.857142 14.071428 A 12.857142 5.5000000 0 1 1 11.142858,14.071428 A 12.857142 5.5000000 0 1 1 36.857142 14.071428 z"
+ transform="matrix(0.271979,0.000000,0.000000,0.216619,17.27048,5.409742)" />
+ </g>
+ <g
+ inkscape:label="Emblem"
+ id="layer2"
+ inkscape:groupmode="layer" />
+</svg>
Modified: xfce4-battery-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/Makefile.am 2007-01-17 16:06:58 UTC (rev 2393)
+++ xfce4-battery-plugin/trunk/panel-plugin/Makefile.am 2007-01-17 17:40:47 UTC (rev 2394)
@@ -1,30 +1,43 @@
# $Id$
-plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfce4-battery-plugin
+INCLUDES = \
+ -I$(top_srcdir) \
+ -DG_LOG_DOMAIN=\"xfce4-battery-plugin\" \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ $(PLATFORM_CPPFLAGS)
-xfce4_battery_plugin_SOURCES = \
- battery.h \
- battery.c \
- libacpi.h \
- libacpi.c \
- libapm.h \
+#
+# Battery plugin
+#
+plugindir = \
+ $(libexecdir)/xfce4/panel-plugins
+
+plugin_PROGRAMS = \
+ xfce4-battery-plugin
+
+xfce4_battery_plugin_SOURCES = \
+ battery.c \
+ libacpi.h \
+ libacpi.c \
+ libapm.h \
libapm.c
-xfce4_battery_plugin_CFLAGS = \
- -I$(top_srcdir) \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- $(LIBXFCE4PANEL_CFLAGS) \
- $(LIBXFCEGUI4_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(GTK_CFLAGS)
+xfce4_battery_plugin_CFLAGS = \
+ $(LIBXFCE4PANEL_CFLAGS) \
+ $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(PLATFORM_CFLAGS)
-xfce4_battery_plugin_LDFLAGS = \
- $(LIBXFCE4PANEL_LIBS) \
- $(LIBXFCEGUI4_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
+xfce4_battery_plugin_LDADD = \
+ $(LIBXFCE4PANEL_LIBS) \
+ $(LIBXFCEGUI4_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
$(GTK_LIBS)
+#
+# Desktop file
+#
desktopdir = $(datadir)/xfce4/panel-plugins
desktop_in_in_files = battmon.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
@@ -39,3 +52,5 @@
CLEANFILES = \
$(desktop_in_files) \
$(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Modified: xfce4-battery-plugin/trunk/panel-plugin/battery.c
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/battery.c 2007-01-17 16:06:58 UTC (rev 2393)
+++ xfce4-battery-plugin/trunk/panel-plugin/battery.c 2007-01-17 17:40:47 UTC (rev 2394)
@@ -52,7 +52,6 @@
#include <gtk/gtk.h>
#include <libxfce4panel/xfce-panel-plugin.h>
-#include "battery.h"
#include "libacpi.h"
#include <sys/time.h>
@@ -622,12 +621,8 @@
/* try to load battery icon from your current icon theme */
icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- "battery", size , 0, NULL);
+ "battery", size , 0, NULL);
- /* no icon found in your curren icon theme? Use ours! */
- if (!icon)
- icon = xfce_inline_icon_at_size (battery_pixbuf, width, height);
-
return icon;
}
Deleted: xfce4-battery-plugin/trunk/panel-plugin/battery.h
Deleted: xfce4-battery-plugin/trunk/panel-plugin/battery.png
Modified: xfce4-battery-plugin/trunk/panel-plugin/battmon.desktop.in.in
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/battmon.desktop.in.in 2007-01-17 16:06:58 UTC (rev 2393)
+++ xfce4-battery-plugin/trunk/panel-plugin/battmon.desktop.in.in 2007-01-17 17:40:47 UTC (rev 2394)
@@ -3,5 +3,5 @@
Encoding=UTF-8
_Name=Battery Monitor
_Comment=Show and monitor the battery status
-Icon=xfce-mouse
+Icon=battery
X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-battery-plugin
More information about the Goodies-commits
mailing list