diff options
Diffstat (limited to 'src/widgets')
22 files changed, 51 insertions, 231 deletions
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp index 3ef5b788c6..e7a3c11b44 100644 --- a/src/widgets/itemviews/qlistview.cpp +++ b/src/widgets/itemviews/qlistview.cpp @@ -73,6 +73,8 @@ extern bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event); \ingroup advanced \inmodule QtWidgets + \image windows-listview.png + A QListView presents items stored in a model, either as a simple non-hierarchical list, or as a collection of icons. This class is used to provide lists and icon views that were previously provided by the @@ -111,15 +113,6 @@ extern bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event); within a notional grid of size specified by gridSize(). The items can be rendered as large or small icons depending on their iconSize(). - \table 100% - \row \li \inlineimage windowsvista-listview.png Screenshot of a Windows Vista style list view - \li \inlineimage macintosh-listview.png Screenshot of a Macintosh style table view - \li \inlineimage fusion-listview.png Screenshot of a Fusion style table view - \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} list view. - \li A \l{Macintosh Style Widget Gallery}{Macintosh style} list view. - \li A \l{Fusion Style Widget Gallery}{Fusion style} list view. - \endtable - \section1 Improving Performance It is possible to give the view hints about the data it is handling in order diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp index 9b34e89ef0..0a1f85facb 100644 --- a/src/widgets/itemviews/qlistwidget.cpp +++ b/src/widgets/itemviews/qlistwidget.cpp @@ -1149,6 +1149,8 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, \ingroup model-view \inmodule QtWidgets + \image windows-listview.png + QListWidget is a convenience class that provides a list view similar to the one supplied by QListView, but with a classic item-based interface for adding and removing items. QListWidget uses an internal model to manage @@ -1191,15 +1193,6 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, current item changes, the currentItemChanged() signal is emitted with the new current item and the item that was previously current. - \table 100% - \row \li \inlineimage windowsvista-listview.png Screenshot of a Windows Vista style list widget - \li \inlineimage macintosh-listview.png Screenshot of a Macintosh style table widget - \li \inlineimage fusion-listview.png Screenshot of a Fusion style table widget - \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} list widget. - \li A \l{Macintosh Style Widget Gallery}{Macintosh style} list widget. - \li A \l{Fusion Style Widget Gallery}{Fusion style} list widget. - \endtable - \sa QListWidgetItem, QListView, QTreeView, {Model/View Programming}, {Config Dialog Example} */ diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index ed6482a8bc..b79932327b 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -988,6 +988,8 @@ int QTableViewPrivate::heightHintForIndex(const QModelIndex &index, int hint, QS \ingroup advanced \inmodule QtWidgets + \image windows-tableview.png + A QTableView implements a table view that displays items from a model. This class is used to provide standard tables that were previously provided by the QTable class, but using the more @@ -1052,21 +1054,6 @@ int QTableViewPrivate::heightHintForIndex(const QModelIndex &index, int hint, QS columnViewportPosition() functions provide the equivalent conversion operations between x-coordinates and column indexes. - \section1 Styles - - QTableView is styled appropriately for each platform. The following images show - how it looks on three different platforms. Go to the \l{Qt Widget Gallery} to see - its appearance in other styles. - - \table 100% - \row \li \inlineimage windowsvista-tableview.png Screenshot of a Windows Vista style table view - \li \inlineimage macintosh-tableview.png Screenshot of a Macintosh style table view - \li \inlineimage fusion-tableview.png Screenshot of a Fusion style table view - \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} table view. - \li A \l{Macintosh Style Widget Gallery}{Macintosh style} table view. - \li A \l{Fusion Style Widget Gallery}{Fusion style} table view. - \endtable - \sa QTableWidget, {View Classes}, QAbstractItemModel, QAbstractItemView, {Chart Example}, {Pixelator Example}, {Table Model Example} */ diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp index ed83ef7b85..663cd4adc6 100644 --- a/src/widgets/itemviews/qtablewidget.cpp +++ b/src/widgets/itemviews/qtablewidget.cpp @@ -1504,6 +1504,8 @@ QTableWidgetItem &QTableWidgetItem::operator=(const QTableWidgetItem &other) \ingroup model-view \inmodule QtWidgets + \image windows-tableview.png + Table widgets provide standard table display facilities for applications. The items in a QTableWidget are provided by QTableWidgetItem. @@ -1545,15 +1547,6 @@ QTableWidgetItem &QTableWidgetItem::operator=(const QTableWidgetItem &other) number of columns with columnCount(). The table can be cleared with the clear() function. - \table 100% - \row \li \inlineimage windowsvista-tableview.png Screenshot of a Windows Vista style table widget - \li \inlineimage macintosh-tableview.png Screenshot of a Macintosh style table widget - \li \inlineimage fusion-tableview.png Screenshot of a Fusion style table widget - \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} table widget. - \li A \l{Macintosh Style Widget Gallery}{Macintosh style} table widget. - \li A \l{Fusion Style Widget Gallery}{Fusion style} table widget. - \endtable - \sa QTableWidgetItem, QTableView, {Model/View Programming} */ diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index f139fb2d5b..c1647cc2f1 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -71,6 +71,8 @@ QT_BEGIN_NAMESPACE \ingroup advanced \inmodule QtWidgets + \image windows-treeview.png + A QTreeView implements a tree representation of items from a model. This class is used to provide standard hierarchical lists that were previously provided by the \c QListView class, but using the more @@ -150,15 +152,6 @@ QT_BEGIN_NAMESPACE Describe the expanding/collapsing concept if not covered elsewhere. \endomit - \table 100% - \row \li \inlineimage windowsvista-treeview.png Screenshot of a Windows Vista style tree view - \li \inlineimage macintosh-treeview.png Screenshot of a Macintosh style tree view - \li \inlineimage fusion-treeview.png Screenshot of a Fusion style tree view - \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} tree view. - \li A \l{Macintosh Style Widget Gallery}{Macintosh style} tree view. - \li A \l{Fusion Style Widget Gallery}{Fusion style} tree view. - \endtable - \section1 Improving Performance It is possible to give the view hints about the data it is handling in order diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index 1338ce4585..8ce36ab47e 100644 --- a/src/widgets/itemviews/qtreewidget.cpp +++ b/src/widgets/itemviews/qtreewidget.cpp @@ -2354,6 +2354,8 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, \ingroup model-view \inmodule QtWidgets + \image windows-treeview.png + The QTreeWidget class is a convenience class that provides a standard tree widget with a classic item-based interface similar to that used by the QListView class in Qt 3. @@ -2387,15 +2389,6 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, \l{QTreeView::isSortingEnabled()}{isSortingEnabled()} function indicates whether sorting is enabled. - \table 100% - \row \li \inlineimage windowsvista-treeview.png Screenshot of a Windows Vista style tree widget - \li \inlineimage macintosh-treeview.png Screenshot of a Macintosh style tree widget - \li \inlineimage fusion-treeview.png Screenshot of a Fusion style tree widget - \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} tree widget. - \li A \l{Macintosh Style Widget Gallery}{Macintosh style} tree widget. - \li A \l{Fusion Style Widget Gallery}{Fusion style} tree widget. - \endtable - \sa QTreeWidgetItem, QTreeWidgetItemIterator, QTreeView, {Model/View Programming}, {Settings Editor Example} */ diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp index d4ba17b08e..9b49916774 100644 --- a/src/widgets/widgets/qcheckbox.cpp +++ b/src/widgets/widgets/qcheckbox.cpp @@ -73,6 +73,8 @@ public: \ingroup basicwidgets \inmodule QtWidgets + \image windows-checkbox.png + A QCheckBox is an option button that can be switched on (checked) or off (unchecked). Checkboxes are typically used to represent features in an application that can be enabled or disabled without affecting others. @@ -117,18 +119,6 @@ public: setAutoRepeat(), toggle(), pressed(), released(), clicked(), toggled(), checkState(), and stateChanged(). - \table 100% - \row - \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 - \li \inlineimage windowsvista-checkbox.png Screenshot of a Windows Vista style checkbox - \li A checkbox shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. - \row - \li \inlineimage fusion-checkbox.png Screenshot of a Fusion style checkbox - \li A checkbox shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. - \endtable - \sa QAbstractButton, QRadioButton, {fowler}{GUI Design Handbook: Check Box} */ diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 2376a18e43..45dfffe8bd 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -900,6 +900,8 @@ QComboBox::QComboBox(QComboBoxPrivate &dd, QWidget *parent) \ingroup basicwidgets \inmodule QtWidgets + \image windows-combobox.png + A QComboBox provides a means of presenting a list of options to the user in a way that takes up the minimum amount of screen space. @@ -960,8 +962,6 @@ QComboBox::QComboBox(QComboBoxPrivate &dd, QWidget *parent) of the view(), e.g., by using \l{QAbstractItemView::}{setSelectionMode()}. - \image qstyle-comboboxes.png Comboboxes in the different built-in styles. - \sa QLineEdit, QSpinBox, QRadioButton, QButtonGroup, {fowler}{GUI Design Handbook: Combo Box, Drop-Down List Box} */ diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 0eaa110bee..2e0a8a3cd7 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -76,6 +76,8 @@ QT_BEGIN_NAMESPACE \ingroup basicwidgets \inmodule QtWidgets + \image windows-datetimeedit.png + QDateTimeEdit allows the user to edit dates by using the keyboard or the arrow keys to increase and decrease date and time values. The arrow keys can be used to move from section to section within the @@ -103,15 +105,6 @@ QT_BEGIN_NAMESPACE calendar pop-up by calling the setCalendarWidget() function. The existing calendar widget can be retrieved with calendarWidget(). - \table 100% - \row \li \inlineimage windowsvista-datetimeedit.png Screenshot of a Windows Vista style date time editing widget - \li A date time editing widget shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista 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 fusion-datetimeedit.png Screenshot of a Fusion style date time editing widget - \li A date time editing widget shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. - \endtable - \sa QDateEdit, QTimeEdit, QDate, QTime */ @@ -1505,6 +1498,8 @@ void QDateTimeEdit::mousePressEvent(QMouseEvent *event) \ingroup basicwidgets \inmodule QtWidgets + \image windows-timeedit.png + Many of the properties and functions provided by QTimeEdit are implemented in QDateTimeEdit. These are the relevant properties of this class: @@ -1518,15 +1513,6 @@ void QDateTimeEdit::mousePressEvent(QMouseEvent *event) to format the time displayed in the widget. \endlist - \table 100% - \row \li \inlineimage windowsvista-timeedit.png Screenshot of a Windows Vista style time editing widget - \li A time editing widget shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista 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 fusion-timeedit.png Screenshot of a Fusion style time editing widget - \li A time editing widget shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. - \endtable - \sa QDateEdit, QDateTimeEdit */ @@ -1582,6 +1568,8 @@ QTimeEdit::~QTimeEdit() \ingroup basicwidgets \inmodule QtWidgets + \image windows-dateedit.png + Many of the properties and functions provided by QDateEdit are implemented in QDateTimeEdit. These are the relevant properties of this class: @@ -1595,15 +1583,6 @@ QTimeEdit::~QTimeEdit() to format the date displayed in the widget. \endlist - \table 100% - \row \li \inlineimage windowsvista-dateedit.png Screenshot of a Windows Vista style date editing widget - \li A date editing widget shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista 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 fusion-dateedit.png Screenshot of a Fusion style date editing widget - \li A date editing widget shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. - \endtable - \sa QTimeEdit, QDateTimeEdit */ diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index cee39e2ae3..a219e4ccb6 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -179,6 +179,8 @@ int QDialPrivate::valueFromPoint(const QPoint &p) const \ingroup basicwidgets \inmodule QtWidgets + \image windows-dial.png + QDial is used when the user needs to control a value within a program-definable range, and the range either wraps around (for example, with angles measured from 0 to 359 degrees) or the @@ -226,16 +228,6 @@ int QDialPrivate::valueFromPoint(const QPoint &p) const by \l {QAbstractSlider::singleStep} {singleStep}, and \l {QAbstractSlider::pageStep} {pageStep}. - \table - \row \li \inlineimage fusion-dial.png Screenshot of a dial in the Fusion widget style - \li \inlineimage windowsvista-dial.png Screenshot of a dial in the Windows Vista 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{Fusion Style Widget Gallery}{Fusion}, - \l{Windows Vista Style Widget Gallery}{Windows Vista}, - \l{Macintosh Style Widget Gallery}{Macintosh}. - \endtable - \sa QScrollBar, QSpinBox, QSlider, {fowler}{GUI Design Handbook: Slider}, {Sliders Example} */ diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index fda68879d1..9e323df9a6 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -145,6 +145,8 @@ void QGroupBoxPrivate::click() \ingroup geomanagement \inmodule QtWidgets + \image windows-groupbox.png + A group box provides a frame, a title on top, a keyboard shortcut, and displays various other widgets inside itself. The keyboard shortcut moves keyboard focus to one of the group box's child widgets. @@ -166,15 +168,6 @@ void QGroupBoxPrivate::click() \snippet widgets/groupbox/window.cpp 2 - \table 100% - \row \li \inlineimage windowsvista-groupbox.png Screenshot of a Windows Vista style group box - \li \inlineimage macintosh-groupbox.png Screenshot of a Macintosh style group box - \li \inlineimage fusion-groupbox.png Screenshot of a Fusion style group box - \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} group box. - \li A \l{Macintosh Style Widget Gallery}{Macintosh style} group box. - \li A \l{Fusion Style Widget Gallery}{Fusion style} group box. - \endtable - \sa QButtonGroup, {Group Box Example} */ diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 4946e3e354..e3225800cc 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -116,6 +116,8 @@ QLabelPrivate::~QLabelPrivate() \ingroup basicwidgets \inmodule QtWidgets + \image windows-label.png + QLabel is used for displaying text or an image. No user interaction functionality is provided. The visual appearance of the label can be configured in various ways, and it can be used @@ -181,18 +183,6 @@ QLabelPrivate::~QLabelPrivate() was a button (inheriting from QAbstractButton), triggering the mnemonic would emulate a button click. - \table 100% - \row - \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 - \li \inlineimage fusion-label.png Screenshot of a Fusion style label - \li A label shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. - \row - \li \inlineimage windowsvista-label.png Screenshot of a Windows Vista style label - \li A label shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. - \endtable - \sa QLineEdit, QTextEdit, QPixmap, QMovie, {fowler}{GUI Design Handbook: Label} */ diff --git a/src/widgets/widgets/qlcdnumber.cpp b/src/widgets/widgets/qlcdnumber.cpp index a0aeee2237..282714843c 100644 --- a/src/widgets/widgets/qlcdnumber.cpp +++ b/src/widgets/widgets/qlcdnumber.cpp @@ -74,6 +74,8 @@ public: \ingroup basicwidgets \inmodule QtWidgets + \image windows-lcdnumber.png + It can display a number in just about any size. It can display decimal, hexadecimal, octal or binary numbers. It is easy to connect to data sources using the display() slot, which is @@ -103,17 +105,6 @@ public: Incidentally, QLCDNumber is the very oldest part of Qt, tracing its roots back to a BASIC program on the \l{Sinclair Spectrum}{Sinclair Spectrum}. - \table - \row \li - \inlineimage windows-lcdnumber.png Screenshot of a Windows style LCD number widget - \inlineimage windowsvista-lcdnumber.png Screenshot of a Windows Vista style LCD number widget - \inlineimage macintosh-lcdnumber.png Screenshot of a Macintosh style LCD number widget - \inlineimage fusion-lcdnumber.png Screenshot of a Fusion style LCD number widget - \row \li LCD number widgets shown in various widget styles (from left to right): - \l{Windows Style Widget Gallery}{Windows}, \l{Windows Vista Style Widget Gallery}{Windows Vista}, - \l{Macintosh Style Widget Gallery}{Macintosh}, \l{Fusion Style Widget Gallery}{Fusion}. - \endtable - \sa QLabel, QFrame, {Digital Clock Example}, {Tetrix Example} */ diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 27dd186f04..7e24704de3 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -128,6 +128,8 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const \ingroup basicwidgets \inmodule QtWidgets + \image windows-lineedit.png + A line edit allows the user to enter and edit a single line of plain text with a useful collection of editing functions, including undo and redo, cut and paste, and drag and drop (see @@ -142,7 +144,6 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const on the same line edit, it is best to clear the validator or input mask to prevent undefined behavior. - A related class is QTextEdit which allows multi-line, rich text editing. @@ -202,15 +203,6 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const Any other key sequence that represents a valid character, will cause the character to be inserted into the line edit. - \table 100% - \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 windowsvista-lineedit.png Screenshot of a Windows Vista style line edit - \li A line edit shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. - \row \li \inlineimage fusion-lineedit.png Screenshot of a Fusion style line edit - \li A line edit shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. - \endtable - \sa QTextEdit, QLabel, QComboBox, {fowler}{GUI Design Handbook: Field, Entry}, {Line Edits Example} */ diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 2cafe462b1..5732131578 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1534,6 +1534,8 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) \ingroup basicwidgets \inmodule QtWidgets + \image fusion-menu.png + A menu widget is a selection menu. It can be either a pull-down menu in a menu bar or a standalone context menu. Pull-down menus are shown by the menu bar when the user clicks on the respective @@ -1545,16 +1547,6 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) response to button presses; these are just like context menus except for how they are invoked. - \table 100% - \row - \li \inlineimage fusion-menu.png - \li \inlineimage windowsxp-menu.png - \li \inlineimage macintosh-menu.png - \endtable - \caption Fig. A menu shown in \l{Fusion Style Widget Gallery}{Fusion widget style}, - \l{Windows XP Style Widget Gallery}{Windows XP widget style}, - and \l{Macintosh Style Widget Gallery}{Macintosh widget style}. - \section1 Actions A menu consists of a list of action items. Actions are added with diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index 2b228cdb2c..b4819278c7 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -177,6 +177,8 @@ bool QProgressBarPrivate::repaintRequired() const \ingroup basicwidgets \inmodule QtWidgets + \image windows-progressbar.png + A progress bar is used to give the user an indication of the progress of an operation and to reassure them that the application is still running. @@ -198,15 +200,6 @@ bool QProgressBarPrivate::repaintRequired() const example, when using QNetworkAccessManager to download items when they are unable to determine the size of the item being downloaded. - \table - \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 windowsvista-progressbar.png Screenshot of a Windows Vista style progress bar - \li A progress bar shown in the Windows Vista widget style. - \row \li \inlineimage fusion-progressbar.png Screenshot of a Fusion style progress bar - \li A progress bar shown in the Fusion 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 5b1e10eb32..6aa1d68c32 100644 --- a/src/widgets/widgets/qpushbutton.cpp +++ b/src/widgets/widgets/qpushbutton.cpp @@ -81,6 +81,8 @@ QT_BEGIN_NAMESPACE \ingroup basicwidgets \inmodule QtWidgets + \image windows-pushbutton.jpg + The push button, or command button, is perhaps the most commonly used widget in any graphical user interface. Push (click) a button to command the computer to perform some action, or to answer a @@ -152,6 +154,11 @@ QT_BEGIN_NAMESPACE button is probably not what you want. When in doubt, use a tool button. + \note On \macos when a push 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. + A variation of a command button is a menu button. These provide not just one command, but several, since when they are clicked they pop up a menu of options. Use the method setMenu() to @@ -160,20 +167,6 @@ QT_BEGIN_NAMESPACE Other classes of buttons are option buttons (see QRadioButton) and check boxes (see QCheckBox). - \table 100% - \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 \li \inlineimage windowsvista-pushbutton.png Screenshot of a Windows Vista style push button - \li A push button shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. - \row \li \inlineimage fusion-pushbutton.png Screenshot of a Fusion style push button - \li A push button shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. - \endtable In Qt, the QAbstractButton base class provides most of the modes and other API, and QPushButton provides GUI logic. diff --git a/src/widgets/widgets/qradiobutton.cpp b/src/widgets/widgets/qradiobutton.cpp index 284c5f56cf..ac711d34c7 100644 --- a/src/widgets/widgets/qradiobutton.cpp +++ b/src/widgets/widgets/qradiobutton.cpp @@ -80,6 +80,8 @@ void QRadioButtonPrivate::init() \ingroup basicwidgets \inmodule QtWidgets + \image windows-radiobutton.png + A QRadioButton is an option button that can be switched on (checked) or off (unchecked). Radio buttons typically present the user with a "one of many" choice. In a group of radio buttons, only one radio button at @@ -113,15 +115,6 @@ void QRadioButtonPrivate::init() setDown(), isDown(), autoRepeat(), group(), setAutoRepeat(), toggle(), pressed(), released(), clicked(), and toggled(). - \table 100% - \row \li \inlineimage fusion-radiobutton.png Screenshot of a Fusion radio button - \li A radio button shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. - \row \li \inlineimage windowsvista-radiobutton.png Screenshot of a Windows Vista radio button - \li A radio button shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista 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}, {Group Box Example} */ diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index 79bfedb8c4..66f1a4c689 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -187,15 +187,6 @@ QT_BEGIN_NAMESPACE Most GUI styles use the pageStep() value to calculate the size of the slider. - \table 100% - \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 windowsvista-horizontalscrollbar.png Screenshot of a Windows Vista style scroll bar - \li A scroll bar shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. - \row \li \inlineimage fusion-horizontalscrollbar.png Screenshot of a Fusion style scroll bar - \li A scroll bar shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. - \endtable - \sa QScrollArea, QSlider, QDial, QSpinBox, {fowler}{GUI Design Handbook: Scroll Bar}, {Sliders Example} */ diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp index 744a43253a..356cbcfce7 100644 --- a/src/widgets/widgets/qslider.cpp +++ b/src/widgets/widgets/qslider.cpp @@ -203,6 +203,8 @@ QStyle::SubControl QSliderPrivate::newHoverControl(const QPoint &pos) \ingroup basicwidgets \inmodule QtWidgets + \image windows-slider.png + The slider is the classic widget for controlling a bounded value. It lets the user move a slider handle along a horizontal or vertical groove and translates the handle's position into an integer value @@ -252,15 +254,6 @@ QStyle::SubControl QSliderPrivate::newHoverControl(const QPoint &pos) \li End moves to the end (maximum). \endlist - \table 100% - \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 windowsvista-slider.png Screenshot of a Windows Vista slider - \li A slider shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. - \row \li \inlineimage fusion-slider.png Screenshot of a Fusion slider - \li A slider shown in the \l{Fusion Style Widget Gallery}{Fusion 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 0daa624ae8..508cb05cfc 100644 --- a/src/widgets/widgets/qspinbox.cpp +++ b/src/widgets/widgets/qspinbox.cpp @@ -112,6 +112,8 @@ public: \ingroup basicwidgets \inmodule QtWidgets + \image windows-spinbox.png + QSpinBox is designed to handle integers and discrete sets of values (e.g., month names); use QDoubleSpinBox for floating point values. @@ -151,15 +153,6 @@ public: choice in addition to the range of numeric values. See setSpecialValueText() for how to do this with QSpinBox. - \table 100% - \row \li \inlineimage windowsvista-spinbox.png Screenshot of a Windows Vista spin box - \li A spin box shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. - \row \li \inlineimage fusion-spinbox.png Screenshot of a Fusion spin box - \li A spin box shown in the \l{Fusion Style Widget Gallery}{Fusion 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 If using prefix(), suffix(), and specialValueText() don't provide diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp index be870133ee..7c75f859ed 100644 --- a/src/widgets/widgets/qtabwidget.cpp +++ b/src/widgets/widgets/qtabwidget.cpp @@ -64,6 +64,8 @@ QT_BEGIN_NAMESPACE \ingroup basicwidgets \inmodule QtWidgets + \image windows-tabwidget.png + A tab widget provides a tab bar (see QTabBar) and a "page area" that is used to display pages related to each tab. By default, the tab bar is shown above the page area, but different configurations @@ -117,15 +119,6 @@ QT_BEGIN_NAMESPACE (at the top, providing the tabs) and a QStackedWidget (most of the area, organizing the individual pages). - \table 100% - \row \li \inlineimage windowsvista-tabwidget.png Screenshot of a Windows Vista style tab widget - \li \inlineimage macintosh-tabwidget.png Screenshot of a Macintosh style tab widget - \li \inlineimage fusion-tabwidget.png Screenshot of a Fusion style tab widget - \row \li A Windows Vista style tab widget. - \li A Macintosh style tab widget. - \li A Fusion style tab widget. - \endtable - \sa QTabBar, QStackedWidget, QToolBox, {Tab Dialog Example} */ |