Merge lp:~qqworini/ubuntu-rssreader-app/editable-topic-name into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
- editable-topic-name
- Merge into trunk
Proposed by
Joey Chan
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~qqworini/ubuntu-rssreader-app/editable-topic-name | ||||
Merge into: | lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk | ||||
Diff against target: |
510 lines (+213/-121) 4 files modified
.bzrignore (+1/-0) databasemodule_v2.js (+16/-1) feeds/TopicComponent.qml (+144/-28) feeds/TopicManagement.qml (+52/-92) |
||||
To merge this branch: | bzr merge lp:~qqworini/ubuntu-rssreader-app/editable-topic-name | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Needs Fixing | |
Ubuntu Shorts Developers | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2013-08-22.
Commit message
new feature: editable topic name and removable topic item
Description of the change
new feature: editable topic name and removable topic item
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.bzrignore' | |||
2 | --- .bzrignore 2013-05-23 10:56:53 +0000 | |||
3 | +++ .bzrignore 2013-08-22 15:37:02 +0000 | |||
4 | @@ -5,3 +5,4 @@ | |||
5 | 5 | debian/*.debhelper.log | 5 | debian/*.debhelper.log |
6 | 6 | debian/*.substvars | 6 | debian/*.substvars |
7 | 7 | RE:\.?[^.]+ | 7 | RE:\.?[^.]+ |
8 | 8 | ./ubuntu-rssreader-app.qmlproject | ||
9 | 8 | 9 | ||
10 | === modified file 'databasemodule_v2.js' | |||
11 | --- databasemodule_v2.js 2013-08-08 15:15:39 +0000 | |||
12 | +++ databasemodule_v2.js 2013-08-22 15:37:02 +0000 | |||
13 | @@ -167,6 +167,21 @@ | |||
14 | 167 | return dbResult | 167 | return dbResult |
15 | 168 | } | 168 | } |
16 | 169 | 169 | ||
17 | 170 | function deleteFeedByTagId(tagId) | ||
18 | 171 | { | ||
19 | 172 | var db = openStdDataBase() | ||
20 | 173 | var dbResult | ||
21 | 174 | db.transaction(function (tx) { | ||
22 | 175 | // ensureFeedTableExists(tx) | ||
23 | 176 | tx.executeSql('PRAGMA foreign_keys = ON;') // enable foreign key support | ||
24 | 177 | dbResult = tx.executeSql('delete from feed where exists (select 1 from feed_tag where feed_tag.feed_id = feed.id and feed_tag.tag_id = ?)', | ||
25 | 178 | [tagId]) | ||
26 | 179 | console.log("feed delete by tag id, AFFECTED ROWS: ", dbResult.rowsAffected) | ||
27 | 180 | } | ||
28 | 181 | ) | ||
29 | 182 | return dbResult | ||
30 | 183 | } | ||
31 | 184 | |||
32 | 170 | // select feeds without of topic (tag). | 185 | // select feeds without of topic (tag). |
33 | 171 | function loadFeedsWithoutTopic() | 186 | function loadFeedsWithoutTopic() |
34 | 172 | { | 187 | { |
35 | @@ -515,7 +530,7 @@ | |||
36 | 515 | 530 | ||
37 | 516 | db.transaction(function(tx) { | 531 | db.transaction(function(tx) { |
38 | 517 | dbResult = tx.executeSql("DELETE FROM feed_tag WHERE feed_id = ? AND tag_id = ?", [feedId, tagId]) | 532 | dbResult = tx.executeSql("DELETE FROM feed_tag WHERE feed_id = ? AND tag_id = ?", [feedId, tagId]) |
40 | 518 | console.log("feed_tag delete by feedId and tagId: ", dbResult.rows.length) | 533 | console.log("feed_tag delete by feedId and tagId: ", dbResult.rowsAffected) |
41 | 519 | } | 534 | } |
42 | 520 | ) | 535 | ) |
43 | 521 | return dbResult; | 536 | return dbResult; |
44 | 522 | 537 | ||
45 | === modified file 'feeds/TopicComponent.qml' | |||
46 | --- feeds/TopicComponent.qml 2013-08-03 10:06:36 +0000 | |||
47 | +++ feeds/TopicComponent.qml 2013-08-22 15:37:02 +0000 | |||
48 | @@ -16,14 +16,13 @@ | |||
49 | 16 | property bool isExpended: false | 16 | property bool isExpended: false |
50 | 17 | property string topicName | 17 | property string topicName |
51 | 18 | property int topicId | 18 | property int topicId |
52 | 19 | property int modelIndex | ||
53 | 19 | 20 | ||
54 | 20 | // onClicked: isExpended = !isExpended ; | 21 | // onClicked: isExpended = !isExpended ; |
55 | 21 | 22 | ||
61 | 22 | onStateChanged: | 23 | onStateChanged:{ |
62 | 23 | { | 24 | if (isExpended){ |
63 | 24 | if (isExpended) | 25 | reloadFeed() |
59 | 25 | { | ||
60 | 26 | reloadFeed() ; | ||
64 | 27 | } | 26 | } |
65 | 28 | } | 27 | } |
66 | 29 | 28 | ||
67 | @@ -31,37 +30,154 @@ | |||
68 | 31 | NumberAnimation { duration: 150; easing.type: Easing.OutQuad } | 30 | NumberAnimation { duration: 150; easing.type: Easing.OutQuad } |
69 | 32 | } | 31 | } |
70 | 33 | 32 | ||
85 | 34 | function reloadFeed () | 33 | function reloadFeed (){ |
86 | 35 | { | 34 | feedModel.clear() |
87 | 36 | // for (var j=0; j < columnFeeds.children.length; j++) | 35 | var feeds_tag = DB.loadFeedsFromTag(topicId) |
88 | 37 | // { | 36 | for (var i=0; i< feeds_tag.rows.length; i++){ |
75 | 38 | // columnFeeds.children[j].destroy() ; | ||
76 | 39 | // } | ||
77 | 40 | feedModel.clear() ; | ||
78 | 41 | var feeds_tag = DB.loadFeedsFromTag(topicId) ; | ||
79 | 42 | // var feed_array = [] ; | ||
80 | 43 | for (var i=0; i< feeds_tag.rows.length; i++) | ||
81 | 44 | { | ||
82 | 45 | // feed_array.push(feeds_tag.rows.item(i)) ; | ||
83 | 46 | // var component = Qt.createComponent("./FeedComponent.qml"); | ||
84 | 47 | // var sprite = component.createObject(columnFeeds, {"text": feeds_tag.rows[i].title}); | ||
89 | 48 | feedModel.append(feeds_tag.rows[i]) ; | 37 | feedModel.append(feeds_tag.rows[i]) ; |
90 | 49 | } | 38 | } |
91 | 50 | // columnFeeds.height = columnFeeds.childrenRect.height ; | ||
92 | 51 | // return feed_array ; | ||
93 | 52 | } | 39 | } |
94 | 53 | 40 | ||
97 | 54 | Column | 41 | Column{ |
96 | 55 | { | ||
98 | 56 | id: columnContent | 42 | id: columnContent |
99 | 57 | anchors{ left: parent.left; right: parent.right } | 43 | anchors{ left: parent.left; right: parent.right } |
100 | 58 | 44 | ||
102 | 59 | ListItem.Standard | 45 | Item |
103 | 60 | { | 46 | { |
108 | 61 | id: headerTopic | 47 | anchors{ left: parent.left; right: parent.right } |
109 | 62 | text: topicName | 48 | height: units.gu(5) |
110 | 63 | 49 | ||
111 | 64 | onClicked: isExpended = !isExpended ; | 50 | ListItem.Base{ |
112 | 51 | id: headerTopic | ||
113 | 52 | removable: true | ||
114 | 53 | height: units.gu(5) | ||
115 | 54 | |||
116 | 55 | onClicked: isExpended = !isExpended | ||
117 | 56 | |||
118 | 57 | onItemRemoved:{ | ||
119 | 58 | console.log("item about to be removed: ", topicComponent.topicId) | ||
120 | 59 | // itemCancelDelete.startCounting() | ||
121 | 60 | var result = DB.deleteFeedByTagId(topicComponent.topicId) | ||
122 | 61 | if (result.rowsAffected == undefined) | ||
123 | 62 | { | ||
124 | 63 | topicManagement.reloadTopics() | ||
125 | 64 | } | ||
126 | 65 | result = DB.deleteTag(topicComponent.topicId) | ||
127 | 66 | // topicManagement.reloadTopics() | ||
128 | 67 | if (result.rowsAffected == 1) | ||
129 | 68 | { | ||
130 | 69 | topicManagement.removeModelItem(topicComponent.modelIndex) | ||
131 | 70 | } | ||
132 | 71 | else | ||
133 | 72 | { | ||
134 | 73 | topicManagement.reloadTopics() | ||
135 | 74 | } | ||
136 | 75 | } | ||
137 | 76 | |||
138 | 77 | Row{ | ||
139 | 78 | id: rowTopicContent | ||
140 | 79 | anchors | ||
141 | 80 | { | ||
142 | 81 | top: parent.top; bottom: parent.bottom; left: parent.left; | ||
143 | 82 | leftMargin: units.gu(0); topMargin: units.gu(1); bottomMargin: units.gu(1); | ||
144 | 83 | } | ||
145 | 84 | spacing: units.gu(2) | ||
146 | 85 | |||
147 | 86 | property bool isEditing: false | ||
148 | 87 | |||
149 | 88 | Image{ | ||
150 | 89 | anchors | ||
151 | 90 | { | ||
152 | 91 | top: parent.top; bottom: parent.bottom; | ||
153 | 92 | topMargin: units.gu(0.5); bottomMargin: units.gu(0.5); | ||
154 | 93 | } | ||
155 | 94 | fillMode: Image.PreserveAspectFit | ||
156 | 95 | source: Qt.resolvedUrl("../icons_tmp/compose.svg") | ||
157 | 96 | smooth: true | ||
158 | 97 | |||
159 | 98 | MouseArea{ | ||
160 | 99 | anchors { fill: parent; margins: units.gu(-1) } | ||
161 | 100 | onClicked: | ||
162 | 101 | { | ||
163 | 102 | if (rowTopicContent.isEditing) | ||
164 | 103 | { | ||
165 | 104 | var result = DB.updateTag(topicComponent.topicId, inputTopicName.text) | ||
166 | 105 | if (result.rowsAffected == 1) | ||
167 | 106 | { | ||
168 | 107 | labelTopicName.text = inputTopicName.text | ||
169 | 108 | } | ||
170 | 109 | else | ||
171 | 110 | { | ||
172 | 111 | inputTopicName.text = labelTopicName.text | ||
173 | 112 | } | ||
174 | 113 | } | ||
175 | 114 | else | ||
176 | 115 | {} | ||
177 | 116 | rowTopicContent.isEditing = !rowTopicContent.isEditing | ||
178 | 117 | } | ||
179 | 118 | } | ||
180 | 119 | } | ||
181 | 120 | |||
182 | 121 | Label{ | ||
183 | 122 | id: labelTopicName | ||
184 | 123 | anchors.verticalCenter: parent.verticalCenter | ||
185 | 124 | text: topicName | ||
186 | 125 | width: rowTopicContent.isEditing ? 0 : paintedWidth | ||
187 | 126 | opacity: rowTopicContent.isEditing ? 0 : 1 | ||
188 | 127 | |||
189 | 128 | // Behavior on width { UbuntuNumberAnimation{} } | ||
190 | 129 | } | ||
191 | 130 | |||
192 | 131 | TextField{ | ||
193 | 132 | id: inputTopicName | ||
194 | 133 | anchors.verticalCenter: parent.verticalCenter | ||
195 | 134 | text: topicName | ||
196 | 135 | width: rowTopicContent.isEditing ? headerTopic.width - units.gu(15) : 0 | ||
197 | 136 | opacity: rowTopicContent.isEditing ? 1 : 0 | ||
198 | 137 | hasClearButton: true | ||
199 | 138 | activeFocusOnPress: true | ||
200 | 139 | |||
201 | 140 | Behavior on width { UbuntuNumberAnimation{} } | ||
202 | 141 | |||
203 | 142 | Connections { | ||
204 | 143 | target: Qt.inputMethod | ||
205 | 144 | onVisibleChanged: { | ||
206 | 145 | if (!Qt.inputMethod.visible) { | ||
207 | 146 | topicComponent.focus = true | ||
208 | 147 | } | ||
209 | 148 | } | ||
210 | 149 | } | ||
211 | 150 | } | ||
212 | 151 | } | ||
213 | 152 | |||
214 | 153 | Image{ | ||
215 | 154 | id: imgArrow | ||
216 | 155 | anchors | ||
217 | 156 | { | ||
218 | 157 | right: parent.right; top: parent.top; bottom: parent.bottom; | ||
219 | 158 | topMargin: units.gu(1.5); bottomMargin: units.gu(1.5); rightMargin: units.gu(2) | ||
220 | 159 | } | ||
221 | 160 | fillMode: Image.PreserveAspectFit | ||
222 | 161 | source: Qt.resolvedUrl("../icons_tmp/go-to.svg") | ||
223 | 162 | smooth: true | ||
224 | 163 | |||
225 | 164 | Behavior on rotation { UbuntuNumberAnimation{} } | ||
226 | 165 | |||
227 | 166 | states: [ | ||
228 | 167 | State { | ||
229 | 168 | name: "expended" | ||
230 | 169 | when: topicComponent.isExpended | ||
231 | 170 | |||
232 | 171 | PropertyChanges | ||
233 | 172 | { | ||
234 | 173 | target: imgArrow | ||
235 | 174 | rotation: 90 | ||
236 | 175 | } | ||
237 | 176 | } | ||
238 | 177 | ] | ||
239 | 178 | } | ||
240 | 179 | } | ||
241 | 180 | |||
242 | 65 | } | 181 | } |
243 | 66 | 182 | ||
244 | 67 | ListView | 183 | ListView |
245 | 68 | 184 | ||
246 | === modified file 'feeds/TopicManagement.qml' | |||
247 | --- feeds/TopicManagement.qml 2013-08-08 17:17:28 +0000 | |||
248 | +++ feeds/TopicManagement.qml 2013-08-22 15:37:02 +0000 | |||
249 | @@ -10,9 +10,6 @@ | |||
250 | 10 | objectName: "topicmanagement" | 10 | objectName: "topicmanagement" |
251 | 11 | id: topicManagement | 11 | id: topicManagement |
252 | 12 | 12 | ||
253 | 13 | // width: units.gu(50) | ||
254 | 14 | // height: units.gu(75) | ||
255 | 15 | |||
256 | 16 | title: i18n.tr("Management") | 13 | title: i18n.tr("Management") |
257 | 17 | flickable: content | 14 | flickable: content |
258 | 18 | tools: ToolbarItems { | 15 | tools: ToolbarItems { |
259 | @@ -29,31 +26,26 @@ | |||
260 | 29 | 26 | ||
261 | 30 | Component.onCompleted: | 27 | Component.onCompleted: |
262 | 31 | { | 28 | { |
264 | 32 | reloadTopics () ; | 29 | reloadTopics () |
265 | 33 | } | 30 | } |
266 | 34 | 31 | ||
267 | 35 | function reloadTopics () | 32 | function reloadTopics () |
268 | 36 | { | 33 | { |
278 | 37 | topicModel.clear() ; | 34 | topicModel.clear() |
279 | 38 | // for (var j=0; j < topicColumn.children.length; j++) | 35 | var topics = DB.loadTags() |
280 | 39 | // { | 36 | for (var i=0; i < topics.rows.length; i++){ |
272 | 40 | // topicColumn.children[j].destroy() ; | ||
273 | 41 | // } | ||
274 | 42 | |||
275 | 43 | var topics = DB.loadTags() ; | ||
276 | 44 | for (var i=0; i < topics.rows.length; i++) | ||
277 | 45 | { | ||
281 | 46 | topicModel.append( | 37 | topicModel.append( |
282 | 47 | { | 38 | { |
283 | 48 | "id": topics.rows[i].id | 39 | "id": topics.rows[i].id |
284 | 49 | ,"name": topics.rows[i].name | 40 | ,"name": topics.rows[i].name |
289 | 50 | }); | 41 | }) |
286 | 51 | |||
287 | 52 | // var component = Qt.createComponent("./TopicComponent.qml"); | ||
288 | 53 | // var sprite = component.createObject(topicColumn, {"topicName": topics.rows[i].name}); | ||
290 | 54 | } | 42 | } |
291 | 55 | } | 43 | } |
292 | 56 | 44 | ||
293 | 45 | function removeModelItem (modelIndex){ | ||
294 | 46 | topicModel.remove(modelIndex) | ||
295 | 47 | } | ||
296 | 48 | |||
297 | 57 | function reloadPageContent() { | 49 | function reloadPageContent() { |
298 | 58 | 50 | ||
299 | 59 | } | 51 | } |
300 | @@ -64,8 +56,7 @@ | |||
301 | 64 | contentHeight: contentItem.childrenRect.height | 56 | contentHeight: contentItem.childrenRect.height |
302 | 65 | boundsBehavior: (contentHeight > topicManagement.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds | 57 | boundsBehavior: (contentHeight > topicManagement.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds |
303 | 66 | 58 | ||
306 | 67 | Column | 59 | Column{ |
305 | 68 | { | ||
307 | 69 | anchors{ left: parent.left; right: parent.right } | 60 | anchors{ left: parent.left; right: parent.right } |
308 | 70 | 61 | ||
309 | 71 | Item { | 62 | Item { |
310 | @@ -74,22 +65,19 @@ | |||
311 | 74 | anchors{ left: parent.left; right: parent.right } | 65 | anchors{ left: parent.left; right: parent.right } |
312 | 75 | height: units.gu(8) | 66 | height: units.gu(8) |
313 | 76 | 67 | ||
316 | 77 | UbuntuShape | 68 | UbuntuShape{ |
315 | 78 | { | ||
317 | 79 | id: uAddTopic | 69 | id: uAddTopic |
318 | 80 | anchors { fill: parent; margins: units.gu(1) } | 70 | anchors { fill: parent; margins: units.gu(1) } |
319 | 81 | gradientColor: "goldenrod" | 71 | gradientColor: "goldenrod" |
320 | 82 | radius: "medium" | 72 | radius: "medium" |
321 | 83 | 73 | ||
324 | 84 | Label | 74 | Label{ |
323 | 85 | { | ||
325 | 86 | text: i18n.tr("Add a Topic") | 75 | text: i18n.tr("Add a Topic") |
326 | 87 | fontSize: "large" | 76 | fontSize: "large" |
327 | 88 | anchors.centerIn: parent | 77 | anchors.centerIn: parent |
328 | 89 | } | 78 | } |
329 | 90 | 79 | ||
332 | 91 | MouseArea | 80 | MouseArea{ |
331 | 92 | { | ||
333 | 93 | id: maAddTopic | 81 | id: maAddTopic |
334 | 94 | anchors.fill: parent | 82 | anchors.fill: parent |
335 | 95 | onClicked: pageStack.push(createTopicPage) | 83 | onClicked: pageStack.push(createTopicPage) |
336 | @@ -110,8 +98,7 @@ | |||
337 | 110 | } | 98 | } |
338 | 111 | } | 99 | } |
339 | 112 | 100 | ||
342 | 113 | ListView | 101 | ListView { |
341 | 114 | { | ||
343 | 115 | id: topicList | 102 | id: topicList |
344 | 116 | anchors{ left: parent.left; right: parent.right } | 103 | anchors{ left: parent.left; right: parent.right } |
345 | 117 | height: contentItem.childrenRect.height | 104 | height: contentItem.childrenRect.height |
346 | @@ -120,15 +107,8 @@ | |||
347 | 120 | 107 | ||
348 | 121 | signal collapseAllItem() | 108 | signal collapseAllItem() |
349 | 122 | 109 | ||
359 | 123 | function collapseAll() | 110 | function collapseAll(){ |
360 | 124 | { | 111 | collapseAllItem() |
352 | 125 | // console.log("topicList length", topicList.contentItem.children.length) ; | ||
353 | 126 | // for (var j=0; j < topicList.contentItem.children.length; j++) | ||
354 | 127 | // { | ||
355 | 128 | // console.log("topicList children", topicList.contentItem.children[j]) ; | ||
356 | 129 | // topicList.contentItem.children[j].isExpended = false ; | ||
357 | 130 | // } | ||
358 | 131 | collapseAllItem() ; | ||
361 | 132 | } | 112 | } |
362 | 133 | 113 | ||
363 | 134 | displaced: Transition { | 114 | displaced: Transition { |
364 | @@ -149,78 +129,64 @@ | |||
365 | 149 | anchors{ left: parent.left; right: parent.right } | 129 | anchors{ left: parent.left; right: parent.right } |
366 | 150 | height: topicItem.height | 130 | height: topicItem.height |
367 | 151 | 131 | ||
375 | 152 | // onPressAndHold: | 132 | TopicComponent{ |
369 | 153 | // { | ||
370 | 154 | // delegateRoot.drag.target = icon | ||
371 | 155 | // } | ||
372 | 156 | |||
373 | 157 | TopicComponent | ||
374 | 158 | { | ||
376 | 159 | id: topicItem | 133 | id: topicItem |
377 | 160 | topicName: model.name | 134 | topicName: model.name |
378 | 161 | topicId: model.id | 135 | topicId: model.id |
379 | 136 | modelIndex: index | ||
380 | 162 | // isExpended: delegateRoot.isExpended | 137 | // isExpended: delegateRoot.isExpended |
381 | 163 | } | 138 | } |
382 | 164 | 139 | ||
383 | 165 | DropArea { | 140 | DropArea { |
384 | 166 | anchors { fill: parent; margins: 0 } | 141 | anchors { fill: parent; margins: 0 } |
385 | 167 | 142 | ||
388 | 168 | onEntered: | 143 | onEntered:{ |
387 | 169 | { | ||
389 | 170 | // console.log("enter", drag.source) | 144 | // console.log("enter", drag.source) |
391 | 171 | topicItem.selected = true ; | 145 | topicItem.selected = true |
392 | 172 | } | 146 | } |
393 | 173 | 147 | ||
396 | 174 | onExited: | 148 | onExited:{ |
395 | 175 | { | ||
397 | 176 | // console.log("exit", drag.source) | 149 | // console.log("exit", drag.source) |
399 | 177 | topicItem.selected = false ; | 150 | topicItem.selected = false |
400 | 178 | } | 151 | } |
401 | 179 | 152 | ||
412 | 180 | onDropped: | 153 | onDropped:{ |
413 | 181 | { | 154 | // console.log("drop", drag.source) |
414 | 182 | // console.log("drop", drag.source) ; | 155 | topicItem.selected = false |
415 | 183 | topicItem.selected = false ; | 156 | drag.source.opacity = 0 |
416 | 184 | drag.source.opacity = 0 ; | 157 | console.log("dropped item feed id", drag.source.feedId) |
417 | 185 | console.log("dropped item feed id", drag.source.feedId) ; | 158 | console.log("dropped item topic id", drag.source.topicId) |
418 | 186 | console.log("dropped item topic id", drag.source.topicId) ; | 159 | DB.deleteFeedTag(drag.source.feedId, drag.source.topicId) |
419 | 187 | DB.deleteFeedTag(drag.source.feedId, drag.source.topicId) ; | 160 | DB.addFeedTag(drag.source.feedId, model.id) |
420 | 188 | DB.addFeedTag(drag.source.feedId, model.id) ; | 161 | delegateRoot.isExpended = true |
411 | 189 | delegateRoot.isExpended = true ; | ||
421 | 190 | } | 162 | } |
422 | 191 | } | 163 | } |
423 | 192 | 164 | ||
426 | 193 | Connections | 165 | Connections{ |
425 | 194 | { | ||
427 | 195 | id: connTopicList | 166 | id: connTopicList |
428 | 196 | target: topicList | 167 | target: topicList |
429 | 197 | 168 | ||
430 | 198 | onCollapseAllItem: | 169 | onCollapseAllItem: |
431 | 199 | { | 170 | { |
433 | 200 | delegateRoot.isExpended = false ; | 171 | delegateRoot.isExpended = false |
434 | 201 | } | 172 | } |
435 | 202 | } | 173 | } |
436 | 203 | 174 | ||
439 | 204 | Connections | 175 | Connections{ |
438 | 205 | { | ||
440 | 206 | id: connEditFeed0 | 176 | id: connEditFeed0 |
441 | 207 | target: editFeed | 177 | target: editFeed |
442 | 208 | 178 | ||
449 | 209 | onApply: | 179 | onApply:{ |
450 | 210 | { | 180 | if (model.id == newTopicId || model.id == previousTopicId){ |
451 | 211 | if (model.id == newTopicId || model.id == previousTopicId) | 181 | topicItem.reloadFeed() |
452 | 212 | { | 182 | topicItem.isExpended = true |
447 | 213 | topicItem.reloadFeed() ; | ||
448 | 214 | topicItem.isExpended = true ; | ||
453 | 215 | } | 183 | } |
454 | 216 | } | 184 | } |
455 | 217 | 185 | ||
462 | 218 | onDeleteFeed: | 186 | onDeleteFeed:{ |
463 | 219 | { | 187 | if (model.id == topicId){ |
464 | 220 | if (model.id == topicId) | 188 | topicItem.reloadFeed() |
465 | 221 | { | 189 | topicItem.isExpended = true |
460 | 222 | topicItem.reloadFeed() ; | ||
461 | 223 | topicItem.isExpended = true ; | ||
466 | 224 | } | 190 | } |
467 | 225 | } | 191 | } |
468 | 226 | } | 192 | } |
469 | @@ -231,31 +197,25 @@ | |||
470 | 231 | } // column | 197 | } // column |
471 | 232 | } // flickable | 198 | } // flickable |
472 | 233 | 199 | ||
475 | 234 | Connections | 200 | Connections{ |
474 | 235 | { | ||
476 | 236 | id: connAddTopic | 201 | id: connAddTopic |
477 | 237 | target: createTopicPage | 202 | target: createTopicPage |
478 | 238 | 203 | ||
482 | 239 | onTopicAdded: | 204 | onTopicAdded:{ |
483 | 240 | { | 205 | reloadTopics() |
481 | 241 | reloadTopics() ; | ||
484 | 242 | } | 206 | } |
485 | 243 | } | 207 | } |
486 | 244 | 208 | ||
489 | 245 | Connections | 209 | Connections { |
488 | 246 | { | ||
490 | 247 | id: connAddFeed | 210 | id: connAddFeed |
491 | 248 | target: chooseTopicPage | 211 | target: chooseTopicPage |
492 | 249 | 212 | ||
502 | 250 | onFeedAdded: | 213 | onFeedAdded:{ |
503 | 251 | { | 214 | reloadTopics() |
504 | 252 | reloadTopics() ; | 215 | for (var i=0; i<topicModel.count; i++){ |
505 | 253 | for (var i=0; i<topicModel.count; i++) | 216 | if (topicModel.get(i).id == topicId){ |
506 | 254 | { | 217 | topicList.currentIndex = i |
507 | 255 | if (topicModel.get(i).id == topicId) | 218 | topicList.currentItem.isExpended = true |
499 | 256 | { | ||
500 | 257 | topicList.currentIndex = i ; | ||
501 | 258 | topicList.currentItem.isExpended = true ; | ||
508 | 259 | } | 219 | } |
509 | 260 | } | 220 | } |
510 | 261 | } | 221 | } |
FAILED: Continuous integration, rev:44 91.189. 93.70:8080/ job/ubuntu- rssreader- app-ci/ 120/ 91.189. 93.70:8080/ job/generic- mediumtests/ 409 91.189. 93.70:8080/ job/ubuntu- rssreader- app-precise- amd64-ci/ 115 91.189. 93.70:8080/ job/ubuntu- rssreader- app-quantal- amd64-ci/ 120 91.189. 93.70:8080/ job/ubuntu- rssreader- app-raring- amd64-ci/ 120 91.189. 93.70:8080/ job/ubuntu- rssreader- app-saucy- amd64-ci/ 115
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- rssreader- app-ci/ 120/rebuild
http://