diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-09-11 18:28:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 08:50:01 +0200 |
| commit | e6dd7437ba4148fefec15b1c2d277efb6e2acba7 (patch) | |
| tree | 1050c4ec00941e77d027525111072ef76f6a5119 /tests | |
| parent | 0c657048b9215274df10f5cf779c39260f203ce8 (diff) | |
Overhaul the TaskbarButton QML type
Make the overlay a grouped property, and use QQuickIconLoader
internally to support remote icon sources.
Change-Id: I888244fe5384702dceebe372b0bd0dd50891629a
Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual/taskbar/main.qml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/manual/taskbar/main.qml b/tests/manual/taskbar/main.qml index 7c7af2a..913560c 100644 --- a/tests/manual/taskbar/main.qml +++ b/tests/manual/taskbar/main.qml @@ -61,7 +61,8 @@ ApplicationWindow { progress.maximum: indeterminateBox.checked ? 0 : maxSpinBox.value progress.value: indeterminateBox.checked ? 0 : valueSlider.value - overlayIcon: overlayBox.checked && overlayCombo.currentIndex >= 0 ? overlayModel.get(overlayCombo.currentIndex).source : "" + overlay.iconSource: overlayBox.checked && overlayCombo.currentIndex >= 0 ? overlayModel.get(overlayCombo.currentIndex).source : "" + overlay.accessibleDescription: "TaskbarButton" } ColumnLayout { @@ -88,11 +89,12 @@ ApplicationWindow { textRole: "name" model: ListModel { id: overlayModel - ListElement { name: "Qt logo (64)"; source: ":/qt-project.org/qmessagebox/images/qtlogo-64.png" } - ListElement { name: "Up (16)"; source: ":/qt-project.org/styles/commonstyle/images/up-16.png" } - ListElement { name: "Left (32)"; source: ":/qt-project.org/styles/commonstyle/images/left-32.png" } - ListElement { name: "Right (32)"; source: ":/qt-project.org/styles/commonstyle/images/right-32.png" } - ListElement { name: "Down (128)"; source: ":/qt-project.org/styles/commonstyle/images/down-128.png" } + ListElement { name: "Qt logo (64)"; source: "qrc:/qt-project.org/qmessagebox/images/qtlogo-64.png" } + ListElement { name: "Up (16)"; source: "qrc:/qt-project.org/styles/commonstyle/images/up-16.png" } + ListElement { name: "Left (32)"; source: "qrc:/qt-project.org/styles/commonstyle/images/left-32.png" } + ListElement { name: "Right (32)"; source: "qrc:/qt-project.org/styles/commonstyle/images/right-32.png" } + ListElement { name: "Down (128)"; source: "qrc:/qt-project.org/styles/commonstyle/images/down-128.png" } + ListElement { name: "Remote"; source: "http://qt-project.org/images/qt13a/Qt-logo.png" } ListElement { name: "Non-existing"; source: "do not crash explorer" } } } |