Differential D7453 Diff 18593 src/apps/marble-maps/Bookmarks.qml

Changeset View

Standalone View

src/apps/marble-maps/Bookmarks.qml

Context not available.
13	import QtQuick.Window 2.2	13		import QtQuick.Window 2.2
14	import QtQuick.Layouts 1.3	14		import QtQuick.Layouts 1.3
15	import QtQml.Models 2.1	15		import QtQml.Models 2.1
		16		import QtQuick.Controls.Material 2.1
16	import QtGraphicalEffects 1.0	17		import QtGraphicalEffects 1.0
17		18
18	import org.kde.kirigami 2.0 as Kirigami	19		import org.kde.kirigami 2.0 as Kirigami
19		20
20	import org.kde.marble 0.20	21		import org.kde.marble 0.20
21	Kirigami.ScrollablePage {	22
		23		Kirigami.Page {
22	id: bookmarkPage	24		id: bookmarkPage
23	title: "Bookmarks"	25		title: "Bookmarks"
24		26
25	property int currentIndex: 0	27		property variant marbleQuickItem
26	property var marbleQuickItem: null	28		signal backTriggered()
			rahnUnsubmitted Not Done I know it's not directly part of this patchset, but I'd still like to mention it: It's relatively unusual to have visual items inside a MouseArea and semantically it's pretty odd: The object hierarchy should also always reflect the semantics in order to keep good modularity: The delegate here is not primarily an "extended MouseArea" so the MouseArea should not be the root item. You could either put the MouseArea as a child inside the SwipeDelegate (but I guess input handling will interfere then) OR you add it as a sibling next to the SwipeDelegate. rahn: I know it's not directly part of this patchset, but I'd still like to mention it: It's…
27
28	SystemPalette{
29	id: palette
30	colorGroup: SystemPalette.Active
31	}
32		29
33	Rectangle {	30		Flickable {
		31		id: root
34	anchors.fill: parent	32		anchors.fill: parent
35	color: palette.base	33		property int currentIndex: 0
36	}
37		34
38	Column {	35		SystemPalette {
39	id: column	36		id: palette
40	anchors {	37		colorGroup: SystemPalette.Active
41	fill: parent
42	margins: Screen.pixelDensity * 2
43	}	38		}
44		39
45	Text {	40		Column {
46	text: "<h3>Bookmarks</h3>"	41		id: column
47	}	42		anchors {
		43		fill: parent
		44		margins: Screen.pixelDensity * 2
		45		}
48		46
49	ListView {	47		Text {
50	id: bookmarksView	48		text: "<h3>Bookmarks</h3>"
51	width: parent.width	49		}
52	interactive: false	50
53	spacing: 5	51		ListView {
54	height: contentHeight	52		id: bookmarksView
55		53		interactive: false
56	model: DelegateModel {	54		width: parent.width
57	id: visualModel	55		spacing: 5
58	model: bookmarks.model	56		height: contentHeight
59	delegate: MouseArea {	57
60	id: delegateRoot	58		model: DelegateModel {
61	property int visualIndex: DelegateModel.itemsIndex	59		id: visualModel
62	width: bookmarksView.width	60		model: bookmarks.model
63	height: 100	61
64	drag.target: bookmarkRectangle	62		delegate:
65	drag.axis: Drag.YAxis	63		MouseArea {
66		64		id: delegateRoot
67	SwipeDelegate {	65		propagateComposedEvents: true
68	id: delegate	66		property int visualIndex: DelegateModel.itemsIndex
69	text: model.display	67		width: bookmarksView.width
70	width: parent.width	68		height: 100
71		69		drag.target: icon
72	contentItem: Rectangle {	70		drag.axis: Drag.YAxis
73	id: bookmarkRectangle	71
		72		SwipeDelegate {
		73		id: delegate
		74		text: model.display
74	width: parent.width	75		width: parent.width
75	height: Screen.pixelDensity * 2 + Math.max(text.height, imageButton.height)	76		height: Screen.pixelDensity * 2 + Math.max(bookmarkText.height, imageButton.height)
76	color: palette.basefconte
77	anchors {
78	horizontalCenter: parent.horizontalCenter;
79	}
80		77
81	Drag.active: delegateRoot.drag.active	78		contentItem: Rectangle {
82	Drag.source: delegateRoot	79		id: icon
83	Drag.hotSpot.x: 36	80		width: parent.width
84	Drag.hotSpot.y: 36	81		height: Screen.pixelDensity + Math.max(bookmarkText.height, imageButton.height)
85		82
86	Text {
87	id: text
88	anchors {	83		anchors {
89	left: imageButton.right	84		horizontalCenter: parent.horizontalCenter;
90	right: dragButton.left
91	leftMargin: parent.width * 0.05
92	verticalCenter: parent.verticalCenter	85		verticalCenter: parent.verticalCenter
93	}	86		}
94	elide: Text.ElideMiddle
95	text: model.display
96	verticalAlignment: Qt.AlignVCenter
97		87
98	font.pointSize: 12	88		Drag.active: delegateRoot.drag.active
99	color: palette.text	89		Drag.source: delegateRoot
100	}	90		Drag.hotSpot.x: 50 //150
		91		Drag.hotSpot.y: 50 //150
		92		color: "transparent"
		93
		94		Text{
		95		id: bookmarkText
		96		anchors.left: imageButton.right
		97		leftPadding: 5
		98		text: delegate.text
		99		elide: Text.ElideRight
		100		horizontalAlignment: Text.AlignLeft
		101		anchors.verticalCenter: parent.verticalCenter
		102		font.pointSize: 12
		103		color: palette.text
		104		}
101		105
102	Image {	106		Image {
103	id: imageButton	107		id: imageButton
104	anchors {	108		anchors {
105	left: bookmarksView.left	109		left: bookmarksView.left
106	verticalCenter: parent.verticalCenter	110		verticalCenter: parent.verticalCenter
		111		}
		112		source: "qrc:///material/place.svg"
		113		width: Screen.pixelDensity * 6
		114		verticalAlignment: Qt.AlignVCenter
		115
		116		height: width
		117		smooth: true
107	}	118		}
108	source: "qrc:///material/place.svg"
109	width: Screen.pixelDensity * 6
110	verticalAlignment: Qt.AlignVCenter
111		119
112	height: width	120		ColorOverlay{
113	smooth: true	121		anchors.fill: imageButton
		122		source: imageButton
		123		color: palette.highlight
		124		}
114	}	125		}
115		126
116	ColorOverlay{	127		swipe.behind: Item {
117	anchors.fill: imageButton	128		width: parent.width
118	source: imageButton	129		height: parent.height
119	color: palette.highlight
120	}
121		130
122	Image {	131		Rectangle{
123	id: dragButton	132		width: parent.width
124	anchors{	133		color: "#333333"
125	verticalCenter: parent.verticalCenter	134		height: parent.height
126	right: parent.right	135		z: 200
		136		Text {
		137		font.pointSize: 10
		138		text: qsTr("Removed")
		139		color: "white"
		140
		141		padding: 20
		142		anchors.fill: parent
		143		horizontalAlignment: Qt.AlignRight
		144		verticalAlignment: Qt.AlignVCenter
		145
		146		opacity: delegate.swipe.complete ? 1 : 0
		147		Behavior on opacity {
		148		NumberAnimation {}
		149		}
		150		}
127	}	151		}
128	width: Screen.pixelDensity * 6
129	height: width
130	source: "qrc:///material/drag.png"
131	verticalAlignment: Qt.AlignVCenter
132		152
133	smooth: true	153		SwipeDelegate.onClicked: delegate.swipe.close()
		154		SwipeDelegate.onPressedChanged: undoTimer.stop()
134	}	155		}
135	}
136		156
137	background: Rectangle {
138	width: parent.width
139	height: parent.height
140	opacity: enabled ? 1 : 0.3
141	color: delegate.down ? "#dddedf" : "transparent"
142	}
143		157
		158		Timer {
		159		id: undoTimer
		160		interval: 1600
		161		onTriggered: {
		162		var currentBookmark = bookmarks.placemark(index)
		163		bookmarks.removeBookmark(currentBookmark.longitude, currentBookmark.latitude)
		164		}
		165		}
144		166
145	swipe.behind: Rectangle {	167		swipe.onCompleted: undoTimer.start()
146	id: rect	168		swipe.onClosed: delegate.swipe.close()
147	width: parent.width	169		swipe.transition: Transition {
148	height: Screen.pixelDensity * 4	170		SmoothedAnimation { velocity: 3; easing.type: Easing.InOutCubic }
149	clip: true
150	color: SwipeDelegate.pressed ? "#555" : "transparent"
151
152	Label {
153	font.family: "Fontello"
154	text: delegate.swipe.complete ? "\ue805" // icon-cw-circled
155	: "\ue801" // icon-cancel-circled-1
156	anchors.fill: parent
157	horizontalAlignment: Qt.AlignRight
158
159	opacity: 2 * -delegate.swipe.position
160	color: Material.Red
161	Behavior on color { ColorAnimation { } }
162	}	171		}
163		172
164	Rectangle{	173		states: [
165	width: parent.width	174		State {
166	color: "#333333"	175		when: icon.Drag.active
167	height: parent.height	176		ParentChange {
168	z: 200	177		target: icon
169	Text {	178		parent: root
170	font.pointSize: 10	179		}
171	text: qsTr("Removed")	180
172	color: "white"	181		AnchorChanges {
173	padding: 20	182		target: icon;
174	anchors.fill: parent	183		anchors.horizontalCenter: undefined;
175	horizontalAlignment: Qt.AlignRight	184		anchors.verticalCenter: undefined
176	opacity: delegate.swipe.complete ? 1 : 0
177	Behavior on opacity {
178	NumberAnimation {}
179	}	185		}
180	}	186		}
		187		]
181		188
		189		background: Rectangle {
		190		color: "transparent"
182	}	191		}
183
184	SwipeDelegate.onClicked: delegate.swipe.close()
185	SwipeDelegate.onPressedChanged: undoTimer.stop()
186	}	192		}
187		193
188	Timer {	194		DropArea {
189	id: undoTimer	195		anchors.fill: parent
190	interval: 3600	196		onEntered: visualModel.items.move(drag.source.visualIndex, delegateRoot.visualIndex)
191	onTriggered: {
192	var currentBookmark = bookmarks.placemark(index)
193	bookmarks.removeBookmark(currentBookmark.longitude, currentBookmark.latitude)
194	}
195	}	197		}
		198		}
		199		}
196		200
197	swipe.onCompleted: undoTimer.start()	201		remove: Transition {
198		202		SequentialAnimation {
199	states: [	203		PauseAnimation { duration: 125 }
200	State {	204		NumberAnimation { property: "height"; to: 0; easing.type: Easing.InOutQuad }
201	when: bookmarkRectangle.Drag.active
202	ParentChange {
203	target: bookmarkRectangle
204	parent: column
205	}
206
207	AnchorChanges {
208	target: bookmarkRectangle;
209	anchors.horizontalCenter: undefined;
210	anchors.verticalCenter: undefined
211	}
212	}
213	]
214	}	205		}
		206		}
215		207
216	DropArea {	208		displaced: Transition {
217	anchors.fill: parent	209		SequentialAnimation {
218	onEntered: visualModel.items.move(drag.source.visualIndex, delegateRoot.visualIndex)	210		PauseAnimation { duration: 125 }
		211		NumberAnimation { property: "y"; easing.type: Easing.InOutQuad }
219	}	212		}
220	}	213		}
221	}	214		}
222		215
223	remove: Transition {	216		Column {
224	SequentialAnimation {	217		visible: bookmarksView.model.count === 0
225	PauseAnimation { duration: 125 }	218		width: parent.width
226	NumberAnimation { property: "height"; to: 0; easing.type: Easing.InOutQuad }	219
		220		Text {
		221		width: 0.8 * parent.width
		222		font.pointSize: 18
		223		color: paletteDisabled.text
		224		text: qsTr("Your bookmarks will appear here.")
		225		wrapMode: Text.WrapAtWordBoundaryOrAnywhere
		226		elide: Text.ElideRight
227	}	227		}
228	}
229		228
230	displaced: Transition {	229		Image {
231	NumberAnimation { properties: "x,y"; easing.type: Easing.OutQuad }	230		anchors.right: parent.right
		231		anchors.bottom: column.bottom
		232		width: 0.3 * parent.width
		233		fillMode: Image.PreserveAspectFit
		234		source: "qrc:/konqi/books.png"
		235		}
232	}	236		}
233	}	237		}
234		238
235	Column {
236	visible: bookmarksView.model.count === 0
237	width: parent.width
238
239	Text {
240	width: 0.8 * parent.width
241	font.pointSize: 18
242	color: paletteDisabled.text
243	text: qsTr("Your bookmarks will appear here.")
244	wrapMode: Text.WrapAtWordBoundaryOrAnywhere
245	elide: Text.ElideRight
246	}
247
248	Image {
249	anchors.right: parent.right
250	anchors.bottom: column.bottom
251	width: 0.3 * parent.width
252	fillMode: Image.PreserveAspectFit
253	source: "qrc:/konqi/books.png"
254	}
255	}
256	}	239		}
257		240
258	Bookmarks {	241		Bookmarks {
259	id: bookmarks	242		id: bookmarks
260	map: marbleQuickItem	243		map: marbleQuickItem
261	}	244		}
262	}
263
264		245
		246		//onMapChanged: bookmarks.map = map
		247		}
Context not available.