diff --git a/0001-feature-touchpad-set-the-default-values-of-disable-w.patch b/0001-feature-touchpad-set-the-default-values-of-disable-w.patch new file mode 100644 index 0000000..066b477 --- /dev/null +++ b/0001-feature-touchpad-set-the-default-values-of-disable-w.patch @@ -0,0 +1,38 @@ +From 4b946f8e463d62fe77b1d76838b528117b036d60 Mon Sep 17 00:00:00 2001 +From: tangjie02 +Date: Mon, 24 Aug 2020 11:06:21 +0800 +Subject: [PATCH] feature(touchpad): set the default values of + disable-while-typing and tap-to-click to true. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 设置disable-while-typing和tap-to-click的默认值为true + +Signed-off-by: tangjie02 +--- + data/org.mate.peripherals-touchpad.gschema.xml.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/org.mate.peripherals-touchpad.gschema.xml.in b/data/org.mate.peripherals-touchpad.gschema.xml.in +index 90b83c8..a67b6c9 100644 +--- a/data/org.mate.peripherals-touchpad.gschema.xml.in ++++ b/data/org.mate.peripherals-touchpad.gschema.xml.in +@@ -6,12 +6,12 @@ + + + +- false ++ true + Disable touchpad while typing + Set this to TRUE if you have problems with accidentally hitting the touchpad while typing. + + +- false ++ true + Enable mouse clicks with touchpad + Set this to TRUE to be able to send mouse clicks by tapping on the touchpad. + +-- +2.18.1 + diff --git a/0001-fix-mate-display-add-the-window-scale-changed-tip-wi.patch b/0001-fix-mate-display-add-the-window-scale-changed-tip-wi.patch new file mode 100644 index 0000000..54c80e4 --- /dev/null +++ b/0001-fix-mate-display-add-the-window-scale-changed-tip-wi.patch @@ -0,0 +1,97 @@ +From 61c2ae5e954b82dac23b16ec6770e009d8e6f237 Mon Sep 17 00:00:00 2001 +From: wangxiaoqing +Date: Tue, 16 Jun 2020 17:27:55 +0800 +Subject: [PATCH] fix(mate-display): add the window scale changed tip with + notify +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 当窗口缩放发生改变时， 通过notify显示有些应用需要注销再登录才能起作用的提示。 + + Fixes #25310 +--- + plugins/xsettings/msd-xsettings-manager.c | 38 +++++++++++++++++++++++++++++++ + po/zh_CN.po | 6 +++++ + 2 files changed, 44 insertions(+) + +diff --git a/plugins/xsettings/msd-xsettings-manager.c b/plugins/xsettings/msd-xsettings-manager.c +index b31288d..17d5b88 100644 +--- a/plugins/xsettings/msd-xsettings-manager.c ++++ b/plugins/xsettings/msd-xsettings-manager.c +@@ -39,6 +39,10 @@ + #include + #include + ++#ifdef HAVE_LIBNOTIFY ++#include ++#endif ++ + #include "mate-settings-profile.h" + #include "msd-xsettings-manager.h" + #include "xsettings-manager.h" +@@ -518,6 +522,38 @@ delayed_toggle_bg_draw (gboolean value) + } + + static void ++info_message (const char *primary_text, const char *secondary_text) ++{ ++#ifdef HAVE_LIBNOTIFY ++ NotifyNotification *notification; ++ ++ notification = notify_notification_new (primary_text, ++ secondary_text, ++ "msd-xrandr"); ++ ++ notify_notification_show (notification, NULL); /* NULL-GError */ ++#else ++ GtkWidget *dialog; ++ ++ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, ++ "%s", primary_text); ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", ++ secondary_text); ++ ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++#endif /* HAVE_LIBNOTIFY */ ++} ++ ++static gboolean ++delayed_show_info_msg (gboolean value) ++{ ++ info_message (_("Window zooming"), _("Window zooming has changed,\nsome applications need to logout and login again to work!")); ++ ++ return FALSE; ++} ++ ++static void + scale_change_workarounds (MateXSettingsManager *manager, int new_scale) + { + if (manager->priv->window_scale == new_scale) +@@ -578,6 +614,8 @@ scale_change_workarounds (MateXSettingsManager *manager, int new_scale) + g_timeout_add_seconds (1, (GSourceFunc) delayed_toggle_bg_draw, (gpointer) FALSE); + g_timeout_add_seconds (2, (GSourceFunc) delayed_toggle_bg_draw, (gpointer) TRUE); + } ++ ++ g_timeout_add_seconds (2, (GSourceFunc) delayed_show_info_msg, (gpointer) TRUE); + } + + /* Store new scale value */ +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 88573d4..e581552 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -1358,3 +1358,9 @@ msgstr "配置硬件时钟" + #: ../plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in.h:6 + msgid "Privileges are required to configure the hardware clock." + msgstr "配置硬件时钟需要权限" ++ ++msgid "Window zooming" ++msgstr "窗口缩放" ++ ++msgid "Window zooming has changed,\nsome applications need to logout and login again to work!" ++msgstr "窗口缩放已经改变，\n有些应用需要注销再登录才能起作用！" +-- +1.8.3.1 + diff --git a/0001-fix-plugin-keyboard-not-show-the-xkb-status-icon-2613d058.patch b/0001-fix-plugin-keyboard-not-show-the-xkb-status-icon-2613d058.patch new file mode 100644 index 0000000..52cad50 --- /dev/null +++ b/0001-fix-plugin-keyboard-not-show-the-xkb-status-icon-2613d058.patch @@ -0,0 +1,25 @@ +From 2613d0586f2043ace936d2f34b85de2166f4fc09 Mon Sep 17 00:00:00 2001 +From: longcheng +Date: Thu, 15 Jul 2021 17:31:17 +0800 +Subject: [PATCH] fix(plugin-keyboard): not show the xkb status icon + +--- + plugins/keyboard/msd-keyboard-xkb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c +index 7e90f1c..0584919 100644 +--- a/plugins/keyboard/msd-keyboard-xkb.c ++++ b/plugins/keyboard/msd-keyboard-xkb.c +@@ -467,7 +467,7 @@ apply_xkb_settings (void) + "Actual KBD configuration was not changed: redundant notification\n"); + + matekbd_keyboard_config_term (¤t_sys_kbd_config); +- show_hide_icon (); ++ /*show_hide_icon ();*/ + } + + static void +-- +2.27.0 + diff --git a/1004-fix-keybinding-add-some-media-key-translations-f605e267.patch b/1004-fix-keybinding-add-some-media-key-translations-f605e267.patch new file mode 100644 index 0000000..b6d1cc4 --- /dev/null +++ b/1004-fix-keybinding-add-some-media-key-translations-f605e267.patch @@ -0,0 +1,77 @@ +From f605e26779dccba3c2d2e808c926e6b37785dc7c Mon Sep 17 00:00:00 2001 +From: yuanxing +Date: Tue, 11 Jan 2022 14:30:12 +0800 +Subject: [PATCH] fix(keybinding):add some media key translations +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 添加一些多媒体按键的翻译 + +Related #48455 +--- + po/zh_CN.po | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 88573d4..03456e5 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -427,6 +427,18 @@ msgstr "启用或禁用触摸板的键绑定。" + msgid "Volume mute" + msgstr "静音" + ++msgid "Volume down quietly" ++msgstr "安静地将音量调低" ++ ++msgid "Volume up quietly" ++msgstr "安静地将音量调高" ++ ++msgid "Volume mute quietly" ++msgstr "音频静音" ++ ++msgid "Microphone mute" ++msgstr "麦克风静音" ++ + #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:12 + msgid "Binding to mute the system volume." + msgstr "使系统静音的键绑定。" +@@ -449,7 +461,7 @@ msgstr "升高系统音量的键绑定。" + + #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:17 + msgid "Mute the audio quietly" +-msgstr "" ++msgstr "音频静音" + + #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:18 + msgid "Binding to mute the system volume quietly." +@@ -457,7 +469,7 @@ msgstr "" + + #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:19 + msgid "Turn the volume down quietly" +-msgstr "" ++msgstr "安静地把音量调低" + + #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:20 + msgid "Binding to lower the system volume quietly." +@@ -465,7 +477,7 @@ msgstr "" + + #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:21 + msgid "Turn the volume up quietly" +-msgstr "" ++msgstr "安静地把音量调高" + + #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:22 + msgid "Binding to raise the system volume quietly." +@@ -473,7 +485,7 @@ msgstr "" + + #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:23 + msgid "Microphone mute/unmute" +-msgstr "" ++msgstr "麦克风静音" + + #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:24 + msgid "Binding to mute/unmute the microphone." +-- +2.27.0 + diff --git a/1005-fix-media-keys-add-the-case-of-kiran-screensaver-whi-cc8f2984.patch b/1005-fix-media-keys-add-the-case-of-kiran-screensaver-whi-cc8f2984.patch new file mode 100644 index 0000000..a2a00e9 --- /dev/null +++ b/1005-fix-media-keys-add-the-case-of-kiran-screensaver-whi-cc8f2984.patch @@ -0,0 +1,34 @@ +From cc8f2984ef67083abb13ab1a7a7e0b395defb9bc Mon Sep 17 00:00:00 2001 +From: meizhigang +Date: Mon, 24 Jan 2022 14:38:57 +0800 +Subject: [PATCH] fix(media-keys):add the case of kiran screensaver while lock + screen +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + -添加快捷键锁屏kiran-screensaver条件分支 + + Related #48454 +--- + plugins/media-keys/msd-media-keys-manager.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c +index fc9bee7..79d9496 100644 +--- a/plugins/media-keys/msd-media-keys-manager.c ++++ b/plugins/media-keys/msd-media-keys-manager.c +@@ -1243,7 +1243,9 @@ do_action (MsdMediaKeysManager *manager, + g_free (cmd); + break; + case SCREENSAVER_KEY: +- if ((cmd = g_find_program_in_path ("mate-screensaver-command"))) { ++ if ((cmd = g_find_program_in_path ("kiran-screensaver-command"))) { ++ execute (manager, "kiran-screensaver-command --lock", FALSE, FALSE); ++ } else if ((cmd = g_find_program_in_path ("mate-screensaver-command"))) { + execute (manager, "mate-screensaver-command --lock", FALSE, FALSE); + } else { + execute (manager, "xscreensaver-command -lock", FALSE, FALSE); +-- +2.27.0 + diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index bc391b6..2be8854 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -15,9 +15,9 @@ Name: mate-settings-daemon Version: %{branch}.0 %if 0%{?rel_build} -Release: 3%{?dist} +Release: 5 %else -Release: 0.9%{?git_rel}%{?dist} +Release: 0.9%{?git_rel} %endif Summary: MATE Desktop settings daemon License: GPLv2+ @@ -35,6 +35,13 @@ URL: http://mate-desktop.org Patch1: mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch %endif +Patch1000: mate-settings-daemon_Always-use-preferred-size-for-Virtual-screens-or-whe.patch +Patch1001: 0001-fix-mate-display-add-the-window-scale-changed-tip-wi.patch +Patch1002: 0001-feature-touchpad-set-the-default-values-of-disable-w.patch +Patch1003: 0001-fix-plugin-keyboard-not-show-the-xkb-status-icon-2613d058.patch +Patch1004: 1004-fix-keybinding-add-some-media-key-translations-f605e267.patch +Patch1005: 1005-fix-media-keys-add-the-case-of-kiran-screensaver-whi-cc8f2984.patch + BuildRequires: dbus-glib-devel BuildRequires: dconf-devel BuildRequires: desktop-file-utils @@ -131,6 +138,17 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae %changelog +* Fri Jul 08 2022 longcheng - 1.22.0-5 +- Always use preferred size for Virtual screens or when auto configure monitors Related #24217 #24260 +- add the window scale changed tip with notify. (#25310) +- set the default values of disable-while-typing and tap-to-click to true. +- KYOS-F: fix plugin keyboard not show the xkb status icon (#39545) +- KYOS-F: add some media key translations (#48455) +- KYOS-F: add the case of kiran screensaver while lock screen (#48454) + +* Mon Jun 13 2022 qiaoyujie - 1.22.0-4 +- remove %{dist} from spec file + * Thu Jul 25 2019 Fedora Release Engineering - 1.22.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/mate-settings-daemon_Always-use-preferred-size-for-Virtual-screens-or-whe.patch b/mate-settings-daemon_Always-use-preferred-size-for-Virtual-screens-or-whe.patch new file mode 100644 index 0000000..0be8db4 --- /dev/null +++ b/mate-settings-daemon_Always-use-preferred-size-for-Virtual-screens-or-whe.patch @@ -0,0 +1,74 @@ +From 228384e4772f13d3078c45e726a3940dd2913af5 Mon Sep 17 00:00:00 2001 +From: songchuanfei +Date: Tue, 7 Apr 2020 19:03:34 +0800 +Subject: [PATCH] Always use preferred size for Virtual screens or when auto + configure monitors +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 对于接入的新输出，自动设置分辨率时总是使用最佳分辨率, Fix #24217 #24260 +- 对于虚拟屏幕, 总是自动设置分辨率 + +Signed-off-by: songchuanfei +--- + plugins/xrandr/msd-xrandr-manager.c | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) + +diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c +index fff0c9b..ff6fa3c 100644 +--- a/plugins/xrandr/msd-xrandr-manager.c ++++ b/plugins/xrandr/msd-xrandr-manager.c +@@ -1455,7 +1455,10 @@ auto_configure_outputs (MsdXrandrManager *manager, guint32 timestamp) + int width, height; + g_assert (mate_rr_output_info_is_connected (output)); + +- mate_rr_output_info_get_geometry (output, NULL, NULL, &width, &height); ++ width = mate_rr_output_info_get_preferred_width(output); ++ height = mate_rr_output_info_get_preferred_height(output); ++ ++ log_msg("Set output '%s' size to '%d x %d'\n", mate_rr_output_info_get_name(output), width, height); + mate_rr_output_info_set_geometry (output, x, 0, width, height); + + x += width; +@@ -1603,6 +1606,29 @@ on_randr_event (MateRRScreen *screen, gpointer data) + + show_timestamps_dialog (manager, "need to deal with reconfiguration, as config > change"); + ++ do { ++ MsdXrandrManagerPrivate *priv = manager->priv; ++ MateRROutput **outputs = mate_rr_screen_list_outputs(priv->rw_screen); ++ int i; ++ ++ for (i = 0; outputs[i] != NULL; i++) { ++ MateRROutput *output = outputs[i]; ++ ++ if (!mate_rr_output_is_connected(output)) ++ continue; ++ ++ if (mate_rr_output_has_hotplug_mode_update(output)) { ++ log_msg (" Found output '%s' with property 'hotplug_mode_update'\n", ++ mate_rr_output_get_name(output)); ++ /* ++ * Virtual screen found, just do autoconfigure ++ */ ++ goto autoconfigure; ++ } ++ } ++ ++ } while (0); ++ + intended_filename = mate_rr_config_get_intended_filename (); + + error = NULL; +@@ -1628,6 +1654,7 @@ on_randr_event (MateRRScreen *screen, gpointer data) + if (error) + g_error_free (error); + ++autoconfigure: + if (config_timestamp != priv->last_config_timestamp) { + priv->last_config_timestamp = config_timestamp; + auto_configure_outputs (manager, config_timestamp); +-- +2.18.1 +