From 5e699c2a8b50be1c02e354171c98953c4d95c79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 28 Feb 2024 14:47:45 +0100 Subject: [PATCH] Replace 'Qt Designer' and 'Qt Widgets Designer' in code Use new term in examples, code comments, error messages and and mime types. Task-number: QTBUG-122253 Change-Id: I355452d6eb02a7a0ffbb20acf82ddb8ebbfa4837 Reviewed-by: Joerg Bornemann --- examples/widgets/doc/src/simpletreemodel.qdoc | 8 +-- .../itemviews/editabletreemodel/default.txt | 10 +-- .../itemviews/simpletreemodel/default.txt | 10 +-- .../mime/packages/freedesktop.org.xml | 62 +++++++++---------- src/plugins/platforms/cocoa/qcocoawindow.mm | 2 +- src/tools/rcc/rcc.cpp | 2 +- src/tools/rcc/rcc.h | 2 +- src/tools/uic/cpp/cppwriteinitialization.cpp | 2 +- src/tools/uic/uic.cpp | 4 +- src/widgets/styles/qstylehelper.cpp | 2 +- .../qmetaproperty/tst_qmetaproperty.cpp | 2 +- .../text/qtextmarkdownwriter/data/example.md | 4 +- tests/manual/dialogs/wizardpanel.cpp | 2 +- .../widgets/richtext/textedit/example.html | 4 +- .../widgets/richtext/textedit/example.md | 4 +- 15 files changed, 60 insertions(+), 60 deletions(-) diff --git a/examples/widgets/doc/src/simpletreemodel.qdoc b/examples/widgets/doc/src/simpletreemodel.qdoc index aa12a9585ff..d8e5a6faa8b 100644 --- a/examples/widgets/doc/src/simpletreemodel.qdoc +++ b/examples/widgets/doc/src/simpletreemodel.qdoc @@ -295,14 +295,14 @@ We begin with a text file in the following format: \code - Getting Started How to familiarize yourself with Qt Designer - Launching Designer Running the Qt Designer application - The User Interface How to interact with Qt Designer + Getting Started How to familiarize yourself with Qt Widgets Designer + Launching Designer Running the Qt Widgets Designer application + The User Interface How to interact with Qt Widgets Designer \endcode \dots \code Connection Editing Mode Connecting widgets together with signals and slots - Connecting Objects Making connections in Qt Designer + Connecting Objects Making connections in Qt Widgets Designer Editing Connections Changing existing connections \endcode diff --git a/examples/widgets/itemviews/editabletreemodel/default.txt b/examples/widgets/itemviews/editabletreemodel/default.txt index 2b2fb579ae1..c3ea35257cc 100644 --- a/examples/widgets/itemviews/editabletreemodel/default.txt +++ b/examples/widgets/itemviews/editabletreemodel/default.txt @@ -1,6 +1,6 @@ -Getting Started How to familiarize yourself with Qt Designer - Launching Designer Running the Qt Designer application - The User Interface How to interact with Qt Designer +Getting Started How to familiarize yourself with Qt Widgets Designer + Launching Designer Running the Qt Widgets Designer application + The User Interface How to interact with Qt Widgets Designer Designing a Component Creating a GUI for your application Creating a Dialog How to create a dialog @@ -16,7 +16,7 @@ Using a Component in Your Application Generating code from forms A Dialog Without Auto-Connect How to connect widgets without a naming scheme A Dialog With Auto-Connect Using automatic connections -Form Editing Mode How to edit a form in Qt Designer +Form Editing Mode How to edit a form in Qt Widgets Designer Managing Forms Loading and saving forms Editing a Form Basic editing techniques The Property Editor Changing widget properties @@ -36,5 +36,5 @@ Using Containers How to group widgets together Toolbox Widgets QToolBox Connection Editing Mode Connecting widgets together with signals and slots - Connecting Objects Making connections in Qt Designer + Connecting Objects Making connections in Qt Widgets Designer Editing Connections Changing existing connections diff --git a/examples/widgets/itemviews/simpletreemodel/default.txt b/examples/widgets/itemviews/simpletreemodel/default.txt index 2b2fb579ae1..c3ea35257cc 100644 --- a/examples/widgets/itemviews/simpletreemodel/default.txt +++ b/examples/widgets/itemviews/simpletreemodel/default.txt @@ -1,6 +1,6 @@ -Getting Started How to familiarize yourself with Qt Designer - Launching Designer Running the Qt Designer application - The User Interface How to interact with Qt Designer +Getting Started How to familiarize yourself with Qt Widgets Designer + Launching Designer Running the Qt Widgets Designer application + The User Interface How to interact with Qt Widgets Designer Designing a Component Creating a GUI for your application Creating a Dialog How to create a dialog @@ -16,7 +16,7 @@ Using a Component in Your Application Generating code from forms A Dialog Without Auto-Connect How to connect widgets without a naming scheme A Dialog With Auto-Connect Using automatic connections -Form Editing Mode How to edit a form in Qt Designer +Form Editing Mode How to edit a form in Qt Widgets Designer Managing Forms Loading and saving forms Editing a Form Basic editing techniques The Property Editor Changing widget properties @@ -36,5 +36,5 @@ Using Containers How to group widgets together Toolbox Widgets QToolBox Connection Editing Mode Connecting widgets together with signals and slots - Connecting Objects Making connections in Qt Designer + Connecting Objects Making connections in Qt Widgets Designer Editing Connections Changing existing connections diff --git a/src/corelib/mimetypes/mime/packages/freedesktop.org.xml b/src/corelib/mimetypes/mime/packages/freedesktop.org.xml index b7aa6a1995b..e77349a12ec 100644 --- a/src/corelib/mimetypes/mime/packages/freedesktop.org.xml +++ b/src/corelib/mimetypes/mime/packages/freedesktop.org.xml @@ -10699,39 +10699,39 @@ command to generate the output files. - Qt Designer interface document - Qt Designer 介面文件 - Qt Designer 界面文档 - документ інтерфейсу Qt Designer - Qt Designer arayüz belgesi - Qt Designer-gränssnittsdokument - dokument ndërfaqesh Qt Designer - Dokument vmesnika Qt Designer - Qt Designer අතුරුමුහුණත් ලේඛනය - Документ интерфейса Qt Designer - Documento de interface do Qt Designer - documento de interface Qt Designer - Dokument interfejsu Qt Designer - Qt Designer-interfacedocument + Qt Widgets Designer interface document + Qt Widgets Designer 介面文件 + Qt Widgets Designer 界面文档 + документ інтерфейсу Qt Widgets Designer + Qt Widgets Designer arayüz belgesi + Qt Widgets Designer-gränssnittsdokument + dokument ndërfaqesh Qt Widgets Designer + Dokument vmesnika Qt Widgets Designer + Qt Widgets Designer අතුරුමුහුණත් ලේඛනය + Документ интерфейса Qt Widgets Designer + Documento de interface do Qt Widgets Designer + documento de interface Qt Widgets Designer + Dokument interfejsu Qt Widgets Designer + Qt Widgets Designer-interfacedocument Qt 디자이너 인터페이스 문서 - Qt Designer интерфейс құжаты - Qt Designer インターフェイスドキュメント - Documento interfaccia Qt Designer - Qt Designer viðmótsskjal - Dokumen antarmuka Qt Designer - Qt Designer felületleíró dokumentum - Qt Designer dokument sučelja - מסמך מנשק של Qt Designer - document d'interface Qt Designer - Qt Designer -käyttöliittymän asiakirja - Qt Designer interfaze dokumentua - documento de interfaz de Qt Designer - Qt Designer interface document + Qt Widgets Designer интерфейс құжаты + Qt Widgets Designer インターフェイスドキュメント + Documento interfaccia Qt Widgets Designer + Qt Widgets Designer viðmótsskjal + Dokumen antarmuka Qt Widgets Designer + Qt Widgets Designer felületleíró dokumentum + Qt Widgets Designer dokument sučelja + מסמך מנשק של Qt Widgets Designer + document d'interface Qt Widgets Designer + Qt Widgets Designer -käyttöliittymän asiakirja + Qt Widgets Designer interfaze dokumentua + documento de interfaz de Qt Widgets Designer + Qt Widgets Designer interface document Qt-Designer-Oberflächendokument - Qt Designer-brugerflade-dokument - document d'interfície Qt Designer - Документ — интерфейс, Qt Designer - дакумент інтэрфейсу Qt Designer + Qt Widgets Designer-brugerflade-dokument + document d'interfície Qt Widgets Designer + Документ — интерфейс, Qt Widgets Designer + дакумент інтэрфейсу Qt Widgets Designer مستند واجهة مصمم كيوت diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 4a245a0f8af..d2c9bb0196b 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -514,7 +514,7 @@ NSInteger QCocoaWindow::windowLevel(Qt::WindowFlags flags) auto *nsWindow = transientCocoaWindow->nativeWindow(); // We only upgrade the window level for "special" windows, to work - // around Qt Designer parenting the designer windows to the widget + // around Qt Widgets Designer parenting the designer windows to the widget // palette window (QTBUG-31779). This should be fixed in designer. if (type != Qt::Window) windowLevel = qMax(windowLevel, nsWindow.level); diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 2bda7f2977e..0fdba3671d1 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -21,7 +21,7 @@ # include #endif -// Note: A copy of this file is used in Qt Designer (qttools/src/designer/src/lib/shared/rcc.cpp) +// Note: A copy of this file is used in Qt Widgets Designer (qttools/src/designer/src/lib/shared/rcc.cpp) QT_BEGIN_NAMESPACE diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h index 60af1c67cf9..bfc3503da87 100644 --- a/src/tools/rcc/rcc.h +++ b/src/tools/rcc/rcc.h @@ -2,7 +2,7 @@ // Copyright (C) 2018 Intel Corporation. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -// Note: A copy of this file is used in Qt Designer (qttools/src/designer/src/lib/shared/rcc_p.h) +// Note: A copy of this file is used in Qt Widgets Designer (qttools/src/designer/src/lib/shared/rcc_p.h) #ifndef RCC_H #define RCC_H diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 205d6a50a98..c9356a4111c 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2155,7 +2155,7 @@ QString WriteInitialization::pixCall(const DomProperty *p) const s = p->elementPixmap()->text(); break; default: - qWarning("%s: Warning: Unknown icon format encountered. The ui-file was generated with a too-recent version of Designer.", + qWarning("%s: Warning: Unknown icon format encountered. The ui-file was generated with a too-recent version of Qt Widgets Designer.", qPrintable(m_option.messagePrefix())); return "QIcon()"_L1; break; diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index fb0a37d21da..1b10e1d722b 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -165,7 +165,7 @@ DomUI *Uic::parseUiFile(QXmlStreamReader &reader) && !ui) { const double version = versionFromUiAttribute(reader); if (version < 4.0) { - const QString msg = QString::fromLatin1("uic: File generated with too old version of Qt Designer (%1)").arg(version); + const QString msg = QString::fromLatin1("uic: File generated with too old version of Qt Widgets Designer (%1)").arg(version); fprintf(stderr, "%s\n", qPrintable(msg)); return nullptr; } @@ -202,7 +202,7 @@ bool Uic::write(QIODevice *in) double version = ui->attributeVersion().toDouble(); if (version < 4.0) { - fprintf(stderr, "uic: File generated with too old version of Qt Designer\n"); + fprintf(stderr, "uic: File generated with too old version of Qt Widgets Designer\n"); return false; } diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp index 02827de8470..b4616b8c243 100644 --- a/src/widgets/styles/qstylehelper.cpp +++ b/src/widgets/styles/qstylehelper.cpp @@ -202,7 +202,7 @@ QPolygonF calcLines(const QStyleOptionSlider *dial) qreal xc = width / 2 + 0.5; qreal yc = height / 2 + 0.5; const int ns = dial->tickInterval; - if (!ns) // Invalid values may be set by Qt Designer. + if (!ns) // Invalid values may be set by Qt Widgets Designer. return poly; int notches = (dial->maximum + ns - 1 - dial->minimum) / ns; if (notches <= 0) diff --git a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp index e67bab7da46..3bf6211a539 100644 --- a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp +++ b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp @@ -335,7 +335,7 @@ void tst_QMetaProperty::conversion() void tst_QMetaProperty::enumsFlags() { // QTBUG-83689, verify that enumerations and flags can be assigned from int, - // which is important for Qt Designer. + // which is important for Qt Widgets Designer. EnumFlagsTester t; auto mo = t.metaObject(); diff --git a/tests/auto/gui/text/qtextmarkdownwriter/data/example.md b/tests/auto/gui/text/qtextmarkdownwriter/data/example.md index 15b30598e68..8fdad207aea 100644 --- a/tests/auto/gui/text/qtextmarkdownwriter/data/example.md +++ b/tests/auto/gui/text/qtextmarkdownwriter/data/example.md @@ -40,7 +40,7 @@ numerals in the same list structure: 1. Introduction 2. Qt Tools 1) Qt Assistant - 2) Qt Designer + 2) Qt Widgets Designer 1. Form Editor 2. Component Architecture 3) Qt Linguist @@ -70,7 +70,7 @@ column spans, text formatting within cells, and size constraints for columns. |-------------|------------------------------------|---------------------------|-------------------------| |9:00 - 11:00 |Introduction to Qt ||| |11:00 - 13:00|Using qmake |Object-oriented Programming|Layouts in Qt | -|13:00 - 15:00|Qt Designer Tutorial |Extreme Programming |Writing Custom Styles | +|13:00 - 15:00|Qt Widgets Designer Tutorial |Extreme Programming |Writing Custom Styles | |15:00 - 17:00|Qt Linguist and Internationalization|Test-Driven Development | | *Try adding text to the cells in the table and experiment with the alignment of diff --git a/tests/manual/dialogs/wizardpanel.cpp b/tests/manual/dialogs/wizardpanel.cpp index 6fa7d1803a0..5e413960e3a 100644 --- a/tests/manual/dialogs/wizardpanel.cpp +++ b/tests/manual/dialogs/wizardpanel.cpp @@ -229,7 +229,7 @@ Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) addPage(new WizardPage(tr("Page 3"), this)); } -// A dialog using a Wizard as child widget (emulating Qt Designer). +// A dialog using a Wizard as child widget (emulating Qt Widgets Designer). class WizardEmbeddingDialog : public QDialog { public: explicit WizardEmbeddingDialog(QWidget *parent = nullptr); diff --git a/tests/manual/examples/widgets/richtext/textedit/example.html b/tests/manual/examples/widgets/richtext/textedit/example.html index ebae3362e90..038f71acfe5 100644 --- a/tests/manual/examples/widgets/richtext/textedit/example.html +++ b/tests/manual/examples/widgets/richtext/textedit/example.html @@ -19,7 +19,7 @@ hr { height: 1px; border-width: 0; }
  1. Introduction
  2. Qt Tools
  1. Qt Assistant
    2. -
  2. Qt Designer
    3. +
  3. Qt Widgets Designer
    1. Form Editor
    2. Component Architecture
  4. Qt Linguist
