diff --git a/doc/qtcreator/src/howto/creator-help.qdoc b/doc/qtcreator/src/howto/creator-help.qdoc index 7d8e7908bcc..bdfca10777f 100644 --- a/doc/qtcreator/src/howto/creator-help.qdoc +++ b/doc/qtcreator/src/howto/creator-help.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -51,7 +51,7 @@ \li To display the full help on a Qt class or function, press \key F1 or select \uicontrol {Context Help} in the context menu. The documentation is displayed in a - pane next to the code editor, or, if there is not enough vertical + view next to the code editor, or, if there is not enough vertical space, in the fullscreen \uicontrol Help mode. \li To select and configure how the documentation is displayed in the @@ -215,7 +215,7 @@ You can select the page to display when you open the \uicontrol Help mode in the \uicontrol Tools > \uicontrol Options > \uicontrol Help > \uicontrol General > \uicontrol {On help start} field. - To display the page and help panes that were open when you exited the mode, + To display the page and help views that were open when you exited the mode, select the \uicontrol {Show My Tabs from Last Session} option. However, Web pages are not opened, because loading them would slow down opening the \uicontrol Help mode. @@ -232,7 +232,7 @@ You can filter the documents displayed in the \uicontrol Help mode to find relevant information faster. Select a filter from a list of filters (1). The contents of the \uicontrol Index and \uicontrol Contents - pane in the sidebar change accordingly. + view in the sidebar change accordingly. \image qtcreator-help-filters.png "Help filters" diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc index 6fc434fdd71..59048bf5eec 100644 --- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -239,14 +239,14 @@ Where the number is the number of the output pane. \if defined(qtcreator) \row - \li Activate \uicontrol Bookmarks pane + \li Activate \uicontrol Bookmarks view \li Alt+M \endif \row - \li Activate \uicontrol{File System} pane + \li Activate \uicontrol{File System} view \li Alt+Y \row - \li Activate \uicontrol{Open Documents} pane + \li Activate \uicontrol{Open Documents} view \li Alt+O \row \li Maximize output panes @@ -258,7 +258,7 @@ \li Move to previous item in output panes \li Shift+F6 \row - \li Activate \uicontrol Projects pane + \li Activate \uicontrol Projects view \li Alt+X \row \li Full screen diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc index d84cfd537fa..2b249293704 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc @@ -434,16 +434,16 @@ \image qtcreator-new-opengl-file.png "New OpenGL file wizard" - \section2 Displaying Additional File Types in Projects Pane + \section2 Displaying Additional File Types in Projects View \QC determines whether to display files from the project folder - in the \uicontrol Projects pane depending on the file type (.pro, .pri, .cpp, + in the \uicontrol Projects view depending on the file type (.pro, .pri, .cpp, .h, .qrc, and so on). To display other types of files, edit the project file. Add filenames as values of the \c {DISTFILES} variable. You can also use wildcards. For example, the following code specifies that text files are displayed - in the \uicontrol Projects pane: + in the \uicontrol Projects view: \code @@ -478,7 +478,7 @@ {SUBDIRS variable}. It also adds all the necessary files for the subproject. To create more subprojects, right-click the project name in the - \uicontrol Projects pane to open the context menu, and select + \uicontrol Projects view to open the context menu, and select \uicontrol {New Subproject}. Follow the steps in the \uicontrol {New Subproject} wizard to create a subproject. @@ -489,7 +489,7 @@ In the file browser dialog, locate your subproject. To remove subprojects, right-click the project name in the \uicontrol Projects - pane, and select \uicontrol {Remove Subproject} in the context menu. + view, and select \uicontrol {Remove Subproject} in the context menu. To specify dependencies, use the \uicontrol{Add Library} wizard. For more information, see \l{Adding Libraries to Projects}. diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc index a29ea16293a..ff99faefaa2 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -88,7 +88,7 @@ \list 1 - \li In the \uicontrol Projects pane, right-click the project name to open the + \li In the \uicontrol Projects view, right-click the project name to open the context menu and select \uicontrol {Add Library}. @@ -122,7 +122,7 @@ \uicontrol {Project Management} dialog. In the \uicontrol {Add to project} list, select a project. For example, \b myapp. - \li In the \uicontrol Projects pane, right-click the project name to open the + \li In the \uicontrol Projects view, right-click the project name to open the context menu and select \uicontrol {Add Library > Internal Library > Next}. diff --git a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc index 7165df0c4c6..7769b7501c7 100644 --- a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -109,7 +109,7 @@ \li In \uicontrol Library > \uicontrol Assets, select Bluebubble.svg and drag and drop it to \e mainWindow in the navigator. - \li In the \uicontrol Properties pane, \uicontrol Id field, enter + \li In the \uicontrol Properties view, \uicontrol Id field, enter \e bubble to be able to reference the image from other places. \li Select the \inlineimage export_unchecked.png diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc index 2fa9e55fb78..a7938078ab7 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -98,7 +98,7 @@ properties. Some properties, such as position, size, and visibility, are common to all QML types, whereas others are specific to the QML type. You can specify properties for your components in the - \uicontrol Properties pane. + \uicontrol Properties view. \li \l {Creating Animations} diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc index 6614ade1f34..ccbc2362290 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -32,7 +32,7 @@ the state machine in the \uicontrol Backends tab in the Design mode, as described in \l {Managing C++ Backend Objects}. - In the \uicontrol States pane, you can edit the \c when condition of states + In the \uicontrol States view, you can edit the \c when condition of states to map QML states to the states of the SCXML state machine. For an example, see \l {Qt SCXML Traffic Light QML Example (Dynamic)}. diff --git a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc index 104605a7b86..68e2aaadb81 100644 --- a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -58,14 +58,14 @@ \li In the \uicontrol Navigator, select \uicontrol Item and set the width (\uicontrol W) and height (\uicontrol H) of the button in the - \uicontrol Properties pane. + \uicontrol Properties view. \li Drag and drop a \uicontrol Rectangle from the \uicontrol Library to the item in the navigator. This creates a nested item where the item is the parent of the rectangle. Items are positioned relative to their parents. - \li In the \uicontrol Properties pane, modify the appearance of the + \li In the \uicontrol Properties view, modify the appearance of the rectangle: \list a @@ -85,7 +85,7 @@ \li Drag and drop a \uicontrol {Text} type to the item in the navigator. - \li In the \uicontrol Properties pane, edit the properties of the \uicontrol Text + \li In the \uicontrol Properties view, edit the properties of the \uicontrol Text type. \list a @@ -167,7 +167,7 @@ \li In the \uicontrol Navigator, select \uicontrol Item and set the width (\uicontrol W) and height (\uicontrol H) of the button in the - \uicontrol Properties pane. + \uicontrol Properties view. \li Select \uicontrol Connections > \uicontrol {Properties} > \uicontrol Add to add properties for the item: @@ -193,7 +193,7 @@ navigator. \li In the navigator, select a border image to specify settings for it - in the \uicontrol Properties pane: + in the \uicontrol Properties view: \list a diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc index fac448c820a..f2e3f922a11 100644 --- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -47,7 +47,7 @@ is generally defined in its own QML file. You can import components to applications. - The \uicontrol {Library} pane lists the available QML types, UI + The \uicontrol {Library} view lists the available QML types, UI components, assets, and QML imports. \image qmldesigner-qml-components.png "QML Components" @@ -77,13 +77,13 @@ \li Drag and drop components from the \uicontrol Library (2) to the \uicontrol Navigator (3) or \uicontrol {Form Editor} (1). \li Select components in the \uicontrol Navigator to edit their - properties in the \uicontrol Properties pane (4). For more + properties in the \uicontrol Properties view (4). For more information, see \l {Specifying Item Properties}. \li Connect components to signals or create bindings between components - in the \uicontrol Connections pane (5). For more information, see + in the \uicontrol Connections view (5). For more information, see \l{Adding Connections}. \li Add states to apply sets of changes to the properties of one or - several components in the \uicontrol States pane (6). For more + several components in the \uicontrol States view (6). For more information, see \l{Adding States}. \endlist @@ -135,7 +135,7 @@ When you add a \l{GridView}{Grid View}, \l{ListView}{List View}, or \l{PathView}{Path View}, the ListModel and the delegate component that creates an instance for each item in the model are added automatically. - You can edit item properties in the \uicontrol Properties pane or + You can edit item properties in the \uicontrol Properties view or in the \uicontrol {Text Editor}. You can also replace the default model and delegate with other, more complex models and delegates in the \uicontrol {Text Editor}. \l{ItemDelegate}{Item Delegate} and @@ -212,7 +212,7 @@ invisible \e anchor lines: top, bottom, left, right, fill, horizontal center, vertical center, and baseline. - In the \uicontrol Layout pane you can set anchors and margins for items. To + In the \uicontrol Layout tab you can set anchors and margins for items. To set the anchors of an item, click the anchor buttons. You can combine the top/bottom, left/right, and horizontal/vertical anchors to anchor items in the corners of the parent item or center them horizontally or vertically @@ -558,7 +558,7 @@ \li Drag and drop a QML type from the \uicontrol Library to the \uicontrol Navigator or \uicontrol {Form Editor}. - \li Edit its properties in the \uicontrol Properties pane. + \li Edit its properties in the \uicontrol Properties view. The available properties depend on the QML type. diff --git a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc index c1d2cb3fa12..6666f421ddc 100644 --- a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -102,13 +102,13 @@ \endlist - \li \uicontrol {States} pane (6) displays the different states of the item. + \li \uicontrol {States} view (6) displays the different states of the item. QML states typically describe user interface configurations, such as the UI controls, their properties and behavior and the available actions. For more information, see \l{Adding States}. \if defined(qtdesignstudio) - \li \uicontrol Timeline pane (7) provides a timeline and keyframe based + \li \uicontrol Timeline view (7) provides a timeline and keyframe based editor that enables you to animate the properties of UI components. \endif @@ -165,9 +165,9 @@ To experiment with different component sizes, enter values in the \uicontrol {Override Width} and \uicontrol {Override Height} fields (1) on the canvas toolbar. The changes are displayed on the canvas (2) - and in the \uicontrol States pane (3), but the property + and in the \uicontrol States view (3), but the property values are not changed permanently in the QML file. You can permanently - change the property values in the \uicontrol Properties pane (4). + change the property values in the \uicontrol Properties view (4). \image qmldesigner-preview-size.png "Canvas width and height" diff --git a/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc b/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc index db8921630cb..5ae3344d4f9 100644 --- a/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -38,7 +38,7 @@ \image qmldesigner-navigator.png "Navigator" You can select items in the \uicontrol Navigator to edit their properties - in the \uicontrol Properties pane. Items can access the properties of their + in the \uicontrol Properties view. Items can access the properties of their parent item. To select items on the canvas, right-click an item, and select another type in the context menu. @@ -55,7 +55,7 @@ To show and hide items on the canvas when focusing on specific parts of the application, click \inlineimage eye_open.png . To change the visibility of an item in the application code, select the - \uicontrol Visibility check box in the \uicontrol Properties pane or select + \uicontrol Visibility check box in the \uicontrol Properties view or select \uicontrol Edit > \uicontrol Visibility in the context menu. You can also set the \uicontrol Opacity field to 0 to hide items that you diff --git a/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc index 41b5bb02e96..489a84da257 100644 --- a/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -59,7 +59,7 @@ To add intermediary points to a curve segment, select \uicontrol {Split Segment} in the context menu. - In the \uicontrol Properties pane, you can specify other properties for + In the \uicontrol Properties view, you can specify other properties for the path view. For example, what is the maximum distance from the path that initiates mouse dragging and what is the rate at which a flick will decelerate. diff --git a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc index e0995815f12..3f6ef08d6aa 100644 --- a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -35,19 +35,19 @@ \title Specifying Item Properties - The \uicontrol Properties pane displays all the properties of the selected - item. The properties are grouped by type. The top part of the pane displays + The \uicontrol Properties view displays all the properties of the selected + item. The properties are grouped by type. The top part of the view displays properties that are common to all QML types, such as position, size, and visibility. - The bottom part of the pane displays properties that are specific to each + The bottom part of the view displays properties that are specific to each QML type. For example, the following image displays the properties you can set for \uicontrol Rectangle (1) and \uicontrol Text (2) items. \image qmldesigner-element-properties.png To change the item type, double-click the \uicontrol Type field in the - \uicontrol Properties pane, and enter the name of another QML type in the + \uicontrol Properties view, and enter the name of another QML type in the field. If you have specified properties for the item that are not supported for the new type, the type cannot be changed and an error message is displayed. Select the \inlineimage icons/action-icon.png @@ -130,7 +130,7 @@ \section1 Picking Colors To specify the color of the selected item in the color picker view (1), - select the color picker icon (2) in the \uicontrol Properties pane. + select the color picker icon (2) in the \uicontrol Properties view. \image qtquick-designer-color-picker.png "Color Picker view" @@ -163,7 +163,7 @@ \section1 Marking Text Items for Translation To support translators, mark each text item that should be translated. - In the \uicontrol Properties pane, \uicontrol Text field, select \uicontrol tr (1). + In the \uicontrol Properties view, \uicontrol Text field, select \uicontrol tr (1). \image qmldesigner-text-property-tr.png "Text properties" @@ -281,7 +281,7 @@ \section1 Building Transformations on Items - The \uicontrol Advanced pane allows you to configure advanced + The \uicontrol Advanced tab allows you to configure advanced transformations, such as rotation, scale, and translation. You can assign any number of transformations to an item. Each transformation is applied in order, one at a time. diff --git a/doc/qtcreator/src/qtquick/qtquick-states.qdoc b/doc/qtcreator/src/qtquick/qtquick-states.qdoc index 5a40828f766..d836643191e 100644 --- a/doc/qtcreator/src/qtquick/qtquick-states.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-states.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -62,12 +62,12 @@ \li Show a different view. \endlist - The \uicontrol States pane displays the different \l{State}{states} - of the component in the Design mode. The \uicontrol States pane is + The \uicontrol States view displays the different \l{State}{states} + of the component in the Design mode. The \uicontrol States view is collapsed by default to save space. Select \uicontrol Expand in - the context menu to view the whole pane. + the context menu to view the whole view. - \image qmldesigner-transitions.png "States pane" + \image qmldesigner-transitions.png "States view" To add states, click the \inlineimage plus.png button. Then modify the new state in the editor. For example, to change the @@ -86,9 +86,9 @@ a button is pressed, you could select a button component and its pressed property. - \image qtquick-states-binding-editor.png "Binding editor in States pane" + \image qtquick-states-binding-editor.png "Binding editor in States view" - You can preview the states in the \uicontrol States pane and click them to + You can preview the states in the \uicontrol States view and click them to switch between states on the canvas. \section1 Using States @@ -97,11 +97,11 @@ controls, their properties and behavior and the available actions. For example, you can use states to create two views. - To add states, click the empty slot in the \uicontrol States pane. + To add states, click the empty slot in the \uicontrol States view. Then modify the new state in the \uicontrol {Form Editor} or the - \uicontrol Properties pane. + \uicontrol Properties view. - \image qmldesigner-states.png "States pane" + \image qmldesigner-states.png "States view" The properties that you change in a state are highlighted with blue color. In the \uicontrol {Text Editor}, you can see the changes recorded as changes @@ -130,9 +130,9 @@ (1). While you work on one view, you can click the \inlineimage eye_open.png icon to hide items on the canvas that are not part of a view. - \li In the \uicontrol States pane, click the empty slot to create a + \li In the \uicontrol States view, click the empty slot to create a new state and give it a name. For example, \c Normal. - \li In the \uicontrol Properties pane (2), deselect the + \li In the \uicontrol Properties view (2), deselect the \uicontrol Visibility check box or set \uicontrol Opacity to 0 for each item that is not needed in this view. If you specify the setting for the parent item, all child items inherit it and diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc index ec6b1a2ebe0..ca1512bb9eb 100644 --- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc +++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -189,7 +189,7 @@ The \uicontrol {Diff Selected Files} button brings up a diff view of the files selected in the file list. Since the commit page is just another editor, you can go back to it by closing the diff view. You can also switch - to an open diff view by selecting it in the \uicontrol {Open Documents} pane + to an open diff view by selecting it in the \uicontrol {Open Documents} view in the sidebar. \section2 Amending Commits diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc index cef1c5a1bab..cca4674da38 100644 --- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc +++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -157,7 +157,7 @@ \li Double-click the \uicontrol{Push Button} widget and enter the text \b{Find}. - \li In the \uicontrol Properties pane, change the \uicontrol objectName to + \li In the \uicontrol Properties view, change the \uicontrol objectName to \b findButton. \image qtcreator-textfinder-objectname.png "Changing object names" @@ -216,7 +216,7 @@ \list 1 - \li In the \uicontrol{Projects} pane in the \uicontrol {Edit view}, double-click the + \li In the \uicontrol{Projects} view in the \uicontrol {Edit view}, double-click the \c{textfinder.h} file to open it for editing. \li Add a private function to the \c{private} section, after the @@ -234,7 +234,7 @@ \list 1 - \li In the \uicontrol{Projects} pane in the \uicontrol Edit view, double-click the + \li In the \uicontrol{Projects} view in the \uicontrol Edit view, double-click the textfinder.cpp file to open it for editing. \li Add code to load a text file using QFile, read it with QTextStream, diff --git a/doc/qtdesignstudio/examples/doc/loginui1.qdoc b/doc/qtdesignstudio/examples/doc/loginui1.qdoc index 18a7d8d4994..3be68658aa2 100644 --- a/doc/qtdesignstudio/examples/doc/loginui1.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui1.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Design Studio documentation. @@ -79,7 +79,7 @@ \QDS creates a set of boilerplate files and folders that you need to create a UI using Qt Quick and QML. The files are listed in the \uicontrol Project - tab in the \uicontrol Navigator and in the \uicontrol Projects pane. For + tab in the \uicontrol Navigator and in the \uicontrol Projects view. For more information, see \l {Viewing Project Files}. \image loginui1-project-files.png diff --git a/doc/qtdesignstudio/examples/doc/loginui3.qdoc b/doc/qtdesignstudio/examples/doc/loginui3.qdoc index 1bfa856b3e4..e4b143a7a6f 100644 --- a/doc/qtdesignstudio/examples/doc/loginui3.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui3.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Design Studio documentation. @@ -117,9 +117,9 @@ components on the canvas: \list 1 - \li In the \uicontrol States pane, select the \inlineimage plus.png + \li In the \uicontrol States view, select the \inlineimage plus.png button. - \image loginui3-login-state.png "States pane" + \image loginui3-login-state.png "States view" \li Enter \e loginState as the state name. \li Select \e verifyPasswordField in the \uicontrol Navigator, and deselect the \uicontrol Visibility check box in diff --git a/doc/qtdesignstudio/examples/doc/loginui4.qdoc b/doc/qtdesignstudio/examples/doc/loginui4.qdoc index 66fd5886c55..93204d05f35 100644 --- a/doc/qtdesignstudio/examples/doc/loginui4.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui4.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Design Studio documentation. @@ -85,7 +85,7 @@ \list 1 \li Open \e {Screen01.ui.qml} in the Design mode for editing. - \li In the \uicontrol States pane, select the \inlineimage close.png + \li In the \uicontrol States view, select the \inlineimage close.png (\uicontrol Close) button in \e loginState and \e registerState to remove the states. \li In the \uicontrol {Text Editor}, remove the following line: @@ -259,11 +259,11 @@ \section1 Binding Animation to States You will now bring back the \l{Adding States}{states} in the - \uicontrol States pane and bind them to the animation settings + \uicontrol States view and bind them to the animation settings in the \uicontrol Timeline view: \list 1 - \li In the \uicontrol States pane, select the \inlineimage plus.png + \li In the \uicontrol States view, select the \inlineimage plus.png button twice to add two states called \e loginState and \e registerState. You don't need to make any property changes this time, because you'll bind the states to property animations. diff --git a/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc b/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc index 71857f95a7a..808872eef01 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc +++ b/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Design Studio documentation. @@ -70,7 +70,7 @@ \note Components are listed in the \uicontrol {QML Components} section of the \uicontrol Library only if the filename begins with a capital letter. - \li Edit component properties in the \uicontrol Properties pane. + \li Edit component properties in the \uicontrol Properties view. The available properties depend on the QML type. \endlist diff --git a/doc/qtdesignstudio/src/qtdesignstudio-prototyping.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-prototyping.qdoc index df42f2fca0b..d511c23359f 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-prototyping.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-prototyping.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Design Studio documentation. @@ -72,7 +72,7 @@ properties. Some properties, such as position, size, and visibility, are common to all QML types, whereas others are specific to the QML type. You can specify properties for your components in the - \uicontrol Properties pane. + \uicontrol Properties view. \li \l {Using Custom Fonts}