1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace 'Qt Designer' and 'Qt Widgets Designer' in code

Browse Source 
Use new term in examples, code comments, error messages and and mime types.

Task-number: QTBUG-122253
Change-Id: I355452d6eb02a7a0ffbb20acf82ddb8ebbfa4837
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Kai Köhne 2024-02-28 14:47:45 +01:00
parent 7678edebba
commit 5e699c2a8b
15 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/widgets/doc/src/simpletreemodel.qdoc
View File

@ -295,14 +295,14 @@
We begin with a text file in the following format: We begin with a text file in the following format:
\code \code
Getting Started How to familiarize yourself with Qt Designer Getting Started How to familiarize yourself with Qt Widgets Designer
Launching Designer Running the Qt Designer application Launching Designer Running the Qt Widgets Designer application
The User Interface How to interact with Qt Designer The User Interface How to interact with Qt Widgets Designer
\endcode \endcode
\dots \dots
\code \code
Connection Editing Mode Connecting widgets together with signals and slots 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 Editing Connections Changing existing connections
\endcode \endcode

10
examples/widgets/itemviews/editabletreemodel/default.txt
View File

@ -1,6 +1,6 @@
Getting Started How to familiarize yourself with Qt Designer Getting Started How to familiarize yourself with Qt Widgets Designer
Launching Designer Running the Qt Designer application Launching Designer Running the Qt Widgets Designer application
The User Interface How to interact with Qt Designer The User Interface How to interact with Qt Widgets Designer
Designing a Component Creating a GUI for your application Designing a Component Creating a GUI for your application
Creating a Dialog How to create a dialog 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 Without Auto-Connect How to connect widgets without a naming scheme
A Dialog With Auto-Connect Using automatic connections 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 Managing Forms Loading and saving forms
Editing a Form Basic editing techniques Editing a Form Basic editing techniques
The Property Editor Changing widget properties The Property Editor Changing widget properties
@ -36,5 +36,5 @@ Using Containers How to group widgets together
Toolbox Widgets QToolBox Toolbox Widgets QToolBox
Connection Editing Mode Connecting widgets together with signals and slots 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 Editing Connections Changing existing connections

10
examples/widgets/itemviews/simpletreemodel/default.txt
View File

@ -1,6 +1,6 @@
Getting Started How to familiarize yourself with Qt Designer Getting Started How to familiarize yourself with Qt Widgets Designer
Launching Designer Running the Qt Designer application Launching Designer Running the Qt Widgets Designer application
The User Interface How to interact with Qt Designer The User Interface How to interact with Qt Widgets Designer
Designing a Component Creating a GUI for your application Designing a Component Creating a GUI for your application
Creating a Dialog How to create a dialog 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 Without Auto-Connect How to connect widgets without a naming scheme
A Dialog With Auto-Connect Using automatic connections 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 Managing Forms Loading and saving forms
Editing a Form Basic editing techniques Editing a Form Basic editing techniques
The Property Editor Changing widget properties The Property Editor Changing widget properties
@ -36,5 +36,5 @@ Using Containers How to group widgets together
Toolbox Widgets QToolBox Toolbox Widgets QToolBox
Connection Editing Mode Connecting widgets together with signals and slots 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 Editing Connections Changing existing connections

62
src/corelib/mimetypes/mime/packages/freedesktop.org.xml
View File

