From b74f814ae26b07fe1678ee58dfb651eb3d4717da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 28 Feb 2024 14:23:07 +0100 Subject: [PATCH] Doc: Further replace 'Qt Designer' with 'Qt Widgets Designer' Use \QD macro wherever possible. Amends 8aceccc7eb075 Task-number: QTBUG-122253 Change-Id: I276dabd40fb81486f6380fd90cf9968990932a24 Reviewed-by: Joerg Bornemann --- .../tutorials/notepad/gettingstartedqt.qdoc | 10 +++++----- qmake/doc/src/qmake-manual.qdoc | 4 ++-- src/corelib/global/qflags.qdoc | 2 +- src/corelib/kernel/qcoreapplication.cpp | 2 +- src/corelib/kernel/qobject.cpp | 4 ++-- .../doc/src/widgets-and-layouts/focus.qdoc | 2 +- .../doc/src/widgets-and-layouts/layout.qdoc | 4 ++-- .../doc/src/widgets-and-layouts/stylesheet.qdoc | 16 ++++++++-------- src/widgets/doc/src/widgets-tutorial.qdoc | 2 +- .../doc/src/windows-and-dialogs/mainwindow.qdoc | 4 ++-- .../widgets/richtext/textedit/textedit.qdoc | 4 ++-- tests/manual/findfiles/findfiles.qdoc | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc b/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc index e1d93129870..0979cecb189 100644 --- a/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc +++ b/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc @@ -143,25 +143,25 @@ The wizard generates a user interface definition in XML format: notepad.ui. When you open the notepad.ui file in Qt Creator, it automatically - opens in the integrated Qt Designer. + opens in the integrated \QD. When you build the application, Qt Creator launches the Qt \l{User Interface Compiler (uic)} that reads the .ui file and creates a corresponding C++ header file, ui_notepad.h. - \section2 Using Qt Designer + \section2 Using \QD The wizard creates an application that uses a QMainWindow. It has its own layout to which you can add a menu bar, dock widgets, toolbars, and a status bar. The center area can be occupied by any kind of widget. The wizard places the Notepad widget there. - To add widgets in Qt Designer: + To add widgets in \QD: \list 1 \li In the Qt Creator \uicontrol Edit mode, double-click the notepad.ui file in the \uicontrol Projects view to launch the file in the integrated - Qt Designer. + \QD. \li Drag and drop widgets Text Edit (QTextEdit) to the form. \li Press \key {Ctrl+A} (or \key {Cmd+A}) to select the widgets and click \uicontrol {Lay out Vertically} (or press \key {Ctrl+L}) to apply a vertical @@ -169,7 +169,7 @@ \li Press \key {Ctrl+S} (or \key {Cmd+S}) to save your changes. \endlist - The UI now looks as follows in Qt Designer: + The UI now looks as follows in \QD: \image notepad4.png diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 3d553afb726..e762832821f 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -5465,7 +5465,7 @@ \li \l{HEADERS} - A list of header files for the application. \li \l{SOURCES} - A list of C++ source files for the application. \li \l{FORMS} - A list of UI files for the application (created using - Qt Designer). + \QD). \li \l{LEXSOURCES} - A list of Lex source files for the application. \li \l{YACCSOURCES} - A list of Yacc source files for the application. @@ -5600,7 +5600,7 @@ \li VERSION - The version number of the target library. For example, 2.3.1. \endlist - \section2 Building a Qt Designer Plugin + \section2 Building a Qt Widgets Designer Plugin \QD plugins are built using a specific set of configuration settings that depend on the way Qt was configured for your system. For convenience, these diff --git a/src/corelib/global/qflags.qdoc b/src/corelib/global/qflags.qdoc index 598576bfe6b..dd3b1e4c9b0 100644 --- a/src/corelib/global/qflags.qdoc +++ b/src/corelib/global/qflags.qdoc @@ -98,7 +98,7 @@ \section1 Flags and the Meta-Object System The Q_DECLARE_FLAGS() macro does not expose the flags to the meta-object - system, so they cannot be used by Qt Script or edited in Qt Designer. + system, so they cannot be used by Qt Script or edited in \QD. To make the flags available for these purposes, the Q_FLAG() macro must be used: diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 1728bbeb5ab..5be217b5fd8 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2202,7 +2202,7 @@ void QCoreApplicationPrivate::quit() to all toplevel widgets, where a reimplementation of changeEvent can re-translate the user interface by passing user-visible strings via the tr() function to the respective property setters. User-interface classes - generated by Qt Designer provide a \c retranslateUi() function that can be + generated by \QD provide a \c retranslateUi() function that can be called. The function returns \c true on success and false on failure. diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 828a48e21e0..cbdb95079b0 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -893,9 +893,9 @@ QMetaCallEvent* QMetaCallEvent::create_impl(QtPrivate::SlotObjUniquePtr slotObj, \l uic generates code that invokes this function to enable auto-connection to be performed between widgets on forms created - with \e{Qt Designer}. More information about using auto-connection with \e{Qt Designer} is + with \e{\QD}. More information about using auto-connection with \e{\QD} is given in the \l{Using a Designer UI File in Your Application} section of - the \e{Qt Designer} manual. + the \l{Qt Widgets Designer Manual}{\QD} manual. \section1 Dynamic Properties diff --git a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc index 22ef1bc9ddc..b49fc89993c 100644 --- a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc @@ -54,7 +54,7 @@ You can customize the tab order using QWidget::setTabOrder(). (If you don't, \uicontrol Tab generally moves focus in the order of widget - construction.) Qt Designer provides a means of visually + construction.) \QD provides a means of visually changing the tab order. Since pressing \uicontrol Tab is so common, most widgets that can have focus diff --git a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc index 23d1ae9a51b..5f1d5a7ea9d 100644 --- a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc @@ -48,8 +48,8 @@ Qt's layout classes were designed for hand-written C++ code, allowing measurements to be specified in pixels for simplicity, so they are easy to - understand and use. The code generated for forms created using Qt Designer also - uses the layout classes. Qt Designer is useful to use when experimenting with the + understand and use. The code generated for forms created using \QD also + uses the layout classes. \QD is useful to use when experimenting with the design of a form since it avoids the compile, link and run cycle usually involved in user interface development. diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc index d426a52051a..f4c9eb2cc34 100644 --- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -28,7 +28,7 @@ \list \li \l{Overview} \li \l{The Style Sheet Syntax} - \li \l{Qt Designer Integration} + \li \l{Qt Widgets Designer Integration} \li \l{Customizing Qt Widgets Using Style Sheets} \li \l{Qt Style Sheets Reference} \li \l{Qt Style Sheets Examples} @@ -75,7 +75,7 @@ consideration. Unlike palette fiddling, style sheets offer guarantees: If you set the background color of a QPushButton to be red, you can be assured that the button will have a red background - in all styles, on all platforms. In addition, Qt Designer + in all styles, on all platforms. In addition, \QD provides style sheet integration, making it easy to view the effects of a style sheet in different \l{QStyle}{widget styles}. @@ -100,7 +100,7 @@ /*! \page stylesheet-syntax.html \previouspage Qt Style Sheets - \nextpage Qt Designer Integration + \nextpage Qt Widgets Designer Integration \title The Style Sheet Syntax Qt Style Sheet terminology and syntactic rules are almost @@ -523,22 +523,22 @@ \page stylesheet-designer.html \previouspage The Style Sheet Syntax \nextpage Customizing Qt Widgets Using Style Sheets - \title Qt Designer Integration + \title Qt Widgets Designer Integration - Qt Designer{Qt Designer} is an excellent tool + \l{Qt Widgets Designer Manual}{\QD} is an excellent tool to preview style sheets. You can right-click on any widget in Designer and select \uicontrol{Change styleSheet...} to set the style sheet. \image designer-stylesheet-options.png - In Qt 4.2 and later, Qt Designer also includes a + In Qt 4.2 and later, \QD also includes a style sheet syntax highlighter and validator. The validator indicates if the syntax is valid or invalid, at the bottom left of the \uicontrol{Edit Style Sheet} dialog. \image designer-validator-highlighter.png - When you click \uicontrol{OK} or \uicontrol{Apply}, Qt Designer will automatically display + When you click \uicontrol{OK} or \uicontrol{Apply}, \QD will automatically display the widget with its new stylesheet. \image designer-stylesheet-usage.png @@ -546,7 +546,7 @@ /*! \page stylesheet-customizing.html - \previouspage Qt Designer Integration + \previouspage Qt Widgets Designer Integration \nextpage Qt Style Sheets Reference \title Customizing Qt Widgets Using Style Sheets diff --git a/src/widgets/doc/src/widgets-tutorial.qdoc b/src/widgets/doc/src/widgets-tutorial.qdoc index 6e9447395cf..e0ad4d850c0 100644 --- a/src/widgets/doc/src/widgets-tutorial.qdoc +++ b/src/widgets/doc/src/widgets-tutorial.qdoc @@ -215,7 +215,7 @@ As well as QHBoxLayout and QVBoxLayout, Qt also provides QGridLayout and QFormLayout classes to help with more complex user interfaces. - These can be seen if you run Qt Designer. + These can be seen if you run \QD. \section1 Setting up the Model diff --git a/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc b/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc index 8e3db64de08..6b0315f10a8 100644 --- a/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc +++ b/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc @@ -52,8 +52,8 @@ In addition, Qt provides a number of ready-made standard dialogs that can be used for standard tasks like file or font selection. - Both main windows and dialogs can be created with Qt Designer, Qt's visual design tool. - Using Qt Designer is a lot faster than hand-coding, and makes it easy to test different + Both main windows and dialogs can be created with \QD, Qt's visual design tool. + Using \QD is a lot faster than hand-coding, and makes it easy to test different design ideas. Creating designs visually and reading the code generated by \l{uic} is a great way to learn Qt! diff --git a/tests/manual/examples/widgets/richtext/textedit/textedit.qdoc b/tests/manual/examples/widgets/richtext/textedit/textedit.qdoc index 938fad36c8f..ce574353b46 100644 --- a/tests/manual/examples/widgets/richtext/textedit/textedit.qdoc +++ b/tests/manual/examples/widgets/richtext/textedit/textedit.qdoc @@ -9,8 +9,8 @@ \brief This example displays a text editor with the user interface written in pure C++. - A similar example which uses Qt Designer to produce the user - interface is in the \l {Qt Designer Manual}. + A similar example which uses \QD to produce the user + interface is in the \l {Qt Widgets Designer Manual}. See \c{$QTDIR/examples/textedit} for the source code. diff --git a/tests/manual/findfiles/findfiles.qdoc b/tests/manual/findfiles/findfiles.qdoc index bed831d14d0..ec006987034 100644 --- a/tests/manual/findfiles/findfiles.qdoc +++ b/tests/manual/findfiles/findfiles.qdoc @@ -86,7 +86,7 @@ and a stretchable space in a separate \l QHBoxLayout first, to make the buttons appear in the \c Window widget's bottom right corner. - Alternatively, we could have used Qt Designer to construct a UI file, + Alternatively, we could have used \QD to construct a UI file, and \l {uic} to generate this code. \snippet dialogs/findfiles/window.cpp 1