diff options
Diffstat (limited to 'src/widgets/doc')
35 files changed, 17 insertions, 160 deletions
diff --git a/src/widgets/doc/images/stylesheet-coffee-xp.png b/src/widgets/doc/images/stylesheet-coffee-xp.png Binary files differdeleted file mode 100644 index 8bedd80ee9..0000000000 --- a/src/widgets/doc/images/stylesheet-coffee-xp.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-calendarwidget.png b/src/widgets/doc/images/windowsxp-calendarwidget.png Binary files differdeleted file mode 100644 index 9a5fa6ebcd..0000000000 --- a/src/widgets/doc/images/windowsxp-calendarwidget.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-checkbox.png b/src/widgets/doc/images/windowsxp-checkbox.png Binary files differdeleted file mode 100644 index 505d3a3641..0000000000 --- a/src/widgets/doc/images/windowsxp-checkbox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-combobox.png b/src/widgets/doc/images/windowsxp-combobox.png Binary files differdeleted file mode 100644 index 2363c8401c..0000000000 --- a/src/widgets/doc/images/windowsxp-combobox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-dateedit.png b/src/widgets/doc/images/windowsxp-dateedit.png Binary files differdeleted file mode 100644 index 060ba07b2c..0000000000 --- a/src/widgets/doc/images/windowsxp-dateedit.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-datetimeedit.png b/src/widgets/doc/images/windowsxp-datetimeedit.png Binary files differdeleted file mode 100644 index 4e41f0fc14..0000000000 --- a/src/widgets/doc/images/windowsxp-datetimeedit.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-dial.png b/src/widgets/doc/images/windowsxp-dial.png Binary files differdeleted file mode 100644 index 0aa3a26159..0000000000 --- a/src/widgets/doc/images/windowsxp-dial.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-doublespinbox.png b/src/widgets/doc/images/windowsxp-doublespinbox.png Binary files differdeleted file mode 100644 index 3165a61b93..0000000000 --- a/src/widgets/doc/images/windowsxp-doublespinbox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-fontcombobox.png b/src/widgets/doc/images/windowsxp-fontcombobox.png Binary files differdeleted file mode 100644 index 96292b84ef..0000000000 --- a/src/widgets/doc/images/windowsxp-fontcombobox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-frame.png b/src/widgets/doc/images/windowsxp-frame.png Binary files differdeleted file mode 100644 index 5979b31b25..0000000000 --- a/src/widgets/doc/images/windowsxp-frame.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-groupbox.png b/src/widgets/doc/images/windowsxp-groupbox.png Binary files differdeleted file mode 100644 index 0b6f7e21ad..0000000000 --- a/src/widgets/doc/images/windowsxp-groupbox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-horizontalscrollbar.png b/src/widgets/doc/images/windowsxp-horizontalscrollbar.png Binary files differdeleted file mode 100644 index 38812ec107..0000000000 --- a/src/widgets/doc/images/windowsxp-horizontalscrollbar.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-label.png b/src/widgets/doc/images/windowsxp-label.png Binary files differdeleted file mode 100644 index a1c3a396a9..0000000000 --- a/src/widgets/doc/images/windowsxp-label.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-lcdnumber.png b/src/widgets/doc/images/windowsxp-lcdnumber.png Binary files differdeleted file mode 100644 index 102023c8ed..0000000000 --- a/src/widgets/doc/images/windowsxp-lcdnumber.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-lineedit.png b/src/widgets/doc/images/windowsxp-lineedit.png Binary files differdeleted file mode 100644 index 9102b53ca4..0000000000 --- a/src/widgets/doc/images/windowsxp-lineedit.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-listview.png b/src/widgets/doc/images/windowsxp-listview.png Binary files differdeleted file mode 100644 index b0fc9bd3a7..0000000000 --- a/src/widgets/doc/images/windowsxp-listview.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-menu.png b/src/widgets/doc/images/windowsxp-menu.png Binary files differdeleted file mode 100644 index b8ca947e73..0000000000 --- a/src/widgets/doc/images/windowsxp-menu.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-progressbar.png b/src/widgets/doc/images/windowsxp-progressbar.png Binary files differdeleted file mode 100644 index c8a73d6754..0000000000 --- a/src/widgets/doc/images/windowsxp-progressbar.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-pushbutton.png b/src/widgets/doc/images/windowsxp-pushbutton.png Binary files differdeleted file mode 100644 index bf6b7bf15d..0000000000 --- a/src/widgets/doc/images/windowsxp-pushbutton.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-radiobutton.png b/src/widgets/doc/images/windowsxp-radiobutton.png Binary files differdeleted file mode 100644 index ad8a908fb2..0000000000 --- a/src/widgets/doc/images/windowsxp-radiobutton.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-slider.png b/src/widgets/doc/images/windowsxp-slider.png Binary files differdeleted file mode 100644 index 9e2fca7c40..0000000000 --- a/src/widgets/doc/images/windowsxp-slider.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-spinbox.png b/src/widgets/doc/images/windowsxp-spinbox.png Binary files differdeleted file mode 100644 index e42073cd6b..0000000000 --- a/src/widgets/doc/images/windowsxp-spinbox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-tableview.png b/src/widgets/doc/images/windowsxp-tableview.png Binary files differdeleted file mode 100644 index 5d12137ad5..0000000000 --- a/src/widgets/doc/images/windowsxp-tableview.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-tabwidget.png b/src/widgets/doc/images/windowsxp-tabwidget.png Binary files differdeleted file mode 100644 index 3c8e777a0b..0000000000 --- a/src/widgets/doc/images/windowsxp-tabwidget.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-textedit.png b/src/widgets/doc/images/windowsxp-textedit.png Binary files differdeleted file mode 100644 index d89c75c71b..0000000000 --- a/src/widgets/doc/images/windowsxp-textedit.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-timeedit.png b/src/widgets/doc/images/windowsxp-timeedit.png Binary files differdeleted file mode 100644 index 751cca9e6a..0000000000 --- a/src/widgets/doc/images/windowsxp-timeedit.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-toolbox.png b/src/widgets/doc/images/windowsxp-toolbox.png Binary files differdeleted file mode 100644 index 99b471e6df..0000000000 --- a/src/widgets/doc/images/windowsxp-toolbox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-toolbutton.png b/src/widgets/doc/images/windowsxp-toolbutton.png Binary files differdeleted file mode 100644 index ea63e16aae..0000000000 --- a/src/widgets/doc/images/windowsxp-toolbutton.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsxp-treeview.png b/src/widgets/doc/images/windowsxp-treeview.png Binary files differdeleted file mode 100644 index 050cc2f4d6..0000000000 --- a/src/widgets/doc/images/windowsxp-treeview.png +++ /dev/null diff --git a/src/widgets/doc/snippets/macmainwindow.mm b/src/widgets/doc/snippets/macmainwindow.mm index d848e6442d..c63796a3f2 100644 --- a/src/widgets/doc/snippets/macmainwindow.mm +++ b/src/widgets/doc/snippets/macmainwindow.mm @@ -43,8 +43,6 @@ #if 0 // Used to be included in Qt4 for Q_WS_MAC -#include <Carbon/Carbon.h> - //![0] SearchWidget::SearchWidget(QWidget *parent) : QMacCocoaViewContainer(0, parent) diff --git a/src/widgets/doc/src/qtwidgets-index.qdoc b/src/widgets/doc/src/qtwidgets-index.qdoc index d3acabcbf9..55661f342b 100644 --- a/src/widgets/doc/src/qtwidgets-index.qdoc +++ b/src/widgets/doc/src/qtwidgets-index.qdoc @@ -83,7 +83,7 @@ interfaces \table \row - \li \image windowsxp-tabwidget.png + \li \image windowsvista-tabwidget.png \li \image fusion-tabwidget.png \li \image macintosh-tabwidget.png \endtable @@ -118,7 +118,7 @@ interfaces which use lists and tables are structured to separate the data and view using models, views, and delegates. - \image windowsxp-treeview.png + \image windowsvista-treeview.png \section1 Graphics View 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..f8b6584f19 100644 --- a/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc @@ -36,10 +36,6 @@ \table \row - \li \image windowsxp-tabwidget.png Windows XP Style Widget Gallery - \caption \l{Windows XP Style Widget Gallery} - - The Windows XP style is provided by QWindowsXPStyle. \li \image windows-tabwidget.png Windows Style Widget Gallery \caption \l{Windows Style Widget Gallery} diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc index 6745b78898..0131ae18e5 100644 --- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -80,7 +80,7 @@ the QPalette::Button role to red for a QPushButton to obtain a red push button. However, this wasn't guaranteed to work for all styles, because style authors are restricted by the different - platforms' guidelines and (on Windows XP and \macos) by the + platforms' guidelines and (on Windows and \macos) by the native theme engine. Style sheets let you perform all kinds of customizations that are @@ -111,10 +111,8 @@ will. \table - \row \li \inlineimage stylesheet-coffee-xp.png - \li \inlineimage stylesheet-pagefold.png - \row \li Coffee theme running on Windows XP - \li Pagefold theme running on Windows XP + \row \li \inlineimage stylesheet-pagefold.png + \row \li Pagefold theme running on Windows \endtable \table @@ -128,7 +126,7 @@ is a wrapper "style sheet" style, \e not the platform-specific style. The wrapper style ensures that any active style sheet is respected and otherwise forwards the drawing operations to the underlying, - platform-specific style (e.g., QWindowsXPStyle on Windows XP). + platform-specific style (e.g., QWindowsVistaStyle on Windows). Since Qt 4.5, Qt style sheets fully supports \macos. @@ -1793,8 +1791,9 @@ a QMessageBox. The possible values are 0 (\l{QDialogButtonBox::}{WinLayout}), 1 (\l{QDialogButtonBox::}{MacLayout}), 2 - (\l{QDialogButtonBox::}{KdeLayout}), and 3 - (\l{QDialogButtonBox::}{GnomeLayout}). + (\l{QDialogButtonBox::}{KdeLayout}), 3 + (\l{QDialogButtonBox::}{GnomeLayout}) and 5 + (\l{QDialogButtonBox::}{AndroidLayout}). If this property is not specified, it defaults to the value specified by the current style for the @@ -2434,6 +2433,12 @@ \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin}. \row + \li \b{\c titlebar-show-tooltips-on-buttons}} + \target titlebar-show-tooltips-on-buttons-prop + \li \c bool + \li Whether tool tips are shown on window title bar buttons. + + \row \li \b{\c text-align} \target text-align-prop \li \l{#Alignment}{Alignment} \li The alignment of text and icon within the contents of the widget. @@ -3525,7 +3530,7 @@ \list \li We have made a request that cannot be satisfied using the - native styles alone (e.g., the Windows XP theme engine doesn't + native styles alone (e.g., the Windows Vista theme engine doesn't let us specify the background color of a button). \li Therefore, the button is rendered using style sheets. \li We haven't specified any values for diff --git a/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc b/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc index 1e99030e7a..15af308cec 100644 --- a/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc @@ -68,7 +68,7 @@ \table \row - \li \image windowsxp-treeview.png + \li \image windowsvista-treeview.png \li \image fusion-calendarwidget.png \li \image qundoview.png \endtable |
