diff options
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/dialogs/qfilesystemmodel.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/dialogs/qinputdialog.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 164 | ||||
| -rw-r--r-- | src/widgets/dialogs/qprogressdialog.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 94 |
7 files changed, 144 insertions, 144 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 5ffb5466d6..4170df4799 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -166,7 +166,7 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const \section1 Modal Dialogs - A \bold{modal} dialog is a dialog that blocks input to other + A \b{modal} dialog is a dialog that blocks input to other visible windows in the same application. Dialogs that are used to request a file name from the user or that are used to set application preferences are usually modal. Dialogs can be @@ -200,7 +200,7 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const \section1 Modeless Dialogs - A \bold{modeless} dialog is a dialog that operates + A \b{modeless} dialog is a dialog that operates independently of other windows in the same application. Find and replace dialogs in word-processors are often modeless to allow the user to interact with both the application's main window and with diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 84fdef6702..3908daec9c 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -1096,7 +1096,7 @@ QStringList qt_make_filter_list(const QString &filter) Sets the filter used in the file dialog to the given \a filter. If \a filter contains a pair of parentheses containing one or more - of \bold{anything*something}, separated by spaces, then only the + of \b{anything*something}, separated by spaces, then only the text contained in the parentheses is used as the filter. This means that these calls are all equivalent: diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp index 0211b2512c..5446eca383 100644 --- a/src/widgets/dialogs/qfilesystemmodel.cpp +++ b/src/widgets/dialogs/qfilesystemmodel.cpp @@ -130,12 +130,12 @@ QT_BEGIN_NAMESPACE \fn bool QFileSystemModel::rmdir(const QModelIndex &index) const Removes the directory corresponding to the model item \a index in the - file system model and \bold{deletes the corresponding directory from the + file system model and \b{deletes the corresponding directory from the file system}, returning true if successful. If the directory cannot be removed, false is returned. \warning This function deletes directories from the file system; it does - \bold{not} move them to a location where they can be recovered. + \b{not} move them to a location where they can be recovered. \sa remove() */ @@ -185,11 +185,11 @@ QT_BEGIN_NAMESPACE /*! \fn bool QFileSystemModel::remove(const QModelIndex &index) const - Removes the model item \a index from the file system model and \bold{deletes the + Removes the model item \a index from the file system model and \b{deletes the corresponding file from the file system}, returning true if successful. If the item cannot be removed, false is returned. - \warning This function deletes files from the file system; it does \bold{not} + \warning This function deletes files from the file system; it does \b{not} move them to a location where they can be recovered. \sa rmdir() diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index 9cf41003f5..737d6bb467 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -1031,10 +1031,10 @@ QString QInputDialog::cancelButtonText() const in \a member. These are: \list - \o textValueSelected() if \a member has a QString for its first argument. - \o intValueSelected() if \a member has an int for its first argument. - \o doubleValueSelected() if \a member has a double for its first argument. - \o accepted() if \a member has NO arguments. + \li textValueSelected() if \a member has a QString for its first argument. + \li intValueSelected() if \a member has an int for its first argument. + \li doubleValueSelected() if \a member has a double for its first argument. + \li accepted() if \a member has NO arguments. \endlist The signal will be disconnected from the slot when the dialog is closed. diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index a737584e3f..3909125fe7 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -577,21 +577,21 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button) \table \row - \o \img qmessagebox-quest.png - \o \l Question - \o For asking a question during normal operations. + \li \img qmessagebox-quest.png + \li \l Question + \li For asking a question during normal operations. \row - \o \img qmessagebox-info.png - \o \l Information - \o For reporting information about normal operations. + \li \img qmessagebox-info.png + \li \l Information + \li For reporting information about normal operations. \row - \o \img qmessagebox-warn.png - \o \l Warning - \o For reporting non-critical errors. + \li \img qmessagebox-warn.png + \li \l Warning + \li For reporting non-critical errors. \row - \o \img qmessagebox-crit.png - \o \l Critical - \o For reporting critical errors. + \li \img qmessagebox-crit.png + \li \l Critical + \li For reporting critical errors. \endtable \l{QMessageBox::Icon}{Predefined icons} are not defined by QMessageBox, but @@ -663,13 +663,13 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button) \list 1 - \o If there is only one button, it is the button activated when + \li If there is only one button, it is the button activated when \key Esc is pressed. - \o If there is a \l Cancel button, it is the button activated when + \li If there is a \l Cancel button, it is the button activated when \key Esc is pressed. - \o If there is exactly one button having either + \li If there is exactly one button having either \l{QMessageBox::RejectRole} {the Reject role} or the \l{QMessageBox::NoRole} {the No role}, it is the button activated when \key Esc is pressed. @@ -927,9 +927,9 @@ QAbstractButton *QMessageBox::button(StandardButton which) const escape button as follows: \list 1 - \o If there is only one button, it is made the escape button. - \o If there is a \l Cancel button, it is made the escape button. - \o On Mac OS X only, if there is exactly one button with the role + \li If there is only one button, it is made the escape button. + \li If there is a \l Cancel button, it is made the escape button. + \li On Mac OS X only, if there is exactly one button with the role QMessageBox::RejectRole, it is made the escape button. \endlist @@ -1142,11 +1142,11 @@ void QMessageBox::setText(const QString &text) values: \list - \o QMessageBox::NoIcon - \o QMessageBox::Question - \o QMessageBox::Information - \o QMessageBox::Warning - \o QMessageBox::Critical + \li QMessageBox::NoIcon + \li QMessageBox::Question + \li QMessageBox::Information + \li QMessageBox::Warning + \li QMessageBox::Critical \endlist The default is QMessageBox::NoIcon. @@ -1649,12 +1649,12 @@ QMessageBox::StandardButton QMessageBox::critical(QWidget *parent, const QString about() looks for a suitable icon in four locations: \list 1 - \o It prefers \link QWidget::windowIcon() parent->icon() \endlink + \li It prefers \link QWidget::windowIcon() parent->icon() \endlink if that exists. - \o If not, it tries the top-level widget containing \a parent. - \o If that fails, it tries the \link + \li If not, it tries the top-level widget containing \a parent. + \li If that fails, it tries the \link QApplication::activeWindow() active window. \endlink - \o As a last resort it uses the Information icon. + \li As a last resort it uses the Information icon. \endlist The about box has a single button labelled "OK". On Mac OS X, the @@ -1929,26 +1929,26 @@ void QMessageBoxPrivate::retranslateStrings() The \a icon must be one of the following: \list - \o QMessageBox::NoIcon - \o QMessageBox::Question - \o QMessageBox::Information - \o QMessageBox::Warning - \o QMessageBox::Critical + \li QMessageBox::NoIcon + \li QMessageBox::Question + \li QMessageBox::Information + \li QMessageBox::Warning + \li QMessageBox::Critical \endlist Each button, \a button0, \a button1 and \a button2, can have one of the following values: \list - \o QMessageBox::NoButton - \o QMessageBox::Ok - \o QMessageBox::Cancel - \o QMessageBox::Yes - \o QMessageBox::No - \o QMessageBox::Abort - \o QMessageBox::Retry - \o QMessageBox::Ignore - \o QMessageBox::YesAll - \o QMessageBox::NoAll + \li QMessageBox::NoButton + \li QMessageBox::Ok + \li QMessageBox::Cancel + \li QMessageBox::Yes + \li QMessageBox::No + \li QMessageBox::Abort + \li QMessageBox::Retry + \li QMessageBox::Ignore + \li QMessageBox::YesAll + \li QMessageBox::NoAll \endlist Use QMessageBox::NoButton for the later parameters to have fewer @@ -1994,16 +1994,16 @@ QMessageBox::QMessageBox(const QString &title, const QString &text, Icon icon, of the following values: \list - \o QMessageBox::NoButton - \o QMessageBox::Ok - \o QMessageBox::Cancel - \o QMessageBox::Yes - \o QMessageBox::No - \o QMessageBox::Abort - \o QMessageBox::Retry - \o QMessageBox::Ignore - \o QMessageBox::YesAll - \o QMessageBox::NoAll + \li QMessageBox::NoButton + \li QMessageBox::Ok + \li QMessageBox::Cancel + \li QMessageBox::Yes + \li QMessageBox::No + \li QMessageBox::Abort + \li QMessageBox::Retry + \li QMessageBox::Ignore + \li QMessageBox::YesAll + \li QMessageBox::NoAll \endlist If you don't want all three buttons, set the last button, or last @@ -2080,16 +2080,16 @@ int QMessageBox::information(QWidget *parent, const QString &title, const QStrin following values: \list - \o QMessageBox::NoButton - \o QMessageBox::Ok - \o QMessageBox::Cancel - \o QMessageBox::Yes - \o QMessageBox::No - \o QMessageBox::Abort - \o QMessageBox::Retry - \o QMessageBox::Ignore - \o QMessageBox::YesAll - \o QMessageBox::NoAll + \li QMessageBox::NoButton + \li QMessageBox::Ok + \li QMessageBox::Cancel + \li QMessageBox::Yes + \li QMessageBox::No + \li QMessageBox::Abort + \li QMessageBox::Retry + \li QMessageBox::Ignore + \li QMessageBox::YesAll + \li QMessageBox::NoAll \endlist If you don't want all three buttons, set the last button, or last @@ -2166,16 +2166,16 @@ int QMessageBox::question(QWidget *parent, const QString &title, const QString& one of the following values: \list - \o QMessageBox::NoButton - \o QMessageBox::Ok - \o QMessageBox::Cancel - \o QMessageBox::Yes - \o QMessageBox::No - \o QMessageBox::Abort - \o QMessageBox::Retry - \o QMessageBox::Ignore - \o QMessageBox::YesAll - \o QMessageBox::NoAll + \li QMessageBox::NoButton + \li QMessageBox::Ok + \li QMessageBox::Cancel + \li QMessageBox::Yes + \li QMessageBox::No + \li QMessageBox::Abort + \li QMessageBox::Retry + \li QMessageBox::Ignore + \li QMessageBox::YesAll + \li QMessageBox::NoAll \endlist If you don't want all three buttons, set the last button, or last @@ -2251,16 +2251,16 @@ int QMessageBox::warning(QWidget *parent, const QString &title, const QString& t one of the following values: \list - \o QMessageBox::NoButton - \o QMessageBox::Ok - \o QMessageBox::Cancel - \o QMessageBox::Yes - \o QMessageBox::No - \o QMessageBox::Abort - \o QMessageBox::Retry - \o QMessageBox::Ignore - \o QMessageBox::YesAll - \o QMessageBox::NoAll + \li QMessageBox::NoButton + \li QMessageBox::Ok + \li QMessageBox::Cancel + \li QMessageBox::Yes + \li QMessageBox::No + \li QMessageBox::Abort + \li QMessageBox::Retry + \li QMessageBox::Ignore + \li QMessageBox::YesAll + \li QMessageBox::NoAll \endlist If you don't want all three buttons, set the last button, or last diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp index f39a7b63ec..350fb57e20 100644 --- a/src/widgets/dialogs/qprogressdialog.cpp +++ b/src/widgets/dialogs/qprogressdialog.cpp @@ -281,10 +281,10 @@ void QProgressDialogPrivate::_q_disconnectOnClose() Default settings: \list - \i The label text is empty. - \i The cancel button text is (translated) "Cancel". - \i minimum is 0; - \i maximum is 100 + \li The label text is empty. + \li The cancel button text is (translated) "Cancel". + \li minimum is 0; + \li maximum is 100 \endlist The \a parent argument is dialog's parent widget. The widget flags, \a f, are diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 8cd3799cae..8a75353c86 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -1826,28 +1826,28 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) QWizard supports four wizard looks: \list - \o ClassicStyle - \o ModernStyle - \o MacStyle - \o AeroStyle + \li ClassicStyle + \li ModernStyle + \li MacStyle + \li AeroStyle \endlist You can explicitly set the look to use using setWizardStyle() (e.g., if you want the same look on all platforms). \table - \header \o ClassicStyle - \o ModernStyle - \o MacStyle - \o AeroStyle - \row \o \inlineimage qtwizard-classic1.png - \o \inlineimage qtwizard-modern1.png - \o \inlineimage qtwizard-mac1.png - \o \inlineimage qtwizard-aero1.png - \row \o \inlineimage qtwizard-classic2.png - \o \inlineimage qtwizard-modern2.png - \o \inlineimage qtwizard-mac2.png - \o \inlineimage qtwizard-aero2.png + \header \li ClassicStyle + \li ModernStyle + \li MacStyle + \li AeroStyle + \row \li \inlineimage qtwizard-classic1.png + \li \inlineimage qtwizard-modern1.png + \li \inlineimage qtwizard-mac1.png + \li \inlineimage qtwizard-aero1.png + \row \li \inlineimage qtwizard-classic2.png + \li \inlineimage qtwizard-modern2.png + \li \inlineimage qtwizard-mac2.png + \li \inlineimage qtwizard-aero2.png \endtable Note: AeroStyle has effect only on a Windows Vista system with alpha compositing enabled. @@ -1876,15 +1876,15 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) only one page is shown. A page has the following attributes: \list - \o A \l{QWizardPage::}{title}. - \o A \l{QWizardPage::}{subTitle}. - \o A set of pixmaps, which may or may not be honored, depending + \li A \l{QWizardPage::}{title}. + \li A \l{QWizardPage::}{subTitle}. + \li A set of pixmaps, which may or may not be honored, depending on the wizard's style: \list - \o WatermarkPixmap (used by ClassicStyle and ModernStyle) - \o BannerPixmap (used by ModernStyle) - \o LogoPixmap (used by ClassicStyle and ModernStyle) - \o BackgroundPixmap (used by MacStyle) + \li WatermarkPixmap (used by ClassicStyle and ModernStyle) + \li BannerPixmap (used by ModernStyle) + \li LogoPixmap (used by ClassicStyle and ModernStyle) + \li BackgroundPixmap (used by MacStyle) \endlist \endlist @@ -2590,9 +2590,9 @@ bool QWizard::testOption(WizardOption option) const By default, the following options are set (depending on the platform): \list - \o Windows: HelpButtonOnRight. - \o Mac OS X: NoDefaultButton and NoCancelButton. - \o X11 and QWS (Qt for Embedded Linux): none. + \li Windows: HelpButtonOnRight. + \li Mac OS X: NoDefaultButton and NoCancelButton. + \li X11 and QWS (Qt for Embedded Linux): none. \endlist \sa wizardStyle @@ -2881,14 +2881,14 @@ QPixmap QWizard::pixmap(WizardPixmap which) const changedSignal. The table below lists these widgets: \table - \header \o Widget \o Property \o Change Notification Signal - \row \o QAbstractButton \o bool \l{QAbstractButton::}{checked} \o \l{QAbstractButton::}{toggled()} - \row \o QAbstractSlider \o int \l{QAbstractSlider::}{value} \o \l{QAbstractSlider::}{valueChanged()} - \row \o QComboBox \o int \l{QComboBox::}{currentIndex} \o \l{QComboBox::}{currentIndexChanged()} - \row \o QDateTimeEdit \o QDateTime \l{QDateTimeEdit::}{dateTime} \o \l{QDateTimeEdit::}{dateTimeChanged()} - \row \o QLineEdit \o QString \l{QLineEdit::}{text} \o \l{QLineEdit::}{textChanged()} - \row \o QListWidget \o int \l{QListWidget::}{currentRow} \o \l{QListWidget::}{currentRowChanged()} - \row \o QSpinBox \o int \l{QSpinBox::}{value} \o \l{QSpinBox::}{valueChanged()} + \header \li Widget \li Property \li Change Notification Signal + \row \li QAbstractButton \li bool \l{QAbstractButton::}{checked} \li \l{QAbstractButton::}{toggled()} + \row \li QAbstractSlider \li int \l{QAbstractSlider::}{value} \li \l{QAbstractSlider::}{valueChanged()} + \row \li QComboBox \li int \l{QComboBox::}{currentIndex} \li \l{QComboBox::}{currentIndexChanged()} + \row \li QDateTimeEdit \li QDateTime \l{QDateTimeEdit::}{dateTime} \li \l{QDateTimeEdit::}{dateTimeChanged()} + \row \li QLineEdit \li QString \l{QLineEdit::}{text} \li \l{QLineEdit::}{textChanged()} + \row \li QListWidget \li int \l{QListWidget::}{currentRow} \li \l{QListWidget::}{currentRowChanged()} + \row \li QSpinBox \li int \l{QSpinBox::}{value} \li \l{QSpinBox::}{valueChanged()} \endtable \sa QWizardPage::registerField() @@ -3361,19 +3361,19 @@ int QWizard::nextId() const provide custom behavior: \list - \o initializePage() is called to initialize the page's contents + \li initializePage() is called to initialize the page's contents when the user clicks the wizard's \gui Next button. If you want to derive the page's default from what the user entered on previous pages, this is the function to reimplement. - \o cleanupPage() is called to reset the page's contents when the + \li cleanupPage() is called to reset the page's contents when the user clicks the wizard's \gui Back button. - \o validatePage() validates the page when the user clicks \gui + \li validatePage() validates the page when the user clicks \gui Next or \gui Finish. It is often used to show an error message if the user has entered incomplete or invalid information. - \o nextId() returns the ID of the next page. It is useful when + \li nextId() returns the ID of the next page. It is useful when \l{creating non-linear wizards}, which allow different traversal paths based on the information provided by the user. - \o isComplete() is called to determine whether the \gui Next + \li isComplete() is called to determine whether the \gui Next and/or \gui Finish button should be enabled or disabled. If you reimplement isComplete(), also make sure that completeChanged() is emitted whenever the complete state @@ -3878,14 +3878,14 @@ QVariant QWizardPage::field(const QString &name) const changedSignal. The table below lists these widgets: \table - \header \o Widget \o Property \o Change Notification Signal - \row \o QAbstractButton \o bool \l{QAbstractButton::}{checked} \o \l{QAbstractButton::}{toggled()} - \row \o QAbstractSlider \o int \l{QAbstractSlider::}{value} \o \l{QAbstractSlider::}{valueChanged()} - \row \o QComboBox \o int \l{QComboBox::}{currentIndex} \o \l{QComboBox::}{currentIndexChanged()} - \row \o QDateTimeEdit \o QDateTime \l{QDateTimeEdit::}{dateTime} \o \l{QDateTimeEdit::}{dateTimeChanged()} - \row \o QLineEdit \o QString \l{QLineEdit::}{text} \o \l{QLineEdit::}{textChanged()} - \row \o QListWidget \o int \l{QListWidget::}{currentRow} \o \l{QListWidget::}{currentRowChanged()} - \row \o QSpinBox \o int \l{QSpinBox::}{value} \o \l{QSpinBox::}{valueChanged()} + \header \li Widget \li Property \li Change Notification Signal + \row \li QAbstractButton \li bool \l{QAbstractButton::}{checked} \li \l{QAbstractButton::}{toggled()} + \row \li QAbstractSlider \li int \l{QAbstractSlider::}{value} \li \l{QAbstractSlider::}{valueChanged()} + \row \li QComboBox \li int \l{QComboBox::}{currentIndex} \li \l{QComboBox::}{currentIndexChanged()} + \row \li QDateTimeEdit \li QDateTime \l{QDateTimeEdit::}{dateTime} \li \l{QDateTimeEdit::}{dateTimeChanged()} + \row \li QLineEdit \li QString \l{QLineEdit::}{text} \li \l{QLineEdit::}{textChanged()} + \row \li QListWidget \li int \l{QListWidget::}{currentRow} \li \l{QListWidget::}{currentRowChanged()} + \row \li QSpinBox \li int \l{QSpinBox::}{value} \li \l{QSpinBox::}{valueChanged()} \endtable You can use QWizard::setDefaultProperty() to add entries to this |