@ -10699,39 +10699,39 @@ command to generate the output files.
<glob pattern="*.udeb"/> <glob pattern="*.udeb"/>
</mime-type> </mime-type>
<mime-type type="application/x-designer"> <mime-type type="application/x-designer">
<comment>Qt Designer interface document</comment> <comment>Qt Widgets Designer interface document</comment>
<comment xml:lang="zh_TW">Qt Designer 介面文件</comment> <comment xml:lang="zh_TW">Qt Widgets Designer 介面文件</comment>
<comment xml:lang="zh_CN">Qt Designer 界面文档</comment> <comment xml:lang="zh_CN">Qt Widgets Designer 界面文档</comment>
<comment xml:lang="uk">документ інтерфейсу Qt Designer</comment> <comment xml:lang="uk">документ інтерфейсу Qt Widgets Designer</comment>
<comment xml:lang="tr">Qt Designer arayüz belgesi</comment> <comment xml:lang="tr">Qt Widgets Designer arayüz belgesi</comment>
<comment xml:lang="sv">Qt Designer-gränssnittsdokument</comment> <comment xml:lang="sv">Qt Widgets Designer-gränssnittsdokument</comment>
<comment xml:lang="sq">dokument ndërfaqesh Qt Designer</comment> <comment xml:lang="sq">dokument ndërfaqesh Qt Widgets Designer</comment>
<comment xml:lang="sl">Dokument vmesnika Qt Designer</comment> <comment xml:lang="sl">Dokument vmesnika Qt Widgets Designer</comment>
<comment xml:lang="si">Qt Designer අතුරුමුහුණත් ලේඛනය</comment> <comment xml:lang="si">Qt Widgets Designer අතුරුමුහුණත් ලේඛනය</comment>
<comment xml:lang="ru">Документ интерфейса Qt Designer</comment> <comment xml:lang="ru">Документ интерфейса Qt Widgets Designer</comment>
<comment xml:lang="pt_BR">Documento de interface do Qt Designer</comment> <comment xml:lang="pt_BR">Documento de interface do Qt Widgets Designer</comment>
<comment xml:lang="pt">documento de interface Qt Designer</comment> <comment xml:lang="pt">documento de interface Qt Widgets Designer</comment>
<comment xml:lang="pl">Dokument interfejsu Qt Designer</comment> <comment xml:lang="pl">Dokument interfejsu Qt Widgets Designer</comment>
<comment xml:lang="nl">Qt Designer-interfacedocument</comment> <comment xml:lang="nl">Qt Widgets Designer-interfacedocument</comment>
<comment xml:lang="ko">Qt 디자이너 인터페이스 문서</comment> <comment xml:lang="ko">Qt 디자이너 인터페이스 문서</comment>
<comment xml:lang="kk">Qt Designer интерфейс құжаты</comment> <comment xml:lang="kk">Qt Widgets Designer интерфейс құжаты</comment>
<comment xml:lang="ja">Qt Designer インターフェイスドキュメント</comment> <comment xml:lang="ja">Qt Widgets Designer インターフェイスドキュメント</comment>
<comment xml:lang="it">Documento interfaccia Qt Designer</comment> <comment xml:lang="it">Documento interfaccia Qt Widgets Designer</comment>
<comment xml:lang="is">Qt Designer viðmótsskjal</comment> <comment xml:lang="is">Qt Widgets Designer viðmótsskjal</comment>
<comment xml:lang="id">Dokumen antarmuka Qt Designer</comment> <comment xml:lang="id">Dokumen antarmuka Qt Widgets Designer</comment>
<comment xml:lang="hu">Qt Designer felületleíró dokumentum</comment> <comment xml:lang="hu">Qt Widgets Designer felületleíró dokumentum</comment>
<comment xml:lang="hr">Qt Designer dokument sučelja</comment> <comment xml:lang="hr">Qt Widgets Designer dokument sučelja</comment>
<comment xml:lang="he">מסמך מנשק של Qt Designer</comment> <comment xml:lang="he">מסמך מנשק של Qt Widgets Designer</comment>
<comment xml:lang="fr">document d'interface Qt Designer</comment> <comment xml:lang="fr">document d'interface Qt Widgets Designer</comment>
<comment xml:lang="fi">Qt Designer -käyttöliittymän asiakirja</comment> <comment xml:lang="fi">Qt Widgets Designer -käyttöliittymän asiakirja</comment>
<comment xml:lang="eu">Qt Designer interfaze dokumentua</comment> <comment xml:lang="eu">Qt Widgets Designer interfaze dokumentua</comment>
<comment xml:lang="es">documento de interfaz de Qt Designer</comment> <comment xml:lang="es">documento de interfaz de Qt Widgets Designer</comment>
<comment xml:lang="en_GB">Qt Designer interface document</comment> <comment xml:lang="en_GB">Qt Widgets Designer interface document</comment>
<comment xml:lang="de">Qt-Designer-Oberflächendokument</comment> <comment xml:lang="de">Qt-Designer-Oberflächendokument</comment>
<comment xml:lang="da">Qt Designer-brugerflade-dokument</comment> <comment xml:lang="da">Qt Widgets Designer-brugerflade-dokument</comment>
<comment xml:lang="ca">document d'interfície Qt Designer</comment> <comment xml:lang="ca">document d'interfície Qt Widgets Designer</comment>
<comment xml:lang="bg">Документ — интерфейс, Qt Designer</comment> <comment xml:lang="bg">Документ — интерфейс, Qt Widgets Designer</comment>
<comment xml:lang="be">дакумент інтэрфейсу Qt Designer</comment> <comment xml:lang="be">дакумент інтэрфейсу Qt Widgets Designer</comment>
<comment xml:lang="ar">مستند واجهة مصمم كيوت</comment> <comment xml:lang="ar">مستند واجهة مصمم كيوت</comment>
<generic-icon name="x-office-document"/> <generic-icon name="x-office-document"/>
<sub-class-of type="application/xml"/> <sub-class-of type="application/xml"/>

