diff options
Diffstat (limited to 'src/widgets/widgets')
38 files changed, 456 insertions, 457 deletions
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index be250c54e1..80e125947e 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -109,21 +109,21 @@ Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets; \list - \o isDown() indicates whether the button is \e pressed down. + \li isDown() indicates whether the button is \e pressed down. - \o isChecked() indicates whether the button is \e checked. Only + \li isChecked() indicates whether the button is \e checked. Only checkable buttons can be checked and unchecked (see below). - \o isEnabled() indicates whether the button can be pressed by the + \li isEnabled() indicates whether the button can be pressed by the user. \note As opposed to other widgets, buttons derived from QAbstractButton accepts mouse and context menu events when disabled. - \o setAutoRepeat() sets whether the button will auto-repeat if the + \li setAutoRepeat() sets whether the button will auto-repeat if the user holds it down. \l autoRepeatDelay and \l autoRepeatInterval define how auto-repetition is done. - \o setCheckable() sets whether the button is a toggle button or not. + \li setCheckable() sets whether the button is a toggle button or not. \endlist @@ -138,16 +138,16 @@ Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets; \list 1 - \o pressed() is emitted when the left mouse button is pressed while + \li pressed() is emitted when the left mouse button is pressed while the mouse cursor is inside the button. - \o released() is emitted when the left mouse button is released. + \li released() is emitted when the left mouse button is released. - \o clicked() is emitted when the button is first pressed and then + \li clicked() is emitted when the button is first pressed and then released, when the shortcut key is typed, or when click() or animateClick() is called. - \o toggled() is emitted when the state of a toggle button changes. + \li toggled() is emitted when the state of a toggle button changes. \endlist @@ -190,7 +190,7 @@ public: void detectCheckedButton(); void notifyChecked(QAbstractButton *button); bool exclusive; - QMap<QAbstractButton*, int> mapping; + QHash<QAbstractButton*, int> mapping; }; QButtonGroup::QButtonGroup(QObject *parent) diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 03ec21680d..a960ce8d9c 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -101,14 +101,14 @@ QT_BEGIN_NAMESPACE following: \list - \o Control the scroll bars by setting their + \li Control the scroll bars by setting their range, value, page step, and tracking their movements. - \o Draw the contents of the area in the viewport according + \li Draw the contents of the area in the viewport according to the values of the scroll bars. - \o Handle events received by the viewport in + \li Handle events received by the viewport in viewportEvent() - notably resize events. - \o Use \c{viewport->update()} to update the contents of the + \li Use \c{viewport->update()} to update the contents of the viewport instead of \l{QWidget::update()}{update()} as all painting operations take place on the viewport. \endlist diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp index be193f64f0..6aff2e9077 100644 --- a/src/widgets/widgets/qabstractslider.cpp +++ b/src/widgets/widgets/qabstractslider.cpp @@ -65,23 +65,23 @@ QT_BEGIN_NAMESPACE \list 1 - \i \l value: The bounded integer that QAbstractSlider maintains. + \li \l value: The bounded integer that QAbstractSlider maintains. - \i \l minimum: The lowest possible value. + \li \l minimum: The lowest possible value. - \i \l maximum: The highest possible value. + \li \l maximum: The highest possible value. - \i \l singleStep: The smaller of two natural steps that an + \li \l singleStep: The smaller of two natural steps that an abstract sliders provides and typically corresponds to the user pressing an arrow key. - \i \l pageStep: The larger of two natural steps that an abstract + \li \l pageStep: The larger of two natural steps that an abstract slider provides and typically corresponds to the user pressing PageUp or PageDown. - \i \l tracking: Whether slider tracking is enabled. + \li \l tracking: Whether slider tracking is enabled. - \i \l sliderPosition: The current position of the slider. If \l + \li \l sliderPosition: The current position of the slider. If \l tracking is enabled (the default), this is identical to \l value. \endlist @@ -95,21 +95,21 @@ QT_BEGIN_NAMESPACE QAbstractSlider emits a comprehensive set of signals: \table - \header \i Signal \i Emitted when - \row \i \l valueChanged() - \i the value has changed. The \l tracking + \header \li Signal \li Emitted when + \row \li \l valueChanged() + \li the value has changed. The \l tracking determines whether this signal is emitted during user interaction. - \row \i \l sliderPressed() - \i the user starts to drag the slider. - \row \i \l sliderMoved() - \i the user drags the slider. - \row \i \l sliderReleased() - \i the user releases the slider. - \row \i \l actionTriggered() - \i a slider action was triggerd. - \row \i \l rangeChanged() - \i a the range has changed. + \row \li \l sliderPressed() + \li the user starts to drag the slider. + \row \li \l sliderMoved() + \li the user drags the slider. + \row \li \l sliderReleased() + \li the user releases the slider. + \row \li \l actionTriggered() + \li a slider action was triggerd. + \row \li \l rangeChanged() + \li a the range has changed. \endtable QAbstractSlider provides a virtual sliderChange() function that is diff --git a/src/widgets/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h index dbcd14cb67..d03a1a3918 100644 --- a/src/widgets/widgets/qabstractslider.h +++ b/src/widgets/widgets/qabstractslider.h @@ -79,8 +79,6 @@ public: void setMaximum(int); int maximum() const; - void setRange(int min, int max); - void setSingleStep(int); int singleStep() const; @@ -120,6 +118,7 @@ public: public Q_SLOTS: void setValue(int); void setOrientation(Qt::Orientation); + void setRange(int min, int max); Q_SIGNALS: void valueChanged(int value); diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index 331b4918bd..e9652a9869 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -90,11 +90,11 @@ QT_BEGIN_NAMESPACE \list 1 - \i \l text: The text that is displayed in the QAbstractSpinBox. + \li \l text: The text that is displayed in the QAbstractSpinBox. - \i \l alignment: The alignment of the text in the QAbstractSpinBox. + \li \l alignment: The alignment of the text in the QAbstractSpinBox. - \i \l wrapping: Whether the QAbstractSpinBox wraps from the + \li \l wrapping: Whether the QAbstractSpinBox wraps from the minimum value to the maximum value and vica versa. \endlist @@ -167,7 +167,7 @@ QAbstractSpinBox::~QAbstractSpinBox() \inlineimage qspinbox-plusminus.png \value UpDownArrows Little arrows in the classic style. - \value PlusMinus \bold{+} and \bold{-} symbols. + \value PlusMinus \b{+} and \b{-} symbols. \value NoButtons Don't display buttons. \sa QAbstractSpinBox::buttonSymbols @@ -918,17 +918,17 @@ void QAbstractSpinBox::paintEvent(QPaintEvent *) The following keys are handled specifically: \table - \row \i Enter/Return - \i This will reinterpret the text and emit a signal even if the value has not changed + \row \li Enter/Return + \li This will reinterpret the text and emit a signal even if the value has not changed since last time a signal was emitted. - \row \i Up - \i This will invoke stepBy(1) - \row \i Down - \i This will invoke stepBy(-1) - \row \i Page up - \i This will invoke stepBy(10) - \row \i Page down - \i This will invoke stepBy(-10) + \row \li Up + \li This will invoke stepBy(1) + \row \li Down + \li This will invoke stepBy(-1) + \row \li Page up + \li This will invoke stepBy(10) + \row \li Page down + \li This will invoke stepBy(-10) \endtable */ diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 1541010646..129da9d94d 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -2001,9 +2001,9 @@ void QCalendarWidgetPrivate::_q_editingFinished() setGridVisible() function: \table - \row \o + \row \li \image qcalendarwidget-grid.png - \row \o + \row \li \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 0 \endtable @@ -2418,9 +2418,9 @@ void QCalendarWidget::showToday() \table \row - \o \image qcalendarwidget-minimum.png + \li \image qcalendarwidget-minimum.png \row - \o + \li \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 1 \endtable @@ -2469,9 +2469,9 @@ void QCalendarWidget::setMinimumDate(const QDate &date) \table \row - \o \image qcalendarwidget-maximum.png + \li \image qcalendarwidget-maximum.png \row - \o + \li \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 2 \endtable @@ -2638,9 +2638,9 @@ void QCalendarWidget::setVerticalHeaderFormat(QCalendarWidget::VerticalHeaderFor \table \row - \o \inlineimage qcalendarwidget-grid.png + \li \inlineimage qcalendarwidget-grid.png \row - \o + \li \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 5 \endtable diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp index 3bf2e39ef1..13440ac104 100644 --- a/src/widgets/widgets/qcheckbox.cpp +++ b/src/widgets/widgets/qcheckbox.cpp @@ -87,8 +87,8 @@ public: non-exclusive checkboxes. \table - \row \o \inlineimage checkboxes-exclusive.png - \o \inlineimage checkboxes-non-exclusive.png + \row \li \inlineimage checkboxes-exclusive.png + \li \inlineimage checkboxes-non-exclusive.png \endtable Whenever a checkbox is checked or cleared it emits the signal @@ -121,14 +121,14 @@ public: \table 100% \row - \o \inlineimage macintosh-checkbox.png Screenshot of a Macintosh style checkbox - \o A checkbox shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \li \inlineimage macintosh-checkbox.png Screenshot of a Macintosh style checkbox + \li A checkbox shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \row - \o \inlineimage windows-checkbox.png Screenshot of a Windows XP style checkbox - \o A checkbox shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \li \inlineimage windows-checkbox.png Screenshot of a Windows XP style checkbox + \li A checkbox shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. \row - \o \inlineimage plastique-checkbox.png Screenshot of a Plastique style checkbox - \o A checkbox shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \li \inlineimage plastique-checkbox.png Screenshot of a Plastique style checkbox + \li A checkbox shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. \endtable \sa QAbstractButton, QRadioButton, {fowler}{GUI Design Handbook: Check Box} diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 5761c1299c..3d0996a9f5 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -103,12 +103,12 @@ QT_BEGIN_NAMESPACE calendar widget can be retrieved with calendarWidget(). \table 100% - \row \o \inlineimage windowsxp-datetimeedit.png Screenshot of a Windows XP style date time editing widget - \o A date time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \o \inlineimage macintosh-datetimeedit.png Screenshot of a Macintosh style date time editing widget - \o A date time editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. - \row \o \inlineimage plastique-datetimeedit.png Screenshot of a Plastique style date time editing widget - \o A date time editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \row \li \inlineimage windowsxp-datetimeedit.png Screenshot of a Windows XP style date time editing widget + \li A date time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage macintosh-datetimeedit.png Screenshot of a Macintosh style date time editing widget + \li A date time editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \row \li \inlineimage plastique-datetimeedit.png Screenshot of a Plastique style date time editing widget + \li A date time editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. \endtable \sa QDateEdit, QTimeEdit, QDate, QTime @@ -835,10 +835,10 @@ QString QDateTimeEdit::sectionText(Section section) const Example format strings (assuming that the date is 2nd of July 1969): \table - \header \i Format \i Result - \row \i dd.MM.yyyy \i 02.07.1969 - \row \i MMM d yy \i Jul 2 69 - \row \i MMMM d yy \i July 2 69 + \header \li Format \li Result + \row \li dd.MM.yyyy \li 02.07.1969 + \row \li MMM d yy \li Jul 2 69 + \row \li MMMM d yy \li July 2 69 \endtable Note that if you specify a two digit year, it will be interpreted @@ -1520,22 +1520,22 @@ void QDateTimeEdit::mousePressEvent(QMouseEvent *event) class: \list - \o \l{QDateTimeEdit::time}{time} holds the date displayed by the widget. - \o \l{QDateTimeEdit::minimumTime}{minimumTime} defines the minimum (earliest) time + \li \l{QDateTimeEdit::time}{time} holds the date displayed by the widget. + \li \l{QDateTimeEdit::minimumTime}{minimumTime} defines the minimum (earliest) time that can be set by the user. - \o \l{QDateTimeEdit::maximumTime}{maximumTime} defines the maximum (latest) time + \li \l{QDateTimeEdit::maximumTime}{maximumTime} defines the maximum (latest) time that can be set by the user. - \o \l{QDateTimeEdit::displayFormat}{displayFormat} contains a string that is used + \li \l{QDateTimeEdit::displayFormat}{displayFormat} contains a string that is used to format the time displayed in the widget. \endlist \table 100% - \row \o \inlineimage windowsxp-timeedit.png Screenshot of a Windows XP style time editing widget - \o A time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \o \inlineimage macintosh-timeedit.png Screenshot of a Macintosh style time editing widget - \o A time editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. - \row \o \inlineimage plastique-timeedit.png Screenshot of a Plastique style time editing widget - \o A time editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \row \li \inlineimage windowsxp-timeedit.png Screenshot of a Windows XP style time editing widget + \li A time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage macintosh-timeedit.png Screenshot of a Macintosh style time editing widget + \li A time editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \row \li \inlineimage plastique-timeedit.png Screenshot of a Plastique style time editing widget + \li A time editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. \endtable \sa QDateEdit, QDateTimeEdit @@ -1575,22 +1575,22 @@ QTimeEdit::QTimeEdit(const QTime &time, QWidget *parent) class: \list - \o \l{QDateTimeEdit::date}{date} holds the date displayed by the widget. - \o \l{QDateTimeEdit::minimumDate}{minimumDate} defines the minimum (earliest) + \li \l{QDateTimeEdit::date}{date} holds the date displayed by the widget. + \li \l{QDateTimeEdit::minimumDate}{minimumDate} defines the minimum (earliest) date that can be set by the user. - \o \l{QDateTimeEdit::maximumDate}{maximumDate} defines the maximum (latest) date + \li \l{QDateTimeEdit::maximumDate}{maximumDate} defines the maximum (latest) date that can be set by the user. - \o \l{QDateTimeEdit::displayFormat}{displayFormat} contains a string that is used + \li \l{QDateTimeEdit::displayFormat}{displayFormat} contains a string that is used to format the date displayed in the widget. \endlist \table 100% - \row \o \inlineimage windowsxp-dateedit.png Screenshot of a Windows XP style date editing widget - \o A date editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \o \inlineimage macintosh-dateedit.png Screenshot of a Macintosh style date editing widget - \o A date editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. - \row \o \inlineimage plastique-dateedit.png Screenshot of a Plastique style date editing widget - \o A date editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \row \li \inlineimage windowsxp-dateedit.png Screenshot of a Windows XP style date editing widget + \li A date editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage macintosh-dateedit.png Screenshot of a Macintosh style date editing widget + \li A date editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \row \li \inlineimage plastique-dateedit.png Screenshot of a Plastique style date editing widget + \li A date editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. \endtable \sa QTimeEdit, QDateTimeEdit diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index 566652b8f5..e3fe390f2a 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -230,10 +230,10 @@ int QDialPrivate::valueFromPoint(const QPoint &p) const \l {QAbstractSlider::pageStep} {pageStep}. \table - \row \o \inlineimage plastique-dial.png Screenshot of a dial in the Plastique widget style - \o \inlineimage windowsxp-dial.png Screenshot of a dial in the Windows XP widget style - \o \inlineimage macintosh-dial.png Screenshot of a dial in the Macintosh widget style - \row \o {3,1} Dials shown in various widget styles (from left to right): + \row \li \inlineimage plastique-dial.png Screenshot of a dial in the Plastique widget style + \li \inlineimage windowsxp-dial.png Screenshot of a dial in the Windows XP widget style + \li \inlineimage macintosh-dial.png Screenshot of a dial in the Macintosh widget style + \row \li {3,1} Dials shown in various widget styles (from left to right): \l{Plastique Style Widget Gallery}{Plastique}, \l{Windows XP Style Widget Gallery}{Windows XP}, \l{Macintosh Style Widget Gallery}{Macintosh}. diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp index d1084168a9..14643e77f6 100644 --- a/src/widgets/widgets/qdialogbuttonbox.cpp +++ b/src/widgets/widgets/qdialogbuttonbox.cpp @@ -76,9 +76,9 @@ QT_BEGIN_NAMESPACE Most buttons for a dialog follow certain roles. Such roles include: \list - \o Accepting or rejecting the dialog. - \o Asking for help. - \o Performing actions on the dialog itself (such as resetting fields or + \li Accepting or rejecting the dialog. + \li Asking for help. + \li Performing actions on the dialog itself (such as resetting fields or applying changes). \endlist @@ -104,35 +104,35 @@ QT_BEGIN_NAMESPACE Currently the buttons are laid out in the following way if the button box is horizontal: \table - \row \o \inlineimage buttonbox-gnomelayout-horizontal.png GnomeLayout Horizontal - \o Button box laid out in horizontal GnomeLayout - \row \o \inlineimage buttonbox-kdelayout-horizontal.png KdeLayout Horizontal - \o Button box laid out in horizontal KdeLayout - \row \o \inlineimage buttonbox-maclayout-horizontal.png MacLayout Horizontal - \o Button box laid out in horizontal MacLayout - \row \o \inlineimage buttonbox-winlayout-horizontal.png WinLayout Horizontal - \o Button box laid out in horizontal WinLayout + \row \li \inlineimage buttonbox-gnomelayout-horizontal.png GnomeLayout Horizontal + \li Button box laid out in horizontal GnomeLayout + \row \li \inlineimage buttonbox-kdelayout-horizontal.png KdeLayout Horizontal + \li Button box laid out in horizontal KdeLayout + \row \li \inlineimage buttonbox-maclayout-horizontal.png MacLayout Horizontal + \li Button box laid out in horizontal MacLayout + \row \li \inlineimage buttonbox-winlayout-horizontal.png WinLayout Horizontal + \li Button box laid out in horizontal WinLayout \endtable The buttons are laid out the following way if the button box is vertical: \table - \row \o GnomeLayout - \o KdeLayout - \o MacLayout - \o WinLayout - \row \o \inlineimage buttonbox-gnomelayout-vertical.png GnomeLayout Vertical - \o \inlineimage buttonbox-kdelayout-vertical.png KdeLayout Vertical - \o \inlineimage buttonbox-maclayout-vertical.png MacLayout Vertical - \o \inlineimage buttonbox-winlayout-vertical.png WinLayout Vertical + \row \li GnomeLayout + \li KdeLayout + \li MacLayout + \li WinLayout + \row \li \inlineimage buttonbox-gnomelayout-vertical.png GnomeLayout Vertical + \li \inlineimage buttonbox-kdelayout-vertical.png KdeLayout Vertical + \li \inlineimage buttonbox-maclayout-vertical.png MacLayout Vertical + \li \inlineimage buttonbox-winlayout-vertical.png WinLayout Vertical \endtable Additionally, button boxes that contain only buttons with ActionRole or HelpRole can be considered modeless and have an alternate look on Mac OS X: \table - \row \o modeless horizontal MacLayout - \o \inlineimage buttonbox-mac-modeless-horizontal.png Screenshot of modeless horizontal MacLayout + \row \li modeless horizontal MacLayout + \li \inlineimage buttonbox-mac-modeless-horizontal.png Screenshot of modeless horizontal MacLayout \endtable When a button is clicked in the button box, the clicked() signal is emitted diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index a90c754cee..e40b109455 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1538,22 +1538,22 @@ QAction * QDockWidget::toggleViewAction() const Here are some tips for implementing custom title bars: \list - \o Mouse events that are not explicitly handled by the title bar widget + \li Mouse events that are not explicitly handled by the title bar widget must be ignored by calling QMouseEvent::ignore(). These events then propagate to the QDockWidget parent, which handles them in the usual manner, moving when the title bar is dragged, docking and undocking when it is double-clicked, etc. - \o When DockWidgetVerticalTitleBar is set on QDockWidget, the title + \li When DockWidgetVerticalTitleBar is set on QDockWidget, the title bar widget is repositioned accordingly. In resizeEvent(), the title bar should check what orientation it should assume: \snippet doc/src/snippets/code/src_gui_widgets_qdockwidget.cpp 0 - \o The title bar widget must have a valid QWidget::sizeHint() and + \li The title bar widget must have a valid QWidget::sizeHint() and QWidget::minimumSizeHint(). These functions should take into account the current orientation of the title bar. - \o It is not possible to remove a title bar from a dock widget. However, + \li It is not possible to remove a title bar from a dock widget. However, a similar effect can be achieved by setting a default constructed QWidget as the title bar widget. \endlist diff --git a/src/widgets/widgets/qframe.cpp b/src/widgets/widgets/qframe.cpp index cae4137803..29c213f7af 100644 --- a/src/widgets/widgets/qframe.cpp +++ b/src/widgets/widgets/qframe.cpp @@ -97,15 +97,15 @@ inline void QFramePrivate::init() border: \l lineWidth, \l midLineWidth, and \l frameWidth. \list - \o The line width is the width of the frame border. It can be modified + \li The line width is the width of the frame border. It can be modified to customize the frame's appearance. - \o The mid-line width specifies the width of an extra line in the + \li The mid-line width specifies the width of an extra line in the middle of the frame, which uses a third color to obtain a special 3D effect. Notice that a mid-line is only drawn for \l Box, \l HLine and \l VLine frames that are raised or sunken. - \o The frame width is determined by the frame style, and the frameWidth() + \li The frame width is determined by the frame style, and the frameWidth() function is used to obtain the value defined for the style used. \endlist diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 17f3a9323a..cf3e14871f 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -172,12 +172,12 @@ void QGroupBoxPrivate::click() \snippet examples/widgets/groupbox/window.cpp 2 \table 100% - \row \o \inlineimage windowsxp-groupbox.png Screenshot of a Windows XP style group box - \o \inlineimage macintosh-groupbox.png Screenshot of a Macintosh style group box - \o \inlineimage plastique-groupbox.png Screenshot of a Plastique style group box - \row \o A \l{Windows XP Style Widget Gallery}{Windows XP style} group box. - \o A \l{Macintosh Style Widget Gallery}{Macintosh style} group box. - \o A \l{Plastique Style Widget Gallery}{Plastique style} group box. + \row \li \inlineimage windowsxp-groupbox.png Screenshot of a Windows XP style group box + \li \inlineimage macintosh-groupbox.png Screenshot of a Macintosh style group box + \li \inlineimage plastique-groupbox.png Screenshot of a Plastique style group box + \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} group box. + \li A \l{Macintosh Style Widget Gallery}{Macintosh style} group box. + \li A \l{Plastique Style Widget Gallery}{Plastique style} group box. \endtable \sa QButtonGroup, {Group Box Example} @@ -287,9 +287,9 @@ QString QGroupBox::title() const the following list: \list - \i Qt::AlignLeft aligns the title text with the left-hand side of the group box. - \i Qt::AlignRight aligns the title text with the right-hand side of the group box. - \i Qt::AlignHCenter aligns the title text with the horizontal center of the group box. + \li Qt::AlignLeft aligns the title text with the left-hand side of the group box. + \li Qt::AlignRight aligns the title text with the right-hand side of the group box. + \li Qt::AlignHCenter aligns the title text with the horizontal center of the group box. \endlist The default alignment is Qt::AlignLeft. @@ -516,7 +516,7 @@ QSize QGroupBox::minimumSizeHint() const By default, this property is disabled; i.e. group boxes are not flat unless explicitly specified. - \bold{Note:} In some styles, flat and non-flat group boxes have similar + \b{Note:} In some styles, flat and non-flat group boxes have similar representations and may not be as distinguishable as they are in other styles. diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index d23fab4083..82e56f3354 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -76,20 +76,20 @@ QT_BEGIN_NAMESPACE A QLabel can contain any of the following content types: \table - \header \o Content \o Setting - \row \o Plain text - \o Pass a QString to setText(). - \row \o Rich text - \o Pass a QString that contains rich text to setText(). - \row \o A pixmap - \o Pass a QPixmap to setPixmap(). - \row \o A movie - \o Pass a QMovie to setMovie(). - \row \o A number - \o Pass an \e int or a \e double to setNum(), which converts + \header \li Content \li Setting + \row \li Plain text + \li Pass a QString to setText(). + \row \li Rich text + \li Pass a QString that contains rich text to setText(). + \row \li A pixmap + \li Pass a QPixmap to setPixmap(). + \row \li A movie + \li Pass a QMovie to setMovie(). + \row \li A number + \li Pass an \e int or a \e double to setNum(), which converts the number to plain text. - \row \o Nothing - \o The same as an empty plain text. This is the default. Set + \row \li Nothing + \li The same as an empty plain text. This is the default. Set by clear(). \endtable @@ -134,14 +134,14 @@ QT_BEGIN_NAMESPACE \table 100% \row - \o \inlineimage macintosh-label.png Screenshot of a Macintosh style label - \o A label shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \li \inlineimage macintosh-label.png Screenshot of a Macintosh style label + \li A label shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \row - \o \inlineimage plastique-label.png Screenshot of a Plastique style label - \o A label shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \li \inlineimage plastique-label.png Screenshot of a Plastique style label + \li A label shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. \row - \o \inlineimage windowsxp-label.png Screenshot of a Windows XP style label - \o A label shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \li \inlineimage windowsxp-label.png Screenshot of a Windows XP style label + \li A label shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. \endtable \sa QLineEdit, QTextEdit, QPixmap, QMovie, @@ -655,7 +655,7 @@ int QLabel::heightForWidth(int w) const QDesktopServices::openUrl() instead of emitting the linkActivated() signal. - \bold{Note:} The textInteractionFlags set on the label need to include + \b{Note:} The textInteractionFlags set on the label need to include either LinksAccessibleByMouse or LinksAccessibleByKeyboard. The default value is false. @@ -723,7 +723,7 @@ Qt::TextInteractionFlags QLabel::textInteractionFlags() const \sa selectedText() - \bold{Note:} The textInteractionFlags set on the label need to include + \b{Note:} The textInteractionFlags set on the label need to include either TextSelectableByMouse or TextSelectableByKeyboard. \since 4.7 @@ -751,7 +751,7 @@ void QLabel::setSelection(int start, int length) \sa selectedText() - \bold{Note:} The textInteractionFlags set on the label need to include + \b{Note:} The textInteractionFlags set on the label need to include either TextSelectableByMouse or TextSelectableByKeyboard. \since 4.7 @@ -775,7 +775,7 @@ bool QLabel::hasSelectedText() const \sa hasSelectedText() - \bold{Note:} The textInteractionFlags set on the label need to include + \b{Note:} The textInteractionFlags set on the label need to include either TextSelectableByMouse or TextSelectableByKeyboard. \since 4.7 @@ -794,7 +794,7 @@ QString QLabel::selectedText() const \sa selectedText() - \bold{Note:} The textInteractionFlags set on the label need to include + \b{Note:} The textInteractionFlags set on the label need to include either TextSelectableByMouse or TextSelectableByKeyboard. \since 4.7 diff --git a/src/widgets/widgets/qlcdnumber.cpp b/src/widgets/widgets/qlcdnumber.cpp index 71e08fdaeb..4639b15834 100644 --- a/src/widgets/widgets/qlcdnumber.cpp +++ b/src/widgets/widgets/qlcdnumber.cpp @@ -108,13 +108,13 @@ public: Sinclair Spectrum\endlink. \table - \row \o \inlineimage motif-lcdnumber.png Screenshot of a Motif style LCD number widget + \row \li \inlineimage motif-lcdnumber.png Screenshot of a Motif style LCD number widget \inlineimage cde-lcdnumber.png Screenshot of a CDE style LCD number widget \inlineimage windows-lcdnumber.png Screenshot of a Windows style LCD number widget \inlineimage windowsxp-lcdnumber.png Screenshot of a Windows XP style LCD number widget \inlineimage macintosh-lcdnumber.png Screenshot of a Macintosh style LCD number widget \inlineimage plastique-lcdnumber.png Screenshot of a Plastique style LCD number widget - \row \o LCD number widgets shown in various widget styles (from left to right): + \row \li LCD number widgets shown in various widget styles (from left to right): \l{Motif Style Widget Gallery}{Motif}, \l{CDE Style Widget Gallery}{CDE}, \l{Windows Style Widget Gallery}{Windows}, \l{Windows XP Style Widget Gallery}{Windows XP}, \l{Macintosh Style Widget Gallery}{Macintosh}, \l{Plastique Style Widget Gallery}{Plastique}. @@ -1184,14 +1184,14 @@ void QLCDNumberPrivate::drawSegment(const QPoint &pos, char segmentNo, QPainter \brief the style of the LCDNumber \table - \header \i Style \i Result - \row \i \c Outline - \i Produces raised segments filled with the background color - \row \i \c Filled + \header \li Style \li Result + \row \li \c Outline + \li Produces raised segments filled with the background color + \row \li \c Filled (this is the default). - \i Produces raised segments filled with the foreground color. - \row \i \c Flat - \i Produces flat segments filled with the foreground color. + \li Produces raised segments filled with the foreground color. + \row \li \c Flat + \li Produces flat segments filled with the foreground color. \endtable \c Outline and \c Filled will additionally use diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 7118881ef2..07843136ff 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -177,39 +177,39 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const that presents some of these editing options. \target desc \table - \header \i Keypress \i Action - \row \i Left Arrow \i Moves the cursor one character to the left. - \row \i Shift+Left Arrow \i Moves and selects text one character to the left. - \row \i Right Arrow \i Moves the cursor one character to the right. - \row \i Shift+Right Arrow \i Moves and selects text one character to the right. - \row \i Home \i Moves the cursor to the beginning of the line. - \row \i End \i Moves the cursor to the end of the line. - \row \i Backspace \i Deletes the character to the left of the cursor. - \row \i Ctrl+Backspace \i Deletes the word to the left of the cursor. - \row \i Delete \i Deletes the character to the right of the cursor. - \row \i Ctrl+Delete \i Deletes the word to the right of the cursor. - \row \i Ctrl+A \i Select all. - \row \i Ctrl+C \i Copies the selected text to the clipboard. - \row \i Ctrl+Insert \i Copies the selected text to the clipboard. - \row \i Ctrl+K \i Deletes to the end of the line. - \row \i Ctrl+V \i Pastes the clipboard text into line edit. - \row \i Shift+Insert \i Pastes the clipboard text into line edit. - \row \i Ctrl+X \i Deletes the selected text and copies it to the clipboard. - \row \i Shift+Delete \i Deletes the selected text and copies it to the clipboard. - \row \i Ctrl+Z \i Undoes the last operation. - \row \i Ctrl+Y \i Redoes the last undone operation. + \header \li Keypress \li Action + \row \li Left Arrow \li Moves the cursor one character to the left. + \row \li Shift+Left Arrow \li Moves and selects text one character to the left. + \row \li Right Arrow \li Moves the cursor one character to the right. + \row \li Shift+Right Arrow \li Moves and selects text one character to the right. + \row \li Home \li Moves the cursor to the beginning of the line. + \row \li End \li Moves the cursor to the end of the line. + \row \li Backspace \li Deletes the character to the left of the cursor. + \row \li Ctrl+Backspace \li Deletes the word to the left of the cursor. + \row \li Delete \li Deletes the character to the right of the cursor. + \row \li Ctrl+Delete \li Deletes the word to the right of the cursor. + \row \li Ctrl+A \li Select all. + \row \li Ctrl+C \li Copies the selected text to the clipboard. + \row \li Ctrl+Insert \li Copies the selected text to the clipboard. + \row \li Ctrl+K \li Deletes to the end of the line. + \row \li Ctrl+V \li Pastes the clipboard text into line edit. + \row \li Shift+Insert \li Pastes the clipboard text into line edit. + \row \li Ctrl+X \li Deletes the selected text and copies it to the clipboard. + \row \li Shift+Delete \li Deletes the selected text and copies it to the clipboard. + \row \li Ctrl+Z \li Undoes the last operation. + \row \li Ctrl+Y \li Redoes the last undone operation. \endtable Any other key sequence that represents a valid character, will cause the character to be inserted into the line edit. \table 100% - \row \o \inlineimage macintosh-lineedit.png Screenshot of a Macintosh style line edit - \o A line edit shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. - \row \o \inlineimage windows-lineedit.png Screenshot of a Windows XP style line edit - \o A line edit shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \o \inlineimage plastique-lineedit.png Screenshot of a Plastique style line edit - \o A line edit shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \row \li \inlineimage macintosh-lineedit.png Screenshot of a Macintosh style line edit + \li A line edit shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \row \li \inlineimage windows-lineedit.png Screenshot of a Windows XP style line edit + \li A line edit shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage plastique-lineedit.png Screenshot of a Plastique style line edit + \li A line edit shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. \endtable \sa QTextEdit, QLabel, QComboBox, {fowler}{GUI Design Handbook: Field, Entry}, {Line Edits Example} @@ -1096,26 +1096,26 @@ QMargins QLineEdit::textMargins() const where a character is \e{permitted but not required}. \table - \header \i Character \i Meaning - \row \i \c A \i ASCII alphabetic character required. A-Z, a-z. - \row \i \c a \i ASCII alphabetic character permitted but not required. - \row \i \c N \i ASCII alphanumeric character required. A-Z, a-z, 0-9. - \row \i \c n \i ASCII alphanumeric character permitted but not required. - \row \i \c X \i Any character required. - \row \i \c x \i Any character permitted but not required. - \row \i \c 9 \i ASCII digit required. 0-9. - \row \i \c 0 \i ASCII digit permitted but not required. - \row \i \c D \i ASCII digit required. 1-9. - \row \i \c d \i ASCII digit permitted but not required (1-9). - \row \i \c # \i ASCII digit or plus/minus sign permitted but not required. - \row \i \c H \i Hexadecimal character required. A-F, a-f, 0-9. - \row \i \c h \i Hexadecimal character permitted but not required. - \row \i \c B \i Binary character required. 0-1. - \row \i \c b \i Binary character permitted but not required. - \row \i \c > \i All following alphabetic characters are uppercased. - \row \i \c < \i All following alphabetic characters are lowercased. - \row \i \c ! \i Switch off case conversion. - \row \i \tt{\\} \i Use \tt{\\} to escape the special + \header \li Character \li Meaning + \row \li \c A \li ASCII alphabetic character required. A-Z, a-z. + \row \li \c a \li ASCII alphabetic character permitted but not required. + \row \li \c N \li ASCII alphanumeric character required. A-Z, a-z, 0-9. + \row \li \c n \li ASCII alphanumeric character permitted but not required. + \row \li \c X \li Any character required. + \row \li \c x \li Any character permitted but not required. + \row \li \c 9 \li ASCII digit required. 0-9. + \row \li \c 0 \li ASCII digit permitted but not required. + \row \li \c D \li ASCII digit required. 1-9. + \row \li \c d \li ASCII digit permitted but not required (1-9). + \row \li \c # \li ASCII digit or plus/minus sign permitted but not required. + \row \li \c H \li Hexadecimal character required. A-F, a-f, 0-9. + \row \li \c h \li Hexadecimal character permitted but not required. + \row \li \c B \li Binary character required. 0-1. + \row \li \c b \li Binary character permitted but not required. + \row \li \c > \li All following alphabetic characters are uppercased. + \row \li \c < \li All following alphabetic characters are lowercased. + \row \li \c ! \li Switch off case conversion. + \row \li \tt{\\} \li Use \tt{\\} to escape the special characters listed above to use them as separators. \endtable @@ -1127,11 +1127,11 @@ QMargins QLineEdit::textMargins() const Examples: \table - \header \i Mask \i Notes - \row \i \c 000.000.000.000;_ \i IP address; blanks are \c{_}. - \row \i \c HH:HH:HH:HH:HH:HH;_ \i MAC address - \row \i \c 0000-00-00 \i ISO Date; blanks are \c space - \row \i \c >AAAAA-AAAAA-AAAAA-AAAAA-AAAAA;# \i License number; + \header \li Mask \li Notes + \row \li \c 000.000.000.000;_ \li IP address; blanks are \c{_}. + \row \li \c HH:HH:HH:HH:HH:HH;_ \li MAC address + \row \li \c 0000-00-00 \li ISO Date; blanks are \c space + \row \li \c >AAAAA-AAAAA-AAAAA-AAAAA-AAAAA;# \li License number; blanks are \c - and all (alphabetic) characters are converted to uppercase. \endtable diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 73ba0cc15e..7607f2f238 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -1480,12 +1480,12 @@ bool QMainWindow::event(QEvent *event) moved to that. This means a couple of things. \list - \i QToolBars in this toolbar area are not movable and you cannot drag other + \li QToolBars in this toolbar area are not movable and you cannot drag other toolbars to it - \i Toolbar breaks are not respected or preserved - \i Any custom widgets in the toolbar will not be shown if the toolbar + \li Toolbar breaks are not respected or preserved + \li Any custom widgets in the toolbar will not be shown if the toolbar becomes too small (only actions will be shown) - \i Before Qt 4.5, if you called showFullScreen() on the main window, the QToolbar would + \li Before Qt 4.5, if you called showFullScreen() on the main window, the QToolbar would disappear since it is considered to be part of the title bar. Qt 4.5 and up will now work around this by pulling the toolbars out and back into the regular toolbar and vice versa when you swap out. \endlist diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 7d73a66c5c..36fba72963 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -92,8 +92,8 @@ slots and are easily connected to menu entries. \table - \row \o \inlineimage mdi-cascade.png - \o \inlineimage mdi-tile.png + \row \li \inlineimage mdi-cascade.png + \li \inlineimage mdi-tile.png \endtable \note The default scroll bar property for QMdiArea is Qt::ScrollBarAlwaysOff. diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 7ebfdbecae..3fb2a6122c 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1218,9 +1218,9 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) \table 100% \row - \o \inlineimage plastique-menu.png - \o \inlineimage windowsxp-menu.png - \o \inlineimage macintosh-menu.png + \li \inlineimage plastique-menu.png + \li \inlineimage windowsxp-menu.png + \li \inlineimage macintosh-menu.png \endtable \caption Fig. A menu shown in \l{Plastique Style Widget Gallery}{Plastique widget style}, \l{Windows XP Style Widget Gallery}{Windows XP widget style}, @@ -1284,7 +1284,7 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) See the \l{mainwindows/menus}{Menus} example for an example of how to use QMenuBar and QMenu in your application. - \bold{Important inherited functions:} addAction(), removeAction(), clear(), + \b{Important inherited functions:} addAction(), removeAction(), clear(), addSeparator(), and addMenu(). \sa QMenuBar, {fowler}{GUI Design Handbook: Menu, Drop-Down and Pop-Up}, diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 16e486e77f..11f6592cc9 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -621,17 +621,17 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti \table - \row \o \inlineimage plastique-menubar.png A menu bar shown in the + \row \li \inlineimage plastique-menubar.png A menu bar shown in the Plastique widget style. - \o The \l{QPlastiqueStyle}{Plastique widget style}, like most + \li The \l{QPlastiqueStyle}{Plastique widget style}, like most other styles, handles the \gui{Help} menu in the same way as it handles any other menu. - \row \o \inlineimage motif-menubar.png A menu bar shown in the + \row \li \inlineimage motif-menubar.png A menu bar shown in the Motif widget style. - \o The \l{QMotifStyle}{Motif widget style} treats \gui{Help} menus + \li The \l{QMotifStyle}{Motif widget style} treats \gui{Help} menus in a special way, placing them at right-hand end of the menu bar. \endtable @@ -652,18 +652,18 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti the strings looked for and where the entry is placed if matched: \table - \header \i String matches \i Placement \i Notes - \row \i about.* - \i Application Menu | About <application name> - \i The application name is fetched from the \c {Info.plist} file + \header \li String matches \li Placement \li Notes + \row \li about.* + \li Application Menu | About <application name> + \li The application name is fetched from the \c {Info.plist} file (see note below). If this entry is not found no About item will appear in the Application Menu. - \row \i config, options, setup, settings or preferences - \i Application Menu | Preferences - \i If this entry is not found the Settings item will be disabled - \row \i quit or exit - \i Application Menu | Quit <application name> - \i If this entry is not found a default Quit item will be + \row \li config, options, setup, settings or preferences + \li Application Menu | Preferences + \li If this entry is not found the Settings item will be disabled + \row \li quit or exit + \li Application Menu | Quit <application name> + \li If this entry is not found a default Quit item will be created to call QApplication::quit() \endtable @@ -676,12 +676,12 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti \snippet doc/src/snippets/code/src_gui_widgets_qmenubar.cpp 1 - \bold{Note:} Do \e{not} call QMainWindow::menuBar() to create the + \b{Note:} Do \e{not} call QMainWindow::menuBar() to create the shared menu bar, because that menu bar will have the QMainWindow as its parent. That menu bar would only be displayed for the parent QMainWindow. - \bold{Note:} The text used for the application name in the menu + \b{Note:} The text used for the application name in the menu bar is obtained from the value set in the \c{Info.plist} file in the application's bundle. See \l{Deploying an Application on Mac OS X} for more information. diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index de6cb6a283..fad2d4e747 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -1081,19 +1081,19 @@ void QPlainTextEditPrivate::ensureViewportLayouted() When QPlainTextEdit is used read-only the key bindings are limited to navigation, and text may only be selected with the mouse: \table - \header \i Keypresses \i Action - \row \i Qt::UpArrow \i Moves one line up. - \row \i Qt::DownArrow \i Moves one line down. - \row \i Qt::LeftArrow \i Moves one character to the left. - \row \i Qt::RightArrow \i Moves one character to the right. - \row \i PageUp \i Moves one (viewport) page up. - \row \i PageDown \i Moves one (viewport) page down. - \row \i Home \i Moves to the beginning of the text. - \row \i End \i Moves to the end of the text. - \row \i Alt+Wheel - \i Scrolls the page horizontally (the Wheel is the mouse wheel). - \row \i Ctrl+Wheel \i Zooms the text. - \row \i Ctrl+A \i Selects all text. + \header \li Keypresses \li Action + \row \li Qt::UpArrow \li Moves one line up. + \row \li Qt::DownArrow \li Moves one line down. + \row \li Qt::LeftArrow \li Moves one character to the left. + \row \li Qt::RightArrow \li Moves one character to the right. + \row \li PageUp \li Moves one (viewport) page up. + \row \li PageDown \li Moves one (viewport) page down. + \row \li Home \li Moves to the beginning of the text. + \row \li End \li Moves to the end of the text. + \row \li Alt+Wheel + \li Scrolls the page horizontally (the Wheel is the mouse wheel). + \row \li Ctrl+Wheel \li Zooms the text. + \row \li Ctrl+A \li Selects all text. \endtable @@ -1127,34 +1127,34 @@ void QPlainTextEditPrivate::ensureViewportLayouted() The list of key bindings which are implemented for editing: \table - \header \i Keypresses \i Action - \row \i Backspace \i Deletes the character to the left of the cursor. - \row \i Delete \i Deletes the character to the right of the cursor. - \row \i Ctrl+C \i Copy the selected text to the clipboard. - \row \i Ctrl+Insert \i Copy the selected text to the clipboard. - \row \i Ctrl+K \i Deletes to the end of the line. - \row \i Ctrl+V \i Pastes the clipboard text into text edit. - \row \i Shift+Insert \i Pastes the clipboard text into text edit. - \row \i Ctrl+X \i Deletes the selected text and copies it to the clipboard. - \row \i Shift+Delete \i Deletes the selected text and copies it to the clipboard. - \row \i Ctrl+Z \i Undoes the last operation. - \row \i Ctrl+Y \i Redoes the last operation. - \row \i LeftArrow \i Moves the cursor one character to the left. - \row \i Ctrl+LeftArrow \i Moves the cursor one word to the left. - \row \i RightArrow \i Moves the cursor one character to the right. - \row \i Ctrl+RightArrow \i Moves the cursor one word to the right. - \row \i UpArrow \i Moves the cursor one line up. - \row \i Ctrl+UpArrow \i Moves the cursor one word up. - \row \i DownArrow \i Moves the cursor one line down. - \row \i Ctrl+Down Arrow \i Moves the cursor one word down. - \row \i PageUp \i Moves the cursor one page up. - \row \i PageDown \i Moves the cursor one page down. - \row \i Home \i Moves the cursor to the beginning of the line. - \row \i Ctrl+Home \i Moves the cursor to the beginning of the text. - \row \i End \i Moves the cursor to the end of the line. - \row \i Ctrl+End \i Moves the cursor to the end of the text. - \row \i Alt+Wheel \i Scrolls the page horizontally (the Wheel is the mouse wheel). - \row \i Ctrl+Wheel \i Zooms the text. + \header \li Keypresses \li Action + \row \li Backspace \li Deletes the character to the left of the cursor. + \row \li Delete \li Deletes the character to the right of the cursor. + \row \li Ctrl+C \li Copy the selected text to the clipboard. + \row \li Ctrl+Insert \li Copy the selected text to the clipboard. + \row \li Ctrl+K \li Deletes to the end of the line. + \row \li Ctrl+V \li Pastes the clipboard text into text edit. + \row \li Shift+Insert \li Pastes the clipboard text into text edit. + \row \li Ctrl+X \li Deletes the selected text and copies it to the clipboard. + \row \li Shift+Delete \li Deletes the selected text and copies it to the clipboard. + \row \li Ctrl+Z \li Undoes the last operation. + \row \li Ctrl+Y \li Redoes the last operation. + \row \li LeftArrow \li Moves the cursor one character to the left. + \row \li Ctrl+LeftArrow \li Moves the cursor one word to the left. + \row \li RightArrow \li Moves the cursor one character to the right. + \row \li Ctrl+RightArrow \li Moves the cursor one word to the right. + \row \li UpArrow \li Moves the cursor one line up. + \row \li Ctrl+UpArrow \li Moves the cursor one word up. + \row \li DownArrow \li Moves the cursor one line down. + \row \li Ctrl+Down Arrow \li Moves the cursor one word down. + \row \li PageUp \li Moves the cursor one page up. + \row \li PageDown \li Moves the cursor one page down. + \row \li Home \li Moves the cursor to the beginning of the line. + \row \li Ctrl+Home \li Moves the cursor to the beginning of the text. + \row \li End \li Moves the cursor to the end of the line. + \row \li Ctrl+End \li Moves the cursor to the end of the text. + \row \li Alt+Wheel \li Scrolls the page horizontally (the Wheel is the mouse wheel). + \row \li Ctrl+Wheel \li Zooms the text. \endtable To select (mark) text hold down the Shift key whilst pressing one diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index eabed2ee62..816b847cf5 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -196,12 +196,12 @@ bool QProgressBarPrivate::repaintRequired() const they are unable to determine the size of the item being downloaded. \table - \row \o \inlineimage macintosh-progressbar.png Screenshot of a Macintosh style progress bar - \o A progress bar shown in the Macintosh widget style. - \row \o \inlineimage windowsxp-progressbar.png Screenshot of a Windows XP style progress bar - \o A progress bar shown in the Windows XP widget style. - \row \o \inlineimage plastique-progressbar.png Screenshot of a Plastique style progress bar - \o A progress bar shown in the Plastique widget style. + \row \li \inlineimage macintosh-progressbar.png Screenshot of a Macintosh style progress bar + \li A progress bar shown in the Macintosh widget style. + \row \li \inlineimage windowsxp-progressbar.png Screenshot of a Windows XP style progress bar + \li A progress bar shown in the Windows XP widget style. + \row \li \inlineimage plastique-progressbar.png Screenshot of a Plastique style progress bar + \li A progress bar shown in the Plastique widget style. \endtable \sa QProgressDialog, {fowler}{GUI Design Handbook: Progress Indicator} diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp index 99252c43dc..7ca5dcb486 100644 --- a/src/widgets/widgets/qpushbutton.cpp +++ b/src/widgets/widgets/qpushbutton.cpp @@ -126,13 +126,13 @@ QT_BEGIN_NAMESPACE The most important modes or states are: \list - \i Available or not (grayed out, disabled). - \i Standard push button, toggling push button or menu button. - \i On or off (only for toggling push buttons). - \i Default or normal. The default button in a dialog can generally + \li Available or not (grayed out, disabled). + \li Standard push button, toggling push button or menu button. + \li On or off (only for toggling push buttons). + \li Default or normal. The default button in a dialog can generally be "clicked" using the Enter or Return key. - \i Auto-repeat or not. - \i Pressed down or not. + \li Auto-repeat or not. + \li Pressed down or not. \endlist As a general rule, use a push button when the application or @@ -160,18 +160,18 @@ QT_BEGIN_NAMESPACE check boxes (see QCheckBox). \table 100% - \row \o \inlineimage macintosh-pushbutton.png Screenshot of a Macintosh style push button - \o A push button shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \row \li \inlineimage macintosh-pushbutton.png Screenshot of a Macintosh style push button + \li A push button shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. Note that when a button's width becomes smaller than 50 or its height becomes smaller than 30, the button's corners are changed from round to square. Use the setMinimumSize() function to prevent this behavior. - \row \o \inlineimage windowsxp-pushbutton.png Screenshot of a Windows XP style push button - \o A push button shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \o \inlineimage plastique-pushbutton.png Screenshot of a Plastique style push button - \o A push button shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \row \li \inlineimage windowsxp-pushbutton.png Screenshot of a Windows XP style push button + \li A push button shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage plastique-pushbutton.png Screenshot of a Plastique style push button + \li A push button shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. \endtable In Qt, the QAbstractButton base class provides most of the modes @@ -518,9 +518,9 @@ void QPushButton::focusOutEvent(QFocusEvent *e) \table 100% \row - \o \inlineimage plastique-pushbutton-menu.png Screenshot of a Plastique style push button with popup menu. - \o \inlineimage cleanlooks-pushbutton-menu.png Screenshot of a Cleanlooks style push button with popup menu. - \o Push buttons with popup menus shown in the \l{Plastique Style Widget Gallery}{Plastique widget style} + \li \inlineimage plastique-pushbutton-menu.png Screenshot of a Plastique style push button with popup menu. + \li \inlineimage cleanlooks-pushbutton-menu.png Screenshot of a Cleanlooks style push button with popup menu. + \li Push buttons with popup menus shown in the \l{Plastique Style Widget Gallery}{Plastique widget style} (left) and \l{Cleanlooks Style Widget Gallery}{Cleanlooks widget style} (right). \endtable diff --git a/src/widgets/widgets/qradiobutton.cpp b/src/widgets/widgets/qradiobutton.cpp index 792550949b..11cd89bca2 100644 --- a/src/widgets/widgets/qradiobutton.cpp +++ b/src/widgets/widgets/qradiobutton.cpp @@ -116,12 +116,12 @@ void QRadioButtonPrivate::init() toggle(), pressed(), released(), clicked(), and toggled(). \table 100% - \row \o \inlineimage plastique-radiobutton.png Screenshot of a Plastique radio button - \o A radio button shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. - \row \o \inlineimage windows-radiobutton.png Screenshot of a Windows XP radio button - \o A radio button shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \o \inlineimage macintosh-radiobutton.png Screenshot of a Macintosh radio button - \o A radio button shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \row \li \inlineimage plastique-radiobutton.png Screenshot of a Plastique radio button + \li A radio button shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \row \li \inlineimage windows-radiobutton.png Screenshot of a Windows XP radio button + \li A radio button shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage macintosh-radiobutton.png Screenshot of a Macintosh radio button + \li A radio button shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \endtable \sa QPushButton, QToolButton, QCheckBox, {fowler}{GUI Design Handbook: Radio Button}, diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp index 490dea0d2d..84be2d569b 100644 --- a/src/widgets/widgets/qscrollarea.cpp +++ b/src/widgets/widgets/qscrollarea.cpp @@ -77,9 +77,9 @@ QT_BEGIN_NAMESPACE \table \row - \o \inlineimage qscrollarea-noscrollbars.png - \o \inlineimage qscrollarea-onescrollbar.png - \o \inlineimage qscrollarea-twoscrollbars.png + \li \inlineimage qscrollarea-noscrollbars.png + \li \inlineimage qscrollarea-onescrollbar.png + \li \inlineimage qscrollarea-twoscrollbars.png \endtable The scroll bars appearance depends on the currently set \l diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index cb3126e566..6ac5473f2e 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -83,21 +83,21 @@ QT_BEGIN_NAMESPACE needs. \table - \row \o \image qscrollbar-picture.png - \o Scroll bars typically include four separate controls: a slider, + \row \li \image qscrollbar-picture.png + \li Scroll bars typically include four separate controls: a slider, scroll arrows, and a page control. \list - \o a. The slider provides a way to quickly go to any part of the + \li a. The slider provides a way to quickly go to any part of the document, but does not support accurate navigation within large documents. - \o b. The scroll arrows are push buttons which can be used to accurately + \li b. The scroll arrows are push buttons which can be used to accurately navigate to a particular place in a document. For a vertical scroll bar connected to a text editor, these typically move the current position one "line" up or down, and adjust the position of the slider by a small amount. In editors and list boxes a "line" might mean one line of text; in an image viewer it might mean 20 pixels. - \o c. The page control is the area over which the slider is dragged (the + \li c. The page control is the area over which the slider is dragged (the scroll bar's background). Clicking here moves the scroll bar towards the click by one "page". This value is usually the same as the length of the slider. @@ -135,8 +135,8 @@ QT_BEGIN_NAMESPACE value of 80. This would give us a scroll bar with five "pages". \table - \row \o \inlineimage qscrollbar-values.png - \o The relationship between a document length, the range of values used + \row \li \inlineimage qscrollbar-values.png + \li The relationship between a document length, the range of values used in a scroll bar, and the page step is simple in many common situations. The scroll bar's range of values is determined by subtracting a chosen page step from some value representing the length of the document. @@ -153,18 +153,18 @@ QT_BEGIN_NAMESPACE ScrollBar inherits a comprehensive set of signals from QAbstractSlider: \list - \o \l{QAbstractSlider::valueChanged()}{valueChanged()} is emitted when the + \li \l{QAbstractSlider::valueChanged()}{valueChanged()} is emitted when the scroll bar's value has changed. The tracking() determines whether this signal is emitted during user interaction. - \o \l{QAbstractSlider::rangeChanged()}{rangeChanged()} is emitted when the + \li \l{QAbstractSlider::rangeChanged()}{rangeChanged()} is emitted when the scroll bar's range of values has changed. - \o \l{QAbstractSlider::sliderPressed()}{sliderPressed()} is emitted when + \li \l{QAbstractSlider::sliderPressed()}{sliderPressed()} is emitted when the user starts to drag the slider. - \o \l{QAbstractSlider::sliderMoved()}{sliderMoved()} is emitted when the user + \li \l{QAbstractSlider::sliderMoved()}{sliderMoved()} is emitted when the user drags the slider. - \o \l{QAbstractSlider::sliderReleased()}{sliderReleased()} is emitted when + \li \l{QAbstractSlider::sliderReleased()}{sliderReleased()} is emitted when the user releases the slider. - \o \l{QAbstractSlider::actionTriggered()}{actionTriggered()} is emitted + \li \l{QAbstractSlider::actionTriggered()}{actionTriggered()} is emitted when the scroll bar is changed by user interaction or via the \l{QAbstractSlider::triggerAction()}{triggerAction()} function. \endlist @@ -173,12 +173,12 @@ QT_BEGIN_NAMESPACE default focusPolicy() of Qt::NoFocus. Use setFocusPolicy() to enable keyboard interaction with the scroll bar: \list - \o Left/Right move a horizontal scroll bar by one single step. - \o Up/Down move a vertical scroll bar by one single step. - \o PageUp moves up one page. - \o PageDown moves down one page. - \o Home moves to the start (mininum). - \o End moves to the end (maximum). + \li Left/Right move a horizontal scroll bar by one single step. + \li Up/Down move a vertical scroll bar by one single step. + \li PageUp moves up one page. + \li PageDown moves down one page. + \li Home moves to the start (mininum). + \li End moves to the end (maximum). \endlist The slider itself can be controlled by using the @@ -190,12 +190,12 @@ QT_BEGIN_NAMESPACE slider. \table 100% - \row \o \inlineimage macintosh-horizontalscrollbar.png Screenshot of a Macintosh style scroll bar - \o A scroll bar shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. - \row \o \inlineimage windowsxp-horizontalscrollbar.png Screenshot of a Windows XP style scroll bar - \o A scroll bar shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \o \inlineimage plastique-horizontalscrollbar.png Screenshot of a Plastique style scroll bar - \o A scroll bar shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \row \li \inlineimage macintosh-horizontalscrollbar.png Screenshot of a Macintosh style scroll bar + \li A scroll bar shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \row \li \inlineimage windowsxp-horizontalscrollbar.png Screenshot of a Windows XP style scroll bar + \li A scroll bar shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage plastique-horizontalscrollbar.png Screenshot of a Plastique style scroll bar + \li A scroll bar shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. \endtable \sa QScrollArea, QSlider, QDial, QSpinBox, {fowler}{GUI Design Handbook: Scroll Bar}, {Sliders Example} diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp index 09557a3c90..4a5269c110 100644 --- a/src/widgets/widgets/qsizegrip.cpp +++ b/src/widgets/widgets/qsizegrip.cpp @@ -195,8 +195,8 @@ Qt::Corner QSizeGripPrivate::corner() const window is shown full screen or maximised. \table 50% - \row \o \inlineimage plastique-sizegrip.png Screenshot of a Plastique style size grip - \o A size grip widget at the bottom-right corner of a main window, shown in the + \row \li \inlineimage plastique-sizegrip.png Screenshot of a Plastique style size grip + \li A size grip widget at the bottom-right corner of a main window, shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. \endtable diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp index b05726c965..7f77bc9d03 100644 --- a/src/widgets/widgets/qslider.cpp +++ b/src/widgets/widgets/qslider.cpp @@ -225,17 +225,17 @@ QStyle::SubControl QSliderPrivate::newHoverControl(const QPoint &pos) QSlider inherits a comprehensive set of signals: \table - \header \o Signal \o Description - \row \o \l valueChanged() - \o Emitted when the slider's value has changed. The tracking() + \header \li Signal \li Description + \row \li \l valueChanged() + \li Emitted when the slider's value has changed. The tracking() determines whether this signal is emitted during user interaction. - \row \o \l sliderPressed() - \o Emitted when the user starts to drag the slider. - \row \o \l sliderMoved() - \o Emitted when the user drags the slider. - \row \o \l sliderReleased() - \o Emitted when the user releases the slider. + \row \li \l sliderPressed() + \li Emitted when the user starts to drag the slider. + \row \li \l sliderMoved() + \li Emitted when the user drags the slider. + \row \li \l sliderReleased() + \li Emitted when the user releases the slider. \endtable QSlider only provides integer ranges. Note that although @@ -246,21 +246,21 @@ QStyle::SubControl QSliderPrivate::newHoverControl(const QPoint &pos) keyboard interface. The keyboard interface is the following: \list - \o Left/Right move a horizontal slider by one single step. - \o Up/Down move a vertical slider by one single step. - \o PageUp moves up one page. - \o PageDown moves down one page. - \o Home moves to the start (mininum). - \o End moves to the end (maximum). + \li Left/Right move a horizontal slider by one single step. + \li Up/Down move a vertical slider by one single step. + \li PageUp moves up one page. + \li PageDown moves down one page. + \li Home moves to the start (mininum). + \li End moves to the end (maximum). \endlist \table 100% - \row \o \inlineimage macintosh-slider.png Screenshot of a Macintosh slider - \o A slider shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. - \row \o \inlineimage windows-slider.png Screenshot of a Windows XP slider - \o A slider shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \o \inlineimage plastique-slider.png Screenshot of a Plastique slider - \o A slider shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \row \li \inlineimage macintosh-slider.png Screenshot of a Macintosh slider + \li A slider shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \row \li \inlineimage windows-slider.png Screenshot of a Windows XP slider + \li A slider shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage plastique-slider.png Screenshot of a Plastique slider + \li A slider shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. \endtable \sa QScrollBar, QSpinBox, QDial, {fowler}{GUI Design Handbook: Slider}, {Sliders Example} diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp index 3038d8e30c..7dcaead2f4 100644 --- a/src/widgets/widgets/qspinbox.cpp +++ b/src/widgets/widgets/qspinbox.cpp @@ -152,12 +152,12 @@ public: setSpecialValueText() for how to do this with QSpinBox. \table 100% - \row \o \inlineimage windowsxp-spinbox.png Screenshot of a Windows XP spin box - \o A spin box shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \o \inlineimage plastique-spinbox.png Screenshot of a Plastique spin box - \o A spin box shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. - \row \o \inlineimage macintosh-spinbox.png Screenshot of a Macintosh spin box - \o A spin box shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. + \row \li \inlineimage windowsxp-spinbox.png Screenshot of a Windows XP spin box + \li A spin box shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. + \row \li \inlineimage plastique-spinbox.png Screenshot of a Plastique spin box + \li A spin box shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \row \li \inlineimage macintosh-spinbox.png Screenshot of a Macintosh spin box + \li A spin box shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \endtable \section1 Subclassing QSpinBox diff --git a/src/widgets/widgets/qstackedwidget.cpp b/src/widgets/widgets/qstackedwidget.cpp index 5a8a382a58..9617d6de58 100644 --- a/src/widgets/widgets/qstackedwidget.cpp +++ b/src/widgets/widgets/qstackedwidget.cpp @@ -232,7 +232,7 @@ int QStackedWidget::insertWidget(int index, QWidget *widget) not deleted but simply removed from the stacked layout, causing it to be hidden. - \bold{Note:} Ownership of \a widget reverts to the application. + \b{Note:} Ownership of \a widget reverts to the application. \sa addWidget(), insertWidget(), currentWidget() */ diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp index 9f170626da..4b9242499c 100644 --- a/src/widgets/widgets/qstatusbar.cpp +++ b/src/widgets/widgets/qstatusbar.cpp @@ -165,12 +165,12 @@ QRect QStatusBarPrivate::messageRect() const Each status indicator falls into one of three categories: \list - \o \e Temporary - briefly occupies most of the status bar. Used + \li \e Temporary - briefly occupies most of the status bar. Used to explain tool tip texts or menu entries, for example. - \o \e Normal - occupies part of the status bar and may be hidden + \li \e Normal - occupies part of the status bar and may be hidden by temporary messages. Used to display the page and line number in a word processor, for example. - \o \e Permanent - is never hidden. Used for important mode + \li \e Permanent - is never hidden. Used for important mode indications, for example, some applications put a Caps Lock indicator in the status bar. \endlist diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 580aea10b9..ca94854d11 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -252,21 +252,21 @@ void QTabBar::initStyleOption(QStyleOptionTab *option, int tabIndex) const tab: \list - \i tabSizeHint() calcuates the size of a tab. - \i tabInserted() notifies that a new tab was added. - \i tabRemoved() notifies that a tab was removed. - \i tabLayoutChange() notifies that the tabs have been re-laid out. - \i paintEvent() paints all tabs. + \li tabSizeHint() calcuates the size of a tab. + \li tabInserted() notifies that a new tab was added. + \li tabRemoved() notifies that a tab was removed. + \li tabLayoutChange() notifies that the tabs have been re-laid out. + \li paintEvent() paints all tabs. \endlist For subclasses, you might also need the tabRect() functions which returns the visual geometry of a single tab. \table 100% - \row \o \inlineimage plastique-tabbar.png Screenshot of a Plastique style tab bar - \o A tab bar shown in the Plastique widget style. - \row \o \inlineimage plastique-tabbar-truncated.png Screenshot of a truncated Plastique tab bar - \o A truncated tab bar shown in the Plastique widget style. + \row \li \inlineimage plastique-tabbar.png Screenshot of a Plastique style tab bar + \li A tab bar shown in the Plastique widget style. + \row \li \inlineimage plastique-tabbar-truncated.png Screenshot of a truncated Plastique tab bar + \li A truncated tab bar shown in the Plastique widget style. \endtable \sa QTabWidget diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp index 612d51826c..505287512e 100644 --- a/src/widgets/widgets/qtabwidget.cpp +++ b/src/widgets/widgets/qtabwidget.cpp @@ -77,12 +77,12 @@ QT_BEGIN_NAMESPACE The normal way to use QTabWidget is to do the following: \list 1 - \i Create a QTabWidget. - \i Create a QWidget for each of the pages in the tab dialog, but + \li Create a QTabWidget. + \li Create a QWidget for each of the pages in the tab dialog, but do not specify parent widgets for them. - \i Insert child widgets into the page widget, using layouts to + \li Insert child widgets into the page widget, using layouts to position them as normal. - \i Call addTab() or insertTab() to put the page widgets into the + \li Call addTab() or insertTab() to put the page widgets into the tab widget, giving each tab a suitable label with an optional keyboard shortcut. \endlist @@ -120,12 +120,12 @@ QT_BEGIN_NAMESPACE area, organizing the individual pages). \table 100% - \row \o \inlineimage windowsxp-tabwidget.png Screenshot of a Windows XP style tab widget - \o \inlineimage macintosh-tabwidget.png Screenshot of a Macintosh style tab widget - \o \inlineimage plastique-tabwidget.png Screenshot of a Plastique style tab widget - \row \o A Windows XP style tab widget. - \o A Macintosh style tab widget. - \o A Plastique style tab widget. + \row \li \inlineimage windowsxp-tabwidget.png Screenshot of a Windows XP style tab widget + \li \inlineimage macintosh-tabwidget.png Screenshot of a Macintosh style tab widget + \li \inlineimage plastique-tabwidget.png Screenshot of a Plastique style tab widget + \row \li A Windows XP style tab widget. + \li A Macintosh style tab widget. + \li A Plastique style tab widget. \endtable \sa QTabBar, QStackedWidget, QToolBox, {Tab Dialog Example} diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index d9229c12e8..050730ec2a 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -902,10 +902,10 @@ void QTextBrowser::home() /*! The event \a ev is used to provide the following keyboard shortcuts: \table - \header \i Keypress \i Action - \row \i Alt+Left Arrow \i \l backward() - \row \i Alt+Right Arrow \i \l forward() - \row \i Alt+Up Arrow \i \l home() + \header \li Keypress \li Action + \row \li Alt+Left Arrow \li \l backward() + \row \li Alt+Right Arrow \li \l forward() + \row \li Alt+Up Arrow \li \l home() \endtable */ void QTextBrowser::keyPressEvent(QKeyEvent *ev) @@ -1068,10 +1068,10 @@ void QTextBrowser::paintEvent(QPaintEvent *e) depending on the resource type: \table - \header \i ResourceType \i QVariant::Type - \row \i QTextDocument::HtmlResource \i QString or QByteArray - \row \i QTextDocument::ImageResource \i QImage, QPixmap or QByteArray - \row \i QTextDocument::StyleSheetResource \i QString or QByteArray + \header \li ResourceType \li QVariant::Type + \row \li QTextDocument::HtmlResource \li QString or QByteArray + \row \li QTextDocument::ImageResource \li QImage, QPixmap or QByteArray + \row \li QTextDocument::StyleSheetResource \li QString or QByteArray \endtable */ QVariant QTextBrowser::loadResource(int /*type*/, const QUrl &name) @@ -1146,10 +1146,10 @@ void QTextBrowser::clearHistory() Returns the url of the HistoryItem. \table - \header \i Input \i Return - \row \i \a{i} < 0 \i \l backward() history - \row \i\a{i} == 0 \i current, see QTextBrowser::source() - \row \i \a{i} > 0 \i \l forward() history + \header \li Input \li Return + \row \li \a{i} < 0 \li \l backward() history + \row \li\a{i} == 0 \li current, see QTextBrowser::source() + \row \li \a{i} > 0 \li \l forward() history \endtable \since 4.4 @@ -1164,10 +1164,10 @@ QUrl QTextBrowser::historyUrl(int i) const Returns the documentTitle() of the HistoryItem. \table - \header \i Input \i Return - \row \i \a{i} < 0 \i \l backward() history - \row \i \a{i} == 0 \i current, see QTextBrowser::source() - \row \i \a{i} > 0 \i \l forward() history + \header \li Input \li Return + \row \li \a{i} < 0 \li \l backward() history + \row \li \a{i} == 0 \li current, see QTextBrowser::source() + \row \li \a{i} > 0 \li \l forward() history \endtable \snippet doc/src/snippets/code/src_gui_widgets_qtextbrowser.cpp 0 diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index d0065aacb9..198d101dbf 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -412,19 +412,19 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect) When QTextEdit is used read-only the key bindings are limited to navigation, and text may only be selected with the mouse: \table - \header \i Keypresses \i Action - \row \i Up \i Moves one line up. - \row \i Down \i Moves one line down. - \row \i Left \i Moves one character to the left. - \row \i Right \i Moves one character to the right. - \row \i PageUp \i Moves one (viewport) page up. - \row \i PageDown \i Moves one (viewport) page down. - \row \i Home \i Moves to the beginning of the text. - \row \i End \i Moves to the end of the text. - \row \i Alt+Wheel - \i Scrolls the page horizontally (the Wheel is the mouse wheel). - \row \i Ctrl+Wheel \i Zooms the text. - \row \i Ctrl+A \i Selects all text. + \header \li Keypresses \li Action + \row \li Up \li Moves one line up. + \row \li Down \li Moves one line down. + \row \li Left \li Moves one character to the left. + \row \li Right \li Moves one character to the right. + \row \li PageUp \li Moves one (viewport) page up. + \row \li PageDown \li Moves one (viewport) page down. + \row \li Home \li Moves to the beginning of the text. + \row \li End \li Moves to the end of the text. + \row \li Alt+Wheel + \li Scrolls the page horizontally (the Wheel is the mouse wheel). + \row \li Ctrl+Wheel \li Zooms the text. + \row \li Ctrl+A \li Selects all text. \endtable The text edit may be able to provide some meta-information. For @@ -486,31 +486,31 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect) The list of key bindings which are implemented for editing: \table - \header \i Keypresses \i Action - \row \i Backspace \i Deletes the character to the left of the cursor. - \row \i Delete \i Deletes the character to the right of the cursor. - \row \i Ctrl+C \i Copy the selected text to the clipboard. - \row \i Ctrl+Insert \i Copy the selected text to the clipboard. - \row \i Ctrl+K \i Deletes to the end of the line. - \row \i Ctrl+V \i Pastes the clipboard text into text edit. - \row \i Shift+Insert \i Pastes the clipboard text into text edit. - \row \i Ctrl+X \i Deletes the selected text and copies it to the clipboard. - \row \i Shift+Delete \i Deletes the selected text and copies it to the clipboard. - \row \i Ctrl+Z \i Undoes the last operation. - \row \i Ctrl+Y \i Redoes the last operation. - \row \i Left \i Moves the cursor one character to the left. - \row \i Ctrl+Left \i Moves the cursor one word to the left. - \row \i Right \i Moves the cursor one character to the right. - \row \i Ctrl+Right \i Moves the cursor one word to the right. - \row \i Up \i Moves the cursor one line up. - \row \i Down \i Moves the cursor one line down. - \row \i PageUp \i Moves the cursor one page up. - \row \i PageDown \i Moves the cursor one page down. - \row \i Home \i Moves the cursor to the beginning of the line. - \row \i Ctrl+Home \i Moves the cursor to the beginning of the text. - \row \i End \i Moves the cursor to the end of the line. - \row \i Ctrl+End \i Moves the cursor to the end of the text. - \row \i Alt+Wheel \i Scrolls the page horizontally (the Wheel is the mouse wheel). + \header \li Keypresses \li Action + \row \li Backspace \li Deletes the character to the left of the cursor. + \row \li Delete \li Deletes the character to the right of the cursor. + \row \li Ctrl+C \li Copy the selected text to the clipboard. + \row \li Ctrl+Insert \li Copy the selected text to the clipboard. + \row \li Ctrl+K \li Deletes to the end of the line. + \row \li Ctrl+V \li Pastes the clipboard text into text edit. + \row \li Shift+Insert \li Pastes the clipboard text into text edit. + \row \li Ctrl+X \li Deletes the selected text and copies it to the clipboard. + \row \li Shift+Delete \li Deletes the selected text and copies it to the clipboard. + \row \li Ctrl+Z \li Undoes the last operation. + \row \li Ctrl+Y \li Redoes the last operation. + \row \li Left \li Moves the cursor one character to the left. + \row \li Ctrl+Left \li Moves the cursor one word to the left. + \row \li Right \li Moves the cursor one character to the right. + \row \li Ctrl+Right \li Moves the cursor one word to the right. + \row \li Up \li Moves the cursor one line up. + \row \li Down \li Moves the cursor one line down. + \row \li PageUp \li Moves the cursor one page up. + \row \li PageDown \li Moves the cursor one page down. + \row \li Home \li Moves the cursor to the beginning of the line. + \row \li Ctrl+Home \li Moves the cursor to the beginning of the text. + \row \li End \li Moves the cursor to the end of the line. + \row \li Ctrl+End \li Moves the cursor to the end of the text. + \row \li Alt+Wheel \li Scrolls the page horizontally (the Wheel is the mouse wheel). \endtable To select (mark) text hold down the Shift key whilst pressing one diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index 015419a879..68a4f20fb6 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -159,8 +159,8 @@ bool QToolButtonPrivate::hasMenu() const adjust it with setPopupDelay(). \table 100% - \row \o \inlineimage assistant-toolbar.png Qt Assistant's toolbar with tool buttons - \row \o Qt Assistant's toolbar contains tool buttons that are associated + \row \li \inlineimage assistant-toolbar.png Qt Assistant's toolbar with tool buttons + \row \li Qt Assistant's toolbar contains tool buttons that are associated with actions used in other parts of the main window. \endtable diff --git a/src/widgets/widgets/qwidgetanimator_p.h b/src/widgets/widgets/qwidgetanimator_p.h index e2054401d6..82f81a704f 100644 --- a/src/widgets/widgets/qwidgetanimator_p.h +++ b/src/widgets/widgets/qwidgetanimator_p.h @@ -54,7 +54,7 @@ // #include <qobject.h> -#include <qmap.h> +#include <qhash.h> QT_BEGIN_NAMESPACE @@ -79,7 +79,7 @@ private Q_SLOTS: #endif private: - typedef QMap<QWidget*, QPropertyAnimation*> AnimationMap; + typedef QHash<QWidget*, QPropertyAnimation*> AnimationMap; AnimationMap m_animation_map; QMainWindowLayout *m_mainWindowLayout; }; diff --git a/src/widgets/widgets/qworkspace.cpp b/src/widgets/widgets/qworkspace.cpp index 5cc8e363f1..36c589be1c 100644 --- a/src/widgets/widgets/qworkspace.cpp +++ b/src/widgets/widgets/qworkspace.cpp @@ -878,8 +878,8 @@ QSize QWorkspaceTitleBar::sizeHint() const connect menu entries to them. \table - \row \o \inlineimage mdi-cascade.png - \o \inlineimage mdi-tile.png + \row \li \inlineimage mdi-cascade.png + \li \inlineimage mdi-tile.png \endtable If you want your users to be able to work with child windows |