From 401d9b527823ffc8691e8a624ee3d40495622359 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 10 Apr 2017 10:32:14 -0700 Subject: Remove the Windows XP style from public accessibility Later, the Windows XP style will be removed entirely by means of being merged with the Windows Vista style (which inherits from the XP style). There was actually no reason for these styles being separate classes in the first place, because both result in the same appearance for controls on the running version of Windows. Therefore, the windowsxp style merely appears as a "broken" version of the windowsvista style, with only minor differences based on the additional metrics that the vista style provides. The windowsxp style does NOT, and never did, allow users to get a Windows XP style appearance on Windows 7 and above (which is currently Qt's minimum supported platform). Therefore, now that Qt no longer supports Windows XP, the windowsxp style is unusable. [ChangeLog][QtWidgets] The windowsxp style is no longer available as a separate style, because it did not (and cannot) actually provide an XP-style appearance on currently supported Qt platforms. Change-Id: I513d9bce3f247f97cfb28dfee88fe888469e0a6f Reviewed-by: Friedemann Kleint Reviewed-by: Gabriel de Dietrich --- src/widgets/doc/images/stylesheet-coffee-xp.png | Bin 14200 -> 0 bytes .../doc/images/windowsxp-calendarwidget.png | Bin 5009 -> 0 bytes src/widgets/doc/images/windowsxp-checkbox.png | Bin 1006 -> 0 bytes src/widgets/doc/images/windowsxp-combobox.png | Bin 1450 -> 0 bytes src/widgets/doc/images/windowsxp-dateedit.png | Bin 1107 -> 0 bytes src/widgets/doc/images/windowsxp-datetimeedit.png | Bin 1321 -> 0 bytes src/widgets/doc/images/windowsxp-dial.png | Bin 4598 -> 0 bytes src/widgets/doc/images/windowsxp-doublespinbox.png | Bin 1065 -> 0 bytes src/widgets/doc/images/windowsxp-fontcombobox.png | Bin 1408 -> 0 bytes src/widgets/doc/images/windowsxp-frame.png | Bin 1837 -> 0 bytes src/widgets/doc/images/windowsxp-groupbox.png | Bin 2016 -> 0 bytes .../doc/images/windowsxp-horizontalscrollbar.png | Bin 1498 -> 0 bytes src/widgets/doc/images/windowsxp-label.png | Bin 696 -> 0 bytes src/widgets/doc/images/windowsxp-lcdnumber.png | Bin 493 -> 0 bytes src/widgets/doc/images/windowsxp-lineedit.png | Bin 861 -> 0 bytes src/widgets/doc/images/windowsxp-listview.png | Bin 5391 -> 0 bytes src/widgets/doc/images/windowsxp-menu.png | Bin 1442 -> 0 bytes src/widgets/doc/images/windowsxp-progressbar.png | Bin 1007 -> 0 bytes src/widgets/doc/images/windowsxp-pushbutton.png | Bin 1462 -> 0 bytes src/widgets/doc/images/windowsxp-radiobutton.png | Bin 1270 -> 0 bytes src/widgets/doc/images/windowsxp-slider.png | Bin 732 -> 0 bytes src/widgets/doc/images/windowsxp-spinbox.png | Bin 974 -> 0 bytes src/widgets/doc/images/windowsxp-tableview.png | Bin 3204 -> 0 bytes src/widgets/doc/images/windowsxp-tabwidget.png | Bin 5220 -> 0 bytes src/widgets/doc/images/windowsxp-textedit.png | Bin 3159 -> 0 bytes src/widgets/doc/images/windowsxp-timeedit.png | Bin 1172 -> 0 bytes src/widgets/doc/images/windowsxp-toolbox.png | Bin 925 -> 0 bytes src/widgets/doc/images/windowsxp-toolbutton.png | Bin 1549 -> 0 bytes src/widgets/doc/images/windowsxp-treeview.png | Bin 5795 -> 0 bytes src/widgets/doc/src/qtwidgets-index.qdoc | 4 +- .../src/widgets-and-layouts/gallery-windowsxp.qdoc | 142 --------------------- .../doc/src/widgets-and-layouts/gallery.qdoc | 4 - .../doc/src/widgets-and-layouts/stylesheet.qdoc | 12 +- .../doc/src/widgets-and-layouts/widgets.qdoc | 2 +- 34 files changed, 8 insertions(+), 156 deletions(-) delete mode 100644 src/widgets/doc/images/stylesheet-coffee-xp.png delete mode 100644 src/widgets/doc/images/windowsxp-calendarwidget.png delete mode 100644 src/widgets/doc/images/windowsxp-checkbox.png delete mode 100644 src/widgets/doc/images/windowsxp-combobox.png delete mode 100644 src/widgets/doc/images/windowsxp-dateedit.png delete mode 100644 src/widgets/doc/images/windowsxp-datetimeedit.png delete mode 100644 src/widgets/doc/images/windowsxp-dial.png delete mode 100644 src/widgets/doc/images/windowsxp-doublespinbox.png delete mode 100644 src/widgets/doc/images/windowsxp-fontcombobox.png delete mode 100644 src/widgets/doc/images/windowsxp-frame.png delete mode 100644 src/widgets/doc/images/windowsxp-groupbox.png delete mode 100644 src/widgets/doc/images/windowsxp-horizontalscrollbar.png delete mode 100644 src/widgets/doc/images/windowsxp-label.png delete mode 100644 src/widgets/doc/images/windowsxp-lcdnumber.png delete mode 100644 src/widgets/doc/images/windowsxp-lineedit.png delete mode 100644 src/widgets/doc/images/windowsxp-listview.png delete mode 100644 src/widgets/doc/images/windowsxp-menu.png delete mode 100644 src/widgets/doc/images/windowsxp-progressbar.png delete mode 100644 src/widgets/doc/images/windowsxp-pushbutton.png delete mode 100644 src/widgets/doc/images/windowsxp-radiobutton.png delete mode 100644 src/widgets/doc/images/windowsxp-slider.png delete mode 100644 src/widgets/doc/images/windowsxp-spinbox.png delete mode 100644 src/widgets/doc/images/windowsxp-tableview.png delete mode 100644 src/widgets/doc/images/windowsxp-tabwidget.png delete mode 100644 src/widgets/doc/images/windowsxp-textedit.png delete mode 100644 src/widgets/doc/images/windowsxp-timeedit.png delete mode 100644 src/widgets/doc/images/windowsxp-toolbox.png delete mode 100644 src/widgets/doc/images/windowsxp-toolbutton.png delete mode 100644 src/widgets/doc/images/windowsxp-treeview.png delete mode 100644 src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc (limited to 'src/widgets/doc') diff --git a/src/widgets/doc/images/stylesheet-coffee-xp.png b/src/widgets/doc/images/stylesheet-coffee-xp.png deleted file mode 100644 index 8bedd80ee9..0000000000 Binary files a/src/widgets/doc/images/stylesheet-coffee-xp.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-calendarwidget.png b/src/widgets/doc/images/windowsxp-calendarwidget.png deleted file mode 100644 index 9a5fa6ebcd..0000000000 Binary files a/src/widgets/doc/images/windowsxp-calendarwidget.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-checkbox.png b/src/widgets/doc/images/windowsxp-checkbox.png deleted file mode 100644 index 505d3a3641..0000000000 Binary files a/src/widgets/doc/images/windowsxp-checkbox.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-combobox.png b/src/widgets/doc/images/windowsxp-combobox.png deleted file mode 100644 index 2363c8401c..0000000000 Binary files a/src/widgets/doc/images/windowsxp-combobox.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-dateedit.png b/src/widgets/doc/images/windowsxp-dateedit.png deleted file mode 100644 index 060ba07b2c..0000000000 Binary files a/src/widgets/doc/images/windowsxp-dateedit.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-datetimeedit.png b/src/widgets/doc/images/windowsxp-datetimeedit.png deleted file mode 100644 index 4e41f0fc14..0000000000 Binary files a/src/widgets/doc/images/windowsxp-datetimeedit.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-dial.png b/src/widgets/doc/images/windowsxp-dial.png deleted file mode 100644 index 0aa3a26159..0000000000 Binary files a/src/widgets/doc/images/windowsxp-dial.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-doublespinbox.png b/src/widgets/doc/images/windowsxp-doublespinbox.png deleted file mode 100644 index 3165a61b93..0000000000 Binary files a/src/widgets/doc/images/windowsxp-doublespinbox.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-fontcombobox.png b/src/widgets/doc/images/windowsxp-fontcombobox.png deleted file mode 100644 index 96292b84ef..0000000000 Binary files a/src/widgets/doc/images/windowsxp-fontcombobox.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-frame.png b/src/widgets/doc/images/windowsxp-frame.png deleted file mode 100644 index 5979b31b25..0000000000 Binary files a/src/widgets/doc/images/windowsxp-frame.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-groupbox.png b/src/widgets/doc/images/windowsxp-groupbox.png deleted file mode 100644 index 0b6f7e21ad..0000000000 Binary files a/src/widgets/doc/images/windowsxp-groupbox.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-horizontalscrollbar.png b/src/widgets/doc/images/windowsxp-horizontalscrollbar.png deleted file mode 100644 index 38812ec107..0000000000 Binary files a/src/widgets/doc/images/windowsxp-horizontalscrollbar.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-label.png b/src/widgets/doc/images/windowsxp-label.png deleted file mode 100644 index a1c3a396a9..0000000000 Binary files a/src/widgets/doc/images/windowsxp-label.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-lcdnumber.png b/src/widgets/doc/images/windowsxp-lcdnumber.png deleted file mode 100644 index 102023c8ed..0000000000 Binary files a/src/widgets/doc/images/windowsxp-lcdnumber.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-lineedit.png b/src/widgets/doc/images/windowsxp-lineedit.png deleted file mode 100644 index 9102b53ca4..0000000000 Binary files a/src/widgets/doc/images/windowsxp-lineedit.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-listview.png b/src/widgets/doc/images/windowsxp-listview.png deleted file mode 100644 index b0fc9bd3a7..0000000000 Binary files a/src/widgets/doc/images/windowsxp-listview.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-menu.png b/src/widgets/doc/images/windowsxp-menu.png deleted file mode 100644 index b8ca947e73..0000000000 Binary files a/src/widgets/doc/images/windowsxp-menu.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-progressbar.png b/src/widgets/doc/images/windowsxp-progressbar.png deleted file mode 100644 index c8a73d6754..0000000000 Binary files a/src/widgets/doc/images/windowsxp-progressbar.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-pushbutton.png b/src/widgets/doc/images/windowsxp-pushbutton.png deleted file mode 100644 index bf6b7bf15d..0000000000 Binary files a/src/widgets/doc/images/windowsxp-pushbutton.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-radiobutton.png b/src/widgets/doc/images/windowsxp-radiobutton.png deleted file mode 100644 index ad8a908fb2..0000000000 Binary files a/src/widgets/doc/images/windowsxp-radiobutton.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-slider.png b/src/widgets/doc/images/windowsxp-slider.png deleted file mode 100644 index 9e2fca7c40..0000000000 Binary files a/src/widgets/doc/images/windowsxp-slider.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-spinbox.png b/src/widgets/doc/images/windowsxp-spinbox.png deleted file mode 100644 index e42073cd6b..0000000000 Binary files a/src/widgets/doc/images/windowsxp-spinbox.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-tableview.png b/src/widgets/doc/images/windowsxp-tableview.png deleted file mode 100644 index 5d12137ad5..0000000000 Binary files a/src/widgets/doc/images/windowsxp-tableview.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-tabwidget.png b/src/widgets/doc/images/windowsxp-tabwidget.png deleted file mode 100644 index 3c8e777a0b..0000000000 Binary files a/src/widgets/doc/images/windowsxp-tabwidget.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-textedit.png b/src/widgets/doc/images/windowsxp-textedit.png deleted file mode 100644 index d89c75c71b..0000000000 Binary files a/src/widgets/doc/images/windowsxp-textedit.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-timeedit.png b/src/widgets/doc/images/windowsxp-timeedit.png deleted file mode 100644 index 751cca9e6a..0000000000 Binary files a/src/widgets/doc/images/windowsxp-timeedit.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-toolbox.png b/src/widgets/doc/images/windowsxp-toolbox.png deleted file mode 100644 index 99b471e6df..0000000000 Binary files a/src/widgets/doc/images/windowsxp-toolbox.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-toolbutton.png b/src/widgets/doc/images/windowsxp-toolbutton.png deleted file mode 100644 index ea63e16aae..0000000000 Binary files a/src/widgets/doc/images/windowsxp-toolbutton.png and /dev/null differ diff --git a/src/widgets/doc/images/windowsxp-treeview.png b/src/widgets/doc/images/windowsxp-treeview.png deleted file mode 100644 index 050cc2f4d6..0000000000 Binary files a/src/widgets/doc/images/windowsxp-treeview.png and /dev/null differ 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 f37476a78e..607ea84c9b 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. @@ -3532,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 -- cgit v1.2.3