2
src/plugins/platforms/cocoa/qcocoawindow.mm
View File

@ -514,7 +514,7 @@ NSInteger QCocoaWindow::windowLevel(Qt::WindowFlags flags)
auto *nsWindow = transientCocoaWindow->nativeWindow(); auto *nsWindow = transientCocoaWindow->nativeWindow();
// We only upgrade the window level for "special" windows, to work // 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. // palette window (QTBUG-31779). This should be fixed in designer.
if (type != Qt::Window) if (type != Qt::Window)
windowLevel = qMax(windowLevel, nsWindow.level); windowLevel = qMax(windowLevel, nsWindow.level);

2
src/tools/rcc/rcc.cpp
View File

@ -21,7 +21,7 @@
# include <zstd.h> # include <zstd.h>
#endif #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 QT_BEGIN_NAMESPACE

2
src/tools/rcc/rcc.h
View File

@ -2,7 +2,7 @@
// Copyright (C) 2018 Intel Corporation. // Copyright (C) 2018 Intel Corporation.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // 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 #ifndef RCC_H
#define RCC_H #define RCC_H

2
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -2155,7 +2155,7 @@ QString WriteInitialization::pixCall(const DomProperty *p) const
s = p->elementPixmap()->text(); s = p->elementPixmap()->text();
break; break;
default: 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())); qPrintable(m_option.messagePrefix()));
return "QIcon()"_L1; return "QIcon()"_L1;
break; break;

4
src/tools/uic/uic.cpp
View File

@ -165,7 +165,7 @@ DomUI *Uic::parseUiFile(QXmlStreamReader &reader)
&& !ui) { && !ui) {
const double version = versionFromUiAttribute(reader); const double version = versionFromUiAttribute(reader);
if (version < 4.0) { 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)); fprintf(stderr, "%s\n", qPrintable(msg));
return nullptr; return nullptr;
} }
@ -202,7 +202,7 @@ bool Uic::write(QIODevice *in)
double version = ui->attributeVersion().toDouble(); double version = ui->attributeVersion().toDouble();
if (version < 4.0) { 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; return false;
} }

2
src/widgets/styles/qstylehelper.cpp
View File

