Hello community, here is the log from the commit of package libmatekbd for openSUSE:Factory checked in at 2017-04-11 09:48:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmatekbd (Old) and /work/SRC/openSUSE:Factory/.libmatekbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmatekbd" Tue Apr 11 09:48:57 2017 rev:13 rq:487012 version:1.18.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libmatekbd/libmatekbd.changes 2017-03-20 17:11:29.549521884 +0100 +++ /work/SRC/openSUSE:Factory/.libmatekbd.new/libmatekbd.changes 2017-04-11 09:49:00.308517390 +0200 @@ -1,0 +2,18 @@ +Mon Apr 10 10:00:19 UTC 2017 - [email protected] + +- Update to version 1.18.2 (changes since 1.18.0): + * matekbd-indicator: Do not use deprecated gdk_cairo_create. + * A fix for a strange GtkIconInfo behaviour. + * matekbd-indicator: Do not use deprecated GtkAlignment. + * keyboard-drawing: Set a CSS name matekbd-keyboard-drawing. + * Slightly increase the font size for the key labels. + * matekbd-keyboard-drawing: Don't unset double buffering. + * matekbd-keyboard-drawing: Handle XkbGetKeyboard() failing. + * matekbd-keyboard-drawing: Prevent gtk+ keynav from taking + focus away. + * Fix some introspection warnings. + * show-layout.ui: Do not use deprecated widgets. + * UI: Expand kbdraw vertically. + * Update translations. + +------------------------------------------------------------------- Old: ---- libmatekbd-1.18.0.tar.xz New: ---- libmatekbd-1.18.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmatekbd.spec ++++++ --- /var/tmp/diff_new_pack.ksUjEp/_old 2017-04-11 09:49:00.876437164 +0200 +++ /var/tmp/diff_new_pack.ksUjEp/_new 2017-04-11 09:49:00.880436599 +0200 @@ -20,7 +20,7 @@ %define _version 1.18 %define sover 4 Name: libmatekbd -Version: 1.18.0 +Version: 1.18.2 Release: 0 Summary: MATE Desktop keyboard configuration libraries License: LGPL-2.1+ ++++++ libmatekbd-1.18.0.tar.xz -> libmatekbd-1.18.2.tar.xz ++++++ ++++ 1716 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/ChangeLog new/libmatekbd-1.18.2/ChangeLog --- old/libmatekbd-1.18.0/ChangeLog 2017-03-12 13:03:26.000000000 +0100 +++ new/libmatekbd-1.18.2/ChangeLog 2017-04-09 21:17:37.000000000 +0200 @@ -1,3 +1,206 @@ +commit 6eef18810d3b87490ec63d8aee0eb20d1b2a5bdd +Author: raveit65 <[email protected]> +Date: Sun Apr 9 21:16:15 2017 +0200 + + release 1.18.2 + + NEWS | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 089b7f46324bf071d8ddce1e15766083642e2f07 +Author: raveit65 <[email protected]> +Date: Sun Apr 9 21:12:45 2017 +0200 + + sync with transifex + + po/ar.po | 9 +++++---- + po/kk.po | 29 +++++++++++++++-------------- + po/lt.po | 18 +++++++++--------- + po/pt.po | 6 +++--- + 4 files changed, 32 insertions(+), 30 deletions(-) + +commit a2c14a672309d3b34890344b5375d0c8dff796d8 +Author: Alexei Sorokin <[email protected]> +Date: Sat Apr 8 23:41:31 2017 +0300 + + matekbd-indicator: Don't expand + + Causes problems with mate-screensaver. + + libmatekbd/matekbd-indicator.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 5d6248f915fecccd7fd3cba9858ef47ed10d5d77 +Author: Martin Wimpress <[email protected]> +Date: Thu Apr 6 16:07:27 2017 +0100 + + Bump version to 1.18.1 + + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit f72cb3d12d794beedab5bb392506b54c1b5d1a2c +Author: raveit65 <[email protected]> +Date: Mon Apr 3 16:13:44 2017 +0200 + + matekbd-indicator: don't use deprecated gdk_cairo_create + + Expose event is changed to draw + + partial taken from: + https://git.gnome.org/browse/libgnomekbd/commit/?id=16c6c2b + + libmatekbd/matekbd-indicator.c | 25 +++++++++---------------- + 1 file changed, 9 insertions(+), 16 deletions(-) + +commit 303e86ed31a12d44592b3a688d2584a6bd9304ff +Author: raveit65 <[email protected]> +Date: Mon Apr 3 15:47:36 2017 +0200 + + Fix for strange GtkIconInfo behaviour + + Sometimes you can get an icon without filename. Odd + + taken from: + https://git.gnome.org/browse/libgnomekbd/commit/?id=44e2396 + + libmatekbd/matekbd-indicator-config.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 4e78638051b25a3fb6ff2ce47ff9a42f711f4982 +Author: raveit65 <[email protected]> +Date: Sun Apr 2 19:02:12 2017 +0200 + + matekbd-indicator: don't use deprecated GtkAlignment + + libmatekbd/matekbd-indicator.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit e0e5650c8889586f91f7794272bd26f247971852 +Author: raveit65 <[email protected]> +Date: Sun Apr 2 15:00:44 2017 +0200 + + keyboard-drawing: set css name matekbd-keyboard-drawing + + Needed to avoid using wildcards in themes for styling + selected bg on pressed keys on 'widget' css name. + + libmatekbd/matekbd-keyboard-drawing.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 8d7526cba768a3626ede09b601efe95e2739f80e +Author: raveit65 <[email protected]> +Date: Sun Apr 2 12:34:12 2017 +0200 + + Slightly increase the font size for the key labels + + It was 10, it is 12 now + https://bugzilla.gnome.org/show_bug.cgi?id=642903 + + taken from: + https://git.gnome.org/browse/libgnomekbd/commit/?id=efb1354 + + libmatekbd/matekbd-keyboard-drawing.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 47098e99757a01e599e03cceb1e637bf757101e9 +Author: raveit65 <[email protected]> +Date: Sun Apr 2 11:44:13 2017 +0200 + + matekbd-keyboard-drawing: Don't unset double buffering + + It's not needed with modern gtk+ . + + taken from: + https://git.gnome.org/browse/libgnomekbd/commit/?id=ae83b72 + + libmatekbd/matekbd-keyboard-drawing.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 2f12b7ca7d63e8eef0943a99179f31abde1d3282 +Author: raveit65 <[email protected]> +Date: Sun Apr 2 08:32:38 2017 +0200 + + matekbd-keyboard-drawing: Handle XkbGetKeyboard() failing + + XkbGetKeyboard() might fail but we might still be able to work with a + XkbGetKeyboardByName() later in gkbd_keyboard_drawing_set_keyboard() + so don't abort the initialization if it fails. + + taken from: + https://git.gnome.org/browse/libgnomekbd/commit/?id=5f260b2 + + libmatekbd/matekbd-keyboard-drawing.c | 27 +++++++++++++++------------ + 1 file changed, 15 insertions(+), 12 deletions(-) + +commit 0c6d56e56978500d0491f2b809e2e31287eeb98d +Author: raveit65 <[email protected]> +Date: Sun Apr 2 08:17:11 2017 +0200 + + matekbd-keyboard-drawing: Prevent gtk+ keynav from taking focus away + + We need to tell gtk+ we handled the key event otherwise gtk+ keynav + key events will move focus to the close button and it looks like the + dialog stopped working. + + taken from: + https://git.gnome.org/browse/libgnomekbd/commit/?id=648cd5a + + libmatekbd/matekbd-keyboard-drawing.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b3a06f947493002f75933117343fd8eb8e2469d5 +Author: raveit65 <[email protected]> +Date: Sun Apr 2 19:55:22 2017 +0200 + + fix some introspection warnings + + libmatekbd/matekbd-keyboard-config.c | 3 +-- + libmatekbd/matekbd-keyboard-drawing.c | 3 +++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 92299e6db966d18a0e21ef7ea38f19dc86a6912b +Author: raveit65 <[email protected]> +Date: Thu Mar 30 16:39:35 2017 +0200 + + Revert "pre-bump version" + + This reverts commit 722aeeccdbdeb68fa03e6f52f170b1b142eb54e6. + + NEWS | 2 -- + configure.ac | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit 722aeeccdbdeb68fa03e6f52f170b1b142eb54e6 +Author: raveit65 <[email protected]> +Date: Thu Mar 30 16:36:19 2017 +0200 + + pre-bump version + + NEWS | 2 ++ + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit cf440b263e6e35531d77b20da9ff2b8d0a802e57 +Author: raveit65 <[email protected]> +Date: Mon Mar 27 18:18:13 2017 +0200 + + show-layout.ui: don't use deprecated widgets + + libmatekbd/show-layout.ui | 73 ++++++++++++++++++++++++++++++----------------- + 1 file changed, 47 insertions(+), 26 deletions(-) + +commit 9b2b1973c194399c6824efb7c63815011fb5d5bf +Author: raveit65 <[email protected]> +Date: Mon Mar 27 18:16:14 2017 +0200 + + UI: expand kbdraw vertical + + libmatekbd/matekbd-keyboard-drawing.c | 1 + + 1 file changed, 1 insertion(+) + commit cdc776896fe313a995bd2f789c0ea3990e33eccb Author: raveit65 <[email protected]> Date: Sun Mar 12 13:02:10 2017 +0100 @@ -1649,10 +1852,9 @@ aclocal-1.12: warning: autoconf input should be named 'configure.ac', not 'configure.in' - autogen.sh | 2 +- - configure.ac | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - configure.in | 136 ----------------------------------------------------------- - 3 files changed, 137 insertions(+), 137 deletions(-) + autogen.sh | 2 +- + configure.in => configure.ac | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) commit 958dec506a68e41df432b1aa91c1ad229137e758 Merge: 18039ce e8282ca diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/NEWS new/libmatekbd-1.18.2/NEWS --- old/libmatekbd-1.18.0/NEWS 2017-03-12 12:49:41.000000000 +0100 +++ new/libmatekbd-1.18.2/NEWS 2017-04-09 21:15:47.000000000 +0200 @@ -1,3 +1,22 @@ +### libmatekbd 1.18.2 + + * Translations update + * don't expand mate-indicator in lock-dialog + +### libmatekbd 1.18.1 + + * matekbd-indicator: don't use deprecated gdk_cairo_create + * Fix for strange GtkIconInfo behaviour + * matekbd-indicator: don't use deprecated GtkAlignment + * keyboard-drawing: set css name matekbd-keyboard-drawing + * Slightly increase the font size for the key labels + * matekbd-keyboard-drawing: Don't unset double buffering + * matekbd-keyboard-drawing: Handle XkbGetKeyboard() failing + * matekbd-keyboard-drawing: Prevent gtk+ keynav from taking focus away + * fix some introspection warnings + * show-layout.ui: don't use deprecated widgets + * UI: expand kbdraw vertical + ### libmatekbd 1.18.0 * NEWS: use consistent, project wide, markdown-like formatting diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/configure.ac new/libmatekbd-1.18.2/configure.ac --- old/libmatekbd-1.18.0/configure.ac 2017-03-12 13:01:56.000000000 +0100 +++ new/libmatekbd-1.18.2/configure.ac 2017-04-09 21:14:12.000000000 +0200 @@ -3,7 +3,7 @@ dnl *************************************************************************** m4_define([libmatekbd_major_version], [1]) m4_define([libmatekbd_minor_version], [18]) -m4_define([libmatekbd_micro_version], [0]) +m4_define([libmatekbd_micro_version], [2]) m4_define([libmatekbd_version],[libmatekbd_major_version.libmatekbd_minor_version.libmatekbd_micro_version]) AC_INIT([libmatekbd], [libmatekbd_version], [https://github.com/mate-desktop/libmatekbd]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/libmatekbd/matekbd-indicator-config.c new/libmatekbd-1.18.2/libmatekbd/matekbd-indicator-config.c --- old/libmatekbd-1.18.0/libmatekbd/matekbd-indicator-config.c 2016-11-20 23:18:31.000000000 +0100 +++ new/libmatekbd-1.18.2/libmatekbd/matekbd-indicator-config.c 2017-04-06 15:17:57.000000000 +0200 @@ -139,7 +139,7 @@ matekbd_indicator_config_load_colors (ind_config); } -char * +gchar * matekbd_indicator_config_get_images_file (MatekbdIndicatorConfig * ind_config, MatekbdKeyboardConfig * @@ -164,6 +164,13 @@ /* probably there is something in theme? */ icon_info = gtk_icon_theme_lookup_icon (ind_config->icon_theme, l, 48, 0); + + /* Unbelievable but happens */ + if (icon_info != NULL && + gtk_icon_info_get_filename (icon_info) == NULL) { + g_object_unref (icon_info); + icon_info = NULL; + } } } } @@ -195,7 +202,7 @@ for (i = xkl_engine_get_max_num_groups (ind_config->engine); --i >= 0;) { - char *image_file = + gchar *image_file = matekbd_indicator_config_get_images_file (ind_config, kbd_config, i); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/libmatekbd/matekbd-indicator.c new/libmatekbd-1.18.2/libmatekbd/matekbd-indicator.c --- old/libmatekbd-1.18.0/libmatekbd/matekbd-indicator.c 2016-01-24 03:48:48.000000000 +0100 +++ new/libmatekbd-1.18.2/libmatekbd/matekbd-indicator.c 2017-04-09 21:10:56.000000000 +0200 @@ -251,35 +251,28 @@ } static void -flag_exposed (GtkWidget * flag, GdkEventExpose * event, GdkPixbuf * image) +draw_flag (GtkWidget * flag, cairo_t * cr, GdkPixbuf * image) { /* Image width and height */ int iw = gdk_pixbuf_get_width (image); int ih = gdk_pixbuf_get_height (image); GtkAllocation allocation; double xwiratio, ywiratio, wiratio; - cairo_t *cr; gtk_widget_get_allocation (flag, &allocation); - cr = gdk_cairo_create (event->window); - gdk_cairo_region (cr, event->region); - cairo_clip (cr); - /* widget-to-image scales, X and Y */ xwiratio = 1.0 * allocation.width / iw; ywiratio = 1.0 * allocation.height / ih; wiratio = xwiratio < ywiratio ? xwiratio : ywiratio; - /* transform cairo context */ - cairo_translate (cr, allocation.width / 2.0, allocation.height / 2.0); - cairo_scale (cr, wiratio, wiratio); - cairo_translate (cr, - iw / 2.0, - ih / 2.0); - - gdk_cairo_set_source_pixbuf (cr, image, 0, 0); - cairo_paint (cr); + /* transform cairo context */ + cairo_translate (cr, allocation.width / 2.0, allocation.height / 2.0); + cairo_scale (cr, wiratio, wiratio); + cairo_translate (cr, - iw / 2.0, - ih / 2.0); - cairo_destroy (cr); + gdk_cairo_set_source_pixbuf (cr, image, 0, 0); + cairo_paint (cr); } gchar * @@ -382,13 +375,13 @@ flag = gtk_drawing_area_new (); gtk_widget_add_events (GTK_WIDGET (flag), GDK_BUTTON_PRESS_MASK); - g_signal_connect (G_OBJECT (flag), "expose_event", - G_CALLBACK (flag_exposed), image); + g_signal_connect (G_OBJECT (flag), "draw", + G_CALLBACK (draw_flag), image); gtk_container_add (GTK_CONTAINER (ebox), flag); } else { char *lbl_title = NULL; char *layout_name = NULL; - GtkWidget *align, *label; + GtkWidget *label; static GHashTable *ln2cnt_map = NULL; layout_name = @@ -403,8 +396,13 @@ &ln2cnt_map, layout_name); - align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); label = gtk_label_new (lbl_title); + gtk_widget_set_halign (label, GTK_ALIGN_CENTER); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_widget_set_margin_start (label, 2); + gtk_widget_set_margin_end (label, 2); + gtk_widget_set_margin_top (label, 2); + gtk_widget_set_margin_bottom (label, 2); g_free (lbl_title); gtk_label_set_angle (GTK_LABEL (label), gki->priv->angle); @@ -414,10 +412,7 @@ ln2cnt_map = NULL; } - gtk_container_add (GTK_CONTAINER (align), label); - gtk_container_add (GTK_CONTAINER (ebox), align); - - gtk_container_set_border_width (GTK_CONTAINER (align), 2); + gtk_container_add (GTK_CONTAINER (ebox), label); } g_signal_connect (G_OBJECT (ebox), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/libmatekbd/matekbd-keyboard-config.c new/libmatekbd-1.18.2/libmatekbd/matekbd-keyboard-config.c --- old/libmatekbd-1.18.0/libmatekbd/matekbd-keyboard-config.c 2015-12-06 22:49:53.000000000 +0100 +++ new/libmatekbd-1.18.2/libmatekbd/matekbd-keyboard-config.c 2017-04-04 17:57:59.000000000 +0200 @@ -637,8 +637,7 @@ /** * matekbd_keyboard_config_start_listen: - * - * Func: (scope notified): a function to call when settings are changed + * @func: (scope notified): a function to call when settings are changed */ void matekbd_keyboard_config_start_listen (MatekbdKeyboardConfig * kbd_config, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/libmatekbd/matekbd-keyboard-drawing.c new/libmatekbd-1.18.2/libmatekbd/matekbd-keyboard-drawing.c --- old/libmatekbd-1.18.0/libmatekbd/matekbd-keyboard-drawing.c 2016-11-20 23:18:31.000000000 +0100 +++ new/libmatekbd-1.18.2/libmatekbd/matekbd-keyboard-drawing.c 2017-04-04 18:00:35.000000000 +0200 @@ -39,6 +39,8 @@ #define GTK_RESPONSE_PRINT 2 +#define KEY_FONT_SIZE 12 + enum { BAD_KEYCODE = 0, NUM_SIGNALS @@ -1519,7 +1521,7 @@ } pango_font_description_set_size (context->font_desc, - 720 * dpi_x * + 72 * KEY_FONT_SIZE * dpi_x * context->scale_numerator / context->scale_denominator); pango_layout_set_spacing (context->layout, @@ -1585,7 +1587,7 @@ } invalidate_key_region (drawing, key); - return FALSE; + return TRUE; } static gint @@ -1913,6 +1915,9 @@ static void alloc_cdik (MatekbdKeyboardDrawing * drawing) { + if (!drawing->xkb) + return; + drawing->physical_indicators_size = drawing->xkb->indicators->phys_indicators + 1; drawing->physical_indicators = @@ -2091,8 +2096,6 @@ drawing->track_modifiers = 0; drawing->track_config = 0; - gtk_widget_set_double_buffered (GTK_WIDGET (drawing), FALSE); - /* XXX: XkbClientMapMask | XkbIndicatorMapMask | XkbNamesMask | XkbGeometryMask */ drawing->xkb = XkbGetKeyboard (drawing->display, XkbGBN_GeometryMask | @@ -2101,13 +2104,14 @@ XkbGBN_SymbolsMask | XkbGBN_IndicatorMapMask, XkbUseCoreKbd); - if (drawing->xkb == NULL) { - g_critical - ("XkbGetKeyboard failed to get keyboard from the server!"); - return; + if (drawing->xkb) { + XkbGetNames (drawing->display, XkbAllNamesMask, drawing->xkb); + XkbSelectEventDetails (drawing->display, XkbUseCoreKbd, + XkbIndicatorStateNotify, + drawing->xkb->indicators->phys_indicators, + drawing->xkb->indicators->phys_indicators); } - XkbGetNames (drawing->display, XkbAllNamesMask, drawing->xkb); drawing->l3mod = XkbKeysymToModifiers (drawing->display, GDK_KEY_ISO_Level3_Shift); @@ -2115,11 +2119,6 @@ alloc_cdik (drawing); - XkbSelectEventDetails (drawing->display, XkbUseCoreKbd, - XkbIndicatorStateNotify, - drawing->xkb->indicators->phys_indicators, - drawing->xkb->indicators->phys_indicators); - mask = (XkbStateNotifyMask | XkbNamesNotifyMask | XkbControlsNotifyMask | XkbIndicatorMapNotifyMask | @@ -2177,6 +2176,11 @@ static void matekbd_keyboard_drawing_class_init (MatekbdKeyboardDrawingClass * klass) { +#if GTK_CHECK_VERSION (3, 20, 0) + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + gtk_widget_class_set_css_name (widget_class, "matekbd-keyboard-drawing"); +#endif + klass->bad_keycode = NULL; matekbd_keyboard_drawing_signals[BAD_KEYCODE] = @@ -2291,6 +2295,9 @@ return TRUE; } +/** + * matekbd_keyboard_drawing_set_keyboard: (skip) + */ gboolean matekbd_keyboard_drawing_set_keyboard (MatekbdKeyboardDrawing * drawing, XkbComponentNamesRec * names) @@ -2325,8 +2332,12 @@ drawing->xkbOnDisplay = TRUE; } - if (drawing->xkb == NULL) - return FALSE; + if (drawing->xkb) { + XkbSelectEventDetails (drawing->display, XkbUseCoreKbd, + XkbIndicatorStateNotify, + drawing->xkb->indicators->phys_indicators, + drawing->xkb->indicators->phys_indicators); + } alloc_cdik (drawing); @@ -2615,6 +2626,7 @@ GTK_WIDGET (gtk_builder_get_object (builder, "gswitchit_layout_view")); kbdraw = matekbd_keyboard_drawing_new (); + gtk_widget_set_vexpand (kbdraw, TRUE); snprintf (title, sizeof (title), _("Keyboard Layout \"%s\""), group_name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/libmatekbd/show-layout.ui new/libmatekbd-1.18.2/libmatekbd/show-layout.ui --- old/libmatekbd-1.18.0/libmatekbd/show-layout.ui 2015-10-09 15:27:14.000000000 +0200 +++ new/libmatekbd-1.18.2/libmatekbd/show-layout.ui 2017-03-28 16:38:00.000000000 +0200 @@ -1,64 +1,82 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.0 --> <!--*- mode: xml -*--> <interface> + <requires lib="gtk+" version="3.14"/> <object class="GtkDialog" id="gswitchit_layout_view"> + <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">Keyboard Layout</property> <property name="resizable">False</property> <property name="destroy_with_parent">True</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> + <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">2</property> - <child> - <object class="GtkVBox" id="preview_vbox"> - <property name="visible">True</property> - <property name="border_width">5</property> - <property name="spacing">18</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> + <object class="GtkButtonBox" id="dialog-action_area1"> <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> <child> <object class="GtkButton" id="btnPrint"> + <property name="label">gtk-print</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label">gtk-print</property> <property name="use_stock">True</property> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> <child> <object class="GtkButton" id="btnClose"> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="label">gtk-close</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="preview_vbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -67,5 +85,8 @@ <action-widget response="2">btnPrint</action-widget> <action-widget response="-7">btnClose</action-widget> </action-widgets> + <style> + <class name="gswitchit-layout-view"/> + </style> </object> </interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/po/ar.po new/libmatekbd-1.18.2/po/ar.po --- old/libmatekbd-1.18.0/po/ar.po 2017-03-12 13:00:46.000000000 +0100 +++ new/libmatekbd-1.18.2/po/ar.po 2017-04-09 21:13:34.000000000 +0200 @@ -5,13 +5,14 @@ # Translators: # Automatically generated, 2007 # Khaled Hosny <[email protected]>, 2008, 2009, 2010 +# Mubarak Qahtani <[email protected]>, 2017 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-28 13:01+0300\n" -"PO-Revision-Date: 2015-09-06 18:41+0000\n" -"Last-Translator: infirit <[email protected]>\n" +"PO-Revision-Date: 2017-04-02 11:45+0000\n" +"Last-Translator: Mubarak Qahtani <[email protected]>\n" "Language-Team: Arabic (http://www.transifex.com/mate/MATE/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -158,7 +159,7 @@ #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19 msgid "Show keyboard leds indicator" -msgstr "" +msgstr "اظهر لمبات مؤشر لوحة المفاتيح" #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20 msgid "The Keyboard Preview, X offset" @@ -182,7 +183,7 @@ #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25 msgid "The font" -msgstr "" +msgstr "الخط" #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/po/kk.po new/libmatekbd-1.18.2/po/kk.po --- old/libmatekbd-1.18.0/po/kk.po 2017-03-12 13:00:47.000000000 +0100 +++ new/libmatekbd-1.18.2/po/kk.po 2017-04-09 21:13:34.000000000 +0200 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Baurzhan Muftakhidinov <[email protected]>, 2017 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-28 13:01+0300\n" -"PO-Revision-Date: 2015-09-06 18:41+0000\n" -"Last-Translator: infirit <[email protected]>\n" +"PO-Revision-Date: 2017-03-18 05:30+0000\n" +"Last-Translator: Baurzhan Muftakhidinov <[email protected]>\n" "Language-Team: Kazakh (http://www.transifex.com/mate/MATE/language/kk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ #: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310 #, c-format msgid "There was an error loading an image: %s" -msgstr "" +msgstr "Суретті жүктеу кезінде қате кетті: %s" #: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645 msgid "XKB initialization error" @@ -41,52 +42,52 @@ #: ../libmatekbd/matekbd-keyboard-drawing.c:2619 #, c-format msgid "Keyboard Layout \"%s\"" -msgstr "" +msgstr "\"%s\" пернетақта жаймасы " #: ../libmatekbd/matekbd-keyboard-config.c:720 #, c-format msgid "layout \"%s\"" msgid_plural "layouts \"%s\"" -msgstr[0] "" +msgstr[0] "\"%s\" жаймалары" #: ../libmatekbd/matekbd-keyboard-config.c:738 #, c-format msgid "option \"%s\"" msgid_plural "options \"%s\"" -msgstr[0] "" +msgstr[0] "\"%s\" опциялары" #: ../libmatekbd/matekbd-keyboard-config.c:746 #, c-format msgid "model \"%s\", %s and %s" -msgstr "" +msgstr "модельдер \"%s\", %s және %s" #: ../libmatekbd/matekbd-keyboard-config.c:747 msgid "no layout" -msgstr "" +msgstr "жаймасы жоқ" #: ../libmatekbd/matekbd-keyboard-config.c:748 msgid "no options" -msgstr "" +msgstr "опциялары жоқ" #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1 msgid "Keyboard model" -msgstr "" +msgstr "Пернетақта түрі" #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2 msgid "keyboard model" -msgstr "" +msgstr "пернетақта түрі" #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3 msgid "Keyboard layout" -msgstr "" +msgstr "Пернетақта жаймасы " #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4 msgid "keyboard layout" -msgstr "" +msgstr "пернетақта жаймасы " #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5 msgid "Keyboard options" -msgstr "" +msgstr "Пернетақта опциялары" #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6 msgid "Keyboard Update Handlers" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/po/lt.po new/libmatekbd-1.18.2/po/lt.po --- old/libmatekbd-1.18.0/po/lt.po 2017-03-12 13:00:40.000000000 +0100 +++ new/libmatekbd-1.18.2/po/lt.po 2017-04-09 21:13:34.000000000 +0200 @@ -6,13 +6,13 @@ # Džiugas Grėbliūnas <[email protected]>, 2014 # Gintautas Miliauskas <[email protected]>, 2007, 2008 # brennus <[email protected]>, 2014 -# Moo, 2015-2016 +# Moo, 2015-2017 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-28 13:01+0300\n" -"PO-Revision-Date: 2016-09-07 13:29+0000\n" +"PO-Revision-Date: 2017-03-16 09:12+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/mate/MATE/language/lt/)\n" "MIME-Version: 1.0\n" @@ -59,9 +59,9 @@ #, c-format msgid "option \"%s\"" msgid_plural "options \"%s\"" -msgstr[0] "parinktis \"%s\"" -msgstr[1] "parinktys \"%s\"" -msgstr[2] "parinktys \"%s\"" +msgstr[0] "parametras \"%s\"" +msgstr[1] "parametrai \"%s\"" +msgstr[2] "parametrai \"%s\"" #: ../libmatekbd/matekbd-keyboard-config.c:746 #, c-format @@ -74,7 +74,7 @@ #: ../libmatekbd/matekbd-keyboard-config.c:748 msgid "no options" -msgstr "nėra parinkčių" +msgstr "nėra parametrų" #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1 msgid "Keyboard model" @@ -94,7 +94,7 @@ #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5 msgid "Keyboard options" -msgstr "Klaviatūros parinktys" +msgstr "Klaviatūros parametrai" #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6 msgid "Keyboard Update Handlers" @@ -142,7 +142,7 @@ #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16 msgid "Load exotic, rarely used layouts and options" -msgstr "Įkelti retus išdėstymus ir parinktis" +msgstr "Įkelti retus išdėstymus ir parametrus" #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17 msgid "Suppress the \"X sysconfig changed\" warning message" @@ -184,7 +184,7 @@ msgid "" "The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-" "OPTIONS] [SIZE]\" format." -msgstr "Išdėstymų indikatoriaus šriftas. Tai turėtų būti nurodyta \"[ŠEIMOS-SĄRAŠAS] [STILIAUS-PARINKTYS] [DYDIS]\" formatu." +msgstr "Išdėstymų indikatoriaus šriftas. Tai turėtų būti nurodyta \"[ŠEIMOS-SĄRAŠAS] [STILIAUS-PARAMETRAI] [DYDIS]\" formatu." #: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27 msgid "The foreground color" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.18.0/po/pt.po new/libmatekbd-1.18.2/po/pt.po --- old/libmatekbd-1.18.0/po/pt.po 2017-03-12 13:00:44.000000000 +0100 +++ new/libmatekbd-1.18.2/po/pt.po 2017-04-09 21:13:34.000000000 +0200 @@ -3,8 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# crolidge, 2014-2015 -# crolidge, 2016 +# Carlos Moreira, 2014-2015 +# Carlos Moreira, 2016 # Duarte Loreto <[email protected]>, 2007-2010 # Sérgio Marques <[email protected]>, 2012 msgid "" @@ -13,7 +13,7 @@ "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-28 13:01+0300\n" "PO-Revision-Date: 2016-05-29 15:41+0000\n" -"Last-Translator: crolidge\n" +"Last-Translator: Carlos Moreira\n" "Language-Team: Portuguese (http://www.transifex.com/mate/MATE/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"
