From 5de4874e71be38a5fb8a446682b5670b20898d4c Mon Sep 17 00:00:00 2001 From: jishengjie <348240162@qq.com> Date: Mon, 18 Jul 2022 12:22:08 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E7=A7=BB=E9=99=A4=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E5=B8=AE=E5=8A=A9=E6=8C=89=E9=92=AE?= =?UTF-8?q?=20CLOSE-CD:=20128162?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 9 +++++++++ plugins/externaltools/tools/tools.ui | 16 ---------------- plugins/snippets/snippets/snippets.ui | 16 ---------------- plugins/sort/sort.ui | 17 ----------------- plugins/spell/languages-dialog.ui | 17 ----------------- plugins/spell/pluma-spell-language-dialog.c | 1 - plugins/spell/pluma-spell-setup-dialog.ui | 17 ----------------- plugins/time/pluma-time-dialog.ui | 17 ----------------- plugins/time/pluma-time-setup-dialog.ui | 17 ----------------- pluma/dialogs/pluma-encodings-dialog.c | 1 - pluma/dialogs/pluma-encodings-dialog.ui | 17 ----------------- pluma/dialogs/pluma-preferences-dialog.c | 1 - pluma/dialogs/pluma-preferences-dialog.ui | 17 ----------------- pluma/pluma-ui.h | 2 -- 14 files changed, 9 insertions(+), 156 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e6e398..f730922 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +pluma (1.24.0-ok2~0718) yangtze; urgency=medium + + * BUG号：128162 【用户手册】文本编辑器—帮助—目录 弹出了用户手册的“undefined页面” + * 任务号：无 + * 其他改动说明：无 + * 其他改动影响域：无 + + -- openKylinBot Mon, 18 Jul 2022 12:20:32 +0800 + pluma (1.24.0-ok2~0713) yangtze; urgency=medium * BUG号： 129455 【文本编辑器】文本编辑器在开始菜单名称未汉化，为plu diff --git a/plugins/externaltools/tools/tools.ui b/plugins/externaltools/tools/tools.ui index 21de842..780d4e6 100644 --- a/plugins/externaltools/tools/tools.ui +++ b/plugins/externaltools/tools/tools.ui @@ -152,21 +152,6 @@ True False end - - - gtk-help - True - True - True - False - True - - - False - False - 0 - - gtk-close @@ -595,7 +580,6 @@ - button1 button2 diff --git a/plugins/snippets/snippets/snippets.ui b/plugins/snippets/snippets/snippets.ui index 833aa02..a151a68 100644 --- a/plugins/snippets/snippets/snippets.ui +++ b/plugins/snippets/snippets/snippets.ui @@ -59,21 +59,6 @@ False True end - - - gtk-help - True - True - True - False - True - - - True - True - 0 - - gtk-close @@ -482,7 +467,6 @@ - button1 closebutton1 diff --git a/plugins/sort/sort.ui b/plugins/sort/sort.ui index 98ac2e0..8b59464 100644 --- a/plugins/sort/sort.ui +++ b/plugins/sort/sort.ui @@ -72,22 +72,6 @@ 1 - - - _Help - True - True - True - False - image2 - True - - - True - True - 2 - - False @@ -256,7 +240,6 @@ button1 button2 - button3 diff --git a/plugins/spell/languages-dialog.ui b/plugins/spell/languages-dialog.ui index 4b9f9fb..55b7469 100644 --- a/plugins/spell/languages-dialog.ui +++ b/plugins/spell/languages-dialog.ui @@ -35,22 +35,6 @@ True False end - - - _Help - True - True - True - False - image1 - True - - - True - True - 0 - - _Cancel @@ -148,7 +132,6 @@ - helpbutton1 closebutton1 button1 diff --git a/plugins/spell/pluma-spell-language-dialog.c b/plugins/spell/pluma-spell-language-dialog.c index 363d11a..3eff8d9 100644 --- a/plugins/spell/pluma-spell-language-dialog.c +++ b/plugins/spell/pluma-spell-language-dialog.c @@ -131,7 +131,6 @@ create_dialog (PlumaSpellLanguageDialog *dlg, pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Cancel"), "process-stop", GTK_RESPONSE_CANCEL); pluma_dialog_add_button (GTK_DIALOG (dlg), _("_OK"), "gtk-ok", GTK_RESPONSE_OK); - pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Help"), "help-browser", GTK_RESPONSE_HELP); gtk_window_set_title (GTK_WINDOW (dlg), _("Set language")); gtk_window_set_modal (GTK_WINDOW (dlg), TRUE); diff --git a/plugins/spell/pluma-spell-setup-dialog.ui b/plugins/spell/pluma-spell-setup-dialog.ui index abdb4a6..02b50bd 100644 --- a/plugins/spell/pluma-spell-setup-dialog.ui +++ b/plugins/spell/pluma-spell-setup-dialog.ui @@ -34,22 +34,6 @@ True False end - - - _Help - True - True - True - False - image1 - True - - - True - True - 0 - - _Cancel @@ -174,7 +158,6 @@ - button1 button3 button4 diff --git a/plugins/time/pluma-time-dialog.ui b/plugins/time/pluma-time-dialog.ui index 9a5f7db..2a275bc 100644 --- a/plugins/time/pluma-time-dialog.ui +++ b/plugins/time/pluma-time-dialog.ui @@ -31,22 +31,6 @@ True False end - - - _Help - True - True - True - False - image2 - True - - - True - True - 0 - - _Cancel @@ -292,7 +276,6 @@ - helpbutton1 cancelbutton1 okbutton1 diff --git a/plugins/time/pluma-time-setup-dialog.ui b/plugins/time/pluma-time-setup-dialog.ui index 54ac4fc..10c5497 100644 --- a/plugins/time/pluma-time-setup-dialog.ui +++ b/plugins/time/pluma-time-setup-dialog.ui @@ -34,22 +34,6 @@ True False end - - - _Help - True - True - True - False - image1 - True - - - True - True - 0 - - _Cancel @@ -327,7 +311,6 @@ - button1 button3 button4 diff --git a/pluma/dialogs/pluma-encodings-dialog.c b/pluma/dialogs/pluma-encodings-dialog.c index fe58ad5..7e7b24c 100644 --- a/pluma/dialogs/pluma-encodings-dialog.c +++ b/pluma/dialogs/pluma-encodings-dialog.c @@ -305,7 +305,6 @@ pluma_encodings_dialog_init (PlumaEncodingsDialog *dlg) pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Cancel"), "process-stop", GTK_RESPONSE_CANCEL); pluma_dialog_add_button (GTK_DIALOG (dlg), _("_OK"), "gtk-ok", GTK_RESPONSE_OK); - pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Help"), "help-browser", GTK_RESPONSE_HELP); gtk_window_set_title (GTK_WINDOW (dlg), _("Character Encodings")); gtk_window_set_default_size (GTK_WINDOW (dlg), 650, 400); diff --git a/pluma/dialogs/pluma-encodings-dialog.ui b/pluma/dialogs/pluma-encodings-dialog.ui index 66602e6..8bee9ac 100644 --- a/pluma/dialogs/pluma-encodings-dialog.ui +++ b/pluma/dialogs/pluma-encodings-dialog.ui @@ -35,22 +35,6 @@ True False end - - - _Help - True - True - True - False - image1 - True - - - True - True - 0 - - _Cancel @@ -264,7 +248,6 @@ - helpbutton1 closebutton1 button1 diff --git a/pluma/dialogs/pluma-preferences-dialog.c b/pluma/dialogs/pluma-preferences-dialog.c index 2712b59..8f1a20d 100644 --- a/pluma/dialogs/pluma-preferences-dialog.c +++ b/pluma/dialogs/pluma-preferences-dialog.c @@ -1289,7 +1289,6 @@ pluma_preferences_dialog_init (PlumaPreferencesDialog *dlg) dlg->priv = pluma_preferences_dialog_get_instance_private (dlg); pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Close"), "window-close", GTK_RESPONSE_CLOSE); - pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Help"), "help-browser", GTK_RESPONSE_HELP); gtk_window_set_title (GTK_WINDOW (dlg), _("Pluma Preferences")); gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE); diff --git a/pluma/dialogs/pluma-preferences-dialog.ui b/pluma/dialogs/pluma-preferences-dialog.ui index f571d24..8aae8bd 100644 --- a/pluma/dialogs/pluma-preferences-dialog.ui +++ b/pluma/dialogs/pluma-preferences-dialog.ui @@ -53,22 +53,6 @@ True False end - - - _Help - True - True - True - False - image1 - True - - - False - False - 0 - - _Close @@ -1493,7 +1477,6 @@ - helpbutton1 closebutton1 diff --git a/pluma/pluma-ui.h b/pluma/pluma-ui.h index 824e1e3..941f24e 100644 --- a/pluma/pluma-ui.h +++ b/pluma/pluma-ui.h @@ -63,8 +63,6 @@ static const GtkActionEntry pluma_always_sensitive_menu_entries[] = N_("Configure the application"), G_CALLBACK (_pluma_cmd_edit_preferences) }, /* Help menu */ - {"HelpContents", "help-browser", N_("_Contents"), "F1", - N_("Open the pluma manual"), G_CALLBACK (_pluma_cmd_help_contents) }, { "HelpAbout", "help-about", N_("_About"), NULL, N_("About this application"), G_CALLBACK (_pluma_cmd_help_about) },