@ -202,7 +202,7 @@ QPolygonF calcLines(const QStyleOptionSlider *dial)
qreal xc = width / 2 + 0.5; qreal xc = width / 2 + 0.5;
qreal yc = height / 2 + 0.5; qreal yc = height / 2 + 0.5;
const int ns = dial->tickInterval; 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; return poly;
int notches = (dial->maximum + ns - 1 - dial->minimum) / ns; int notches = (dial->maximum + ns - 1 - dial->minimum) / ns;
if (notches <= 0) if (notches <= 0)

2
tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
View File

@ -335,7 +335,7 @@ void tst_QMetaProperty::conversion()
void tst_QMetaProperty::enumsFlags() void tst_QMetaProperty::enumsFlags()
{ {
// QTBUG-83689, verify that enumerations and flags can be assigned from int, // 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; EnumFlagsTester t;
auto mo = t.metaObject(); auto mo = t.metaObject();

4
tests/auto/gui/text/qtextmarkdownwriter/data/example.md
View File

@ -40,7 +40,7 @@ numerals in the same list structure:
1. Introduction 1. Introduction
2. Qt Tools 2. Qt Tools
1) Qt Assistant 1) Qt Assistant
2) Qt Designer 2) Qt Widgets Designer
1. Form Editor 1. Form Editor
2. Component Architecture 2. Component Architecture
3) Qt Linguist 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 ||| |9:00 - 11:00 |Introduction to Qt |||
|11:00 - 13:00|Using qmake |Object-oriented Programming|Layouts in 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 | | |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 *Try adding text to the cells in the table and experiment with the alignment of

2
tests/manual/dialogs/wizardpanel.cpp
View File

@ -229,7 +229,7 @@ Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags)
addPage(new WizardPage(tr("Page 3"), this)); 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 { class WizardEmbeddingDialog : public QDialog {
public: public:
explicit WizardEmbeddingDialog(QWidget *parent = nullptr); explicit WizardEmbeddingDialog(QWidget *parent = nullptr);

4
tests/manual/examples/widgets/richtext/textedit/example.html
View File

@ -19,7 +19,7 @@ hr { height: 1px; border-width: 0; }
<ol style="-qt-list-indent: 1;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Introduction</li> <ol style="-qt-list-indent: 1;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Introduction</li>
<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Tools </li></ol> <li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Tools </li></ol>
<ol type=a style="-qt-list-indent: 2;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Assistant</li> <ol type=a style="-qt-list-indent: 2;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Assistant</li>
<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Designer</li> <li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Widgets Designer</li>
<ol type=A style="-qt-list-indent: 3;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Form Editor</li> <ol type=A style="-qt-list-indent: 3;"><li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Form Editor</li>
<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Component Architecture</li></ol> <li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Component Architecture</li></ol>
<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Linguist</li></ol> <li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Qt Linguist</li></ol>
@ -64,7 +64,7 @@ hr { height: 1px; border-width: 0; }
<td> <td>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">13:00 - 15:00 </span></p></td> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">13:00 - 15:00 </span></p></td>
<td> <td>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Qt Designer</span> Tutorial </p></td> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Qt Widgets Designer</span> Tutorial </p></td>
<td rowspan="2"> <td rowspan="2">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Extreme Programming </p></td> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Extreme Programming </p></td>
<td> <td>

4
tests/manual/examples/widgets/richtext/textedit/example.md
View File

@ -43,7 +43,7 @@ numerals in the same list structure:
1. Introduction 1. Introduction
2. Qt Tools 2. Qt Tools
1) Qt Assistant 1) Qt Assistant
2) Qt Designer 2) Qt Widgets Designer
1. Form Editor 1. Form Editor
2. Component Architecture 2. Component Architecture
3) Qt Linguist 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 ||| | 9:00 - 11:00 | Introduction to Qt |||
| 11:00 - 13:00 | Using qmake | Object-oriented Programming | Layouts in 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 | &nbsp; | &nbsp; | | 15:00 - 17:00 | Qt Linguist and Internationalization | &nbsp; | &nbsp; |
*Try adding text to the cells in the table and experiment with the alignment of *Try adding text to the cells in the table and experiment with the alignment of