1
=== removed file 'ListColumnDelegate.qml'
2
--- ListColumnDelegate.qml	2013-08-03 10:06:36 +0000
3
+++ ListColumnDelegate.qml	1970-01-01 00:00:00 +0000
4
@@ -1,62 +0,0 @@
5
1
import QtQuick 2.0
6
2
7
3
import Ubuntu.Components 0.1
8
4
import Ubuntu.Components.ListItems 0.1 as ListItem
9
5
import Ubuntu.Components.Popups 0.1
10
6
11
7
import "./addDelegate.js" as AddD
12
8
import "./imgSeparator.js" as ImgS
13
9
//import "./article_items"
14
10
15
11
Column {
16
12
    id: rss_item_delegate
17
13
//    width: units.gu(50)
18
14
//    height: units.gu(75)
19
15
20
16
//    height: parent.height
21
17
    spacing: units.gu(2)
22
18
23
19
    property bool isFull: false
24
20
    property real childrenSumHeight: 0
25
21
    property real childrenMaxWidth: 0
26
22
    property int modelIndex
27
23
28
24
    function addItem(rss_item, rss_description, model, index)
29
25
    {
30
26
        var newD = AddD.addDelegate(rss_item, ImgS.separate(rss_description), model, index, rss_item_delegate);
31
27
        getChildrenRect() ;
32
28
        rss_item_delegate.width = childrenMaxWidth ;
33
29
//        console.log("childrenSumHeight, column.height: ", childrenSumHeight, rss_item_delegate.childrenRect.height)
34
30
        //console.log("children list: ", rss_item_delegate.children.length)
35
31
        if (childrenSumHeight > rss_item_delegate.height + units.gu(2))
36
32
        {
37
33
            isFull = true ;
38
34
            newD.destroy() ;
39
35
            getChildrenRect() ;
40
36
            rss_item_delegate.width = childrenMaxWidth ;
41
37
//            rss_item_delegate.children[rss_item_delegate.children.length-1].destroy() ;
42
38
//            rss_item_delegate.spacing = (childrenSumHeight - rss_item_delegate.height) / (rss_item_delegate.children.length + 2)
43
39
            return false ;
44
40
        }
45
41
        else
46
42
        {
47
43
            isFull = false ;
48
44
            return true ;
49
45
        }
50
46
    }
51
47
52
48
    function getChildrenRect()
53
49
    {
54
50
        childrenSumHeight = 0 ;
55
51
        childrenMaxWidth = 0 ;
56
52
        var length = rss_item_delegate.children.length ;
57
53
        for (var i=0; i<length; i++)
58
54
        {
59
55
            childrenSumHeight += (rss_item_delegate.children[i].height + units.gu(2) * length) ;
60
56
            if (rss_item_delegate.children[i].width > childrenMaxWidth)
61
57
            {
62
58
                childrenMaxWidth = rss_item_delegate.children[i].width
63
59
            }
64
60
        }
65
61
    }
66
62
}
67
63
0
68
=== removed file 'ListColumnView.qml'
69
--- ListColumnView.qml	2013-08-16 16:22:59 +0000
70
+++ ListColumnView.qml	1970-01-01 00:00:00 +0000
71
@@ -1,119 +0,0 @@
72
1
import QtQuick 2.0
73
2
import QtQuick.XmlListModel 2.0
74
3
import Ubuntu.Components 0.1
75
4
import Ubuntu.Components.ListItems 0.1 as ListItem
76
5
import Ubuntu.Components.Popups 0.1
77
6
78
7
import "databasemodule_v2.js" as DB
79
8
80
9
Item {
81
10
82
11
    property int tag_id
83
12
    property bool isAll: false
84
13
    property variant feedArray: []
85
14
    property alias rss_model: tempmodel
86
15
87
16
    anchors.fill: parent
88
17
    anchors.bottomMargin: units.gu(7)
89
18
90
19
    function reload() {
91
20
        tempmodel.clear();
92
21
        if (!isAll)
93
22
        {
94
23
            for (var j=0; j < feedArray.length ; j++)
95
24
            {
96
25
                var articles = DB.loadArticles({"isAll": false, "feedId": feedArray[j].id});
97
26
                var temp
98
27
                for (var i=0; i < articles.rows.length; i++)
99
28
                {
100
29
                    temp =
101
30
                            {
102
31
                        "id": articles.rows[i].id
103
32
                        ,"title": articles.rows[i].title
104
33
                        ,"content": articles.rows[i].content
105
34
                        ,"link": articles.rows[i].link
106
35
                        ,"description": articles.rows[i].description
107
36
                        ,"pubdate": articles.rows[i].pubdate
108
37
                        ,"status": articles.rows[i].status
109
38
                        ,"favourite": articles.rows[i].favourite
110
39
                        ,"image": articles.rows[i].image
111
40
                        ,"guid": articles.rows[i].guid
112
41
                        ,"feed_id": articles.rows[i].feed_id
113
42
                        ,"count": articles.rows[i].count
114
43
                        ,"feed_name": articles.rows[i].feed_name
115
44
                    }
116
45
                    tempmodel.append(temp);
117
46
                }
118
47
            }
119
48
        }
120
49
        else
121
50
        {
122
51
            var articles = DB.loadArticles({"isAll": true});
123
52
            var temp
124
53
            for (var i=0; i < articles.rows.length; i++)
125
54
            {
126
55
                temp =
127
56
                        {
128
57
                    "id": articles.rows[i].id
129
58
                    ,"title": articles.rows[i].title
130
59
                    ,"content": articles.rows[i].content
131
60
                    ,"link": articles.rows[i].link
132
61
                    ,"description": articles.rows[i].description
133
62
                    ,"pubdate": articles.rows[i].pubdate
134
63
                    ,"status": articles.rows[i].status
135
64
                    ,"favourite": articles.rows[i].favourite
136
65
                    ,"image": articles.rows[i].image
137
66
                    ,"guid": articles.rows[i].guid
138
67
                    ,"feed_id": articles.rows[i].feed_id
139
68
                    ,"count": articles.rows[i].count
140
69
                    ,"feed_name": articles.rows[i].feed_name
141
70
                }
142
71
                tempmodel.append(temp);
143
72
            }
144
73
        }
145
74
146
75
//        console.timeEnd("model append");
147
76
        list_column.loadArticles();
148
77
    }
149
78
150
79
151
80
    ListView {
152
81
        id: list_column
153
82
154
83
        anchors.fill: parent
155
84
        anchors.margins: units.gu(2)
156
85
        orientation: ListView.Horizontal
157
86
        spacing: units.gu(3)
158
87
        cacheBuffer: 99999
159
88
160
89
        function loadArticles(/*temp_model*/) {
161
90
            console.time("loadArticles: ");
162
91
            column_model.clear()  ;
163
92
            column_model.append( { "nothing": "nothing" } )  ;
164
93
            currentIndex = 0 ;
165
94
166
95
            for (var i=0; i<   tempmodel.count; i++)
167
96
            {
168
97
                while (!currentItem.addItem(tempmodel.get(i), tempmodel.get(i).content, tempmodel, i))
169
98
                {
170
99
                    column_model.append( { "nothing": "nothing" } )  ;
171
100
                    currentIndex = column_model.count - 1 ;
172
101
                }
173
102
            }
174
103
175
104
            positionViewAtBeginning() ;
176
105
            console.timeEnd("loadArticles: ");
177
106
        }
178
107
179
108
        model: ListModel { id: column_model }
180
109
181
110
        delegate: ListColumnDelegate {
182
111
            height: list_column.height
183
112
            modelIndex: index
184
113
        }
185
114
    }
186
115
187
116
    ListModel {
188
117
        id: tempmodel
189
118
    }
190
119
}
191
120
0
192
=== added file 'OrganicGrid.qml'
193
--- OrganicGrid.qml	1970-01-01 00:00:00 +0000
194
+++ OrganicGrid.qml	2013-09-02 04:22:41 +0000
195
@@ -0,0 +1,227 @@
196
1
import QtQuick 2.0
197
2
import QtGraphicalEffects 1.0
198
3
import Ubuntu.Components 0.1
199
4
import "databasemodule_v2.js" as DB
200
5
import "./imgSeparator.js" as ImageSeparator
201
6
202
7
Item {
203
8
    id: organicGridRoot
204
9
205
10
    anchors.fill: parent
206
11
207
12
    property variant rectangleList: []
208
13
    property int tag_id
209
14
    property bool isAll: false
210
15
    property variant feedArray: []
211
16
212
17
    /*!
213
18
      * \brief check collision of two article items
214
19
      *
215
20
      */
216
21
    function checkCollision(rect1, rect2) {
217
22
        return !((rect1.y + rect1.height <= rect2.y) ||
218
23
                 (rect2.y + rect2.height <= rect1.y) ||
219
24
                 (rect1.x >= rect2.x + rect2.width) ||
220
25
                 (rect2.x >= rect1.x + rect1.width))
221
26
    }
222
27
223
28
    /*!
224
29
      * \brief Returns a margin within given numbers. Used to make the view
225
30
      * look more organic.
226
31
      */
227
32
    function randomMargin() {
228
33
        return units.gu(2 /*3 + Math.random() * 4*/);
229
34
    }
230
35
231
36
    /*!
232
37
      * Adds a given article to the model. Also adds metadata about the
233
38
      * model to the article.
234
39
      */
235
40
    function addArticleToModel(article) {
236
41
        article.model = articleModel
237
42
        article.modelIndex = articleModel.count
238
43
        articleModel.append(article)
239
44
    }
240
45
241
46
242
47
    /*!
243
48
      * Clears all articles from the model and the view.
244
49
      */
245
50
    function clear() {
246
51
        for(var i in rectangleList) {
247
52
            rectangleList[i].destroy()
248
53
        }
249
54
250
55
        articleModel.clear()
251
56
        rectangleList = []
252
57
    }
253
58
254
59
    /*!
255
60
      * Reloads the organic view. See inline comments for details.
256
61
      */
257
62
    function reload() {
258
63
        clear()
259
64
        // Decide if we should load all articles in our database or a subset.
260
65
        if (!isAll)
261
66
        {
262
67
            for (var j=0; j < feedArray.length ; j++)
263
68
            {
264
69
                var feedArticles = DB.loadArticles({"isAll": false, "feedId": feedArray[j].id});
265
70
                for(var i = 0; i < feedArticles.rows.length; i++) {
266
71
                    addArticleToModel(feedArticles.rows[i])
267
72
                }
268
73
            }
269
74
        } else {
270
75
            var feedArticles = DB.loadArticles({"isAll": true});
271
76
            for (var i=0; i < feedArticles.rows.length; i++)
272
77
            {
273
78
                addArticleToModel(feedArticles.rows[i])
274
79
            }
275
80
        }
276
81
277
82
        // Initial values for the starting column of items
278
83
        var xEdge = 0;
279
84
        var lastColumnX = 0;
280
85
        var y = randomMargin();
281
86
        // A hard-coded sequence that gives an organic look, but is not
282
87
        // completely random
283
88
        var sequence = [0,1,0,1,2,1,0,0,2,1,0,1,0,0];
284
89
        // TODO: Remove hard limit on 300 items
285
90
        for(var i = 0; i < articleModel.count; i++) {
286
91
            var article = articleModel.get(i);
287
92
//            var imageArray = ImageSeparator.separate(article.content)
288
93
            var imageArray = [article.image]
289
94
//            console.log("imageArray: ", imageArray)
290
95
            var hasImage = (article.image !== "");
291
96
292
97
            // Pick the type of size we will use for this item from the sequence
293
98
            var sizeType = sequence[i % sequence.length];
294
99
            var alignType = parseInt(Math.random() * 2)
295
100
//            if(hasImage) {
296
101
//                alignType = parseInt(Math.random() * 4);
297
102
//            } else {
298
103
//                alignType = parseInt(Math.random() * 2);
299
104
//            }
300
105
301
106
            var alignName
302
107
303
108
            // Name of the QML file to be used
304
109
            var componentName
305
110
            var noImageName = ""
306
111
            if(!hasImage) {
307
112
                switch(alignType) {
308
113
                case 0:
309
114
                    alignName = "TextA"
310
115
                    break;
311
116
                case 1:
312
117
                    alignName = "TextB"
313
118
                    break;
314
119
                }
315
120
                noImageName += "NoImage";
316
121
                sizeType = 0;
317
122
            }
318
123
            else {
319
124
                switch(alignType) {
320
125
                case 0:
321
126
                    alignName = "OneImgA"
322
127
                    break;
323
128
                case 1:
324
129
                    alignName = "FullImg"
325
130
                    break;
326
131
                }
327
132
            }
328
133
            componentName = "article_items/" + "Article" + alignName + ".qml";
329
134
330
135
            // create component for an article
331
136
            var component = Qt.createComponent(componentName);
332
137
            if(component.status !== Component.Ready) {
333
138
                console.log("Error loading component:", component.errorString());
334
139
                continue; // Skip if we for some reason could not create this component
335
140
            }
336
141
337
142
            var properties = {
338
143
                "rss_item": article,
339
144
                "imageArray": imageArray,
340
145
                "rss_model": articleModel,
341
146
                "model_index": article.modelIndex
342
147
            }
343
148
344
149
            // This is the actual item that will be on display
345
150
            var articleItem = component.createObject(itemContainer /*organicFlickable.contentItem*/, properties);
346
151
347
152
            if(y + articleItem.height > organicGridRoot.height)  {
348
153
                y = randomMargin();
349
154
                xEdge = lastColumnX;
350
155
            }
351
156
352
157
            // The xEdge is where the last "column" of items were placed last
353
158
            // This keeps us moving forward in x-direction
354
159
            var x = xEdge + randomMargin();
355
160
356
161
            // We add some extra random margin to make it look a bit more organic
357
162
            x += randomMargin();
358
163
359
164
            articleItem.x = x
360
165
            articleItem.y = y
361
166
362
167
            // Check for collisions with all other items
363
168
            // TODO: See if this may be limited to only the previous two colums
364
169
            for(var j = 0; j < rectangleList.length; j++) {
365
170
                var rect2 = rectangleList[j]
366
171
                if(checkCollision(articleItem, rect2)) {
367
172
                    articleItem.x = rect2.x + rect2.width + randomMargin();
368
173
                }
369
174
            }
370
175
371
176
            // Did we move the x-edge value further to the right than before?
372
177
            lastColumnX = Math.max(articleItem.x, lastColumnX);
373
178
374
179
            // Push this item to all lists and all that stuff
375
180
            var list = rectangleList
376
181
            list.push(articleItem)
377
182
            rectangleList = list
378
183
379
184
            // Increment y for the next item
380
185
            y += articleItem.height + randomMargin();
381
186
        }
382
187
        organicFlickable.scrollToStart()
383
188
    }
384
189
385
190
    /*!
386
191
      * use Flickable as articles container
387
192
      */
388
193
    Flickable {
389
194
        id: organicFlickable
390
195
        anchors.fill: parent
391
196
        contentWidth: itemContainer.width /*contentItem.childrenRect.width*/
392
197
        contentHeight: parent.height
393
198
394
199
        Item {
395
200
            id: itemContainer
396
201
            //            color: "white"
397
202
            anchors {
398
203
                left: parent.left
399
204
                top: parent.top
400
205
            }
401
206
402
207
            width: childrenRect.width + units.gu(6)
403
208
            height: parent.height
404
209
        }
405
210
406
211
//        Behavior on contentX {
407
212
//            NumberAnimation {
408
213
//                duration: 600
409
214
//                easing.type: Easing.InOutQuart
410
215
//            }
411
216
//        }
412
217
413
218
        function scrollToStart() {
414
219
            contentX = 0
415
220
        }
416
221
    }
417
222
418
223
    ListModel
419
224
    {
420
225
        id: articleModel
421
226
    }
422
227
}
423
0
228
424
=== modified file 'RssFeedPage.qml'
425
--- RssFeedPage.qml	2013-09-01 09:07:30 +0000
426
+++ RssFeedPage.qml	2013-09-02 04:22:41 +0000
427
@@ -98,7 +98,7 @@
428
98
98
429
99
                Label {
99
                Label {
430
100
                    id: label_time
100
                    id: label_time
432
101
                    text: DateUtils.formatRelativeTime(i18n, model.pubdate)
101
                    text: DateUtils.formatRelativeTime(i18n, pubdate)
433
102
                    fontSize: "small"
102
                    fontSize: "small"
434
103
                    anchors.horizontalCenter: parent.horizontalCenter
103
                    anchors.horizontalCenter: parent.horizontalCenter
435
104
                    width: parent.width - units.gu(4)
104
                    width: parent.width - units.gu(4)
436
@@ -106,14 +106,14 @@
437
106
106
438
107
                Label {
107
                Label {
439
108
                    fontSize: "large"
108
                    fontSize: "large"
441
109
                    text: model.title
109
                    text: title
442
110
                    anchors.horizontalCenter: parent.horizontalCenter
110
                    anchors.horizontalCenter: parent.horizontalCenter
443
111
                    width: parent.width - units.gu(4)
111
                    width: parent.width - units.gu(4)
444
112
                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
112
                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
445
113
                }
113
                }
446
114
114
447
115
                Label {
115
                Label {
449
116
                    text: model.content
116
                    text: content
450
117
                    linkColor: UbuntuColors.orange // Temporary. Mb bad color, but better than dark blue.
117
                    linkColor: UbuntuColors.orange // Temporary. Mb bad color, but better than dark blue.
451
118
                    anchors.horizontalCenter: parent.horizontalCenter
118
                    anchors.horizontalCenter: parent.horizontalCenter
452
119
                    width: parent.width - units.gu(4)
119
                    width: parent.width - units.gu(4)
453
120
120
454
=== modified file 'TopicTab.qml'
455
--- TopicTab.qml	2013-09-01 14:35:33 +0000
456
+++ TopicTab.qml	2013-09-02 04:22:41 +0000
457
@@ -63,11 +63,11 @@
458
63
                feeds.push(feedTags.rows.item(i))
63
                feeds.push(feedTags.rows.item(i))
459
64
            }
64
            }
460
65
            feedArray = feeds
65
            feedArray = feeds
462
66
            listColumnView.reload()
66
            organicGridView.reload()
463
67
        }
67
        }
