From e192199bb286b7b794e577c4d9f52714423e79a6 Mon Sep 17 00:00:00 2001 From: Tom Swindell Date: Mon, 2 May 2016 11:45:42 +0100 Subject: [PATCH 1/6] Added missing navigation_arrow_drop_down.svg resource used in MenuField Signed-off-by: Tom Swindell --- icons/core_icons.qrc | 3 ++- icons/navigation_arrow_drop_down.svg | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 icons/navigation_arrow_drop_down.svg diff --git a/icons/core_icons.qrc b/icons/core_icons.qrc index 25aaa6f9..ec2605fb 100644 --- a/icons/core_icons.qrc +++ b/icons/core_icons.qrc @@ -3,6 +3,7 @@ navigation_arrow_back.svg + navigation_arrow_drop_down.svg navigation_chevron_left.svg navigation_chevron_right.svg navigation_close.svg @@ -10,4 +11,4 @@ navigation_more_vert.svg - \ No newline at end of file + diff --git a/icons/navigation_arrow_drop_down.svg b/icons/navigation_arrow_drop_down.svg new file mode 100644 index 00000000..16f54224 --- /dev/null +++ b/icons/navigation_arrow_drop_down.svg @@ -0,0 +1 @@ + \ No newline at end of file From 91b5427f2f13b60c8f289638c0725ea381535b1e Mon Sep 17 00:00:00 2001 From: Tom Swindell Date: Tue, 31 May 2016 20:02:48 +0100 Subject: [PATCH 2/6] Added navigation_expand_more icon. Signed-off-by: Tom Swindell --- icons.yml | 1 + icons/core_icons.qrc | 1 + icons/navigation_expand_more.svg | 1 + 3 files changed, 3 insertions(+) create mode 100644 icons/navigation_expand_more.svg diff --git a/icons.yml b/icons.yml index e76ae0bf..49d3ce4c 100644 --- a/icons.yml +++ b/icons.yml @@ -6,3 +6,4 @@ icons: - navigation/close - navigation/menu - navigation/more_vert + - navigation/expand_more diff --git a/icons/core_icons.qrc b/icons/core_icons.qrc index ec2605fb..cc21a48f 100644 --- a/icons/core_icons.qrc +++ b/icons/core_icons.qrc @@ -9,6 +9,7 @@ navigation_close.svg navigation_menu.svg navigation_more_vert.svg + navigation_expand_more.svg diff --git a/icons/navigation_expand_more.svg b/icons/navigation_expand_more.svg new file mode 100644 index 00000000..64e0965b --- /dev/null +++ b/icons/navigation_expand_more.svg @@ -0,0 +1 @@ + \ No newline at end of file From c042cdaec11e349cba1457a526af88d343fc6fb2 Mon Sep 17 00:00:00 2001 From: Tom Swindell Date: Tue, 31 May 2016 20:04:38 +0100 Subject: [PATCH 3/6] Fixed wrong image path in CircleImage.qml Signed-off-by: Tom Swindell --- src/extras/CircleImage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extras/CircleImage.qml b/src/extras/CircleImage.qml index 1cd3b994..2241443e 100644 --- a/src/extras/CircleImage.qml +++ b/src/extras/CircleImage.qml @@ -36,7 +36,7 @@ Item { Extras.Image { id: mask - source: Qt.resolvedUrl("images/circle.png") + source: Qt.resolvedUrl("circle.png") anchors.fill: image smooth: true visible: false From 0cc659250d07f3469c10b50f5527df05d6c6a6b9 Mon Sep 17 00:00:00 2001 From: Tom Swindell Date: Tue, 31 May 2016 20:07:22 +0100 Subject: [PATCH 4/6] Added "closeOnAccept" option to dialog. Signed-off-by: Tom Swindell --- src/popups/Dialog.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/popups/Dialog.qml b/src/popups/Dialog.qml index dfc2cc57..3dddd94a 100644 --- a/src/popups/Dialog.qml +++ b/src/popups/Dialog.qml @@ -68,6 +68,8 @@ PopupBase { default property alias dialogContent: column.data + property bool closeOnAccepted: true + signal accepted() signal rejected() @@ -312,7 +314,7 @@ PopupBase { } onClicked: { - close() + if(closeOnAccepted) close() accepted(); } } From c88f5adf32a4b550b9e322250e8762637d39cc48 Mon Sep 17 00:00:00 2001 From: Tom Swindell Date: Tue, 31 May 2016 20:08:04 +0100 Subject: [PATCH 5/6] Added ability to have no selection in MenuField.qml Signed-off-by: Tom Swindell --- src/popups/MenuField.qml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/popups/MenuField.qml b/src/popups/MenuField.qml index f396ed18..33d423ed 100644 --- a/src/popups/MenuField.qml +++ b/src/popups/MenuField.qml @@ -64,9 +64,11 @@ Item { Ink { anchors.fill: parent onClicked: { - listView.positionViewAtIndex(listView.currentIndex, ListView.Center) - var offset = listView.currentItem.itemLabel.mapToItem(menu, 0, 0) - menu.open(label, 0, -offset.y) + if(listView.currentIndex !== -1) { + listView.positionViewAtIndex(listView.currentIndex, ListView.Center) + var offset = listView.currentItem.itemLabel.mapToItem(menu, 0, 0) + } + menu.open(label, 0, listView.currentIndex !== -1 ? -offset.y : 0) } } From e674cfedebc6031c0d2ebfd1616c7816ef94facf Mon Sep 17 00:00:00 2001 From: Tom Swindell Date: Tue, 31 May 2016 20:10:30 +0100 Subject: [PATCH 6/6] Fixed Subheader component font selection issue. Signed-off-by: Tom Swindell --- src/listitems/Subheader.qml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/listitems/Subheader.qml b/src/listitems/Subheader.qml index ef4cd4e2..0811658a 100644 --- a/src/listitems/Subheader.qml +++ b/src/listitems/Subheader.qml @@ -39,9 +39,7 @@ View { Label { id: label - font.pixelSize: 14 * Units.dp - font.family: "Roboto" - font.weight: Font.DemiBold + style: "subheading" anchors { verticalCenter: parent.verticalCenter