summaryrefslogtreecommitdiffstats
path: root/src/widgets/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/doc/src')
-rw-r--r--src/widgets/doc/src/qtwidgets-index.qdoc2
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-fusion.qdoc138
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc142
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc138
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc142
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc142
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery.qdoc78
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/widgets.qdoc10
8 files changed, 59 insertions, 733 deletions
diff --git a/src/widgets/doc/src/qtwidgets-index.qdoc b/src/widgets/doc/src/qtwidgets-index.qdoc
index d3acabcbf9..f0d82aebe4 100644
--- a/src/widgets/doc/src/qtwidgets-index.qdoc
+++ b/src/widgets/doc/src/qtwidgets-index.qdoc
@@ -85,7 +85,7 @@ interfaces
\row
\li \image windowsxp-tabwidget.png
\li \image fusion-tabwidget.png
- \li \image macintosh-tabwidget.png
+ \li \image macos-tabwidget.png
\endtable
\l{Qt Style Sheets} are a powerful mechanism that allows you to customize the
diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-fusion.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-fusion.qdoc
deleted file mode 100644
index ca6de8fd5e..0000000000
--- a/src/widgets/doc/src/widgets-and-layouts/gallery-fusion.qdoc
+++ /dev/null
@@ -1,138 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \page gallery-fusion.html
-
- \title Fusion Style Widget Gallery
- \ingroup gallery
-
- This page shows some of the widgets available in Qt
- when configured to use the "fusion" style.
-
-\section2 Buttons
-
-\table 100%
-\row
-\li \image fusion-pushbutton.png
- \caption The QPushButton widget provides a command button.
-\li \image fusion-toolbutton.png
- \caption The QToolButton class provides a quick-access button to commands
- or options, usually used inside a QToolBar.
-\endtable
-
-\table 100%
-\row
-\li \image fusion-checkbox.png
- \caption The QCheckBox widget provides a checkbox with a text label.
-\li \image fusion-radiobutton.png
- \caption The QRadioButton widget provides a radio button with a text or pixmap label.
-\endtable
-
-\section2 Containers
-
-\table 100%
-\row
-\li \image fusion-groupbox.png
- The QGroupBox widget provides a group box frame with a title.
-\li \image fusion-tabwidget.png
- The QTabWidget class provides a stack of tabbed widgets.
-\li \image fusion-frame.png
- The QFrame widget provides a simple decorated container for other widgets.
-\li \image fusion-toolbox.png
- The QToolBox class provides a column of tabbed widget items.
-\endtable
-
-\section2 Item Views
-
-\table 100%
-\row
-\li \image fusion-listview.png
- The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.
-\li \image fusion-treeview.png
- The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.
-\li \image fusion-tableview.png
- The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\li
-\li
-\endtable
-
-\section2 Display Widgets
-
-\table 100%
-\row
-\li \image fusion-progressbar.png
- The QProgressBar widget provides a horizontal progress bar.
-\li \image fusion-label.png
- The QLabel widget provides a text or image display.
-\li \image fusion-lcdnumber.png
- The QLCDNumber widget displays a number with LCD-like digits.
-\endtable
-
-\section2 Input Widgets
-
-\table 100%
-\row
-\li \image fusion-lineedit.png
- The QLineEdit widget is a one-line text editor.
-\li \image fusion-dateedit.png
- The QDateEdit class provides a widget for editing dates.
-\li \image fusion-timeedit.png
- The QTimeEdit class provides a widget for editing times.
-\li \image fusion-datetimeedit.png
- The QDateTimeEdit class provides a widget for editing dates and times.
-\endtable
-
-\table 100%
-\row
-\li \image fusion-slider.png
- The QSlider widget provides a vertical or horizontal slider.
-\li \image fusion-combobox.png
- The QComboBox widget is a combined button and pop-up list.
-\li \image fusion-spinbox.png
- The QSpinBox class provides a spin box widget.
-\endtable
-
-\table 100%
-\row
-\li \image fusion-fontcombobox.png
- The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.
-\li \image fusion-doublespinbox.png
- The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.
-\li \image fusion-horizontalscrollbar.png
- The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.
-\endtable
-
-\table 100%
-\row
-\li \image fusion-dial.png
- The QDial class provides a rounded range control (like a speedometer or potentiometer).
-\li \image fusion-textedit.png
- The QTextEdit class provides a widget that is used to edit and display both plain and rich text.
-\li \image fusion-calendarwidget.png
- The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.
-\endtable
-*/
diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc
deleted file mode 100644
index 4d4e2b9a8d..0000000000
--- a/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \page gallery-macintosh.html
-
- \title Macintosh Style Widget Gallery
- \ingroup gallery
-
- This page shows some of the widgets available in Qt
- when configured to use the "macintosh" style. This
- style is only available on Mac OSX, and provides
- native look'n'feel by integrating to the Mac OSX
- platform theme. Thus, the final appearance varies
- depending on the active Mac OSX theme.
-
-\section2 Buttons
-
-\table 100%
-\row
-\li \image macintosh-pushbutton.png
- \caption The QPushButton widget provides a command button.
-\li \image macintosh-toolbutton.png
- \caption The QToolButton class provides a quick-access button to commands
- or options, usually used inside a QToolBar.
-\endtable
-
-\table 100%
-\row
-\li \image macintosh-checkbox.png
- \caption The QCheckBox widget provides a checkbox with a text label.
-\li \image macintosh-radiobutton.png
- \caption The QRadioButton widget provides a radio button with a text or pixmap label.
-\endtable
-
-\section2 Containers
-
-\table 100%
-\row
-\li \image macintosh-groupbox.png
- The QGroupBox widget provides a group box frame with a title.
-\li \image macintosh-tabwidget.png
- The QTabWidget class provides a stack of tabbed widgets.
-\li \image macintosh-frame.png
- The QFrame widget provides a simple decorated container for other widgets.
-\li \image macintosh-toolbox.png
- The QToolBox class provides a column of tabbed widget items.
-\endtable
-
-\section2 Item Views
-
-\table 100%
-\row
-\li \image macintosh-listview.png
- The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.
-\li \image macintosh-treeview.png
- The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.
-\li \image macintosh-tableview.png
- The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\li
-\li
-\endtable
-
-\section2 Display Widgets
-
-\table 100%
-\row
-\li \image macintosh-progressbar.png
- The QProgressBar widget provides a horizontal progress bar.
-\li \image macintosh-label.png
- The QLabel widget provides a text or image display.
-\li \image macintosh-lcdnumber.png
- The QLCDNumber widget displays a number with LCD-like digits.
-\endtable
-
-\section2 Input Widgets
-
-\table 100%
-\row
-\li \image macintosh-lineedit.png
- The QLineEdit widget is a one-line text editor.
-\li \image macintosh-dateedit.png
- The QDateEdit class provides a widget for editing dates.
-\li \image macintosh-timeedit.png
- The QTimeEdit class provides a widget for editing times.
-\li \image macintosh-datetimeedit.png
- The QDateTimeEdit class provides a widget for editing dates and times.
-\endtable
-
-\table 100%
-\row
-\li \image macintosh-slider.png
- The QSlider widget provides a vertical or horizontal slider.
-\li \image macintosh-combobox.png
- The QComboBox widget is a combined button and pop-up list.
-\li \image macintosh-spinbox.png
- The QSpinBox class provides a spin box widget.
-\endtable
-
-\table 100%
-\row
-\li \image macintosh-fontcombobox.png
- The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.
-\li \image macintosh-doublespinbox.png
- The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.
-\li \image macintosh-horizontalscrollbar.png
- The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.
-\endtable
-
-\table 100%
-\row
-\li \image macintosh-dial.png
- The QDial class provides a rounded range control (like a speedometer or potentiometer).
-\li \image macintosh-textedit.png
- The QTextEdit class provides a widget that is used to edit and display both plain and rich text.
-\li \image macintosh-calendarwidget.png
- The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.
-\endtable
-*/
diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc
deleted file mode 100644
index 40e41ff98a..0000000000
--- a/src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc
+++ /dev/null
@@ -1,138 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \page gallery-windows.html
-
- \title Windows Style Widget Gallery
- \ingroup gallery
-
- This page shows some of the widgets available in Qt
- when configured to use the "windows" style.
-
-\section2 Buttons
-
-\table 100%
-\row
-\li \image windows-pushbutton.png
- \caption The QPushButton widget provides a command button.
-\li \image windows-toolbutton.png
- \caption The QToolButton class provides a quick-access button to commands
- or options, usually used inside a QToolBar.
-\endtable
-
-\table 100%
-\row
-\li \image windows-checkbox.png
- \caption The QCheckBox widget provides a checkbox with a text label.
-\li \image windows-radiobutton.png
- \caption The QRadioButton widget provides a radio button with a text or pixmap label.
-\endtable
-
-\section2 Containers
-
-\table 100%
-\row
-\li \image windows-groupbox.png
- The QGroupBox widget provides a group box frame with a title.
-\li \image windows-tabwidget.png
- The QTabWidget class provides a stack of tabbed widgets.
-\li \image windows-frame.png
- The QFrame widget provides a simple decorated container for other widgets.
-\li \image windows-toolbox.png
- The QToolBox class provides a column of tabbed widget items.
-\endtable
-
-\section2 Item Views
-
-\table 100%
-\row
-\li \image windows-listview.png
- The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.
-\li \image windows-treeview.png
- The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.
-\li \image windows-tableview.png
- The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\li
-\li
-\endtable
-
-\section2 Display Widgets
-
-\table 100%
-\row
-\li \image windows-progressbar.png
- The QProgressBar widget provides a horizontal progress bar.
-\li \image windows-label.png
- The QLabel widget provides a text or image display.
-\li \image windows-lcdnumber.png
- The QLCDNumber widget displays a number with LCD-like digits.
-\endtable
-
-\section2 Input Widgets
-
-\table 100%
-\row
-\li \image windows-lineedit.png
- The QLineEdit widget is a one-line text editor.
-\li \image windows-dateedit.png
- The QDateEdit class provides a widget for editing dates.
-\li \image windows-timeedit.png
- The QTimeEdit class provides a widget for editing times.
-\li \image windows-datetimeedit.png
- The QDateTimeEdit class provides a widget for editing dates and times.
-\endtable
-
-\table 100%
-\row
-\li \image windows-slider.png
- The QSlider widget provides a vertical or horizontal slider.
-\li \image windows-combobox.png
- The QComboBox widget is a combined button and pop-up list.
-\li \image windows-spinbox.png
- The QSpinBox class provides a spin box widget.
-\endtable
-
-\table 100%
-\row
-\li \image windows-fontcombobox.png
- The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.
-\li \image windows-doublespinbox.png
- The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.
-\li \image windows-horizontalscrollbar.png
- The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.
-\endtable
-
-\table 100%
-\row
-\li \image windows-dial.png
- The QDial class provides a rounded range control (like a speedometer or potentiometer).
-\li \image windows-textedit.png
- The QTextEdit class provides a widget that is used to edit and display both plain and rich text.
-\li \image windows-calendarwidget.png
- The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.
-\endtable
-*/
diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc
deleted file mode 100644
index 2347528a3c..0000000000
--- a/src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \page gallery-windowsvista.html
-
- \title Windows Vista Style Widget Gallery
- \ingroup gallery
-
- This page shows some of the widgets available in Qt
- when configured to use the "windowsvista" style. This
- style is only available on Windows Vista or later.
- This style provides native look'n'feel by integrating
- to the Windows platform theme. Thus, the final appearance
- varies depending on the active Windows theme.
-
-\section2 Buttons
-
-\table 100%
-\row
-\li \image windowsvista-pushbutton.png
- \caption The QPushButton widget provides a command button.
-\li \image windowsvista-toolbutton.png
- \caption The QToolButton class provides a quick-access button to commands
- or options, usually used inside a QToolBar.
-\endtable
-
-\table 100%
-\row
-\li \image windowsvista-checkbox.png
- \caption The QCheckBox widget provides a checkbox with a text label.
-\li \image windowsvista-radiobutton.png
- \caption The QRadioButton widget provides a radio button with a text or pixmap label.
-\endtable
-
-\section2 Containers
-
-\table 100%
-\row
-\li \image windowsvista-groupbox.png
- The QGroupBox widget provides a group box frame with a title.
-\li \image windowsvista-tabwidget.png
- The QTabWidget class provides a stack of tabbed widgets.
-\li \image windowsvista-frame.png
- The QFrame widget provides a simple decorated container for other widgets.
-\li \image windowsvista-toolbox.png
- The QToolBox class provides a column of tabbed widget items.
-\endtable
-
-\section2 Item Views
-
-\table 100%
-\row
-\li \image windowsvista-listview.png
- The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.
-\li \image windowsvista-treeview.png
- The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.
-\li \image windowsvista-tableview.png
- The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\li
-\li
-\endtable
-
-\section2 Display Widgets
-
-\table 100%
-\row
-\li \image windowsvista-progressbar.png
- The QProgressBar widget provides a horizontal progress bar.
-\li \image windowsvista-label.png
- The QLabel widget provides a text or image display.
-\li \image windowsvista-lcdnumber.png
- The QLCDNumber widget displays a number with LCD-like digits.
-\endtable
-
-\section2 Input Widgets
-
-\table 100%
-\row
-\li \image windowsvista-lineedit.png
- The QLineEdit widget is a one-line text editor.
-\li \image windowsvista-dateedit.png
- The QDateEdit class provides a widget for editing dates.
-\li \image windowsvista-timeedit.png
- The QTimeEdit class provides a widget for editing times.
-\li \image windowsvista-datetimeedit.png
- The QDateTimeEdit class provides a widget for editing dates and times.
-\endtable
-
-\table 100%
-\row
-\li \image windowsvista-slider.png
- The QSlider widget provides a vertical or horizontal slider.
-\li \image windowsvista-combobox.png
- The QComboBox widget is a combined button and pop-up list.
-\li \image windowsvista-spinbox.png
- The QSpinBox class provides a spin box widget.
-\endtable
-
-\table 100%
-\row
-\li \image windowsvista-fontcombobox.png
- The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.
-\li \image windowsvista-doublespinbox.png
- The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.
-\li \image windowsvista-horizontalscrollbar.png
- The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.
-\endtable
-
-\table 100%
-\row
-\li \image windowsvista-dial.png
- The QDial class provides a rounded range control (like a speedometer or potentiometer).
-\li \image windowsvista-textedit.png
- The QTextEdit class provides a widget that is used to edit and display both plain and rich text.
-\li \image windowsvista-calendarwidget.png
- The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.
-\endtable
-*/
diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc
deleted file mode 100644
index 6193284f50..0000000000
--- a/src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \page gallery-windowsxp.html
-
- \title Windows XP Style Widget Gallery
- \ingroup gallery
-
- This page shows some of the widgets available in Qt
- when configured to use the "windowsxp" style. This
- style is only available on Windows XP or later. This
- style provides native look'n'feel by integrating to
- the Windows platform theme. Thus, the final appearance
- varies depending on the active Windows theme.
-
-\section2 Buttons
-
-\table 100%
-\row
-\li \image windowsxp-pushbutton.png
- \caption The QPushButton widget provides a command button.
-\li \image windowsxp-toolbutton.png
- \caption The QToolButton class provides a quick-access button to commands
- or options, usually used inside a QToolBar.
-\endtable
-
-\table 100%
-\row
-\li \image windowsxp-checkbox.png
- \caption The QCheckBox widget provides a checkbox with a text label.
-\li \image windowsxp-radiobutton.png
- \caption The QRadioButton widget provides a radio button with a text or pixmap label.
-\endtable
-
-\section2 Containers
-
-\table 100%
-\row
-\li \image windowsxp-groupbox.png
- The QGroupBox widget provides a group box frame with a title.
-\li \image windowsxp-tabwidget.png
- The QTabWidget class provides a stack of tabbed widgets.
-\li \image windowsxp-frame.png
- The QFrame widget provides a simple decorated container for other widgets.
-\li \image windowsxp-toolbox.png
- The QToolBox class provides a column of tabbed widget items.
-\endtable
-
-\section2 Item Views
-
-\table 100%
-\row
-\li \image windowsxp-listview.png
- The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.
-\li \image windowsxp-treeview.png
- The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.
-\li \image windowsxp-tableview.png
- The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\li
-\li
-\endtable
-
-\section2 Display Widgets
-
-\table 100%
-\row
-\li \image windowsxp-progressbar.png
- The QProgressBar widget provides a horizontal progress bar.
-\li \image windowsxp-label.png
- The QLabel widget provides a text or image display.
-\li \image windowsxp-lcdnumber.png
- The QLCDNumber widget displays a number with LCD-like digits.
-\endtable
-
-\section2 Input Widgets
-
-\table 100%
-\row
-\li \image windowsxp-lineedit.png
- The QLineEdit widget is a one-line text editor.
-\li \image windowsxp-dateedit.png
- The QDateEdit class provides a widget for editing dates.
-\li \image windowsxp-timeedit.png
- The QTimeEdit class provides a widget for editing times.
-\li \image windowsxp-datetimeedit.png
- The QDateTimeEdit class provides a widget for editing dates and times.
-\endtable
-
-\table 100%
-\row
-\li \image windowsxp-slider.png
- The QSlider widget provides a vertical or horizontal slider.
-\li \image windowsxp-combobox.png
- The QComboBox widget is a combined button and pop-up list.
-\li \image windowsxp-spinbox.png
- The QSpinBox class provides a spin box widget.
-\endtable
-
-\table 100%
-\row
-\li \image windowsxp-fontcombobox.png
- The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.
-\li \image windowsxp-doublespinbox.png
- The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.
-\li \image windowsxp-horizontalscrollbar.png
- The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.
-\endtable
-
-\table 100%
-\row
-\li \image windowsxp-dial.png
- The QDial class provides a rounded range control (like a speedometer or potentiometer).
-\li \image windowsxp-textedit.png
- The QTextEdit class provides a widget that is used to edit and display both plain and rich text.
-\li \image windowsxp-calendarwidget.png
- The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.
-\endtable
-*/
diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
index f79b59f7dd..5076970854 100644
--- a/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
@@ -26,37 +26,71 @@
****************************************************************************/
/*!
- \group gallery
+ \page gallery.html
\title Qt Widget Gallery
\brief Qt widgets shown in different styles on various platforms.
Qt's support for widget styles and themes enables your application to fit in
- with the native desktop environment. Below, you can find links to the various
- widget styles that are supplied with Qt.
+ with the native desktop environment.
- \table
- \row
- \li \image windowsxp-tabwidget.png Windows XP Style Widget Gallery
- \caption \l{Windows XP Style Widget Gallery}
+ The widgets examples show how some of the widgets available in Qt might
+ appear when configured to use the a particular style. Each style is only
+ available on the respective platfom, and provides native look and feel by
+ integrating to the platform theme. Thus, the final appearance varies
+ depending on the active theme.
- The Windows XP style is provided by QWindowsXPStyle.
- \li \image windows-tabwidget.png Windows Style Widget Gallery
- \caption \l{Windows Style Widget Gallery}
+ \table
+ \row
+ \li \image windows-xp-style.png Windows XP Style
+ \li The Windows XP style ("windowsxp") is provided by
+ QWindowsXPStyle.
+ \row
+ \li The Windows style ("windows") is provided by QWindowsStyle.
+ \li \image windows-style.png Windows Style
+ \row
+ \li \image windows-vista-style.png Windows Vista Style
+ \li The Windows Vista style ("windowsvista") is provided by
+ QWindowsVistaStyle.
+ \row
+ \li The \macos style ("macintosh") is provided by QMacStyle.
+ \li \image macos-style.png \macos Style
+ \row
+ \li \image fusion-style.png Fusion Style
+ \li The Fusion style ("fusion") is provided by QFusionStyle.
+ \endtable
- The Windows style is provided by QWindowsStyle.
- \li \image windowsvista-tabwidget.png Windows Vista Style Widget Gallery
- \caption \l{Windows Vista Style Widget Gallery}
+ The Styles example displays the following widgets:
- The Windows Vista style is provided by QWindowsVistaStyle.
+ \list
+ \li QCheckBox (1) provides a checkbox with a text label.
+ \li QRadioButton (2) provides a radio button with a text or pixmap
+ label.
+ \li QPushButton (3) provides a command button.
+ \li QTabWidget (4) provides a stack of tabbed widgets.
+ \li QTableWidget (5) provides a classic item-based table view.
+ \li QScrollBar (6) provides a vertical or horizontal scroll bar.
+ \li QProgressBar (7) provides a horizontal progress bar.
+ \li QDateTimeEdit (8) provides a widget for editing dates and times.
+ \li QSlider (9) provides a vertical or horizontal slider.
+ \li QDial (10) provides a rounded range control (like a speedometer
+ or potentiometer).
+ \endlist
- \row
- \li \image macintosh-tabwidget.png Macintosh Style Widget Gallery
- \caption \l{Macintosh Style Widget Gallery}
+ The Calendar Widget example displays some additional widgets, here run on
+ Windows 10 and \macos:
- The Macintosh style is provided by QMacStyle.
- \li \image fusion-tabwidget.png Fusion Style Widget Gallery
- \caption \l{Fusion Style Widget Gallery}
+ \image windows-style2.png
+ \caption Calendar Widget example on Windows 10
- The Fusion style is provided by QFusionStyle.
- \endtable
+ \image macos-style2.png
+ \caption Calendar Widget example on \macos
+
+ \list
+ \li QGroupBox (1) provides a group box frame with a title.
+ \li QCalendarWidget (2) provides a monthly calendar widget
+ that can be used to select dates.
+ \li QLabel (3) provides a text or image display.
+ \li QDateEdit (4) provides a widget for editing dates.
+ \li QComboBox (5) provides a combined button and pop-up list.
+ \endlist
*/
diff --git a/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc b/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
index 1e99030e7a..a444d5358c 100644
--- a/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
@@ -45,21 +45,15 @@
\row
\li \image fusion-label.png
\li \image windowsvista-pushbutton.png
- \li \image macintosh-progressbar.png
+ \li \image macos-progressbar.png
\row
\li \image fusion-combobox.png
\li \image windowsvista-radiobutton.png
- \li \image macintosh-lineedit.png
+ \li \image macos-lineedit.png
\endtable
\annotatedlist basicwidgets
- \table
- \row
- \li \image windowsvista-tabwidget.png
- \li \image macintosh-groupbox.png
- \endtable
-
\section2 Advanced Widget Classes