feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Terminal: Do not use plugin tr includes inside header

Browse Source 
...to avoid accidently including it elsewhere and using a
different Tr::tr() in turn.
Amends a485f18a94.

Change-Id: Iee5b6626ebf53cd2c18833f48ca1a603c3cbff8b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Christian Stenger
2023-03-24 06:53:02 +01:00
parent 4885002613
commit 875dc22ef4
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/terminal/terminalcommands.h
View File

@@ -3,9 +3,8 @@
#pragma once
#include "terminaltr.h"
#include <QAction>
#include <QCoreApplication>
#include <QKeyEvent>
namespace Core {
@@ -17,21 +16,23 @@ namespace Terminal {
struct WidgetActions
{
QAction copy{Tr::tr("Copy")};
QAction paste{Tr::tr("Paste")};
QAction clearSelection{Tr::tr("Clear Selection")};
QAction clearTerminal{Tr::tr("Clear Terminal")};
QAction moveCursorWordLeft{Tr::tr("Move Cursor Word Left")};
QAction moveCursorWordRight{Tr::tr("Move Cursor Word Right")};
QAction copy{QCoreApplication::translate("QtC::Terminal", "Copy")};
QAction paste{QCoreApplication::translate("QtC::Terminal", "Paste")};
QAction clearSelection{QCoreApplication::translate("QtC::Terminal", "Clear Selection")};
QAction clearTerminal{QCoreApplication::translate("QtC::Terminal", "Clear Terminal")};
QAction moveCursorWordLeft{QCoreApplication::translate("QtC::Terminal",
"Move Cursor Word Left")};
QAction moveCursorWordRight{QCoreApplication::translate("QtC::Terminal",
"Move Cursor Word Right")};
};
struct PaneActions
{
QAction newTerminal{Tr::tr("New Terminal")};
QAction closeTerminal{Tr::tr("Close Terminal")};
QAction nextTerminal{Tr::tr("Next Terminal")};
QAction prevTerminal{Tr::tr("Previous Terminal")};
QAction minMax{Tr::tr("Minimize/Maximize Terminal")};
QAction newTerminal{QCoreApplication::translate("QtC::Terminal", "New Terminal")};
QAction closeTerminal{QCoreApplication::translate("QtC::Terminal", "Close Terminal")};
QAction nextTerminal{QCoreApplication::translate("QtC::Terminal", "Next Terminal")};
QAction prevTerminal{QCoreApplication::translate("QtC::Terminal", "Previous Terminal")};
QAction minMax{QCoreApplication::translate("QtC::Terminal", "Minimize/Maximize Terminal")};
};
class TerminalCommands