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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Change-Id: Iff4973fc4116122bcaa7aa9434294dba875ef56a
This commit is contained in:
Orgad Shaneh
2023-02-14 13:08:27 +02:00
parent 6383146b0e b4f665f8ac
commit 6a0a4ac5e4
303 changed files with 5518 additions and 6428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/languageclient/languageclient_global.h
View File

@@ -19,15 +19,15 @@ namespace Constants {
const char LANGUAGECLIENT_SETTINGS_CATEGORY[] = "ZY.LanguageClient";
const char LANGUAGECLIENT_SETTINGS_PAGE[] = "LanguageClient.General";
const char LANGUAGECLIENT_STDIO_SETTINGS_ID[] = "LanguageClient::StdIOSettingsID";
const char LANGUAGECLIENT_SETTINGS_TR[] = QT_TRANSLATE_NOOP("::LanguageClient", "Language Client");
const char LANGUAGECLIENT_SETTINGS_TR[] = QT_TRANSLATE_NOOP("QtC::LanguageClient", "Language Client");
const char LANGUAGECLIENT_DOCUMENT_FILTER_ID[] = "Current Document Symbols";
const char LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Symbols in Current Document");
const char LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::LanguageClient", "Symbols in Current Document");
const char LANGUAGECLIENT_WORKSPACE_FILTER_ID[] = "Workspace Symbols";
const char LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Symbols in Workspace");
const char LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::LanguageClient", "Symbols in Workspace");
const char LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_ID[] = "Workspace Classes and Structs";
const char LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Classes and Structs in Workspace");
const char LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::LanguageClient", "Classes and Structs in Workspace");
const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_ID[] = "Workspace Functions and Methods";
const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Functions and Methods in Workspace");
const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::LanguageClient", "Functions and Methods in Workspace");
} // namespace Constants
} // namespace LanguageClient

4
src/plugins/languageclient/languageclientoutline.cpp
View File

@@ -13,6 +13,7 @@
#include <texteditor/outlinefactory.h>
#include <texteditor/textdocument.h>
#include <texteditor/texteditor.h>
#include <texteditor/texteditortr.h>
#include <utils/dropsupport.h>
#include <utils/itemviews.h>
#include <utils/navigationtreeview.h>
@@ -326,8 +327,7 @@ OutlineComboBox::OutlineComboBox(Client *client, TextEditor::BaseTextEditor *edi
setMaxVisibleItems(40);
setContextMenuPolicy(Qt::ActionsContextMenu);
const QString sortActionText
= QCoreApplication::translate("::TextEditor", "Sort Alphabetically");
const QString sortActionText = ::TextEditor::Tr::tr("Sort Alphabetically");
auto sortAction = new QAction(sortActionText, this);
sortAction->setCheckable(true);
sortAction->setChecked(sorted);

2
src/plugins/languageclient/languageclienttr.h
View File

@@ -9,7 +9,7 @@ namespace LanguageClient {
struct Tr
{
Q_DECLARE_TR_FUNCTIONS(::LanguageClient)
Q_DECLARE_TR_FUNCTIONS(QtC::LanguageClient)
};
} // namespace LanguageClient