Grouped WinTaskbarButton.progress property

Usage in QML becomes:

WinTaskbarButton {
    progress.value: 50
    progress.visible: true
}

Change-Id: I5cd4b2d99fc110709e056b3d6c5f0c89b03735e3
Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

3 files changed, 7 insertions, 81 deletions

diff --git a/src/imports/winextras/qquickwintaskbarbutton.cpp b/src/imports/winextras/qquickwintaskbarbutton.cpp
index 8a34f44..29348f8 100644
--- a/src/imports/winextras/qquickwintaskbarbutton.cpp
+++ b/src/imports/winextras/qquickwintaskbarbutton.cpp
@@ -75,44 +75,14 @@ QQuickWinTaskbarButton::~QQuickWinTaskbarButton()
 {
 }
 
-int QQuickWinTaskbarButton::progressMinimum() const
-{
-    return button->progressBar()->minimum();
-}
-
-void QQuickWinTaskbarButton::setProgressMinimum(int min)
-{
-    button->progressBar()->setMinimum(min);
-}
-
-/*!
-    \qmlproperty int WinTaskbarButton::progressMaximum
-
-    The maximum progress value.
- */
-int QQuickWinTaskbarButton::progressMaximum() const
-{
-    return button->progressBar()->maximum();
-}
-
-void QQuickWinTaskbarButton::setProgressMaximum(int max)
-{
-    button->progressBar()->setMaximum(max);
-}
-
 /*!
-    \qmlproperty int WinTaskbarButton::progressValue
+    \qmlproperty string WinTaskbarButton::progress
 
-    The displayed progress value.
+    The task bar progress indicator.
  */
-int QQuickWinTaskbarButton::progressValue() const
+QWinTaskbarProgress *QQuickWinTaskbarButton::progress() const
 {
-    return button->progressBar()->value();
-}
-
-void QQuickWinTaskbarButton::setProgressValue(int progress)
-{
-    button->progressBar()->setValue(progress);
+    return button->progressBar();
 }
 
 /*!
@@ -147,38 +117,6 @@ void QQuickWinTaskbarButton::setIconDescription(const QString &descr)
     button->setOverlayIconAccessibilityDescription(m_iconDescription);
 }
 
-/*!
-    \qmlproperty enumeration WinTaskbarButton::progressState
-
-    The state of the progress indicator.
-
-    The state can be one of the following:
-
-    \table
-    \header \li Value \li Description
-    \row \li NoProgressState
-        \li No progress indicator is displayed.
-    \row \li IndeterminateState
-        \li The progress indicator cycles repeatedly.
-    \row \li NormalState
-        \li The progress indicator is green.
-    \row \li PausedState
-        \li The progress indicator turns yellow. Use this state to show that the
-            operation has been paused, but it can be continued.
-    \row \li ErrorState
-        \li The progress indicator turns red.
-    \endtable
- */
-QWinTaskbarProgress::ProgressState QQuickWinTaskbarButton::progressState() const
-{
-    return button->progressBar()->state();
-}
-
-void QQuickWinTaskbarButton::setProgressState(QWinTaskbarProgress::ProgressState state)
-{
-    button->progressBar()->setState(state);
-}
-
 void QQuickWinTaskbarButton::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
 {
     if (change == ItemSceneChange) {
diff --git a/src/imports/winextras/qquickwintaskbarbutton.h b/src/imports/winextras/qquickwintaskbarbutton.h
index c575077..118e085 100644
--- a/src/imports/winextras/qquickwintaskbarbutton.h
+++ b/src/imports/winextras/qquickwintaskbarbutton.h
@@ -53,32 +53,19 @@ class QQuickWinTaskbarButtonPrivate;
 class QQuickWinTaskbarButton : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(int progressMinimum READ progressMinimum WRITE setProgressMinimum)
-    Q_PROPERTY(int progressMaximum READ progressMaximum WRITE setProgressMaximum)
-    Q_PROPERTY(int progressValue   READ progressValue   WRITE setProgressValue)
     Q_PROPERTY(QString overlayIcon READ overlayIcon WRITE setOverlayIcon)
     Q_PROPERTY(QString iconDescription READ iconDescription WRITE setIconDescription)
-    Q_PROPERTY(QWinTaskbarProgress::ProgressState progressState READ progressState WRITE setProgressState)
+    Q_PROPERTY(QWinTaskbarProgress *progress READ progress CONSTANT)
 
 public:
-    Q_ENUMS(QWinTaskbarButton::ProgressState)
-
     QQuickWinTaskbarButton(QQuickItem *parent = 0);
     ~QQuickWinTaskbarButton();
-    int progressMinimum() const;
-    void setProgressMinimum(int min);
-    int progressMaximum() const;
-    void setProgressMaximum(int max);
-    int progressValue() const;
-    void setProgressValue(int progress);
+    QWinTaskbarProgress *progress() const;
     QString overlayIcon() const;
     void setOverlayIcon(const QString &path);
     QString iconDescription() const;
     void setIconDescription(const QString &descr);
 
-    QWinTaskbarProgress::ProgressState progressState() const;
-    void setProgressState(QWinTaskbarProgress::ProgressState state);
-
 protected:
     void itemChange(ItemChange, const ItemChangeData &) Q_DECL_OVERRIDE;
 
diff --git a/src/imports/winextras/qwinextrasplugin.cpp b/src/imports/winextras/qwinextrasplugin.cpp
index 17fe255..d6254cd 100644
--- a/src/imports/winextras/qwinextrasplugin.cpp
+++ b/src/imports/winextras/qwinextrasplugin.cpp
@@ -60,6 +60,7 @@ void QWinExtrasQmlPlugin::registerTypes(const char *uri)
     Q_ASSERT(uri == QLatin1String("QtWinExtras"));
     qmlRegisterType<QQuickWinDwmFeatures>(uri, 1, 0, "WinDwmFeatures");
     qmlRegisterType<QQuickWinTaskbarButton>(uri, 1, 0, "WinTaskbarButton");
+    qmlRegisterUncreatableType<QWinTaskbarProgress>(uri, 1, 0, "WinTaskbarProgress", "Cannot create WinTaskbarProgress - use WinTaskbarButton.progress instead.");
     qmlRegisterType<QQuickJumpList>(uri, 1, 0, "JumpList");
     qmlRegisterType<QQuickJumpListItem>(uri, 1, 0, "JumpListItem");
     qmlRegisterType<QQuickJumpListCategory>(uri, 1, 0, "JumpListCategory");