464
68
68
467
69
        ListColumnView {
69
        OrganicGrid {
468
70
            id: listColumnView
70
            id: organicGridView
469
71
71
470
72
            tag_id: topicTab.topicId
72
            tag_id: topicTab.topicId
471
73
            isAll: topicTab.isAll
73
            isAll: topicTab.isAll
472
74
74
473
=== removed file 'addDelegate.js'
474
--- addDelegate.js	2013-08-03 10:06:36 +0000
475
+++ addDelegate.js	1970-01-01 00:00:00 +0000
476
@@ -1,153 +0,0 @@
477
1
//var component;
478
2
//var sprite;
479
3
480
4
//var mob_component;
481
5
//var mob_sprite;
482
6
483
7
function addDelegate(rss_item, imageArray, model, index, parentItem)
484
8
{
485
9
//    console.log("add delegate start")
486
10
//    component = undefined ;
487
11
//    sprite = undefined ;
488
12
489
13
//    console.time("add delegate");
490
14
    var rand = Math.random()  ;
491
15
    rand = Math.round(rand * 100)
492
16
    var newD
493
17
    if (imageArray.length == 1)
494
18
    {
495
19
496
20
//        console.log("rand value: ", rand)
497
21
        /*else*/ if (rand < 35)
498
22
        {
499
23
            //        component = Qt.createComponent("./ArticledelegateOneImgB.qml");
500
24
            //        sprite = component.createObject(rss_item_delegate, {"rss_title": rss_title, "imageArray": imageArray});
501
25
            //        console.log("delegate BBBBB")
502
26
            newD = delegateOneImgA (rss_item, imageArray, model, index, parentItem)
503
27
        }
504
28
        else if (rand > 70)
505
29
        {
506
30
            //        component = Qt.createComponent("./ArticledelegateOneImgA.qml");
507
31
            //        sprite = component.createObject(rss_item_delegate, {"rss_title": rss_title, "imageArray": imageArray});
508
32
            //        console.log("delegate AAAAA")
509
33
            newD = delegateOneImgB (rss_item, imageArray, model, index, parentItem)
510
34
        }
511
35
        else
512
36
        {
513
37
            newD = delegateFullImg (rss_item, imageArray, model, index, parentItem)
514
38
        }
515
39
516
40
    }
517
41
    else if (imageArray.length < 1)
518
42
    {
519
43
        if (rand > 50)
520
44
        {
521
45
            newD = delegateTextA (rss_item/*, imageArray*/, model, index, parentItem) ;
522
46
        }
523
47
        else
524
48
        {
525
49
            newD = delegateTextB (rss_item/*, imageArray*/, model, index, parentItem) ;
526
50
        }
527
51
    }
528
52
    else
529
53
    {
530
54
        newD = delegateTwoImgA (rss_item, imageArray, model, index, parentItem)
531
55
    }
532
56
533
57
    return newD ;
534
58
}
535
59
536
60
function delegateOneImgA (rss_item, imageArray, model, index, parentItem)
537
61
{
538
62
    var component;
539
63
    var sprite;
540
64
    component = Qt.createComponent("./article_items/ArticleOneImgA.qml");
541
65
    sprite = component.createObject(parentItem, {"rss_item": rss_item, "imageArray": imageArray, "rss_model": model, "model_index": index});
542
66
//    console.log("delegate AAAAA")
543
67
544
68
    if (sprite == null) {
545
69
        // Error Handling
546
70
        console.log("Error creating delegate object delegateOneImgA");
547
71
        return
548
72
    }
549
73
    return sprite
550
74
}
551
75
552
76
function delegateOneImgB (rss_item, imageArray, model, index, parentItem)
553
77
{
554
78
    var component;
555
79
    var sprite;
556
80
    component = Qt.createComponent("./article_items/ArticleOneImgB.qml");
557
81
    sprite = component.createObject(parentItem, {"rss_item": rss_item, "imageArray": imageArray, "rss_model": model, "model_index": index});
558
82
//    console.log("delegate BBBBB")
559
83
560
84
    if (sprite == null) {
561
85
        // Error Handling
562
86
        console.log("Error creating delegate object delegateOneImgB");
563
87
        return
564
88
    }
565
89
    return sprite
566
90
}
567
91
568
92
function delegateTextA (rss_item, model, index, parentItem)
569
93
{
570
94
    var component;
571
95
    var sprite;
572
96
    component = Qt.createComponent("./article_items/ArticleTextA.qml");
573
97
    sprite = component.createObject(parentItem, {"rss_item": rss_item, "rss_model": model, "model_index": index});
574
98
//    console.log("delegate CCCCC")
575
99
576
100
    if (sprite == null) {
577
101
        // Error Handling
578
102
        console.log("Error creating delegate object delegateTextA");
579
103
        return
580
104
    }
581
105
    return sprite
582
106
}
583
107
584
108
function delegateTextB (rss_item, model, index, parentItem)
585
109
{
586
110
    var component;
587
111
    var sprite;
588
112
    component = Qt.createComponent("./article_items/ArticleTextB.qml");
589
113
    sprite = component.createObject(parentItem, {"rss_item": rss_item, "rss_model": model, "model_index": index});
590
114
//    console.log("delegate CCCCC")
591
115
592
116
    if (sprite == null) {
593
117
        // Error Handling
594
118
        console.log("Error creating delegate object delegateTextB");
595
119
        return
596
120
    }
597
121
    return sprite
598
122
}
599
123
600
124
function delegateFullImg (rss_item, imageArray, model, index, parentItem)
601
125
{
602
126
    var component;
603
127
    var sprite;
604
128
    component = Qt.createComponent("./article_items/ArticleFullImg.qml");
605
129
    sprite = component.createObject(parentItem, {"rss_item": rss_item, "imageArray": imageArray, "rss_model": model, "model_index": index});
606
130
//    console.log("delegate DDDDD")
607
131
608
132
    if (sprite == null) {
609
133
        // Error Handling
610
134
        console.log("Error creating delegate object delegateFullImg");
611
135
        return
612
136
    }
613
137
    return sprite
614
138
}
615
139
616
140
function delegateTwoImgA (rss_item, imageArray, model, index, parentItem)
617
141
{
618
142
    var component;
619
143
    var sprite;
620
144
    component = Qt.createComponent("./article_items/ArticleTwoImgA.qml");
621
145
    sprite = component.createObject(parentItem, {"rss_item": rss_item, "imageArray": imageArray, "rss_model": model, "model_index": index});
622
146
623
147
    if (sprite == null) {
624
148
        // Error Handling
625
149
        console.log("Error creating delegate object delegateTwoImgA");
626
150
        return
627
151
    }
628
152
    return sprite
629
153
}
630
154
0
631
=== modified file 'article_items/ArticleFullImg.qml'
632
--- article_items/ArticleFullImg.qml	2013-08-29 21:22:17 +0000
633
+++ article_items/ArticleFullImg.qml	2013-09-02 04:22:41 +0000
634
@@ -7,46 +7,56 @@
635
7
{
7
{
636
8
    id: articleFullImg
8
    id: articleFullImg
637
9
    width: units.gu(24)
9
    width: units.gu(24)
639
10
    height: units.gu(19)
10
    height: units.gu(20)
640
11
    radius: "medium"
11
    radius: "medium"
642
12
    //    anchors.fill: parent
12
    color: "#3E2930"
643
13
644
13
    property variant rss_item
14
    property variant rss_item
645
14
    property variant imageArray: []
15
    property variant imageArray: []
646
15
    property variant rss_model
16
    property variant rss_model
647
16
    property int model_index
17
    property int model_index
648
17
18
655
18
    image: Image {
19
    UbuntuShape
656
19
        id: pic
20
    {
657
20
        width: articleFullImg.width
21
        id: u_pic
658
21
//        anchors.top: articleFullImg.top
22
        width: parent.width
659
22
        fillMode: Image.PreserveAspectCrop
23
        height: pic.height > (parent.height - units.gu(1.5)) ? (parent.height - units.gu(1.5)) : pic.height
660
23
        source: imageArray[0]
24
        radius: "medium"
661
25
        image: Image {
662
26
            id: pic
663
27
            width: u_pic.width
664
28
            source: imageArray[0]
665
29
        }
666
24
    }
30
    }
667
25
31
668
26
    Rectangle
32
    Rectangle
669
27
    {
33
    {
670
28
        id: rec_label_bg
34
        id: rec_label_bg
672
29
        color: "black"
35
        color: "#3E2930"
673
30
        anchors.top: content.top
36
        anchors.top: content.top
674
31
        anchors.bottom: content.bottom
37
        anchors.bottom: content.bottom
675
32
        width: parent.width
38
        width: parent.width
677
33
        opacity: 0.7
39
        opacity: 1
678
34
    }
40
    }
679
35
41
680
36
    Column
42
    Column
681
37
    {
43
    {
682
38
        id: content
44
        id: content
683
39
        anchors.bottom: parent.bottom
45
        anchors.bottom: parent.bottom
685
40
        anchors.bottomMargin: units.gu(1)
46
        anchors.bottomMargin: units.gu(1.5)
686
41
        anchors.horizontalCenter: parent.horizontalCenter
47
        anchors.horizontalCenter: parent.horizontalCenter
689
42
        width: parent.width - units.gu(1)
48
        width: parent.width - units.gu(2)
690
43
        spacing: units.gu(1)
49
        height: parent.height / 2.3
691
50
        spacing: units.gu(0.8)
692
44
51
693
45
        Label
52
        Label
694
46
        {
53
        {
695
47
            id: label_time
54
            id: label_time
696
48
            text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
55
            text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
698
49
            fontSize: "small"
56
            fontSize: "x-small"
699
57
            width: parent.width
700
58
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
701
59
            opacity: 0.6
702
50
        }
60
        }
703
51
61
704
52
        Label
62
        Label
705
@@ -54,20 +64,23 @@
706
54
            id: label_title
64
            id: label_title
707
55
            text: rss_item.title
65
            text: rss_item.title
708
56
            width: parent.width
66
            width: parent.width
709
67
            height: parent.height - parent.spacing * 2 - label_time.paintedHeight - label_feedname.paintedHeight
710
57
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
68
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
714
58
            //            color: "white"
69
            fontSize: "small"
715
59
            fontSize: "medium"
70
            textFormat: Text.PlainText
713
60
            textFormat: Text.StyledText
716
61
            font.weight: Font.DemiBold
71
            font.weight: Font.DemiBold
717
72
            elide: Text.ElideRight
718
73
            opacity: 0.8
719
62
        }
74
        }
720
63
75
721
64
        Label
76
        Label
722
65
        {
77
        {
723
66
            id: label_feedname
78
            id: label_feedname
724
67
            text: rss_item.feed_name
79
            text: rss_item.feed_name
726
68
            fontSize: "small"
80
            fontSize: "x-small"
727
69
            width: parent.width
81
            width: parent.width
728
70
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
82
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
729
83
            opacity: 0.6
730
71
        }
84
        }
731
72
    }
85
    }
732
73
86
733
@@ -81,76 +94,3 @@
734
81
        }
94
        }
