Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xfce4-kbdleds-plugin for
openSUSE:Factory checked in at 2024-07-01 11:22:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-kbdleds-plugin (Old)
and /work/SRC/openSUSE:Factory/.xfce4-kbdleds-plugin.new.18349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-kbdleds-plugin"
Mon Jul 1 11:22:08 2024 rev:2 rq:1184176 version:0.3.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin.changes
2022-04-06 21:52:10.727096521 +0200
+++
/work/SRC/openSUSE:Factory/.xfce4-kbdleds-plugin.new.18349/xfce4-kbdleds-plugin.changes
2024-07-01 11:23:00.612819337 +0200
@@ -2 +2,8 @@
-Sat Apr 2 13:46:40 UTC 2022 - Marcel Kuehlhorn <[email protected]>
+Sun Jun 30 09:57:14 UTC 2024 - [email protected]
+
+- Update to version 0.3.0
+ * Ability to show/hide leds
+ * Add missing x11 linker flags
+
+-------------------------------------------------------------------
+Sat Apr 2 13:46:40 UTC 2022 - [email protected]
Old:
----
xfce4-kbdleds-plugin-0.2.5.tar.gz
New:
----
xfce4-kbdleds-plugin-0.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-kbdleds-plugin.spec ++++++
--- /var/tmp/diff_new_pack.eHbvUE/_old 2024-07-01 11:23:01.016833959 +0200
+++ /var/tmp/diff_new_pack.eHbvUE/_new 2024-07-01 11:23:01.016833959 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xfce4-kbdleds-plugin
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: xfce4-kbdleds-plugin
-Version: 0.2.5
+Version: 0.3.0
Release: 0
Summary: Keyboard LEDs plugin for the Xfce panel
License: GPL-2.0-only
++++++ xfce4-kbdleds-plugin-0.2.5.tar.gz -> xfce4-kbdleds-plugin-0.3.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/.gitignore
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/.gitignore
--- old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/.gitignore
2021-11-02 20:15:44.000000000 +0100
+++ new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/.gitignore
2024-05-29 17:12:36.000000000 +0200
@@ -14,6 +14,7 @@
autom4te.cache/*
config.guess
config.h
+config.h.in
config.status
config.sub
config.log
@@ -37,9 +38,12 @@
panel-plugin/*.lo
po/.intltool-merge-cache
po/POTFILES
+po/Makefile.in.in
+po/stamp-*
+po/*.lock
+po/*.pot
+po/*.mo
*.anjuta
m4
stamp-*
-po/stamp-*
-po/*.lock
-ChangeLog
\ No newline at end of file
+ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/config.h.in
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/config.h.in
--- old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/config.h.in
2021-11-02 20:15:44.000000000 +0100
+++ new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/config.h.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,129 +0,0 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define for debugging support */
-#undef DEBUG
-
-/* Define for tracing support */
-#undef DEBUG_TRACE
-
-/* always defined to indicate that i18n is enabled */
-#undef ENABLE_NLS
-
-/* Name of default gettext domain */
-#undef GETTEXT_PACKAGE
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#undef HAVE_BIND_TEXTDOMAIN_CODESET
-
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
- CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
- the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
-/* Define to 1 if you have the `dcgettext' function. */
-#undef HAVE_DCGETTEXT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if you have the <libintl.h> header file. */
-#undef HAVE_LIBINTL_H
-
-/* Define if libX11 is available */
-#undef HAVE_LIBX11
-
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define to 1 if you have the <math.h> header file. */
-#undef HAVE_MATH_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <signal.h> header file. */
-#undef HAVE_SIGNAL_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/prctl.h> header file. */
-#undef HAVE_SYS_PRCTL_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <time.h> header file. */
-#undef HAVE_TIME_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#undef LT_OBJDIR
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/configure.ac.in
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/configure.ac.in
--- old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/configure.ac.in
2021-11-02 20:15:44.000000000 +0100
+++ new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/configure.ac.in
2024-05-29 17:12:36.000000000 +0200
@@ -9,8 +9,8 @@
dnl *** Version information ***
dnl ***************************
m4_define([kbdleds_version_major], [0])
-m4_define([kbdleds_version_minor], [2])
-m4_define([kbdleds_version_micro], [5])
+m4_define([kbdleds_version_minor], [3])
+m4_define([kbdleds_version_micro], [0])
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/Makefile.am
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/Makefile.am
---
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/Makefile.am
2021-11-02 20:15:44.000000000 +0100
+++
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/Makefile.am
2024-05-29 17:12:36.000000000 +0200
@@ -22,6 +22,7 @@
kbdleds-dialogs.h
libkbdleds_la_CFLAGS = \
+ $(LIBX11_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
@@ -35,6 +36,7 @@
$(PLATFORM_LDFLAGS)
libkbdleds_la_LIBADD = \
+ $(LIBX11_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(LIBXFCE4PANEL_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/kbdleds-dialogs.c
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/kbdleds-dialogs.c
---
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/kbdleds-dialogs.c
2021-11-02 20:15:44.000000000 +0100
+++
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/kbdleds-dialogs.c
2024-05-29 17:12:36.000000000 +0200
@@ -1,6 +1,6 @@
/* xfce4-kbdleds-plugin - panel plugin for keyboard LEDs
*
- * Copyright (c) 2011-2021 OCo <[email protected]>
+ * Copyright (c) 2011-2024 OCo <[email protected]>
*
* 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
@@ -33,10 +33,14 @@
/* the website url */
#define PLUGIN_WEBSITE "https://github.com/oco2000/xfce4-kbdleds-plugin";
+/* prototypes */
+gboolean all_disabled(KbdledsPlugin *kbdleds);
+void check_disabled(KbdledsPlugin *kbdleds, GtkWidget *check_button);
+
static void
kbdleds_configure_response (GtkWidget *dialog,
gint response,
- kbdledsPlugin *kbdleds)
+ KbdledsPlugin *kbdleds)
{
gboolean result;
@@ -64,29 +68,62 @@
}
}
-static void change_foreground_color(GtkWidget *button, kbdledsPlugin *kbdleds)
+static void change_foreground_color(GtkWidget *button, KbdledsPlugin *kbdleds)
{
gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button),
&kbdleds->foreground_color);
kbdleds_save (kbdleds->plugin, kbdleds);
refresh();
}
-static void change_background_color(GtkWidget *button, kbdledsPlugin *kbdleds)
+static void change_background_color(GtkWidget *button, KbdledsPlugin *kbdleds)
{
gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button),
&kbdleds->background_color);
kbdleds_save (kbdleds->plugin, kbdleds);
refresh();
}
+gboolean all_disabled(KbdledsPlugin *kbdleds) {
+ return !kbdleds->show_caps && !kbdleds->show_num && !kbdleds->show_scroll;
+}
+
+void check_disabled(KbdledsPlugin *kbdleds, GtkWidget *check_button) {
+ if (!all_disabled(kbdleds)) {
+ kbdleds_save (kbdleds->plugin, kbdleds);
+ refresh();
+ } else {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button), TRUE);
+ }
+}
+
+static void change_visibility_caps(GtkWidget *check_button, KbdledsPlugin
*kbdleds)
+{
+ kbdleds->show_caps =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_button));
+ check_disabled(kbdleds, check_button);
+}
+
+static void change_visibility_num(GtkWidget *check_button, KbdledsPlugin
*kbdleds)
+{
+ kbdleds->show_num =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_button));
+ check_disabled(kbdleds, check_button);
+}
+
+static void change_visibility_scroll(GtkWidget *check_button, KbdledsPlugin
*kbdleds)
+{
+ kbdleds->show_scroll =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_button));
+ check_disabled(kbdleds, check_button);
+}
+
void
kbdleds_configure (XfcePanelPlugin *plugin,
- kbdledsPlugin *kbdleds)
+ KbdledsPlugin *kbdleds)
{
GtkWidget *dialog;
GtkBox *global_vbox, *foreground_vbox, *background_vbox;
GtkLabel *foreground_label, *background_label;
GtkColorButton *foreground_button, *background_button;
+ GtkCheckButton *toggle_caps, *toggle_num, *toggle_scroll;
+ GtkWidget *separator;
/* block the plugin menu */
xfce_panel_plugin_block_menu (plugin);
@@ -95,10 +132,12 @@
dialog = xfce_titled_dialog_new_with_buttons (_("Kbdleds Plugin"),
GTK_WINDOW
(gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
GTK_DIALOG_DESTROY_WITH_PARENT,
- "gtk-help", GTK_RESPONSE_HELP,
- "gtk-close", GTK_RESPONSE_OK,
NULL);
+ /* add buttons */
+ gtk_dialog_add_button(GTK_DIALOG(dialog), _("Help"), GTK_RESPONSE_HELP);
+ gtk_dialog_add_button(GTK_DIALOG(dialog), _("Close"), GTK_RESPONSE_OK);
+
/* center dialog on the screen */
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
@@ -146,6 +185,26 @@
gtk_widget_show(GTK_WIDGET(background_button));
gtk_box_pack_start(GTK_BOX(background_vbox), GTK_WIDGET(background_button),
FALSE, FALSE, 0);
+ /* Separator */
+ separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
+ gtk_widget_show(separator);
+ gtk_container_add(GTK_CONTAINER (global_vbox), separator);
+
+ /* Visibility toggle buttons */
+ toggle_caps = GTK_CHECK_BUTTON(gtk_check_button_new_with_label (_("Show Caps
Lock indicator")));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_caps),
kbdleds->show_caps);
+ gtk_widget_show(GTK_WIDGET(toggle_caps));
+ gtk_container_add (GTK_CONTAINER (global_vbox), GTK_WIDGET(toggle_caps));
+
+ toggle_num = GTK_CHECK_BUTTON(gtk_check_button_new_with_label (_("Show Num
Lock indicator")));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_num),
kbdleds->show_num);
+ gtk_widget_show(GTK_WIDGET(toggle_num));
+ gtk_container_add (GTK_CONTAINER (global_vbox), GTK_WIDGET(toggle_num));
+
+ toggle_scroll = GTK_CHECK_BUTTON(gtk_check_button_new_with_label (_("Show
Scroll Lock indicator")));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_scroll),
kbdleds->show_scroll);
+ gtk_widget_show(GTK_WIDGET(toggle_scroll));
+ gtk_container_add (GTK_CONTAINER (global_vbox), GTK_WIDGET(toggle_scroll));
/* connect the reponse signal to the dialog */
g_signal_connect (G_OBJECT (dialog), "response",
@@ -157,6 +216,14 @@
g_signal_connect (GTK_WIDGET(background_button), "color-set",
G_CALLBACK(change_background_color), kbdleds);
+ g_signal_connect (GTK_WIDGET(toggle_caps), "toggled",
+ G_CALLBACK (change_visibility_caps), kbdleds);
+
+ g_signal_connect (GTK_WIDGET(toggle_num), "toggled",
+ G_CALLBACK (change_visibility_num), kbdleds);
+
+ g_signal_connect (GTK_WIDGET(toggle_scroll), "toggled",
+ G_CALLBACK (change_visibility_scroll), kbdleds);
/* show the entire dialog */
gtk_widget_show (dialog);
}
@@ -182,7 +249,7 @@
"program-name", PACKAGE_NAME,
"comments", _("Kbdleds Plugin"),
"website", PLUGIN_WEBSITE,
- "copyright", "Copyright \xc2\xa9 2011-2021 OCo\n",
+ "copyright", "Copyright \xc2\xa9 2011-2024 OCo\n",
"authors", auth,
NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/kbdleds-dialogs.h
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/kbdleds-dialogs.h
---
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/kbdleds-dialogs.h
2021-11-02 20:15:44.000000000 +0100
+++
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/kbdleds-dialogs.h
2024-05-29 17:12:36.000000000 +0200
@@ -1,6 +1,6 @@
/* xfce4-kbdleds-plugin - panel plugin for keyboard LEDs
*
- * Copyright (c) 2011-2021 OCo <[email protected]>
+ * Copyright (c) 2011-2024 OCo <[email protected]>
*
* 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
@@ -24,7 +24,7 @@
void
kbdleds_configure (XfcePanelPlugin *plugin,
- kbdledsPlugin *kbdleds);
+ KbdledsPlugin *kbdleds);
void
kbdleds_about (XfcePanelPlugin *plugin);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/kbdleds.c
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/kbdleds.c
--- old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/kbdleds.c
2021-11-02 20:15:44.000000000 +0100
+++ new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/kbdleds.c
2024-05-29 17:12:36.000000000 +0200
@@ -1,6 +1,6 @@
/* xfce4-kbdleds-plugin - panel plugin for keyboard LEDs
*
- * Copyright (c) 2011-2021 OCo <[email protected]>
+ * Copyright (c) 2011-2024 OCo <[email protected]>
*
* 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
@@ -26,39 +26,22 @@
#include <ctype.h>
-#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
-#include <libxfce4panel/libxfce4panel.h>
-#include <X11/XKBlib.h>
-
#include "kbdleds.h"
#include "kbdleds-dialogs.h"
#include "xkbleds.h"
-kbdledsPlugin *kbdleds;
+KbdledsPlugin *kbdledsplugin;
/* prototypes */
-static void
-kbdleds_construct (XfcePanelPlugin *plugin);
+static void kbdleds_construct (XfcePanelPlugin *plugin);
+gchar* getHexColor(GdkRGBA rgba);
/* register the plugin */
XFCE_PANEL_PLUGIN_REGISTER (kbdleds_construct);
-void show_error(gchar *message) {
- GtkDialogFlags flags = GTK_DIALOG_DESTROY_WITH_PARENT;
- GtkWidget *dialog = gtk_message_dialog_new (NULL,
- flags,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "%s",
- message);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-}
-
void
kbdleds_save (XfcePanelPlugin *plugin,
- kbdledsPlugin *kbdleds)
+ KbdledsPlugin *kbdleds)
{
XfceRc *rc;
gchar *file;
@@ -77,8 +60,11 @@
g_free (file);
if (G_LIKELY (rc != NULL)) {
- xfce_rc_write_entry (rc, "Foreground_Color",
gdk_rgba_to_string(&kbdleds->foreground_color));
- xfce_rc_write_entry (rc, "Background_Color",
gdk_rgba_to_string(&kbdleds->background_color));
+ xfce_rc_write_entry(rc, "Foreground_Color",
gdk_rgba_to_string(&kbdleds->foreground_color));
+ xfce_rc_write_entry(rc, "Background_Color",
gdk_rgba_to_string(&kbdleds->background_color));
+ xfce_rc_write_bool_entry(rc, "Show_Caps", kbdleds->show_caps);
+ xfce_rc_write_bool_entry(rc, "Show_Num", kbdleds->show_num);
+ xfce_rc_write_bool_entry(rc, "Show_Scroll", kbdleds->show_scroll);
/* close the rc file */
xfce_rc_close (rc);
@@ -86,7 +72,7 @@
}
static void
-kbdleds_read (kbdledsPlugin *kbdleds)
+kbdleds_read (KbdledsPlugin *kbdleds)
{
XfceRc *rc;
gchar *file;
@@ -116,6 +102,10 @@
gdk_rgba_parse(&kbdleds->background_color, DEFAULT_BACKGROUND_COLOR);
}
+ kbdleds->show_caps = xfce_rc_read_bool_entry(rc, "Show_Caps", TRUE);
+ kbdleds->show_num = xfce_rc_read_bool_entry(rc, "Show_Num", TRUE);
+ kbdleds->show_scroll = xfce_rc_read_bool_entry(rc, "Show_Scroll", TRUE);
+
/* cleanup */
xfce_rc_close (rc);
@@ -129,17 +119,19 @@
gdk_rgba_parse(&kbdleds->foreground_color, DEFAULT_FOREGROUND_COLOR);
gdk_rgba_parse(&kbdleds->background_color, DEFAULT_BACKGROUND_COLOR);
+ kbdleds->show_caps = TRUE;
+ kbdleds->show_num = TRUE;
+ kbdleds->show_scroll = TRUE;
}
-static kbdledsPlugin *
+static KbdledsPlugin *
kbdleds_new (XfcePanelPlugin *plugin)
{
- kbdledsPlugin *kbdleds;
+ KbdledsPlugin *kbdleds;
GtkOrientation orientation;
- GtkWidget *label;
/* allocate memory for the plugin structure */
- kbdleds = g_slice_new0 (kbdledsPlugin);
+ kbdleds = g_slice_new0 (KbdledsPlugin);
/* pointer to plugin */
kbdleds->plugin = plugin;
@@ -169,7 +161,7 @@
static void
kbdleds_free (XfcePanelPlugin *plugin,
- kbdledsPlugin *kbdleds)
+ KbdledsPlugin *kbdleds)
{
GtkWidget *dialog;
@@ -189,14 +181,14 @@
xkbleds_finish();
/* free the plugin structure */
- g_slice_free (kbdledsPlugin, kbdleds);
+ g_slice_free (KbdledsPlugin, kbdleds);
}
static void
kbdleds_orientation_changed (XfcePanelPlugin *plugin,
GtkOrientation orientation,
- kbdledsPlugin *kbdleds)
+ KbdledsPlugin *kbdleds)
{
/* change the orienation of the box */
gtk_orientable_set_orientation(GTK_ORIENTABLE(kbdleds->hvbox), orientation);
@@ -205,7 +197,7 @@
static gboolean
kbdleds_size_changed (XfcePanelPlugin *plugin,
gint size,
- kbdledsPlugin *kbdleds)
+ KbdledsPlugin *kbdleds)
{
GtkOrientation orientation;
@@ -226,48 +218,53 @@
return g_strdup_printf("#%02X%02X%02X", (int)(rgba.red*255),
(int)(rgba.green*255), (int)(rgba.blue*255));
}
-void refresh() {
+void refresh(void) {
int i;
- gchar *str;
gchar *template_on="<span background=\"%s\" foreground=\"%s\">%c</span>";
gchar *template_off="%c";
gchar *led_labels[NUM_LEDS + 1];
gchar *tooltip_labels[NUM_LEDS + 1];
+ int tooltip_count = 0;
gchar *on_off[2]={_("OFF"),_("ON")};
gchar *tooltip_str={""};
gchar *label_str={""};
+ gchar *fColor = getHexColor(kbdledsplugin->foreground_color);
+ gchar *bColor = getHexColor(kbdledsplugin->background_color);
+ gboolean visible[NUM_LEDS] = {kbdledsplugin->show_caps,
kbdledsplugin->show_num, kbdledsplugin->show_scroll};
for(i = 0; i < NUM_LEDS; i++) {
- led_labels[i] = g_strdup_printf("%s : %s", lock_names[i], xkb_leds[i] ?
on_off[1] : on_off[0]);
-
- if (xkb_leds[i]) {
- gchar *fColor = getHexColor(kbdleds->foreground_color);
- gchar *bColor = getHexColor(kbdleds->background_color);
-
- tooltip_labels[i] = g_strdup_printf(template_on, bColor, fColor,
toupper(short_lock_names[i]));
-
- g_free(bColor);
- g_free(fColor);
+ if (visible[i]) {
+ tooltip_labels[tooltip_count] = g_strdup_printf("%s : %s",
lock_names[i], xkb_leds[i] ? on_off[1] : on_off[0]);
+ tooltip_count++;
+ if (xkb_leds[i]) {
+ led_labels[i] = g_strdup_printf(template_on, bColor, fColor,
toupper(short_lock_names[i]));
+ } else {
+ led_labels[i] = g_strdup_printf(template_off, short_lock_names[i]);
+ }
} else {
- tooltip_labels[i] = g_strdup_printf(template_off, short_lock_names[i]);
+ led_labels[i] = g_strdup("");
}
}
led_labels[NUM_LEDS] = NULL;
- tooltip_labels[NUM_LEDS] = NULL;
+ tooltip_labels[tooltip_count] = NULL;
- tooltip_str = g_strjoinv("\n", led_labels);
- label_str = g_strjoinv(NULL, tooltip_labels);
+ tooltip_str = g_strjoinv("\n", tooltip_labels);
+ label_str = g_strjoinv(NULL, led_labels);
- gtk_label_set_markup((GtkLabel*)kbdleds->label, label_str);
- gtk_widget_set_tooltip_text(kbdleds->label, tooltip_str);
+ gtk_label_set_markup((GtkLabel*)kbdledsplugin->label, label_str);
+ gtk_widget_set_tooltip_text(kbdledsplugin->label, tooltip_str);
for(i = 0; i < NUM_LEDS; i++) {
g_free(led_labels[i]);
- g_free(tooltip_labels[i]);
+ if (i < tooltip_count) {
+ g_free(tooltip_labels[i]);
+ }
}
g_free(tooltip_str);
g_free(label_str);
+ g_free(bColor);
+ g_free(fColor);
}
static void
@@ -278,31 +275,31 @@
xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
/* create the plugin */
- kbdleds = kbdleds_new (plugin);
+ kbdledsplugin = kbdleds_new (plugin);
/* add the ebox to the panel */
- gtk_container_add (GTK_CONTAINER (plugin), kbdleds->ebox);
+ gtk_container_add (GTK_CONTAINER (plugin), kbdledsplugin->ebox);
/* show the panel's right-click menu on this ebox */
- xfce_panel_plugin_add_action_widget (plugin, kbdleds->ebox);
+ xfce_panel_plugin_add_action_widget (plugin, kbdledsplugin->ebox);
/* connect plugin signals */
g_signal_connect (G_OBJECT (plugin), "free-data",
- G_CALLBACK (kbdleds_free), kbdleds);
+ G_CALLBACK (kbdleds_free), kbdledsplugin);
g_signal_connect (G_OBJECT (plugin), "save",
- G_CALLBACK (kbdleds_save), kbdleds);
+ G_CALLBACK (kbdleds_save), kbdledsplugin);
g_signal_connect (G_OBJECT (plugin), "size-changed",
- G_CALLBACK (kbdleds_size_changed), kbdleds);
+ G_CALLBACK (kbdleds_size_changed), kbdledsplugin);
g_signal_connect (G_OBJECT (plugin), "orientation-changed",
- G_CALLBACK (kbdleds_orientation_changed), kbdleds);
+ G_CALLBACK (kbdleds_orientation_changed), kbdledsplugin);
/* show the configure menu item and connect signal */
xfce_panel_plugin_menu_show_configure (plugin);
g_signal_connect (G_OBJECT (plugin), "configure-plugin",
- G_CALLBACK (kbdleds_configure), kbdleds);
+ G_CALLBACK (kbdleds_configure), kbdledsplugin);
/* show the about menu item and connect signal */
xfce_panel_plugin_menu_show_about (plugin);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/kbdleds.h
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/kbdleds.h
--- old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/kbdleds.h
2021-11-02 20:15:44.000000000 +0100
+++ new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/kbdleds.h
2024-05-29 17:12:36.000000000 +0200
@@ -1,6 +1,6 @@
/* xfce4-kbdleds-plugin - panel plugin for keyboard LEDs
*
- * Copyright (c) 2011-2021 OCo <[email protected]>
+ * Copyright (c) 2011-2024 OCo <[email protected]>
*
* 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
@@ -20,6 +20,11 @@
#ifndef __KBDLEDS_H__
#define __KBDLEDS_H__
+#include <gtk/gtk.h>
+#include <libxfce4util/libxfce4util.h>
+#include <libxfce4panel/libxfce4panel.h>
+#include <X11/XKBlib.h>
+
G_BEGIN_DECLS
/* plugin structure */
@@ -35,16 +40,19 @@
/* kbdleds settings */
GdkRGBA foreground_color;
GdkRGBA background_color;
+ gboolean show_caps;
+ gboolean show_num;
+ gboolean show_scroll;
}
-kbdledsPlugin;
+KbdledsPlugin;
/* default settings */
-static gchar* DEFAULT_FOREGROUND_COLOR = "#000000";
-static gchar* DEFAULT_BACKGROUND_COLOR = "#00FF00";
+#define DEFAULT_FOREGROUND_COLOR "#000000"
+#define DEFAULT_BACKGROUND_COLOR "#00FF00"
void
kbdleds_save (XfcePanelPlugin *plugin,
- kbdledsPlugin *kbdleds);
+ KbdledsPlugin *kbdleds);
void show_error(gchar *message);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/xkbleds.c
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/xkbleds.c
--- old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/xkbleds.c
2021-11-02 20:15:44.000000000 +0100
+++ new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/xkbleds.c
2024-05-29 17:12:36.000000000 +0200
@@ -1,6 +1,6 @@
/* xfce4-kbdleds-plugin - panel plugin for keyboard LEDs
*
- * Copyright (c) 2011-2021 OCo <[email protected]>
+ * Copyright (c) 2011-2024 OCo <[email protected]>
*
* 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
@@ -25,6 +25,7 @@
#include <gdk/gdkx.h>
#include <xkbleds.h>
+#include <kbdleds.h>
int xkb_leds[NUM_LEDS] = {0,0,0};
int xkb_state = -1;
@@ -38,6 +39,10 @@
int i;
int masks[NUM_LEDS]; /* NUM, CAPS, SCROLL: indicator mask, for XKB*/
+void xkbleds_get_initial_state(Display *d);
+GdkFilterReturn kbd_msg_filter_func(GdkXEvent *xevent, GdkEvent *event,
gpointer data);
+
+
void xkbleds_get_initial_state(Display *d) {
if (XkbGetIndicatorState(d, XkbUseCoreKbd, &states) != Success) {
@@ -77,13 +82,11 @@
}
// 0 - Success
-int xkbleds_init()
+int xkbleds_init(void)
{
- KeyCode keys[NUM_LEDS];
XkbDescPtr xkb;
char *ind_name = NULL;
int j, mask;
- int idx[NUM_LEDS];/* NUM, CAPS, SCROLL: indicator index, for XKB */
GdkDisplay *disp;
Display *d;
int opcode = 0, errorBase = 0, major = XkbMajorVersion, minor =
XkbMinorVersion;
@@ -103,10 +106,6 @@
return 1;
}
-// get keycodes
- for (i = 0; i < NUM_LEDS; i++) {
- keys[i] = XKeysymToKeycode(d, key_syms[i]);
- }
// get the keyboard
xkb = XkbAllocKeyboard();
if (!xkb) {
@@ -126,7 +125,6 @@
if (ind_name && !strcmp(lock_names[j], ind_name)){
if (XkbGetNamedIndicator(d, xkb->names->indicators[i], &mask, NULL,
NULL, NULL) == True) {
masks[j] = 1 << mask;
- idx[j] = mask;
} else {
XkbFreeKeyboard(xkb, 0, True);
return 1;
@@ -147,7 +145,7 @@
return 0;
}
-void xkbleds_finish()
+void xkbleds_finish(void)
{
gdk_window_remove_filter(NULL, kbd_msg_filter_func, NULL);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/xkbleds.h
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/xkbleds.h
--- old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/panel-plugin/xkbleds.h
2021-11-02 20:15:44.000000000 +0100
+++ new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/panel-plugin/xkbleds.h
2024-05-29 17:12:36.000000000 +0200
@@ -1,6 +1,6 @@
/* xfce4-kbdleds-plugin - panel plugin for keyboard LEDs
*
- * Copyright (c) 2011-2021 OCo <[email protected]>
+ * Copyright (c) 2011-2024 OCo <[email protected]>
*
* 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
@@ -31,7 +31,6 @@
int xkbleds_init();
void xkbleds_finish();
-void refresh();
G_END_DECLS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/po/Makefile.in.in
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/po/Makefile.in.in
--- old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/po/Makefile.in.in
2021-11-02 20:15:44.000000000 +0100
+++ new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/po/Makefile.in.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,222 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <[email protected]>
-# Copyright (C) 2004-2008 Rodney Dawes <[email protected]>
-#
-# This file may be copied and used freely without restrictions. It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <[email protected]> to use GETTEXT_PACKAGE
-# instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <[email protected]> to install
-# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <[email protected]> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-localedir = @localedir@
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT_ARGS = @XGETTEXT_ARGS@
-XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS)
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)"
INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir)
$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)"
INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir)
$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#"
$(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)";
ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep
\^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' '
'\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then
LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then
LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in
$$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf
"$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf
"$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
-INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
-INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
-
-.po.pox:
- $(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
- $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
-
-.po.gmo:
- $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
- sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
- $(GENPOT)
-
-install: install-data
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- $(mkdir_p) $$dir; \
- if test -r $$lang.gmo; then \
- $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
- else \
- $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $(srcdir)/$$lang.gmo as" \
- "$$dir/$(GETTEXT_PACKAGE).mo"; \
- fi; \
- if test -r $$lang.gmo.m; then \
- $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
- else \
- if test -r $(srcdir)/$$lang.gmo.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
- $$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $(srcdir)/$$lang.gmo.m as" \
- "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
- else \
- true; \
- fi; \
- fi; \
- done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
- done
-
-check: all $(GETTEXT_PACKAGE).pot
- rm -f missing notexist
- srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
- if [ -r missing -o -r notexist ]; then \
- exit 1; \
- fi
-
-mostlyclean:
- rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
- rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
- rm -f Makefile Makefile.in POTFILES stamp-it
- rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
- rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
- dists="$(DISTFILES)"; \
- extra_dists="$(EXTRA_DISTFILES)"; \
- for file in $$extra_dists; do \
- test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
- done; \
- for file in $$dists; do \
- test -f $$file || file="$(srcdir)/$$file"; \
- ln $$file $(distdir) 2> /dev/null \
- || cp -p $$file $(distdir); \
- done
-
-update-po: Makefile
- $(MAKE) $(GETTEXT_PACKAGE).pot
- tmpdir=`pwd`; \
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- echo "$$lang:"; \
- result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
- if $$result; then \
- if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1;
then \
- rm -f $$tmpdir/$$lang.new.po; \
- else \
- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
- :; \
- else \
- echo "msgmerge for $$lang.po failed: cannot move
$$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
- rm -f $$tmpdir/$$lang.new.po; \
- exit 1; \
- fi; \
- fi; \
- else \
- echo "msgmerge for $$lang.gmo failed!"; \
- rm -f $$tmpdir/$$lang.new.po; \
- fi; \
- done
-
-Makefile POTFILES: stamp-it
- @if test ! -f $@; then \
- rm -f stamp-it; \
- $(MAKE) stamp-it; \
- fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
- $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/po/ru.po
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/po/ru.po
--- old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/po/ru.po
2021-11-02 20:15:44.000000000 +0100
+++ new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/po/ru.po
2024-05-29 17:12:36.000000000 +0200
@@ -7,45 +7,67 @@
msgstr ""
"Project-Id-Version: xfce4-kbdleds-plugin 0.0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-26 15:10+0300\n"
-"PO-Revision-Date: 2019-09-26 15:17+0300\n"
+"POT-Creation-Date: 2024-05-29 18:03+0300\n"
+"PO-Revision-Date: 2024-05-29 18:06+0300\n"
"Last-Translator: Oleg Voronin <[email protected]>\n"
"Language-Team: ÑÑÑÑкий <>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Gtranslator 3.32.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 3.4\n"
-#: ../panel-plugin/kbdleds.c:238
+#: ../panel-plugin/kbdleds.c:228
msgid "OFF"
msgstr "ÐЫÐÐ"
-#: ../panel-plugin/kbdleds.c:238
+#: ../panel-plugin/kbdleds.c:228
msgid "ON"
msgstr "ÐÐÐ"
-#: ../panel-plugin/kbdleds-dialogs.c:49
+#: ../panel-plugin/kbdleds-dialogs.c:53
#, c-format
msgid "Unable to open the following url: %s"
msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð¾ÑкÑÑÑÑ Ð°Ð´ÑеÑ: %s"
#. create the dialog
-#: ../panel-plugin/kbdleds-dialogs.c:95 ../panel-plugin/kbdleds-dialogs.c:183
+#: ../panel-plugin/kbdleds-dialogs.c:132 ../panel-plugin/kbdleds-dialogs.c:250
#: ../panel-plugin/kbdleds.desktop.in.h:1
msgid "Kbdleds Plugin"
msgstr "ÐодÑÐ»Ñ Ð¸Ð½Ð´Ð¸ÐºÐ°ÑоÑов клавиаÑÑÑÑ"
-#: ../panel-plugin/kbdleds-dialogs.c:122
+#. add buttons
+#: ../panel-plugin/kbdleds-dialogs.c:138
+msgid "Help"
+msgstr "ÐомоÑÑ"
+
+#: ../panel-plugin/kbdleds-dialogs.c:139
+msgid "Close"
+msgstr "ÐакÑÑÑÑ"
+
+#: ../panel-plugin/kbdleds-dialogs.c:161
msgid "Active Foreground Color"
msgstr "ÐкÑивнÑй ÑвеÑ"
-#: ../panel-plugin/kbdleds-dialogs.c:138
+#: ../panel-plugin/kbdleds-dialogs.c:177
msgid "Active Background Color"
msgstr "ÐкÑивнÑй ÑÐ²ÐµÑ Ñона"
+#. Visibility toggle buttons
+#: ../panel-plugin/kbdleds-dialogs.c:194
+msgid "Show Caps Lock indicator"
+msgstr "ÐоказаÑÑ Ð¸Ð½Ð´Ð¸ÐºÐ°ÑÐ¾Ñ Caps Lock"
+
+#: ../panel-plugin/kbdleds-dialogs.c:199
+msgid "Show Num Lock indicator"
+msgstr "ÐоказаÑÑ Ð¸Ð½Ð´Ð¸ÐºÐ°ÑÐ¾Ñ Num Lock"
+
+#: ../panel-plugin/kbdleds-dialogs.c:204
+msgid "Show Scroll Lock indicator"
+msgstr "ÐоказаÑÑ Ð¸Ð½Ð´Ð¸ÐºÐ°ÑÐ¾Ñ Scroll Lock"
+
#: ../panel-plugin/kbdleds.desktop.in.h:2
msgid "Keyboard LEDs plugin for the Xfce panel"
msgstr "ÐодÑÐ»Ñ Ð¸Ð½Ð´Ð¸ÐºÐ°ÑоÑов клавиаÑÑÑÑ Ð´Ð»Ñ
панели Xfce"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/po/uk.po
new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/po/uk.po
--- old/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.2.5/po/uk.po
2021-11-02 20:15:44.000000000 +0100
+++ new/xfce4-kbdleds-plugin-xfce4-kbdleds-plugin-0.3.0/po/uk.po
2024-05-29 17:12:36.000000000 +0200
@@ -7,45 +7,67 @@
msgstr ""
"Project-Id-Version: xfce4-kbdleds-plugin 0.0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-26 15:10+0300\n"
-"PO-Revision-Date: 2019-09-26 15:17+0300\n"
+"POT-Creation-Date: 2024-05-29 18:03+0300\n"
+"PO-Revision-Date: 2024-05-29 18:04+0300\n"
"Last-Translator: Oleg Voronin <[email protected]>\n"
"Language-Team: ÑÑÑÑкий <>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Gtranslator 3.32.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 3.4\n"
-#: ../panel-plugin/kbdleds.c:238
+#: ../panel-plugin/kbdleds.c:228
msgid "OFF"
msgstr "ÐÐÐÐ"
-#: ../panel-plugin/kbdleds.c:238
+#: ../panel-plugin/kbdleds.c:228
msgid "ON"
msgstr "ÐÐÐ"
-#: ../panel-plugin/kbdleds-dialogs.c:49
+#: ../panel-plugin/kbdleds-dialogs.c:53
#, c-format
msgid "Unable to open the following url: %s"
msgstr "Ðе Ð¼Ð¾Ð¶Ñ Ð²ÑдкÑиÑи поÑиланнÑ: %s"
#. create the dialog
-#: ../panel-plugin/kbdleds-dialogs.c:95 ../panel-plugin/kbdleds-dialogs.c:183
+#: ../panel-plugin/kbdleds-dialogs.c:132 ../panel-plugin/kbdleds-dialogs.c:250
#: ../panel-plugin/kbdleds.desktop.in.h:1
msgid "Kbdleds Plugin"
msgstr "ÐодÑÐ»Ñ ÑндикаÑоÑÑв клавÑаÑÑÑи"
-#: ../panel-plugin/kbdleds-dialogs.c:122
+#. add buttons
+#: ../panel-plugin/kbdleds-dialogs.c:138
+msgid "Help"
+msgstr "Ðопомога"
+
+#: ../panel-plugin/kbdleds-dialogs.c:139
+msgid "Close"
+msgstr "ÐакÑиÑи"
+
+#: ../panel-plugin/kbdleds-dialogs.c:161
msgid "Active Foreground Color"
msgstr "ÐкÑивний колÑÑ"
-#: ../panel-plugin/kbdleds-dialogs.c:138
+#: ../panel-plugin/kbdleds-dialogs.c:177
msgid "Active Background Color"
msgstr "ÐкÑивний колÑÑ ÑонÑ"
+#. Visibility toggle buttons
+#: ../panel-plugin/kbdleds-dialogs.c:194
+msgid "Show Caps Lock indicator"
+msgstr "ÐоказаÑи ÑндикаÑÐ¾Ñ Caps Lock"
+
+#: ../panel-plugin/kbdleds-dialogs.c:199
+msgid "Show Num Lock indicator"
+msgstr "ÐоказаÑи ÑндикаÑÐ¾Ñ Num Lock"
+
+#: ../panel-plugin/kbdleds-dialogs.c:204
+msgid "Show Scroll Lock indicator"
+msgstr "ÐоказаÑи ÑндикаÑÐ¾Ñ Scroll Lock"
+
#: ../panel-plugin/kbdleds.desktop.in.h:2
msgid "Keyboard LEDs plugin for the Xfce panel"
msgstr "ÐодÑÐ»Ñ ÑндикаÑоÑÑв клавÑаÑÑÑи длÑ
Ð¿Ð°Ð½ÐµÐ»Ñ Xfce"