@@ -64,7 +64,7 @@ hr { height: 1px; border-width: 0; }

13:00 - 15:00

-

Qt Designer Tutorial

+

Qt Widgets Designer Tutorial

Extreme Programming

diff --git a/tests/manual/examples/widgets/richtext/textedit/example.md b/tests/manual/examples/widgets/richtext/textedit/example.md index 15f3c3cacf3..8a5eed72f60 100644 --- a/tests/manual/examples/widgets/richtext/textedit/example.md +++ b/tests/manual/examples/widgets/richtext/textedit/example.md @@ -43,7 +43,7 @@ numerals in the same list structure: 1. Introduction 2. Qt Tools 1) Qt Assistant - 2) Qt Designer + 2) Qt Widgets Designer 1. Form Editor 2. Component Architecture 3) Qt Linguist @@ -78,7 +78,7 @@ column spans, text formatting within cells, and size constraints for columns. | ------------: | ----------------- | ---------------------- | ------------------------- | | 9:00 - 11:00 | Introduction to Qt ||| | 11:00 - 13:00 | Using qmake | Object-oriented Programming | Layouts in Qt | -| 13:00 - 15:00 | Qt Designer Tutorial | Extreme Programming | Writing Custom Styles | +| 13:00 - 15:00 | Qt Widgets Designer Tutorial | Extreme Programming | Writing Custom Styles | | 15:00 - 17:00 | Qt Linguist and Internationalization |   |   | *Try adding text to the cells in the table and experiment with the alignment of