From eada41a393d4d06d4f8b26fd67d088d6fe7fa1ff Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sat, 21 Jan 2023 23:45:47 +0100 Subject: [PATCH] SerialTerminal: Tr::tr Change-Id: Iac630d03a27eb1599485a9b8044d794fc66c7bb2 Reviewed-by: hjk --- share/qtcreator/translations/qtcreator_da.ts | 8 +------ share/qtcreator/translations/qtcreator_de.ts | 8 +------ share/qtcreator/translations/qtcreator_hr.ts | 8 +------ share/qtcreator/translations/qtcreator_ja.ts | 5 +---- share/qtcreator/translations/qtcreator_ru.ts | 8 +------ .../qtcreator/translations/qtcreator_zh_CN.ts | 8 +------ src/plugins/serialterminal/serialcontrol.cpp | 15 ++++++------- .../serialterminal/serialoutputpane.cpp | 21 ++++++++++--------- src/plugins/serialterminal/serialterminal.qbs | 1 + .../serialterminal/serialterminalconstants.h | 2 +- .../serialterminal/serialterminalsettings.cpp | 9 ++++---- src/plugins/serialterminal/serialterminaltr.h | 15 +++++++++++++ 12 files changed, 47 insertions(+), 61 deletions(-) create mode 100644 src/plugins/serialterminal/serialterminaltr.h diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index b3ee55c1a51..e0721acab42 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -40762,7 +40762,7 @@ Gemning mislykkedes. - SerialTerminal::Internal::SerialControl + ::SerialTerminal Unable to open port %1. Kan ikke åbne porten %1. @@ -40791,9 +40791,6 @@ Gemning mislykkedes. Serial port error: %1 (%2) Fejl ved seriel port: %1 (%2) - - - SerialTerminal::Internal::SerialOutputPane Close Tab Luk faneblad @@ -40830,9 +40827,6 @@ Gemning mislykkedes. Add New Terminal Tilføj ny terminal - - - SerialTerminal::Internal::SerialTerminalOutputPane Serial Terminal Seriel terminal diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 378992bbe1f..26624109412 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -41571,7 +41571,7 @@ Was soll %1 tun? - SerialTerminal::Internal::SerialControl + ::SerialTerminal Unable to open port %1: %2. Port %1 konnte nicht geöffnet werden: %2. @@ -41600,9 +41600,6 @@ Was soll %1 tun? Serial port error: %1 (%2) Fehler des seriellen Ports: %1 (%2) - - - SerialTerminal::Internal::SerialOutputPane Close Tab Reiter schließen @@ -41639,9 +41636,6 @@ Was soll %1 tun? Add New Terminal Neues Terminal hinzufügen - - - SerialTerminal::Internal::SerialTerminalOutputPane Serial Terminal Serielles Terminal diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 7e45e73d2cf..19ecc78b73a 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -33263,7 +33263,7 @@ Row: %4, Column: %5 - SerialTerminal::Internal::SerialControl + ::SerialTerminal Unable to open port %1: %2. Neuspjelo otvaranje priključka %1: %2. @@ -33292,9 +33292,6 @@ Row: %4, Column: %5 Serial port error: %1 (%2) Greška u serijskom priključku: %1 (%2) - - - SerialTerminal::Internal::SerialOutputPane Close Tab Zatvori karticu @@ -33331,9 +33328,6 @@ Row: %4, Column: %5 Add New Terminal Dodaj novi terminal - - - SerialTerminal::Internal::SerialTerminalOutputPane Serial Terminal Serijski terminal diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index d61ec531aa9..22db1312b4c 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -48466,7 +48466,7 @@ Row: %4, Column: %5 - SerialTerminal::Internal::SerialControl + ::SerialTerminal Unable to open port %1: %2. ポート %1 を開けませんでした: %2。 @@ -48475,9 +48475,6 @@ Row: %4, Column: %5 Session resumed. セッションが再開されました。 - - - SerialTerminal::Internal::SerialOutputPane Close Tab タブを閉じる diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index d6c742b54e8..d94b2695310 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -42296,7 +42296,7 @@ Row: %4, Column: %5 - SerialTerminal::Internal::SerialControl + ::SerialTerminal Unable to open port %1: %2. Не удалось открыть порт %1: %2. @@ -42325,9 +42325,6 @@ Row: %4, Column: %5 Serial port error: %1 (%2) Ошибка последовательного порта: %1 (%2) - - - SerialTerminal::Internal::SerialOutputPane Close Tab Закрыть вкладку @@ -42364,9 +42361,6 @@ Row: %4, Column: %5 Add New Terminal Добавить новый терминал - - - SerialTerminal::Internal::SerialTerminalOutputPane Serial Terminal Последовательный терминал diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index b23dc5c022b..e7c93313e27 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -40666,7 +40666,7 @@ Row: %4, Column: %5 - SerialTerminal::Internal::SerialControl + ::SerialTerminal Unable to open port %1: %2. @@ -40695,9 +40695,6 @@ Row: %4, Column: %5 Serial port error: %1 (%2) - - - SerialTerminal::Internal::SerialOutputPane Close Tab 关闭标签 @@ -40734,9 +40731,6 @@ Row: %4, Column: %5 Add New Terminal - - - SerialTerminal::Internal::SerialTerminalOutputPane Serial Terminal diff --git a/src/plugins/serialterminal/serialcontrol.cpp b/src/plugins/serialterminal/serialcontrol.cpp index b4eb099123c..0c034f1cb18 100644 --- a/src/plugins/serialterminal/serialcontrol.cpp +++ b/src/plugins/serialterminal/serialcontrol.cpp @@ -3,6 +3,7 @@ #include "serialcontrol.h" #include "serialterminalconstants.h" +#include "serialterminaltr.h" #include @@ -42,7 +43,7 @@ bool SerialControl::start() if (!m_serialPort.open(QIODevice::ReadWrite)) { if (!m_retrying) { - appendMessage(tr("Unable to open port %1: %2.") + appendMessage(Tr::tr("Unable to open port %1: %2.") .arg(portName(), m_serialPort.errorString()), Utils::ErrorMessageFormat); } @@ -53,9 +54,9 @@ bool SerialControl::start() m_serialPort.setRequestToSend(m_initialRtsState); if (m_retrying) - appendMessage(tr("Session resumed.") + QString("\n\n"), Utils::NormalMessageFormat); + appendMessage(Tr::tr("Session resumed.") + QString("\n\n"), Utils::NormalMessageFormat); else - appendMessage(tr("Starting new session on %1...").arg(portName()) + "\n", Utils::NormalMessageFormat); + appendMessage(Tr::tr("Starting new session on %1...").arg(portName()) + "\n", Utils::NormalMessageFormat); m_retrying = false; @@ -80,7 +81,7 @@ void SerialControl::stop(bool force) // Print paused or finished message if (force || (m_running && !m_retrying)) { appendMessage(QString("\n") - + tr("Session finished on %1.").arg(portName()) + + Tr::tr("Session finished on %1.").arg(portName()) + QString("\n\n"), Utils::NormalMessageFormat); @@ -89,7 +90,7 @@ void SerialControl::stop(bool force) emit runningChanged(false); } else if (m_running && m_retrying) { appendMessage(QString("\n") - + tr("Session paused...") + + Tr::tr("Session paused...") + QString("\n"), Utils::NormalMessageFormat); m_running = false; @@ -105,7 +106,7 @@ bool SerialControl::isRunning() const QString SerialControl::displayName() const { - return portName().isEmpty() ? tr("No Port") : portName(); + return portName().isEmpty() ? Tr::tr("No Port") : portName(); } bool SerialControl::canReUseOutputPane(const SerialControl *other) const @@ -190,7 +191,7 @@ void SerialControl::handleError(QSerialPort::SerialPortError error) if (!m_retrying && error != QSerialPort::NoError) appendMessage(QString("\n") - + tr("Serial port error: %1 (%2)").arg(m_serialPort.errorString()).arg(error) + + Tr::tr("Serial port error: %1 (%2)").arg(m_serialPort.errorString()).arg(error) + QString("\n"), Utils::ErrorMessageFormat); diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp index 713190c16ab..7a92424d7b8 100644 --- a/src/plugins/serialterminal/serialoutputpane.cpp +++ b/src/plugins/serialterminal/serialoutputpane.cpp @@ -6,6 +6,7 @@ #include "consolelineedit.h" #include "serialcontrol.h" #include "serialterminalconstants.h" +#include "serialterminaltr.h" #include #include @@ -113,9 +114,9 @@ SerialOutputPane::SerialOutputPane(Settings &settings) : m_tabWidget(new TabWidget), m_settings(settings), m_devicesModel(new SerialDeviceModel), - m_closeCurrentTabAction(new QAction(tr("Close Tab"), this)), - m_closeAllTabsAction(new QAction(tr("Close All Tabs"), this)), - m_closeOtherTabsAction(new QAction(tr("Close Other Tabs"), this)) + m_closeCurrentTabAction(new QAction(Tr::tr("Close Tab"), this)), + m_closeAllTabsAction(new QAction(Tr::tr("Close All Tabs"), this)), + m_closeOtherTabsAction(new QAction(Tr::tr("Close Other Tabs"), this)) { createToolButtons(); @@ -138,7 +139,7 @@ SerialOutputPane::SerialOutputPane(Settings &settings) : layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(2); - m_inputLine->setPlaceholderText(tr("Type text and hit Enter to send.")); + m_inputLine->setPlaceholderText(Tr::tr("Type text and hit Enter to send.")); inputLayout->addWidget(m_inputLine); connect(m_inputLine, &QLineEdit::returnPressed, this, &SerialOutputPane::sendInput); @@ -173,7 +174,7 @@ QList SerialOutputPane::toolBarWidgets() const QString SerialOutputPane::displayName() const { - return tr(Constants::OUTPUT_PANE_TITLE); + return Tr::tr(Constants::OUTPUT_PANE_TITLE); } int SerialOutputPane::priorityInStatusBar() const @@ -287,7 +288,7 @@ void SerialOutputPane::createNewOutputWindow(SerialControl *rc) connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged, this, fontSettingsChanged); fontSettingsChanged(); - ow->setWindowTitle(tr("Serial Terminal Window")); + ow->setWindowTitle(Tr::tr("Serial Terminal Window")); // TODO: wordwrap, maxLineCount, zoom/wheelZoom (add to settings) auto controlTab = SerialControlTab(rc, ow); @@ -323,7 +324,7 @@ void SerialOutputPane::createToolButtons() // Connect button m_connectButton = new QToolButton; m_connectButton->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR.icon()); - m_connectButton->setToolTip(tr("Connect")); + m_connectButton->setToolTip(Tr::tr("Connect")); m_connectButton->setEnabled(false); connect(m_connectButton, &QToolButton::clicked, this, &SerialOutputPane::connectControl); @@ -331,7 +332,7 @@ void SerialOutputPane::createToolButtons() // Disconnect button m_disconnectButton = new QToolButton; m_disconnectButton->setIcon(Utils::Icons::STOP_SMALL_TOOLBAR.icon()); - m_disconnectButton->setToolTip(tr("Disconnect")); + m_disconnectButton->setToolTip(Tr::tr("Disconnect")); m_disconnectButton->setEnabled(false); connect(m_disconnectButton, &QToolButton::clicked, @@ -340,7 +341,7 @@ void SerialOutputPane::createToolButtons() // Reset button m_resetButton = new QToolButton; m_resetButton->setIcon(Utils::Icons::RELOAD_TOOLBAR.icon()); - m_resetButton->setToolTip(tr("Reset Board")); + m_resetButton->setToolTip(Tr::tr("Reset Board")); m_resetButton->setEnabled(false); connect(m_resetButton, &QToolButton::clicked, @@ -349,7 +350,7 @@ void SerialOutputPane::createToolButtons() // New terminal button m_newButton = new QToolButton; m_newButton->setIcon(Utils::Icons::PLUS_TOOLBAR.icon()); - m_newButton->setToolTip(tr("Add New Terminal")); + m_newButton->setToolTip(Tr::tr("Add New Terminal")); m_newButton->setEnabled(true); connect(m_newButton, &QToolButton::clicked, diff --git a/src/plugins/serialterminal/serialterminal.qbs b/src/plugins/serialterminal/serialterminal.qbs index e8fb4822bed..0ee7f414a91 100644 --- a/src/plugins/serialterminal/serialterminal.qbs +++ b/src/plugins/serialterminal/serialterminal.qbs @@ -23,5 +23,6 @@ QtcPlugin { "serialterminalplugin.h", "serialterminalsettings.cpp", "serialterminalsettings.h", + "serialterminaltr.h", ] } diff --git a/src/plugins/serialterminal/serialterminalconstants.h b/src/plugins/serialterminal/serialterminalconstants.h index 58cbb4f36e3..cc2f67ef335 100644 --- a/src/plugins/serialterminal/serialterminalconstants.h +++ b/src/plugins/serialterminal/serialterminalconstants.h @@ -8,7 +8,7 @@ namespace SerialTerminal { namespace Constants { -const char OUTPUT_PANE_TITLE[] = QT_TRANSLATE_NOOP("SerialTerminal::Internal::SerialTerminalOutputPane", "Serial Terminal"); +const char OUTPUT_PANE_TITLE[] = QT_TRANSLATE_NOOP("::SerialTerminal", "Serial Terminal"); const char LOGGING_CATEGORY[] = "qtc.serialterminal.outputpane"; diff --git a/src/plugins/serialterminal/serialterminalsettings.cpp b/src/plugins/serialterminal/serialterminalsettings.cpp index 87e8824c0f0..db938ce673a 100644 --- a/src/plugins/serialterminal/serialterminalsettings.cpp +++ b/src/plugins/serialterminal/serialterminalsettings.cpp @@ -3,6 +3,7 @@ #include "serialterminalsettings.h" #include "serialterminalconstants.h" +#include "serialterminaltr.h" #include #include @@ -22,10 +23,10 @@ void readSetting(const QSettings &settings, T &value, const QString &key) { Settings::Settings() { lineEndings = { - {QObject::tr("None"), ""}, - {QObject::tr("LF"), "\n"}, - {QObject::tr("CR"), "\r"}, - {QObject::tr("CRLF"), "\r\n"} + {Tr::tr("None"), ""}, + {Tr::tr("LF"), "\n"}, + {Tr::tr("CR"), "\r"}, + {Tr::tr("CRLF"), "\r\n"} }; defaultLineEndingIndex = 1; } diff --git a/src/plugins/serialterminal/serialterminaltr.h b/src/plugins/serialterminal/serialterminaltr.h new file mode 100644 index 00000000000..0dc1fb5234d --- /dev/null +++ b/src/plugins/serialterminal/serialterminaltr.h @@ -0,0 +1,15 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +#pragma once + +#include + +namespace SerialTerminal { + +struct Tr +{ + Q_DECLARE_TR_FUNCTIONS(::SerialTerminal) +}; + +} // namespace SerialTerminal