735
82
    }
95
    }
736
83
}
96
}
737
84
738
85
//Column {
739
86
//    width: units.gu(26)
740
87
//    height: units.gu(20)
741
88
//    //    anchors.fill: parent
742
89
//    property variant rss_item
743
90
//    property variant imageArray: []
744
91
//    property variant rss_model
745
92
//    property int model_index
746
93
747
94
//    //    Row
748
95
//    //    {
749
96
//    //        spacing: units.gu(1)
750
97
//    //        anchors.fill: parent
751
98
//    ////        layoutDirection: Qt.RightToLeft
752
99
753
100
//    UbuntuShape
754
101
//    {
755
102
//        id: u_pic
756
103
//        width: units.gu(24)
757
104
//        height: units.gu(17)
758
105
//        image: Image {
759
106
//            id: pic
760
107
//            width: units.gu(24)
761
108
//            fillMode: Image.PreserveAspectCrop
762
109
//            source: imageArray[0]
763
110
//        }
764
111
765
112
//        Rectangle
766
113
//        {
767
114
//            id: rec_label_bg
768
115
////            color: "black"
769
116
//            anchors.top: label_title.top
770
117
//            anchors.bottom: label_title.bottom
771
118
//            width: parent.width
772
119
//            opacity: 0.5
773
120
//        }
774
121
775
122
//        Label
776
123
//        {
777
124
//            id: label_title
778
125
//            text: rss_item.title
779
126
//            anchors.bottom: parent.bottom
780
127
//            anchors.bottomMargin: units.gu(1)
781
128
//            anchors.horizontalCenter: parent.horizontalCenter
782
129
//            width: parent.width - units.gu(1)
783
130
//            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
784
131
////            color: "white"
785
132
//            fontSize: "medium"
786
133
//            textFormat: Text.StyledText
787
134
//        }
788
135
789
136
//        MouseArea
790
137
//        {
791
138
//            anchors.fill: parent
792
139
793
140
//            onClicked:
794
141
//            {
795
142
//                mainView.toRssPage(rss_model, model_index) ;
796
143
//            }
797
144
//        }
798
145
//    }
799
146
800
147
//    Label
801
148
//    {
802
149
//        id: label_time
803
150
//        text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
804
151
////        color: "black"
805
152
//        fontSize: "medium"
806
153
//    }
807
154
808
155
//    //    }
809
156
//}
810
157
97
811
=== modified file 'article_items/ArticleOneImgA.qml'
812
--- article_items/ArticleOneImgA.qml	2013-08-29 21:22:17 +0000
813
+++ article_items/ArticleOneImgA.qml	2013-09-02 04:22:41 +0000
814
@@ -5,27 +5,27 @@
815
5
5
816
6
UbuntuShape
6
UbuntuShape
817
7
{
7
{
820
8
    width: units.gu(20)
8
    width: units.gu(18)
821
9
    height: content.height + units.gu(1.5)
9
    height: units.gu(33) /*content.height + units.gu(1.5)*/
822
10
    radius: "medium"
10
    radius: "medium"
824
11
    color: "#3D3028"
11
    color: "#5C3B42"
825
12
12
826
13
    property variant rss_item
13
    property variant rss_item
827
14
    property variant imageArray: []
14
    property variant imageArray: []
828
15
    property variant rss_model
15
    property variant rss_model
829
16
    property int model_index
16
    property int model_index
830
17
17
836
18
    Column
18
//    Column
837
19
    {
19
//    {
838
20
        id: content
20
//        id: content
839
21
        anchors{ left: parent.left; right: parent.right }
21
//        anchors{ left: parent.left; right: parent.right }
840
22
        spacing: units.gu(1)
22
//        spacing: units.gu(1)
841
23
23
842
24
        UbuntuShape
24
        UbuntuShape
843
25
        {
25
        {
844
26
            id: u_pic
26
            id: u_pic
845
27
            width: parent.width
27
            width: parent.width
847
28
            height: pic.height > units.gu(12) ? pic.height : units.gu(12)
28
            height: pic.height /*> units.gu(12) ? pic.height : units.gu(12)*/
848
29
            radius: "medium"
29
            radius: "medium"
849
30
            image: Image {
30
            image: Image {
850
31
                id: pic
31
                id: pic
851
@@ -37,41 +37,49 @@
852
37
37
853
38
        Column
38
        Column
854
39
        {
39
        {
856
40
            anchors{ left: parent.left; right: parent.right; margins: units.gu(2) }
40
            anchors {
857
41
                left: parent.left; right: parent.right;
858
42
                top: u_pic.bottom; bottom: parent.bottom
859
43
                topMargin: units.gu(2); bottomMargin: units.gu(1.5);
860
44
                leftMargin: units.gu(1); rightMargin: units.gu(1.5)
861
45
            }
862
41
            spacing: units.gu(1)
46
            spacing: units.gu(1)
863
42
47
864
43
            Label
48
            Label
865
44
            {
49
            {
866
45
                id: label_time
50
                id: label_time
867
46
                text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
51
                text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
870
47
                fontSize: "small"
52
                fontSize: "x-small"
869
48
                //            horizontalAlignment: Text.AlignRight
871
49
                width: parent.width
53
                width: parent.width
872
54
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
873
55
                opacity: 0.6
874
50
            }
56
            }
875
51
57
876
52
            Label
58
            Label
877
53
            {
59
            {
878
54
                id: label_title
60
                id: label_title
879
55
                text: rss_item.title
61
                text: rss_item.title
880
56
                //            anchors.horizontalCenter: parent.horizontalCenter
881
57
                width: parent.width
62
                width: parent.width
882
63
                height: parent.height - parent.spacing * 2 - label_time.paintedHeight - label_feedname.paintedHeight
883
58
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
64
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
885
59
                fontSize: "medium"
65
                fontSize: "small"
886
60
                textFormat: Text.PlainText
66
                textFormat: Text.PlainText
887
61
                //            horizontalAlignment: Text.AlignRight
888
62
                font.weight: Font.DemiBold
67
                font.weight: Font.DemiBold
889
68
                elide: Text.ElideRight
890
69
                opacity: 0.8
891
63
            }
70
            }
892
64
71
893
65
            Label
72
            Label
894
66
            {
73
            {
895
67
                id: label_feedname
74
                id: label_feedname
896
68
                text: rss_item.feed_name
75
                text: rss_item.feed_name
898
69
                fontSize: "small"
76
                fontSize: "x-small"
899
70
                width: parent.width
77
                width: parent.width
900
71
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
78
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
901
79
                opacity: 0.6
902
72
            }
80
            }
903
73
        }
81
        }
905
74
    }
82
//    }
906
75
83
907
76
    MouseArea
84
    MouseArea
908
77
    {
85
    {
909
@@ -83,71 +91,3 @@
910
83
        }
91
        }
911
84
    }
92
    }
912
85
}
93
}
913
86
914
87
//Column {
915
88
//    id: delegate_item
916
89
//    width: units.gu(34)
917
90
////    height: units.gu(16)
918
91
////    anchors.fill: parent
919
92
//    property variant rss_item
920
93
//    property variant imageArray: []
921
94
//    property variant rss_model
922
95
//    property int model_index
923
96
924
97
//    Row
925
98
//    {
926
99
//        id: row
927
100
//        spacing: units.gu(1)
928
101
////        anchors.fill: parent
929
102
930
103
//        Label
931
104
//        {
932
105
//            id: label_title
933
106
//            text: rss_item.title
934
107
////            anchors.horizontalCenter: parent.horizontalCenter
935
108
//            width: units.gu(14)
936
109
//            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
937
110
////            color: "black"
938
111
//            fontSize: "medium"
939
112
//            textFormat: Text.PlainText
940
113
//            horizontalAlignment: Text.AlignRight
941
114
942
115
943
116
//        }
944
117
945
118
//        UbuntuShape
946
119
//        {
947
120
//            id: u_pic
948
121
//            width: units.gu(18)
949
122
//            height: pic.height
950
123
//            image: Image {
951
124
//                id: pic
952
125
//                width: units.gu(18)
953
126
//                fillMode: Image.PreserveAspectFit
954
127
//                source: imageArray[0]
955
128
////                {
956
129
////                    if (imageArray == 0)
957
130
////                    {
958
131
////                        label_title.width = units.gu(30)
959
132
////                        label_title.fontSize = "large"
960
133
////                        return ""
961
134
////                    }
962
135
////                    else if (imageArray.length > 0)
963
136
////                        return imageArray[0]
964
137
////                }
965
138
//            }
966
139
//        }
967
140
968
141
969
142
//    }
970
143
971
144
//    Label
972
145
//    {
973
146
//        id: label_time
974
147
//        text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
975
148
////        color: "black"
976
149
//        fontSize: "medium"
977
150
//        horizontalAlignment: Text.AlignRight
978
151
//        width: parent.width
979
152
//    }
980
153
//}
981
154
94
982
=== removed file 'article_items/ArticleOneImgB.qml'
983
--- article_items/ArticleOneImgB.qml	2013-08-29 21:22:17 +0000
984
+++ article_items/ArticleOneImgB.qml	1970-01-01 00:00:00 +0000
985
@@ -1,180 +0,0 @@
986
1
import QtQuick 2.0
987
2
import Ubuntu.Components 0.1
988
3
import Ubuntu.Components.ListItems 0.1 as ListItem
989
4
import "../dateutils.js" as DateUtils
990
5
991
6
UbuntuShape
992
7
{
993
8
    width: units.gu(20)
994
9
    height: content.height + units.gu(1.5)
995
10
    radius: "medium"
996
11
    color: "#3D3028"
997
12
998
13
    property variant rss_item
999
14
    property variant imageArray: []
1000
15
    property variant rss_model
1001
16
    property int model_index
1002
17
1003
18
    Column
1004
19
    {
1005
20
        id: content
1006
21
        anchors{ left: parent.left; right: parent.right; bottom: parent.bottom }
1007
22
        spacing: units.gu(1)
1008
23
1009
24
        Column
1010
25
        {
1011
26
            anchors{ left: parent.left; right: parent.right; margins: units.gu(2) }
1012
27
            spacing: units.gu(1)
1013
28
1014
29
            Label
1015
30
            {
1016
31
                id: label_time
1017
32
                text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
1018
33
                fontSize: "small"
1019
34
                //            horizontalAlignment: Text.AlignRight
1020
35
                width: parent.width
1021
36
            }
1022
37
1023
38
            Label
1024
39
            {
1025
40
                id: label_title
1026
41
                text: rss_item.title
1027
42
                //            anchors.horizontalCenter: parent.horizontalCenter
1028
43
                width: parent.width
1029
44
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1030
45
                fontSize: "medium"
1031
46
                textFormat: Text.PlainText
1032
47
                //            horizontalAlignment: Text.AlignRight
1033
48
                font.weight: Font.DemiBold
1034
49
            }
1035
50
1036
51
            Label
1037
52
            {
1038
53
                id: label_feedname
1039
54
                text: rss_item.feed_name
1040
55
                fontSize: "small"
1041
56
                width: parent.width
1042
57
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1043
58
            }
1044
59
        }
1045
60
1046
61
        UbuntuShape
1047
62
        {
1048
63
            id: u_pic
1049
64
            width: parent.width
1050
65
            height: pic.height > units.gu(12) ? pic.height : units.gu(12)
1051
66
            radius: "medium"
1052
67
            image: Image {
1053
68
                id: pic
1054
69
                width: u_pic.width
1055
70
                fillMode: Image.PreserveAspectFit
1056
71
                source: imageArray[0]
1057
72
            }
1058
73
        }
1059
74
    }
1060
75
1061
76
    MouseArea
1062
77
    {
1063
78
        anchors.fill: parent
1064
79
1065
80
        onClicked:
1066
81
        {
1067
82
            mainView.toRssPage(rss_model, model_index) ;
1068
83
        }
1069
84
    }
1070
85
}
1071
86
1072
87
//Column {
1073
88
//    id: delegate_item
1074
89
//    width: units.gu(34)
1075
90
////    height: units.gu(16)
1076
91
////    anchors.fill: parent
1077
92
//    property variant rss_item
1078
93
//    property variant imageArray: []
1079
94
//    property variant rss_model
1080
95
//    property int model_index
1081
96
1082
97
//    Row
1083
98
//    {
1084
99
//        id: row
1085
100
//        spacing: units.gu(1)
1086
101
////        anchors.fill: parent
1087
102
////        layoutDirection: Qt.RightToLeft
1088
103
1089
104
1090
105
1091
106
//        UbuntuShape
1092
107
//        {
1093
108
//            id: u_pic
1094
109
//            width: units.gu(18)
1095
110
//            height: pic.height
1096
111
//            image: Image {
1097
112
//                id: pic
1098
113
//                width: units.gu(18)
1099
114
//                fillMode: Image.PreserveAspectFit
1100
115
//                source: imageArray[0]
1101
116
////                {
1102
117
////                    if (imageArray == 0)
1103
118
////                    {
1104
119
////                        label_title.width = units.gu(30)
1105
120
////                        label_title.fontSize = "large"
1106
121
////                        return ""
1107
122
////                    }
1108
123
////                    else if (imageArray.length > 0)
1109
124
////                        return imageArray[0]
1110
125
////                }
1111
126
//            }
1112
127
1113
128
//            MouseArea
1114
129
//            {
1115
130
//                x:0; y:0
1116
131
//                width: delegate_item.width
1117
132
//                height: delegate_item.height
1118
133
1119
134
//                onClicked:
1120
135
//                {
1121
136
//                    mainView.toRssPage(rss_model, model_index) ;
1122
137
//                }
1123
138
//            }
1124
139
//        }
1125
140
1126
141
//        Label
1127
142
//        {
1128
143
//            id: label_title
1129
144
//            text: rss_item.title
1130
145
////            anchors.horizontalCenter: parent.horizontalCenter
1131
146
//            width: units.gu(14)
1132
147
//            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1133
148
////            color: "black"
1134
149
//            fontSize: "medium"
1135
150
//            textFormat: Text.StyledText
1136
151
//        }
1137
152
1138
153
////        Image {
1139
154
////            id: pic
1140
155
////            width: units.gu(18)
1141
156
////            fillMode: Image.PreserveAspectFit
1142
157
////            source: imageArray[0]
1143
158
////            {
1144
159
////                if (imageArray == undefined)
1145
160
////                {
1146
161
////                    return ""
1147
162
////                }
1148
163
////                else if (imageArray.length > 0)
1149
164
////                    return imageArray[0]
1150
165
//////                else
1151
166
//////                    return ""
1152
167
////            }
1153
168
////            anchors.centerIn: parent
1154
169
////            anchors.verticalCenter: parent.verticalCenter
1155
170
////        }
1156
171
//    }
1157
172
1158
173
//    Label
1159
174
//    {
1160
175
//        id: label_time
1161
176
//        text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
1162
177
////        color: "black"
1163
178
//        fontSize: "medium"
1164
179
//    }
1165
180
//}
1166
181
0
1167
=== modified file 'article_items/ArticleTextA.qml'
1168
--- article_items/ArticleTextA.qml	2013-08-29 21:22:17 +0000
1169
+++ article_items/ArticleTextA.qml	2013-09-02 04:22:41 +0000
1170
@@ -5,8 +5,8 @@
1171
5
5
1172
6
UbuntuShape
6
UbuntuShape
1173
7
{
7
{
1176
8
    width: units.gu(16)
8
    width: units.gu(11)
1177
9
    height: content.height + units.gu(4)
9
    height: units.gu(20) /*content.height + units.gu(4)*/
1178
10
    color: "#32222C"
10
    color: "#32222C"
1179
11
    radius: "medium"
11
    radius: "medium"
1180
12
12
1181
@@ -18,16 +18,21 @@
1182
18
    Column
18
    Column
1183
19
    {
19
    {
1184
20
        id: content
20
        id: content
1186
21
        anchors{ left: parent.left; right: parent.right; margins: units.gu(2); verticalCenter: parent.verticalCenter }
21
//        anchors{ left: parent.left; right: parent.right; margins: units.gu(2); verticalCenter: parent.verticalCenter }
1187
22
        anchors {
1188
23
            fill: parent; topMargin: units.gu(2); bottomMargin: units.gu(1.5);
1189
24
            leftMargin: units.gu(1); rightMargin: units.gu(1.5)
1190
25
        }
1191
22
        spacing: units.gu(1)
26
        spacing: units.gu(1)
1192
23
27
1193
24
        Label
28
        Label
1194
25
        {
29
        {
1195
26
            id: label_time
30
            id: label_time
1196
27
            text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
31
            text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
1198
28
            fontSize: "small"
32
            fontSize: "x-small"
1199
29
            width: parent.width
33
            width: parent.width
1200
30
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
34
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1201
35
            opacity: 0.6
1202
31
        }
36
        }
1203
32
37
1204
33
        Label
38
        Label
1205
@@ -35,19 +40,23 @@
1206
35
            id: label_title
40
            id: label_title
1207
36
            text: rss_item.title
41
            text: rss_item.title
1208
37
            width: parent.width
42
            width: parent.width
1209
43
            height: parent.height - parent.spacing * 2 - label_time.paintedHeight - label_feedname.paintedHeight
1210
38
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
44
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1212
39
            fontSize: "medium"
45
            fontSize: "small"
1213
40
            textFormat: Text.PlainText
46
            textFormat: Text.PlainText
1214
41
            font.weight: Font.DemiBold
47
            font.weight: Font.DemiBold
1215
48
            elide: Text.ElideRight
1216
49
            opacity: 0.8
1217
42
        }
50
        }
1218
43
51
1219
44
        Label
52
        Label
1220
45
        {
53
        {
1221
46
            id: label_feedname
54
            id: label_feedname
1222
47
            text: rss_item.feed_name
55
            text: rss_item.feed_name
1224
48
            fontSize: "small"
56
            fontSize: "x-small"
1225
49
            width: parent.width
57
            width: parent.width
1226
50
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
58
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1227
59
            opacity: 0.6
1228
51
        }
60
        }
1229
52
    }
61
    }
1230
53
62
1231
@@ -62,56 +71,3 @@
1232
62
    }
71
    }
