From 27748e588ad471e28103fce5ff1037418e87f026 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 28 Nov 2012 15:01:34 +0100 Subject: QtWidgets docs: use Fusion screenshots The Plastique style no longer exists in QtBase. All the references have been updated to Fusion, and the obsolete screenshots have been removed. Change-Id: I771a9ecf23b82965c7b3c41a40945cf051cb5f3a Reviewed-by: Lars Knoll --- src/widgets/widgets/qcheckbox.cpp | 4 ++-- src/widgets/widgets/qdatetimeedit.cpp | 12 ++++++------ src/widgets/widgets/qdial.cpp | 4 ++-- src/widgets/widgets/qgroupbox.cpp | 4 ++-- src/widgets/widgets/qlabel.cpp | 4 ++-- src/widgets/widgets/qlcdnumber.cpp | 4 ++-- src/widgets/widgets/qlineedit.cpp | 4 ++-- src/widgets/widgets/qmenu.cpp | 4 ++-- src/widgets/widgets/qprogressbar.cpp | 4 ++-- src/widgets/widgets/qradiobutton.cpp | 4 ++-- src/widgets/widgets/qscrollbar.cpp | 4 ++-- src/widgets/widgets/qsizegrip.cpp | 4 ++-- src/widgets/widgets/qslider.cpp | 4 ++-- src/widgets/widgets/qspinbox.cpp | 4 ++-- src/widgets/widgets/qstatusbar.cpp | 2 +- src/widgets/widgets/qtabbar.cpp | 8 ++++---- src/widgets/widgets/qtabwidget.cpp | 4 ++-- 17 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src/widgets/widgets') diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp index bbad976c4b..1567e30d83 100644 --- a/src/widgets/widgets/qcheckbox.cpp +++ b/src/widgets/widgets/qcheckbox.cpp @@ -127,8 +127,8 @@ public: \li \inlineimage windows-checkbox.png Screenshot of a Windows XP style checkbox \li A checkbox shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. \row - \li \inlineimage plastique-checkbox.png Screenshot of a Plastique style checkbox - \li A checkbox shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \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/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 0895c96577..394e2b537f 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -109,8 +109,8 @@ QT_BEGIN_NAMESPACE \li A date time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP 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 plastique-datetimeedit.png Screenshot of a Plastique style date time editing widget - \li A date time editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique 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 @@ -1540,8 +1540,8 @@ void QDateTimeEdit::mousePressEvent(QMouseEvent *event) \li A time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP 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 plastique-timeedit.png Screenshot of a Plastique style time editing widget - \li A time editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique 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 @@ -1617,8 +1617,8 @@ QTimeEdit::~QTimeEdit() \li A date editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP 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 plastique-dateedit.png Screenshot of a Plastique style date editing widget - \li A date editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique 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 28941236e2..1f06fed0f6 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -230,11 +230,11 @@ int QDialPrivate::valueFromPoint(const QPoint &p) const \l {QAbstractSlider::pageStep} {pageStep}. \table - \row \li \inlineimage plastique-dial.png Screenshot of a dial in the Plastique widget style + \row \li \inlineimage fusion-dial.png Screenshot of a dial in the Fusion widget style \li \inlineimage windowsxp-dial.png Screenshot of a dial in the Windows XP 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{Plastique Style Widget Gallery}{Plastique}, + \l{Fusion Style Widget Gallery}{Fusion}, \l{Windows XP Style Widget Gallery}{Windows XP}, \l{Macintosh Style Widget Gallery}{Macintosh}. \endtable diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 19a0368d94..e52b8f1a94 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -173,10 +173,10 @@ void QGroupBoxPrivate::click() \table 100% \row \li \inlineimage windowsxp-groupbox.png Screenshot of a Windows XP style group box \li \inlineimage macintosh-groupbox.png Screenshot of a Macintosh style group box - \li \inlineimage plastique-groupbox.png Screenshot of a Plastique style group box + \li \inlineimage fusion-groupbox.png Screenshot of a Fusion style group box \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} group box. \li A \l{Macintosh Style Widget Gallery}{Macintosh style} group box. - \li A \l{Plastique Style Widget Gallery}{Plastique 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 2f12a11e60..a133b9c310 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -138,8 +138,8 @@ QT_BEGIN_NAMESPACE \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 plastique-label.png Screenshot of a Plastique style label - \li A label shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \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 windowsxp-label.png Screenshot of a Windows XP style label \li A label shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. diff --git a/src/widgets/widgets/qlcdnumber.cpp b/src/widgets/widgets/qlcdnumber.cpp index d651597180..69d838bb00 100644 --- a/src/widgets/widgets/qlcdnumber.cpp +++ b/src/widgets/widgets/qlcdnumber.cpp @@ -110,10 +110,10 @@ public: \inlineimage windows-lcdnumber.png Screenshot of a Windows style LCD number widget \inlineimage windowsxp-lcdnumber.png Screenshot of a Windows XP style LCD number widget \inlineimage macintosh-lcdnumber.png Screenshot of a Macintosh style LCD number widget - \inlineimage plastique-lcdnumber.png Screenshot of a Plastique 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 XP Style Widget Gallery}{Windows XP}, - \l{Macintosh Style Widget Gallery}{Macintosh}, \l{Plastique Style Widget Gallery}{Plastique}. + \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 f4539e8e4a..23dee90406 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -208,8 +208,8 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const \li A line edit shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \row \li \inlineimage windows-lineedit.png Screenshot of a Windows XP style line edit \li A line edit shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \li \inlineimage plastique-lineedit.png Screenshot of a Plastique style line edit - \li A line edit shown in the \l{Plastique Style Widget Gallery}{Plastique 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 47ffdda3b6..4d431868ac 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1225,11 +1225,11 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) \table 100% \row - \li \inlineimage plastique-menu.png + \li \inlineimage fusion-menu.png \li \inlineimage windowsxp-menu.png \li \inlineimage macintosh-menu.png \endtable - \caption Fig. A menu shown in \l{Plastique Style Widget Gallery}{Plastique widget style}, + \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}. diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index 2bd893003d..3292116dac 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -200,8 +200,8 @@ bool QProgressBarPrivate::repaintRequired() const \li A progress bar shown in the Macintosh widget style. \row \li \inlineimage windowsxp-progressbar.png Screenshot of a Windows XP style progress bar \li A progress bar shown in the Windows XP widget style. - \row \li \inlineimage plastique-progressbar.png Screenshot of a Plastique style progress bar - \li A progress bar shown in the Plastique 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/qradiobutton.cpp b/src/widgets/widgets/qradiobutton.cpp index 1bb9fa0957..68681a9dea 100644 --- a/src/widgets/widgets/qradiobutton.cpp +++ b/src/widgets/widgets/qradiobutton.cpp @@ -116,8 +116,8 @@ void QRadioButtonPrivate::init() toggle(), pressed(), released(), clicked(), and toggled(). \table 100% - \row \li \inlineimage plastique-radiobutton.png Screenshot of a Plastique radio button - \li A radio button shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}. + \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 windows-radiobutton.png Screenshot of a Windows XP radio button \li A radio button shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. \row \li \inlineimage macintosh-radiobutton.png Screenshot of a Macintosh radio button diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index 199aaf93de..32cf9f4467 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -194,8 +194,8 @@ QT_BEGIN_NAMESPACE \li A scroll bar shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \row \li \inlineimage windowsxp-horizontalscrollbar.png Screenshot of a Windows XP style scroll bar \li A scroll bar shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \li \inlineimage plastique-horizontalscrollbar.png Screenshot of a Plastique style scroll bar - \li A scroll bar shown in the \l{Plastique Style Widget Gallery}{Plastique 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/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp index 742025fce6..030c359021 100644 --- a/src/widgets/widgets/qsizegrip.cpp +++ b/src/widgets/widgets/qsizegrip.cpp @@ -194,9 +194,9 @@ Qt::Corner QSizeGripPrivate::corner() const window is shown full screen or maximised. \table 50% - \row \li \inlineimage plastique-sizegrip.png Screenshot of a Plastique style size grip + \row \li \inlineimage fusion-statusbar-sizegrip.png Screenshot of a Fusion style size grip \li A size grip widget at the bottom-right corner of a main window, shown in the - \l{Plastique Style Widget Gallery}{Plastique widget style}. + \l{Fusion Style Widget Gallery}{Fusion widget style}. \endtable The QSizeGrip class inherits QWidget and reimplements the \l diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp index f22810abeb..f96a44c29f 100644 --- a/src/widgets/widgets/qslider.cpp +++ b/src/widgets/widgets/qslider.cpp @@ -259,8 +259,8 @@ QStyle::SubControl QSliderPrivate::newHoverControl(const QPoint &pos) \li A slider shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. \row \li \inlineimage windows-slider.png Screenshot of a Windows XP slider \li A slider shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \li \inlineimage plastique-slider.png Screenshot of a Plastique slider - \li A slider shown in the \l{Plastique Style Widget Gallery}{Plastique 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 cb09e8bb32..4754f5c1a6 100644 --- a/src/widgets/widgets/qspinbox.cpp +++ b/src/widgets/widgets/qspinbox.cpp @@ -155,8 +155,8 @@ public: \table 100% \row \li \inlineimage windowsxp-spinbox.png Screenshot of a Windows XP spin box \li A spin box shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}. - \row \li \inlineimage plastique-spinbox.png Screenshot of a Plastique spin box - \li A spin box shown in the \l{Plastique Style Widget Gallery}{Plastique 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 diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp index 4f4e7f29f1..cd9a6a89c4 100644 --- a/src/widgets/widgets/qstatusbar.cpp +++ b/src/widgets/widgets/qstatusbar.cpp @@ -216,7 +216,7 @@ QRect QStatusBarPrivate::messageRect() const function. Use the isSizeGripEnabled() function to determine the current status of the size grip. - \image plastique-statusbar.png A status bar shown in the Plastique widget style + \image fusion-statusbar-sizegrip.png A status bar shown in the Fusion widget style \sa QMainWindow, QStatusTipEvent, {fowler}{GUI Design Handbook: Status Bar}, {Application Example} diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index f9325e6352..8cd86dd3f1 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -264,10 +264,10 @@ void QTabBar::initStyleOption(QStyleOptionTab *option, int tabIndex) const returns the visual geometry of a single tab. \table 100% - \row \li \inlineimage plastique-tabbar.png Screenshot of a Plastique style tab bar - \li A tab bar shown in the Plastique widget style. - \row \li \inlineimage plastique-tabbar-truncated.png Screenshot of a truncated Plastique tab bar - \li A truncated tab bar shown in the Plastique widget style. + \row \li \inlineimage fusion-tabbar.png Screenshot of a Fusion style tab bar + \li A tab bar shown in the Fusion widget style. + \row \li \inlineimage fusion-tabbar-truncated.png Screenshot of a truncated Fusion tab bar + \li A truncated tab bar shown in the Fusion widget style. \endtable \sa QTabWidget diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp index 963b86adc1..df9ca56e88 100644 --- a/src/widgets/widgets/qtabwidget.cpp +++ b/src/widgets/widgets/qtabwidget.cpp @@ -122,10 +122,10 @@ QT_BEGIN_NAMESPACE \table 100% \row \li \inlineimage windowsxp-tabwidget.png Screenshot of a Windows XP style tab widget \li \inlineimage macintosh-tabwidget.png Screenshot of a Macintosh style tab widget - \li \inlineimage plastique-tabwidget.png Screenshot of a Plastique style tab widget + \li \inlineimage fusion-tabwidget.png Screenshot of a Fusion style tab widget \row \li A Windows XP style tab widget. \li A Macintosh style tab widget. - \li A Plastique style tab widget. + \li A Fusion style tab widget. \endtable \sa QTabBar, QStackedWidget, QToolBox, {Tab Dialog Example} -- cgit v1.2.3