Git commit 2339a4e2dbcbf37ca2ebf4c08abf2617a0cbf788 by Christoph Cullmann, on behalf of Felipe Kinoshita. Committed on 30/04/2021 at 22:34. Pushed by cullmann into branch 'master'.
Change terminal actions icons and text M +11 -11 addons/konsole/kateconsole.cpp M +4 -4 doc/kate/plugins.docbook https://invent.kde.org/utilities/kate/commit/2339a4e2dbcbf37ca2ebf4c08abf2617a0cbf788 diff --git a/addons/konsole/kateconsole.cpp b/addons/konsole/kateconsole.cpp index 01dfe4ce1..b47058cd4 100644 --- a/addons/konsole/kateconsole.cpp +++ b/addons/konsole/kateconsole.cpp @@ -99,8 +99,8 @@ KateKonsolePluginView::KateKonsolePluginView(KateKonsolePlugin *plugin, KTextEdi QWidget *toolview = mainWindow->createToolView(plugin, QStringLiteral("kate_private_plugin_katekonsoleplugin"), KTextEditor::MainWindow::Bottom, - QIcon::fromTheme(QStringLiteral("utilities-terminal")), - i18n("Terminal")); + QIcon::fromTheme(QStringLiteral("dialog-scripts")), + i18n("Terminal Panel")); m_console = new KateConsole(m_plugin, mainWindow, toolview); // register this view @@ -138,7 +138,7 @@ KateConsole::KateConsole(KateKonsolePlugin *plugin, KTextEditor::MainWindow *mw, layout()->setContentsMargins(0, 0, 0, 0); QAction *a = actionCollection()->addAction(QStringLiteral("katekonsole_tools_pipe_to_terminal")); - a->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); + a->setIcon(QIcon::fromTheme(QStringLiteral("dialog-scripts"))); a->setText(i18nc("@action", "&Pipe to Terminal")); connect(a, &QAction::triggered, this, &KateConsole::slotPipeToConsole); @@ -151,14 +151,14 @@ KateConsole::KateConsole(KateKonsolePlugin *plugin, KTextEditor::MainWindow *mw, connect(a, &QAction::triggered, this, &KateConsole::slotRun); a = actionCollection()->addAction(QStringLiteral("katekonsole_tools_toggle_visibility")); - a->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); - a->setText(i18nc("@action", "S&how Terminal")); + a->setIcon(QIcon::fromTheme(QStringLiteral("dialog-scripts"))); + a->setText(i18nc("@action", "S&how Terminal Panel")); actionCollection()->setDefaultShortcut(a, QKeySequence(Qt::Key_F4)); connect(a, &QAction::triggered, this, &KateConsole::slotToggleVisibility); a = actionCollection()->addAction(QStringLiteral("katekonsole_tools_toggle_focus")); a->setIcon(QIcon::fromTheme(QStringLiteral("swap-panels"))); - a->setText(i18nc("@action", "&Focus Terminal")); + a->setText(i18nc("@action", "&Focus Terminal Panel")); actionCollection()->setDefaultShortcut(a, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_F4)); connect(a, &QAction::triggered, this, &KateConsole::slotToggleFocus); @@ -418,10 +418,10 @@ void KateConsole::slotToggleVisibility() QAction *action = actionCollection()->action(QStringLiteral("katekonsole_tools_toggle_visibility")); if (!m_part || !m_part->widget()->isVisible()) { m_mw->showToolView(parentWidget()); - action->setText(i18nc("@action", "&Hide Terminal")); + action->setText(i18nc("@action", "&Hide Terminal Panel")); } else { m_mw->hideToolView(m_toolView); - action->setText(i18nc("@action", "S&how Terminal")); + action->setText(i18nc("@action", "S&how Terminal Panel")); } } @@ -430,7 +430,7 @@ void KateConsole::slotToggleFocus() QAction *action = actionCollection()->action(QStringLiteral("katekonsole_tools_toggle_focus")); if (!m_part) { m_mw->showToolView(parentWidget()); - action->setText(i18n("Defocus Terminal")); + action->setText(i18n("Defocus Terminal Panel")); return; // this shows and focuses the konsole } @@ -442,7 +442,7 @@ void KateConsole::slotToggleFocus() if (m_mw->activeView()) { m_mw->activeView()->setFocus(); } - action->setText(i18n("Focus Terminal")); + action->setText(i18n("Focus Terminal Panel")); } else { // show the view if it is hidden if (parentWidget()->isHidden()) { @@ -450,7 +450,7 @@ void KateConsole::slotToggleFocus() } else { // should focus the widget too! m_part->widget()->setFocus(Qt::OtherFocusReason); } - action->setText(i18n("Defocus Terminal")); + action->setText(i18n("Defocus Terminal Panel")); } } diff --git a/doc/kate/plugins.docbook b/doc/kate/plugins.docbook index 8539c1b42..e745dc0ce 100644 --- a/doc/kate/plugins.docbook +++ b/doc/kate/plugins.docbook @@ -2118,7 +2118,7 @@ precedence over <filename>.kateproject</filename>. <varlistentry> <term> -<guimenu>Terminal</guimenu> +<guimenu>Terminal Panel</guimenu> </term> <listitem> <para>A <link linkend="kate-application-plugin-konsole">Terminal emulator</link> starting in the @@ -3598,7 +3598,7 @@ Structures of the source code in the active document.</para> The built in Terminal Emulator is a copy of the &kde; &konsole; terminal application, for your convenience. It is available from the <menuchoice><guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu> -<guimenuitem>Show Terminal</guimenuitem></menuchoice> menu item and will get the focus +<guimenuitem>Show Terminal Panel</guimenuitem></menuchoice> menu item and will get the focus whenever displayed. Additionally, if the <link linkend="konsole-config">Automatically synchronize the terminal with the current document when possible</link> option is enabled, it will @@ -3622,7 +3622,7 @@ information, see the <ulink url="help:/konsole/index.html">&konsole; manual</uli <varlistentry id="view-toolviews-show-terminal"> <term><menuchoice> <guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu> -<guimenuitem>Show Terminal</guimenuitem> +<guimenuitem>Show Terminal Panel</guimenuitem> </menuchoice></term> <listitem> <para>Toggles the display of the built-in terminal emulator.</para> @@ -3661,7 +3661,7 @@ sync with the current document. See <varlistentry id="tools-focus-terminal"> <term><menuchoice> <guimenu>Tools</guimenu> -<guimenuitem>Focus/Defocus Terminal</guimenuitem> +<guimenuitem>Focus/Defocus Terminal Panel</guimenuitem> </menuchoice></term> <listitem> <para>Switch the focus from the current document to the terminal and vice versa.