1233
63
}
72
}
1234
64
73
1235
65
//Column {
1236
66
//    width: units.gu(30)
1237
67
////    height: units.gu(15)
1238
68
////    anchors.fill: parent
1239
69
//    property variant rss_item
1240
70
//    property variant imageArray: []
1241
71
//    property variant rss_model
1242
72
//    property int model_index
1243
73
1244
74
////    Row
1245
75
////    {
1246
76
//        spacing: units.gu(1)
1247
77
////        anchors.fill: parent
1248
78
1249
79
//        Label
1250
80
//        {
1251
81
//            id: label_title
1252
82
//            text: rss_item.title
1253
83
////            anchors.horizontalCenter: parent.horizontalCenter
1254
84
//            width: units.gu(30)
1255
85
//            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1256
86
////            color: "black"
1257
87
//            fontSize: "large"
1258
88
//            textFormat: Text.PlainText
1259
89
1260
90
//            MouseArea
1261
91
//            {
1262
92
//                anchors.fill: parent
1263
93
1264
94
//                onClicked:
1265
95
//                {
1266
96
//                    mainView.toRssPage(rss_model, model_index) ;
1267
97
//                }
1268
98
//            }
1269
99
//        }
1270
100
////    }
1271
101
1272
102
//        Label
1273
103
//        {
1274
104
//            id: label_time
1275
105
//            text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
1276
106
////            color: "black"
1277
107
//            fontSize: "medium"
1278
108
//            width: parent.width
1279
109
//            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1280
110
//        }
1281
111
1282
112
//        Item
1283
113
//        {
1284
114
//            width: parent.width
1285
115
//            height: units.gu(2)
1286
116
//        }
1287
117
//}
1288
118
74
1289
=== modified file 'article_items/ArticleTextB.qml'
1290
--- article_items/ArticleTextB.qml	2013-08-29 21:22:17 +0000
1291
+++ article_items/ArticleTextB.qml	2013-09-02 04:22:41 +0000
1292
@@ -6,7 +6,7 @@
1293
6
UbuntuShape
6
UbuntuShape
1294
7
{
7
{
1295
8
    width: units.gu(18)
8
    width: units.gu(18)
1297
9
    height: content.height + units.gu(4)
9
    height: units.gu(15) /*content.height + units.gu(4)*/
1298
10
    color: "#32222C"
10
    color: "#32222C"
1299
11
    radius: "medium"
11
    radius: "medium"
1300
12
12
1301
@@ -18,17 +18,21 @@
1302
18
    Column
18
    Column
1303
19
    {
19
    {
1304
20
        id: content
20
        id: content
1306
21
        anchors{ left: parent.left; right: parent.right; margins: units.gu(2); verticalCenter: parent.verticalCenter }
21
//        anchors{ left: parent.left; right: parent.right; margins: units.gu(2); verticalCenter: parent.verticalCenter }
1307
22
        anchors {
1308
23
            fill: parent; topMargin: units.gu(2); bottomMargin: units.gu(1.5);
1309
24
            leftMargin: units.gu(1); rightMargin: units.gu(1.5)
1310
25
        }
1311
22
        spacing: units.gu(1)
26
        spacing: units.gu(1)
1312
23
27
1313
24
        Label
28
        Label
1314
25
        {
29
        {
1315
26
            id: label_time
30
            id: label_time
1316
27
            text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
31
            text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
1318
28
            fontSize: "small"
32
            fontSize: "x-small"
1319
29
            width: parent.width
33
            width: parent.width
1320
30
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
34
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1322
31
            horizontalAlignment: Text.AlignRight
35
            opacity: 0.6
1323
32
        }
36
        }
1324
33
37
1325
34
        Label
38
        Label
1326
@@ -36,21 +40,23 @@
1327
36
            id: label_title
40
            id: label_title
1328
37
            text: rss_item.title
41
            text: rss_item.title
1329
38
            width: parent.width
42
            width: parent.width
1330
43
            height: parent.height - parent.spacing * 2 - label_time.paintedHeight - label_feedname.paintedHeight
1331
39
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
44
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1333
40
            fontSize: "medium"
45
            fontSize: "small"
1334
41
            textFormat: Text.PlainText
46
            textFormat: Text.PlainText
1335
42
            font.weight: Font.DemiBold
47
            font.weight: Font.DemiBold
1337
43
            horizontalAlignment: Text.AlignRight
48
            elide: Text.ElideRight
1338
49
            opacity: 0.8
1339
44
        }
50
        }
1340
45
51
1341
46
        Label
52
        Label
1342
47
        {
53
        {
1343
48
            id: label_feedname
54
            id: label_feedname
1344
49
            text: rss_item.feed_name
55
            text: rss_item.feed_name
1346
50
            fontSize: "small"
56
            fontSize: "x-small"
1347
51
            width: parent.width
57
            width: parent.width
1348
52
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
58
            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1350
53
            horizontalAlignment: Text.AlignRight
59
            opacity: 0.6
1351
54
        }
60
        }
1352
55
    }
61
    }
