diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-17 03:17:46 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-17 03:17:46 (GMT) |
| commit | 0e73159e81ae30ade45484a5ffccdf26b9d79667 (patch) | |
| tree | 711051ebd87fd7f80e5bbe4c0fb7edc38258585f /doc/src | |
| parent | a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34 (diff) | |
| parent | 64e03f7ada9eb6af7c65dbea7a36ebcb3f4e67fb (diff) | |
| download | Qt-0e73159e81ae30ade45484a5ffccdf26b9d79667.zip Qt-0e73159e81ae30ade45484a5ffccdf26b9d79667.tar.gz Qt-0e73159e81ae30ade45484a5ffccdf26b9d79667.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/development/designer-manual.qdoc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc index bdadcf7..65b6baa 100644 --- a/doc/src/development/designer-manual.qdoc +++ b/doc/src/development/designer-manual.qdoc @@ -1569,12 +1569,11 @@ \raw HTML </div> \endraw - \table \section2 Creating a Menu Entry - Double-click the \gui{new action} placeholder to begin editing, or - double-click \gui{new separator} to insert a new separator line after + Double-click the \gui{Type Here} placeholder to begin editing, or + double-click \gui{Add Separator} to insert a new separator line after the last entry in the menu. The menu entry's text is displayed using a line edit, and can be @@ -1630,7 +1629,6 @@ Since actions can be represented by menu entries and toolbar buttons, they can be moved between menus and toolbars. - \target AddingAnAction \raw HTML <div style="float: right; margin-left: 2em"> \endraw @@ -1745,13 +1743,19 @@ \section2 Adding a Dock Widget - To add a dock widget, simply drag one from the \gui Containers section - of the widget box, and drop it onto the main form area. Just like other - widgets, its properties can be modified with the \gui{Property Editor}. + To add a dock widget to a form, drag one from the \gui Containers section + of the widget box, and drop it onto the main form area. Do not add the + dock widget to an existing layout. Instead, open the \gui{Property Editor} + and enable the \gui{docked} property to place it in a dock area. + + Note that it is sometimes easier to configure a dock widget if it is added + to a form before a layout is applied to the central widget. For example, + it is possible to undock it and resize it, making it more convenient to + add child widgets. - Dock widgets can be optionally floated as indpendent tool windows. + Dock widgets can be optionally floated as independent tool windows. Hence, it is useful to give them window titles by setting their - \gui{windowTitle} property. This also helps to identify them on the + \l{QDockWidget::}{windowTitle} property. This also helps to identify them on the form. \raw HTML |