From 11d5a011e87b9137b33626032eed336b999395a0 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 23 May 2016 09:54:56 +0200 Subject: SwipeDelegate: rename exposure to swipe, active to complete "swipe" is both shorter and easier to understand. "complete" is easier to understand. Task-number: QTBUG-53519 Change-Id: I87ecba4ac878f033111ee56fa618b80b227858a7 Reviewed-by: J-P Nurmi --- examples/quickcontrols2/gallery/pages/DelegatePage.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples') diff --git a/examples/quickcontrols2/gallery/pages/DelegatePage.qml b/examples/quickcontrols2/gallery/pages/DelegatePage.qml index c3fa06c5..3d175fd8 100644 --- a/examples/quickcontrols2/gallery/pages/DelegatePage.qml +++ b/examples/quickcontrols2/gallery/pages/DelegatePage.qml @@ -70,13 +70,13 @@ Pane { text: labelText width: parent.width - onClicked: if (exposure.active) view.model.remove(ourIndex) + onClicked: if (swipe.complete) view.model.remove(ourIndex) Component { id: removeComponent Rectangle { - color: swipeDelegate.exposed && swipeDelegate.pressed ? "#333" : "#444" + color: swipeDelegate.swipe.complete && swipeDelegate.pressed ? "#333" : "#444" width: parent.width height: parent.height clip: true @@ -90,8 +90,8 @@ Pane { } } - exposure.left: removeComponent - exposure.right: removeComponent + swipe.left: removeComponent + swipe.right: removeComponent } } -- cgit v1.2.3 From cfc839a58991a78882251b1489d740c43255ac04 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 24 May 2016 14:07:26 +0200 Subject: Gallery: update logos, icons, colors & screenshots Change-Id: I4b1bec349b3141cabd1882ae28a5ad53ae2cb029 Reviewed-by: Mitch Curtis --- .../doc/images/qtquickcontrols2-gallery-drawer.png | Bin 17156 -> 15785 bytes .../doc/images/qtquickcontrols2-gallery-menu.png | Bin 17209 -> 16618 bytes .../doc/images/qtquickcontrols2-gallery-welcome.png | Bin 23502 -> 20138 bytes examples/quickcontrols2/gallery/gallery.qml | 2 ++ examples/quickcontrols2/gallery/gallery.qrc | 8 ++++++++ .../gallery/images/+material/drawer.png | Bin 0 -> 213 bytes .../gallery/images/+material/drawer@2x.png | Bin 0 -> 286 bytes .../gallery/images/+material/drawer@3x.png | Bin 0 -> 345 bytes .../gallery/images/+material/drawer@4x.png | Bin 0 -> 420 bytes .../gallery/images/+material/menu.png | Bin 0 -> 232 bytes .../gallery/images/+material/menu@2x.png | Bin 0 -> 366 bytes .../gallery/images/+material/menu@3x.png | Bin 0 -> 499 bytes .../gallery/images/+material/menu@4x.png | Bin 0 -> 642 bytes examples/quickcontrols2/gallery/images/arrow.png | Bin 352 -> 3060 bytes examples/quickcontrols2/gallery/images/arrow@2x.png | Bin 524 -> 3240 bytes examples/quickcontrols2/gallery/images/arrow@3x.png | Bin 719 -> 3370 bytes examples/quickcontrols2/gallery/images/arrow@4x.png | Bin 922 -> 3615 bytes examples/quickcontrols2/gallery/images/arrows.png | Bin 429 -> 768 bytes .../quickcontrols2/gallery/images/arrows@2x.png | Bin 663 -> 1290 bytes .../quickcontrols2/gallery/images/arrows@3x.png | Bin 943 -> 1883 bytes .../quickcontrols2/gallery/images/arrows@4x.png | Bin 1236 -> 2765 bytes examples/quickcontrols2/gallery/images/qt-logo.png | Bin 1601 -> 2695 bytes .../quickcontrols2/gallery/images/qt-logo@2x.png | Bin 3186 -> 5521 bytes .../quickcontrols2/gallery/images/qt-logo@3x.png | Bin 4828 -> 8166 bytes .../quickcontrols2/gallery/images/qt-logo@4x.png | Bin 6957 -> 11600 bytes .../quickcontrols2/gallery/qtquickcontrols2.conf | 6 +++--- 26 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 examples/quickcontrols2/gallery/images/+material/drawer.png create mode 100644 examples/quickcontrols2/gallery/images/+material/drawer@2x.png create mode 100644 examples/quickcontrols2/gallery/images/+material/drawer@3x.png create mode 100644 examples/quickcontrols2/gallery/images/+material/drawer@4x.png create mode 100644 examples/quickcontrols2/gallery/images/+material/menu.png create mode 100644 examples/quickcontrols2/gallery/images/+material/menu@2x.png create mode 100644 examples/quickcontrols2/gallery/images/+material/menu@3x.png create mode 100644 examples/quickcontrols2/gallery/images/+material/menu@4x.png (limited to 'examples') diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png index 57ec1026..9109fdda 100644 Binary files a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png and b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png differ diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png index 5b34264e..3cbfbe65 100644 Binary files a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png and b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png differ diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png index 5c2bb682..e69e7e46 100644 Binary files a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png and b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png differ diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml index 567325ad..113874a9 100644 --- a/examples/quickcontrols2/gallery/gallery.qml +++ b/examples/quickcontrols2/gallery/gallery.qml @@ -58,6 +58,8 @@ ApplicationWindow { } header: ToolBar { + Material.foreground: "white" + RowLayout { spacing: 20 anchors.fill: parent diff --git a/examples/quickcontrols2/gallery/gallery.qrc b/examples/quickcontrols2/gallery/gallery.qrc index ba5fb595..01c61324 100644 --- a/examples/quickcontrols2/gallery/gallery.qrc +++ b/examples/quickcontrols2/gallery/gallery.qrc @@ -18,6 +18,14 @@ images/menu@2x.png images/menu@3x.png images/menu@4x.png + images/+material/drawer.png + images/+material/drawer@2x.png + images/+material/drawer@3x.png + images/+material/drawer@4x.png + images/+material/menu.png + images/+material/menu@2x.png + images/+material/menu@3x.png + images/+material/menu@4x.png images/qt-logo.png images/qt-logo@2x.png images/qt-logo@3x.png diff --git a/examples/quickcontrols2/gallery/images/+material/drawer.png b/examples/quickcontrols2/gallery/images/+material/drawer.png new file mode 100644 index 00000000..615cc817 Binary files /dev/null and b/examples/quickcontrols2/gallery/images/+material/drawer.png differ diff --git a/examples/quickcontrols2/gallery/images/+material/drawer@2x.png b/examples/quickcontrols2/gallery/images/+material/drawer@2x.png new file mode 100644 index 00000000..b1dd106d Binary files /dev/null and b/examples/quickcontrols2/gallery/images/+material/drawer@2x.png differ diff --git a/examples/quickcontrols2/gallery/images/+material/drawer@3x.png b/examples/quickcontrols2/gallery/images/+material/drawer@3x.png new file mode 100644 index 00000000..289889bf Binary files /dev/null and b/examples/quickcontrols2/gallery/images/+material/drawer@3x.png differ diff --git a/examples/quickcontrols2/gallery/images/+material/drawer@4x.png b/examples/quickcontrols2/gallery/images/+material/drawer@4x.png new file mode 100644 index 00000000..215e6a82 Binary files /dev/null and b/examples/quickcontrols2/gallery/images/+material/drawer@4x.png differ diff --git a/examples/quickcontrols2/gallery/images/+material/menu.png b/examples/quickcontrols2/gallery/images/+material/menu.png new file mode 100644 index 00000000..f02429e9 Binary files /dev/null and b/examples/quickcontrols2/gallery/images/+material/menu.png differ diff --git a/examples/quickcontrols2/gallery/images/+material/menu@2x.png b/examples/quickcontrols2/gallery/images/+material/menu@2x.png new file mode 100644 index 00000000..9309ad9a Binary files /dev/null and b/examples/quickcontrols2/gallery/images/+material/menu@2x.png differ diff --git a/examples/quickcontrols2/gallery/images/+material/menu@3x.png b/examples/quickcontrols2/gallery/images/+material/menu@3x.png new file mode 100644 index 00000000..7bddf71f Binary files /dev/null and b/examples/quickcontrols2/gallery/images/+material/menu@3x.png differ diff --git a/examples/quickcontrols2/gallery/images/+material/menu@4x.png b/examples/quickcontrols2/gallery/images/+material/menu@4x.png new file mode 100644 index 00000000..e5c23a3b Binary files /dev/null and b/examples/quickcontrols2/gallery/images/+material/menu@4x.png differ diff --git a/examples/quickcontrols2/gallery/images/arrow.png b/examples/quickcontrols2/gallery/images/arrow.png index 340139de..d81accbb 100644 Binary files a/examples/quickcontrols2/gallery/images/arrow.png and b/examples/quickcontrols2/gallery/images/arrow.png differ diff --git a/examples/quickcontrols2/gallery/images/arrow@2x.png b/examples/quickcontrols2/gallery/images/arrow@2x.png index ef2016e9..309c0187 100644 Binary files a/examples/quickcontrols2/gallery/images/arrow@2x.png and b/examples/quickcontrols2/gallery/images/arrow@2x.png differ diff --git a/examples/quickcontrols2/gallery/images/arrow@3x.png b/examples/quickcontrols2/gallery/images/arrow@3x.png index 86c8506b..e146ecc9 100644 Binary files a/examples/quickcontrols2/gallery/images/arrow@3x.png and b/examples/quickcontrols2/gallery/images/arrow@3x.png differ diff --git a/examples/quickcontrols2/gallery/images/arrow@4x.png b/examples/quickcontrols2/gallery/images/arrow@4x.png index ce70d95b..b2ad27f3 100644 Binary files a/examples/quickcontrols2/gallery/images/arrow@4x.png and b/examples/quickcontrols2/gallery/images/arrow@4x.png differ diff --git a/examples/quickcontrols2/gallery/images/arrows.png b/examples/quickcontrols2/gallery/images/arrows.png index f77e01fa..d38b94a4 100644 Binary files a/examples/quickcontrols2/gallery/images/arrows.png and b/examples/quickcontrols2/gallery/images/arrows.png differ diff --git a/examples/quickcontrols2/gallery/images/arrows@2x.png b/examples/quickcontrols2/gallery/images/arrows@2x.png index 9615d436..69b9342b 100644 Binary files a/examples/quickcontrols2/gallery/images/arrows@2x.png and b/examples/quickcontrols2/gallery/images/arrows@2x.png differ diff --git a/examples/quickcontrols2/gallery/images/arrows@3x.png b/examples/quickcontrols2/gallery/images/arrows@3x.png index b6a53e1c..77032526 100644 Binary files a/examples/quickcontrols2/gallery/images/arrows@3x.png and b/examples/quickcontrols2/gallery/images/arrows@3x.png differ diff --git a/examples/quickcontrols2/gallery/images/arrows@4x.png b/examples/quickcontrols2/gallery/images/arrows@4x.png index 099ed1b5..66c1fac5 100644 Binary files a/examples/quickcontrols2/gallery/images/arrows@4x.png and b/examples/quickcontrols2/gallery/images/arrows@4x.png differ diff --git a/examples/quickcontrols2/gallery/images/qt-logo.png b/examples/quickcontrols2/gallery/images/qt-logo.png index 8b0772b0..90e6f905 100644 Binary files a/examples/quickcontrols2/gallery/images/qt-logo.png and b/examples/quickcontrols2/gallery/images/qt-logo.png differ diff --git a/examples/quickcontrols2/gallery/images/qt-logo@2x.png b/examples/quickcontrols2/gallery/images/qt-logo@2x.png index 0d1d499b..22d111ad 100644 Binary files a/examples/quickcontrols2/gallery/images/qt-logo@2x.png and b/examples/quickcontrols2/gallery/images/qt-logo@2x.png differ diff --git a/examples/quickcontrols2/gallery/images/qt-logo@3x.png b/examples/quickcontrols2/gallery/images/qt-logo@3x.png index c9aae358..627746cd 100644 Binary files a/examples/quickcontrols2/gallery/images/qt-logo@3x.png and b/examples/quickcontrols2/gallery/images/qt-logo@3x.png differ diff --git a/examples/quickcontrols2/gallery/images/qt-logo@4x.png b/examples/quickcontrols2/gallery/images/qt-logo@4x.png index ad0ebd03..dc62286d 100644 Binary files a/examples/quickcontrols2/gallery/images/qt-logo@4x.png and b/examples/quickcontrols2/gallery/images/qt-logo@4x.png differ diff --git a/examples/quickcontrols2/gallery/qtquickcontrols2.conf b/examples/quickcontrols2/gallery/qtquickcontrols2.conf index 61375ac1..ce348f2e 100644 --- a/examples/quickcontrols2/gallery/qtquickcontrols2.conf +++ b/examples/quickcontrols2/gallery/qtquickcontrols2.conf @@ -1,8 +1,8 @@ [Material] -Primary=LightGreen -Accent=LightGreen +Primary=#41cd52 +Accent=#41cd52 Theme=Light [Universal] -Accent=Green +Accent=#41cd52 Theme=Light -- cgit v1.2.3