1353
56
62
1354
@@ -64,58 +70,3 @@
1355
64
        }
70
        }
1356
65
    }
71
    }
1357
66
}
72
}
1358
67
//Column {
1359
68
//    width: units.gu(30)
1360
69
////    height: units.gu(15)
1361
70
////    anchors.fill: parent
1362
71
//    property variant rss_item
1363
72
//    property variant imageArray: []
1364
73
//    property variant rss_model
1365
74
//    property int model_index
1366
75
1367
76
////    Row
1368
77
////    {
1369
78
//        spacing: units.gu(1)
1370
79
////        anchors.fill: parent
1371
80
1372
81
//        Label
1373
82
//        {
1374
83
//            id: label_title
1375
84
//            text: rss_item.title
1376
85
////            anchors.horizontalCenter: parent.horizontalCenter
1377
86
//            width: units.gu(30)
1378
87
//            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1379
88
////            color: "black"
1380
89
//            fontSize: "large"
1381
90
//            textFormat: Text.PlainText
1382
91
//            horizontalAlignment: Text.AlignRight
1383
92
1384
93
//            MouseArea
1385
94
//            {
1386
95
//                anchors.fill: parent
1387
96
1388
97
//                onClicked:
1389
98
//                {
1390
99
//                    mainView.toRssPage(rss_model, model_index) ;
1391
100
//                }
1392
101
//            }
1393
102
//        }
1394
103
////    }
1395
104
1396
105
//        Label
1397
106
//        {
1398
107
//            id: label_time
1399
108
//            text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
1400
109
////            color: "black"
1401
110
//            fontSize: "medium"
1402
111
//            horizontalAlignment: Text.AlignRight
1403
112
//            width: parent.width
1404
113
//            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1405
114
//        }
1406
115
1407
116
//        Item
1408
117
//        {
1409
118
//            width: parent.width
1410
119
//            height: units.gu(2)
1411
120
//        }
1412
121
//}
1413
122
73
1414
=== removed file 'article_items/ArticleTwoImgA.qml'
1415
--- article_items/ArticleTwoImgA.qml	2013-08-29 21:22:17 +0000
1416
+++ article_items/ArticleTwoImgA.qml	1970-01-01 00:00:00 +0000
1417
@@ -1,256 +0,0 @@
1418
1
import QtQuick 2.0
1419
2
import Ubuntu.Components 0.1
1420
3
import Ubuntu.Components.ListItems 0.1 as ListItem
1421
4
import "../dateutils.js" as DateUtils
1422
5
1423
6
UbuntuShape
1424
7
{
1425
8
    width: units.gu(24)
1426
9
    height: content.height + units.gu(1.5)
1427
10
    radius: "medium"
1428
11
    color: "#3D3028"
1429
12
1430
13
    property variant rss_item
1431
14
    property variant imageArray: []
1432
15
    property variant rss_model
1433
16
    property int model_index
1434
17
1435
18
    Column
1436
19
    {
1437
20
        id: content
1438
21
        anchors{ left: parent.left; right: parent.right }
1439
22
        spacing: units.gu(1)
1440
23
1441
24
        Row
1442
25
        {
1443
26
//            anchors{ left: parent.left; right: parent.right }
1444
27
            height: u_pic.height > u_pic1.height ? u_pic.height : u_pic1.height
1445
28
1446
29
            UbuntuShape
1447
30
            {
1448
31
                id: u_pic
1449
32
                width: content.width / 2
1450
33
                height: pic.height > units.gu(8) ? pic.height : units.gu(8)
1451
34
                radius: "medium"
1452
35
                image: Image {
1453
36
                    id: pic
1454
37
                    width: u_pic.width
1455
38
                    fillMode: Image.PreserveAspectFit
1456
39
                    source: imageArray[0]
1457
40
                }
1458
41
            }
1459
42
1460
43
            UbuntuShape
1461
44
            {
1462
45
                id: u_pic1
1463
46
                width: content.width / 2
1464
47
                height: pic1.height > units.gu(8) ? pic1.height : units.gu(8)
1465
48
                radius: "medium"
1466
49
                image: Image {
1467
50
                    id: pic1
1468
51
                    width: u_pic1.width
1469
52
                    fillMode: Image.PreserveAspectFit
1470
53
                    source: imageArray[1]
1471
54
                }
1472
55
            }
1473
56
        }
1474
57
1475
58
        Column
1476
59
        {
1477
60
            anchors{ left: parent.left; right: parent.right; margins: units.gu(2) }
1478
61
            spacing: units.gu(1)
1479
62
1480
63
            Label
1481
64
            {
1482
65
                id: label_time
1483
66
                text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
1484
67
                fontSize: "small"
1485
68
                //            horizontalAlignment: Text.AlignRight
1486
69
                width: parent.width
1487
70
            }
1488
71
1489
72
            Label
1490
73
            {
1491
74
                id: label_title
1492
75
                text: rss_item.title
1493
76
                //            anchors.horizontalCenter: parent.horizontalCenter
1494
77
                width: parent.width
1495
78
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1496
79
                fontSize: "medium"
1497
80
                textFormat: Text.PlainText
1498
81
                //            horizontalAlignment: Text.AlignRight
1499
82
                font.weight: Font.DemiBold
1500
83
            }
1501
84
1502
85
            Label
1503
86
            {
1504
87
                id: label_feedname
1505
88
                text: rss_item.feed_name
1506
89
                fontSize: "small"
1507
90
                width: parent.width
1508
91
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1509
92
            }
1510
93
        }
1511
94
    }
1512
95
1513
96
    MouseArea
1514
97
    {
1515
98
        anchors.fill: parent
1516
99
1517
100
        onClicked:
1518
101
        {
1519
102
            mainView.toRssPage(rss_model, model_index) ;
1520
103
        }
1521
104
    }
1522
105
}
1523
106
1524
107
//Column {
1525
108
//    id: delegate_item
1526
109
//    width: units.gu(34)
1527
110
////    height: units.gu(16)
1528
111
////    anchors.fill: parent
1529
112
//    property variant rss_item
1530
113
//    property variant imageArray: []
1531
114
//    property variant rss_model
1532
115
//    property int model_index
1533
116
1534
117
//    Row
1535
118
//    {
1536
119
//        id: row
1537
120
//        spacing: units.gu(1)
1538
121
////        anchors.fill: parent
1539
122
1540
123
//        Label
1541
124
//        {
1542
125
//            id: label_title
1543
126
//            text: rss_item.title
1544
127
////            anchors.horizontalCenter: parent.horizontalCenter
1545
128
//            width: units.gu(14)
1546
129
//            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1547
130
////            color: "black"
1548
131
//            fontSize: "medium"
1549
132
//            textFormat: Text.PlainText
1550
133
//            horizontalAlignment: Text.AlignRight
1551
134
1552
135
1553
136
//        }
1554
137
1555
138
//        UbuntuShape
1556
139
//        {
1557
140
//            id: u_pic
1558
141
//            width: units.gu(18)
1559
142
//            height: pic.height
1560
143
//            image: Image {
1561
144
//                id: pic
1562
145
//                width: units.gu(18)
1563
146
//                fillMode: Image.PreserveAspectFit
1564
147
//                source: imageArray[0]
1565
148
////                {
1566
149
////                    if (imageArray == 0)
1567
150
////                    {
1568
151
////                        label_title.width = units.gu(30)
1569
152
////                        label_title.fontSize = "large"
1570
153
////                        return ""
1571
154
////                    }
1572
155
////                    else if (imageArray.length > 0)
1573
156
////                        return imageArray[0]
1574
157
////                }
1575
158
//            }
1576
159
//        }
1577
160
1578
161
1579
162
//    }
1580
163
1581
164
//    Label
1582
165
//    {
1583
166
//        id: label_time
1584
167
//        text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
1585
168
////        color: "black"
1586
169
//        fontSize: "medium"
1587
170
//        horizontalAlignment: Text.AlignRight
1588
171
//        width: parent.width
1589
172
//    }
1590
173
//}
1591
174
1592
175
1593
176
//Column {
1594
177
//    id: delegate_item
1595
178
//    width: units.gu(34)
1596
179
////    height: units.gu(30)
1597
180
////    anchors.fill: parent
1598
181
//    property variant rss_item
1599
182
//    property variant imageArray: []
1600
183
//    property variant rss_model
1601
184
//    property int model_index
1602
185
1603
186
//    Row
1604
187
//    {
1605
188
//        id: row
1606
189
//        spacing: units.gu(1)
1607
190
////        anchors.fill: parent
1608
191
1609
192
//        Label
1610
193
//        {
1611
194
//            id: label_title
1612
195
//            text: rss_item.title
1613
196
////            anchors.horizontalCenter: parent.horizontalCenter
1614
197
//            width: units.gu(14)
1615
198
//            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
1616
199
////            color: "black"
1617
200
//            fontSize: "medium"
1618
201
//            textFormat: Text.PlainText
1619
202
1620
203
//            MouseArea
1621
204
//            {
1622
205
//                x:0; y:0
1623
206
//                width: delegate_item.width
1624
207
//                height: delegate_item.height
1625
208
1626
209
//                onClicked:
1627
210
//                {
1628
211
//                    mainView.toRssPage(rss_model, model_index) ;
1629
212
//                }
1630
213
//            }
1631
214
//        }
1632
215
1633
216
//        Column
1634
217
//        {
1635
218
//            spacing: units.gu(1)
1636
219
1637
220
//            UbuntuShape
1638
221
//            {
1639
222
//                id: u_pic0
1640
223
//                width: units.gu(15)
1641
224
//                height: pic0.height
1642
225
//                image: Image {
1643
226
//                    id: pic0
1644
227
//                    width: units.gu(15)
1645
228
//                    fillMode: Image.PreserveAspectFit
1646
229
//                    source: imageArray[0]
1647
230
//                }
1648
231
//            }
1649
232
1650
233
//            UbuntuShape
1651
234
//            {
1652
235
//                id: u_pic1
1653
236
//                width: units.gu(15)
1654
237
//                height: pic1.height
1655
238
//                image: Image {
1656
239
//                    id: pic1
1657
240
//                    width: units.gu(15)
1658
241
//                    fillMode: Image.PreserveAspectFit
1659
242
//                    source: imageArray[1]
1660
243
//                }
1661
244
//            }
1662
245
//        }
1663
246
1664
247
//    }
1665
248
1666
249
//    Label
1667
250
//    {
1668
251
//        id: label_time
1669
252
//        text: DateUtils.formatRelativeTime(i18n, rss_item.pubdate)
1670
253
////        color: "black"
1671
254
//        fontSize: "medium"
1672
255
//    }
1673
256
//}
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-09-03
Roman Shchekin		2013-09-02	Approve on 2013-09-03
Review via email: mp+183377@code.launchpad.net