[Xfce4-commits] <xfce4-kbdleds-plugin:master> Added color background
OCo
noreply at xfce.org
Thu Oct 13 19:52:01 CEST 2011
Updating branch refs/heads/master
to bc71331779421d98ea7b6fa8ea47191a56364607 (commit)
from b927baf1c01d787d64076a181bd243d909561d91 (commit)
commit bc71331779421d98ea7b6fa8ea47191a56364607
Author: OCo <oco at newmail.ru>
Date: Thu Oct 13 20:42:50 2011 +0300
Added color background
.anjuta/default.profile | 5 +++
.anjuta/session/anjuta.session | 4 +-
.anjuta/session/dock-layout.xml | 2 +-
.anjuta_sym_db.db | Bin 60416 -> 93184 bytes
ChangeLog | 12 +++++++
Makefile | 6 ++--
TODO | 1 +
autom4te.cache/output.0 | 20 ++++++------
autom4te.cache/output.1 | 20 ++++++------
autom4te.cache/requests | 2 +-
config.h | 6 ++--
config.log | 42 +++++++++++++-------------
config.status | 22 +++++++-------
configure | 20 ++++++------
configure.ac | 4 +-
configure.ac.in | 2 +-
icons/48x48/Makefile | 6 ++--
icons/Makefile | 6 ++--
icons/scalable/Makefile | 6 ++--
libtool | 2 +-
panel-plugin/Makefile | 6 ++--
panel-plugin/kbdleds.c | 20 +++++++++---
panel-plugin/kbdleds.c~ | 27 +++++++++++++----
panel-plugin/xfce4-kbdleds-plugin | Bin 85613 -> 85867 bytes
panel-plugin/xfce4_kbdleds_plugin-kbdleds.o | Bin 65056 -> 65624 bytes
po/Makefile | 2 +-
po/Makefile.in | 2 +-
27 files changed, 143 insertions(+), 102 deletions(-)
diff --git a/.anjuta/default.profile b/.anjuta/default.profile
index 52ccf45..40cce68 100644
--- a/.anjuta/default.profile
+++ b/.anjuta/default.profile
@@ -1,5 +1,10 @@
<?xml version="1.0"?>
<anjuta>
+ <plugin name="Git" mandatory="no">
+ <require group="Anjuta Plugin"
+ attribute="Location"
+ value="anjuta-git:Git"/>
+ </plugin>
<plugin name="Terminal" mandatory="no">
<require group="Anjuta Plugin"
attribute="Location"
diff --git a/.anjuta/session/anjuta.session b/.anjuta/session/anjuta.session
index 466d3fd..3032b68 100644
--- a/.anjuta/session/anjuta.session
+++ b/.anjuta/session/anjuta.session
@@ -4,10 +4,10 @@ Maximized=1
Geometry=773x436+0+0
[Project Manager]
-Shortcut=C file:///home/oleg/temp/xfce/xfce4-kbdleds-plugin/panel-plugin xfce4-kbdleds-plugin
+Shortcut=E file:///home/oleg/temp/xfce/xfce4-kbdleds-plugin/panel-plugin xfce4-kbdleds-plugin
[File Loader]
-Files=file:///home/oleg/temp/xfce/xfce4-kbdleds-plugin/panel-plugin/xkbleds.c#29
+Files=file:///home/oleg/temp/xfce/xfce4-kbdleds-plugin/panel-plugin/xkbleds.c#29%%%file:///home/oleg/temp/xfce/xfce4-kbdleds-plugin/panel-plugin/kbdleds.c#247
[Document Manager]
bookmarks=<?xml version="1.0" encoding="UTF-8"?>\n<bookmarks/>\n
diff --git a/.anjuta/session/dock-layout.xml b/.anjuta/session/dock-layout.xml
index 21ed4ba..f70b5d5 100644
--- a/.anjuta/session/dock-layout.xml
+++ b/.anjuta/session/dock-layout.xml
@@ -1,2 +1,2 @@
<?xml version="1.0"?>
-<dock-layout><layout name="__default__"><dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0"><paned orientation="horizontal" locked="no" position="172"><notebook orientation="vertical" locked="no" page="1"><item name="AnjutaFileManager" orientation="vertical" locked="no"/><item name="AnjutaProjectManager" orientation="vertical" locked="no"/><item name="AnjutaSymbolDB" orientation="vertical" locked="no"/><item name="AnjutaDevhelpIndex" orientation="vertical" locked="no"/></notebook><paned orientation="vertical" locked="no" position="233"><notebook orientation="vertical" locked="no" page="0"><item name="AnjutaDocumentManager" orientation="vertical" locked="no"/><item name="AnjutaTodoPlugin" orientation="vertical" locked="no"/></notebook><item name="AnjutaMessageView" orientation="vertical" locked="no"/></paned></paned></dock><dock floating="yes" width="773" height="436" floatx="0" floaty="19"><item name="AnjutaDevhelpDisplay" orientation="vertical"
locked="no"/></dock></layout></dock-layout>
+<dock-layout><layout name="__default__"><dock floating="yes" width="773" height="436" floatx="0" floaty="19"><item name="AnjutaDevhelpDisplay" orientation="vertical" locked="no"/></dock><dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0"><paned orientation="horizontal" locked="no" position="172"><notebook orientation="vertical" locked="no" page="1"><item name="AnjutaFileManager" orientation="vertical" locked="no"/><item name="AnjutaProjectManager" orientation="vertical" locked="no"/><item name="AnjutaSymbolDB" orientation="vertical" locked="no"/><item name="AnjutaDevhelpIndex" orientation="vertical" locked="no"/></notebook><paned orientation="vertical" locked="no" position="276"><notebook orientation="vertical" locked="no" page="0"><item name="AnjutaDocumentManager" orientation="vertical" locked="no"/><item name="AnjutaTodoPlugin" orientation="vertical" locked="no"/></notebook><item name="AnjutaMessageView" orientation="vertical" locked="no"/></p
aned></paned></dock></layout></dock-layout>
diff --git a/.anjuta_sym_db.db b/.anjuta_sym_db.db
index 17053e4..49c60cf 100644
Binary files a/.anjuta_sym_db.db and b/.anjuta_sym_db.db differ
diff --git a/ChangeLog b/ChangeLog
index f3a74f6..06d4261 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+commit b927baf1c01d787d64076a181bd243d909561d91
+Author: OCo <oco at newmail.ru>
+Date: Tue Oct 11 22:03:41 2011 +0300
+
+ Dist file created
+
+commit f9833d1fe15220a02a6476d3bdbaa6cef7e4a9a8
+Author: OCo <oco at newmail.ru>
+Date: Tue Oct 11 22:03:05 2011 +0300
+
+ Dist file created
+
commit c3babd5347fbb7e6d0be6f8078997f3ff378b636
Author: OCo <oco at newmail.ru>
Date: Tue Oct 11 21:56:00 2011 +0300
diff --git a/Makefile b/Makefile
index 9987454..f53793e 100644
--- a/Makefile
+++ b/Makefile
@@ -194,10 +194,10 @@ OTOOL64 =
PACKAGE = xfce4-kbdleds-plugin
PACKAGE_BUGREPORT = http://bugzilla.xfce.org/
PACKAGE_NAME = xfce4-kbdleds
-PACKAGE_STRING = xfce4-kbdleds 0.0.5
+PACKAGE_STRING = xfce4-kbdleds 0.0.6
PACKAGE_TARNAME = xfce4-kbdleds-plugin
PACKAGE_URL =
-PACKAGE_VERSION = 0.0.5
+PACKAGE_VERSION = 0.0.6
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PLATFORM_CFLAGS =
@@ -213,7 +213,7 @@ SET_MAKE =
SHELL = /bin/bash
STRIP = strip
USE_NLS = yes
-VERSION = 0.0.5
+VERSION = 0.0.6
XGETTEXT = /usr/bin/xgettext
XGETTEXT_ARGS = --keyword=Q_ --from-code=UTF-8
XMKMF =
diff --git a/TODO b/TODO
index e69de29..2edaa85 100644
--- a/TODO
+++ b/TODO
@@ -0,0 +1 @@
+Make about and configurastion dialogs
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index 265fe46..9b4fd76 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,7 +1,7 @@
@%:@! /bin/sh
@%:@ From configure.ac xfce4_panel_version_build.
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.67 for xfce4-kbdleds 0.0.5.
+@%:@ Generated by GNU Autoconf 2.67 for xfce4-kbdleds 0.0.6.
@%:@
@%:@ Report bugs to <http://bugzilla.xfce.org/>.
@%:@
@@ -705,8 +705,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xfce4-kbdleds'
PACKAGE_TARNAME='xfce4-kbdleds-plugin'
-PACKAGE_VERSION='0.0.5'
-PACKAGE_STRING='xfce4-kbdleds 0.0.5'
+PACKAGE_VERSION='0.0.6'
+PACKAGE_STRING='xfce4-kbdleds 0.0.6'
PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
PACKAGE_URL=''
@@ -1500,7 +1500,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xfce4-kbdleds 0.0.5 to adapt to many kinds of systems.
+\`configure' configures xfce4-kbdleds 0.0.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1575,7 +1575,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-kbdleds 0.0.5:";;
+ short | recursive ) echo "Configuration of xfce4-kbdleds 0.0.6:";;
esac
cat <<\_ACEOF
@@ -1687,7 +1687,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-kbdleds configure 0.0.5
+xfce4-kbdleds configure 0.0.6
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2059,7 +2059,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-kbdleds $as_me 0.0.5, which was
+It was created by xfce4-kbdleds $as_me 0.0.6, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2877,7 +2877,7 @@ fi
# Define the identity of the package.
PACKAGE='xfce4-kbdleds-plugin'
- VERSION='0.0.5'
+ VERSION='0.0.6'
cat >>confdefs.h <<_ACEOF
@@ -14957,7 +14957,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfce4-kbdleds $as_me 0.0.5, which was
+This file was extended by xfce4-kbdleds $as_me 0.0.6, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15023,7 +15023,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xfce4-kbdleds config.status 0.0.5
+xfce4-kbdleds config.status 0.0.6
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index 51df693..a1ee868 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -1,7 +1,7 @@
@%:@! /bin/sh
@%:@ From configure.ac xfce4_panel_version_build.
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.67 for xfce4-kbdleds 0.0.5.
+@%:@ Generated by GNU Autoconf 2.67 for xfce4-kbdleds 0.0.6.
@%:@
@%:@ Report bugs to <http://bugzilla.xfce.org/>.
@%:@
@@ -705,8 +705,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xfce4-kbdleds'
PACKAGE_TARNAME='xfce4-kbdleds-plugin'
-PACKAGE_VERSION='0.0.5'
-PACKAGE_STRING='xfce4-kbdleds 0.0.5'
+PACKAGE_VERSION='0.0.6'
+PACKAGE_STRING='xfce4-kbdleds 0.0.6'
PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
PACKAGE_URL=''
@@ -1500,7 +1500,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xfce4-kbdleds 0.0.5 to adapt to many kinds of systems.
+\`configure' configures xfce4-kbdleds 0.0.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1575,7 +1575,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-kbdleds 0.0.5:";;
+ short | recursive ) echo "Configuration of xfce4-kbdleds 0.0.6:";;
esac
cat <<\_ACEOF
@@ -1687,7 +1687,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-kbdleds configure 0.0.5
+xfce4-kbdleds configure 0.0.6
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2059,7 +2059,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-kbdleds $as_me 0.0.5, which was
+It was created by xfce4-kbdleds $as_me 0.0.6, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2877,7 +2877,7 @@ fi
# Define the identity of the package.
PACKAGE='xfce4-kbdleds-plugin'
- VERSION='0.0.5'
+ VERSION='0.0.6'
cat >>confdefs.h <<_ACEOF
@@ -14953,7 +14953,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfce4-kbdleds $as_me 0.0.5, which was
+This file was extended by xfce4-kbdleds $as_me 0.0.6, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15019,7 +15019,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xfce4-kbdleds config.status 0.0.5
+xfce4-kbdleds config.status 0.0.6
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 26f5320..fa5dd33 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -110,9 +110,9 @@
'_AM_SET_OPTION' => 1,
'AC_LTDL_PREOPEN' => 1,
'_LT_LINKER_BOILERPLATE' => 1,
+ 'GLIB_RUN_PROG' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
'AC_LIBTOOL_PROG_CC_C_O' => 1,
- 'GLIB_RUN_PROG' => 1,
'BM_I18N' => 1,
'gl_PREREQ_ARGZ' => 1,
'XDT_CHECK_LIBSM' => 1,
diff --git a/config.h b/config.h
index 35dd4e4..0242255 100644
--- a/config.h
+++ b/config.h
@@ -102,7 +102,7 @@
#define PACKAGE_NAME "xfce4-kbdleds"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xfce4-kbdleds 0.0.5"
+#define PACKAGE_STRING "xfce4-kbdleds 0.0.6"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xfce4-kbdleds-plugin"
@@ -111,7 +111,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.0.5"
+#define PACKAGE_VERSION "0.0.6"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -139,7 +139,7 @@
/* Version number of package */
-#define VERSION "0.0.5"
+#define VERSION "0.0.6"
/* Define to 1 if the X Window System is missing or not being used. */
/* #undef X_DISPLAY_MISSING */
diff --git a/config.log b/config.log
index 14eedac..75e3430 100644
--- a/config.log
+++ b/config.log
@@ -1,10 +1,10 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-kbdleds configure 0.0.5, which was
+It was created by xfce4-kbdleds configure 0.0.6, which was
generated by GNU Autoconf 2.67. Invocation command line was
- $ ./configure --prefix=/usr
+ $ ./configure --prefix=/usr/
## --------- ##
## Platform. ##
@@ -144,12 +144,12 @@ configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME "xfce4-kbdleds"
| #define PACKAGE_TARNAME "xfce4-kbdleds-plugin"
-| #define PACKAGE_VERSION "0.0.5"
-| #define PACKAGE_STRING "xfce4-kbdleds 0.0.5"
+| #define PACKAGE_VERSION "0.0.6"
+| #define PACKAGE_STRING "xfce4-kbdleds 0.0.6"
| #define PACKAGE_BUGREPORT "http://bugzilla.xfce.org/"
| #define PACKAGE_URL ""
| #define PACKAGE "xfce4-kbdleds-plugin"
-| #define VERSION "0.0.5"
+| #define VERSION "0.0.6"
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
configure:4094: result: gcc -E
@@ -163,12 +163,12 @@ configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME "xfce4-kbdleds"
| #define PACKAGE_TARNAME "xfce4-kbdleds-plugin"
-| #define PACKAGE_VERSION "0.0.5"
-| #define PACKAGE_STRING "xfce4-kbdleds 0.0.5"
+| #define PACKAGE_VERSION "0.0.6"
+| #define PACKAGE_STRING "xfce4-kbdleds 0.0.6"
| #define PACKAGE_BUGREPORT "http://bugzilla.xfce.org/"
| #define PACKAGE_URL ""
| #define PACKAGE "xfce4-kbdleds-plugin"
-| #define VERSION "0.0.5"
+| #define VERSION "0.0.6"
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
configure:4157: checking for grep that handles long lines and -e
@@ -228,12 +228,12 @@ configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME "xfce4-kbdleds"
| #define PACKAGE_TARNAME "xfce4-kbdleds-plugin"
-| #define PACKAGE_VERSION "0.0.5"
-| #define PACKAGE_STRING "xfce4-kbdleds 0.0.5"
+| #define PACKAGE_VERSION "0.0.6"
+| #define PACKAGE_STRING "xfce4-kbdleds 0.0.6"
| #define PACKAGE_BUGREPORT "http://bugzilla.xfce.org/"
| #define PACKAGE_URL ""
| #define PACKAGE "xfce4-kbdleds-plugin"
-| #define VERSION "0.0.5"
+| #define VERSION "0.0.6"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -289,12 +289,12 @@ configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME "xfce4-kbdleds"
| #define PACKAGE_TARNAME "xfce4-kbdleds-plugin"
-| #define PACKAGE_VERSION "0.0.5"
-| #define PACKAGE_STRING "xfce4-kbdleds 0.0.5"
+| #define PACKAGE_VERSION "0.0.6"
+| #define PACKAGE_STRING "xfce4-kbdleds 0.0.6"
| #define PACKAGE_BUGREPORT "http://bugzilla.xfce.org/"
| #define PACKAGE_URL ""
| #define PACKAGE "xfce4-kbdleds-plugin"
-| #define VERSION "0.0.5"
+| #define VERSION "0.0.6"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -718,7 +718,7 @@ configure:14553: creating ./config.status
## Running config.status. ##
## ---------------------- ##
-This file was extended by xfce4-kbdleds config.status 0.0.5, which was
+This file was extended by xfce4-kbdleds config.status 0.0.6, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES =
@@ -969,10 +969,10 @@ OTOOL=''
PACKAGE='xfce4-kbdleds-plugin'
PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
PACKAGE_NAME='xfce4-kbdleds'
-PACKAGE_STRING='xfce4-kbdleds 0.0.5'
+PACKAGE_STRING='xfce4-kbdleds 0.0.6'
PACKAGE_TARNAME='xfce4-kbdleds-plugin'
PACKAGE_URL=''
-PACKAGE_VERSION='0.0.5'
+PACKAGE_VERSION='0.0.6'
PATH_SEPARATOR=':'
PKG_CONFIG='/usr/bin/pkg-config'
PLATFORM_CFLAGS=''
@@ -988,7 +988,7 @@ SET_MAKE=''
SHELL='/bin/bash'
STRIP='strip'
USE_NLS='yes'
-VERSION='0.0.5'
+VERSION='0.0.6'
XGETTEXT='/usr/bin/xgettext'
XGETTEXT_ARGS='--keyword=Q_ --from-code=UTF-8'
XMKMF=''
@@ -1052,12 +1052,12 @@ target_alias=''
/* confdefs.h */
#define PACKAGE_NAME "xfce4-kbdleds"
#define PACKAGE_TARNAME "xfce4-kbdleds-plugin"
-#define PACKAGE_VERSION "0.0.5"
-#define PACKAGE_STRING "xfce4-kbdleds 0.0.5"
+#define PACKAGE_VERSION "0.0.6"
+#define PACKAGE_STRING "xfce4-kbdleds 0.0.6"
#define PACKAGE_BUGREPORT "http://bugzilla.xfce.org/"
#define PACKAGE_URL ""
#define PACKAGE "xfce4-kbdleds-plugin"
-#define VERSION "0.0.5"
+#define VERSION "0.0.6"
#define STDC_HEADERS 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_STAT_H 1
diff --git a/config.status b/config.status
index 7b720b2..7544f72 100755
--- a/config.status
+++ b/config.status
@@ -391,7 +391,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfce4-kbdleds $as_me 0.0.5, which was
+This file was extended by xfce4-kbdleds $as_me 0.0.6, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -438,9 +438,9 @@ $config_commands
Report bugs to <http://bugzilla.xfce.org/>."
-ac_cs_config="'--prefix=/usr'"
+ac_cs_config="'--prefix=/usr/'"
ac_cs_version="\
-xfce4-kbdleds config.status 0.0.5
+xfce4-kbdleds config.status 0.0.6
configured by ./configure, generated by GNU Autoconf 2.67,
with options \"$ac_cs_config\"
@@ -530,7 +530,7 @@ if $ac_cs_silent; then
fi
if $ac_cs_recheck; then
- set X '/bin/bash' './configure' '--prefix=/usr' $ac_configure_extra_args --no-create --no-recursion
+ set X '/bin/bash' './configure' '--prefix=/usr/' $ac_configure_extra_args --no-create --no-recursion
shift
$as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
CONFIG_SHELL='/bin/bash'
@@ -728,7 +728,7 @@ fi
PACKAGE='xfce4-kbdleds-plugin'
- VERSION='0.0.5'
+ VERSION='0.0.6'
TIMESTAMP=''
RM='rm -f'
ofile='libtool'
@@ -982,7 +982,7 @@ S["AUTOHEADER"]="${SHELL} /home/oleg/temp/xfce/xfce4-kbdleds-plugin/missing --ru
S["AUTOMAKE"]="${SHELL} /home/oleg/temp/xfce/xfce4-kbdleds-plugin/missing --run automake-1.11"
S["AUTOCONF"]="${SHELL} /home/oleg/temp/xfce/xfce4-kbdleds-plugin/missing --run autoconf"
S["ACLOCAL"]="${SHELL} /home/oleg/temp/xfce/xfce4-kbdleds-plugin/missing --run aclocal-1.11"
-S["VERSION"]="0.0.5"
+S["VERSION"]="0.0.6"
S["PACKAGE"]="xfce4-kbdleds-plugin"
S["CYGPATH_W"]="echo"
S["am__isrc"]=""
@@ -1021,8 +1021,8 @@ S["prefix"]="/usr"
S["exec_prefix"]="${prefix}"
S["PACKAGE_URL"]=""
S["PACKAGE_BUGREPORT"]="http://bugzilla.xfce.org/"
-S["PACKAGE_STRING"]="xfce4-kbdleds 0.0.5"
-S["PACKAGE_VERSION"]="0.0.5"
+S["PACKAGE_STRING"]="xfce4-kbdleds 0.0.6"
+S["PACKAGE_VERSION"]="0.0.6"
S["PACKAGE_TARNAME"]="xfce4-kbdleds-plugin"
S["PACKAGE_NAME"]="xfce4-kbdleds"
S["PATH_SEPARATOR"]=":"
@@ -1070,12 +1070,12 @@ cat >"$tmp/defines.awk" <<\_ACAWK ||
BEGIN {
D["PACKAGE_NAME"]=" \"xfce4-kbdleds\""
D["PACKAGE_TARNAME"]=" \"xfce4-kbdleds-plugin\""
-D["PACKAGE_VERSION"]=" \"0.0.5\""
-D["PACKAGE_STRING"]=" \"xfce4-kbdleds 0.0.5\""
+D["PACKAGE_VERSION"]=" \"0.0.6\""
+D["PACKAGE_STRING"]=" \"xfce4-kbdleds 0.0.6\""
D["PACKAGE_BUGREPORT"]=" \"http://bugzilla.xfce.org/\""
D["PACKAGE_URL"]=" \"\""
D["PACKAGE"]=" \"xfce4-kbdleds-plugin\""
-D["VERSION"]=" \"0.0.5\""
+D["VERSION"]=" \"0.0.6\""
D["STDC_HEADERS"]=" 1"
D["HAVE_SYS_TYPES_H"]=" 1"
D["HAVE_SYS_STAT_H"]=" 1"
diff --git a/configure b/configure
index 9f0e0d3..abd470d 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac xfce4_panel_version_build.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for xfce4-kbdleds 0.0.5.
+# Generated by GNU Autoconf 2.67 for xfce4-kbdleds 0.0.6.
#
# Report bugs to <http://bugzilla.xfce.org/>.
#
@@ -705,8 +705,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xfce4-kbdleds'
PACKAGE_TARNAME='xfce4-kbdleds-plugin'
-PACKAGE_VERSION='0.0.5'
-PACKAGE_STRING='xfce4-kbdleds 0.0.5'
+PACKAGE_VERSION='0.0.6'
+PACKAGE_STRING='xfce4-kbdleds 0.0.6'
PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
PACKAGE_URL=''
@@ -1500,7 +1500,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xfce4-kbdleds 0.0.5 to adapt to many kinds of systems.
+\`configure' configures xfce4-kbdleds 0.0.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1575,7 +1575,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-kbdleds 0.0.5:";;
+ short | recursive ) echo "Configuration of xfce4-kbdleds 0.0.6:";;
esac
cat <<\_ACEOF
@@ -1687,7 +1687,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-kbdleds configure 0.0.5
+xfce4-kbdleds configure 0.0.6
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2059,7 +2059,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-kbdleds $as_me 0.0.5, which was
+It was created by xfce4-kbdleds $as_me 0.0.6, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2877,7 +2877,7 @@ fi
# Define the identity of the package.
PACKAGE='xfce4-kbdleds-plugin'
- VERSION='0.0.5'
+ VERSION='0.0.6'
cat >>confdefs.h <<_ACEOF
@@ -14953,7 +14953,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfce4-kbdleds $as_me 0.0.5, which was
+This file was extended by xfce4-kbdleds $as_me 0.0.6, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15019,7 +15019,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xfce4-kbdleds config.status 0.0.5
+xfce4-kbdleds config.status 0.0.6
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index d3a3387..e42c9cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,9 +15,9 @@ dnl *** Version information ***
dnl ***************************
m4_define([kbdleds_version_major], [0])
m4_define([kbdleds_version_minor], [0])
-m4_define([kbdleds_version_micro], [5])
+m4_define([kbdleds_version_micro], [6])
m4_define([kbdleds_version_nano], []) dnl leave this empty to have no nano version
-m4_define([kbdleds_version_build], [c0b57c6])
+m4_define([kbdleds_version_build], [b927baf])
m4_define([kbdleds_version_tag], [])
m4_define([kbdleds_version], [kbdleds_version_major().kbdleds_version_minor().kbdleds_version_micro()ifelse(kbdleds_version_nano(), [], [], [.kbdleds_version_nano()])ifelse(kbdleds_version_tag(), [git], [kbdleds_version_tag()-kbdleds_version_build()], [kbdleds_version_tag()])])
diff --git a/configure.ac.in b/configure.ac.in
index e0baa89..14756e0 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -10,7 +10,7 @@ dnl *** Version information ***
dnl ***************************
m4_define([kbdleds_version_major], [0])
m4_define([kbdleds_version_minor], [0])
-m4_define([kbdleds_version_micro], [5])
+m4_define([kbdleds_version_micro], [6])
m4_define([kbdleds_version_nano], []) dnl leave this empty to have no nano version
m4_define([kbdleds_version_build], [@REVISION@])
m4_define([kbdleds_version_tag], [])
diff --git a/icons/48x48/Makefile b/icons/48x48/Makefile
index 1d80d91..3b890b6 100644
--- a/icons/48x48/Makefile
+++ b/icons/48x48/Makefile
@@ -164,10 +164,10 @@ OTOOL64 =
PACKAGE = xfce4-kbdleds-plugin
PACKAGE_BUGREPORT = http://bugzilla.xfce.org/
PACKAGE_NAME = xfce4-kbdleds
-PACKAGE_STRING = xfce4-kbdleds 0.0.5
+PACKAGE_STRING = xfce4-kbdleds 0.0.6
PACKAGE_TARNAME = xfce4-kbdleds-plugin
PACKAGE_URL =
-PACKAGE_VERSION = 0.0.5
+PACKAGE_VERSION = 0.0.6
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PLATFORM_CFLAGS =
@@ -183,7 +183,7 @@ SET_MAKE =
SHELL = /bin/bash
STRIP = strip
USE_NLS = yes
-VERSION = 0.0.5
+VERSION = 0.0.6
XGETTEXT = /usr/bin/xgettext
XGETTEXT_ARGS = --keyword=Q_ --from-code=UTF-8
XMKMF =
diff --git a/icons/Makefile b/icons/Makefile
index d683867..e226318 100644
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -180,10 +180,10 @@ OTOOL64 =
PACKAGE = xfce4-kbdleds-plugin
PACKAGE_BUGREPORT = http://bugzilla.xfce.org/
PACKAGE_NAME = xfce4-kbdleds
-PACKAGE_STRING = xfce4-kbdleds 0.0.5
+PACKAGE_STRING = xfce4-kbdleds 0.0.6
PACKAGE_TARNAME = xfce4-kbdleds-plugin
PACKAGE_URL =
-PACKAGE_VERSION = 0.0.5
+PACKAGE_VERSION = 0.0.6
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PLATFORM_CFLAGS =
@@ -199,7 +199,7 @@ SET_MAKE =
SHELL = /bin/bash
STRIP = strip
USE_NLS = yes
-VERSION = 0.0.5
+VERSION = 0.0.6
XGETTEXT = /usr/bin/xgettext
XGETTEXT_ARGS = --keyword=Q_ --from-code=UTF-8
XMKMF =
diff --git a/icons/scalable/Makefile b/icons/scalable/Makefile
index 4032f31..25fe5c4 100644
--- a/icons/scalable/Makefile
+++ b/icons/scalable/Makefile
@@ -164,10 +164,10 @@ OTOOL64 =
PACKAGE = xfce4-kbdleds-plugin
PACKAGE_BUGREPORT = http://bugzilla.xfce.org/
PACKAGE_NAME = xfce4-kbdleds
-PACKAGE_STRING = xfce4-kbdleds 0.0.5
+PACKAGE_STRING = xfce4-kbdleds 0.0.6
PACKAGE_TARNAME = xfce4-kbdleds-plugin
PACKAGE_URL =
-PACKAGE_VERSION = 0.0.5
+PACKAGE_VERSION = 0.0.6
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PLATFORM_CFLAGS =
@@ -183,7 +183,7 @@ SET_MAKE =
SHELL = /bin/bash
STRIP = strip
USE_NLS = yes
-VERSION = 0.0.5
+VERSION = 0.0.6
XGETTEXT = /usr/bin/xgettext
XGETTEXT_ARGS = --keyword=Q_ --from-code=UTF-8
XMKMF =
diff --git a/libtool b/libtool
index 132e718..c5356c4 100755
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
#! /bin/bash
# libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (xfce4-kbdleds-plugin) 0.0.5
+# Generated automatically by config.status (xfce4-kbdleds-plugin) 0.0.6
# Libtool was configured on host oleg-netbook:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
diff --git a/panel-plugin/Makefile b/panel-plugin/Makefile
index 23de467..28ce0d6 100644
--- a/panel-plugin/Makefile
+++ b/panel-plugin/Makefile
@@ -203,10 +203,10 @@ OTOOL64 =
PACKAGE = xfce4-kbdleds-plugin
PACKAGE_BUGREPORT = http://bugzilla.xfce.org/
PACKAGE_NAME = xfce4-kbdleds
-PACKAGE_STRING = xfce4-kbdleds 0.0.5
+PACKAGE_STRING = xfce4-kbdleds 0.0.6
PACKAGE_TARNAME = xfce4-kbdleds-plugin
PACKAGE_URL =
-PACKAGE_VERSION = 0.0.5
+PACKAGE_VERSION = 0.0.6
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PLATFORM_CFLAGS =
@@ -222,7 +222,7 @@ SET_MAKE =
SHELL = /bin/bash
STRIP = strip
USE_NLS = yes
-VERSION = 0.0.5
+VERSION = 0.0.6
XGETTEXT = /usr/bin/xgettext
XGETTEXT_ARGS = --keyword=Q_ --from-code=UTF-8
XMKMF =
diff --git a/panel-plugin/kbdleds.c b/panel-plugin/kbdleds.c
index ce8e3ce..7d0c60d 100644
--- a/panel-plugin/kbdleds.c
+++ b/panel-plugin/kbdleds.c
@@ -220,9 +220,13 @@ kbdleds_size_changed (XfcePanelPlugin *plugin,
gboolean kbdleds_update_state(gpointer data) {
int i;
gchar *str;
+ gchar *template_on="<span background=\"#00ff00\" foreground=\"#000000\">%c</span>";
+ gchar *template_off="%c";
gchar *tempstr[NUM_LEDS];
+ gchar *templates[NUM_LEDS];
gchar *on_off[2]={_("OFF"),_("ON")};
gchar *tooltip={""};
+ gchar *label_str={""};
if (!xkbleds_get_state())
// stop g_timeout
@@ -233,17 +237,23 @@ gboolean kbdleds_update_state(gpointer data) {
str=g_strdup(short_lock_names);
for(i = 0; i < NUM_LEDS; i++) {
tempstr[i]=g_strdup_printf("%s : %s",lock_names[i],xkb_leds[i] ? on_off[1]:on_off[0]);
- if (xkb_leds[i])
- str[i]=toupper(str[i]);
-
+ if (xkb_leds[i]) {
+// str[i]=toupper(str[i]);
+ templates[i]=g_strdup_printf(template_on,toupper(str[i]));
+ } else
+ templates[i]=g_strdup_printf(template_off,str[i]);
}
tooltip=g_strdup_printf("%s\n%s\n%s",tempstr[0],tempstr[1],tempstr[2]);
- for(i = 0; i < NUM_LEDS; i++)
+ label_str=g_strconcat(templates[0],templates[1],templates[2],NULL);
+ for(i = 0; i < NUM_LEDS; i++) {
g_free(tempstr[i]);
- gtk_label_set_text((GtkLabel*)kbdleds->label,str);
+ g_free(templates[i]);
+ }
+ gtk_label_set_markup((GtkLabel*)kbdleds->label,label_str);
gtk_widget_set_tooltip_text(kbdleds->label,tooltip);
g_free(tooltip);
g_free(str);
+ g_free(label_str);
}
return TRUE;
}
diff --git a/panel-plugin/kbdleds.c~ b/panel-plugin/kbdleds.c~
index 8a308ee..ee64e5e 100644
--- a/panel-plugin/kbdleds.c~
+++ b/panel-plugin/kbdleds.c~
@@ -1,6 +1,6 @@
-/* $Id$
+/* xfce4-kbdleds-plugin - panel plugin for keyboard LEDs
*
- * Copyright (c) 2011 John Doo <john at foo.org>
+ * Copyright (c) 2011 Oleg Voronin <oco at newmail.ru>
*
* 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
@@ -220,9 +220,13 @@ kbdleds_size_changed (XfcePanelPlugin *plugin,
gboolean kbdleds_update_state(gpointer data) {
int i;
gchar *str;
+ gchar *template_on="<span background=\"#00ff00\" foreground=\"#000000\">%c</span>";
+ gchar *template_off="%c";
gchar *tempstr[NUM_LEDS];
- gchar *on_off[2]={"OFF","ON"};
+ gchar *templates[NUM_LEDS];
+ gchar *on_off[2]={_("OFF"),_("ON")};
gchar *tooltip={""};
+ gchar *label_str={""};
if (!xkbleds_get_state())
// stop g_timeout
@@ -233,17 +237,26 @@ gboolean kbdleds_update_state(gpointer data) {
str=g_strdup(short_lock_names);
for(i = 0; i < NUM_LEDS; i++) {
tempstr[i]=g_strdup_printf("%s : %s",lock_names[i],xkb_leds[i] ? on_off[1]:on_off[0]);
- if (xkb_leds[i])
- str[i]=toupper(str[i]);
+ if (xkb_leds[i]) {
+// str[i]=toupper(str[i]);
+ templates[i]=g_strdup_printf(template_on,toupper(str[i]));
+ } else
+ templates[i]=g_strdup_printf(template_off,str[i]);
+
}
tooltip=g_strdup_printf("%s\n%s\n%s",tempstr[0],tempstr[1],tempstr[2]);
- for(i = 0; i < NUM_LEDS; i++)
+ label_str=g_strdup_printf("%s%s%s",templates[0],templates[1],templates[2]);
+ for(i = 0; i < NUM_LEDS; i++) {
g_free(tempstr[i]);
- gtk_label_set_text((GtkLabel*)kbdleds->label,str);
+ g_free(templates[i]);
+
+ }
+ gtk_label_set_markup((GtkLabel*)kbdleds->label,label_str);
gtk_widget_set_tooltip_text(kbdleds->label,tooltip);
g_free(tooltip);
g_free(str);
+ g_free(label_str);
}
return TRUE;
}
diff --git a/panel-plugin/xfce4-kbdleds-plugin b/panel-plugin/xfce4-kbdleds-plugin
index c13cc6b..236c2fe 100755
Binary files a/panel-plugin/xfce4-kbdleds-plugin and b/panel-plugin/xfce4-kbdleds-plugin differ
diff --git a/panel-plugin/xfce4_kbdleds_plugin-kbdleds.o b/panel-plugin/xfce4_kbdleds_plugin-kbdleds.o
index efa3688..084fee7 100644
Binary files a/panel-plugin/xfce4_kbdleds_plugin-kbdleds.o and b/panel-plugin/xfce4_kbdleds_plugin-kbdleds.o differ
diff --git a/po/Makefile b/po/Makefile
index 544b82f..d2859f8 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -19,7 +19,7 @@
GETTEXT_PACKAGE = xfce4-kbdleds-plugin
PACKAGE = xfce4-kbdleds-plugin
-VERSION = 0.0.5
+VERSION = 0.0.6
SHELL = /bin/bash
diff --git a/po/Makefile.in b/po/Makefile.in
index eb37291..ae9516d 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -19,7 +19,7 @@
GETTEXT_PACKAGE = xfce4-kbdleds-plugin
PACKAGE = xfce4-kbdleds-plugin
-VERSION = 0.0.5
+VERSION = 0.0.6
SHELL = /bin/bash
More information about the Xfce4-commits
mailing list