[Goodies-commits] r3416 - in xfce4-sensors-plugin/trunk: . icons panel-plugin po
Fabian Nowak
timystery at xfce.org
Sat Oct 20 20:11:34 CEST 2007
Author: timystery
Date: 2007-10-20 18:11:34 +0000 (Sat, 20 Oct 2007)
New Revision: 3416
Added:
xfce4-sensors-plugin/trunk/NOTES
Removed:
xfce4-sensors-plugin/trunk/configure.ac
Modified:
xfce4-sensors-plugin/trunk/INSTALL
xfce4-sensors-plugin/trunk/Makefile.am
xfce4-sensors-plugin/trunk/NEWS
xfce4-sensors-plugin/trunk/README
xfce4-sensors-plugin/trunk/TODO
xfce4-sensors-plugin/trunk/configure.in.in
xfce4-sensors-plugin/trunk/icons/Makefile
xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am
xfce4-sensors-plugin/trunk/panel-plugin/sensors.c
xfce4-sensors-plugin/trunk/panel-plugin/sensors.h
xfce4-sensors-plugin/trunk/po/LINGUAS
xfce4-sensors-plugin/trunk/po/ca.po
xfce4-sensors-plugin/trunk/po/cs.po
xfce4-sensors-plugin/trunk/po/de.po
xfce4-sensors-plugin/trunk/po/el.po
xfce4-sensors-plugin/trunk/po/en_GB.po
xfce4-sensors-plugin/trunk/po/eu.po
xfce4-sensors-plugin/trunk/po/fr.po
xfce4-sensors-plugin/trunk/po/hu.po
xfce4-sensors-plugin/trunk/po/ja.po
xfce4-sensors-plugin/trunk/po/ko.po
xfce4-sensors-plugin/trunk/po/lt.po
xfce4-sensors-plugin/trunk/po/pl.po
xfce4-sensors-plugin/trunk/po/ru.po
xfce4-sensors-plugin/trunk/po/sq.po
xfce4-sensors-plugin/trunk/po/vi.po
xfce4-sensors-plugin/trunk/po/zh_TW.po
Log:
- new internal API for kinda plugins to different sensor interfaces
- rearranged settings dialog
- harddisks stored correctly now
- timing works better
- some minor fixes
- some speedup
- memory consumption seems to be stable.
Modified: xfce4-sensors-plugin/trunk/INSTALL
===================================================================
--- xfce4-sensors-plugin/trunk/INSTALL 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/INSTALL 2007-10-20 18:11:34 UTC (rev 3416)
@@ -1,7 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
@@ -102,16 +102,16 @@
Installation Names
==================
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +159,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -189,9 +189,14 @@
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
`configure' Invocation
======================
Modified: xfce4-sensors-plugin/trunk/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/Makefile.am 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/Makefile.am 2007-10-20 18:11:34 UTC (rev 3416)
@@ -1,4 +1,4 @@
- at SET_MAKE@
+# $Id$
SUBDIRS = panel-plugin \
po \
@@ -27,13 +27,21 @@
NEWS \
README \
TODO \
- xfce4-sensors-plugin.spec \
+ NOTES \
+ xfce4-sensors-plugin.spec.in \
intltool-extract.in \
intltool-merge.in \
- intltool-update.in
+ intltool-update.in
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
- intltool-update
+ intltool-update \
+ xfce4-sensors-plugin.spec
+DISTCHECK_CONFIGURE_FLAGS = \
+ --with-libsensors \
+ --with-hddtemp \
+ --with-acpi
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Modified: xfce4-sensors-plugin/trunk/NEWS
===================================================================
--- xfce4-sensors-plugin/trunk/NEWS 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/NEWS 2007-10-20 18:11:34 UTC (rev 3416)
@@ -10,3 +10,7 @@
0.9.0: support for hddtemp
0.10.0: accelerators in options dialog, some cleanup in options dialog, colored
bars possible, bars are arranged more carfeully in panel
+0.11.0: Modular sensors interface suitable for extension of further
+ system-specific routines and libraries. New configure stuff.
+ Added po/LINGUAS.
+
Added: xfce4-sensors-plugin/trunk/NOTES
===================================================================
--- xfce4-sensors-plugin/trunk/NOTES (rev 0)
+++ xfce4-sensors-plugin/trunk/NOTES 2007-10-20 18:11:34 UTC (rev 3416)
@@ -0,0 +1,14 @@
+Notes for package maintainers (and perhaps suitable for finding solutions to
+your problem with no hddtemp being displayed):
+
+This version now has optional compile-time support for libsensors3, hddtemp and
+ACPI stuff. Thus, when creating packages, you have the choice to deliver a
+package with all features, which then strongly depends on all of the compiled-in
+features and libraries.
+
+hddtemp is no longer searched at run-time, it is only enabled at compile-time.
+
+If you know of any further OS-specific interface or system library that might be worth including, please tell me.
+
+For hddtemp to work for users in the plugin, it must be setuid root or a hddtemp daemon must be running. if none of this is done, it cant display the hddtemp.
+
Modified: xfce4-sensors-plugin/trunk/README
===================================================================
--- xfce4-sensors-plugin/trunk/README 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/README 2007-10-20 18:11:34 UTC (rev 3416)
@@ -1,20 +1,20 @@
Xfce4-Sensors-Plugin
====================
-Version 0.10.0 - For Xfce 4 Panel 4.3.22 and newer only!
+Version 0.11.0 - For Xfce 4 Panel 4.4.0 and newer only!
-Copyright (c) 2004,2005 by Fabian Nowak (timystery at arcor.de), Stefan Ott
+Copyright (c) 2004,2005,2006,2007 by Fabian Nowak (timystery at arcor.de), Stefan Ott
Licence: GPL version 2 (or later at your option)
Description: Reads your hardware sensor values and displays them in your panel
-Dependencies: libxfcegui4-4, libxfce4util-i4, libgtk2.0-0, libsensors3,
+Dependencies: libxfcegui4-4, libxfce4util-i4, libgtk2.0-0,
xfce4-panel
- libxfcegui4-dev, libxfce4util-dev, libgtk2.0-dev, libsensors-dev,
+ libxfcegui4-dev, libxfce4util-dev, libgtk2.0-dev,
xfce4-panel-dev
-Optional: hddtemp
+Optional: hddtemp, lmsensors3, working ACPI library
Installation: ./configure && make && [sudo] make install
Modified: xfce4-sensors-plugin/trunk/TODO
===================================================================
--- xfce4-sensors-plugin/trunk/TODO 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/TODO 2007-10-20 18:11:34 UTC (rev 3416)
@@ -7,3 +7,5 @@
- implement HDD sensor values
+- enable compilöe-time configure-switches
+
Deleted: xfce4-sensors-plugin/trunk/configure.ac
Modified: xfce4-sensors-plugin/trunk/configure.in.in
===================================================================
--- xfce4-sensors-plugin/trunk/configure.in.in 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/configure.in.in 2007-10-20 18:11:34 UTC (rev 3416)
@@ -6,7 +6,7 @@
dnl 2007 Benedikt Meurer <benny at xfce.org>, Fabian Nowak <timystery at arcor.de>
dnl
-m4_define([sensors_version],[0.11.0])
+m4_define([sensors_version],[0.10.99-1])
AC_INIT([xfce4-sensors-plugin], [sensors_version()], [timystery at arcor.de])
AC_PREREQ([2.50])
@@ -31,64 +31,83 @@
dnl Check for standard header files
AC_HEADER_STDC
+
dnl Check for libsensors depending on whether it is disabled upon user request
AC_ARG_ENABLE([libsensors], [AC_HELP_STRING([--disable-libsensors], [Do not use libsensors to read a vast amount of sensors on your mainboards @<:@default=no@:>@])],
[
- HAVE_LIBSENSORS=0
+ HAVE_LIBSENSORS=0
], [
- AC_CHECK_LIB([sensors], [sensors_get_detected_chips],
- [
- AC_DEFINE([HAVE_LIBSENSORS], [1], [Define to 1 if libsensors is found])
- HAVE_LIBSENSORS=1
- ],
- [
- HAVE_LIBSENSORS=0
- ])
+ AC_CHECK_LIB([sensors], [sensors_get_detected_chips],
+ [
+ AC_DEFINE([HAVE_LIBSENSORS], [1], [Define to 1 if libsensors is found])
+ HAVE_LIBSENSORS=1
+ LIBSENSORS_CFLAGS="-I/usr/include"
+ LIBSENSORS_LDFLAGS="-lsensors"
+ ],
+ [
+ HAVE_LIBSENSORS=0
+ ])
])
+AC_SUBST([LIBSENSORS_CFLAGS])
+AC_SUBST([LIBSENSORS_LDFLAGS])
+AM_CONDITIONAL([HAVE_LIBSENSORS], [test $HAVE_LIBSENSORS = 1])
+
dnl Check for hddtemp depending on whether it is disabled upon user request
AC_ARG_ENABLE([hddtemp], [AC_HELP_STRING([--disable-hddtemp], [Do not use hddtemp to read your harddisk temperature @<:@default=no@:>@])],
[
- HAVE_HDDTEMP=0
+ HAVE_HDDTEMP=0
],
[
- AC_CHECK_PROG([hddtemp], [hddtemp], [1])
- if test "$hddtemp" = 1; then
- AC_DEFINE([HAVE_HDDTEMP], [1], [Define to 1 if hddtemp is desired])
- HAVE_HDDTEMP=1
- else
- HAVE_HDDTEMP=0
- fi
+ AC_CHECK_PROG([hddtemp], [hddtemp], [1])
+ if test "$hddtemp" = 1; then
+ AC_DEFINE([HAVE_HDDTEMP], [1], [Define to 1 if hddtemp is desired])
+ HAVE_HDDTEMP=1
+ else
+ HAVE_HDDTEMP=0
+ fi
])
+AM_CONDITIONAL([HAVE_HDDTEMP], [test $HAVE_HDDTEMP = 1])
+
dnl Check for interface for /proc/acpi to be used
AC_ARG_ENABLE([procacpi], [AC_HELP_STRING([--disable-procacpi], [Do not use /proc/acpi to read your CPU temperature @<:@default=no@:>@])],
[
- HAVE_ACPI=0
+ HAVE_ACPI=0
],
[
- AC_CHECK_FILE([/proc/acpi/info],
- [
- AC_DEFINE([HAVE_ACPI], [1], [Define to 1 if proc/acpi is found])
- HAVE_ACPI=1
- ],
- [
- HAVE_ACPI=0
- ])
+ AC_CHECK_FILE([/proc/acpi/info],
+ [
+ AC_DEFINE([HAVE_ACPI], [1], [Define to 1 if proc/acpi is found])
+ HAVE_ACPI=1
+ ],
+ [
+ HAVE_ACPI=0
+ ])
])
+AM_CONDITIONAL([HAVE_ACPI], [test $HAVE_ACPI = 1])
+
+dnl Check for full debugging
+AC_ARG_ENABLE([fulldebug], [AC_HELP_STRING([--enable-fulldebug], [Allow full debugging. Dont use the other debug switches! @<:@default=no@:>@])],
+[
+ AC_DEFINE([DEBUG], [1], [Set this to 1 to enable full debugging. Dont use the other debug switches!])
+ AC_DEFINE([DEBUG_TRACE], [1],
+ [Set this to 1 to enable full trace debugging. Dont use the other debug switches!]
+ )
+ DEBUG=1
+ PLATFORM_CFLAGS="-Wall -Werror $PLATFORM_CFLAGS"
+], [])
+AC_SUBST([PLATFORM_CFLAGS])
+
+
dnl Get operating system information
KERNEL=`uname -s`
if test "$KERNEL" = "Linux"; then
- VERSION=`uname -r`
- if test "$VERSION" = "2.6"; then
- AC_DEFINE([HAVE_LINUX26], [1], [Set this to 1 if using Linux 2.6 or newer])
- else
- AC_DEFINE([HAVE_LINUX24], [1], [Set this to 1 if using Linux 2.4 and older])
- fi
-OS="$KERNEL"
-AC_DEFINE([OS], ["$OS"], [Set this to the name of the oeprating system.])
+ AC_DEFINE([HAVE_LINUX], [1], [Set this to 1 if using Linux or newer])
fi
+dnl OS="$KERNEL"
+dnl AC_DEFINE([OS], ["$OS"], [Set this to the name of the operating system.])
dnl Substitute in Makefile
dnl AC_SUBST(OS)
@@ -140,9 +159,11 @@
dnl *** Print configuration ***
dnl ***************************
echo
-echo "Build Configuration:"
+echo "==============================================================="
+echo "Build Configuration"
+echo "==============================================================="
echo
-echo "Host system: $OS"
+echo "Host system: $OS"
echo
echo "The following sensor interfaces will be built into the plugin:"
if test "$HAVE_HDDTEMP" = 1; then
@@ -155,3 +176,10 @@
echo "* /proc/acpi"
fi
echo
+if test "$DEBUG" = 1; then
+echo "Full debug is enabled"
+else
+echo "Full debug is disabled"
+fi
+echo
+echo "==============================================================="
Modified: xfce4-sensors-plugin/trunk/icons/Makefile
===================================================================
--- xfce4-sensors-plugin/trunk/icons/Makefile 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/icons/Makefile 2007-10-20 18:11:34 UTC (rev 3416)
@@ -36,10 +36,11 @@
POST_UNINSTALL = :
build_triplet = i686-pc-linux-gnu
host_triplet = i686-pc-linux-gnu
+target_triplet = i686-pc-linux-gnu
subdir = icons
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -58,7 +59,7 @@
DATA = $(hicolor48_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/tim/tmp/xfce-4.3/xfce4-sensors-plugin/missing --run aclocal-1.9
-ALL_LINGUAS = de el eu fr hu ja ko lt pl ru vi
+ALL_LINGUAS = ca cs de el en_GB eu fr hu ja ko lt pl ru sq vi zh_TW
AMDEP_FALSE = #
AMDEP_TRUE =
AMTAR = ${SHELL} /home/tim/tmp/xfce-4.3/xfce4-sensors-plugin/missing --run tar
@@ -67,7 +68,7 @@
AUTOHEADER = ${SHELL} /home/tim/tmp/xfce-4.3/xfce4-sensors-plugin/missing --run autoheader
AUTOMAKE = ${SHELL} /home/tim/tmp/xfce-4.3/xfce4-sensors-plugin/missing --run automake-1.9
AWK = mawk
-CATALOGS = de.gmo el.gmo eu.gmo fr.gmo hu.gmo ja.gmo ko.gmo lt.gmo pl.gmo ru.gmo vi.gmo
+CATALOGS = ca.gmo cs.gmo de.gmo el.gmo en_GB.gmo eu.gmo fr.gmo hu.gmo ja.gmo ko.gmo lt.gmo pl.gmo ru.gmo sq.gmo vi.gmo zh_TW.gmo
CATOBJEXT = .gmo
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -91,9 +92,15 @@
F77 =
FFLAGS =
GETTEXT_PACKAGE = xfce4-sensors-plugin
-GMOFILES = de.gmo el.gmo eu.gmo fr.gmo hu.gmo ja.gmo ko.gmo lt.gmo pl.gmo ru.gmo vi.gmo
+GMOFILES = ca.gmo cs.gmo de.gmo el.gmo en_GB.gmo eu.gmo fr.gmo hu.gmo ja.gmo ko.gmo lt.gmo pl.gmo ru.gmo sq.gmo vi.gmo zh_TW.gmo
GMSGFMT = /usr/bin/msgfmt
GREP = /bin/grep
+HAVE_ACPI_FALSE = #
+HAVE_ACPI_TRUE =
+HAVE_HDDTEMP_FALSE = #
+HAVE_HDDTEMP_TRUE =
+HAVE_LIBSENSORS_FALSE = #
+HAVE_LIBSENSORS_TRUE =
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
@@ -104,14 +111,12 @@
INTLTOOL_DESKTOP_RULE = %.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
INTLTOOL_DIRECTORY_RULE = %.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
INTLTOOL_EXTRACT = $(top_builddir)/intltool-extract
-INTLTOOL_ICONV = /usr/bin/iconv
INTLTOOL_KBD_RULE = %.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
INTLTOOL_KEYS_RULE = %.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
INTLTOOL_MERGE = $(top_builddir)/intltool-merge
-INTLTOOL_MSGFMT = /usr/bin/msgfmt
-INTLTOOL_MSGMERGE = /usr/bin/msgmerge
INTLTOOL_OAF_RULE = %.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@
INTLTOOL_PERL = /usr/bin/perl
+INTLTOOL_POLICY_RULE = %.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
INTLTOOL_PONG_RULE = %.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
INTLTOOL_PROP_RULE = %.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
INTLTOOL_SCHEMAS_RULE = %.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
@@ -123,48 +128,50 @@
INTLTOOL_UI_RULE = %.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
INTLTOOL_UPDATE = $(top_builddir)/intltool-update
INTLTOOL_XAM_RULE = %.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_XGETTEXT = /usr/bin/xgettext
INTLTOOL_XML_NOMERGE_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
INTLTOOL_XML_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
LDFLAGS =
LIBOBJS =
-LIBS = -lsensors
+LIBS =
+LIBSENSORS_CFLAGS = -I/usr/include
+LIBSENSORS_LDFLAGS = -lsensors
LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIBXFCE4PANEL_CFLAGS = -DXTHREADS -I/usr/local/include/xfce4/ -I/usr/local/include/xfce4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/atk-1.0
-LIBXFCE4PANEL_LIBS = -L/usr/local/lib -L/usr/X11R6/lib -lxfce4panel -lxfcegui4 -lgtk-x11-2.0 -lxfce4util -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
-LIBXFCE4PANEL_REQUIRED_VERSION = 4.3.20
-LIBXFCE4PANEL_VERSION = 4.3.99.1
+LIBXFCE4PANEL_CFLAGS = -I/usr/include/xfce4/ -I/usr/include/xfce4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/atk-1.0
+LIBXFCE4PANEL_LIBS = -lxfce4panel -lxfcegui4 -lgtk-x11-2.0 -lxfce4util -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage -lpango-1.0 -lcairo -lX11 -lXfixes -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
+LIBXFCE4PANEL_REQUIRED_VERSION = 4.4.0
+LIBXFCE4PANEL_VERSION = 4.4.1
LN_S = ln -s
LTLIBOBJS =
-MAINT =
-MAINTAINER_MODE_FALSE = #
-MAINTAINER_MODE_TRUE =
+MAINT = #
+MAINTAINER_MODE_FALSE =
+MAINTAINER_MODE_TRUE = #
MAKEINFO = ${SHELL} /home/tim/tmp/xfce-4.3/xfce4-sensors-plugin/missing --run makeinfo
MKINSTALLDIRS = ./mkinstalldirs
MSGFMT = /usr/bin/msgfmt
OBJEXT = o
-OS =
PACKAGE = xfce4-sensors-plugin
PACKAGE_BUGREPORT = timystery at arcor.de
PACKAGE_NAME = xfce4-sensors-plugin
-PACKAGE_STRING = xfce4-sensors-plugin 0.10.0
+PACKAGE_STRING = xfce4-sensors-plugin 0.11.0
PACKAGE_TARNAME = xfce4-sensors-plugin
-PACKAGE_VERSION = 0.10.0
+PACKAGE_VERSION = 0.11.0
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
-POFILES = de.po el.po eu.po fr.po hu.po ja.po ko.po lt.po pl.po ru.po vi.po
+PLATFORM_CFLAGS =
+POFILES = ca.po cs.po de.po el.po en_GB.po eu.po fr.po hu.po ja.po ko.po lt.po pl.po ru.po sq.po vi.po zh_TW.po
POSUB = po
PO_IN_DATADIR_FALSE =
PO_IN_DATADIR_TRUE =
RANLIB = ranlib
+SED = /bin/sed
SET_MAKE =
SHELL = /bin/sh
SOLLIBS =
STRIP = strip
USE_NLS = yes
-VERSION = 0.10.0
+VERSION = 0.11.0
XGETTEXT = /usr/bin/xgettext
-XGETTEXT_ARGS = --keyword=Q_
+XGETTEXT_ARGS = --keyword=Q_ --from-code=UTF-8
ac_ct_CC = gcc
ac_ct_CXX = g++
ac_ct_F77 =
@@ -188,6 +195,7 @@
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
+hddtemp = 1
host = i686-pc-linux-gnu
host_alias =
host_cpu = i686
@@ -211,7 +219,11 @@
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
sysconfdir = ${prefix}/etc
+target = i686-pc-linux-gnu
target_alias =
+target_cpu = i686
+target_os = linux-gnu
+target_vendor = pc
hicolor48dir = $(datadir)/icons/hicolor/48x48/apps
hicolor48_DATA = \
xfce-sensors.png
@@ -220,7 +232,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -245,9 +257,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/configure: # $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
Modified: xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am 2007-10-20 18:11:34 UTC (rev 3416)
@@ -1,23 +1,44 @@
plugindir = $(libexecdir)/xfce4/panel-plugins
plugin_PROGRAMS = xfce4-sensors-plugin
-LIBS = @LIBS@ @SOLLIBS@
+# LIBS = @LIBS@ @SOLLIBS@
-xfce4_sensors_plugin_SOURCES = \
- sensors.c \
- sensors.h
+if HAVE_LIBSENSORS
+SENSORS_SOURCES = lmsensors.c lmsensors.h
+endif
-xfce4_sensors_plugin_CFLAGS = \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- @LIBXFCE4PANEL_CFLAGS@
+if HAVE_HDDTEMP
+HDDTEMP_SOURCES = hddtemp.c hddtemp.h
+endif
-xfce4_sensors_plugin_LDFLAGS = \
- @SOLLIBS@ \
- @LIBXFCE4PANEL_LIBS@ \
- -lsensors
+if HAVE_ACPI
+ACPI_SOURCES = acpi.c acpi.h
+endif
-# INCLUDES = \
-# -DG_LOG_DOMAIN=\"xfce4-sensors-plugin\" \
+
+xfce4_sensors_plugin_SOURCES = \
+ middlelayer.c \
+ middlelayer.h \
+ $(SENSORS_SOURCES) \
+ $(HDDTEMP_SOURCES) \
+ $(ACPI_SOURCES) \
+ sensors.c \
+ sensors.h \
+ types.h
+
+xfce4_sensors_plugin_CFLAGS = \
+ @LIBXFCE4PANEL_CFLAGS@ \
+ @PLATFORM_CFLAGS@ \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ @LIBSENSORS_CFLAGS@
+
+xfce4_sensors_plugin_LDFLAGS = \
+ @LIBXFCE4PANEL_LIBS@ \
+ @SOLLIBS@ \
+ @LIBSENSORS_LDFLAGS@
+
+# INCLUDES = \
+# -DG_LOG_DOMAIN=\"xfce4-sensors-plugin\" \
# -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
# .desktop file
@@ -34,15 +55,15 @@
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
+EXTRA_DIST = \
$(desktop_in_in_files)
-DISTCLEANFILES = \
+DISTCLEANFILES = \
$(desktop_DATA) $(desktop_in_files)
# get full path into .desktop file
%.desktop.in: %.desktop.in.in
- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
- $< > $@
+ sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
+ $< > $@
Modified: xfce4-sensors-plugin/trunk/panel-plugin/sensors.c
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/sensors.c 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/panel-plugin/sensors.c 2007-10-20 18:11:34 UTC (rev 3416)
@@ -1,5 +1,5 @@
-/* Copyright 2004 Fabian Nowak (timystery at arcor.de)
- *
+/* Copyright 2004-2007 Fabian Nowak (timystery at arcor.de)
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -12,294 +12,304 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* This plugin requires libsensors-3 and its headers !*/
+/* This plugin requires libsensors-3 and its headers in order to monitor
+ * ordinary mainboard sensors!
+ *
+ * It also works with solely ACPI or hddtemp, but then with more limited
+ * functionality.
+ */
/* Note for programmers and editors: Try to use 4 spaces instead of Tab! */
#include "sensors.h"
-/* #define DEBUG */
-
static void
sensors_set_bar_size (GtkWidget *bar, int size, int orientation)
{
- #ifdef DEBUG
- g_printf ("sensors_set_bar_size \n");
- #endif
- /* check arguments */
- g_return_if_fail (G_IS_OBJECT(bar));
-
- int sizeClass;
-
- if (size<22) sizeClass = 2;
- else if (size < 32) sizeClass = 3;
- else if (size < 48) sizeClass = 4;
- else if (size < 64) sizeClass = 5;
- else sizeClass = 6;
+ TRACE ("enters sensors_set_bar_size");
- if (orientation == GTK_ORIENTATION_HORIZONTAL) {
- gtk_widget_set_size_request (bar, 2 * sizeClass, size - 4);
- } else {
- gtk_widget_set_size_request (bar, size - 4, 2 * sizeClass);
- }
+ /* check arguments */
+ g_return_if_fail (G_IS_OBJECT(bar));
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL) {
+ gtk_widget_set_size_request (bar, BORDER, size-BORDER);
+ } else {
+ gtk_widget_set_size_request (bar, size-BORDER, BORDER);
+ }
+
+ TRACE ("leaves sensors_set_bar_size");
}
static void
-sensors_set_bar_color (GtkWidget *bar, double fraction, gchar* user_bar_color, t_sensors *st)
+sensors_set_bar_color (GtkWidget *bar, double fraction, gchar* user_bar_color,
+ t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_set_bar_color \n");
- #endif
- /* check arguments */
- g_return_if_fail(G_IS_OBJECT(bar));
+ GdkColor color;
+ GtkRcStyle *rc;
- GtkRcStyle *rc = gtk_widget_get_modifier_style(GTK_WIDGET(bar));
- if (!rc) {
- rc = gtk_rc_style_new();
- }
- GdkColor color;
- if (fraction >= 1) {
- gdk_color_parse(COLOR_ERROR, &color);
- } else if ((fraction < .2) || (fraction > .8)) {
- gdk_color_parse(COLOR_WARN, &color);
- } else {
- if (st->showColoredBars)
- gdk_color_parse(user_bar_color, &color);
- else
- gdk_color_parse(COLOR_NORMAL, &color);
- }
- rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
- rc->bg[GTK_STATE_PRELIGHT] = color;
- gtk_widget_modify_bg(bar, GTK_STATE_PRELIGHT, &color);
+ TRACE ("enters sensors_set_bar_color");
+
+ /* check arguments */
+ g_return_if_fail(G_IS_OBJECT(bar));
+
+ rc = gtk_widget_get_modifier_style(GTK_WIDGET(bar));
+ if (!rc) {
+ rc = gtk_rc_style_new();
+ }
+
+ if (fraction >= 1)
+ gdk_color_parse(COLOR_ERROR, &color);
+
+ else if ((fraction < .2) || (fraction > .8))
+ gdk_color_parse(COLOR_WARN, &color);
+
+ else {
+ if (sensors->show_colored_bars)
+ gdk_color_parse(user_bar_color, &color);
+ else
+ gdk_color_parse(COLOR_NORMAL, &color);
+ }
+
+ rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
+ rc->bg[GTK_STATE_PRELIGHT] = color;
+ gtk_widget_modify_bg(bar, GTK_STATE_PRELIGHT, &color);
+
+ TRACE ("leaves sensors_set_bar_color");
}
static double
-sensors_get_percentage (gint chipNum, gint feature, t_sensors *st)
+sensors_get_percentage (t_chipfeature *chipfeature)
{
- #ifdef DEBUG
- g_printf ("sensors_get_percentage \n");
- #endif
- int value = st->sensorRawValues[chipNum][feature];
- int min = st->sensorMinValues[chipNum][feature];
- int max = st->sensorMaxValues[chipNum][feature];
- double percentage = (double) (value - min) / (max - min);
- if ((percentage > 1) || (percentage <= 0)) {
- return 1;
- }
- return percentage;
+ double value, min, max, percentage;
+
+ TRACE ("enters sensors_get_percentage");
+
+ value = chipfeature->raw_value;
+ min = chipfeature->min_value;
+ max = chipfeature->max_value;
+ percentage = (value - min) / (max - min);
+
+ if ((percentage > 1) || (percentage <= 0)) {
+ TRACE ("leaves sensors_get_percentage with 1.0");
+ return 1.0;
+ }
+
+ TRACE ("leaves sensors_get_percentage with %f", percentage);
+ return percentage;
}
static void
-sensors_remove_graphical_panel (t_sensors *st)
+sensors_remove_graphical_panel (t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_remove_graphical_panel \n");
- #endif
- int chip, feature;
- for (chip=0; chip < st->sensorNumber; chip++) {
- for (feature=0; feature < FEATURES_PER_SENSOR; feature++) {
- if (st->sensorCheckBoxes[chip][feature] == TRUE) {
- t_barpanel *panel = (t_barpanel*) st->panels[chip][feature];
+ int chipNum, feature;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
+ t_barpanel *panel;
- gtk_widget_destroy(panel->progressbar);
- gtk_widget_destroy(panel->label);
- gtk_widget_destroy(panel->databox);
- g_free(panel);
- }
- }
- }
- st->barsCreated = FALSE;
- gtk_widget_hide(st->panelValuesLabel);
+ TRACE ("enters sensors_remove_graphical_panel");
+
+ for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
+ chip = (t_chip *) g_ptr_array_index(sensors->chips, chipNum);
+ g_assert (chip != NULL);
+
+ for (feature=0; feature<chip->num_features; feature++) {
+ chipfeature = g_ptr_array_index(chip->chip_features, feature);
+ g_assert (chipfeature != NULL);
+
+ if (chipfeature->show == TRUE) {
+ panel = (t_barpanel*) sensors->panels[chipNum][feature];
+
+ gtk_widget_destroy (panel->progressbar);
+ gtk_widget_destroy (panel->label);
+ gtk_widget_destroy (panel->databox);
+ g_free (panel);
+ }
+ }
+ }
+ sensors->bars_created = FALSE;
+ gtk_widget_hide(sensors->panel_label_text);
+
+ TRACE ("leaves sensors_remove_graphical_panel");
}
static void
-sensors_update_graphical_panel (t_sensors *st)
+sensors_update_graphical_panel (t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_update_graphical_panel \n");
- #endif
- int chip, feature;
- for (chip=0; chip < st->sensorNumber; chip++) {
- for (feature=0; feature < FEATURES_PER_SENSOR; feature++) {
- if (st->sensorCheckBoxes[chip][feature] == TRUE) {
- t_barpanel *panel = (t_barpanel*) st->panels[chip][feature];
+ int chipNum, feature;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
+ t_barpanel *panel;
+ double fraction;
+ GtkWidget *bar;
- GtkWidget *bar = panel->progressbar;
- g_return_if_fail (G_IS_OBJECT(bar));
+ TRACE("enters sensors_update_graphical_panel");
- sensors_set_bar_size (bar, (int) st->panelSize,
- st->orientation);
- double fraction = sensors_get_percentage (
- chip, feature, st);
- sensors_set_bar_color (bar, fraction, st->sensorColors[chip][feature], st);
- gtk_progress_bar_set_fraction (
- GTK_PROGRESS_BAR(bar), fraction);
- }
- }
- }
+ for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
+ chip = (t_chip *) g_ptr_array_index(sensors->chips, chipNum);
+ g_assert (chip != NULL);
+
+ for (feature=0; feature<chip->num_features; feature++) {
+ chipfeature = g_ptr_array_index(chip->chip_features, feature);
+ g_assert (chipfeature != NULL);
+
+ if (chipfeature->show == TRUE) {
+ panel = (t_barpanel*) sensors->panels[chipNum][feature];
+
+ bar = panel->progressbar;
+ g_return_if_fail (G_IS_OBJECT(bar));
+
+ sensors_set_bar_size (bar, (int) sensors->panel_size,
+ sensors->orientation);
+ fraction = sensors_get_percentage (chipfeature);
+ sensors_set_bar_color (bar, fraction, chipfeature->color,
+ sensors);
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(bar),
+ fraction);
+ }
+ }
+ }
+
+ TRACE("leaves sensors_update_graphical_panel");
}
static void
-sensors_add_graphical_panel (t_sensors *st)
+sensors_add_graphical_panel (t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_add_graphical_panel \n");
- #endif
- gtk_label_set_markup(GTK_LABEL(st->panelValuesLabel), _("<b>Sensors</b>"));
+ int chipNum, feature;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
+ t_barpanel *panel;
+ gboolean has_bars = FALSE;
+ GtkWidget *progbar, *databox, *label;
+ gchar *caption, *myLabelText;
- gboolean has_bars = FALSE;
+ TRACE ("enters sensors_add_graphical_panel");
- int chip, feature;
- for (chip=0; chip < st->sensorNumber; chip++) {
- for (feature=0; feature < FEATURES_PER_SENSOR; feature++) {
- if (st->sensorCheckBoxes[chip][feature] == TRUE) {
- has_bars = TRUE;
+ myLabelText = g_strdup (_("<span foreground=\"#000000\">"
+ "<b>Sensors</b></span>\n"));
+ gtk_label_set_markup (GTK_LABEL(sensors->panel_label_text), myLabelText);
+ gtk_misc_set_alignment(GTK_MISC(sensors->panel_label_text), 0.0, 0.5);
- /* prepare the progress bar */
- GtkWidget *progbar = gtk_progress_bar_new();
+ for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
+ chip = (t_chip *) g_ptr_array_index(sensors->chips, chipNum);
+ g_assert (chip != NULL);
- if (st->orientation == GTK_ORIENTATION_HORIZONTAL) {
- gtk_progress_bar_set_orientation (
- GTK_PROGRESS_BAR (progbar),
- GTK_PROGRESS_BOTTOM_TO_TOP);
- } else {
- gtk_progress_bar_set_orientation (
- GTK_PROGRESS_BAR (progbar),
- GTK_PROGRESS_LEFT_TO_RIGHT);
- }
- sensors_set_bar_size (progbar,
- (int) st->panelSize,
- st->orientation);
- gtk_widget_show(progbar);
+ for (feature=0; feature<chip->num_features; feature++) {
+ chipfeature = g_ptr_array_index (chip->chip_features, feature);
+ g_assert (chipfeature != NULL);
- /* put it all in the box */
- GtkWidget *databox;
- if (st->orientation == GTK_ORIENTATION_HORIZONTAL) {
- databox = gtk_hbox_new (FALSE, 0);
- } else {
- databox = gtk_vbox_new (FALSE, 0);
- }
- gtk_widget_show (databox);
-
- /* save the panel elements */
- t_barpanel *panel = g_new (t_barpanel, 1);
- panel->progressbar = progbar;
-
- /* create the label stuff only if needed - saves some memory! */
- if (st->showLabels == TRUE) {
- gchar caption[128];
- g_snprintf (caption, sizeof(caption), "%s",
- st->sensorNames[chip][feature]);
- GtkWidget *label = gtk_label_new (caption);
- gtk_misc_set_padding (GTK_MISC(label), 3, 0);
+ if (chipfeature->show == TRUE) {
+ has_bars = TRUE;
+
+ /* prepare the progress bar */
+ progbar = gtk_progress_bar_new();
+
+ if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_progress_bar_set_orientation (
+ GTK_PROGRESS_BAR (progbar),
+ GTK_PROGRESS_BOTTOM_TO_TOP);
+ else
+ gtk_progress_bar_set_orientation (
+ GTK_PROGRESS_BAR (progbar),
+ GTK_PROGRESS_LEFT_TO_RIGHT);
+
+ sensors_set_bar_size (progbar, (int) sensors->panel_size,
+ sensors->orientation);
+ gtk_widget_show (progbar);
+
+ /* put it all in the box */
+ if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL)
+ databox = gtk_hbox_new (FALSE, 0);
+
+ else
+ databox = gtk_vbox_new (FALSE, 0);
+
+ gtk_widget_show (databox);
+
+ /* save the panel elements */
+ panel = g_new (t_barpanel, 1);
+ panel->progressbar = progbar;
+
+ /* create the label stuff only if needed - saves some memory! */
+ if (sensors->show_labels == TRUE) {
+ caption = g_strdup (chipfeature->name);
+ if (strlen(caption)>16) {
+ caption[12]='.'; caption[13]='.';
+ caption[14]='.'; caption[15]='\n';
+ g_free (caption+16);
+ }
+ label = gtk_label_new (caption);
+ gtk_misc_set_padding (GTK_MISC(label), INNER_BORDER, 0);
gtk_widget_show (label);
panel->label = label;
-
- gtk_box_pack_start (GTK_BOX(databox), label,
- FALSE, FALSE, 0);
- }
- else {
- panel->label = NULL;
- }
-
- gtk_box_pack_start (GTK_BOX(databox), progbar,
- FALSE, FALSE, 0);
- gtk_container_set_border_width (
- GTK_CONTAINER(databox), 0); /* BORDER); */ /* border_width); */
- panel->databox = databox;
- st->panels[chip][feature] = (GtkWidget*) panel;
+ gtk_box_pack_start (GTK_BOX(databox), label, FALSE, FALSE, 0);
+ }
+ else
+ panel->label = NULL;
- /* and add it to the outer box */
- gtk_box_pack_start (GTK_BOX (st->sensors),
- databox, FALSE, FALSE, 3);
- }
- }
- }
- if (has_bars && !st->showTitle) {
- gtk_widget_hide (st->panelValuesLabel);
- } else {
- gtk_widget_show (st->panelValuesLabel);
- }
- st->barsCreated = TRUE;
- sensors_update_graphical_panel(st);
+ gtk_box_pack_start (GTK_BOX(databox), progbar, FALSE, FALSE, 0);
+
+ /* gtk_misc_set_padding (GTK_MISC(databox), 0, OUTER_BORDER); */
+
+ panel->databox = databox;
+ sensors->panels[chipNum][feature] = (GtkWidget*) panel;
+
+ /* and add it to the outer box */
+ gtk_container_set_border_width (GTK_CONTAINER(sensors->widget_sensors), OUTER_BORDER);
+ gtk_box_pack_start (GTK_BOX (sensors->widget_sensors),
+ databox, FALSE, FALSE, INNER_BORDER);
+ }
+ }
+ }
+ if (has_bars && !sensors->show_title)
+ gtk_widget_hide (sensors->panel_label_text);
+ else
+ gtk_widget_show (sensors->panel_label_text);
+
+ sensors->bars_created = TRUE;
+ sensors_update_graphical_panel (sensors);
+
+ TRACE ("leaves sensors_add_graphical_panel");
}
static gboolean
-sensors_show_graphical_panel (t_sensors *st)
+sensors_show_graphical_panel (t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_show_graphical_panel \n");
- #endif
- if (st->barsCreated == TRUE) {
- sensors_update_graphical_panel(st);
- } else {
- sensors_add_graphical_panel(st);
- }
- return TRUE;
+ TRACE ("enters sensors_show_graphical_panel");
+
+ if (sensors->bars_created == TRUE)
+ sensors_update_graphical_panel (sensors);
+ else
+ sensors_add_graphical_panel (sensors);
+
+ TRACE ("leaves sensors_show_graphical_panel");
+
+ return TRUE;
}
-/* draw label with sensor values into panel's vbox */
-static gboolean
-sensors_show_text_panel (t_sensors *st)
+static int
+determine_number_of_rows (t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_show_text_panel \n");
- #endif
-/* REMARK:
- Since sensors_show_panel is called with the same period as
- update_tooltip and update_tooltip already reads in new
- sensor values, this isn't done again in here */
+ gint numRows, size;
- gtk_widget_show (st->panelValuesLabel);
- gtk_misc_set_padding (GTK_MISC(st->panelValuesLabel), 2, 0);
+ TRACE ("enters determine_number_of_rows");
- /* add labels */
- gint chipNumber = 0;
- gint itemsToDisplay = 0;
-
- gchar *myLabelText;
-
- if (st->showTitle == TRUE) {
- myLabelText = g_strdup_printf(_(
- "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"),
- st->fontSize);
- }
- else /* nul-terminate the string for further concatenating */
- myLabelText = g_strdup ("");
-
- /* count number of checked sensors to display.
- this could also be done by every toggle/untoggle action
- by putting this variable into t_sensors */
- while (chipNumber < st->sensorNumber) {
-
- gint chipFeature = 0;
-
- while (chipFeature < FEATURES_PER_SENSOR) {
-
- if (st->sensorCheckBoxes[chipNumber][chipFeature] == TRUE)
- itemsToDisplay++;
+ numRows = 0;
+ size = sensors->panel_size;
- chipFeature ++;
- }
-
- chipNumber++;
- }
-
- gint numRows = 0, numCols, size = st->panelSize;
-
- if (st->orientation == GTK_ORIENTATION_HORIZONTAL) {
- switch (st->fontSizeNumerical) {
+ if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL) {
+ switch (sensors->font_size_numerical) {
/* we have to allocate N items per row and N-1 spaces. Assuming that
row spacing is half the font size and smallest font size is 6, we add
6/2 more space for row spacing per each item, except for the last.
@@ -308,264 +318,304 @@
of the icon theme, but he doesn't want to find out where those
settings can be found. */
case 0: for (size+=3; size>=(6+3); numRows++, size-=(6+3)) ; break;
-
+
case 1: for (size+=4; size>=(8+4); numRows++, size-=(8+4)) ; break;
-
+
case 2: for (size+=5; size>=(10+5); numRows++, size-=(10+5)) ; break;
-
+
case 3: for (size+=6; size>=(12+6); numRows++, size-=(12+6)) ; break;
-
+
case 4: for (size+=7; size>=(14+7); numRows++, size-=(14+7)) ; break;
default: numRows = 2;
} /* end switch */
} /* end if horizontal */
- else {
- numRows = FEATURES_PER_SENSOR * SENSORS + 1; /* cannot have more rows ;-) */
- }
-
+ else
+ /* could not have more rows when limited amount of pointers was used
+ before*/
+ numRows = 256 * 10 + 1;
+
/* fail-safe */
- if (numRows==0) numRows = 1;
-
- if (st->showTitle == TRUE ) {
- numRows--; /* we can draw one more item per column */
-
- /* draw the title if no item is to be displayed */
- /* This allows a user to still find the plugin */
- /* might also be replaced by approximately two spaces */
- if (itemsToDisplay==0)
- myLabelText = g_strdup_printf(_(
- "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"),
- st->fontSize);
- }
-
- if ( numRows > 1) {
- if( itemsToDisplay > numRows )
+ if (numRows==0)
+ numRows = 1;
+
+ TRACE ("leaves determine_number_of_rows");
+
+ return numRows;
+}
+
+
+static int
+determine_number_of_cols (int numRows, int itemsToDisplay)
+{
+ gint numCols;
+
+ TRACE ("enters determine_number_of_cols");
+
+ if (numRows > 1) {
+ if (itemsToDisplay > numRows)
/* the following is a simple integer ceiling function */
- numCols = (itemsToDisplay%numRows == 0)?
+ numCols = (itemsToDisplay%numRows == 0) ?
itemsToDisplay/numRows : itemsToDisplay/numRows+1;
else
numCols = 1;
- }
- else
+ }
+ else
numCols = itemsToDisplay;
-
- gint currentColumn = 0;
-
- chipNumber=0;
- while (chipNumber < st->sensorNumber) {
-
- gint chipFeature = 0;
-
- while (chipFeature < FEATURES_PER_SENSOR) {
-
- if (st->sensorCheckBoxes[chipNumber][chipFeature] == TRUE) {
- myLabelText = g_strconcat (myLabelText, "<span foreground=\"",
- st->sensorColors[chipNumber][chipFeature], "\" size=\"",
- st->fontSize, "\">",
- st->sensorValues[chipNumber][chipFeature], "</span>",
- NULL);
-
+
+ TRACE ("leaves determine_number_of_cols");
+
+ return numCols;
+}
+
+
+static void
+sensors_set_text_panel_label (t_sensors *sensors, gint numCols,
+ gint itemsToDisplay, gchar **myLabelText)
+{
+ gint currentColumn, chipNum, feature;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
+
+ TRACE ("enters sensors_set_text_panel_label");
+
+ currentColumn = 0;
+
+ for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
+ chip = (t_chip *) g_ptr_array_index (sensors->chips, chipNum);
+ g_assert (chip != NULL);
+
+ for (feature=0; feature<chip->num_features; feature++) {
+ chipfeature = g_ptr_array_index (chip->chip_features, feature);
+ g_assert (chipfeature != NULL);
+
+ if (chipfeature->show == TRUE) {
+ *myLabelText = g_strconcat (*myLabelText,
+ "<span foreground=\"",
+ chipfeature->color, "\" size=\"",
+ sensors->font_size, "\">",
+ chipfeature->formatted_value,
+ "</span>", NULL);
+
if (currentColumn < numCols-1) {
- myLabelText = g_strconcat (myLabelText, " \t", NULL);
+ *myLabelText = g_strconcat (*myLabelText, " \t", NULL);
currentColumn++;
}
else if (itemsToDisplay > 1) { /* do NOT add \n if last item */
- myLabelText = g_strconcat (myLabelText, " \n", NULL);
+ *myLabelText = g_strconcat (*myLabelText, " \n", NULL);
currentColumn = 0;
}
itemsToDisplay--;
}
+ }
+ }
- chipFeature++;
+ g_assert (itemsToDisplay==0);
+
+ gtk_label_set_markup (GTK_LABEL(sensors->panel_label_text), *myLabelText);
+
+ TRACE ("leaves sensors_set_text_panel_label");
+}
+
+
+static int
+count_number_checked_sensor_features (t_sensors *sensors)
+{
+ gint chipNum, feature, itemsToDisplay;
+ t_chipfeature *chipfeature;
+ t_chip *chip;
+
+ TRACE ("enters count_number_checked_sensor_features");
+
+ itemsToDisplay = 0;
+
+
+ for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
+ chip = (t_chip *) g_ptr_array_index (sensors->chips, chipNum);
+ g_assert (chip!=NULL);
+
+ for (feature=0; feature<chip->num_features; /* none */ ) {
+ chipfeature = g_ptr_array_index (chip->chip_features, feature);
+ g_assert (chipfeature!=NULL);
+
+ if (chipfeature->show == TRUE)
+ itemsToDisplay++;
+
+ if (chipfeature->valid == TRUE)
+ feature++;
}
+ }
- chipNumber++;
+ TRACE ("leaves count_number_checked_sensor_features");
+
+ return itemsToDisplay;
+}
+
+/* draw label with sensor values into panel's vbox */
+static gboolean
+sensors_show_text_panel (t_sensors *sensors)
+{
+ gint itemsToDisplay, numRows, numCols;
+ gchar *myLabelText;
+
+ TRACE ("enters sensors_show_text_panel");
+
+/* REMARK (old):
+ Since sensors_show_panel is called with the same period as
+ update_tooltip and update_tooltip already reads in new
+ sensor values, this isn't done again in here.
+ (new): We should perhaps now care more about that, as it is no more done in
+ update_tooltip(). FIXME therefore. */
+
+ gtk_widget_show (sensors->panel_label_text);
+ gtk_misc_set_padding (GTK_MISC(sensors->panel_label_text), OUTER_BORDER, 0);
+
+ /* count number of checked sensors to display.
+ this could also be done by every toggle/untoggle action
+ by putting this variable into t_sensors */
+ itemsToDisplay = count_number_checked_sensor_features (sensors);
+
+ numRows = determine_number_of_rows (sensors);
+
+ if (sensors->show_title == TRUE || itemsToDisplay==0) {
+ myLabelText = g_strdup_printf (_("<span foreground=\"#000000\" "
+ "size=\"%s\"><b>Sensors</b></span>\n"),
+ sensors->font_size);
+ if (sensors->show_title == TRUE)
+ numRows--; /* we can draw one more item per column */
}
+ else
+ /* draw the title if no item is to be displayed.
+ This enables the user to still find the plugin. */
+ myLabelText = g_strdup ("");
- gtk_label_set_markup (GTK_LABEL(st->panelValuesLabel), myLabelText);
-
+ numCols = determine_number_of_cols (numRows, itemsToDisplay);
+
+ sensors_set_text_panel_label (sensors, numCols, itemsToDisplay,
+ &myLabelText);
+
+ TRACE ("leaves sensors_show_text_panel\n");
+
return TRUE;
}
-static double
-get_hddtemp_value (char* disk)
+static void
+format_sensor_value (t_tempscale scale, t_chipfeature *chipfeature,
+ double sensorFeature, gchar **help)
{
- #ifdef DEBUG
- g_printf ("get_hddtemp_value %s \n", disk);
- #endif
+ /* TRACE ("enters format_sensor_value"); */
- GError *error = NULL;
- gchar *standard_output;
- gchar *standard_error;
- gint exit_status=0;
+ switch (chipfeature->class) {
+ case TEMPERATURE:
+ if (scale == FAHRENHEIT) {
+ *help = g_strdup_printf("%5.1f °F",
+ (float) (sensorFeature * 9/5 + 32) );
+ } else { /* Celsius */
+ *help = g_strdup_printf("%5.1f °C", sensorFeature);
+ }
+ break;
- gboolean result;
- gchar *cmd_line;
- cmd_line = g_strdup_printf ( "hddtemp -n -q %s", disk);
- result = g_spawn_command_line_sync ( cmd_line,
- &standard_output, &standard_error, &exit_status, &error);
-
- /* filter those with no sensors out */
- if (!result || exit_status!=0 /* || error!=NULL */ ) {
- return 0.0;
- }
-
- double value = strtod ( (const char*) standard_output, NULL);
-
- g_free(cmd_line);
- g_free(standard_output);
- g_free(standard_error);
-
- return value;
+ case VOLTAGE:
+ *help = g_strdup_printf("%+5.2f V", sensorFeature);
+ break;
+
+
+ case SPEED:
+ *help = g_strdup_printf(_("%5.0f rpm"), sensorFeature);
+ break;
+
+ default:
+ *help = g_strdup_printf("%+5.2f", sensorFeature);
+ break;
+ } /* end switch */
+
+ /* TRACE ("leaves format_sensor_value"); */
}
/* create tooltip
Updates the sensor values, see lines 440 and following */
static gboolean
-sensors_date_tooltip (gpointer data)
+sensors_create_tooltip (gpointer data)
{
- #ifdef DEBUG
- g_printf ("sensors_date_tooltip \n");
- #endif
+ TRACE ("enters sensors_create_tooltip");
+ t_sensors *sensors;
+ GtkWidget *widget;
+ int i, index_feature, res;
+ double sensorFeature;
+ gboolean first, prependedChipName;
+ gchar *myToolTipText, *tmp;
+ t_chipfeature *chipfeature;
+ t_chip *chip;
+
g_return_val_if_fail (data != NULL, FALSE);
- t_sensors *st = (t_sensors *) data;
-
- GtkWidget *widget = st->eventbox;
+ sensors = (t_sensors *) data;
+ widget = sensors->eventbox;
+ myToolTipText = g_strdup (_("No sensors selected!"));
+ first = TRUE;
-/* FIXME: Work more with asprintf(target, source); here */
+ for (i=0; i < sensors->num_sensorchips; i++) {
+ chip = (t_chip *) g_ptr_array_index(sensors->chips, i);
+ g_assert (chip!=NULL);
- gchar *myToolTipText;
-
- /* circumvent empty char pointer */
- myToolTipText = g_strdup (_("No sensors selected!"));
-
- int i=0;
-
- if (st->sensorNumber > SENSORS+1) return FALSE; /* accept one more for hdd */
-
- gboolean first = TRUE;
+ prependedChipName = FALSE;
- /* FIXME: update hddtemp values after while loop */
+ for (index_feature = 0; index_feature<chip->num_features; index_feature++) {
+ chipfeature = g_ptr_array_index(chip->chip_features, index_feature);
+ g_assert (chipfeature!=NULL);
- gboolean prependedChipName;
- while ( i < st->sensorNumber-1 ) { /* last one is hddtemp */
-
- int nr1 = 0;
- prependedChipName = FALSE;
- while ( nr1 < FEATURES_PER_SENSOR ) {
-
- if ( st->sensorValid[i][nr1] == TRUE &&
- st->sensorCheckBoxes[i][nr1] == TRUE ) {
-
- if ( prependedChipName != TRUE) {
-
+ if ( chipfeature->valid == TRUE && chipfeature->show == TRUE ) {
+
+ if (prependedChipName != TRUE) {
+
if (first == TRUE) {
- myToolTipText = g_strdup(st->sensorId[i]);
+ myToolTipText = g_strdup (chip->sensorId);
first = FALSE;
}
else
- myToolTipText = g_strconcat (
- myToolTipText, " \n ", st->sensorId[i], NULL);
-
+ myToolTipText = g_strconcat (myToolTipText, " \n",
+ chip->sensorId, NULL);
+
prependedChipName = TRUE;
} /* end if prepended chipname */
-
- double sensorFeature;
- int res = sensors_get_feature(*st->chipName[i], nr1,
- &sensorFeature);
+ res = sensors_get_feature_wrapper (chip, chipfeature->address,
+ &sensorFeature);
+
if ( res!=0 ) {
- g_printf( _(" \nXfce Hardware Sensors Plugin: \
-\nSeems like there was a problem reading a sensor \
-feature value. \nProper proceeding cannot be \
-guaranteed.\n"));
+ g_printf ( _("Xfce Hardware Sensors Plugin:\n"
+ "Seems like there was a problem reading a sensor feature "
+ "value. \nProper proceeding cannot be guaranteed.\n") );
break;
}
-
- gchar *help;
- switch (st->sensor_types[i][nr1]) {
- case TEMPERATURE:
- if( st->scale == FAHRENHEIT ) {
- help = g_strdup_printf("%5.1f °F",
- (float) (sensorFeature * 9/5 + 32) );
- } else { /* Celsius */
- help = g_strdup_printf("%5.1f °C", sensorFeature);
- }
- break;
- case VOLTAGE:
- help = g_strdup_printf("%+5.2f V", sensorFeature);
- break;
- case SPEED:
- help = g_strdup_printf(_("%5.0f rpm"), sensorFeature);
- break;
- default: help = g_strdup_printf("%+5.2f", sensorFeature);
- break;
- } /* end switch */
-
- myToolTipText = g_strconcat (myToolTipText, "\n ",
- st->sensorNames[i][nr1], ": ", help, NULL);
-
- st->sensorValues[i][nr1] = g_strdup (help);
- st->sensorRawValues[i][nr1] = sensorFeature;
-
- g_free (help);
- }
+ tmp = g_new (gchar, 0);
+ format_sensor_value (sensors->scale, chipfeature,
+ sensorFeature, &tmp);
- nr1++;
- }
+ myToolTipText = g_strconcat (myToolTipText, "\n ",
+ chipfeature->name, ": ", tmp,
+ NULL);
- i++;
- }
-
- /* now use 'i' to get hddtemp information */
- int diskIndex = 0;
-
- prependedChipName = FALSE;
- while ( diskIndex < st->numDisks ) {
-
- if ( st->sensorValid[i][diskIndex] == TRUE &&
- st->sensorCheckBoxes[i][diskIndex] == TRUE ) {
-
- if ( prependedChipName != TRUE) {
- if (first == TRUE) {
- myToolTipText = g_strdup(st->sensorId[i]);
- first = FALSE;
- }
- else
- myToolTipText = g_strconcat (
- myToolTipText, " \n ", st->sensorId[i], NULL);
- prependedChipName = TRUE;
- }
-
- double value;
- value = get_hddtemp_value (
- g_ptr_array_index (st->disklist, diskIndex));
-
- gchar *help;
- if( st->scale == FAHRENHEIT )
- help = g_strdup_printf("%5.1f °F", (float) (value * 9/5 + 32));
- else /* Celsius */
- help = g_strdup_printf("%5.1f °C", value);
+ /* FIXME: uuh, we update the values in here. how ugly.
+ Put me in another function. */
+ chipfeature->formatted_value = g_strdup (tmp);
+ chipfeature->raw_value = sensorFeature;
- myToolTipText = g_strconcat (myToolTipText, "\n ",
- st->sensorNames[i][diskIndex], ": ", help, NULL);
-
- st->sensorValues[i][diskIndex] = g_strdup (help);
- st->sensorRawValues[i][diskIndex] = value;
- }
- diskIndex++;
+ g_free (tmp);
+ } /* end if chipfeature->valid */
+ } /* end while chipfeature != NULL */
}
- if (!tooltips) {
+ if (!tooltips)
tooltips = gtk_tooltips_new();
- }
- gtk_tooltips_set_tip (tooltips, GTK_WIDGET(st->eventbox), myToolTipText,
- NULL);
+ gtk_tooltips_set_tip (tooltips, GTK_WIDGET(sensors->eventbox),
+ myToolTipText, NULL);
+
+ TRACE ("leaves sensors_create_tooltip");
+
return TRUE;
}
@@ -573,1243 +623,1206 @@
static gboolean
sensors_show_panel (gpointer data)
{
- #ifdef DEBUG
- g_printf ("sensors_show_panel \n");
- #endif
- g_return_val_if_fail (data != NULL, FALSE);
+ t_sensors *sensors;
+ gboolean result;
- t_sensors *st = (t_sensors *) data;
+ TRACE ("enters sensors_show_panel");
- sensors_date_tooltip ((gpointer) st);
- if (st->useBarUI == FALSE) {
- return sensors_show_text_panel (st);
- } else {
- return sensors_show_graphical_panel (st);
- }
+ g_return_val_if_fail (data != NULL, FALSE);
+
+ sensors = (t_sensors *) data;
+
+ sensors_create_tooltip ((gpointer) sensors);
+
+ if (sensors->display_values_graphically == FALSE)
+ result = sensors_show_text_panel (sensors);
+ else
+ result = sensors_show_graphical_panel (sensors);
+
+ TRACE ("leaves sensors_show_panel\n");
+ return result;
}
static void
-sensors_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation,
- t_sensors *st)
+sensors_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation,
+ t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_set_orientation \n");
- #endif
+ GtkWidget *newBox;
+ int i, feature;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
+ t_barpanel *panel;
- if (orientation == st->orientation) return;
-
- st->orientation = orientation;
-
- if (st->useBarUI==FALSE) return;
-
- GtkWidget *newBox;
+ TRACE ("enters sensors_set_orientation");
- if (orientation == GTK_ORIENTATION_HORIZONTAL) {
- newBox = gtk_hbox_new(FALSE, 0);
- } else {
- newBox = gtk_vbox_new(FALSE, 0);
- }
- gtk_widget_show (newBox);
-
- gtk_widget_reparent(st->panelValuesLabel, newBox);
-
- int chip, feature;
- for (chip=0; chip < st->sensorNumber; chip++) {
- for (feature=0; feature < FEATURES_PER_SENSOR; feature++) {
- if (st->sensorCheckBoxes[chip][feature] == TRUE) {
- t_barpanel *panel = (t_barpanel*) st->panels[chip][feature];
- gtk_widget_reparent (panel->databox, newBox);
- }
- }
- }
-
- gtk_widget_destroy (st->sensors);
- st->sensors = newBox;
-
- gtk_container_add (GTK_CONTAINER (st->eventbox), st->sensors);
-
- sensors_remove_graphical_panel(st);
- sensors_show_panel (st);
+ if (orientation == sensors->orientation || !sensors->display_values_graphically)
+ return;
+
+ sensors->orientation = orientation; /* now assign the new orientation */
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ newBox = gtk_hbox_new(FALSE, 0);
+ else
+ newBox = gtk_vbox_new(FALSE, 0);
+
+ gtk_widget_show (newBox);
+
+ gtk_widget_reparent (sensors->panel_label_text, newBox);
+
+ for (i=0; i < sensors->num_sensorchips; i++) {
+ chip = (t_chip *) g_ptr_array_index (sensors->chips, i);
+ g_assert (chip!=NULL);
+
+ for (feature = 0; feature<chip->num_features; feature++) {
+ chipfeature = g_ptr_array_index (chip->chip_features, feature);
+ g_assert (chipfeature!=NULL);
+
+ if (chipfeature->show == TRUE) {
+ panel = (t_barpanel*) sensors->panels[i][feature];
+ gtk_widget_reparent (panel->databox, newBox);
+ }
+ }
+ }
+
+ gtk_widget_destroy (sensors->widget_sensors);
+ sensors->widget_sensors = newBox;
+
+ gtk_container_add (GTK_CONTAINER (sensors->eventbox),
+ sensors->widget_sensors);
+
+ sensors_remove_graphical_panel (sensors);
+ sensors_show_panel (sensors);
+
+ TRACE ("leaves sensors_set_orientation");
}
/* initialize box and label to pack them together */
static void
-create_panel_widget (t_sensors * st)
+create_panel_widget (t_sensors * sensors)
{
- #ifdef DEBUG
- g_printf ("create_panel_widget \n");
- #endif
+ TRACE ("enters create_panel_widget");
/* initialize a new vbox widget */
- if (st->orientation == GTK_ORIENTATION_HORIZONTAL)
- st->sensors = gtk_hbox_new (FALSE, 0);
+ if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL)
+ sensors->widget_sensors = gtk_hbox_new (FALSE, 0);
else
- st->sensors = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (st->sensors);
-
+ sensors->widget_sensors = gtk_vbox_new (FALSE, 0);
+
+ gtk_widget_show (sensors->widget_sensors);
+
/* initialize value label widget */
- st->panelValuesLabel = gtk_label_new(NULL);
- gtk_widget_show (st->panelValuesLabel);
-
+ sensors->panel_label_text = gtk_label_new (NULL);
+ gtk_widget_show (sensors->panel_label_text);
+
/* create 'valued' label */
- sensors_show_panel(st);
-
+ sensors_show_panel (sensors);
+
+ g_assert (sensors->panel_label_text!=NULL);
+
/* add newly created label to box */
- gtk_box_pack_start(GTK_BOX (st->sensors), st->panelValuesLabel, FALSE,
- FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (sensors->widget_sensors),
+ sensors->panel_label_text, FALSE, FALSE, 0);
+
+ TRACE ("leaves create_panel_widget");
}
/* double-click improvement */
static gboolean
-execute_command (GtkWidget *widget, GdkEventButton *event, gpointer data)
+execute_command (GtkWidget *widget, GdkEventButton *event, gpointer data)
{
- #ifdef DEBUG
- g_printf ("execute_command \n");
- #endif
-
- g_return_val_if_fail (data != NULL, FALSE);
-
- if (event->type == GDK_2BUTTON_PRESS) {
+ t_sensors *sensors;
- t_sensors *st = (t_sensors *) data;
-
- g_return_val_if_fail ( st->execCommand, FALSE);
-
- GError *error;
- /* gboolean res = */
- xfce_exec (st->commandName, FALSE, FALSE, &error);
-
- return TRUE;
+ TRACE ("enters execute_command");
+
+ g_return_val_if_fail (data != NULL, FALSE);
+
+ if (event->type == GDK_2BUTTON_PRESS) {
+
+ sensors = (t_sensors *) data;
+
+ g_return_val_if_fail ( sensors->exec_command, FALSE);
+
+ xfce_exec (sensors->command_name, FALSE, FALSE, NULL);
+
+ TRACE ("leaves execute_command with TRUE");
+
+ return TRUE;
}
- else
- return FALSE;
+ else {
+ TRACE ("leaves execute_command with FALSE");
+ return FALSE;
+ }
}
-static t_sensors *
-sensors_new (XfcePanelPlugin *plugin)
+static void
+sensors_init_default_values (t_sensors *sensors, XfcePanelPlugin *plugin)
{
- #ifdef DEBUG
- g_printf ("sensors_new \n");
- #endif
+ TRACE ("enters sensors_init_default_values");
- t_sensors *st = g_new (t_sensors, 1);
+ sensors->show_title = TRUE;
+ sensors->show_labels = TRUE;
+ sensors->display_values_graphically = FALSE;
+ sensors->bars_created = FALSE;
+ sensors->font_size = "medium";
+ sensors->font_size_numerical = 2;
+ sensors->panel_size = 32;
+ sensors->sensors_refresh_time = 60;
+ sensors->scale = CELSIUS;
- /* init xfce sensors stuff */
- /* this is to be moved to read/write functions! */
- st->showTitle = TRUE;
- st->showLabels = TRUE;
- st->useBarUI = FALSE;
- st->barsCreated = FALSE;
- st->fontSize = "medium";
- st->fontSizeNumerical = 2;
- st->panelSize = 32;
- st->sensorUpdateTime = 60;
- st->scale = CELSIUS;
-
- st->plugin = plugin;
- st->orientation = xfce_panel_plugin_get_orientation (plugin);
-
+ sensors->plugin = plugin;
+ sensors->orientation = xfce_panel_plugin_get_orientation (plugin);
+
/* double-click improvement */
- st->execCommand = TRUE;
- st->commandName = "xsensors";
- st->doubleClick_id = 0;
+ sensors->exec_command = TRUE;
+ sensors->command_name = "xsensors";
+ sensors->doubleclick_id = 0;
- /* init libsensors stuff */
- FILE *filename = fopen("/etc/sensors.conf", "r");
- int sensorsInit = sensors_init(filename);
- if (sensorsInit != 0)
- g_printf(_("Error: Could not connect to sensors!"));
-
- st->sensorNumber = 0;
- st->chipName[st->sensorNumber] =
- sensors_get_detected_chips(&st->sensorNumber);
-
+ TRACE ("leaves sensors_init_default_values");
+}
- /* iterate over chips on mainboard */
- while (st->chipName[st->sensorNumber-1]!=NULL) {
- int currentIndex = st->sensorNumber-1;
+static t_sensors *
+sensors_new (XfcePanelPlugin *plugin)
+{
+ t_sensors *sensors;
+ gint result;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
- st->sensorId[currentIndex] = g_strdup_printf("%s-%i-%i",
- st->chipName[currentIndex]->prefix,
- st->chipName[currentIndex]->bus,
- st->chipName[currentIndex]->addr);
+ TRACE ("enters sensors_new");
- int nr1=0;
- st->sensorsCount[currentIndex]=0;
+ sensors = g_new (t_sensors, 1);
- /* iterate over chip features, i.e. id, cpu temp, mb temp... */
- while(nr1<FEATURES_PER_SENSOR) {
- int res = sensors_get_label(*st->chipName[currentIndex], nr1,
- &st->sensorNames[currentIndex][nr1] );
- if (res==0) {
- double sensorFeature;
- res = sensors_get_feature(*st->chipName[currentIndex], nr1,
- &sensorFeature);
-
- if (res==0) {
- gint ci = st->sensorsCount [currentIndex];
- st->sensorAddress [currentIndex] [ ci ] = nr1;
- st->sensorsCount [currentIndex]++;
- st->sensorColors [currentIndex] [nr1] = "#000000";
- st->sensorValid [currentIndex] [nr1] = TRUE;
- st->sensorValues [currentIndex] [nr1] =
- g_strdup_printf("%+5.2f", sensorFeature);
- st->sensorRawValues [currentIndex] [nr1] = sensorFeature;
-
- /* categorize sensor type */
- if ( strstr(st->sensorNames[currentIndex][nr1], "Temp")!=NULL
- || strstr(st->sensorNames[currentIndex][nr1], "temp")!=NULL ) {
- st->sensor_types[currentIndex][nr1] = TEMPERATURE;
- st->sensorMinValues[currentIndex][nr1] = 0;
- st->sensorMaxValues[currentIndex][nr1] = 80;
- } else if ( strstr(st->sensorNames[currentIndex][nr1], "VCore")!=NULL
- || strstr(st->sensorNames[currentIndex][nr1], "3V")!=NULL
- || strstr(st->sensorNames[currentIndex][nr1], "5V")!=NULL
- || strstr(st->sensorNames[currentIndex][nr1], "12V")!=NULL ) {
- st->sensor_types[currentIndex][nr1] = VOLTAGE;
- st->sensorMinValues[currentIndex][nr1] = 2.8;
- st->sensorMaxValues[currentIndex][nr1] = 12.2;
- } else if ( strstr(st->sensorNames[currentIndex][nr1], "Fan")!=NULL
- || strstr(st->sensorNames[currentIndex][nr1], "fan")!=NULL ) {
- st->sensor_types[currentIndex][nr1] = SPEED;
- st->sensorMinValues[currentIndex][nr1] = 1000;
- st->sensorMaxValues[currentIndex][nr1] = 3500;
- } else {
- st->sensor_types[currentIndex][nr1] = OTHER;
- st->sensorMinValues[currentIndex][nr1] = 0;
- st->sensorMaxValues[currentIndex][nr1] = 7000;
- }
- } /* end if sensorFeature */
- else {
- st->sensorValid [currentIndex] [nr1] = FALSE;
- }
+ /* init xfce sensors stuff width default values */
+ sensors_init_default_values (sensors, plugin);
- } /* end if sensorNames */
-
- st->sensorCheckBoxes [currentIndex] [nr1] = FALSE;
-
- nr1++;
- } /* end while nr1 */
+ /* read all sensors from libraries */
+ result = initialize_all (&(sensors->chips));
- /* static problem if more sensors than supported! */
- if (currentIndex>=(SENSORS - 1)) break;
+ sensors->num_sensorchips = sensors->chips->len;
- st->chipName[++currentIndex] =
- sensors_get_detected_chips(&st->sensorNumber);
- } /* end while sensor chipNames */
+ /* error handling for no sensors */
+ if (!sensors->chips || sensors->num_sensorchips <= 0) {
+ g_printf("no sensors found! \n");
+ if (!sensors->chips)
+ sensors->chips = g_ptr_array_new ();
- /* decrease sensorNumber which was incremented by last call on
- sensors_get_detected_chips in order to now reflect the correct
- number of found sensor chips */
- st->sensorNumber--;
-
-
- /* hddtemp extension */
- int disksensor = st->sensorNumber++; /* have one more sensor - disk sensor */
-
- st->chipName[disksensor] = (const sensors_chip_name*)
- ( strdup(_("Hard disks")), 0, 0, strdup(_("Hard disks")) );
-
- st->disklist = g_ptr_array_new ();
- st->numDisks = 0;
-
- /* determine kernel version under linux */
- GError *error = NULL;
- gchar *standard_output;
- gint exit_status=0;
+ chip = g_new ( t_chip, 1);
+ g_ptr_array_add (sensors->chips, chip);
+ chip->chip_features = g_ptr_array_new();
+ chipfeature = g_new (t_chipfeature, 1);
- gchar *cmd_line = g_strdup ("uname -s");
- gboolean result = g_spawn_command_line_sync (cmd_line, &standard_output,
- NULL, &exit_status, &error);
-
- if (result && exit_status==0 && strncmp(standard_output, "Linux", 5)==0 ) {
-
- error = NULL;
- cmd_line = g_strdup ("uname -r");
- result = g_spawn_command_line_sync (cmd_line, &standard_output,
- NULL, &exit_status, &error);
-
- if (result && exit_status==0) {
- int generation = atoi ( standard_output );
- int major = atoi ( (standard_output+2) );
-
- if (generation==2 && major<=4) { /* kernel 2.0.* - 2.4.* */
- /* read from /proc/ide */
- error = NULL;
- GDir *gdir = g_dir_open ("/proc/ide/", 0, &error);
- const gchar* dirname;
- while ( (dirname = g_dir_read_name (gdir))!=NULL ) {
- if ( strncmp (dirname, "hd", 2)==0 ) {
- gchar* disk = g_strconcat ("/dev/", dirname, NULL);
- g_ptr_array_add (st->disklist, disk);
- st->numDisks++;
- }
- }
- /* FIXME: read SCSI info from where? */
- }
- else if (generation==2 && major<=6) { /* kernel 2.6.* */
- /* read from /sys/block */
- error = NULL;
- GDir *gdir = g_dir_open ("/sys/block/", 0, &error);
- const gchar* dirname;
- while ( (dirname = g_dir_read_name (gdir))!=NULL ) {
- if ( strncmp (dirname, "ram", 3)!=0 &&
- strncmp (dirname, "loop", 4)!=0 ) {
- gchar* disk = g_strconcat ("/dev/", dirname, NULL);
- #ifdef DEBUG
- g_printf(" disk=%s \n", disk);
- #endif
- g_ptr_array_add (st->disklist, disk);
- st->numDisks++;
- }
- }
- }
- /* what comes next with kernel 2.7 and above? sysdevprocfs? */
- }
-
- } /* end if LINUX */
- /* else FIXME: BSD and others... */
-
- int i=0;
- while (i<st->numDisks) {
- if ( get_hddtemp_value(g_ptr_array_index (st->disklist, i))==0.0) {
- g_ptr_array_remove_index (st->disklist, i);
- i--;
- st->numDisks--;
- }
- i++;
+ chipfeature->address = 0;
+ chip->sensorId = g_strdup(_("No sensors found!"));
+ chip->num_features = 1;
+ chipfeature->color = "#000000";
+ chipfeature->name = "No sensor";
+ chipfeature->valid = TRUE;
+ chipfeature->formatted_value = g_strdup_printf("%+5.2f", 0.0);
+ chipfeature->raw_value = 0.0;
+ chipfeature->min_value = 0;
+ chipfeature->max_value = 7000;
+ chipfeature->show = FALSE;
+
+ g_ptr_array_add (chip->chip_features, chipfeature);
}
-
- if ( 1 ) {
-
- st->sensorId[disksensor] = g_strdup(_("Hard disks"));
- st->sensorsCount[disksensor] = 0;
- int diskIndex = 0;
-
- while ( diskIndex < st->numDisks) {
- gint ci = st->sensorsCount [disksensor];
- st->sensorAddress [disksensor] [ ci ] = diskIndex;
- st->sensorsCount [disksensor]++;
-
- st->sensorColors [disksensor][diskIndex] = "#000000";
- st->sensorValid [disksensor][diskIndex] = TRUE;
- st->sensorValues [disksensor][diskIndex] =
- g_strdup_printf("%+5.2f", 0.0);
- st->sensorRawValues [disksensor][diskIndex] = 0.0;
-
- st->sensor_types[disksensor][diskIndex] = TEMPERATURE;
- st->sensorMinValues[disksensor][diskIndex] = 10;
- st->sensorMaxValues[disksensor][diskIndex] = 40;
-
- st->sensorNames [disksensor][diskIndex] =
- (char*) g_ptr_array_index (st->disklist, diskIndex);
-
- st->sensorCheckBoxes [disksensor] [diskIndex] = FALSE;
-
- diskIndex++;
- }
- st->sensorsCount[disksensor] = diskIndex;
-
- }
- /* end hddtemp extension */
-
- /* error handling for no sensors */
- /* FIXME: we always have our 'virtual' hdd temp sensor, even if it has no
- values */
- if (st->sensorNumber <= 0) {
- st->sensorAddress [0] [0] = 0;
- st->sensorId [0] = g_strdup(_("No sensors found!"));
- st->sensorsCount [0] = 1;
- st->sensorColors [0] [0] = "#000000";
- st->sensorNames [0] [0] = "No sensor";
- st->sensorValid [0] [0] = TRUE;
- st->sensorValues [0] [0] = g_strdup_printf("%+5.2f", 0.0);
- st->sensorRawValues [0] [0] = 0.0;
- st->sensorMinValues [0] [0] = 0;
- st->sensorMaxValues [0] [0] = 7000;
- st->sensorCheckBoxes [0] [0] = FALSE;
- }
/* create eventbox to catch events on widget */
- st->eventbox = gtk_event_box_new ();
- gtk_widget_set_name (st->eventbox, "xfce_sensors");
- gtk_widget_show (st->eventbox);
+ sensors->eventbox = gtk_event_box_new ();
+ gtk_widget_set_name (sensors->eventbox, "xfce_sensors");
+ gtk_widget_show (sensors->eventbox);
/* Add tooltip to show extended current sensors status */
- sensors_date_tooltip ((gpointer) st);
+ sensors_create_tooltip ((gpointer) sensors);
- /* fill panel widget with boxes, strings, values, ... */
- create_panel_widget (st);
-
+ /* fill panel widget with boxes, strings, values, ... */
+ create_panel_widget (sensors);
+
/* finally add panel "sensors" to eventbox */
- gtk_container_add (GTK_CONTAINER (st->eventbox), st->sensors);
+ gtk_container_add (GTK_CONTAINER (sensors->eventbox),
+ sensors->widget_sensors);
- /* update tooltip and widget data */
- /*
- st->timeout_id = g_timeout_add (st->sensorUpdateTime * 1000,
- (GtkFunction) sensors_date_tooltip, (gpointer) st); */
-
/* double-click improvement */
- st->doubleClick_id = g_signal_connect( G_OBJECT(st->eventbox),
- "button-press-event", G_CALLBACK (execute_command), (gpointer) st);
+ sensors->doubleclick_id = g_signal_connect (G_OBJECT(sensors->eventbox),
+ "button-press-event",
+ G_CALLBACK (execute_command),
+ (gpointer) sensors);
- return st;
+ TRACE ("leaves sensors_new");
+
+ return sensors;
}
static void
-sensors_free (XfcePanelPlugin *plugin, t_sensors *st)
+sensors_free (XfcePanelPlugin *plugin, t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_free \n");
+ TRACE ("enters sensors_free");
+
+ g_return_if_fail (sensors != NULL);
+
+ /* stop association to libsensors */
+ #ifdef HAVE_LIBSENSORS
+ sensors_cleanup();
#endif
- /* stop association to libsensors */
-
- /* Why this??? Opening and closing afterwards really makes no sense! */
-
-/* FILE *filename = fopen("/etc/sensors.conf", "r");
- if (filename != NULL)
- {
- int closeResult = fclose(filename);
- if (closeResult!=0)
- printf(_("A problem occured while trying to close the config file. \
-Restart your computer ... err ... \
-restart the sensor daemon only :-) \n"));
- } */
- g_return_if_fail (st != NULL);
+ /* remove timeout functions */
+ if (sensors->timeout_id)
+ g_source_remove (sensors->timeout_id);
- /* remove timeout functions */
- if (st->timeout_id)
- g_source_remove (st->timeout_id);
-
/* double-click improvement */
- g_source_remove (st->doubleClick_id);
+ g_source_remove (sensors->doubleclick_id);
- /* free structure */
- g_free (st);
+ /* free structures and arrays */
+ g_ptr_array_free (sensors->chips, TRUE);
+ /* g_ptr_array_free (sensors->disklist, TRUE);
+ g_ptr_array_free (sensors->acpi_zones, TRUE); */
+
+ g_free (sensors);
+
+ TRACE ("leaves sensors_free");
}
static void
-sensors_set_size (XfcePanelPlugin *plugin, int size, t_sensors *st)
+sensors_set_size (XfcePanelPlugin *plugin, int size, t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_set_size \n");
- #endif
- st->panelSize = (gint) size;
-
+ TRACE ("enters sensors_set_size");
+
+ sensors->panel_size = (gint) size;
+
/* update the panel widget */
- sensors_show_panel ((gpointer) st);
+ sensors_show_panel ((gpointer) sensors);
+
+ TRACE ("leaves sensors_free");
}
static gint
-getIdFromAddress (gint chip, gint addr, t_sensors* st)
+getIdFromAddress (gint chipnumber, gint addr, t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("getIdFromAddress \n");
- #endif
- gint id;
- for (id=0; id<st->sensorsCount[chip]; id++) {
- if (addr == st->sensorAddress[chip][id])
- return id;
+ gint feature;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
+
+ TRACE ("enters getIdFromAddress");
+
+ chip = (t_chip *) g_ptr_array_index (sensors->chips, chipnumber);
+
+ for (feature=0; feature<chip->num_features; feature++) {
+ chipfeature = g_ptr_array_index(chip->chip_features, feature);
+ if (addr == chipfeature->address) {
+ TRACE ("leaves getIdFromAddress with %d", feature);
+ return feature;
+ }
}
-
+
+ TRACE ("leaves getIdFromAddress with -1");
+
return (gint) -1;
}
/* Write the configuration at exit */
static void
-sensors_write_config (XfcePanelPlugin *plugin, t_sensors *st)
+sensors_write_config (XfcePanelPlugin *plugin, t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_write_config \n");
- #endif
-
XfceRc *rc;
- char *file;
+ char *file, *tmp;
+ int i, j;
+ char rc_chip[8], feature[20];
+ t_chip *chip;
+ t_chipfeature *chipfeature;
- if (!(file = xfce_panel_plugin_save_location (plugin, TRUE)))
+ TRACE ("enters sensors_write_config");
+
+ if (!(file = xfce_panel_plugin_save_location (plugin, TRUE))) {
+ TRACE ("leaves sensors_write_config: No file location specified.");
return;
-
+ }
+
/* int res = */ unlink (file);
-
+
rc = xfce_rc_simple_open (file, FALSE);
g_free (file);
- if (!rc)
+ if (!rc) {
+ TRACE ("leaves sensors_write_config: No rc file opened");
return;
-
+ }
+
xfce_rc_set_group (rc, "General");
-
- xfce_rc_write_bool_entry (rc, "Show_Title", st->showTitle);
-
- xfce_rc_write_bool_entry (rc, "Show_Labels", st->showLabels);
-
- xfce_rc_write_bool_entry (rc, "Use_Bar_UI", st->useBarUI);
-
- xfce_rc_write_bool_entry (rc, "Show_Colored_Bars", st->showColoredBars);
- xfce_rc_write_int_entry (rc, "Scale", st->scale);
+ xfce_rc_write_bool_entry (rc, "Show_Title", sensors->show_title);
- xfce_rc_write_entry (rc, "Font_Size", st->fontSize);
-
- xfce_rc_write_int_entry (rc, "Font_Size_Numerical",
- st->fontSizeNumerical);
-
- xfce_rc_write_int_entry (rc, "Update_Interval", st->sensorUpdateTime);
-
- xfce_rc_write_bool_entry (rc, "Exec_Command", st->execCommand);
+ xfce_rc_write_bool_entry (rc, "Show_Labels", sensors->show_labels);
- xfce_rc_write_entry (rc, "Command_Name", st->commandName);
-
- int i;
- char chip[8];
- for (i=0; i<st->sensorNumber; i++) {
-
- g_snprintf (chip, 8, "Chip%d", i);
-
- xfce_rc_set_group (rc, chip);
-
- xfce_rc_write_entry (rc, "Name", st->sensorId[i]);
-
+ xfce_rc_write_bool_entry (rc, "Use_Bar_UI", sensors->display_values_graphically);
+
+ xfce_rc_write_bool_entry (rc, "Show_Colored_Bars", sensors->show_colored_bars);
+
+ xfce_rc_write_int_entry (rc, "Scale", sensors->scale);
+
+ xfce_rc_write_entry (rc, "Font_Size", sensors->font_size);
+
+ xfce_rc_write_int_entry (rc, "Font_Size_Numerical",
+ sensors->font_size_numerical);
+
+ xfce_rc_write_int_entry (rc, "Update_Interval", sensors->sensors_refresh_time);
+
+ xfce_rc_write_bool_entry (rc, "Exec_Command", sensors->exec_command);
+
+ xfce_rc_write_entry (rc, "Command_Name", sensors->command_name);
+
+ xfce_rc_write_int_entry (rc, "Number_Chips", sensors->num_sensorchips);
+
+
+ for (i=0; i<sensors->num_sensorchips; i++) {
+
+ chip = (t_chip *) g_ptr_array_index(sensors->chips, i);
+ g_assert (chip!=NULL);
+
+ g_snprintf (rc_chip, 8, "Chip%d", i);
+
+ xfce_rc_set_group (rc, rc_chip);
+
+ xfce_rc_write_entry (rc, "Name", chip->sensorId);
+
/* number of sensors is still limited */
xfce_rc_write_int_entry (rc, "Number", i);
-
+
/* only save what was displayed to save time */
- int j;
-
- char feature[20];
- for (j=0; j<FEATURES_PER_SENSOR; j++) {
-
- if (st->sensorCheckBoxes[i][j] == TRUE) {
-
- g_snprintf (feature, 20, "%s_Feature%d", chip, j);
-
+
+
+ for (j=0; j<chip->num_features; j++) {
+ chipfeature = g_ptr_array_index(chip->chip_features, j);
+ g_assert (chipfeature!=NULL);
+
+ if (chipfeature->show == TRUE) {
+
+ g_snprintf (feature, 20, "%s_Feature%d", rc_chip, j);
+
xfce_rc_set_group (rc, feature);
-
- xfce_rc_write_int_entry (rc, "Id", getIdFromAddress(i, j, st));
- #ifdef DEBUG
- g_printf(" %d \n", getIdFromAddress(i, j, st));
- #endif
-
+
+ xfce_rc_write_int_entry (rc, "Id", getIdFromAddress(i, j, sensors));
+ /* #ifdef DEBUG
+ g_printf(" %d \n", getIdFromAddress(i, j, sensors));
+ #endif */
+
/* only use this if no hddtemp sensor */
- if (i!=st->sensorNumber-1)
+ if ( strcmp(chipfeature->name, _("Hard disks")) != 0 )
xfce_rc_write_int_entry (rc, "Address", j);
-
- xfce_rc_write_entry (rc, "Name", st->sensorNames[i][j]);
- #ifdef DEBUG
- g_printf(" %s \n", st->sensorNames[i][j]);
- #endif
-
- xfce_rc_write_entry (rc, "Color", st->sensorColors[i][j]);
- #ifdef DEBUG
- g_printf(" %s \n", st->sensorColors[i][j]);
- #endif
-
- xfce_rc_write_bool_entry (rc, "Show", st->sensorCheckBoxes[i][j]);
- #ifdef DEBUG
- g_printf(" %d \n", st->sensorCheckBoxes[i][j]);
- #endif
- xfce_rc_write_int_entry (rc, "Min", st->sensorMinValues[i][j]);
- #ifdef DEBUG
- g_printf(" %d \n", st->sensorMinValues[i][j]);
- #endif
+ xfce_rc_write_entry (rc, "Name", chipfeature->name);
+ /* #ifdef DEBUG
+ g_printf(" %s \n", chipfeature->name);
+ #endif */
- xfce_rc_write_int_entry (rc, "Max", st->sensorMaxValues[i][j]);
- #ifdef DEBUG
- g_printf(" %d \n", st->sensorMaxValues[i][j]);
- #endif
- }
-
+ xfce_rc_write_entry (rc, "Color", chipfeature->color);
+ /* #ifdef DEBUG
+ g_printf(" %s \n", chipfeature->color);
+ #endif */
+
+ xfce_rc_write_bool_entry (rc, "Show", chipfeature->show);
+ /* #ifdef DEBUG
+ g_printf(" %d \n", chipfeature->show);
+ #endif */
+
+ tmp = g_strdup_printf("%.2f", chipfeature->min_value);
+ xfce_rc_write_entry (rc, "Min", tmp);
+ /* #ifdef DEBUG
+ g_printf("Min %s \n", tmp);
+ #endif */
+
+ tmp = g_strdup_printf("%.2f", chipfeature->max_value);
+ xfce_rc_write_entry (rc, "Max", tmp);
+ /* #ifdef DEBUG
+ g_printf("Max %s \n", tmp);
+ #endif */
+ } /* end if */
+
} /* end for j */
- /* g_free (feature); */
-
+
} /* end for i */
- /* g_free (chip); */
-
+
xfce_rc_close (rc);
+
+ TRACE ("leaves sensors_write_config");
}
+static void
+sensors_read_general_config (XfceRc *rc, t_sensors *sensors)
+{
+ const char *value;
+ gint num_chips;
+
+ TRACE ("enters sensors_read_general_config");
+
+ if (xfce_rc_has_group (rc, "General") ) {
+
+ xfce_rc_set_group (rc, "General");
+
+ sensors->show_title = xfce_rc_read_bool_entry (rc, "Show_Title", TRUE);
+
+ sensors->show_labels = xfce_rc_read_bool_entry (rc, "Show_Labels", TRUE);
+
+ sensors->display_values_graphically = xfce_rc_read_bool_entry (rc, "Use_Bar_UI", FALSE);
+
+ sensors->show_colored_bars = xfce_rc_read_bool_entry (rc, "Show_Colored_Bars", FALSE);
+
+ sensors->scale = xfce_rc_read_int_entry (rc, "Scale", 0);
+
+ if ((value = xfce_rc_read_entry (rc, "Font_Size", NULL)) && *value) {
+ sensors->font_size = g_strdup(value);
+ }
+
+ sensors->font_size_numerical = xfce_rc_read_int_entry (rc,
+ "Font_Size_Numerical", 2);
+
+ sensors->sensors_refresh_time = xfce_rc_read_int_entry (rc, "Update_Interval",
+ 60);
+
+ sensors->exec_command = xfce_rc_read_bool_entry (rc, "Exec_Command", TRUE);
+
+ if ((value = xfce_rc_read_entry (rc, "Command_Name", NULL)) && *value) {
+ sensors->command_name = g_strdup (value);
+ }
+
+ num_chips = xfce_rc_read_int_entry (rc, "Number_Chips", 0);
+ /* or could use 1 or the always existent dummy entry */
+ }
+
+ TRACE ("leaves sensors_read_general_config");
+}
+
+
/* Read the configuration file at init */
static void
-sensors_read_config (XfcePanelPlugin *plugin, t_sensors *st)
+sensors_read_config (XfcePanelPlugin *plugin, t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_read_config \n");
- #endif
-
const char *value;
char *file;
XfceRc *rc;
-
+ int i, j;
+ char rc_chip[8], feature[20];
+ gchar* sensorName=NULL;
+ gint num_sensorchip, id, address;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
+
+ TRACE ("enters sensors_read_config");
+
if (!(file = xfce_panel_plugin_lookup_rc_file (plugin)))
return;
-
+
rc = xfce_rc_simple_open (file, TRUE);
g_free (file);
if (!rc)
return;
-
- if (xfce_rc_has_group (rc, "General") ) {
- xfce_rc_set_group (rc, "General");
-
- st->showTitle = xfce_rc_read_bool_entry (rc, "Show_Title", TRUE);
+ sensors_read_general_config (rc, sensors);
- st->showLabels = xfce_rc_read_bool_entry (rc, "Show_Labels", TRUE);
+ for (i = 0; i<sensors->num_sensorchips; i++) {
+ chip = (t_chip *) g_ptr_array_index (sensors->chips, i);
+ if (chip==NULL)
+ break;
- st->useBarUI = xfce_rc_read_bool_entry (rc, "Use_Bar_UI", FALSE);
-
- st->showColoredBars = xfce_rc_read_bool_entry (rc, "Show_Colored_Bars", FALSE);
+ g_snprintf (rc_chip, 8, "Chip%d", i);
- st->scale = xfce_rc_read_int_entry (rc, "Scale", 0);
+ if (xfce_rc_has_group (rc, rc_chip)) {
- if ((value = xfce_rc_read_entry (rc, "Font_Size", NULL)) && *value) {
- st->fontSize = g_strdup(value);
- /* g_free (value); */
- }
-
- st->fontSizeNumerical = xfce_rc_read_int_entry (rc,
- "Font_Size_Numerical", 2);
+ xfce_rc_set_group (rc, rc_chip);
- st->sensorUpdateTime = xfce_rc_read_int_entry (rc, "Update_Interval",
- 60);
-
- st->execCommand = xfce_rc_read_bool_entry (rc, "Exec_Command", TRUE);
-
- if ((value = xfce_rc_read_entry (rc, "Command_Name", NULL)) && *value) {
- st->commandName = g_strdup (value);
- /* g_free (value); */
- }
- }
-
- int i;
- char chip[8];
-
- for (i = 0; i<SENSORS; i++) {
- g_snprintf (chip, 8, "Chip%d", i);
-
- if (xfce_rc_has_group (rc, chip)) {
-
- xfce_rc_set_group (rc, chip);
-
- gchar* sensorName;
- gint sensorNumber=0;
-
- if ((value = xfce_rc_read_entry (rc, "Name", NULL)) && *value) {
+ num_sensorchip=0;
+
+ if ((value = xfce_rc_read_entry (rc, "Name", NULL)) && *value) {
sensorName = g_strdup (value);
- /* g_free (value); */
}
-
- sensorNumber = (gint) xfce_rc_read_int_entry (rc, "Number", 0);
-
- /* assert that file does not contain more information
- than does exist on system */
+
+ num_sensorchip = (gint) xfce_rc_read_int_entry (rc, "Number", 0);
+
+ /* assert that file does not contain more information
+ than does exist on system */
/* ??? At least, it works. */
- g_return_if_fail (sensorNumber < st->sensorNumber);
-
+ g_return_if_fail (num_sensorchip < sensors->num_sensorchips);
+
/* now featuring enhanced string comparison */
- if ( strcmp(st->sensorId[sensorNumber], sensorName)==0 ) {
-
- int j;
- char feature[20];
-
- for (j=0; j<FEATURES_PER_SENSOR; j++) {
- g_snprintf (feature, 20, "%s_Feature%d", chip, j);
-
+ g_assert (chip!=NULL);
+ if ( strcmp(chip->sensorId, sensorName)==0 ) {
+
+ for (j=0; j<chip->num_features; j++) {
+ chipfeature = (t_chipfeature *) g_ptr_array_index (
+ chip->chip_features,
+ j);
+ g_assert (chipfeature!=NULL);
+
+ g_snprintf (feature, 20, "%s_Feature%d", rc_chip, j);
+
if (xfce_rc_has_group (rc, feature)) {
-
xfce_rc_set_group (rc, feature);
-
- gint id=0, address=0;
-
- id = (gint) xfce_rc_read_int_entry (rc, "Id", 0);
-
- if (i!=st->sensorNumber-1)
- address = (gint) xfce_rc_read_int_entry (rc, "Address", 0);
-
+
+ id=0; address=0;
+
+ id = (gint) xfce_rc_read_int_entry (rc, "Id", 0);
+
+ if ( strcmp(chip->name, _("Hard disks")) != 0 )
+ address = (gint) xfce_rc_read_int_entry (rc, "Address", 0);
+ else
+ /* FIXME: compare strings, or also have hddtmep and acpi store numeric values */
+
/* assert correctly saved file */
- if (i!=st->sensorNumber-1)
- g_return_if_fail
- (st->sensorAddress[sensorNumber][id] == address);
-
- if ((value = xfce_rc_read_entry (rc, "Name", NULL))
+ if (strcmp(chip->name, _("Hard disks")) != 0) {
+ chipfeature = g_ptr_array_index(chip->chip_features, id);
+ /* FIXME: it might be necessary to use sensors->addresses here */
+ /* g_return_if_fail
+ (chipfeature->address == address); */
+ if (chipfeature->address != address)
+ continue;
+ }
+
+ if ((value = xfce_rc_read_entry (rc, "Name", NULL))
&& *value) {
- st->sensorNames[sensorNumber][address] =
- g_strdup (value);
+ chipfeature->name = g_strdup (value);
/* g_free (value); */
}
- if ((value = xfce_rc_read_entry (rc, "Color", NULL))
+ if ((value = xfce_rc_read_entry (rc, "Color", NULL))
&& *value) {
- st->sensorColors[sensorNumber][address] =
- g_strdup (value);
+ chipfeature->color = g_strdup (value);
/* g_free (value); */
}
-
- st->sensorCheckBoxes[sensorNumber][address] =
+
+ chipfeature->show =
xfce_rc_read_bool_entry (rc, "Show", FALSE);
- st->sensorMinValues[sensorNumber][address] =
- xfce_rc_read_int_entry (rc, "Min", 0);
+ if ((value = xfce_rc_read_entry (rc, "Min", NULL))
+ && *value)
+ chipfeature->min_value = atof (value);
- st->sensorMaxValues[sensorNumber][address] =
- xfce_rc_read_int_entry (rc, "Max", 0);
+ if ((value = xfce_rc_read_entry (rc, "Max", NULL))
+ && *value)
+ chipfeature->max_value = atof (value);
} /* end if */
-
+
} /* end for */
-
+
} /* end if */
-
+
g_free (sensorName);
-
- } /* end if */
-
+
+ } /* end if */
+
} /* end for */
-
- /* g_free (value); /* issues WARNING: Verarbeiten des Argumentes 1 von
- »g_free« streicht Qualifizierer von Zeiger-Zieltypen */
-
- xfce_rc_close (rc);
-
- st->timeout_id = g_timeout_add (st->sensorUpdateTime * 1000,
- (GtkFunction) sensors_show_panel, (gpointer) st);
- if (!st->execCommand) {
- g_signal_handler_block ( G_OBJECT(st->eventbox), st->doubleClick_id );
+ /* g_free (value); */ /* issues WARNING: Verarbeiten des Argumentes 1 von
+ »g_free« streicht Qualifizierer von Zeiger-Zieltypen */
+
+ xfce_rc_close (rc);
+
+ if (!sensors->exec_command) {
+ g_signal_handler_block ( G_OBJECT(sensors->eventbox), sensors->doubleclick_id );
}
-
+
/* Try to resize the sensors to fit the user settings.
Do also modify the tooltip text. */
- sensors_show_panel ((gpointer) st);
+ sensors_show_panel ((gpointer) sensors);
+
+ TRACE ("leaves sensors_read_config");
}
static void
-show_title_toggled (GtkWidget *widget, SensorsDialog *sd)
+show_title_toggled (GtkWidget *widget, t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("show_title_toggled \n");
- #endif
-
- sd->sensors->showTitle = gtk_toggle_button_get_active
+ TRACE ("enters show_title_toggled");
+
+ sd->sensors->show_title = gtk_toggle_button_get_active
( GTK_TOGGLE_BUTTON(widget) );
- if (sd->sensors->useBarUI == TRUE) {
- sensors_remove_graphical_panel(sd->sensors);
+ if (sd->sensors->display_values_graphically == TRUE) {
+ sensors_remove_graphical_panel(sd->sensors);
}
sensors_show_panel ((gpointer) sd->sensors);
+
+ TRACE ("leaves show_title_toggled");
}
static void
-show_labels_toggled (GtkWidget *widget, SensorsDialog *sd)
+show_labels_toggled (GtkWidget *widget, t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("show_labels_toggled \n");
- #endif
- sd->sensors->showLabels = gtk_toggle_button_get_active
+ TRACE ("enters show_labels_toggled");
+
+ sd->sensors->show_labels = gtk_toggle_button_get_active
( GTK_TOGGLE_BUTTON(widget) );
- if (sd->sensors->useBarUI == TRUE) {
- sensors_remove_graphical_panel(sd->sensors);
+ if (sd->sensors->display_values_graphically == TRUE) {
+ sensors_remove_graphical_panel(sd->sensors);
}
sensors_show_panel ((gpointer) sd->sensors);
+
+ TRACE ("leaves show_labels_toggled");
}
static void
-show_colored_bars_toggled (GtkWidget *widget, SensorsDialog *sd)
+show_colored_bars_toggled (GtkWidget *widget, t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("show_colored_bars_toggled \n");
- #endif
- sd->sensors->showColoredBars = gtk_toggle_button_get_active
+ TRACE ("enters show_colored_bars_toggled");
+
+ sd->sensors->show_colored_bars = gtk_toggle_button_get_active
( GTK_TOGGLE_BUTTON(widget) );
+ if (sd->sensors->display_values_graphically == TRUE) {
+ sensors_remove_graphical_panel(sd->sensors);
+ }
sensors_show_panel ((gpointer) sd->sensors);
+
+ TRACE ("leaves show_colored_bars_toggled");
}
static void
-ui_style_changed (GtkWidget *widget, SensorsDialog *sd)
+ui_style_changed (GtkWidget *widget, t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("ui_style_changed \n");
- #endif
- if (sd->sensors->useBarUI == TRUE) {
- sensors_remove_graphical_panel(sd->sensors);
- gtk_widget_hide(sd->labelsBox);
- gtk_widget_hide(sd->coloredBarsBox);
- gtk_widget_show(sd->fontBox);
+ TRACE ("enters ui_style_changed");
+
+ if (sd->sensors->display_values_graphically == TRUE) {
+ sensors_remove_graphical_panel(sd->sensors);
+ gtk_widget_hide(sd->labels_Box);
+ gtk_widget_hide(sd->coloredBars_Box);
+ gtk_widget_show(sd->font_Box);
}
else {
- gtk_widget_show(sd->labelsBox);
- gtk_widget_show(sd->coloredBarsBox);
- gtk_widget_hide(sd->fontBox);
+ gtk_widget_show(sd->labels_Box);
+ gtk_widget_show(sd->coloredBars_Box);
+ gtk_widget_hide(sd->font_Box);
}
-
- sd->sensors->useBarUI = gtk_toggle_button_get_active
+
+ sd->sensors->display_values_graphically = gtk_toggle_button_get_active
( GTK_TOGGLE_BUTTON(widget) );
/*
- gtk_widget_set_sensitive(sd->labelsBox, sd->sensors->useBarUI);
- gtk_widget_set_sensitive(sd->fontBox, !sd->sensors->useBarUI);
+ gtk_widget_set_sensitive(sd->labelsBox, sd->sensors->display_values_graphically);
+ gtk_widget_set_sensitive(sd->fontBox, !sd->sensors->display_values_graphically);
*/
-
+
sensors_show_panel ((gpointer) sd->sensors);
+
+ TRACE ("leaves ui_style_changed");
}
-static void
-sensor_entry_changed (GtkWidget *widget, SensorsDialog *sd)
+static void
+sensor_entry_changed (GtkWidget *widget, t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("sensor_entry_changed \n");
- #endif
+ gint gtk_combo_box_active;
+ t_chip *chip;
+ /* t_chipfeature *chipfeature; */
- gint gtk_combo_box_active =
+ TRACE ("enters sensor_entry_changed");
+
+ gtk_combo_box_active =
gtk_combo_box_get_active(GTK_COMBO_BOX (widget));
/* widget should be sd->myComboBox */
- const char* adapter_name;
- if ( gtk_combo_box_active!=sd->sensors->sensorNumber-1 )
- gtk_label_set_label (GTK_LABEL(sd->mySensorLabel),
- sensors_get_adapter_name
- (sd->sensors->chipName[gtk_combo_box_active]->bus) );
- else gtk_label_set_label (GTK_LABEL(sd->mySensorLabel),
- g_strdup(_("Hard disk temperature sensors")) );
-
- gtk_tree_view_set_model (
- GTK_TREE_VIEW (sd->myTreeView),
+ /* const char* adapter_name; */
+ /*if ( gtk_combo_box_active!=sd->sensors->num_sensorchips-1 ) { */
+ chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
+ gtk_label_set_label (GTK_LABEL(sd->mySensorLabel), chip->description);
+ /* sensors_get_adapter_name
+ (chip->chip_name->bus) ); */
+ /* } */
+ /* else gtk_label_set_label (GTK_LABEL(sd->mySensorLabel),
+ g_strdup(_("Hard disk temperature sensors")) ); */
+
+ gtk_tree_view_set_model (
+ GTK_TREE_VIEW (sd->myTreeView),
GTK_TREE_MODEL (sd->myListStore [ gtk_combo_box_active ]) );
+
+ TRACE ("leaves sensor_entry_changed");
}
static void
-gtk_font_size_change (GtkWidget *widget, SensorsDialog *sd)
+gtk_font_size_change (GtkWidget *widget, t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("gtk_font_size_change \n");
- #endif
+ TRACE ("enters gtk_font_size_change");
switch ( gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) ) {
-
- case 0: sd->sensors->fontSize = "x-small"; break;
- case 1: sd->sensors->fontSize = "small"; break;
- case 3: sd->sensors->fontSize = "large"; break;
- case 4: sd->sensors->fontSize = "x-large"; break;
- default: sd->sensors->fontSize = "medium";
+
+ case 0: sd->sensors->font_size = "x-small"; break;
+ case 1: sd->sensors->font_size = "small"; break;
+ case 3: sd->sensors->font_size = "large"; break;
+ case 4: sd->sensors->font_size = "x-large"; break;
+ default: sd->sensors->font_size = "medium";
}
-
- sd->sensors->fontSizeNumerical =
+
+ sd->sensors->font_size_numerical =
gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
-
+
/* refresh the panel content */
sensors_show_panel ((gpointer) sd->sensors);
+
+ TRACE ("leaves gtk_font_size_change");
}
static void
-gtk_temperature_unit_change (GtkWidget *widget, SensorsDialog *sd)
+fill_gtkTreeStore (GtkTreeStore *model, t_chip *chip, t_tempscale scale)
{
- #ifdef DEBUG
- g_printf ("gtk_temperature_unit_change ");
- #endif
-
+ int featureindex, res;
+ double sensorFeature;
+ t_chipfeature *chipfeature;
+ GtkTreeIter *iter;
+
+ TRACE ("enters fill_gtkTreeStore");
+
+ for (featureindex=0; featureindex < chip->num_features; featureindex++)
+ {
+ chipfeature = (t_chipfeature *) g_ptr_array_index (chip->chip_features, featureindex);
+ g_assert (chipfeature!=NULL);
+
+ iter = g_new0 (GtkTreeIter, 1);
+
+ if ( chipfeature->valid == TRUE ) {
+ res = sensors_get_feature_wrapper
+ (chip, chipfeature->address, &sensorFeature);
+ if ( res!=0) {
+ g_printf( _("\nXfce Hardware Sensors Plugin: \n"
+ "Seems like there was a problem reading a sensor "
+ "feature value. \nProper proceeding cannot be "
+ "guaranteed.\n") );
+ break;
+ }
+ chipfeature->formatted_value = g_new (gchar, 0);
+ format_sensor_value (scale, chipfeature, sensorFeature,
+ &(chipfeature->formatted_value));
+ chipfeature->raw_value = sensorFeature;
+ gtk_tree_store_append (model, iter, NULL);
+ /* DBG("appended line, iterator=%d\n", iter->stamp); */
+ gtk_tree_store_set ( model, iter,
+ 0, chipfeature->name,
+ 1, chipfeature->formatted_value,
+ 2, chipfeature->show,
+ 3, chipfeature->color,
+ 4, chipfeature->min_value,
+ 5, chipfeature->max_value,
+ -1);
+ } /* end if sensors-valid */
+ }
+
+ TRACE ("leaves fill_gtkTreeStore");
+}
+
+
+static void
+reload_listbox (t_sensors_dialog *sd)
+{
+ int chipindex;
+ t_chip *chip;
+ GtkTreeStore *model;
+ t_sensors *sensors;
+
+ TRACE ("enters reload_listbox");
+
+ sensors = sd->sensors;
+
+ for (chipindex=0; chipindex < sensors->num_sensorchips; chipindex++) {
+ chip = (t_chip *) g_ptr_array_index (sensors->chips, chipindex);
+
+ model = sd->myListStore[chipindex];
+ gtk_tree_store_clear (model);
+ /* iter = g_new (GtkTreeIter, 1); */
+ fill_gtkTreeStore (model, chip, sensors->scale);
+
+ }
+ TRACE ("leaves reload_listbox");
+}
+
+
+static void
+gtk_temperature_unit_change (GtkWidget *widget, t_sensors_dialog *sd)
+{
+ TRACE ("enters gtk_temperature_unit_change ");
+
/* toggle celsius-fahrenheit by use of mathematics ;) */
sd->sensors->scale = 1 - sd->sensors->scale;
/* refresh the panel content */
- sensors_show_panel((gpointer) sd->sensors);
+ sensors_show_panel ((gpointer) sd->sensors);
+
+ reload_listbox (sd);
+
+ TRACE ("laeves gtk_temperature_unit_change ");
}
static void
-adjustment_value_changed (GtkWidget *widget, SensorsDialog* sd)
+adjustment_value_changed (GtkWidget *widget, t_sensors_dialog* sd)
{
- #ifdef DEBUG
- g_printf ("adjustment_value_changed ");
- #endif
-
- sd->sensors->sensorUpdateTime =
+ TRACE ("enters adjustment_value_changed ");
+
+ sd->sensors->sensors_refresh_time =
(gint) gtk_adjustment_get_value ( GTK_ADJUSTMENT (widget) );
-
+
/* stop the timeout functions ... */
g_source_remove (sd->sensors->timeout_id);
/* ... and start them again */
- sd->sensors->timeout_id = g_timeout_add (
- sd->sensors->sensorUpdateTime * 1000,
+ sd->sensors->timeout_id = g_timeout_add (
+ sd->sensors->sensors_refresh_time * 1000,
(GtkFunction) sensors_show_panel, (gpointer) sd->sensors);
+
+ TRACE ("leaves adjustment_value_changed ");
}
/* double-click improvement */
static void
-execCommand_toggled (GtkWidget *widget, SensorsDialog* sd)
+execCommand_toggled (GtkWidget *widget, t_sensors_dialog* sd)
{
- #ifdef DEBUG
- g_printf ("execCommand_toggled \n");
- #endif
- sd->sensors->execCommand =
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (widget) );
+ TRACE ("enters execCommand_toggled");
- if ( sd->sensors->execCommand )
- g_signal_handler_unblock (sd->sensors->eventbox,
- sd->sensors->doubleClick_id);
- else
- g_signal_handler_block (sd->sensors->eventbox,
- sd->sensors->doubleClick_id );
+ sd->sensors->exec_command =
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (widget) );
+
+ if ( sd->sensors->exec_command )
+ g_signal_handler_unblock (sd->sensors->eventbox,
+ sd->sensors->doubleclick_id);
+ else
+ g_signal_handler_block (sd->sensors->eventbox,
+ sd->sensors->doubleclick_id );
+
+ TRACE ("leaves execCommand_toggled");
}
static void
minimum_changed (GtkCellRendererText *cellrenderertext, gchar *path_str,
- gchar *new_value, SensorsDialog *sd)
+ gchar *new_value, t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("minimum_changed \n");
- #endif
- gint value = atol(new_value);
+ gint gtk_combo_box_active;
+ float value;
+ GtkTreeModel *model;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
- gint gtk_combo_box_active =
- gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
+ TRACE ("enters minimum_changed");
- /* get model and path */
- GtkTreeModel *model = (GtkTreeModel *) sd->myListStore
- [gtk_combo_box_active];
- GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
-
- /* get model iterator */
- GtkTreeIter iter;
- gtk_tree_model_get_iter (model, &iter, path);
+ value = atof (new_value);
- /* set new value */
- gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 4, value, -1);
- int help = sd->sensors->sensorAddress [gtk_combo_box_active]
- [atoi(path_str)];
- sd->sensors->sensorMinValues[gtk_combo_box_active][help] = value;
-
- /* clean up */
- gtk_tree_path_free (path);
+ gtk_combo_box_active =
+ gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
- if (sd->sensors->useBarUI == TRUE) {
- sensors_remove_graphical_panel (sd->sensors);
- }
+ /* get model and path */
+ model = (GtkTreeModel *) sd->myListStore
+ [gtk_combo_box_active];
+ path = gtk_tree_path_new_from_string (path_str);
- /* update panel */
- sensors_show_panel ((gpointer) sd->sensors);
+ /* get model iterator */
+ gtk_tree_model_get_iter (model, &iter, path);
+
+ /* set new value */
+ gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 4, value, -1);
+ chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
+
+ chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, atoi(path_str));
+ chipfeature->min_value = value;
+
+ /* clean up */
+ gtk_tree_path_free (path);
+
+ if (sd->sensors->display_values_graphically == TRUE) {
+ sensors_remove_graphical_panel (sd->sensors);
+ }
+
+ /* update panel */
+ sensors_show_panel ((gpointer) sd->sensors);
+
+ TRACE ("leaves minimum_changed");
}
static void
maximum_changed (GtkCellRendererText *cellrenderertext, gchar *path_str,
- gchar *new_value, SensorsDialog *sd)
+ gchar *new_value, t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("maximum_changed \n");
- #endif
- gint value = atol(new_value);
+ gint gtk_combo_box_active;
+ float value;
+ GtkTreeModel *model;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
- gint gtk_combo_box_active =
- gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
+ TRACE ("enters maximum_changed");
- /* get model and path */
- GtkTreeModel *model = (GtkTreeModel *) sd->myListStore
- [gtk_combo_box_active];
- GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
-
- /* get model iterator */
- GtkTreeIter iter;
- gtk_tree_model_get_iter (model, &iter, path);
+ value = atof (new_value);
- /* set new value */
- gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 5, value, -1);
- int help = sd->sensors->sensorAddress [gtk_combo_box_active]
- [atoi(path_str)];
- sd->sensors->sensorMaxValues[gtk_combo_box_active][help] = value;
-
- /* clean up */
- gtk_tree_path_free (path);
+ gtk_combo_box_active =
+ gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
- if (sd->sensors->useBarUI == TRUE) {
- sensors_remove_graphical_panel (sd->sensors);
- }
+ /* get model and path */
+ model = (GtkTreeModel *) sd->myListStore
+ [gtk_combo_box_active];
+ path = gtk_tree_path_new_from_string (path_str);
- /* update panel */
- sensors_show_panel ((gpointer) sd->sensors);
+ /* get model iterator */
+ gtk_tree_model_get_iter (model, &iter, path);
+
+ /* set new value */
+ gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 5, value, -1);
+ chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
+
+ chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, atoi(path_str));
+ chipfeature->max_value = value;
+
+ /* clean up */
+ gtk_tree_path_free (path);
+
+ if (sd->sensors->display_values_graphically == TRUE) {
+ sensors_remove_graphical_panel (sd->sensors);
+ }
+
+ /* update panel */
+ sensors_show_panel ((gpointer) sd->sensors);
+
+ TRACE ("leaves maximum_changed");
}
static void
-gtk_cell_color_edited (GtkCellRendererText *cellrenderertext, gchar *path_str,
- gchar *new_color, SensorsDialog *sd)
+gtk_cell_color_edited (GtkCellRendererText *cellrenderertext, gchar *path_str,
+ gchar *new_color, t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("gtk_cell_color_edited \n");
- #endif
+ gint gtk_combo_box_active;
+ GtkTreeModel *model;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ gboolean hexColor;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
+ TRACE ("enters gtk_cell_color_edited");
+
/* store new color in appropriate array */
- gboolean hexColor = g_str_has_prefix (new_color, "#");
-
+ hexColor = g_str_has_prefix (new_color, "#");
+
if (hexColor && strlen(new_color) == 7) {
int i;
for (i=1; i<7; i++) {
/* only save hex numbers! */
- if ( ! g_ascii_isxdigit (new_color[i]) )
- return;
+ if ( ! g_ascii_isxdigit (new_color[i]) )
+ return;
}
-
- gint gtk_combo_box_active =
+
+ gtk_combo_box_active =
gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
-
+
/* get model and path */
- GtkTreeModel *model = (GtkTreeModel *) sd->myListStore
+ model = (GtkTreeModel *) sd->myListStore
[gtk_combo_box_active];
- GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
-
+ path = gtk_tree_path_new_from_string (path_str);
+
/* get model iterator */
- GtkTreeIter iter;
gtk_tree_model_get_iter (model, &iter, path);
-
+
/* set new value */
gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 3, new_color, -1);
- int help = sd->sensors->sensorAddress [gtk_combo_box_active]
- [atoi(path_str)];
- sd->sensors->sensorColors [gtk_combo_box_active] [help] =
+ chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
+
+ chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, atoi(path_str));
+ chipfeature->color =
g_strdup(new_color);
-
+
/* clean up */
gtk_tree_path_free (path);
-
+
/* update panel */
- sensors_show_panel((gpointer) sd->sensors);
+ sensors_show_panel ((gpointer) sd->sensors);
}
+
+ TRACE ("leaves gtk_cell_color_edited");
}
static void
-gtk_cell_text_edited (GtkCellRendererText *cellrenderertext,
- gchar *path_str, gchar *new_text, SensorsDialog *sd)
+gtk_cell_text_edited (GtkCellRendererText *cellrenderertext,
+ gchar *path_str, gchar *new_text, t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("gtk_cell_text_edited \n");
- #endif
+ gint gtk_combo_box_active;
+ GtkTreeModel *model;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
- if (sd->sensors->useBarUI == TRUE) {
- sensors_remove_graphical_panel(sd->sensors);
+ TRACE ("enters gtk_cell_text_edited");
+
+ if (sd->sensors->display_values_graphically == TRUE) {
+ sensors_remove_graphical_panel(sd->sensors);
}
- gint gtk_combo_box_active =
+ gtk_combo_box_active =
gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
- GtkTreeModel *model =
+ model =
(GtkTreeModel *) sd->myListStore [gtk_combo_box_active];
- GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
- GtkTreeIter iter;
-
+ path = gtk_tree_path_new_from_string (path_str);
+
/* get model iterator */
gtk_tree_model_get_iter (model, &iter, path);
-
+
/* set new value */
gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 0, new_text, -1);
- int help =
- sd->sensors->sensorAddress [ gtk_combo_box_active ] [atoi(path_str)];
- sd->sensors->sensorNames[ gtk_combo_box_active ] [ help ] =
+ chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
+
+ chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, atoi(path_str));
+ chipfeature->name =
g_strdup (new_text);
-
+
/* clean up */
gtk_tree_path_free (path);
-
+
/* update panel */
sensors_show_panel ((gpointer) sd->sensors);
+
+ TRACE ("leaves gtk_cell_text_edited");
}
static void
-gtk_cell_toggle (GtkCellRendererToggle *cell, gchar *path_str,
- SensorsDialog *sd)
+gtk_cell_toggle (GtkCellRendererToggle *cell, gchar *path_str,
+ t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("gtk_cell_toggle \n");
- #endif
+ t_chip *chip;
+ t_chipfeature *chipfeature;
+ gint gtk_combo_box_active;
+ GtkTreeModel *model;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ gboolean toggle_item;
- if (sd->sensors->useBarUI == TRUE) {
- sensors_remove_graphical_panel(sd->sensors);
+ TRACE ("enters gtk_cell_toggle");
+
+ if (sd->sensors->display_values_graphically == TRUE) {
+ sensors_remove_graphical_panel(sd->sensors);
}
- gint gtk_combo_box_active =
+ gtk_combo_box_active =
gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
- GtkTreeModel *model =
- (GtkTreeModel *) sd->myListStore[gtk_combo_box_active];
- GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
- GtkTreeIter iter;
- gboolean toggle_item;
+ model = (GtkTreeModel *) sd->myListStore[gtk_combo_box_active];
+ path = gtk_tree_path_new_from_string (path_str);
/* get toggled iter */
gtk_tree_model_get_iter (model, &iter, path);
gtk_tree_model_get (model, &iter, 2, &toggle_item, -1);
-
+
/* do something with the value */
toggle_item ^= 1;
-
+
/* set new value */
gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 2, toggle_item, -1);
- int help =
- sd->sensors->sensorAddress [ gtk_combo_box_active ] [atoi(path_str)];
-
- sd->sensors->sensorCheckBoxes [gtk_combo_box_active ] [ help ] =
- toggle_item;
-
+ chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
+
+ chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, atoi(path_str));
+
+ /* help = chip->sensorAddress [ gtk_combo_box_active ] [atoi(path_str)];
+ chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, help); */
+
+ chipfeature->show = toggle_item;
+
/* clean up */
gtk_tree_path_free (path);
-
+
/* update tooltip and panel widget */
sensors_show_panel ((gpointer) sd->sensors);
+
+ TRACE ("leaves gtk_cell_toggle");
}
static void
-init_widgets (SensorsDialog *sd)
+init_widgets (t_sensors_dialog *sd)
{
- #ifdef DEBUG
- g_printf ("init_widgets \n");
- #endif
-
- int i=0;
- while( i < sd->sensors->sensorNumber ) {
- sd->myListStore[i] = gtk_tree_store_new (6, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING,
- G_TYPE_INT, G_TYPE_INT);
- i++;
- }
-
- GtkTreeIter iter;
-
- i=0;
- while( i < sd->sensors->sensorNumber-1 ) { /* one less because of hdd sensors */
-
- gtk_combo_box_append_text ( GTK_COMBO_BOX(sd->myComboBox),
- sd->sensors->sensorId[i] );
-
- int nr1=0;
+ int chipindex;
+ t_chip *chip;
+ t_chipfeature *chipfeature;
+ GtkTreeIter *iter;
+ t_sensors *sensors;
+ GtkTreeStore *model;
- while( nr1 < FEATURES_PER_SENSOR ) {
- if ( sd->sensors->sensorValid[i][nr1] == TRUE ) {
- double sensorFeature;
- int res = sensors_get_feature
- (*sd->sensors->chipName[i], nr1, &sensorFeature);
+ TRACE ("enters init_widgets");
- if ( res!=0) {
- g_printf( _(" \nXfce Hardware Sensors Plugin: \
-\nSeems like there was a problem reading a sensor \
-feature value. \nProper proceeding cannot be \
-guaranteed.\n") );
- break;
- }
- sd->sensors->sensorValues[i][nr1] =
- g_strdup_printf("%+5.2f", sensorFeature);
- sd->sensors->sensorRawValues[i][nr1] = sensorFeature;
- gtk_tree_store_append ( GTK_TREE_STORE (sd->myListStore[i]),
- &iter, NULL);
- gtk_tree_store_set ( GTK_TREE_STORE (sd->myListStore[i]),
- &iter,
- 0, sd->sensors->sensorNames[i][nr1] ,
- 1, sd->sensors->sensorValues[i][nr1] ,
- 2, sd->sensors->sensorCheckBoxes[i][nr1],
- 3, sd->sensors->sensorColors[i][nr1],
- 4, sd->sensors->sensorMinValues[i][nr1],
- 5, sd->sensors->sensorMaxValues[i][nr1],
- -1);
- } /* end if sensors-valid */
+ sensors = sd->sensors;
- nr1++;
- } /* end while nr1 */
+ for (chipindex=0; chipindex < sensors->num_sensorchips; chipindex++) {
+ sd->myListStore[chipindex] = gtk_tree_store_new (6, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING,
+ G_TYPE_FLOAT, G_TYPE_FLOAT);
- i++;
- } /* end while i < sensorNumber */
-
-
- /* hdd extension */
- gtk_combo_box_append_text ( GTK_COMBO_BOX(sd->myComboBox),
- sd->sensors->sensorId[i] );
- int diskIndex = 0;
- while ( diskIndex < sd->sensors->numDisks ) {
- if ( sd->sensors->sensorValid[i][diskIndex] == TRUE ) {
- double value = get_hddtemp_value (
- (char*) g_ptr_array_index (sd->sensors->disklist, diskIndex));
- sd->sensors->sensorValues[i][diskIndex] =
- g_strdup_printf("%+5.2f", value);
- sd->sensors->sensorRawValues[i][diskIndex] = value;
- gtk_tree_store_append ( GTK_TREE_STORE (sd->myListStore[i]),
- &iter, NULL);
- gtk_tree_store_set ( GTK_TREE_STORE (sd->myListStore[i]),
- &iter,
- 0, sd->sensors->sensorNames[i][diskIndex] ,
- 1, sd->sensors->sensorValues[i][diskIndex] ,
- 2, sd->sensors->sensorCheckBoxes[i][diskIndex],
- 3, sd->sensors->sensorColors[i][diskIndex],
- 4, sd->sensors->sensorMinValues[i][diskIndex],
- 5, sd->sensors->sensorMaxValues[i][diskIndex],
- -1);
- } /* end if sensors-valid */
+ chip = (t_chip *) g_ptr_array_index (sensors->chips, chipindex);
+ gtk_combo_box_append_text ( GTK_COMBO_BOX(sd->myComboBox),
+ chip->sensorId );
+ model = GTK_TREE_STORE (sd->myListStore[chipindex]);
- diskIndex++;
- } /* end while diskIndex */
-
- /* end hdd extension */
-
- if(sd->sensors->sensorNumber == 0) {
- gtk_combo_box_append_text ( GTK_COMBO_BOX(sd->myComboBox),
- sd->sensors->sensorId[0] );
- sd->myListStore[0] = gtk_tree_store_new (6, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING,
- G_TYPE_INT, G_TYPE_INT);
- sd->sensors->sensorValues[0][0] =
- g_strdup_printf("%+5.2f", 0.0);
- sd->sensors->sensorRawValues[0][0] = 0.0;
- gtk_tree_store_append ( GTK_TREE_STORE (sd->myListStore[0]),
- &iter, NULL);
+ fill_gtkTreeStore (model, chip, sensors->scale);
+ }
+
+ if(sd->sensors->num_sensorchips == 0) {
+ chip = (t_chip *) g_ptr_array_index(sensors->chips, 0);
+ g_assert (chip!=NULL);
+ gtk_combo_box_append_text ( GTK_COMBO_BOX(sd->myComboBox),
+ chip->sensorId );
+ sd->myListStore[0] = gtk_tree_store_new (6, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_BOOLEAN,
+ G_TYPE_STRING, G_TYPE_DOUBLE,
+ G_TYPE_DOUBLE);
+ chipfeature = (t_chipfeature *) g_ptr_array_index (chip->chip_features, 0);
+ g_assert (chipfeature!=NULL);
+
+ chipfeature->formatted_value = g_strdup ("0.0");
+ chipfeature->raw_value = 0.0;
+
+ iter = g_new0 (GtkTreeIter, 1);
+ gtk_tree_store_append ( GTK_TREE_STORE (sd->myListStore[0]),
+ iter, NULL);
gtk_tree_store_set ( GTK_TREE_STORE (sd->myListStore[0]),
- &iter,
- 0, sd->sensors->sensorNames[0][0] ,
- 1, sd->sensors->sensorValues[0][0] ,
- 2, sd->sensors->sensorCheckBoxes[0][0],
- 3, sd->sensors->sensorColors[0][0],
- 4, sd->sensors->sensorMinValues[0][0],
- 5, sd->sensors->sensorMaxValues[0][0],
+ iter,
+ 0, chipfeature->name,
+ 1, "0.0", /* chipfeature->formatted_value */
+ 2, False, /* chipfeature->show */
+ 3, "#000000", /* chipfeature->color */
+ 3, "#000000", /* chipfeature->color */
+ 4, 0.0, /* chipfeature->min_value */
+ 5, 0.0, /* chipfeature->max_value */
-1);
}
-
+ TRACE ("leaves init_widgets");
}
static void
-add_ui_style_box (GtkWidget * vbox, SensorsDialog * sd)
+add_ui_style_box (GtkWidget * vbox, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_ui_style_box \n");
- #endif
+ GtkWidget *hbox, *label, *radioText, *radioBars; /* *checkButton, */
- GtkWidget *hbox, *checkButton;
+ TRACE ("enters add_ui_style_box");
hbox = gtk_hbox_new (FALSE, BORDER);
gtk_widget_show (hbox);
- GtkWidget *label = gtk_label_new_with_mnemonic(_("_UI style:"));
- GtkWidget *radioText = gtk_radio_button_new_with_mnemonic(NULL, _("_text"));
- GtkWidget *radioBars = gtk_radio_button_new_with_mnemonic(
- gtk_radio_button_group(GTK_RADIO_BUTTON(radioText)), _("g_raphical"));
-
+ label = gtk_label_new_with_mnemonic(_("_UI style:"));
+ radioText = gtk_radio_button_new_with_mnemonic(NULL, _("_text"));
+ radioBars = gtk_radio_button_new_with_mnemonic(
+ gtk_radio_button_group(GTK_RADIO_BUTTON(radioText)), _("g_raphical"));
+
gtk_widget_show(radioText);
gtk_widget_show(radioBars);
gtk_widget_show(label);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radioText),
- sd->sensors->useBarUI == FALSE);
+ sd->sensors->display_values_graphically == FALSE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radioBars),
- sd->sensors->useBarUI == TRUE);
+ sd->sensors->display_values_graphically == TRUE);
gtk_box_pack_start(GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX (hbox), radioText, FALSE, FALSE, 0);
@@ -1817,106 +1830,108 @@
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
- g_signal_connect (G_OBJECT (radioBars), "toggled",
+ g_signal_connect (G_OBJECT (radioBars), "toggled",
G_CALLBACK (ui_style_changed), sd );
+
+ TRACE ("leaves add_ui_style_box");
}
static void
-add_labels_box (GtkWidget * vbox, SensorsDialog * sd)
+add_labels_box (GtkWidget * vbox, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_labels_box \n");
- #endif
-
GtkWidget *hbox, *checkButton;
+ TRACE ("enters add_labels_box");
+
hbox = gtk_hbox_new (FALSE, BORDER);
gtk_widget_show (hbox);
- sd->labelsBox = hbox;
- /* gtk_widget_set_sensitive(hbox, sd->sensors->useBarUI); */
+ sd->labels_Box = hbox;
+ /* gtk_widget_set_sensitive(hbox, sd->sensors->display_values_graphically); */
checkButton = gtk_check_button_new_with_mnemonic (
_("Show _labels in graphical UI"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton),
- sd->sensors->showLabels);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton),
+ sd->sensors->show_labels);
gtk_widget_show (checkButton);
-
+
gtk_box_pack_start (GTK_BOX (hbox), checkButton, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
-
- if (sd->sensors->useBarUI==FALSE)
- gtk_widget_hide(sd->labelsBox);
-
- g_signal_connect (G_OBJECT (checkButton), "toggled",
+
+ if (sd->sensors->display_values_graphically==FALSE)
+ gtk_widget_hide(sd->labels_Box);
+
+ g_signal_connect (G_OBJECT (checkButton), "toggled",
G_CALLBACK (show_labels_toggled), sd );
+
+ TRACE ("leaves add_labels_box");
}
static void
-add_colored_bars_box (GtkWidget *vbox, SensorsDialog *sd) {
- #ifdef DEBUG
- g_printf ("add_colored_bars_box \n");
- #endif
+add_colored_bars_box (GtkWidget *vbox, t_sensors_dialog *sd)
+{
+ GtkWidget *hbox, *checkButton;
- GtkWidget *hbox, *checkButton;
-
+ TRACE ("enters add_colored_bars_box");
+
hbox = gtk_hbox_new (FALSE, BORDER);
-
+
gtk_widget_show (hbox);
- sd->coloredBarsBox = hbox;
-
+ sd->coloredBars_Box = hbox;
+
checkButton = gtk_check_button_new_with_mnemonic (
_("Show colored _bars"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton),
- sd->sensors->showColoredBars);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton),
+ sd->sensors->show_colored_bars);
- gtk_widget_show (checkButton);
-
+ gtk_widget_show (checkButton);
+
gtk_box_pack_start (GTK_BOX (hbox), checkButton, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
-
- if (sd->sensors->useBarUI==FALSE)
- gtk_widget_hide(sd->coloredBarsBox);
-
- g_signal_connect (G_OBJECT (checkButton), "toggled",
+
+ if (sd->sensors->display_values_graphically==FALSE)
+ gtk_widget_hide(sd->coloredBars_Box);
+
+ g_signal_connect (G_OBJECT (checkButton), "toggled",
G_CALLBACK (show_colored_bars_toggled), sd );
+ TRACE ("leaves add_colored_bars_box");
}
-
+
static void
-add_title_box (GtkWidget * vbox, SensorsDialog * sd)
+add_title_box (GtkWidget * vbox, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_title_box \n");
- #endif
-
GtkWidget *hbox, *checkButton;
+ TRACE ("enters add_title_box");
+
hbox = gtk_hbox_new (FALSE, BORDER);
gtk_widget_show (hbox);
checkButton = gtk_check_button_new_with_mnemonic (_("_Show title"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton),
- sd->sensors->showTitle);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton),
+ sd->sensors->show_title);
gtk_widget_show (checkButton);
-
+
gtk_box_pack_start (GTK_BOX (hbox), checkButton, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
-
- g_signal_connect (G_OBJECT (checkButton), "toggled",
+
+ g_signal_connect (G_OBJECT (checkButton), "toggled",
G_CALLBACK (show_title_toggled), sd );
+
+ TRACE ("leaves add_title_box");
}
static void
-add_type_box (GtkWidget * vbox, SensorsDialog * sd)
+add_type_box (GtkWidget * vbox, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_type_box \n");
- #endif
-
GtkWidget *hbox, *label;
+ t_chip *chip;
+ gint gtk_combo_box_active;
+ TRACE ("enters add_type_box");
+
hbox = gtk_hbox_new (FALSE, BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@@ -1925,101 +1940,104 @@
gtk_widget_show (label);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
+
gtk_widget_show (sd->myComboBox);
gtk_box_pack_start (GTK_BOX (hbox), sd->myComboBox, FALSE, FALSE, 0);
-
-
- gint gtk_combo_box_active =
+
+ gtk_combo_box_active =
gtk_combo_box_get_active(GTK_COMBO_BOX(sd->myComboBox));
-
- if (sd->sensors->sensorNumber >0)
- sd->mySensorLabel = gtk_label_new
+
+ chip = g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
+
+ if (sd->sensors->num_sensorchips > 0)
+ sd->mySensorLabel = gtk_label_new
( sensors_get_adapter_name
- ( sd->sensors->chipName[gtk_combo_box_active ]->bus) );
+ ( chip->chip_name->bus) );
else
- sd->mySensorLabel =
- gtk_label_new ( sd->sensors->sensorId [gtk_combo_box_active ] );
-
+ sd->mySensorLabel =
+ gtk_label_new (chip->sensorId);
+
gtk_widget_show (sd->mySensorLabel);
gtk_box_pack_start (GTK_BOX (hbox), sd->mySensorLabel, FALSE, FALSE, 0);
-
- g_signal_connect (G_OBJECT (sd->myComboBox), "changed",
+
+ g_signal_connect (G_OBJECT (sd->myComboBox), "changed",
G_CALLBACK (sensor_entry_changed), sd );
+
+ TRACE ("leaves add_type_box");
}
static void
-add_sensor_settings_box ( GtkWidget * vbox, SensorsDialog * sd)
+add_sensor_settings_box ( GtkWidget * vbox, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_sensor_settings_box \n");
- #endif
+ GtkTreeViewColumn *aTreeViewColumn;
+ GtkCellRenderer *myCellRendererText, *myCellRendererToggle;
+ GtkWidget *myScrolledWindow;
+ gint gtk_combo_box_active;
- GtkTreeViewColumn *aTreeViewColumn;
- GtkCellRenderer *myCellRendererText;
-
- gint gtk_combo_box_active =
+ TRACE ("enters add_sensor_settings_box");
+
+ gtk_combo_box_active =
gtk_combo_box_get_active(GTK_COMBO_BOX(sd->myComboBox));
-
+
sd->myTreeView = gtk_tree_view_new_with_model
( GTK_TREE_MODEL ( sd->myListStore[ gtk_combo_box_active ] ) );
myCellRendererText = gtk_cell_renderer_text_new ();
g_object_set ( (gpointer*) myCellRendererText, "editable", TRUE, NULL );
- aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Name"),
+ aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Name"),
myCellRendererText, "text", 0, NULL);
- g_signal_connect (G_OBJECT (myCellRendererText), "edited",
+ g_signal_connect (G_OBJECT (myCellRendererText), "edited",
G_CALLBACK (gtk_cell_text_edited), sd);
gtk_tree_view_column_set_expand (aTreeViewColumn, TRUE);
- gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
+ gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
GTK_TREE_VIEW_COLUMN (aTreeViewColumn));
-
+
myCellRendererText = gtk_cell_renderer_text_new ();
- aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Value"),
+ aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Value"),
myCellRendererText, "text", 1, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
+ gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
GTK_TREE_VIEW_COLUMN (aTreeViewColumn));
-
- GtkCellRenderer *myCellRendererToggle = gtk_cell_renderer_toggle_new();
- aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Show"),
+
+ myCellRendererToggle = gtk_cell_renderer_toggle_new();
+ aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Show"),
myCellRendererToggle, "active", 2, NULL);
- g_signal_connect (G_OBJECT (myCellRendererToggle), "toggled",
+ g_signal_connect (G_OBJECT (myCellRendererToggle), "toggled",
G_CALLBACK (gtk_cell_toggle), sd );
- gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
+ gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
GTK_TREE_VIEW_COLUMN (aTreeViewColumn));
-
+
myCellRendererText = gtk_cell_renderer_text_new ();
g_object_set ( (gpointer*) myCellRendererText, "editable", TRUE, NULL );
- aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Color"),
+ aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Color"),
myCellRendererText, "text", 3, NULL);
- g_signal_connect (G_OBJECT (myCellRendererText), "edited",
+ g_signal_connect (G_OBJECT (myCellRendererText), "edited",
G_CALLBACK (gtk_cell_color_edited), sd);
- gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
+ gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
GTK_TREE_VIEW_COLUMN (aTreeViewColumn));
myCellRendererText = gtk_cell_renderer_text_new ();
g_object_set ( (gpointer*) myCellRendererText, "editable", TRUE, NULL );
aTreeViewColumn = gtk_tree_view_column_new_with_attributes
- (_("Min"), myCellRendererText, "text", 4, NULL);
+ (_("Min"), myCellRendererText, "text", 4, NULL);
g_signal_connect(G_OBJECT(myCellRendererText), "edited",
- G_CALLBACK(minimum_changed), sd);
+ G_CALLBACK(minimum_changed), sd);
gtk_tree_view_append_column(GTK_TREE_VIEW(sd->myTreeView),
- GTK_TREE_VIEW_COLUMN(aTreeViewColumn));
+ GTK_TREE_VIEW_COLUMN(aTreeViewColumn));
myCellRendererText = gtk_cell_renderer_text_new ();
g_object_set ( (gpointer*) myCellRendererText, "editable", TRUE, NULL );
aTreeViewColumn = gtk_tree_view_column_new_with_attributes
- (_("Max"), myCellRendererText, "text", 5, NULL);
+ (_("Max"), myCellRendererText, "text", 5, NULL);
g_signal_connect(G_OBJECT(myCellRendererText), "edited",
- G_CALLBACK(maximum_changed), sd);
+ G_CALLBACK(maximum_changed), sd);
gtk_tree_view_append_column(GTK_TREE_VIEW(sd->myTreeView),
- GTK_TREE_VIEW_COLUMN(aTreeViewColumn));
+ GTK_TREE_VIEW_COLUMN(aTreeViewColumn));
- GtkWidget *myScrolledWindow = gtk_scrolled_window_new (NULL, NULL);
+ myScrolledWindow = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (
- GTK_SCROLLED_WINDOW (myScrolledWindow), GTK_POLICY_AUTOMATIC,
+ GTK_SCROLLED_WINDOW (myScrolledWindow), GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_set_border_width (GTK_CONTAINER (myScrolledWindow), 0);
gtk_scrolled_window_add_with_viewport (
@@ -2029,72 +2047,77 @@
gtk_widget_show (sd->myTreeView);
gtk_widget_show (myScrolledWindow);
+
+ TRACE ("leaves add_sensor_settings_box");
}
static void
-add_font_size_box (GtkWidget * vbox, SensorsDialog * sd)
+add_font_size_box (GtkWidget * vbox, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_font_size_box \n");
- #endif
+ GtkWidget *myFontLabel;
+ GtkWidget *myFontBox;
+ GtkWidget *myFontSizeComboBox;
- GtkWidget *myFontLabel = gtk_label_new_with_mnemonic (_("F_ont size:"));
- GtkWidget *myFontBox = gtk_hbox_new(FALSE, BORDER);
- GtkWidget *myFontSizeComboBox = gtk_combo_box_new_text();
+ TRACE ("enters add_font_size_box");
- sd->fontBox = myFontBox;
- /* gtk_widget_set_sensitive(myFontBox, !sd->sensors->useBarUI); */
+ myFontLabel = gtk_label_new_with_mnemonic (_("F_ont size:"));
+ myFontBox = gtk_hbox_new(FALSE, BORDER);
+ myFontSizeComboBox = gtk_combo_box_new_text();
+ sd->font_Box = myFontBox;
+ /* gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically); */
+
gtk_combo_box_append_text (GTK_COMBO_BOX(myFontSizeComboBox), _("x-small"));
gtk_combo_box_append_text (GTK_COMBO_BOX(myFontSizeComboBox), _("small") );
gtk_combo_box_append_text (GTK_COMBO_BOX(myFontSizeComboBox), _("medium") );
gtk_combo_box_append_text (GTK_COMBO_BOX(myFontSizeComboBox), _("large") );
gtk_combo_box_append_text (GTK_COMBO_BOX(myFontSizeComboBox), _("x-large"));
- gtk_combo_box_set_active (GTK_COMBO_BOX(myFontSizeComboBox),
- sd->sensors->fontSizeNumerical);
+ gtk_combo_box_set_active (GTK_COMBO_BOX(myFontSizeComboBox),
+ sd->sensors->font_size_numerical);
gtk_box_pack_start (GTK_BOX (myFontBox), myFontLabel, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (myFontBox), myFontSizeComboBox, FALSE, FALSE,
- 0);
+ 0);
gtk_box_pack_start (GTK_BOX (vbox), myFontBox, FALSE, FALSE, 0);
-
+
gtk_widget_show (myFontLabel);
gtk_widget_show (myFontSizeComboBox);
gtk_widget_show (myFontBox);
-
- if (sd->sensors->useBarUI==TRUE)
- gtk_widget_hide(sd->fontBox);
-
- g_signal_connect (G_OBJECT (myFontSizeComboBox), "changed",
+
+ if (sd->sensors->display_values_graphically==TRUE)
+ gtk_widget_hide(sd->font_Box);
+
+ g_signal_connect (G_OBJECT (myFontSizeComboBox), "changed",
G_CALLBACK (gtk_font_size_change), sd );
+
+ TRACE ("leaves add_font_size_box");
}
static void
-add_temperature_unit_box (GtkWidget *vbox, SensorsDialog *sd)
-{
- #ifdef DEBUG
- g_printf ("add_temperature_unit_box \n");
- #endif
- GtkWidget *hbox;
+add_temperature_unit_box (GtkWidget *vbox, t_sensors_dialog *sd)
+{
+ GtkWidget *hbox, *label, *radioCelsius, *radioFahrenheit;
+ TRACE ("enters add_temperature_unit_box");
+
hbox = gtk_hbox_new (FALSE, BORDER);
gtk_widget_show (hbox);
- GtkWidget *label = gtk_label_new_with_mnemonic ( _("T_emperature scale:"));
- GtkWidget *radioCelsius = gtk_radio_button_new_with_mnemonic (NULL,
+ label = gtk_label_new_with_mnemonic ( _("T_emperature scale:"));
+ radioCelsius = gtk_radio_button_new_with_mnemonic (NULL,
_("_Celsius"));
- GtkWidget *radioFahrenheit = gtk_radio_button_new_with_mnemonic(
+ radioFahrenheit = gtk_radio_button_new_with_mnemonic(
gtk_radio_button_get_group(GTK_RADIO_BUTTON(radioCelsius)), _("_Fahrenheit"));
-
+
gtk_widget_show(radioCelsius);
gtk_widget_show(radioFahrenheit);
gtk_widget_show(label);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radioCelsius),
- sd->sensors->scale == CELSIUS);
+ sd->sensors->scale == CELSIUS);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radioFahrenheit),
- sd->sensors->scale == FAHRENHEIT);
+ sd->sensors->scale == FAHRENHEIT);
gtk_box_pack_start(GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX (hbox), radioCelsius, FALSE, FALSE, 0);
@@ -2102,25 +2125,25 @@
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
- g_signal_connect (G_OBJECT (radioCelsius), "toggled",
+ g_signal_connect (G_OBJECT (radioCelsius), "toggled",
G_CALLBACK (gtk_temperature_unit_change), sd );
+
+ TRACE ("leaves add_temperature_unit_box");
}
static void
-add_update_time_box (GtkWidget * vbox, SensorsDialog * sd)
+add_update_time_box (GtkWidget * vbox, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_update_time_box \n");
- #endif
-
GtkWidget *spinner, *myLabel, *myBox;
GtkAdjustment *spinner_adj;
+ TRACE ("enters add_update_time_box");
+
spinner_adj = (GtkAdjustment *) gtk_adjustment_new (
/* TODO: restore original */
- sd->sensors->sensorUpdateTime, 1.0, 990.0, 1.0, 60.0, 60.0);
-
+ sd->sensors->sensors_refresh_time, 1.0, 990.0, 1.0, 60.0, 60.0);
+
/* creates the spinner, with no decimal places */
spinner = gtk_spin_button_new (spinner_adj, 10.0, 0);
@@ -2128,220 +2151,226 @@
myBox = gtk_hbox_new(FALSE, BORDER);
gtk_box_pack_start (GTK_BOX (myBox), myLabel, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (myBox), spinner, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (myBox), spinner, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), myBox, FALSE, FALSE, 0);
-
+
gtk_widget_show (myLabel);
gtk_widget_show (spinner);
gtk_widget_show (myBox);
-
+
g_signal_connect (G_OBJECT (spinner_adj), "value_changed",
G_CALLBACK (adjustment_value_changed), sd );
+
+ TRACE ("leaves add_update_time_box");
}
-/* double-click improvement */
+/* double-click improvement */
static void
-add_command_box (GtkWidget * vbox, SensorsDialog * sd)
+add_command_box (GtkWidget * vbox, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_command_box \n");
- #endif
-
GtkWidget *myBox;
+
+ TRACE ("enters add_command_box");
+
myBox = gtk_hbox_new(FALSE, BORDER);
- sd->myExecCommandCheckBox = gtk_check_button_new_with_mnemonic
+ sd->myExecCommand_CheckBox = gtk_check_button_new_with_mnemonic
(_("E_xecute on double click:"));
- gtk_toggle_button_set_active
- ( GTK_TOGGLE_BUTTON (sd->myExecCommandCheckBox),
- sd->sensors->execCommand );
+ gtk_toggle_button_set_active
+ ( GTK_TOGGLE_BUTTON (sd->myExecCommand_CheckBox),
+ sd->sensors->exec_command );
- sd->myCommandNameEntry = gtk_entry_new ();
- gtk_widget_set_size_request (sd->myCommandNameEntry, 160, 25);
-
-
- gtk_entry_set_text( GTK_ENTRY(sd->myCommandNameEntry),
- sd->sensors->commandName );
+ sd->myCommandName_Entry = gtk_entry_new ();
+ gtk_widget_set_size_request (sd->myCommandName_Entry, 160, 25);
- gtk_box_pack_start (GTK_BOX (myBox), sd->myExecCommandCheckBox, FALSE,
+
+ gtk_entry_set_text( GTK_ENTRY(sd->myCommandName_Entry),
+ sd->sensors->command_name );
+
+ gtk_box_pack_start (GTK_BOX (myBox), sd->myExecCommand_CheckBox, FALSE,
FALSE, 0);
- gtk_box_pack_start (GTK_BOX (myBox), sd->myCommandNameEntry, FALSE,
+ gtk_box_pack_start (GTK_BOX (myBox), sd->myCommandName_Entry, FALSE,
FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), myBox, FALSE, FALSE, 0);
- gtk_widget_show (sd->myExecCommandCheckBox);
- gtk_widget_show (sd->myCommandNameEntry);
+ gtk_widget_show (sd->myExecCommand_CheckBox);
+ gtk_widget_show (sd->myCommandName_Entry);
gtk_widget_show (myBox);
- g_signal_connect (G_OBJECT (sd->myExecCommandCheckBox), "toggled",
+ g_signal_connect (G_OBJECT (sd->myExecCommand_CheckBox), "toggled",
G_CALLBACK (execCommand_toggled), sd );
-
+
/* g_signal_connect (G_OBJECT (sd->myCommandNameEntry), "focus-out-event",
G_CALLBACK (execCommandName_activate), sd ); */
-}
+ TRACE ("leaves add_command_box");
+}
-static void
-add_view_frame (GtkWidget * vbox, SensorsDialog * sd)
+static void
+add_view_frame (GtkWidget * notebook, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_view_frame \n");
- #endif
- GtkWidget *_vbox = gtk_vbox_new (FALSE, 4);
+ GtkWidget *_vbox, *_label;
+
+ TRACE ("enters add_view_frame");
+
+ _vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER(_vbox), 4);
gtk_widget_show (_vbox);
-
- GtkWidget *_label = gtk_label_new("");
- gtk_label_set_markup(GTK_LABEL(_label), _("<b>View</b>"));
+
+ _label = gtk_label_new("");
+ gtk_label_set_markup(GTK_LABEL(_label), _("View"));
gtk_widget_show (_label);
-
- GtkWidget *_frame = gtk_frame_new ("");
- gtk_frame_set_label_widget (GTK_FRAME(_frame), _label);
- gtk_frame_set_shadow_type (GTK_FRAME(_frame), GTK_SHADOW_NONE);
- gtk_widget_show (_frame);
+
gtk_container_set_border_width (GTK_CONTAINER (_vbox), BORDER<<1);
- gtk_container_add (GTK_CONTAINER (_frame), _vbox);
- gtk_box_pack_start (GTK_BOX (vbox), _frame, FALSE, FALSE, 4);
+ gtk_notebook_append_page (GTK_NOTEBOOK(notebook), _vbox, _label);
+
add_title_box (_vbox, sd);
add_ui_style_box (_vbox, sd);
- add_labels_box (_vbox, sd);
- add_colored_bars_box (_vbox, sd);
+ add_labels_box (_vbox, sd);
+ add_colored_bars_box (_vbox, sd);
add_font_size_box (_vbox, sd);
+
+ TRACE ("leaves add_view_frame");
}
-static void
-add_sensors_frame (GtkWidget * vbox, SensorsDialog * sd)
+static void
+add_sensors_frame (GtkWidget * notebook, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_sensors_frame \n");
- #endif
- GtkWidget *_vbox = gtk_vbox_new (FALSE, 4);
+ GtkWidget *_vbox, *_label;
+
+ TRACE ("enters add_sensors_frame");
+
+ _vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER(_vbox), 4);
gtk_widget_show (_vbox);
-
- GtkWidget *_label = gtk_label_new("");
- gtk_label_set_markup(GTK_LABEL(_label), _("<b>Sensors</b>"));
+
+ _label = gtk_label_new("");
+ gtk_label_set_markup(GTK_LABEL(_label), _("Sensors"));
gtk_widget_show (_label);
-
- GtkWidget *_frame = gtk_frame_new ("");
- gtk_frame_set_label_widget (GTK_FRAME(_frame), _label);
- gtk_frame_set_shadow_type (GTK_FRAME(_frame), GTK_SHADOW_NONE);
- gtk_widget_show (_frame);
+
gtk_container_set_border_width (GTK_CONTAINER (_vbox), BORDER<<1);
- gtk_container_add (GTK_CONTAINER (_frame), _vbox);
- gtk_box_pack_start (GTK_BOX (vbox), _frame, TRUE, TRUE, 4);
-
+
+ gtk_notebook_append_page (GTK_NOTEBOOK(notebook), _vbox, _label);
+
add_type_box (_vbox, sd);
add_sensor_settings_box (_vbox, sd);
-
+
add_temperature_unit_box (_vbox, sd);
+
+ TRACE ("leaves add_sensors_frame");
}
-static void
-add_miscellaneous_frame (GtkWidget * vbox, SensorsDialog * sd)
+static void
+add_miscellaneous_frame (GtkWidget * notebook, t_sensors_dialog * sd)
{
- #ifdef DEBUG
- g_printf ("add_miscellaneous_frame \n");
- #endif
- GtkWidget *_vbox = gtk_vbox_new (FALSE, 4);
+ GtkWidget *_vbox, *_label;
+
+ TRACE ("enters add_miscellaneous_frame");
+
+ _vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER(_vbox), 4);
gtk_widget_show (_vbox);
-
- GtkWidget *_label = gtk_label_new("");
- gtk_label_set_markup(GTK_LABEL(_label), _("<b>Miscellaneous</b>"));
+
+ _label = gtk_label_new("");
+ gtk_label_set_markup(GTK_LABEL(_label), _("Miscellaneous"));
gtk_widget_show (_label);
-
- GtkWidget *_frame = gtk_frame_new ("");
- gtk_frame_set_label_widget (GTK_FRAME(_frame), _label);
- gtk_frame_set_shadow_type (GTK_FRAME(_frame), GTK_SHADOW_NONE);
- gtk_widget_show (_frame);
+
gtk_container_set_border_width (GTK_CONTAINER (_vbox), BORDER<<1);
- gtk_container_add (GTK_CONTAINER (_frame), _vbox);
- gtk_box_pack_start (GTK_BOX (vbox), _frame, FALSE, FALSE, 4);
-
+
+ gtk_notebook_append_page (GTK_NOTEBOOK(notebook), _vbox, _label);
+
add_update_time_box (_vbox, sd);
-
+
add_command_box (_vbox, sd);
+
+ TRACE ("leaves add_miscellaneous_frame");
}
-static void
-on_optionsDialog_response (GtkWidget *dlg, int response, SensorsDialog *sd)
-{
- #ifdef DEBUG
- g_printf ("on_optionsDialog_response \n");
- #endif
+static void
+on_optionsDialog_response (GtkWidget *dlg, int response, t_sensors_dialog *sd)
+{
+ TRACE ("enters on_optionsDialog_response");
+
if (response==GTK_RESPONSE_OK) {
/* FIXME: save most of the content in this function,
remove those toggle functions where possible. NYI */
- /* sensors_apply_options (sd); */
- sd->sensors->commandName =
- g_strdup ( gtk_entry_get_text(GTK_ENTRY(sd->myCommandNameEntry)) );
-
- sensors_write_config (sd->sensors->plugin, sd->sensors);
+ /* sensors_apply_options (sd); */
+ sd->sensors->command_name =
+ g_strdup ( gtk_entry_get_text(GTK_ENTRY(sd->myCommandName_Entry)) );
+
+ sensors_write_config (sd->sensors->plugin, sd->sensors);
}
gtk_widget_destroy (sd->dialog);
xfce_panel_plugin_unblock_menu (sd->sensors->plugin);
+
+ TRACE ("leaves on_optionsDialog_response");
}
/* create sensor options box */
static void
-sensors_create_options (XfcePanelPlugin *plugin, t_sensors *st)
+sensors_create_options (XfcePanelPlugin *plugin, t_sensors *sensors)
{
- #ifdef DEBUG
- g_printf ("sensors_create_options \n");
- #endif
-
+ GtkWidget *dlg, *header, *vbox, *notebook;
+ t_sensors_dialog *sd;
+
+ TRACE ("enters sensors_create_options");
+
xfce_panel_plugin_block_menu (plugin);
-
- GtkWidget *dlg, *header;
- dlg = gtk_dialog_new_with_buttons (_("Edit Properties"),
+
+ dlg = gtk_dialog_new_with_buttons (_("Edit Properties"),
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
-
+
gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
-
+
header = xfce_create_header (NULL, _("Sensors Plugin"));
gtk_widget_set_size_request (GTK_BIN (header)->child, -1, 32);
gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2);
gtk_widget_show (header);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
FALSE, TRUE, 0);
- GtkWidget *vbox = GTK_DIALOG (dlg)->vbox;
- SensorsDialog *sd;
+ vbox = GTK_DIALOG (dlg)->vbox;
- sd = g_new0 (SensorsDialog, 1);
+ sd = g_new0 (t_sensors_dialog, 1);
- sd->sensors = st;
+ sd->sensors = sensors;
sd->dialog = dlg;
-
+
sd->myComboBox = gtk_combo_box_new_text();
-
+
init_widgets (sd);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX(sd->myComboBox), 0);
-
- add_view_frame (vbox, sd);
- add_sensors_frame (vbox, sd);
- add_miscellaneous_frame (vbox, sd);
-
- gtk_widget_set_size_request (vbox, 470, 550);
+ notebook = gtk_notebook_new ();
+
+ gtk_box_pack_start (GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
+ gtk_widget_show(notebook);
+
+ add_sensors_frame (notebook, sd);
+ add_view_frame (notebook, sd);
+ add_miscellaneous_frame (notebook, sd);
+
+ gtk_widget_set_size_request (vbox, 400, 400);
+
g_signal_connect (dlg, "response",
G_CALLBACK(on_optionsDialog_response), sd);
-
+
gtk_widget_show (dlg);
+
+ TRACE ("leaves sensors_create_options");
}
@@ -2351,53 +2380,60 @@
static t_sensors *
create_sensors_control (XfcePanelPlugin *plugin)
{
- #ifdef DEBUG
- g_printf ("create_sensors_control \n");
- #endif
+ t_sensors *sensors;
- t_sensors *sensors = sensors_new (plugin);
+ TRACE ("enters create_sensors_control");
+ sensors = sensors_new (plugin);
+
gtk_widget_show (sensors->eventbox);
-
+
/* sensors_set_size (control, settings.size); */
+ TRACE ("leaves create_sensors_control");
+
return sensors;
}
-static void
+static void
sensors_plugin_construct (XfcePanelPlugin *plugin)
-{
- #ifdef DEBUG
- g_printf ("sensors_plugin_construct \n");
- #endif
+{
+ t_sensors *sensors;
+
+ TRACE ("enters sensors_plugin_construct");
+
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
- t_sensors *sensors;
-
sensors = create_sensors_control (plugin);
sensors_read_config (plugin, sensors);
-
+
+ sensors->timeout_id = g_timeout_add (sensors->sensors_refresh_time * 1000,
+ (GtkFunction) sensors_show_panel,
+ (gpointer) sensors);
+
g_signal_connect (plugin, "free-data", G_CALLBACK (sensors_free), sensors);
-
- g_signal_connect (plugin, "save", G_CALLBACK (sensors_write_config),
+
+ g_signal_connect (plugin, "save", G_CALLBACK (sensors_write_config),
sensors);
-
+
xfce_panel_plugin_menu_show_configure (plugin);
-
- g_signal_connect (plugin, "configure-plugin",
+
+ g_signal_connect (plugin, "configure-plugin",
G_CALLBACK (sensors_create_options), sensors);
-
- g_signal_connect (plugin, "size-changed", G_CALLBACK (sensors_set_size),
+
+ g_signal_connect (plugin, "size-changed", G_CALLBACK (sensors_set_size),
sensors);
-
- g_signal_connect (plugin, "orientation-changed",
+
+ g_signal_connect (plugin, "orientation-changed",
G_CALLBACK (sensors_set_orientation), sensors);
-
+
gtk_container_add (GTK_CONTAINER(plugin), sensors->eventbox);
xfce_panel_plugin_add_action_widget (plugin, sensors->eventbox);
+
+ TRACE ("leaves sensors_plugin_construct");
}
XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (sensors_plugin_construct);
Modified: xfce4-sensors-plugin/trunk/panel-plugin/sensors.h
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/sensors.h 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/panel-plugin/sensors.h 2007-10-20 18:11:34 UTC (rev 3416)
@@ -1,5 +1,5 @@
-/* Copyright 2004 Fabian Nowak (timystery at arcor.de)
- *
+/* Copyright 2004-2007 Fabian Nowak (timystery at arcor.de)
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -12,68 +12,54 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* This plugin requires libsensors-3 and its headers !*/
-
/* Note for programmers and editors: Try to use 4 spaces instead of Tab! */
-#ifndef XFCE4_SENSORS_H
-#define XFCE4_SENSORS_H
+#ifndef XFCE4_SENSORS_SENSORS_H
+#define XFCE4_SENSORS_SENSORS_H
#ifdef HAVE_CONFIG_H
-#include <config.h>
+ #include <config.h>
#endif
+/* #endif */
+
+#include <glib/garray.h>
#include <glib/gprintf.h>
#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
#include <libxfce4panel/xfce-panel-plugin.h>
-/* #include <libxfce4util/i18n.h>
-#include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/xfce_clock.h>
-
-#include <panel/controls.h>
-#include <panel/global.h>
-#include <panel/icons.h>
-#include <panel/plugins.h> */
-
-/* this is libsensors3 */
-#include <sensors/sensors.h>
-
-/* for strstr() */
#include <string.h>
-/* #include <unistd.h> */
+#include "middlelayer.h"
+
#define APP_NAME N_("Sensors Plugin")
-#define BORDER 6
-#define SENSORS 10
-#define FEATURES_PER_SENSOR 256
+#define BORDER 8
+#define OUTER_BORDER 4
+#define INNER_BORDER 2
-
-#define COLOR_ERROR "#f00000"
-#define COLOR_WARN "#f0f000"
+#define COLOR_ERROR "#F00000"
+#define COLOR_WARN "#F0F000"
#define COLOR_NORMAL "#00C000"
+/*
+ * temperature scale to show values in
+ */
typedef enum {
- TEMPERATURE,
- VOLTAGE,
- SPEED,
- OTHER
-} sensor_type;
-
-
-typedef enum {
CELSIUS,
FAHRENHEIT
-} temp_scale;
+} t_tempscale;
+/*
+ * compound widget displaying a progressbar and optional label
+ */
typedef struct {
/* the progress bar */
GtkWidget *progressbar;
@@ -86,8 +72,8 @@
} t_barpanel;
-/* Sensors module
- * ------------
+/*
+ * Sensors module
*/
typedef struct {
@@ -95,110 +81,117 @@
/* eventbox to catch events */
GtkWidget *eventbox;
-
+
/* our XfceSensors widget */
- GtkWidget *sensors;
-
+ GtkWidget *widget_sensors;
+
/* panel value display */
- GtkWidget *panelValuesLabel;
+ GtkWidget *panel_label_text;
/* update the tooltip */
gint timeout_id;
/* font size for display in panel */
- gchar* fontSize;
- gint fontSizeNumerical;
+ gchar* font_size;
+ gint font_size_numerical;
/* temperature scale for display in panel */
- temp_scale scale;
-
+ t_tempscale scale;
+
/* panel size to compute number of cols/columns */
- gint panelSize;
+ gint panel_size;
/* panel orientation */
gint orientation;
/* if the bars have been initialized */
- gboolean barsCreated;
-
+ gboolean bars_created;
+
/* show title in panel */
- gboolean showTitle;
+ gboolean show_title;
/* show labels in panel (GUI mode only) */
- gboolean showLabels;
-
+ gboolean show_labels;
+
/* show colored bars (GUI mode only) */
- gboolean showColoredBars;
-
+ gboolean show_colored_bars;
+
/* use the progress-bar UI */
- gboolean useBarUI;
+ gboolean display_values_graphically;
/* sensor update time */
- gint sensorUpdateTime;
-
+ gint sensors_refresh_time;
+
/* sensor relevant stuff */
- /* no problem if less than 11 sensors, else will have to enlarge the
+ /* no problem if less than 11 sensors, else will have to enlarge the
following arrays. NYI!! */
- gint sensorNumber;
- gint sensorsCount[SENSORS];
-
+ gint num_sensorchips;
+
+ /* gint sensorsCount[SENSORS]; */
+
/* contains the progress bar panels */
- GtkWidget* panels[SENSORS][FEATURES_PER_SENSOR];
-
+ /* FIXME: Might be replaced by GPtrArray as well */
+ GtkWidget* panels[10][256];
+ /* GArray *panels_array; */
+
/* contains structure from libsensors */
- const sensors_chip_name *chipName[SENSORS];
-
+ /* const sensors_chip_name *chipName[SENSORS]; */
+
/* formatted sensor chip names, e.g. 'asb-100-45' */
- gchar *sensorId[SENSORS];
-
+ /* gchar *sensorId[SENSORS]; */
+
/* unformatted sensor feature names, e.g. 'Vendor' */
- gchar *sensorNames[SENSORS][FEATURES_PER_SENSOR];
+ /* gchar *sensorNames[SENSORS][FEATURES_PER_SENSOR]; */
/* minimum and maximum values (GUI mode only) */
- glong sensorMinValues[SENSORS][FEATURES_PER_SENSOR];
- glong sensorMaxValues[SENSORS][FEATURES_PER_SENSOR];
-
+ /* glong sensorMinValues[SENSORS][FEATURES_PER_SENSOR]; */
+ /* glong sensorMaxValues[SENSORS][FEATURES_PER_SENSOR]; */
+
/* unformatted sensor feature values */
- double sensorRawValues[SENSORS][FEATURES_PER_SENSOR];
+ /* double sensorRawValues[SENSORS][FEATURES_PER_SENSOR]; */
/* formatted (%f5.2) sensor feature values */
- gchar *sensorValues[SENSORS][FEATURES_PER_SENSOR];
+ /* gchar *sensorValues[SENSORS][FEATURES_PER_SENSOR]; */
/* TRUE if sensorNames are set */
- gboolean sensorValid[SENSORS][FEATURES_PER_SENSOR];
-
+ /* gboolean sensorValid[SENSORS][FEATURES_PER_SENSOR]; */
+
/* show sensor in panel */
- gboolean sensorCheckBoxes[SENSORS][FEATURES_PER_SENSOR];
-
+ /* gboolean sensorCheckBoxes[SENSORS][FEATURES_PER_SENSOR]; */
+
/* sensor types to display values in appropriate format */
- sensor_type sensor_types[SENSORS][FEATURES_PER_SENSOR];
-
+ /* sensor_type sensor_types[SENSORS][FEATURES_PER_SENSOR]; */
+ GPtrArray *chips;
+
/* sensor colors in panel */
- gchar *sensorColors[SENSORS][FEATURES_PER_SENSOR];
-
+ /* gchar *sensorColors[SENSORS][FEATURES_PER_SENSOR]; */
+
/* number in list <--> number in array */
- gint sensorAddress[SENSORS][FEATURES_PER_SENSOR];
-
+ /* gint sensorAddress[NUM_SENSOR_CHIPS][FEATURES_PER_SENSOR]; */
+
/* double-click improvement as suggested on xfce4-goodies at berlios.de */
/* whether to execute command on double click */
- gboolean execCommand;
-
+ gboolean exec_command;
+
/* command to excute */
- gchar* commandName;
-
+ gchar* command_name;
+
/* callback_id for doubleclicks */
- gint doubleClick_id;
-
+ gint doubleclick_id;
+
/* hddtemp disks */
GPtrArray *disklist;
- gint numDisks;
-
+ /* gint num_disks; */
+
+ /* ACPI thermal zones */
+ GPtrArray *acpi_zones;
+ gint num_acpi_zones;
}
t_sensors;
-/* sensor panel widget
- * -------------------
+/*
+ * sensor panel widget
*/
typedef struct {
/* the sensors structure */
@@ -215,19 +208,22 @@
/* GtkWidget *myFrame; */
GtkWidget *mySensorLabel;
GtkWidget *myTreeView;
- GtkTreeStore *myListStore[SENSORS];
- GtkWidget *fontBox; /* used to disable font size option when using graphical view */
- GtkWidget *labelsBox; /* used to enable 'show labels' option when using graphical view */
- GtkWidget *coloredBarsBox;
+ GtkTreeStore *myListStore[10]; /* replace by GPtrArray as well */
+ GtkWidget *font_Box; /* used to disable font size option when using graphical view */
+ GtkWidget *labels_Box; /* used to enable 'show labels' option when using graphical view */
+ GtkWidget *coloredBars_Box;
GtkWidget *temperature_radio_group;
- /* double-click improvement */
- GtkWidget *myExecCommandCheckBox;
- GtkWidget *myCommandNameEntry;
+ /* double-click improvement */
+ GtkWidget *myExecCommand_CheckBox;
+ GtkWidget *myCommandName_Entry;
}
-SensorsDialog;
+t_sensors_dialog;
+/*
+ * Tooltips to display for any part of this plugin
+ */
static GtkTooltips *tooltips = NULL;
-#endif // XFCE4_SENSORS_H
+#endif /* XFCE4_SENSORS_SENSORS_H */
Modified: xfce4-sensors-plugin/trunk/po/LINGUAS
===================================================================
--- xfce4-sensors-plugin/trunk/po/LINGUAS 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/LINGUAS 2007-10-20 18:11:34 UTC (rev 3416)
@@ -1,2 +1,2 @@
# set of available languages (in alphabetic order)
-ca cs de el en_GB fr hu ja ka ko lt pl ru sq sv vi zh_TW
+ca cs de el en_GB eu fr hu ja ko lt pl ru sq vi zh_TW
Modified: xfce4-sensors-plugin/trunk/po/ca.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/ca.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/ca.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -8,37 +8,38 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-09-20 13:53+0200\n"
"Last-Translator: Pau Rul·lan Ferragut <paurullan at bulma.net>\n"
"Language-Team: Catalan\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors.c:153 ../panel-plugin/sensors.c:2162
-msgid "<b>Sensors</b>"
-msgstr "<b>Sensors</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
+msgstr "Tipus de sensors:"
-#: ../panel-plugin/sensors.c:272
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-#: ../panel-plugin/sensors.c:334
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:441
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "No s’ha seleccionat cap sensor"
-#: ../panel-plugin/sensors.c:479 ../panel-plugin/sensors.c:1677
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -47,133 +48,138 @@
"S’ha produït un error durant la lectura dels sensors.\n"
"No es podrà assegurar un bon funcionament.\n"
-#: ../panel-plugin/sensors.c:500
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f rpm"
-#: ../panel-plugin/sensors.c:723
-msgid "Error: Could not connect to sensors!"
-msgstr "No s’ha pogut connectar als sensors"
-
-#: ../panel-plugin/sensors.c:813 ../panel-plugin/sensors.c:887
-msgid "Hard disks"
-msgstr "Discs durs"
-
-#: ../panel-plugin/sensors.c:923
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "No s’han trobat sensors"
-#: ../panel-plugin/sensors.c:1356
-msgid "Hard disk temperature sensors"
-msgstr "Sensors de temperatura dels discs durs"
-
-#: ../panel-plugin/sensors.c:1772
-msgid "UI style:"
+#: ../panel-plugin/sensors.c:1813
+#, fuzzy
+msgid "_UI style:"
msgstr "Estil de la interfície:"
-#: ../panel-plugin/sensors.c:1773
-msgid "text"
+#: ../panel-plugin/sensors.c:1814
+#, fuzzy
+msgid "_text"
msgstr "text"
-#: ../panel-plugin/sensors.c:1775
-msgid "graphical"
+#: ../panel-plugin/sensors.c:1816
+#, fuzzy
+msgid "g_raphical"
msgstr "gràfic"
-#: ../panel-plugin/sensors.c:1812
-msgid "Show labels in graphical UI"
+#: ../panel-plugin/sensors.c:1853
+#, fuzzy
+msgid "Show _labels in graphical UI"
msgstr "Mostra les etiquetes a l’interfície gràfica"
-#: ../panel-plugin/sensors.c:1837
-msgid "Show title"
+#: ../panel-plugin/sensors.c:1883
+msgid "Show colored _bars"
+msgstr ""
+
+#: ../panel-plugin/sensors.c:1912
+#, fuzzy
+msgid "_Show title"
msgstr "Mostra títol"
-#: ../panel-plugin/sensors.c:1863
-msgid "Sensors type:"
+#: ../panel-plugin/sensors.c:1940
+#, fuzzy
+msgid "Sensors t_ype:"
msgstr "Tipus de sensors:"
-#: ../panel-plugin/sensors.c:1910
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Nom"
-#: ../panel-plugin/sensors.c:1919
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Valor"
-#: ../panel-plugin/sensors.c:1925
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Mostra"
-#: ../panel-plugin/sensors.c:1934
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Color"
-#: ../panel-plugin/sensors.c:1944
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Mín."
-#: ../panel-plugin/sensors.c:1953
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Màx."
-#: ../panel-plugin/sensors.c:1981
-msgid "Font size:"
+#: ../panel-plugin/sensors.c:2065
+#, fuzzy
+msgid "F_ont size:"
msgstr "Mida de la lletra"
-#: ../panel-plugin/sensors.c:1988
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "molt petit"
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "petit"
-#: ../panel-plugin/sensors.c:1990
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "mitjà"
-#: ../panel-plugin/sensors.c:1991
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "gran"
-#: ../panel-plugin/sensors.c:1992
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "extra gran"
-#: ../panel-plugin/sensors.c:2020
-msgid "Temperature scale:"
+#: ../panel-plugin/sensors.c:2107
+#, fuzzy
+msgid "T_emperature scale:"
msgstr "Escala de temperatura:"
-#: ../panel-plugin/sensors.c:2022
-msgid "Celsius"
+#: ../panel-plugin/sensors.c:2109
+#, fuzzy
+msgid "_Celsius"
msgstr "Celsius"
-#: ../panel-plugin/sensors.c:2024
-msgid "Fahrenheit"
+#: ../panel-plugin/sensors.c:2111
+#, fuzzy
+msgid "_Fahrenheit"
msgstr "Fahrenheit"
-#: ../panel-plugin/sensors.c:2063
-msgid "Update interval (seconds):"
+#: ../panel-plugin/sensors.c:2150
+#, fuzzy
+msgid "U_pdate interval (seconds):"
msgstr "Interval d’actualització (segons):"
-#: ../panel-plugin/sensors.c:2090
-msgid "Execute on double click:"
+#: ../panel-plugin/sensors.c:2178
+#, fuzzy
+msgid "E_xecute on double click:"
msgstr "Executa en fer doble clic:"
-#: ../panel-plugin/sensors.c:2132
-msgid "<b>View</b>"
-msgstr "<b>Visualitza</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2190
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Miscel·lània</b>"
-#: ../panel-plugin/sensors.c:2237
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Edita propietats"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2244 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Connector de sensors"
@@ -185,3 +191,17 @@
msgid "Show sensor values."
msgstr "Mostra els valors dels sensors"
+#~ msgid "<b>Sensors</b>"
+#~ msgstr "<b>Sensors</b>"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "No s’ha pogut connectar als sensors"
+
+#~ msgid "Hard disks"
+#~ msgstr "Discs durs"
+
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Sensors de temperatura dels discs durs"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Visualitza</b>"
Modified: xfce4-sensors-plugin/trunk/po/cs.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/cs.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/cs.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-09-17 09:44+0100\n"
"Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
"Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -16,31 +16,30 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../panel-plugin/sensors.c:153
-#: ../panel-plugin/sensors.c:2162
-msgid "<b>Sensors</b>"
-msgstr "<b>Senzory</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
+msgstr "Typ senzorů:"
-#: ../panel-plugin/sensors.c:272
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senzory</b></span>\n"
-#: ../panel-plugin/sensors.c:334
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senzory</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:441
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Nebyly nalezeny žádné senzory!"
-#: ../panel-plugin/sensors.c:479
-#: ../panel-plugin/sensors.c:1677
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -49,135 +48,138 @@
"Došlo k potížím při čtení hodnoty senzoru. \n"
"Správná funkčnost nemůže být zaručena.\n"
-#: ../panel-plugin/sensors.c:500
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f otáček za minutu"
-#: ../panel-plugin/sensors.c:723
-msgid "Error: Could not connect to sensors!"
-msgstr "Chyba: Nelze se připojit k senzorům!"
-
-#: ../panel-plugin/sensors.c:813
-#: ../panel-plugin/sensors.c:887
-msgid "Hard disks"
-msgstr "Pevné disky"
-
-#: ../panel-plugin/sensors.c:923
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "Nebyly nalezeny žádné senzory!"
-#: ../panel-plugin/sensors.c:1356
-msgid "Hard disk temperature sensors"
-msgstr "Teplotní čidla pevných disků"
-
-#: ../panel-plugin/sensors.c:1772
-msgid "UI style:"
+#: ../panel-plugin/sensors.c:1813
+#, fuzzy
+msgid "_UI style:"
msgstr "Styl grafického rozhraní UI:"
-#: ../panel-plugin/sensors.c:1773
-msgid "text"
+#: ../panel-plugin/sensors.c:1814
+#, fuzzy
+msgid "_text"
msgstr "text"
-#: ../panel-plugin/sensors.c:1775
-msgid "graphical"
+#: ../panel-plugin/sensors.c:1816
+#, fuzzy
+msgid "g_raphical"
msgstr "graficky"
-#: ../panel-plugin/sensors.c:1812
-msgid "Show labels in graphical UI"
+#: ../panel-plugin/sensors.c:1853
+#, fuzzy
+msgid "Show _labels in graphical UI"
msgstr "Zobrazovat popisky v grafickém rozhraní"
-#: ../panel-plugin/sensors.c:1837
-msgid "Show title"
+#: ../panel-plugin/sensors.c:1883
+msgid "Show colored _bars"
+msgstr ""
+
+#: ../panel-plugin/sensors.c:1912
+#, fuzzy
+msgid "_Show title"
msgstr "Zobrazovat titulek"
-#: ../panel-plugin/sensors.c:1863
-msgid "Sensors type:"
+#: ../panel-plugin/sensors.c:1940
+#, fuzzy
+msgid "Sensors t_ype:"
msgstr "Typ senzorů:"
-#: ../panel-plugin/sensors.c:1910
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Název"
-#: ../panel-plugin/sensors.c:1919
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Hodnota"
-#: ../panel-plugin/sensors.c:1925
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Zobrazit"
-#: ../panel-plugin/sensors.c:1934
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Barva"
-#: ../panel-plugin/sensors.c:1944
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Min"
-#: ../panel-plugin/sensors.c:1953
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Max"
-#: ../panel-plugin/sensors.c:1981
-msgid "Font size:"
+#: ../panel-plugin/sensors.c:2065
+#, fuzzy
+msgid "F_ont size:"
msgstr "Velikost písma:"
-#: ../panel-plugin/sensors.c:1988
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "x-small"
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "small"
-#: ../panel-plugin/sensors.c:1990
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "medium"
-#: ../panel-plugin/sensors.c:1991
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "large"
-#: ../panel-plugin/sensors.c:1992
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "x-large"
-#: ../panel-plugin/sensors.c:2020
-msgid "Temperature scale:"
+#: ../panel-plugin/sensors.c:2107
+#, fuzzy
+msgid "T_emperature scale:"
msgstr "Rozsah teplot:"
-#: ../panel-plugin/sensors.c:2022
-msgid "Celsius"
+#: ../panel-plugin/sensors.c:2109
+#, fuzzy
+msgid "_Celsius"
msgstr "Stupně Celsia"
-#: ../panel-plugin/sensors.c:2024
-msgid "Fahrenheit"
+#: ../panel-plugin/sensors.c:2111
+#, fuzzy
+msgid "_Fahrenheit"
msgstr "Stupně Fahrenheita"
-#: ../panel-plugin/sensors.c:2063
-msgid "Update interval (seconds):"
+#: ../panel-plugin/sensors.c:2150
+#, fuzzy
+msgid "U_pdate interval (seconds):"
msgstr "Interval obnovení (vteřiny):"
-#: ../panel-plugin/sensors.c:2090
-msgid "Execute on double click:"
+#: ../panel-plugin/sensors.c:2178
+#, fuzzy
+msgid "E_xecute on double click:"
msgstr "Spustit při dvojitém kliknutí:"
-#: ../panel-plugin/sensors.c:2132
-msgid "<b>View</b>"
-msgstr "<b>Zobrazit</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2190
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Ostatní</b>"
-#: ../panel-plugin/sensors.c:2237
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Upravit vlastnosti"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2244
-#: ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Zásuvný modul senzory"
@@ -189,3 +191,17 @@
msgid "Show sensor values."
msgstr "Zobrazovat hodnoty senzorů."
+#~ msgid "<b>Sensors</b>"
+#~ msgstr "<b>Senzory</b>"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Chyba: Nelze se připojit k senzorům!"
+
+#~ msgid "Hard disks"
+#~ msgstr "Pevné disky"
+
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Teplotní čidla pevných disků"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Zobrazit</b>"
Modified: xfce4-sensors-plugin/trunk/po/de.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/de.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/de.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -1,183 +1,169 @@
# German translation for the xfce4-sensors-plugin.
-# Copyright (C) 2004, 2005 Fabian Nowak
-# This file is distributed under the same license as the xfce4-sensors-plugin package.
-# Fabian Nowak <timystery at arcor.de>, 2004, 2005.
+# Copyright (C) 2004 - 2007 Fabian Nowak
+# This file is distributed under the same license as the xfce4-sensors-plugin.
+# Fabian Nowak <timystery at arcor.de>, 2004 - 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
+"Project-Id-Version: xfce4-sensors-plugin 0.11.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-01 11:14+0200\n"
-"PO-Revision-Date: 2005-09-14 22:28+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
+"PO-Revision-Date: 2007-10-07 14:05+0100\n"
"Last-Translator: Fabian Nowak <timystery at arcor.de>\n"
"Language-Team: German <de at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors.c:156 ../panel-plugin/sensors.c:2227
-msgid "<b>Sensors</b>"
-msgstr "<b>Sensoren</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+msgid "Sensors"
+msgstr "Sensoren"
-#: ../panel-plugin/sensors.c:275
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoren</b></span>\n"
-#: ../panel-plugin/sensors.c:337
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoren</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:444
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Keine Sensoren ausgewählt!"
-#: ../panel-plugin/sensors.c:482 ../panel-plugin/sensors.c:1705
+#: ../panel-plugin/sensors.c:509
+#, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
-" \n"
"Xfce Hardware Sensors Plugin: \n"
"Anscheinend gab es ein Problem beim Auslesen eines Wertes. \n"
"Sauberes Weiterlaufen kann nicht gewährleistet werden.\n"
-#: ../panel-plugin/sensors.c:503
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f U/min"
-#: ../panel-plugin/sensors.c:726
-msgid "Error: Could not connect to sensors!"
-msgstr "Fehler: Konnte nicht mit Sensoren verbinden!"
-
-#: ../panel-plugin/sensors.c:816 ../panel-plugin/sensors.c:890
-msgid "Hard disks"
-msgstr "Festplatten"
-
-#: ../panel-plugin/sensors.c:926
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "Keine Sensoren gefunden!"
-#: ../panel-plugin/sensors.c:1384
-msgid "Hard disk temperature sensors"
-msgstr "Temperatursensoren der Festplatten"
-
-#: ../panel-plugin/sensors.c:1800
+#: ../panel-plugin/sensors.c:1813
msgid "_UI style:"
msgstr "_Darstellung:"
-#: ../panel-plugin/sensors.c:1801
+#: ../panel-plugin/sensors.c:1814
msgid "_text"
msgstr "_textuell"
-#: ../panel-plugin/sensors.c:1803
+#: ../panel-plugin/sensors.c:1816
msgid "g_raphical"
msgstr "g_raphisch"
-#: ../panel-plugin/sensors.c:1840
+#: ../panel-plugin/sensors.c:1853
msgid "Show _labels in graphical UI"
msgstr "_Beschriftungen im graphischen Modus anzeigen"
-#: ../panel-plugin/sensors.c:1869
+#: ../panel-plugin/sensors.c:1883
msgid "Show colored _bars"
msgstr "B_alken farbig darstellen"
-#: ../panel-plugin/sensors.c:1898
+#: ../panel-plugin/sensors.c:1912
msgid "_Show title"
msgstr "T_itel anzeigen"
-#: ../panel-plugin/sensors.c:1924
+#: ../panel-plugin/sensors.c:1940
msgid "Sensors t_ype:"
msgstr "Sensort_yp:"
-#: ../panel-plugin/sensors.c:1971
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Name"
-#: ../panel-plugin/sensors.c:1980
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Wert"
-#: ../panel-plugin/sensors.c:1986
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Anzeigen"
-#: ../panel-plugin/sensors.c:1995
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Farbe"
-#: ../panel-plugin/sensors.c:2005
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Min"
-#: ../panel-plugin/sensors.c:2014
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Max"
-#: ../panel-plugin/sensors.c:2042
+#: ../panel-plugin/sensors.c:2065
msgid "F_ont size:"
msgstr "Sc_hriftgröße:"
-#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->useBarUI);
-#: ../panel-plugin/sensors.c:2049
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "extra-klein"
-#: ../panel-plugin/sensors.c:2050
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "klein"
-#: ../panel-plugin/sensors.c:2051
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "normal"
-#: ../panel-plugin/sensors.c:2052
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "groß"
-#: ../panel-plugin/sensors.c:2053
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "extra-groß"
-#: ../panel-plugin/sensors.c:2084
+#: ../panel-plugin/sensors.c:2107
msgid "T_emperature scale:"
msgstr "T_emperaturskala"
-#: ../panel-plugin/sensors.c:2086
+#: ../panel-plugin/sensors.c:2109
msgid "_Celsius"
msgstr "_Celsius"
-#: ../panel-plugin/sensors.c:2088
+#: ../panel-plugin/sensors.c:2111
msgid "_Fahrenheit"
msgstr "_Fahrenheit"
-#: ../panel-plugin/sensors.c:2127
+#: ../panel-plugin/sensors.c:2150
msgid "U_pdate interval (seconds):"
msgstr "A_uffrischungsintervall (Sekunden):"
-#: ../panel-plugin/sensors.c:2154
+#: ../panel-plugin/sensors.c:2178
msgid "E_xecute on double click:"
msgstr "Bei D_oppel-Klick ausführen:"
-#: ../panel-plugin/sensors.c:2196
-msgid "<b>View</b>"
-msgstr "<b>Ansicht</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr "Aussehen"
-#: ../panel-plugin/sensors.c:2256
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Sonstige Einstellungen</b>"
+#: ../panel-plugin/sensors.c:2283
+msgid "Miscellaneous"
+msgstr "Sonstige Einstellungen"
-#: ../panel-plugin/sensors.c:2304
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Eingeschaften einstellen"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2311 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Sensor Plugin"
@@ -188,3 +174,15 @@
#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:2
msgid "Show sensor values."
msgstr "Sensorwerte erkannter Sensoren überwachen."
+
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Temperatursensoren der Festplatten"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Fehler: Konnte nicht mit Sensoren verbinden!"
+
+#~ msgid "Hard disks"
+#~ msgstr "Festplatten"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Ansicht</b>"
Modified: xfce4-sensors-plugin/trunk/po/el.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/el.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/el.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-10-14 19:59+0200\n"
"Last-Translator: Stavros Giannouris <stavrosg at serverhive.com>\n"
"Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -16,29 +16,30 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Country: GREECE\n"
-#: ../panel-plugin/sensors.c:153 ../panel-plugin/sensors.c:2162
-msgid "<b>Sensors</b>"
-msgstr "<b>Αισθητήρες</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
+msgstr "Τύπος αισθητήρα:"
-#: ../panel-plugin/sensors.c:272
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Αισθητήρες</b></span> \n"
-#: ../panel-plugin/sensors.c:334
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Αισθητήρες</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:441
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Δεν επιλέχθηκαν αισθητήρες!"
-#: ../panel-plugin/sensors.c:479 ../panel-plugin/sensors.c:1677
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -47,133 +48,138 @@
"Από οτι φαίνεται υπήρξε πρόβλημα κατά την ανάγνωση κάποιου αισθητήρα. \n"
"Δεν είναι εγγυημένη η κανονική συνέχεια.\n"
-#: ../panel-plugin/sensors.c:500
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f rpm"
-#: ../panel-plugin/sensors.c:723
-msgid "Error: Could not connect to sensors!"
-msgstr "Σφάλμα: Δεν ήταν δυνατή η σύνδεση με τους αισθητήρες!"
-
-#: ../panel-plugin/sensors.c:813 ../panel-plugin/sensors.c:887
-msgid "Hard disks"
-msgstr "Σκληροί δίσκοι"
-
-#: ../panel-plugin/sensors.c:923
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "Δε βρέθηκαν αισθητήρες!"
-#: ../panel-plugin/sensors.c:1356
-msgid "Hard disk temperature sensors"
-msgstr "Αισθητήρες θερμοκρασίας σκληρών δίσκων"
-
-#: ../panel-plugin/sensors.c:1772
-msgid "UI style:"
+#: ../panel-plugin/sensors.c:1813
+#, fuzzy
+msgid "_UI style:"
msgstr "Στυλ UI:"
-#: ../panel-plugin/sensors.c:1773
-msgid "text"
+#: ../panel-plugin/sensors.c:1814
+#, fuzzy
+msgid "_text"
msgstr "κείμενο"
-#: ../panel-plugin/sensors.c:1775
-msgid "graphical"
+#: ../panel-plugin/sensors.c:1816
+#, fuzzy
+msgid "g_raphical"
msgstr "γραφικό"
-#: ../panel-plugin/sensors.c:1812
-msgid "Show labels in graphical UI"
+#: ../panel-plugin/sensors.c:1853
+#, fuzzy
+msgid "Show _labels in graphical UI"
msgstr "Εμφάνιση ετικετών σε γραφικό UI"
-#: ../panel-plugin/sensors.c:1837
-msgid "Show title"
+#: ../panel-plugin/sensors.c:1883
+msgid "Show colored _bars"
+msgstr ""
+
+#: ../panel-plugin/sensors.c:1912
+#, fuzzy
+msgid "_Show title"
msgstr "Εμφάνιση τίτλου"
-#: ../panel-plugin/sensors.c:1863
-msgid "Sensors type:"
+#: ../panel-plugin/sensors.c:1940
+#, fuzzy
+msgid "Sensors t_ype:"
msgstr "Τύπος αισθητήρα:"
-#: ../panel-plugin/sensors.c:1910
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Όνομα"
-#: ../panel-plugin/sensors.c:1919
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Τιμή"
-#: ../panel-plugin/sensors.c:1925
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Εμφάνιση"
-#: ../panel-plugin/sensors.c:1934
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Χρώμα"
-#: ../panel-plugin/sensors.c:1944
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Ελαχ"
-#: ../panel-plugin/sensors.c:1953
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Μεγ"
-#: ../panel-plugin/sensors.c:1981
-msgid "Font size:"
+#: ../panel-plugin/sensors.c:2065
+#, fuzzy
+msgid "F_ont size:"
msgstr "Μέγεθος γραμματοσειράς:"
-#: ../panel-plugin/sensors.c:1988
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "πολύ μικρό"
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "Μικρό"
-#: ../panel-plugin/sensors.c:1990
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "μεσαίο"
-#: ../panel-plugin/sensors.c:1991
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "μεγάλο"
-#: ../panel-plugin/sensors.c:1992
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "πολύ μεγάλο"
-#: ../panel-plugin/sensors.c:2020
-msgid "Temperature scale:"
+#: ../panel-plugin/sensors.c:2107
+#, fuzzy
+msgid "T_emperature scale:"
msgstr "Κλίμακα θερμοκρασίας:"
-#: ../panel-plugin/sensors.c:2022
-msgid "Celsius"
+#: ../panel-plugin/sensors.c:2109
+#, fuzzy
+msgid "_Celsius"
msgstr "Κελσίου"
-#: ../panel-plugin/sensors.c:2024
-msgid "Fahrenheit"
+#: ../panel-plugin/sensors.c:2111
+#, fuzzy
+msgid "_Fahrenheit"
msgstr "Φαρενάϊτ"
-#: ../panel-plugin/sensors.c:2063
-msgid "Update interval (seconds):"
+#: ../panel-plugin/sensors.c:2150
+#, fuzzy
+msgid "U_pdate interval (seconds):"
msgstr "Διάστημα ανανέωσης (δευτερόλεπτα):"
-#: ../panel-plugin/sensors.c:2090
-msgid "Execute on double click:"
+#: ../panel-plugin/sensors.c:2178
+#, fuzzy
+msgid "E_xecute on double click:"
msgstr "Εκτέλεση στο διπλό κλικ:"
-#: ../panel-plugin/sensors.c:2132
-msgid "<b>View</b>"
-msgstr "<b>Προβολή</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2190
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Διάφορα</b>"
-#: ../panel-plugin/sensors.c:2237
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Ιδιότητες"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2244 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Πρόσθετο αισθητήρων"
@@ -184,3 +190,18 @@
#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:2
msgid "Show sensor values."
msgstr "Εμφάνιση τιμών αισθητήρων."
+
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Αισθητήρες θερμοκρασίας σκληρών δίσκων"
+
+#~ msgid "<b>Sensors</b>"
+#~ msgstr "<b>Αισθητήρες</b>"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Σφάλμα: Δεν ήταν δυνατή η σύνδεση με τους αισθητήρες!"
+
+#~ msgid "Hard disks"
+#~ msgstr "Σκληροί δίσκοι"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Προβολή</b>"
Modified: xfce4-sensors-plugin/trunk/po/en_GB.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/en_GB.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/en_GB.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -9,37 +9,38 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2007-03-31 10:24+1000\n"
"Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
"Language-Team: English/GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors.c:153 ../panel-plugin/sensors.c:2162
-msgid "<b>Sensors</b>"
-msgstr "<b>Sensors</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
+msgstr "Sensors type:"
-#: ../panel-plugin/sensors.c:272
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-#: ../panel-plugin/sensors.c:334
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:441
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "No sensors selected!"
-#: ../panel-plugin/sensors.c:479 ../panel-plugin/sensors.c:1677
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -48,133 +49,138 @@
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
-#: ../panel-plugin/sensors.c:500
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f rpm"
-#: ../panel-plugin/sensors.c:723
-msgid "Error: Could not connect to sensors!"
-msgstr "Error: Could not connect to sensors!"
-
-#: ../panel-plugin/sensors.c:813 ../panel-plugin/sensors.c:887
-msgid "Hard disks"
-msgstr "Hard disks"
-
-#: ../panel-plugin/sensors.c:923
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "No sensors found!"
-#: ../panel-plugin/sensors.c:1356
-msgid "Hard disk temperature sensors"
-msgstr "Hard disk temperature sensors"
-
-#: ../panel-plugin/sensors.c:1772
-msgid "UI style:"
+#: ../panel-plugin/sensors.c:1813
+#, fuzzy
+msgid "_UI style:"
msgstr "UI style:"
-#: ../panel-plugin/sensors.c:1773
-msgid "text"
+#: ../panel-plugin/sensors.c:1814
+#, fuzzy
+msgid "_text"
msgstr "text"
-#: ../panel-plugin/sensors.c:1775
-msgid "graphical"
+#: ../panel-plugin/sensors.c:1816
+#, fuzzy
+msgid "g_raphical"
msgstr "graphical"
-#: ../panel-plugin/sensors.c:1812
-msgid "Show labels in graphical UI"
+#: ../panel-plugin/sensors.c:1853
+#, fuzzy
+msgid "Show _labels in graphical UI"
msgstr "Show labels in graphical UI"
-#: ../panel-plugin/sensors.c:1837
-msgid "Show title"
+#: ../panel-plugin/sensors.c:1883
+msgid "Show colored _bars"
+msgstr ""
+
+#: ../panel-plugin/sensors.c:1912
+#, fuzzy
+msgid "_Show title"
msgstr "Show title"
-#: ../panel-plugin/sensors.c:1863
-msgid "Sensors type:"
+#: ../panel-plugin/sensors.c:1940
+#, fuzzy
+msgid "Sensors t_ype:"
msgstr "Sensors type:"
-#: ../panel-plugin/sensors.c:1910
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Name"
-#: ../panel-plugin/sensors.c:1919
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Value"
-#: ../panel-plugin/sensors.c:1925
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Show"
-#: ../panel-plugin/sensors.c:1934
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Colour"
-#: ../panel-plugin/sensors.c:1944
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Min"
-#: ../panel-plugin/sensors.c:1953
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Max"
-#: ../panel-plugin/sensors.c:1981
-msgid "Font size:"
+#: ../panel-plugin/sensors.c:2065
+#, fuzzy
+msgid "F_ont size:"
msgstr "Font size:"
-#: ../panel-plugin/sensors.c:1988
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "x-small"
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "small"
-#: ../panel-plugin/sensors.c:1990
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "medium"
-#: ../panel-plugin/sensors.c:1991
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "large"
-#: ../panel-plugin/sensors.c:1992
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "x-large"
-#: ../panel-plugin/sensors.c:2020
-msgid "Temperature scale:"
+#: ../panel-plugin/sensors.c:2107
+#, fuzzy
+msgid "T_emperature scale:"
msgstr "Temperature scale:"
-#: ../panel-plugin/sensors.c:2022
-msgid "Celsius"
+#: ../panel-plugin/sensors.c:2109
+#, fuzzy
+msgid "_Celsius"
msgstr "Celsius"
-#: ../panel-plugin/sensors.c:2024
-msgid "Fahrenheit"
+#: ../panel-plugin/sensors.c:2111
+#, fuzzy
+msgid "_Fahrenheit"
msgstr "Fahrenheit"
-#: ../panel-plugin/sensors.c:2063
-msgid "Update interval (seconds):"
+#: ../panel-plugin/sensors.c:2150
+#, fuzzy
+msgid "U_pdate interval (seconds):"
msgstr "Update interval (seconds):"
-#: ../panel-plugin/sensors.c:2090
-msgid "Execute on double click:"
+#: ../panel-plugin/sensors.c:2178
+#, fuzzy
+msgid "E_xecute on double click:"
msgstr "Execute on double click:"
-#: ../panel-plugin/sensors.c:2132
-msgid "<b>View</b>"
-msgstr "<b>View</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2190
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Miscellaneous</b>"
-#: ../panel-plugin/sensors.c:2237
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Edit Properties"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2244 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Sensors Plugin"
@@ -186,3 +192,17 @@
msgid "Show sensor values."
msgstr "Show sensor values."
+#~ msgid "<b>Sensors</b>"
+#~ msgstr "<b>Sensors</b>"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Error: Could not connect to sensors!"
+
+#~ msgid "Hard disks"
+#~ msgstr "Hard disks"
+
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Hard disk temperature sensors"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>View</b>"
Modified: xfce4-sensors-plugin/trunk/po/eu.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/eu.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/eu.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-01 11:14+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-02-13 22:20+0100\n"
"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
"Language-Team: Librezale <librezale at librezale.org>\n"
@@ -16,29 +16,30 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Pootle 0.6.3.20060126\n"
-#: ../panel-plugin/sensors.c:156 ../panel-plugin/sensors.c:2227
-msgid "<b>Sensors</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
msgstr "<b>Sentsoreak</b>"
-#: ../panel-plugin/sensors.c:275
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sentsoreak</b></span>\n"
-#: ../panel-plugin/sensors.c:337
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sentsoreak</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:444
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Ez da sentsorerik hautatu!"
-#: ../panel-plugin/sensors.c:482 ../panel-plugin/sensors.c:1705
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -47,138 +48,126 @@
"Dirudienez arazo bat dago sentsore ezaugarri balioa irakurtzerakoan. \n"
"Ezin da behar ebzala ibiliko den ziurtatu.\n"
-#: ../panel-plugin/sensors.c:503
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f b/min"
-#: ../panel-plugin/sensors.c:726
-msgid "Error: Could not connect to sensors!"
-msgstr "Errorea: Ezin da sentsoreetara konektatu!"
-
-#: ../panel-plugin/sensors.c:816 ../panel-plugin/sensors.c:890
-msgid "Hard disks"
-msgstr "Diska Gogorrak"
-
-#: ../panel-plugin/sensors.c:926
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "Ez da sentsorerik aurkitu!"
-#: ../panel-plugin/sensors.c:1384
-msgid "Hard disk temperature sensors"
-msgstr "Diska gogor tenperatura sentsoreak"
-
-#: ../panel-plugin/sensors.c:1800
+#: ../panel-plugin/sensors.c:1813
msgid "_UI style:"
msgstr "_UI estiloa:"
-#: ../panel-plugin/sensors.c:1801
+#: ../panel-plugin/sensors.c:1814
msgid "_text"
msgstr "_testua"
-#: ../panel-plugin/sensors.c:1803
+#: ../panel-plugin/sensors.c:1816
msgid "g_raphical"
msgstr "g_rafikoa"
-#: ../panel-plugin/sensors.c:1840
+#: ../panel-plugin/sensors.c:1853
msgid "Show _labels in graphical UI"
msgstr "_Etitketa bistarazi UI grafikoan"
-#: ../panel-plugin/sensors.c:1869
+#: ../panel-plugin/sensors.c:1883
msgid "Show colored _bars"
msgstr "Koloretako _barrak ikusi"
-#: ../panel-plugin/sensors.c:1898
+#: ../panel-plugin/sensors.c:1912
msgid "_Show title"
msgstr "_Izenburua ikusi"
-#: ../panel-plugin/sensors.c:1924
+#: ../panel-plugin/sensors.c:1940
msgid "Sensors t_ype:"
msgstr "Sentsore m_ota:"
-#: ../panel-plugin/sensors.c:1971
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Izena"
-#: ../panel-plugin/sensors.c:1980
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Balioa"
-#: ../panel-plugin/sensors.c:1986
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Bistarazi"
-#: ../panel-plugin/sensors.c:1995
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Kolorea"
-#: ../panel-plugin/sensors.c:2005
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Min"
-#: ../panel-plugin/sensors.c:2014
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Geh"
-#: ../panel-plugin/sensors.c:2042
+#: ../panel-plugin/sensors.c:2065
msgid "F_ont size:"
msgstr "Letra-tip_o tamaina:"
-#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->useBarUI);
-#: ../panel-plugin/sensors.c:2049
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "oso txikia"
-#: ../panel-plugin/sensors.c:2050
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "txikia"
-#: ../panel-plugin/sensors.c:2051
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "ertaina"
-#: ../panel-plugin/sensors.c:2052
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "handia"
-#: ../panel-plugin/sensors.c:2053
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "oso handia"
-#: ../panel-plugin/sensors.c:2084
+#: ../panel-plugin/sensors.c:2107
msgid "T_emperature scale:"
msgstr "T_enperatura eskala:"
-#: ../panel-plugin/sensors.c:2086
+#: ../panel-plugin/sensors.c:2109
msgid "_Celsius"
msgstr "_Celsius"
-#: ../panel-plugin/sensors.c:2088
+#: ../panel-plugin/sensors.c:2111
msgid "_Fahrenheit"
msgstr "_Fahrenheit"
-#: ../panel-plugin/sensors.c:2127
+#: ../panel-plugin/sensors.c:2150
msgid "U_pdate interval (seconds):"
msgstr "Egunera_keta aldia (segundu):"
-#: ../panel-plugin/sensors.c:2154
+#: ../panel-plugin/sensors.c:2178
msgid "E_xecute on double click:"
msgstr "Klik bikoitzarekin e_xekutatu:"
-#: ../panel-plugin/sensors.c:2196
-msgid "<b>View</b>"
-msgstr "<b>Bistarazi</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2256
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Bestelakoak</b>"
-#: ../panel-plugin/sensors.c:2304
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Propietateak Editatu"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2311 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Sentsore Plugin-a"
@@ -189,3 +178,15 @@
#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:2
msgid "Show sensor values."
msgstr "Sentsore balioak bistarazi."
+
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Diska gogor tenperatura sentsoreak"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Errorea: Ezin da sentsoreetara konektatu!"
+
+#~ msgid "Hard disks"
+#~ msgstr "Diska Gogorrak"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Bistarazi</b>"
Modified: xfce4-sensors-plugin/trunk/po/fr.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/fr.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/fr.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-01 11:14+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-10-16 17:35+0100\n"
"Last-Translator: Maximilian Schleiss <maximilian at xfce.org>\n"
"Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -17,31 +17,30 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors.c:156
-#: ../panel-plugin/sensors.c:2227
-msgid "<b>Sensors</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
msgstr "<b>Senseurs</b>"
-#: ../panel-plugin/sensors.c:275
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senseurs</b></span>\n"
-#: ../panel-plugin/sensors.c:337
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senseurs</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:444
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Aucun senseur sélectionné !"
-#: ../panel-plugin/sensors.c:482
-#: ../panel-plugin/sensors.c:1705
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -50,140 +49,126 @@
"Il semblerait qu'il y ait un problème de lecture de valeur sur un senseur. \n"
"L'exécution normale ne peut pas être garantie.\n"
-#: ../panel-plugin/sensors.c:503
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f rpm"
-#: ../panel-plugin/sensors.c:726
-msgid "Error: Could not connect to sensors!"
-msgstr "Erreur : ne peut pas se connecter aux senseurs !"
-
-#: ../panel-plugin/sensors.c:816
-#: ../panel-plugin/sensors.c:890
-msgid "Hard disks"
-msgstr "Disques dur"
-
-#: ../panel-plugin/sensors.c:926
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "Aucun senseur trouvé !"
-#: ../panel-plugin/sensors.c:1384
-msgid "Hard disk temperature sensors"
-msgstr "Sondes de température du disque dur"
-
-#: ../panel-plugin/sensors.c:1800
+#: ../panel-plugin/sensors.c:1813
msgid "_UI style:"
msgstr "Style de l'interface :"
-#: ../panel-plugin/sensors.c:1801
+#: ../panel-plugin/sensors.c:1814
msgid "_text"
msgstr "_texte"
-#: ../panel-plugin/sensors.c:1803
+#: ../panel-plugin/sensors.c:1816
msgid "g_raphical"
msgstr "g_raphique"
-#: ../panel-plugin/sensors.c:1840
+#: ../panel-plugin/sensors.c:1853
msgid "Show _labels in graphical UI"
msgstr "Afficher les étiquettes dans l'interface graphique"
-#: ../panel-plugin/sensors.c:1869
+#: ../panel-plugin/sensors.c:1883
msgid "Show colored _bars"
msgstr "Afficher les _barres en couleur"
-#: ../panel-plugin/sensors.c:1898
+#: ../panel-plugin/sensors.c:1912
msgid "_Show title"
msgstr "_Afficher le titre"
-#: ../panel-plugin/sensors.c:1924
+#: ../panel-plugin/sensors.c:1940
msgid "Sensors t_ype:"
msgstr "T_ype de senseurs :"
-#: ../panel-plugin/sensors.c:1971
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Nom"
-#: ../panel-plugin/sensors.c:1980
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Valeur"
-#: ../panel-plugin/sensors.c:1986
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Afficher"
-#: ../panel-plugin/sensors.c:1995
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Couleur"
-#: ../panel-plugin/sensors.c:2005
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Min"
-#: ../panel-plugin/sensors.c:2014
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Max"
-#: ../panel-plugin/sensors.c:2042
+#: ../panel-plugin/sensors.c:2065
msgid "F_ont size:"
msgstr "Taille de la _police :"
-#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->useBarUI);
-#: ../panel-plugin/sensors.c:2049
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "très petite"
-#: ../panel-plugin/sensors.c:2050
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "petite"
-#: ../panel-plugin/sensors.c:2051
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "normale"
-#: ../panel-plugin/sensors.c:2052
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "grande"
-#: ../panel-plugin/sensors.c:2053
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "très grande"
-#: ../panel-plugin/sensors.c:2084
+#: ../panel-plugin/sensors.c:2107
msgid "T_emperature scale:"
msgstr "Échelle de température :"
-#: ../panel-plugin/sensors.c:2086
+#: ../panel-plugin/sensors.c:2109
msgid "_Celsius"
msgstr "_Celsius"
-#: ../panel-plugin/sensors.c:2088
+#: ../panel-plugin/sensors.c:2111
msgid "_Fahrenheit"
msgstr "_Fahrenheit"
-#: ../panel-plugin/sensors.c:2127
+#: ../panel-plugin/sensors.c:2150
msgid "U_pdate interval (seconds):"
msgstr "_Intervalle de mise-à-jour (secondes) :"
-#: ../panel-plugin/sensors.c:2154
+#: ../panel-plugin/sensors.c:2178
msgid "E_xecute on double click:"
msgstr "E_xécute après un double clic :"
-#: ../panel-plugin/sensors.c:2196
-msgid "<b>View</b>"
-msgstr "<b>Vue</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2256
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Divers</b>"
-#: ../panel-plugin/sensors.c:2304
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Ajouter propriétés"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2311
-#: ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Plugin senseurs"
@@ -195,3 +180,14 @@
msgid "Show sensor values."
msgstr "Afficher les valeurs du senseur."
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Sondes de température du disque dur"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Erreur : ne peut pas se connecter aux senseurs !"
+
+#~ msgid "Hard disks"
+#~ msgstr "Disques dur"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Vue</b>"
Modified: xfce4-sensors-plugin/trunk/po/hu.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/hu.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/hu.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-01 11:14+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-10-01 21:31+0100\n"
"Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
"Language-Team: hu\n"
@@ -12,31 +12,30 @@
"X-Poedit-Language: Hungarian\n"
"X-Poedit-Country: HUNGARY\n"
-#: ../panel-plugin/sensors.c:156
-#: ../panel-plugin/sensors.c:2227
-msgid "<b>Sensors</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
msgstr "<b>Érzékelők</b>"
-#: ../panel-plugin/sensors.c:275
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Érzékelők</b></span>\n"
-#: ../panel-plugin/sensors.c:337
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Érzékelők</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:444
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Nincsenek érzékelők!"
-#: ../panel-plugin/sensors.c:482
-#: ../panel-plugin/sensors.c:1705
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -45,140 +44,126 @@
"Úgy tűnik, gond van egy érzékelő értékeinek kiolvasásával. \n"
"A helyes működés nem szavatolt.\n"
-#: ../panel-plugin/sensors.c:503
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f rpm"
-#: ../panel-plugin/sensors.c:726
-msgid "Error: Could not connect to sensors!"
-msgstr "Hiba: nem lehet érzékelőkhöz kapcsolódni!"
-
-#: ../panel-plugin/sensors.c:816
-#: ../panel-plugin/sensors.c:890
-msgid "Hard disks"
-msgstr "Merevlemezek"
-
-#: ../panel-plugin/sensors.c:926
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "Nem leltem érzékelőket!"
-#: ../panel-plugin/sensors.c:1384
-msgid "Hard disk temperature sensors"
-msgstr "Merevlemez hőmérséklet érzékelők"
-
-#: ../panel-plugin/sensors.c:1800
+#: ../panel-plugin/sensors.c:1813
msgid "_UI style:"
msgstr "_UI stílus:"
-#: ../panel-plugin/sensors.c:1801
+#: ../panel-plugin/sensors.c:1814
msgid "_text"
msgstr "s_zöveg"
-#: ../panel-plugin/sensors.c:1803
+#: ../panel-plugin/sensors.c:1816
msgid "g_raphical"
msgstr "g_rafikus"
-#: ../panel-plugin/sensors.c:1840
+#: ../panel-plugin/sensors.c:1853
msgid "Show _labels in graphical UI"
msgstr "Címkék a grafikus UI-ben"
-#: ../panel-plugin/sensors.c:1869
+#: ../panel-plugin/sensors.c:1883
msgid "Show colored _bars"
msgstr "Színes sá_vok mutatása"
-#: ../panel-plugin/sensors.c:1898
+#: ../panel-plugin/sensors.c:1912
msgid "_Show title"
msgstr "Cím mutatá_sa"
-#: ../panel-plugin/sensors.c:1924
+#: ../panel-plugin/sensors.c:1940
msgid "Sensors t_ype:"
msgstr "Érzékelők tí_pusa:"
-#: ../panel-plugin/sensors.c:1971
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Név"
-#: ../panel-plugin/sensors.c:1980
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Érték"
-#: ../panel-plugin/sensors.c:1986
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Megjelenítés"
-#: ../panel-plugin/sensors.c:1995
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Szín"
-#: ../panel-plugin/sensors.c:2005
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Min"
-#: ../panel-plugin/sensors.c:2014
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Max"
-#: ../panel-plugin/sensors.c:2042
+#: ../panel-plugin/sensors.c:2065
msgid "F_ont size:"
msgstr "_Betű mérete:"
-#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->useBarUI);
-#: ../panel-plugin/sensors.c:2049
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "törpe"
-#: ../panel-plugin/sensors.c:2050
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "kicsi"
-#: ../panel-plugin/sensors.c:2051
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "közepes"
-#: ../panel-plugin/sensors.c:2052
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "nagy"
-#: ../panel-plugin/sensors.c:2053
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "óriás"
-#: ../panel-plugin/sensors.c:2084
+#: ../panel-plugin/sensors.c:2107
msgid "T_emperature scale:"
msgstr "_Hőfok skála:"
-#: ../panel-plugin/sensors.c:2086
+#: ../panel-plugin/sensors.c:2109
msgid "_Celsius"
msgstr "_Celsius"
-#: ../panel-plugin/sensors.c:2088
+#: ../panel-plugin/sensors.c:2111
msgid "_Fahrenheit"
msgstr "_Fahrenheit"
-#: ../panel-plugin/sensors.c:2127
+#: ../panel-plugin/sensors.c:2150
msgid "U_pdate interval (seconds):"
msgstr "Frissítési időközök (másodpercben):"
-#: ../panel-plugin/sensors.c:2154
+#: ../panel-plugin/sensors.c:2178
msgid "E_xecute on double click:"
msgstr "Futtatás dupla kattintásra:"
-#: ../panel-plugin/sensors.c:2196
-msgid "<b>View</b>"
-msgstr "<b>Nézet</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2256
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Egyebek</b>"
-#: ../panel-plugin/sensors.c:2304
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Tulajdonságok szerkesztése"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2311
-#: ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Érzékelők"
@@ -190,3 +175,14 @@
msgid "Show sensor values."
msgstr "Értékek mutatása"
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Merevlemez hőmérséklet érzékelők"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Hiba: nem lehet érzékelőkhöz kapcsolódni!"
+
+#~ msgid "Hard disks"
+#~ msgstr "Merevlemezek"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Nézet</b>"
Modified: xfce4-sensors-plugin/trunk/po/ja.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/ja.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/ja.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-01 11:14+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-01-04 00:28+0900\n"
"Last-Translator: Daichi Kawahata <daichi at xfce.org>\n"
"Language-Team: xfce-users-jp <xfce-users-jp at ml.fdiary.net>\n"
@@ -15,29 +15,30 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors.c:156 ../panel-plugin/sensors.c:2227
-msgid "<b>Sensors</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
msgstr "<b>センサー</b>"
-#: ../panel-plugin/sensors.c:275
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>センサー</b></span>\n"
-#: ../panel-plugin/sensors.c:337
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>センサー</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:444
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "センサーが選択されていません！"
-#: ../panel-plugin/sensors.c:482 ../panel-plugin/sensors.c:1705
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -46,150 +47,138 @@
"センサーの機能値の読み込みに問題があるようです。 \n"
"正確な値は保証されません。\n"
-#: ../panel-plugin/sensors.c:503
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f rpm"
-#: ../panel-plugin/sensors.c:726
-msgid "Error: Could not connect to sensors!"
-msgstr "エラー: センサーに接続できませんでした！"
-
-#: ../panel-plugin/sensors.c:816 ../panel-plugin/sensors.c:890
-msgid "Hard disks"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:926
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "センサーが見つかりません！"
-#: ../panel-plugin/sensors.c:1384
-msgid "Hard disk temperature sensors"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:1800
+#: ../panel-plugin/sensors.c:1813
#, fuzzy
msgid "_UI style:"
msgstr "UIのスタイル:"
-#: ../panel-plugin/sensors.c:1801
+#: ../panel-plugin/sensors.c:1814
#, fuzzy
msgid "_text"
msgstr "テキスト"
-#: ../panel-plugin/sensors.c:1803
+#: ../panel-plugin/sensors.c:1816
#, fuzzy
msgid "g_raphical"
msgstr "グラフィック"
-#: ../panel-plugin/sensors.c:1840
+#: ../panel-plugin/sensors.c:1853
#, fuzzy
msgid "Show _labels in graphical UI"
msgstr "UIにラベルを表示する"
-#: ../panel-plugin/sensors.c:1869
+#: ../panel-plugin/sensors.c:1883
msgid "Show colored _bars"
msgstr ""
-#: ../panel-plugin/sensors.c:1898
+#: ../panel-plugin/sensors.c:1912
#, fuzzy
msgid "_Show title"
msgstr "タイトルを表示する"
-#: ../panel-plugin/sensors.c:1924
+#: ../panel-plugin/sensors.c:1940
#, fuzzy
msgid "Sensors t_ype:"
msgstr "センサーの種類:"
-#: ../panel-plugin/sensors.c:1971
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "名前"
-#: ../panel-plugin/sensors.c:1980
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "値"
-#: ../panel-plugin/sensors.c:1986
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "表示"
-#: ../panel-plugin/sensors.c:1995
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "色"
-#: ../panel-plugin/sensors.c:2005
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "最小"
-#: ../panel-plugin/sensors.c:2014
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "最大"
-#: ../panel-plugin/sensors.c:2042
+#: ../panel-plugin/sensors.c:2065
#, fuzzy
msgid "F_ont size:"
msgstr "フォントのサイズ:"
-#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->useBarUI);
-#: ../panel-plugin/sensors.c:2049
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "極小"
-#: ../panel-plugin/sensors.c:2050
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "小"
-#: ../panel-plugin/sensors.c:2051
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "普通"
-#: ../panel-plugin/sensors.c:2052
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "大"
-#: ../panel-plugin/sensors.c:2053
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "巨大"
-#: ../panel-plugin/sensors.c:2084
+#: ../panel-plugin/sensors.c:2107
#, fuzzy
msgid "T_emperature scale:"
msgstr "温度の目盛:"
-#: ../panel-plugin/sensors.c:2086
+#: ../panel-plugin/sensors.c:2109
#, fuzzy
msgid "_Celsius"
msgstr "摂氏"
-#: ../panel-plugin/sensors.c:2088
+#: ../panel-plugin/sensors.c:2111
#, fuzzy
msgid "_Fahrenheit"
msgstr "華氏"
-#: ../panel-plugin/sensors.c:2127
+#: ../panel-plugin/sensors.c:2150
#, fuzzy
msgid "U_pdate interval (seconds):"
msgstr "更新の間隔 (秒):"
-#: ../panel-plugin/sensors.c:2154
+#: ../panel-plugin/sensors.c:2178
#, fuzzy
msgid "E_xecute on double click:"
msgstr "ダブルクリックで実行:"
-#: ../panel-plugin/sensors.c:2196
-msgid "<b>View</b>"
-msgstr "<b>表示</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2256
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>その他</b>"
-#: ../panel-plugin/sensors.c:2304
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "プロパティの編集"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2311 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "センサープラグイン"
@@ -200,3 +189,9 @@
#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:2
msgid "Show sensor values."
msgstr "センサーの値を表示します。"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "エラー: センサーに接続できませんでした！"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>表示</b>"
Modified: xfce4-sensors-plugin/trunk/po/ko.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/ko.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/ko.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-01 11:14+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2005-12-11 02:20+0900\n"
"Last-Translator: ByungHyun Choi <byunghyun.choi at debianusers.org>\n"
"Language-Team: xfce4-users-kr-i18n <xfce4-users-kr-i18n at lists.sourceforge."
@@ -16,29 +16,30 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors.c:156 ../panel-plugin/sensors.c:2227
-msgid "<b>Sensors</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
msgstr "<b>센서</b>"
-#: ../panel-plugin/sensors.c:275
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>센서</b></span> \n"
-#: ../panel-plugin/sensors.c:337
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>센서</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:444
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "센서를 선택하지 않았습니다!"
-#: ../panel-plugin/sensors.c:482 ../panel-plugin/sensors.c:1705
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -47,138 +48,126 @@
"센서의 기능과 측정치를 읽는 도중 문제가 생긴 것 같습니다.\n"
"따라서 정상적인 동작을 보장할 수 없습니다.\n"
-#: ../panel-plugin/sensors.c:503
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f RPM"
-#: ../panel-plugin/sensors.c:726
-msgid "Error: Could not connect to sensors!"
-msgstr "오류: 선세에 연결하지 못 했습니다."
-
-#: ../panel-plugin/sensors.c:816 ../panel-plugin/sensors.c:890
-msgid "Hard disks"
-msgstr "하드 디스크"
-
-#: ../panel-plugin/sensors.c:926
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "센서를 못 찾았습니다!"
-#: ../panel-plugin/sensors.c:1384
-msgid "Hard disk temperature sensors"
-msgstr "하드디스크 온도 센서"
-
-#: ../panel-plugin/sensors.c:1800
+#: ../panel-plugin/sensors.c:1813
msgid "_UI style:"
msgstr "UI 스타일(_U):"
-#: ../panel-plugin/sensors.c:1801
+#: ../panel-plugin/sensors.c:1814
msgid "_text"
msgstr "글자(_t)"
-#: ../panel-plugin/sensors.c:1803
+#: ../panel-plugin/sensors.c:1816
msgid "g_raphical"
msgstr "그림(_r)"
-#: ../panel-plugin/sensors.c:1840
+#: ../panel-plugin/sensors.c:1853
msgid "Show _labels in graphical UI"
msgstr "GUI에 레이블 보이기(_l)"
-#: ../panel-plugin/sensors.c:1869
+#: ../panel-plugin/sensors.c:1883
msgid "Show colored _bars"
msgstr "색깔있는 막대 보이기(_b)"
-#: ../panel-plugin/sensors.c:1898
+#: ../panel-plugin/sensors.c:1912
msgid "_Show title"
msgstr "이름 보여주기(_S)"
-#: ../panel-plugin/sensors.c:1924
+#: ../panel-plugin/sensors.c:1940
msgid "Sensors t_ype:"
msgstr "센서 종류(_t):"
-#: ../panel-plugin/sensors.c:1971
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "이름"
-#: ../panel-plugin/sensors.c:1980
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "값"
-#: ../panel-plugin/sensors.c:1986
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "보이기"
-#: ../panel-plugin/sensors.c:1995
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "색상"
-#: ../panel-plugin/sensors.c:2005
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "최소"
-#: ../panel-plugin/sensors.c:2014
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "최대"
-#: ../panel-plugin/sensors.c:2042
+#: ../panel-plugin/sensors.c:2065
msgid "F_ont size:"
msgstr "글꼴 크기(_o):"
-#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->useBarUI);
-#: ../panel-plugin/sensors.c:2049
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "아주 작게"
-#: ../panel-plugin/sensors.c:2050
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "작게"
-#: ../panel-plugin/sensors.c:2051
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "중간"
-#: ../panel-plugin/sensors.c:2052
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "크게"
-#: ../panel-plugin/sensors.c:2053
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "아주 크게"
-#: ../panel-plugin/sensors.c:2084
+#: ../panel-plugin/sensors.c:2107
msgid "T_emperature scale:"
msgstr "온도 단위(_e):"
-#: ../panel-plugin/sensors.c:2086
+#: ../panel-plugin/sensors.c:2109
msgid "_Celsius"
msgstr "섭씨(_C)"
-#: ../panel-plugin/sensors.c:2088
+#: ../panel-plugin/sensors.c:2111
msgid "_Fahrenheit"
msgstr "화씨(_F)"
-#: ../panel-plugin/sensors.c:2127
+#: ../panel-plugin/sensors.c:2150
msgid "U_pdate interval (seconds):"
msgstr "검사 간격 (초)(_p):"
-#: ../panel-plugin/sensors.c:2154
+#: ../panel-plugin/sensors.c:2178
msgid "E_xecute on double click:"
msgstr "따닥(더블클릭)하면 실행합니다(_x):"
-#: ../panel-plugin/sensors.c:2196
-msgid "<b>View</b>"
-msgstr "<b>보기</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2256
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>기타</b>"
-#: ../panel-plugin/sensors.c:2304
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "속성 변경"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2311 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "센서 플러그인"
@@ -189,3 +178,15 @@
#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:2
msgid "Show sensor values."
msgstr "센서 값 보이기"
+
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "하드디스크 온도 센서"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "오류: 선세에 연결하지 못 했습니다."
+
+#~ msgid "Hard disks"
+#~ msgstr "하드 디스크"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>보기</b>"
Modified: xfce4-sensors-plugin/trunk/po/lt.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/lt.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/lt.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-01 11:14+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2005-02-04 21:07+0200\n"
"Last-Translator: Rimas Kudelis <rq at akl.lt>\n"
"Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -15,30 +15,30 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors.c:156 ../panel-plugin/sensors.c:2227
-msgid "<b>Sensors</b>"
-msgstr ""
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
+msgstr "Sensorių tipas:"
-#: ../panel-plugin/sensors.c:275
+#: ../panel-plugin/sensors.c:323
#, fuzzy, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoriai</b></span> \n"
-#: ../panel-plugin/sensors.c:337
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoriai</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:444
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Nepasirinkti jokie sensoriai!"
-#: ../panel-plugin/sensors.c:482 ../panel-plugin/sensors.c:1705
-#, fuzzy
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -48,143 +48,129 @@
"savybės reikšmę. \n"
"Tvarkingas tolesnis darbas negali būti užtikrinamas. \n"
-#: ../panel-plugin/sensors.c:503
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr ""
-#: ../panel-plugin/sensors.c:726
-msgid "Error: Could not connect to sensors!"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:816 ../panel-plugin/sensors.c:890
-msgid "Hard disks"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:926
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "Jokių sensorių nerasta!"
-#: ../panel-plugin/sensors.c:1384
-#, fuzzy
-msgid "Hard disk temperature sensors"
-msgstr "Aparatiniai sensoriai"
-
-#: ../panel-plugin/sensors.c:1800
+#: ../panel-plugin/sensors.c:1813
msgid "_UI style:"
msgstr ""
-#: ../panel-plugin/sensors.c:1801
+#: ../panel-plugin/sensors.c:1814
msgid "_text"
msgstr ""
-#: ../panel-plugin/sensors.c:1803
+#: ../panel-plugin/sensors.c:1816
msgid "g_raphical"
msgstr ""
-#: ../panel-plugin/sensors.c:1840
+#: ../panel-plugin/sensors.c:1853
msgid "Show _labels in graphical UI"
msgstr ""
-#: ../panel-plugin/sensors.c:1869
+#: ../panel-plugin/sensors.c:1883
msgid "Show colored _bars"
msgstr ""
-#: ../panel-plugin/sensors.c:1898
+#: ../panel-plugin/sensors.c:1912
#, fuzzy
msgid "_Show title"
msgstr "Rodyti pavadinimą"
-#: ../panel-plugin/sensors.c:1924
+#: ../panel-plugin/sensors.c:1940
#, fuzzy
msgid "Sensors t_ype:"
msgstr "Sensorių tipas:"
-#: ../panel-plugin/sensors.c:1971
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr ""
-#: ../panel-plugin/sensors.c:1980
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr ""
-#: ../panel-plugin/sensors.c:1986
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr ""
-#: ../panel-plugin/sensors.c:1995
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr ""
-#: ../panel-plugin/sensors.c:2005
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr ""
-#: ../panel-plugin/sensors.c:2014
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr ""
-#: ../panel-plugin/sensors.c:2042
+#: ../panel-plugin/sensors.c:2065
#, fuzzy
msgid "F_ont size:"
msgstr "Šrifto dydis:"
-#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->useBarUI);
-#: ../panel-plugin/sensors.c:2049
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "labai mažas"
-#: ../panel-plugin/sensors.c:2050
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "mažas"
-#: ../panel-plugin/sensors.c:2051
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "vidutinis"
-#: ../panel-plugin/sensors.c:2052
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "didelis"
-#: ../panel-plugin/sensors.c:2053
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "labai didelis"
-#: ../panel-plugin/sensors.c:2084
+#: ../panel-plugin/sensors.c:2107
msgid "T_emperature scale:"
msgstr ""
-#: ../panel-plugin/sensors.c:2086
+#: ../panel-plugin/sensors.c:2109
msgid "_Celsius"
msgstr ""
-#: ../panel-plugin/sensors.c:2088
+#: ../panel-plugin/sensors.c:2111
msgid "_Fahrenheit"
msgstr ""
-#: ../panel-plugin/sensors.c:2127
+#: ../panel-plugin/sensors.c:2150
#, fuzzy
msgid "U_pdate interval (seconds):"
msgstr "Atnaujinimo dažnumas (sek.):"
-#: ../panel-plugin/sensors.c:2154
+#: ../panel-plugin/sensors.c:2178
msgid "E_xecute on double click:"
msgstr ""
-#: ../panel-plugin/sensors.c:2196
-msgid "<b>View</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
msgstr ""
-#: ../panel-plugin/sensors.c:2256
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+msgid "Miscellaneous"
msgstr ""
-#: ../panel-plugin/sensors.c:2304
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr ""
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2311 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr ""
@@ -197,6 +183,10 @@
msgstr ""
#, fuzzy
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Aparatiniai sensoriai"
+
+#, fuzzy
#~ msgid ""
#~ "A problem occured while trying to close the config file. Restart your "
#~ "computer ... err ... restart the sensor daemon only :-) \n"
Modified: xfce4-sensors-plugin/trunk/po/pl.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/pl.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/pl.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-04-08 13:17+0900\n"
"Last-Translator: Piotr Maliński <admin at rk.edu.pl>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -16,29 +16,30 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors.c:153 ../panel-plugin/sensors.c:2162
-msgid "<b>Sensors</b>"
-msgstr "<b>Czujniki</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
+msgstr "Typ sensorów:"
-#: ../panel-plugin/sensors.c:272
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Czujniki</b></span>\n"
-#: ../panel-plugin/sensors.c:334
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Czujniki</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:441
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Brak wykrytych czujników!"
-#: ../panel-plugin/sensors.c:479 ../panel-plugin/sensors.c:1677
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -47,133 +48,138 @@
"Chyba wystąpił problem przy czytaniu wartości z czujnika. \n"
"Podane wartości mogą być niezgodne z prawdą.\n"
-#: ../panel-plugin/sensors.c:500
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f rpm"
-#: ../panel-plugin/sensors.c:723
-msgid "Error: Could not connect to sensors!"
-msgstr "Błąd: nie mogę połączyć się z czujnikiem!"
-
-#: ../panel-plugin/sensors.c:813 ../panel-plugin/sensors.c:887
-msgid "Hard disks"
-msgstr "Dyski twarde"
-
-#: ../panel-plugin/sensors.c:923
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "Brak czujników!"
-#: ../panel-plugin/sensors.c:1356
-msgid "Hard disk temperature sensors"
-msgstr "Czujniki temperatury dysku"
-
-#: ../panel-plugin/sensors.c:1772
-msgid "UI style:"
+#: ../panel-plugin/sensors.c:1813
+#, fuzzy
+msgid "_UI style:"
msgstr "Styl GUI:"
-#: ../panel-plugin/sensors.c:1773
-msgid "text"
+#: ../panel-plugin/sensors.c:1814
+#, fuzzy
+msgid "_text"
msgstr "tekst"
-#: ../panel-plugin/sensors.c:1775
-msgid "graphical"
+#: ../panel-plugin/sensors.c:1816
+#, fuzzy
+msgid "g_raphical"
msgstr "graficzny"
-#: ../panel-plugin/sensors.c:1812
-msgid "Show labels in graphical UI"
+#: ../panel-plugin/sensors.c:1853
+#, fuzzy
+msgid "Show _labels in graphical UI"
msgstr "Pokazuj etykiety w GUI"
-#: ../panel-plugin/sensors.c:1837
-msgid "Show title"
+#: ../panel-plugin/sensors.c:1883
+msgid "Show colored _bars"
+msgstr "Pokazuj kolorowe _słupki"
+
+#: ../panel-plugin/sensors.c:1912
+#, fuzzy
+msgid "_Show title"
msgstr "Pokazuj tutuł"
-#: ../panel-plugin/sensors.c:1863
-msgid "Sensors type:"
+#: ../panel-plugin/sensors.c:1940
+#, fuzzy
+msgid "Sensors t_ype:"
msgstr "Typ sensorów:"
-#: ../panel-plugin/sensors.c:1910
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Nazwa"
-#: ../panel-plugin/sensors.c:1919
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Wartość"
-#: ../panel-plugin/sensors.c:1925
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Pokaż"
-#: ../panel-plugin/sensors.c:1934
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Kolor"
-#: ../panel-plugin/sensors.c:1944
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Minimum"
-#: ../panel-plugin/sensors.c:1953
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Maximum"
-#: ../panel-plugin/sensors.c:1981
-msgid "Font size:"
+#: ../panel-plugin/sensors.c:2065
+#, fuzzy
+msgid "F_ont size:"
msgstr "Rozmiar czcionki:"
-#: ../panel-plugin/sensors.c:1988
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "x-mała"
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "mała"
-#: ../panel-plugin/sensors.c:1990
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "średnia"
-#: ../panel-plugin/sensors.c:1991
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "duża"
-#: ../panel-plugin/sensors.c:1992
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "x-duża"
-#: ../panel-plugin/sensors.c:2020
-msgid "Temperature scale:"
+#: ../panel-plugin/sensors.c:2107
+#, fuzzy
+msgid "T_emperature scale:"
msgstr "Skala temperatury:"
-#: ../panel-plugin/sensors.c:2022
-msgid "Celsius"
+#: ../panel-plugin/sensors.c:2109
+#, fuzzy
+msgid "_Celsius"
msgstr "Celcjusze"
-#: ../panel-plugin/sensors.c:2024
-msgid "Fahrenheit"
+#: ../panel-plugin/sensors.c:2111
+#, fuzzy
+msgid "_Fahrenheit"
msgstr "Farenhaity"
-#: ../panel-plugin/sensors.c:2063
-msgid "Update interval (seconds):"
+#: ../panel-plugin/sensors.c:2150
+#, fuzzy
+msgid "U_pdate interval (seconds):"
msgstr "Czas aktualizacji (sek):"
-#: ../panel-plugin/sensors.c:2090
-msgid "Execute on double click:"
+#: ../panel-plugin/sensors.c:2178
+#, fuzzy
+msgid "E_xecute on double click:"
msgstr "Wykonaj przy podwójnym kliknięciu:"
-#: ../panel-plugin/sensors.c:2132
-msgid "<b>View</b>"
-msgstr "<b>Widok</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2190
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Inne</b>"
-#: ../panel-plugin/sensors.c:2237
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Edytuj właściowości"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2244 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Wtyczka Czujników"
@@ -185,5 +191,17 @@
msgid "Show sensor values."
msgstr "Pokazuj wartości z czujników"
-#~ msgid "Show colored _bars"
-#~ msgstr "Pokazuj kolorowe _słupki"
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Czujniki temperatury dysku"
+
+#~ msgid "<b>Sensors</b>"
+#~ msgstr "<b>Czujniki</b>"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Błąd: nie mogę połączyć się z czujnikiem!"
+
+#~ msgid "Hard disks"
+#~ msgstr "Dyski twarde"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Widok</b>"
Modified: xfce4-sensors-plugin/trunk/po/ru.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/ru.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/ru.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-01 11:14+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-04-09 17:07+0600\n"
"Last-Translator: Andrey Fedoseev <andrey.fedoseev at gmail.com>\n"
"Language-Team: Russian <ru at li.org>\n"
@@ -15,177 +15,166 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors.c:156 ../panel-plugin/sensors.c:2227
-msgid "<b>Sensors</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
msgstr "<b>Сенсоры</b>"
-#: ../panel-plugin/sensors.c:275
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Сенсоры</b></span>\n"
-#: ../panel-plugin/sensors.c:337
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Сенсоры</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:444
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Сенсоры не выбраны!"
-#: ../panel-plugin/sensors.c:482 ../panel-plugin/sensors.c:1705
+#: ../panel-plugin/sensors.c:509
+#, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
-#: ../panel-plugin/sensors.c:503
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f оборотов/мин"
-#: ../panel-plugin/sensors.c:726
-msgid "Error: Could not connect to sensors!"
-msgstr "Ошибка: Не удается соединиться с сенсорами!"
-
-#: ../panel-plugin/sensors.c:816 ../panel-plugin/sensors.c:890
-msgid "Hard disks"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:926
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "Сенсоры на найдены!"
-#: ../panel-plugin/sensors.c:1384
-msgid "Hard disk temperature sensors"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:1800
+#: ../panel-plugin/sensors.c:1813
#, fuzzy
msgid "_UI style:"
msgstr "Стиль отображения"
-#: ../panel-plugin/sensors.c:1801
+#: ../panel-plugin/sensors.c:1814
#, fuzzy
msgid "_text"
msgstr "текстовый"
-#: ../panel-plugin/sensors.c:1803
+#: ../panel-plugin/sensors.c:1816
#, fuzzy
msgid "g_raphical"
msgstr "графический"
-#: ../panel-plugin/sensors.c:1840
+#: ../panel-plugin/sensors.c:1853
#, fuzzy
msgid "Show _labels in graphical UI"
msgstr "Отображать метки"
-#: ../panel-plugin/sensors.c:1869
+#: ../panel-plugin/sensors.c:1883
msgid "Show colored _bars"
msgstr ""
-#: ../panel-plugin/sensors.c:1898
+#: ../panel-plugin/sensors.c:1912
#, fuzzy
msgid "_Show title"
msgstr "Отображать заголовок"
-#: ../panel-plugin/sensors.c:1924
+#: ../panel-plugin/sensors.c:1940
#, fuzzy
msgid "Sensors t_ype:"
msgstr "Тип сенсоров:"
-#: ../panel-plugin/sensors.c:1971
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Имя"
-#: ../panel-plugin/sensors.c:1980
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Значение"
-#: ../panel-plugin/sensors.c:1986
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Отображать"
-#: ../panel-plugin/sensors.c:1995
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Цвет"
-#: ../panel-plugin/sensors.c:2005
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Мин."
-#: ../panel-plugin/sensors.c:2014
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Макс."
-#: ../panel-plugin/sensors.c:2042
+#: ../panel-plugin/sensors.c:2065
#, fuzzy
msgid "F_ont size:"
msgstr "Размер шрифта:"
-#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->useBarUI);
-#: ../panel-plugin/sensors.c:2049
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "крошечный"
-#: ../panel-plugin/sensors.c:2050
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "маленький"
-#: ../panel-plugin/sensors.c:2051
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "средний"
-#: ../panel-plugin/sensors.c:2052
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "большой"
-#: ../panel-plugin/sensors.c:2053
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "огромный"
-#: ../panel-plugin/sensors.c:2084
+#: ../panel-plugin/sensors.c:2107
#, fuzzy
msgid "T_emperature scale:"
msgstr "Температурная шкала:"
-#: ../panel-plugin/sensors.c:2086
+#: ../panel-plugin/sensors.c:2109
#, fuzzy
msgid "_Celsius"
msgstr "По Цельсию"
-#: ../panel-plugin/sensors.c:2088
+#: ../panel-plugin/sensors.c:2111
#, fuzzy
msgid "_Fahrenheit"
msgstr "По Фаренгейту"
-#: ../panel-plugin/sensors.c:2127
+#: ../panel-plugin/sensors.c:2150
#, fuzzy
msgid "U_pdate interval (seconds):"
msgstr "Интервал обновления (сек.):"
-#: ../panel-plugin/sensors.c:2154
+#: ../panel-plugin/sensors.c:2178
#, fuzzy
msgid "E_xecute on double click:"
msgstr "Выполнить по двойному щелчку:"
-#: ../panel-plugin/sensors.c:2196
-msgid "<b>View</b>"
-msgstr "<b>Вид</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2256
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Дополнительно</b>"
-#: ../panel-plugin/sensors.c:2304
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Свойства"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2311 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Сенсоры"
@@ -196,3 +185,9 @@
#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:2
msgid "Show sensor values."
msgstr "Отображает значения сенсоров."
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Ошибка: Не удается соединиться с сенсорами!"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Вид</b>"
Modified: xfce4-sensors-plugin/trunk/po/sq.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/sq.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/sq.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2007-01-30 21:21+0200\n"
"Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
"Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
@@ -15,31 +15,30 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.1\n"
-#: ../panel-plugin/sensors.c:153
-#: ../panel-plugin/sensors.c:2162
-msgid "<b>Sensors</b>"
-msgstr "<b>Ndijuesa</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
+msgstr "Tip ndijuesish:"
-#: ../panel-plugin/sensors.c:272
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Ndijuesa</b></span>\n"
-#: ../panel-plugin/sensors.c:334
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Ndijuesa</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:441
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Pa ndijuesa të përzgjedhur!"
-#: ../panel-plugin/sensors.c:479
-#: ../panel-plugin/sensors.c:1677
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -48,135 +47,138 @@
"Duket se ka problem me leximin e vlerës së një ndijuesi. \n"
"Nuk garantoj dot ecurinë e duhur.\n"
-#: ../panel-plugin/sensors.c:500
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f rpm"
-#: ../panel-plugin/sensors.c:723
-msgid "Error: Could not connect to sensors!"
-msgstr "Gabim: Nuk u lidha dot me ndijuesat!"
-
-#: ../panel-plugin/sensors.c:813
-#: ../panel-plugin/sensors.c:887
-msgid "Hard disks"
-msgstr "Hard disqe"
-
-#: ../panel-plugin/sensors.c:923
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "S'u gjetën ndijuesa!"
-#: ../panel-plugin/sensors.c:1356
-msgid "Hard disk temperature sensors"
-msgstr "Nidjuesa temperature hard disku"
-
-#: ../panel-plugin/sensors.c:1772
-msgid "UI style:"
+#: ../panel-plugin/sensors.c:1813
+#, fuzzy
+msgid "_UI style:"
msgstr "Stil UI-je:"
-#: ../panel-plugin/sensors.c:1773
-msgid "text"
+#: ../panel-plugin/sensors.c:1814
+#, fuzzy
+msgid "_text"
msgstr "tekst"
-#: ../panel-plugin/sensors.c:1775
-msgid "graphical"
+#: ../panel-plugin/sensors.c:1816
+#, fuzzy
+msgid "g_raphical"
msgstr "grafik"
-#: ../panel-plugin/sensors.c:1812
-msgid "Show labels in graphical UI"
+#: ../panel-plugin/sensors.c:1853
+#, fuzzy
+msgid "Show _labels in graphical UI"
msgstr "Shfaq etiketa në UI grafike"
-#: ../panel-plugin/sensors.c:1837
-msgid "Show title"
+#: ../panel-plugin/sensors.c:1883
+msgid "Show colored _bars"
+msgstr ""
+
+#: ../panel-plugin/sensors.c:1912
+#, fuzzy
+msgid "_Show title"
msgstr "Shfaq titull"
-#: ../panel-plugin/sensors.c:1863
-msgid "Sensors type:"
+#: ../panel-plugin/sensors.c:1940
+#, fuzzy
+msgid "Sensors t_ype:"
msgstr "Tip ndijuesish:"
-#: ../panel-plugin/sensors.c:1910
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Emër"
-#: ../panel-plugin/sensors.c:1919
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Vlerë"
-#: ../panel-plugin/sensors.c:1925
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Shfaq"
-#: ../panel-plugin/sensors.c:1934
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Ngjyrë"
-#: ../panel-plugin/sensors.c:1944
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Min."
-#: ../panel-plugin/sensors.c:1953
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Maks."
-#: ../panel-plugin/sensors.c:1981
-msgid "Font size:"
+#: ../panel-plugin/sensors.c:2065
+#, fuzzy
+msgid "F_ont size:"
msgstr "Madhësi gërmash:"
-#: ../panel-plugin/sensors.c:1988
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "x-small"
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "të vogla"
-#: ../panel-plugin/sensors.c:1990
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "të mesme"
-#: ../panel-plugin/sensors.c:1991
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "të mëdha"
-#: ../panel-plugin/sensors.c:1992
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "shumë të mëdha"
-#: ../panel-plugin/sensors.c:2020
-msgid "Temperature scale:"
+#: ../panel-plugin/sensors.c:2107
+#, fuzzy
+msgid "T_emperature scale:"
msgstr "Shkallë temperature:"
-#: ../panel-plugin/sensors.c:2022
-msgid "Celsius"
+#: ../panel-plugin/sensors.c:2109
+#, fuzzy
+msgid "_Celsius"
msgstr "Celsius"
-#: ../panel-plugin/sensors.c:2024
-msgid "Fahrenheit"
+#: ../panel-plugin/sensors.c:2111
+#, fuzzy
+msgid "_Fahrenheit"
msgstr "Fahrenheit"
-#: ../panel-plugin/sensors.c:2063
-msgid "Update interval (seconds):"
+#: ../panel-plugin/sensors.c:2150
+#, fuzzy
+msgid "U_pdate interval (seconds):"
msgstr "Interval përditësimi (sekonda):"
-#: ../panel-plugin/sensors.c:2090
-msgid "Execute on double click:"
+#: ../panel-plugin/sensors.c:2178
+#, fuzzy
+msgid "E_xecute on double click:"
msgstr "Veprim kur dyklikohet:"
-#: ../panel-plugin/sensors.c:2132
-msgid "<b>View</b>"
-msgstr "<b>Parje</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2190
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Të ndryshme</b>"
-#: ../panel-plugin/sensors.c:2237
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Përpunoni Veti"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2244
-#: ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Shtojcë Ndijuesish"
@@ -188,3 +190,17 @@
msgid "Show sensor values."
msgstr "Shfaq vlera ndijuesish."
+#~ msgid "<b>Sensors</b>"
+#~ msgstr "<b>Ndijuesa</b>"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Gabim: Nuk u lidha dot me ndijuesat!"
+
+#~ msgid "Hard disks"
+#~ msgstr "Hard disqe"
+
+#~ msgid "Hard disk temperature sensors"
+#~ msgstr "Nidjuesa temperature hard disku"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Parje</b>"
Modified: xfce4-sensors-plugin/trunk/po/vi.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/vi.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/vi.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-01 11:14+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-02-19 22:51+0300\n"
"Last-Translator: Phan Vĩnh Thịnh <teppi at vnlinux.org>\n"
"Language-Team: Vietnamese <none at li.org>\n"
@@ -15,29 +15,30 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.9.1\n"
-#: ../panel-plugin/sensors.c:156 ../panel-plugin/sensors.c:2227
-msgid "<b>Sensors</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
msgstr "<b>Cảm ứng</b>"
-#: ../panel-plugin/sensors.c:275
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Cảm ứng</b></span>\n"
-#: ../panel-plugin/sensors.c:337
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Cảm ứng</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:444
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "Chưa chọn bộ cảm ứng nào!"
-#: ../panel-plugin/sensors.c:482 ../panel-plugin/sensors.c:1705
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -46,150 +47,138 @@
"Có vẻ như có vấn đề đọc một giá trị cảm ứng. \n"
"Không có bảo đảm cho sự thực hiện.\n"
-#: ../panel-plugin/sensors.c:503
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f rpm"
-#: ../panel-plugin/sensors.c:726
-msgid "Error: Could not connect to sensors!"
-msgstr "Lỗi: Không thể kết nối tới bộ cảm ứng!"
-
-#: ../panel-plugin/sensors.c:816 ../panel-plugin/sensors.c:890
-msgid "Hard disks"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:926
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "Không tìm thấy bộ cảm ứng!"
-#: ../panel-plugin/sensors.c:1384
-msgid "Hard disk temperature sensors"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:1800
+#: ../panel-plugin/sensors.c:1813
#, fuzzy
msgid "_UI style:"
msgstr "Dạng giao diện:"
-#: ../panel-plugin/sensors.c:1801
+#: ../panel-plugin/sensors.c:1814
#, fuzzy
msgid "_text"
msgstr "văn bản"
-#: ../panel-plugin/sensors.c:1803
+#: ../panel-plugin/sensors.c:1816
#, fuzzy
msgid "g_raphical"
msgstr "đồ hoạ"
-#: ../panel-plugin/sensors.c:1840
+#: ../panel-plugin/sensors.c:1853
#, fuzzy
msgid "Show _labels in graphical UI"
msgstr "Hiển thị nhãn trong giao diện đồ hoạ"
-#: ../panel-plugin/sensors.c:1869
+#: ../panel-plugin/sensors.c:1883
msgid "Show colored _bars"
msgstr ""
-#: ../panel-plugin/sensors.c:1898
+#: ../panel-plugin/sensors.c:1912
#, fuzzy
msgid "_Show title"
msgstr "Hiển thị tiêu đề"
-#: ../panel-plugin/sensors.c:1924
+#: ../panel-plugin/sensors.c:1940
#, fuzzy
msgid "Sensors t_ype:"
msgstr "Dạng cảm ứng:"
-#: ../panel-plugin/sensors.c:1971
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "Tên"
-#: ../panel-plugin/sensors.c:1980
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "Giá trị"
-#: ../panel-plugin/sensors.c:1986
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "Hiện"
-#: ../panel-plugin/sensors.c:1995
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "Màu"
-#: ../panel-plugin/sensors.c:2005
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "Min"
-#: ../panel-plugin/sensors.c:2014
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "Max"
-#: ../panel-plugin/sensors.c:2042
+#: ../panel-plugin/sensors.c:2065
#, fuzzy
msgid "F_ont size:"
msgstr "Kích cỡ phông:"
-#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->useBarUI);
-#: ../panel-plugin/sensors.c:2049
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "rất nhỏ"
-#: ../panel-plugin/sensors.c:2050
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "nhỏ"
-#: ../panel-plugin/sensors.c:2051
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "trung bình"
-#: ../panel-plugin/sensors.c:2052
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "lớn"
-#: ../panel-plugin/sensors.c:2053
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "rất lớn"
-#: ../panel-plugin/sensors.c:2084
+#: ../panel-plugin/sensors.c:2107
#, fuzzy
msgid "T_emperature scale:"
msgstr "Thang nhiệt độ:"
-#: ../panel-plugin/sensors.c:2086
+#: ../panel-plugin/sensors.c:2109
#, fuzzy
msgid "_Celsius"
msgstr "Độ C"
-#: ../panel-plugin/sensors.c:2088
+#: ../panel-plugin/sensors.c:2111
#, fuzzy
msgid "_Fahrenheit"
msgstr "Độ F"
-#: ../panel-plugin/sensors.c:2127
+#: ../panel-plugin/sensors.c:2150
#, fuzzy
msgid "U_pdate interval (seconds):"
msgstr "Cập nhật sau (giây):"
-#: ../panel-plugin/sensors.c:2154
+#: ../panel-plugin/sensors.c:2178
#, fuzzy
msgid "E_xecute on double click:"
msgstr "Thực hiện khi nháy kép:"
-#: ../panel-plugin/sensors.c:2196
-msgid "<b>View</b>"
-msgstr "<b>Xem</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2256
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>Khác</b>"
-#: ../panel-plugin/sensors.c:2304
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "Sửa thuộc tính"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2311 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "Plugin cảm ứng"
@@ -200,3 +189,9 @@
#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:2
msgid "Show sensor values."
msgstr "Hiển thị các giá trị cảm ứng."
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "Lỗi: Không thể kết nối tới bộ cảm ứng!"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>Xem</b>"
Modified: xfce4-sensors-plugin/trunk/po/zh_TW.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/zh_TW.po 2007-10-20 11:52:35 UTC (rev 3415)
+++ xfce4-sensors-plugin/trunk/po/zh_TW.po 2007-10-20 18:11:34 UTC (rev 3416)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-10-07 15:02+0200\n"
"PO-Revision-Date: 2006-06-26 22:37+0800\n"
"Last-Translator: Hydonsingore Cia <hydonsingore at educities.edu.tw>\n"
"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -15,29 +15,30 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors.c:153 ../panel-plugin/sensors.c:2162
-msgid "<b>Sensors</b>"
-msgstr "<b>感測器</b>"
+#: ../panel-plugin/sensors.c:201 ../panel-plugin/sensors.c:2254
+#, fuzzy
+msgid "Sensors"
+msgstr "感測器類型："
-#: ../panel-plugin/sensors.c:272
+#: ../panel-plugin/sensors.c:323
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>感測器</b></span>\n"
-#: ../panel-plugin/sensors.c:334
+#: ../panel-plugin/sensors.c:388
#, c-format
msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\" size=\"%s\"><b>感測器</b></span>"
#. circumvent empty char pointer
-#: ../panel-plugin/sensors.c:441
+#: ../panel-plugin/sensors.c:470
msgid "No sensors selected!"
msgstr "沒有感測器被選用！"
-#: ../panel-plugin/sensors.c:479 ../panel-plugin/sensors.c:1677
+#: ../panel-plugin/sensors.c:509
+#, fuzzy, c-format
msgid ""
-" \n"
-"Xfce Hardware Sensors Plugin: \n"
+"Xfce Hardware Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature value. \n"
"Proper proceeding cannot be guaranteed.\n"
msgstr ""
@@ -46,133 +47,138 @@
"在讀取感測器數值時似乎有點問題。\n"
"無法保證能夠正常運作。\n"
-#: ../panel-plugin/sensors.c:500
+#: ../panel-plugin/sensors.c:528
#, c-format
msgid "%5.0f rpm"
msgstr "%5.0f rpm"
-#: ../panel-plugin/sensors.c:723
-msgid "Error: Could not connect to sensors!"
-msgstr "錯誤：無法連線至感測器！"
-
-#: ../panel-plugin/sensors.c:813 ../panel-plugin/sensors.c:887
-msgid "Hard disks"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:923
+#: ../panel-plugin/sensors.c:840
msgid "No sensors found!"
msgstr "找不到感測器！"
-#: ../panel-plugin/sensors.c:1356
-msgid "Hard disk temperature sensors"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:1772
-msgid "UI style:"
+#: ../panel-plugin/sensors.c:1813
+#, fuzzy
+msgid "_UI style:"
msgstr "使用介面風格"
-#: ../panel-plugin/sensors.c:1773
-msgid "text"
+#: ../panel-plugin/sensors.c:1814
+#, fuzzy
+msgid "_text"
msgstr "文字"
-#: ../panel-plugin/sensors.c:1775
-msgid "graphical"
+#: ../panel-plugin/sensors.c:1816
+#, fuzzy
+msgid "g_raphical"
msgstr "圖形"
-#: ../panel-plugin/sensors.c:1812
-msgid "Show labels in graphical UI"
+#: ../panel-plugin/sensors.c:1853
+#, fuzzy
+msgid "Show _labels in graphical UI"
msgstr "在圖形介面中顯示標籤"
-#: ../panel-plugin/sensors.c:1837
-msgid "Show title"
+#: ../panel-plugin/sensors.c:1883
+msgid "Show colored _bars"
+msgstr ""
+
+#: ../panel-plugin/sensors.c:1912
+#, fuzzy
+msgid "_Show title"
msgstr "顯示標題"
-#: ../panel-plugin/sensors.c:1863
-msgid "Sensors type:"
+#: ../panel-plugin/sensors.c:1940
+#, fuzzy
+msgid "Sensors t_ype:"
msgstr "感測器類型："
-#: ../panel-plugin/sensors.c:1910
+#: ../panel-plugin/sensors.c:1990
msgid "Name"
msgstr "名稱"
-#: ../panel-plugin/sensors.c:1919
+#: ../panel-plugin/sensors.c:1999
msgid "Value"
msgstr "數值"
-#: ../panel-plugin/sensors.c:1925
+#: ../panel-plugin/sensors.c:2005
msgid "Show"
msgstr "顯示"
-#: ../panel-plugin/sensors.c:1934
+#: ../panel-plugin/sensors.c:2014
msgid "Color"
msgstr "顏色"
-#: ../panel-plugin/sensors.c:1944
+#: ../panel-plugin/sensors.c:2024
msgid "Min"
msgstr "最小"
-#: ../panel-plugin/sensors.c:1953
+#: ../panel-plugin/sensors.c:2033
msgid "Max"
msgstr "最大"
-#: ../panel-plugin/sensors.c:1981
-msgid "Font size:"
+#: ../panel-plugin/sensors.c:2065
+#, fuzzy
+msgid "F_ont size:"
msgstr "字型大小："
-#: ../panel-plugin/sensors.c:1988
+#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
+#: ../panel-plugin/sensors.c:2072
msgid "x-small"
msgstr "極小"
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:2073
msgid "small"
msgstr "小"
-#: ../panel-plugin/sensors.c:1990
+#: ../panel-plugin/sensors.c:2074
msgid "medium"
msgstr "普通"
-#: ../panel-plugin/sensors.c:1991
+#: ../panel-plugin/sensors.c:2075
msgid "large"
msgstr "大"
-#: ../panel-plugin/sensors.c:1992
+#: ../panel-plugin/sensors.c:2076
msgid "x-large"
msgstr "巨大"
-#: ../panel-plugin/sensors.c:2020
-msgid "Temperature scale:"
+#: ../panel-plugin/sensors.c:2107
+#, fuzzy
+msgid "T_emperature scale:"
msgstr "温標："
-#: ../panel-plugin/sensors.c:2022
-msgid "Celsius"
+#: ../panel-plugin/sensors.c:2109
+#, fuzzy
+msgid "_Celsius"
msgstr "攝氏"
-#: ../panel-plugin/sensors.c:2024
-msgid "Fahrenheit"
+#: ../panel-plugin/sensors.c:2111
+#, fuzzy
+msgid "_Fahrenheit"
msgstr "華氏"
-#: ../panel-plugin/sensors.c:2063
-msgid "Update interval (seconds):"
+#: ../panel-plugin/sensors.c:2150
+#, fuzzy
+msgid "U_pdate interval (seconds):"
msgstr "更新間隔時間(秒)："
-#: ../panel-plugin/sensors.c:2090
-msgid "Execute on double click:"
+#: ../panel-plugin/sensors.c:2178
+#, fuzzy
+msgid "E_xecute on double click:"
msgstr "於雙擊時執行："
-#: ../panel-plugin/sensors.c:2132
-msgid "<b>View</b>"
-msgstr "<b>檢視</b>"
+#: ../panel-plugin/sensors.c:2223
+msgid "View"
+msgstr ""
-#: ../panel-plugin/sensors.c:2190
-msgid "<b>Miscellaneous</b>"
+#: ../panel-plugin/sensors.c:2283
+#, fuzzy
+msgid "Miscellaneous"
msgstr "<b>雜項</b>"
-#: ../panel-plugin/sensors.c:2237
+#: ../panel-plugin/sensors.c:2331
msgid "Edit Properties"
msgstr "編輯屬性"
-#. #include <unistd.h>
-#: ../panel-plugin/sensors.c:2244 ../panel-plugin/sensors.h:51
+#: ../panel-plugin/sensors.c:2338 ../panel-plugin/sensors.h:40
msgid "Sensors Plugin"
msgstr "感測器外掛程式"
@@ -183,3 +189,12 @@
#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:2
msgid "Show sensor values."
msgstr "顯示感測器數值。"
+
+#~ msgid "<b>Sensors</b>"
+#~ msgstr "<b>感測器</b>"
+
+#~ msgid "Error: Could not connect to sensors!"
+#~ msgstr "錯誤：無法連線至感測器！"
+
+#~ msgid "<b>View</b>"
+#~ msgstr "<b>檢視</b>"
More information about the Goodies-commits
mailing list