1
=== modified file 'src/app/webbrowser/Browser.qml'
2
--- src/app/webbrowser/Browser.qml	2015-11-03 11:56:01 +0000
3
+++ src/app/webbrowser/Browser.qml	2015-11-08 23:11:15 +0000
4
@@ -62,14 +62,11 @@
5
62
        target: tabsModel
62
        target: tabsModel
6
63
        onCurrentIndexChanged: {
63
        onCurrentIndexChanged: {
7
64
            // Remove focus from the address bar when the current tab
64
            // Remove focus from the address bar when the current tab
9
65
            // changes to ensure that its contents are updated.
65
            // changes to ensure that its contents are updated...
10
66
            tabContainer.forceActiveFocus()
66
            tabContainer.forceActiveFocus()
17
67
67
            // ...then give focus to the either the tab or the address bar
18
68
            // In narrow mode, the tabslist is a stack:
68
            // depending if we are on a new tab view or on a page
19
69
            // the current tab is always at the top.
69
            internal.resetFocus()
14
70
            if (!browser.wide) {
15
71
                tabsModel.move(tabsModel.currentIndex, 0)
16
72
            }
20
73
        }
70
        }
21
74
    }
71
    }
22
75
72
23
@@ -711,9 +708,6 @@
24
711
    onWideChanged: {
708
    onWideChanged: {
25
712
        if (wide) {
709
        if (wide) {
26
713
            recentView.reset()
710
            recentView.reset()
27
714
        } else {
28
715
            // In narrow mode, the tabslist is a stack: the current tab is always at the top.
29
716
            tabsModel.move(tabsModel.currentIndex, 0)
30
717
        }
711
        }
31
718
    }
712
    }
32
719
713
33
@@ -946,6 +940,7 @@
34
946
940
35
947
    TabsModel {
941
    TabsModel {
36
948
        id: publicTabsModel
942
        id: publicTabsModel
37
943
        behaveAsStack: !browser.wide
38
949
    }
944
    }
39
950
945
40
951
    Loader {
946
    Loader {
41
@@ -957,6 +952,7 @@
42
957
            id: privateTabsModelComponent
952
            id: privateTabsModelComponent
43
958
953
44
959
            TabsModel {
954
            TabsModel {
45
955
                behaveAsStack: !browser.wide
46
960
                Component.onDestruction: {
956
                Component.onDestruction: {
47
961
                    while (count > 0) {
957
                    while (count > 0) {
48
962
                        var tab = remove(count - 1)
958
                        var tab = remove(count - 1)
49
@@ -1485,7 +1481,7 @@
50
1485
                        internal.addTab(tab, i == 0)
1481
                        internal.addTab(tab, i == 0)
51
1486
                    }
1482
                    }
52
1487
                }
1483
                }
54
1488
                if ('currentIndex' in state) {
1484
                if ('currentIndex' in state && publicTabsModel.validIndex(state.currentIndex)) {
55
1489
                    publicTabsModel.currentIndex = state.currentIndex
1485
                    publicTabsModel.currentIndex = state.currentIndex
56
1490
                }
1486
                }
57
1491
            }
1487
            }
58
1492
1488
59
=== modified file 'src/app/webbrowser/CMakeLists.txt'
60
--- src/app/webbrowser/CMakeLists.txt	2015-10-18 19:21:48 +0000
61
+++ src/app/webbrowser/CMakeLists.txt	2015-11-08 23:11:15 +0000
62
@@ -21,7 +21,6 @@
63
21
    history-model.cpp
21
    history-model.cpp
64
22
    history-timeframe-model.cpp
22
    history-timeframe-model.cpp
65
23
    limit-proxy-model.cpp
23
    limit-proxy-model.cpp
66
24
    tabs-model.cpp
67
25
    text-search-filter-model.cpp
24
    text-search-filter-model.cpp
68
26
    top-sites-model.cpp
25
    top-sites-model.cpp
69
27
)
26
)
70
28
27
71
=== modified file 'src/app/webbrowser/TabsBar.qml'
72
--- src/app/webbrowser/TabsBar.qml	2015-09-24 14:07:47 +0000
73
+++ src/app/webbrowser/TabsBar.qml	2015-11-08 23:11:15 +0000
74
@@ -24,7 +24,7 @@
75
24
Item {
24
Item {
76
25
    id: root
25
    id: root
77
26
26
79
27
    property alias model: repeater.model
27
    property var model
80
28
28
81
29
    property real minTabWidth: 0 //units.gu(6)
29
    property real minTabWidth: 0 //units.gu(6)
82
30
    property real maxTabWidth: units.gu(20)
30
    property real maxTabWidth: units.gu(20)
83
@@ -88,7 +88,7 @@
84
88
                Action {
88
                Action {
85
89
                    objectName: "tab_action_reload"
89
                    objectName: "tab_action_reload"
86
90
                    text: i18n.tr("Reload")
90
                    text: i18n.tr("Reload")
88
91
                    enabled: menu.tab.url.toString().length > 0
91
                    enabled: menu.tab && menu.tab.url.toString().length > 0
89
92
                    onTriggered: menu.tab.reload()
92
                    onTriggered: menu.tab.reload()
90
93
                }
93
                }
91
94
                Action {
94
                Action {
92
@@ -118,6 +118,7 @@
93
118
118
94
119
            property bool reordering: false
119
            property bool reordering: false
95
120
120
96
121
            model: root.model.listModel
97
121
            delegate: MouseArea {
122
            delegate: MouseArea {
98
122
                id: tabDelegate
123
                id: tabDelegate
99
123
                objectName: "tabDelegate"
124
                objectName: "tabDelegate"
100
@@ -145,8 +146,8 @@
101
145
                    active: tabIndex === root.model.currentIndex
146
                    active: tabIndex === root.model.currentIndex
102
146
                    hoverable: true
147
                    hoverable: true
103
147
                    incognito: root.incognito
148
                    incognito: root.incognito
106
148
                    title: model.title ? model.title : (model.url.toString() ? model.url : i18n.tr("New tab"))
149
                    title: model.tab.title ? model.tab.title : (model.tab.url.toString() ? model.tab.url : i18n.tr("New tab"))
107
149
                    icon: model.icon
150
                    icon: model.tab.icon
108
150
151
109
151
                    rightMargin: tabDelegate.rightMargin
152
                    rightMargin: tabDelegate.rightMargin
110
152
153
111
@@ -171,9 +172,9 @@
112
171
                onXChanged: {
172
                onXChanged: {
113
172
                    if (!dragging) return
173
                    if (!dragging) return
114
173
                    if (x < (index * width - width / 2)) {
174
                    if (x < (index * width - width / 2)) {
116
174
                        root.model.move(index, index - 1)
175
                        root.model.move(index, index - 1, 1)
117
175
                    } else if ((x > (index * width + width / 2)) && (index < (root.model.count - 1))) {
176
                    } else if ((x > (index * width + width / 2)) && (index < (root.model.count - 1))) {
119
176
                        root.model.move(index + 1, index)
177
                        root.model.move(index + 1, index, 1)
120
177
                    }
178
                    }
121
178
                }
179
                }
122
179
180
123
180
181
124
=== modified file 'src/app/webbrowser/TabsList.qml'
125
--- src/app/webbrowser/TabsList.qml	2015-09-04 17:48:37 +0000
126
+++ src/app/webbrowser/TabsList.qml	2015-11-08 23:11:15 +0000
127
@@ -24,7 +24,7 @@
128
24
24
129
25
    property real delegateHeight
25
    property real delegateHeight
130
26
    property real chromeOffset
26
    property real chromeOffset
132
27
    property alias model: repeater.model
27
    property var model
133
28
    readonly property int count: repeater.count
28
    readonly property int count: repeater.count
134
29
    property bool incognito
29
    property bool incognito
135
30
30
136
@@ -62,6 +62,7 @@
137
62
        Repeater {
62
        Repeater {
138
63
            id: repeater
63
            id: repeater
139
64
64
140
65
            model: tabslist.model.listModel
141
65
            delegate: Loader {
66
            delegate: Loader {
142
66
                id: delegate
67
                id: delegate
143
67
68
144
@@ -91,8 +92,8 @@
145
91
                    }
92
                    }
146
92
                }
93
                }
147
93
94
150
94
                readonly property string title: model.title ? model.title : (model.url.toString() ? model.url : i18n.tr("New tab"))
95
                readonly property string title: model.tab.title ? model.tab.title : (model.tab.url.toString() ? model.tab.url : i18n.tr("New tab"))
151
95
                readonly property string icon: model.icon
96
                readonly property string icon: model.tab.icon
152
96
97
153
97
                readonly property bool needsInstance: (index >= 0) && ((flickable.contentY + flickable.height + delegateHeight / 2) >= (index * delegateHeight))
98
                readonly property bool needsInstance: (index >= 0) && ((flickable.contentY + flickable.height + delegateHeight / 2) >= (index * delegateHeight))
154
98
                sourceComponent: needsInstance ? tabPreviewComponent : undefined
99
                sourceComponent: needsInstance ? tabPreviewComponent : undefined
155
@@ -103,13 +104,14 @@
156
103
                    id: tabPreviewComponent
104
                    id: tabPreviewComponent
157
104
105
158
105
                    TabPreview {
106
                    TabPreview {
159
107
                        id: preview
160
106
                        title: delegate.title
108
                        title: delegate.title
161
107
                        icon: delegate.icon
109
                        icon: delegate.icon
162
108
                        incognito: tabslist.incognito
110
                        incognito: tabslist.incognito
163
109
                        tab: model.tab
111
                        tab: model.tab
164
110
                        chromeHeight: firstItemChromeBackground.height
112
                        chromeHeight: firstItemChromeBackground.height
165
111
                        showContent: (index > 0) || (delegate.y > flickable.contentY) ||
113
                        showContent: (index > 0) || (delegate.y > flickable.contentY) ||
167
112
                                     !(tab.webview && tab.webview.visible)
114
                                     !(preview.tab.webview && preview.tab.webview.visible)
168
113
115
169
114
                        onSelected: tabslist.selectAndAnimateTab(index)
116
                        onSelected: tabslist.selectAndAnimateTab(index)
170
115
                        onClosed: tabslist.tabClosed(index)
117
                        onClosed: tabslist.tabClosed(index)
171
116
118
172
=== added file 'src/app/webbrowser/TabsModel.qml'
173
--- src/app/webbrowser/TabsModel.qml	1970-01-01 00:00:00 +0000
174
+++ src/app/webbrowser/TabsModel.qml	2015-11-08 23:11:15 +0000
175
@@ -0,0 +1,137 @@
176
1
/*
177
2
 * Copyright 2015 Canonical Ltd.
178
3
 *
179
4
 * This file is part of webbrowser-app.
180
5
 *
181
6
 * webbrowser-app is free software; you can redistribute it and/or modify
182
7
 * it under the terms of the GNU General Public License as published by
183
8
 * the Free Software Foundation; version 3.
184
9
 *
185
10
 * webbrowser-app is distributed in the hope that it will be useful,
186
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
187
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
188
13
 * GNU General Public License for more details.
189
14
 *
190
15
 * You should have received a copy of the GNU General Public License
191
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
192
17
 */
193
18
194
19
import QtQuick 2.4
195
20
196
21
QtObject {
197
22
    property int currentIndex: -1
198
23
    property var currentTab: null
199
24
    property bool behaveAsStack: false
200
25
    property alias count: tabs.count
201
26
202
27
    // Expose the ListModel through a property instead of inheriting directly
203
28
    // from it due to a bug in QML that does not allow calling base class
204
29
    // methods: https://bugreports.qt.io/browse/QTBUG-25942
205
30
    // This allows us to create our own methods that implement the required
206
31
    // semantics (such as correctly tracking and updating currentIndex and
207
32
    // currentTab) at the price of the minor inconvenience of having to access
208
33
    // TabsModel.listModel when wanting to use it as model for a view.
209
34
    property ListModel listModel: ListModel {
210
35
        id: tabs
211
36
212
37
        function updateCurrentTab() {
213
38
            var newCurrentTab = null
214
39
            if (validIndex(currentIndex)) {
215
40
                if (behaveAsStack) {
216
41
                    tabs.move(currentIndex, 0, 1)
217
42
                    currentIndex = 0
218
43
                }
219
44
                newCurrentTab = tabs.get(currentIndex).tab
220
45
            }
221
46
            if (newCurrentTab != currentTab) {
222
47
                currentTab = newCurrentTab
223
48
            }
224
49
        }
225
50
    }
226
51
227
52
    onCurrentIndexChanged: {
228
53
        // Clamp the model index to valid values. -1 is a valid value only
229
54
        // if the model is empty.
230
55
        currentIndex = Math.max((tabs.count === 0) ? -1 : 0,
231
56
                                Math.min(currentIndex, tabs.count - 1))
232
57
        tabs.updateCurrentTab()
233
58
    }
234
59
    onBehaveAsStackChanged: if (behaveAsStack) tabs.updateCurrentTab()
235
60
236
61
    function validIndex(index) { return index >= 0 && index < tabs.count }
237
62
238
63
    function add(tab) { return insert(tab, tabs.count) }
239
64
240
65
    function insert(tab, index) {
241
66
        if (tab) {
242
67
            if (index === undefined) index = tabs.count
243
68
            else if (index < 0 || index > tabs.count) {
244
69
                console.warn("Invalid insert index:", index)
245
70
                return
246
71
            }
247
72
            tabs.insert(index, {tab: tab})
248
73
            if (currentIndex == -1) {
249
74
                // if the current index was -1 then the model must have been
250
75
                // empty, and the first item added to an empty model always
251
76
                // becomes the new current item
252
77
                currentIndex = 0
253
78
                tabs.updateCurrentTab()
254
79
            } else if (currentIndex == tabs.count - 1) {
255
80
                // index was set out of range, but adding the new item made it
256
81
                // valid, so we need to update the current item
257
82
                tabs.updateCurrentTab()
258
83
            } else if (index <= currentIndex) {
259
84
                if (validIndex(currentIndex)) {
260
85
                    // Increment the index if we are inserting items before the
261
86
                    // current index, and the current index has not been set to
262
87
                    // a position past the end of the list.
263
88
                    currentIndex++
264
89
                }
265
90
            }
266
91
            return index
267
92
        } else {
268
93
            console.warn("Invalid Tab:", tab)
269
94
            return -1
270
95
        }
271
96
    }
272
97
273
98
    function remove(index) {
274
99
        if (!validIndex(index)) return null
275
100
        var tab = tabs.get(index).tab
276
101
        tabs.remove(index)
277
102
278
103
        if (index < currentIndex) {
279
104
            // if we removed the current index and it is the last item OR
280
105
            // if we removed any item before the current index,
281
106
            // then decrement the current index
282
107
            --currentIndex
283
108
        } else if (index === currentIndex) {
284
109
            // If the current tab was removed, the following one (if any) is made
285
110
            // current. If it was the last tab in the model, the current index needs
286
111
            // to be decreased.
287
112
            if (index === tabs.count) --currentIndex
288
113
            else tabs.updateCurrentTab()
289
114
        }
290
115
291
116
        return tab
292
117
    }
293
118
294
119
    function get(index) {
295
120
        return validIndex(index) ? tabs.get(index).tab : null
296
121
    }
297
122
298
123
    function move(from, to)
299
124
    {
300
125
        if (from == to || !validIndex(from) || !validIndex(to)) {
301
126
            return
302
127
        }
303
128
        tabs.move(from, to, 1)
304
129
        if (currentIndex == from) {
305
130
            currentIndex = to
306
131
        } else if (currentIndex >= to && currentIndex < from) {
307
132
            currentIndex++
308
133
        } else if (currentIndex > from && currentIndex <= to) {
309
134
            currentIndex--
310
135
        }
311
136
    }
312
137
}
313
0
138
314
=== removed file 'src/app/webbrowser/tabs-model.cpp'
315
--- src/app/webbrowser/tabs-model.cpp	2015-09-23 16:50:21 +0000
316
+++ src/app/webbrowser/tabs-model.cpp	1970-01-01 00:00:00 +0000
317
@@ -1,254 +0,0 @@
318
1
/*
319
2
 * Copyright 2013-2015 Canonical Ltd.
320
3
 *
321
4
 * This file is part of webbrowser-app.
322
5
 *
323
6
 * webbrowser-app is free software; you can redistribute it and/or modify
324
7
 * it under the terms of the GNU General Public License as published by
325
8
 * the Free Software Foundation; version 3.
326
9
 *
327
10
 * webbrowser-app is distributed in the hope that it will be useful,
328
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
329
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
330
13
 * GNU General Public License for more details.
331
14
 *
332
15
 * You should have received a copy of the GNU General Public License
333
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
334
17
 */
335
18
336
19
#include "tabs-model.h"
337
20
338
21
// Qt
339
22
#include <QtCore/QDebug>
340
23
#include <QtCore/QObject>
341
24
#include <QtCore/QtGlobal>
342
25
343
26
/*!
344
27
    \class TabsModel
345
28
    \brief List model that stores the list of currently open tabs.
346
29
347
30
    TabsModel is a list model that stores the list of currently open tabs.
348
31
    Each tab holds a pointer to a Tab and associated metadata (URL, title,
349
32
    icon).
350
33
351
34
    The model doesn’t own the Tab, so it is the responsibility of whoever
352
35
    adds a tab to instantiate the corresponding Tab, and to destroy it after
353
36
    it’s removed from the model.
354
37
*/
355
38
TabsModel::TabsModel(QObject* parent)
356
39
    : QAbstractListModel(parent)
357
40
    , m_currentIndex(-1)
358
41
{
359
42
}
360
43
361
44
TabsModel::~TabsModel()
362
45
{
363
46
}
364
47
365
48
QHash<int, QByteArray> TabsModel::roleNames() const
366
49
{
367
50
    static QHash<int, QByteArray> roles;
368
51
    if (roles.isEmpty()) {
369
52
        roles[Url] = "url";
370
53
        roles[Title] = "title";
371
54
        roles[Icon] = "icon";
372
55
        roles[Tab] = "tab";
373
56
    }
374
57
    return roles;
375
58
}
376
59
377
60
int TabsModel::rowCount(const QModelIndex& parent) const
378
61
{
379
62
    Q_UNUSED(parent);
380
63
    return m_tabs.count();
381
64
}
382
65
383
66
QVariant TabsModel::data(const QModelIndex& index, int role) const
384
67
{
385
68
    if (!index.isValid()) {
386
69
        return QVariant();
387
70
    }
388
71
    QObject* tab = m_tabs.at(index.row());
389
72
    switch (role) {
390
73
    case Url:
391
74
        return tab->property("url");
392
75
    case Title:
393
76
        return tab->property("title");
394
77
    case Icon:
395
78
        return tab->property("icon");
396
79
    case Tab:
397
80
        return QVariant::fromValue(tab);
398
81
    default:
399
82
        return QVariant();
400
83
    }
401
84
}
402
85
403
86
int TabsModel::currentIndex() const
404
87
{
405
88
    return m_currentIndex;
406
89
}
407
90
408
91
void TabsModel::setCurrentIndex(int index)
409
92
{
410
93
    if (!checkValidTabIndex(index)) {
411
94
        return;
412
95
    }
413
96
    if (index != m_currentIndex) {
414
97
        m_currentIndex = index;
415
98
        Q_EMIT currentIndexChanged();
416
99
        Q_EMIT currentTabChanged();
417
100
    }
418
101
}
419
102
420
103
QObject* TabsModel::currentTab() const
421
104
{
422
105
    if (m_tabs.isEmpty() || !checkValidTabIndex(m_currentIndex)) {
423
106
        return nullptr;
424
107
    }
425
108
    return m_tabs.at(m_currentIndex);
426
109
}
427
110
428
111
/*!
429
112
    Append a tab to the model and return the corresponding index in the model.
430
113
431
114
    It is the responsibility of the caller to instantiate the corresponding
432
115
    Tab beforehand.
433
116
*/
434
117
int TabsModel::add(QObject* tab)
435
118
{
436
119
    return insert(tab, m_tabs.count());
437
120
}
438
121
439
122
/*!
440
123
    Add a tab to the model at the specified index, and return the index itself,
441
124
    or -1 if the operation failed.
442
125
443
126
    It is the responsibility of the caller to instantiate the corresponding
444
127
    Tab beforehand.
445
128
*/
446
129
int TabsModel::insert(QObject* tab, int index)
447
130
{
448
131
    if (tab == nullptr) {
449
132
        qWarning() << "Invalid Tab";
450
133
        return -1;
451
134
    }
452
135
    index = qMax(qMin(index, m_tabs.count()), 0);
453
136
    beginInsertRows(QModelIndex(), index, index);
454
137
    m_tabs.insert(index, tab);
455
138
    connect(tab, SIGNAL(urlChanged()), SLOT(onUrlChanged()));
456
139
    connect(tab, SIGNAL(titleChanged()), SLOT(onTitleChanged()));
457
140
    connect(tab, SIGNAL(iconChanged()), SLOT(onIconChanged()));
458
141
    endInsertRows();
459
142
    Q_EMIT countChanged();
460
143
461
144
    if (m_currentIndex == -1) {
462
145
        // Set the index to zero if this is the first item that gets added to the
463
146
        // model, as it should not be possible to have items in the model but no
464
147
        // current tab.
465
148
        m_currentIndex = 0;
466
149
        Q_EMIT currentIndexChanged();
467
150
        Q_EMIT currentTabChanged();
468
151
    } else if (index <= m_currentIndex) {
469
152
        // Increment the index if we are inserting items before the current index.
470
153
        m_currentIndex++;
471
154
        Q_EMIT currentIndexChanged();
472
155
    }
473
156
474
157
    return index;
475
158
}
476
159
477
160
/*!
478
161
    Given its index, remove a tab from the model, and return the corresponding
479
162
    Tab.
480
163
481
164
    It is the responsibility of the caller to destroy the corresponding
482
165
    Tab afterwards.
483
166
*/
484
167
QObject* TabsModel::remove(int index)
485
168
{
486
169
    if (!checkValidTabIndex(index)) {
487
170
        return nullptr;
488
171
    }
489
172
    beginRemoveRows(QModelIndex(), index, index);
490
173
    QObject* tab = m_tabs.takeAt(index);
491
174
    tab->disconnect(this);
492
175
    endRemoveRows();
493
176
    Q_EMIT countChanged();
494
177
495
178
    if (index < m_currentIndex) {
496
179
        // If we removed any tab before the current one, decrease the
497
180
        // current index to match.
498
181
        m_currentIndex--;
499
182
        Q_EMIT currentIndexChanged();
500
183
    } else if (index == m_currentIndex) {
501
184
        // If the current tab was removed, the following one (if any) is made
502
185
        // current. If it was the last tab in the model, the current index needs
503
186
        // to be decreased.
504
187
        if (m_currentIndex == m_tabs.count()) {
505
188
            m_currentIndex--;
506
189
            Q_EMIT currentIndexChanged();
507
190
        }
508
191
        Q_EMIT currentTabChanged();
509
192
    }
510
193
    return tab;
511
194
}
512
195
513
196
QObject* TabsModel::get(int index) const
514
197
{
515
198
    if (!checkValidTabIndex(index)) {
516
199
        return nullptr;
517
200
    }
518
201
    return m_tabs.at(index);
519
202
}
520
203
521
204
void TabsModel::move(int from, int to)
522
205
{
523
206
    if ((from == to) || !checkValidTabIndex(from) || !checkValidTabIndex(to)) {
524
207
        return;
525
208
    }
526
209
    beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
527
210
    m_tabs.move(from, to);
528
211
    endMoveRows();
529
212
    if (m_currentIndex == from) {
530
213
        m_currentIndex = to;
531
214
        Q_EMIT currentIndexChanged();
532
215
    } else if ((m_currentIndex >= to) && (m_currentIndex < from)) {
533
216
        m_currentIndex++;
534
217
        Q_EMIT currentIndexChanged();
535
218
    } else if ((m_currentIndex > from) && (m_currentIndex <= to)) {
536
219
        m_currentIndex--;
537
220
        Q_EMIT currentIndexChanged();
538
221
    }
539
222
}
540
223
541
224
bool TabsModel::checkValidTabIndex(int index) const
542
225
{
543
226
    if ((index < 0) || (index >= m_tabs.count())) {
544
227
        qWarning() << "Invalid tab index:" << index;
545
228
        return false;
546
229
    }
547
230
    return true;
548
231
}
549
232
550
233
void TabsModel::onDataChanged(QObject* tab, int role)
551
234
{
552
235
    int index = m_tabs.indexOf(tab);
553
236
    if (checkValidTabIndex(index)) {
554
237
        Q_EMIT dataChanged(this->index(index, 0), this->index(index, 0), QVector<int>() << role);
555
238
    }
556
239
}
557
240
558
241
void TabsModel::onUrlChanged()
559
242
{
560
243
    onDataChanged(sender(), Url);
561
244
}
562
245
563
246
void TabsModel::onTitleChanged()
564
247
{
565
248
    onDataChanged(sender(), Title);
566
249
}
567
250
568
251
void TabsModel::onIconChanged()
569
252
{
570
253
    onDataChanged(sender(), Icon);
571
254
}
572
255
0
573
=== removed file 'src/app/webbrowser/tabs-model.h'
574
--- src/app/webbrowser/tabs-model.h	2015-09-02 16:37:20 +0000
575
+++ src/app/webbrowser/tabs-model.h	1970-01-01 00:00:00 +0000
576
@@ -1,84 +0,0 @@
577
1
/*
578
2
 * Copyright 2013-2015 Canonical Ltd.
579
3
 *
580
4
 * This file is part of webbrowser-app.
581
5
 *
582
6
 * webbrowser-app is free software; you can redistribute it and/or modify
583
7
 * it under the terms of the GNU General Public License as published by
584
8
 * the Free Software Foundation; version 3.
585
9
 *
586
10
 * webbrowser-app is distributed in the hope that it will be useful,
587
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
588
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
589
13
 * GNU General Public License for more details.
590
14
 *
591
15
 * You should have received a copy of the GNU General Public License
592
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
593
17
 */
594
18
595
19
#ifndef __TABS_MODEL_H__
596
20
#define __TABS_MODEL_H__
597
21
598
22
// Qt
599
23
#include <QtCore/QAbstractListModel>
600
24
#include <QtCore/QList>
601
25
602
26
class QObject;
603
27
604
28
class TabsModel : public QAbstractListModel
605
29
{
606
30
    Q_OBJECT
607
31
608
32
    Q_ENUMS(Roles)
609
33
610
34
    Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
611
35
    Q_PROPERTY(QObject* currentTab READ currentTab NOTIFY currentTabChanged)
612
36
    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
613
37
614
38
public:
615
39
    TabsModel(QObject* parent=0);
616
40
    ~TabsModel();
617
41
618
42
    enum Roles {
619
43
        Url = Qt::UserRole + 1,
620
44
        Title,
621
45
        Icon,
622
46
        Tab
623
47
    };
624
48
625
49
    // reimplemented from QAbstractListModel
626
50
    QHash<int, QByteArray> roleNames() const;
627
51
    int rowCount(const QModelIndex& parent=QModelIndex()) const;
628
52
    QVariant data(const QModelIndex& index, int role) const;
629
53
630
54
    int currentIndex() const;
631
55
    void setCurrentIndex(int index);
632
56
633
57
    QObject* currentTab() const;
634
58
635
59
    Q_INVOKABLE int add(QObject* tab);
636
60
    Q_INVOKABLE int insert(QObject* tab, int index);
637
61
    Q_INVOKABLE QObject* remove(int index);
638
62
    Q_INVOKABLE QObject* get(int index) const;
639
63
    Q_INVOKABLE void move(int from, int to);
640
64
641
65
Q_SIGNALS:
642
66
    void currentIndexChanged() const;
643
67
    void currentTabChanged() const;
644
68
    void countChanged() const;
645
69
646
70
private Q_SLOTS:
647
71
    void onUrlChanged();
648
72
    void onTitleChanged();
649
73
    void onIconChanged();
650
74
651
75
private:
652
76
    QList<QObject*> m_tabs;
653
77
    int m_currentIndex;
654
78
655
79
    bool checkValidTabIndex(int index) const;
656
80
    void setCurrentIndexNoCheck(int index);
657
81
    void onDataChanged(QObject* tab, int role);
658
82
};
659
83
660
84
#endif // __TABS_MODEL_H__
661
85
0
662
=== modified file 'src/app/webbrowser/webbrowser-app.cpp'
663
--- src/app/webbrowser/webbrowser-app.cpp	2015-10-22 15:07:26 +0000
664
+++ src/app/webbrowser/webbrowser-app.cpp	2015-11-08 23:11:15 +0000
665
@@ -30,7 +30,6 @@
666
30
#include "limit-proxy-model.h"
30
#include "limit-proxy-model.h"
667
31
#include "searchengine.h"
31
#include "searchengine.h"
668
32
#include "text-search-filter-model.h"
32
#include "text-search-filter-model.h"
669
33
#include "tabs-model.h"
670
34
#include "top-sites-model.h"
33
#include "top-sites-model.h"
671
35
#include "webbrowser-app.h"
34
#include "webbrowser-app.h"
672
36
35
673
@@ -89,7 +88,6 @@
674
89
    qmlRegisterType<HistoryLastVisitDateListModel>(uri, 0, 1, "HistoryLastVisitDateListModel");
88
    qmlRegisterType<HistoryLastVisitDateListModel>(uri, 0, 1, "HistoryLastVisitDateListModel");
675
90
    qmlRegisterType<HistoryLastVisitDateModel>(uri, 0, 1, "HistoryLastVisitDateModel");
89
    qmlRegisterType<HistoryLastVisitDateModel>(uri, 0, 1, "HistoryLastVisitDateModel");
676
91
    qmlRegisterType<LimitProxyModel>(uri, 0 , 1, "LimitProxyModel");
90
    qmlRegisterType<LimitProxyModel>(uri, 0 , 1, "LimitProxyModel");
677
92
    qmlRegisterType<TabsModel>(uri, 0, 1, "TabsModel");
678
93
    qmlRegisterSingletonType<BookmarksModel>(uri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory);
91
    qmlRegisterSingletonType<BookmarksModel>(uri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory);
679
94
    qmlRegisterType<BookmarksFolderListModel>(uri, 0, 1, "BookmarksFolderListModel");
92
    qmlRegisterType<BookmarksFolderListModel>(uri, 0, 1, "BookmarksFolderListModel");
680
95
    qmlRegisterSingletonType<FileOperations>(uri, 0, 1, "FileOperations", FileOperations_singleton_factory);
93
    qmlRegisterSingletonType<FileOperations>(uri, 0, 1, "FileOperations", FileOperations_singleton_factory);
681
96
94
682
=== modified file 'tests/unittests/CMakeLists.txt'
683
--- tests/unittests/CMakeLists.txt	2015-10-06 09:48:38 +0000
684
+++ tests/unittests/CMakeLists.txt	2015-11-08 23:11:15 +0000
685
@@ -10,7 +10,6 @@
686
10
add_subdirectory(history-lastvisitdatelist-model)
10
add_subdirectory(history-lastvisitdatelist-model)
687
11
add_subdirectory(top-sites-model)
11
add_subdirectory(top-sites-model)
688
12
add_subdirectory(session-utils)
12
add_subdirectory(session-utils)
689
13
add_subdirectory(tabs-model)
690
14
add_subdirectory(bookmarks-model)
13
add_subdirectory(bookmarks-model)
691
15
add_subdirectory(bookmarks-folder-model)
14
add_subdirectory(bookmarks-folder-model)
692
16
add_subdirectory(bookmarks-folderlist-model)
15
add_subdirectory(bookmarks-folderlist-model)
693
17
16
694
=== modified file 'tests/unittests/qml/CMakeLists.txt'
695
--- tests/unittests/qml/CMakeLists.txt	2015-10-06 09:48:38 +0000
696
+++ tests/unittests/qml/CMakeLists.txt	2015-11-08 23:11:15 +0000
697
@@ -27,7 +27,6 @@
698
27
    ${webbrowser-app_SOURCE_DIR}/history-timeframe-model.cpp
27
    ${webbrowser-app_SOURCE_DIR}/history-timeframe-model.cpp
699
28
    ${webbrowser-app_SOURCE_DIR}/limit-proxy-model.cpp
28
    ${webbrowser-app_SOURCE_DIR}/limit-proxy-model.cpp
700
29
    ${webbrowser-app_SOURCE_DIR}/searchengine.cpp
29
    ${webbrowser-app_SOURCE_DIR}/searchengine.cpp
701
30
    ${webbrowser-app_SOURCE_DIR}/tabs-model.cpp
702
31
    ${webbrowser-app_SOURCE_DIR}/text-search-filter-model.cpp
30
    ${webbrowser-app_SOURCE_DIR}/text-search-filter-model.cpp
703
32
    ${webbrowser-app_SOURCE_DIR}/top-sites-model.cpp
31
    ${webbrowser-app_SOURCE_DIR}/top-sites-model.cpp
704
33
    tst_QmlTests.cpp
32
    tst_QmlTests.cpp
705
34
33
706
=== modified file 'tests/unittests/qml/tst_QmlTests.cpp'
707
--- tests/unittests/qml/tst_QmlTests.cpp	2015-10-22 15:07:26 +0000
708
+++ tests/unittests/qml/tst_QmlTests.cpp	2015-11-08 23:11:15 +0000
709
@@ -35,7 +35,6 @@
710
35
#include "history-lastvisitdatelist-model.h"
35
#include "history-lastvisitdatelist-model.h"
711
36
#include "limit-proxy-model.h"
36
#include "limit-proxy-model.h"
712
37
#include "searchengine.h"
37
#include "searchengine.h"
713
38
#include "tabs-model.h"
714
39
#include "text-search-filter-model.h"
38
#include "text-search-filter-model.h"
715
40
#include "top-sites-model.h"
39
#include "top-sites-model.h"
716
41
40
717
@@ -189,7 +188,6 @@
718
189
188
719
190
    const char* browserUri = "webbrowserapp.private";
189
    const char* browserUri = "webbrowserapp.private";
720
191
    qmlRegisterType<SearchEngine>(browserUri, 0, 1, "SearchEngine");
190
    qmlRegisterType<SearchEngine>(browserUri, 0, 1, "SearchEngine");
721
192
    qmlRegisterType<TabsModel>(browserUri, 0, 1, "TabsModel");
722
193
    qmlRegisterSingletonType<BookmarksModel>(browserUri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory);
191
    qmlRegisterSingletonType<BookmarksModel>(browserUri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory);
723
194
    qmlRegisterType<BookmarksFolderListModel>(browserUri, 0, 1, "BookmarksFolderListModel");
192
    qmlRegisterType<BookmarksFolderListModel>(browserUri, 0, 1, "BookmarksFolderListModel");
724
195
    qmlRegisterSingletonType<HistoryModel>(browserUri, 0, 1, "HistoryModel", HistoryModel_singleton_factory);
193
    qmlRegisterSingletonType<HistoryModel>(browserUri, 0, 1, "HistoryModel", HistoryModel_singleton_factory);
725
196
194
726
=== added file 'tests/unittests/qml/tst_TabsModel.qml'
727
--- tests/unittests/qml/tst_TabsModel.qml	1970-01-01 00:00:00 +0000
728
+++ tests/unittests/qml/tst_TabsModel.qml	2015-11-08 23:11:15 +0000
729
@@ -0,0 +1,424 @@
730
1
/*
731
2
 * Copyright 2015 Canonical Ltd.
732
3
 *
733
4
 * This file is part of webbrowser-app.
734
5
 *
735
6
 * webbrowser-app is free software; you can redistribute it and/or modify
736
7
 * it under the terms of the GNU General Public License as published by
737
8
 * the Free Software Foundation; version 3.
738
9
 *
739
10
 * webbrowser-app is distributed in the hope that it will be useful,
740
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
741
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
742
13
 * GNU General Public License for more details.
743
14
 *
744
15
 * You should have received a copy of the GNU General Public License
745
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
746
17
 */
747
18
748
19
import QtQuick 2.4
749
20
import QtTest 1.0
750
21
import "../../../src/app/webbrowser"
751
22
752
23
Item {
753
24
    width: 1
754
25
    height: 1
755
26
756
27
    property alias model: modelLoader.item
757
28
758
29
    Loader {
759
30
        id: modelLoader
760
31
        active: false
761
32
        asynchronous: false
762
33
        sourceComponent: TabsModel { }
763
34
    }
764
35
765
36
    Component {
766
37
        id: tab
767
38
        Item {
768
39
            property url url
769
40
            property string title
770
41
            property url icon
771
42
        }
772
43
    }
773
44
774
45
    SignalSpy {
775
46
        id: countSpy
776
47
        target: model
777
48
        signalName: "countChanged"
778
49
    }
779
50
780
51
    SignalSpy {
781
52
        id: currentIndexSpy
782
53
        target: model
783
54
        signalName: "currentIndexChanged"
784
55
    }
785
56
786
57
    SignalSpy {
787
58
        id: currentTabSpy
788
59
        target: model
789
60
        signalName: "currentTabChanged"
790
61
    }
791
62
792
63
    TestCase {
793
64
        name: "TabsModel"
794
65
        when: windowShown
795
66
796
67
        function createTab()
797
68
        {
798
69
            return tab.createObject()
799
70
        }
800
71
801
72
        function init()
802
73
        {
803
74
            modelLoader.active = true
804
75
        }
805
76
806
77
        function cleanup()
807
78
        {
808
79
            modelLoader.active = false
809
80
            countSpy.clear()
810
81
            currentIndexSpy.clear()
811
82
            currentTabSpy.clear()
812
83
        }
813
84
814
85
        function createTabWithTitle(title) {
815
86
            var tab = createTab()
816
87
            tab.title = title
817
88
            return tab
818
89
        }
819
90
820
91
        function verifyTabsOrder(orderedTitles) {
821
92
            compare(model.count, orderedTitles.length)
822
93
            orderedTitles.forEach(function(title, i) {
823
94
                compare(model.get(i).title, title)
824
95
            })
825
96
        }
826
97
827
98
        function test_shouldBeInitiallyEmpty()
828
99
        {
829
100
            compare(model.count, 0)
830
101
            compare(model.currentIndex, -1)
831
102
            compare(model.currentTab, null)
832
103
        }
833
104
834
105
        function test_currentTabShouldBeNullOnInvalidIndex()
835
106
        {
836
107
            model.add(createTab())
837
108
            model.remove(0)
838
109
            compare(model.currentIndex, -1)
839
110
            compare(model.currentTab, null)
840
111
        }
841
112
842
113
        function test_shouldNotAllowOutOfBoundsCurrentIndex()
843
114
        {
844
115
            model.currentIndex = 0;
845
116
            compare(currentIndexSpy.count, 2)
846
117
            compare(model.currentIndex, -1)
847
118
848
119
            model.currentIndex = -2;
849
120
            compare(currentIndexSpy.count, 4)
850
121
            compare(model.currentIndex, -1)
851
122
852
123
            // verify that when the model is not empty -1 is not a valid
853
124
            // current index
854
125
            model.add(createTab())
855
126
            compare(model.currentIndex, 0)
856
127
            currentIndexSpy.clear()
857
128
            model.currentIndex = -1;
858
129
            compare(currentIndexSpy.count, 2)
859
130
            compare(model.currentIndex, 0)
860
131
        }
861
132
862
133
        function test_shouldNotAddNullTab()
863
134
        {
864
135
            ignoreWarning("Invalid Tab: null")
865
136
            compare(model.add(null), -1)
866
137
            compare(model.count, 0)
867
138
        }
868
139
869
140
        function test_shouldNotInsertTabAtInvalidIndex()
870
141
        {
871
142
            ignoreWarning("Invalid insert index: " + -1)
872
143
            model.insert(createTab(), -1)
873
144
            compare(model.count, 0)
874
145
            compare(model.currentIndex, -1)
875
146
            compare(model.currentTab, null)
876
147
877
148
            ignoreWarning("Invalid insert index: " + 1)
878
149
            model.insert(createTab(), 1)
879
150
            compare(model.count, 0)
880
151
            compare(model.currentIndex, -1)
881
152
            compare(model.currentTab, null)
882
153
        }
883
154
884
155
        function test_shouldAppendWhenInsertingAtUndefinedIndex()
885
156
        {
886
157
            compare(model.insert(createTab()), 0)
887
158
            compare(model.count, 1)
888
159
889
160
            compare(model.insert(createTab(), undefined), 1)
890
161
            compare(model.count, 2)
891
162
        }
892
163
893
164
        function test_shouldReturnIndexWhenAddingTab()
894
165
        {
895
166
            for (var i = 0; i < 3; ++i) {
896
167
                compare(model.add(createTab()), i)
897
168
            }
898
169
        }
899
170
900
171
        function test_shouldUpdateCountWhenAddingTab()
901
172
        {
902
173
            model.add(createTab())
903
174
            compare(countSpy.count, 1)
904
175
            compare(model.count, 1)
905
176
        }
906
177
907
178
        function test_shouldUpdateCountWhenRemovingTab()
908
179
        {
909
180
            model.add(createTab())
910
181
            countSpy.clear()
911
182
            delete model.remove(0)
912
183
            compare(countSpy.count, 1)
913
184
            compare(model.count, 0)
914
185
        }
915
186
916
187
        function test_shouldNotAllowRemovingAtInvalidIndex()
917
188
        {
918
189
            compare(model.remove(0), null)
919
190
            compare(model.remove(2), null)
920
191
            compare(model.remove(-2), null)
921
192
        }
922
193
923
194
        function test_shouldReturnTabWhenRemoving()
924
195
        {
925
196
            var tab = createTab()
926
197
            model.add(tab)
927
198
            var removed = model.remove(0)
928
199
            compare(removed, tab)
929
200
            delete removed
930
201
        }
931
202
932
203
        function test_shouldUpdateCurrentTabWhenSettingCurrentIndex()
933
204
        {
934
205
            var tab1 = createTab()
935
206
            model.add(tab1)
936
207
            compare(model.currentIndex, 0)
937
208
            compare(currentTabSpy.count, 1)
938
209
            compare(model.currentTab, tab1)
939
210
940
211
            var tab2 = createTab()
941
212
            model.add(tab2)
942
213
            model.currentIndex = 1
943
214
            compare(model.currentIndex, 1)
944
215
            compare(currentTabSpy.count, 2)
945
216
            compare(model.currentTab, tab2)
946
217
        }
947
218
948
219
        function test_shouldSetCurrentTabWhenAddingFirstTab()
949
220
        {
950
221
             // Adding a tab to an empty model should update the current tab
951
222
             // to that tab
952
223
             var tab1 = createTab()
953
224
             model.add(tab1)
954
225
955
226
             compare(currentTabSpy.count, 1)
956
227
             compare(currentIndexSpy.count, 1)
957
228
             compare(model.currentIndex, 0)
958
229
             compare(model.currentTab, tab1)
959
230
960
231
             // But adding further items should keep the index where it was
961
232
             model.add(createTab())
962
233
             model.add(createTab())
963
234
964
235
             compare(currentTabSpy.count, 1)
965
236
             compare(currentIndexSpy.count, 1)
966
237
             compare(model.currentIndex, 0)
967
238
             compare(model.currentTab, tab1)
968
239
         }
969
240
970
241
         function test_shouldSetCurrentTabWhenInsertingFirstTab()
971
242
         {
972
243
             // Inserting a tab to an empty model should update the current tab
973
244
             // to that tab
974
245
             var tab1 = createTab()
975
246
             model.insert(tab1, 0)
976
247
977
248
             compare(currentTabSpy.count, 1)
978
249
             compare(currentIndexSpy.count, 1)
979
250
             compare(model.currentIndex, 0)
980
251
             compare(model.currentTab, tab1)
981
252
         }
982
253
983
254
         function test_shouldSetInvalidIndexWhenRemovingLastTab()
984
255
         {
985
256
             // Removing the last item should also set the current index to -1
986
257
             // and the current tab to null
987
258
             model.add(createTab())
988
259
989
260
             currentTabSpy.clear()
990
261
             currentIndexSpy.clear()
991
262
             model.remove(0)
992
263
             compare(currentTabSpy.count, 1)
993
264
             compare(currentIndexSpy.count, 1)
994
265
             compare(model.currentIndex, -1)
995
266
             compare(model.currentTab, null)
996
267
         }
997
268
998
269
         function test_shouldNotChangeIndexWhenRemovingAfterCurrent()
999
270
         {
1000
271
             // When removing a tab after the current one,
1001
272
             // the current tab shouldn’t change.
1002
273
             var tab1 = createTab()
1003
274
             model.add(tab1)
1004
275
             model.add(createTab())
1005
276
1006
277
             currentTabSpy.clear()
1007
278
             currentIndexSpy.clear()
1008
279
             model.remove(1)
1009
280
             compare(model.currentTab, tab1)
1010
281
             compare(currentTabSpy.count, 0)
1011
282
             compare(currentIndexSpy.count, 0)
1012
283
         }
1013
284
1014
285
         function test_shouldUpdateIndexWhenRemovingCurrent()
1015
286
         {
1016
287
             // When removing the current tab, if there is a tab after it,
1017
288
             // it becomes the current one.
1018
289
             var tab1 = createTab()
1019
290
             var tab2 = createTab()
1020
291
             var tab3 = createTab()
1021
292
             model.add(tab1)
1022
293
             model.add(tab2)
1023
294
             model.add(tab3)
1024
295
             model.currentIndex = 1
1025
296
             compare(model.currentIndex, 1)
1026
297
             compare(model.currentTab, tab2)
1027
298
1028
299
             currentTabSpy.clear()
1029
300
             currentIndexSpy.clear()
1030
301
             model.remove(1)
1031
302
             compare(currentIndexSpy.count, 0)
1032
303
             compare(currentTabSpy.count, 1)
1033
304
             compare(model.currentTab, tab3)
1034
305
1035
306
             // If there is no tab after it but one before, that one becomes current
1036
307
             model.remove(1)
1037
308
             compare(currentIndexSpy.count, 1)
1038
309
             compare(currentTabSpy.count, 2)
1039
310
             compare(model.currentIndex, 0)
1040
311
             compare(model.currentTab, tab1)
1041
312
         }
1042
313
1043
314
         function test_shouldDecreaseIndexWhenRemovingBeforeCurrent()
1044
315
         {
1045
316
             // When removing a tab before the current tab, the current index
1046
317
             // should decrease to match.
1047
318
             model.add(createTab())
1048
319
             model.add(createTab())
1049
320
             var tab = createTab()
1050
321
             model.add(tab)
1051
322
             model.currentIndex = 2
1052
323
1053
324
             currentTabSpy.clear()
1054
325
             currentIndexSpy.clear()
1055
326
             model.remove(1)
1056
327
             compare(currentTabSpy.count, 0)
1057
328
             compare(currentIndexSpy.count, 1)
1058
329
             compare(model.currentIndex, 1)
1059
330
             compare(model.currentTab, tab)
1060
331
         }
1061
332
1062
333
        function test_shouldReturnTabAtIndex()
1063
334
        {
1064
335
            // valid indexes
1065
336
            var tab1 = createTab()
1066
337
            model.add(tab1)
1067
338
            var tab2 = createTab()
1068
339
            model.add(tab2)
1069
340
            var tab3 = createTab()
1070
341
            model.add(tab3)
1071
342
            compare(model.get(0), tab1)
1072
343
            compare(model.get(1), tab2)
1073
344
            compare(model.get(2), tab3)
1074
345
1075
346
            // invalid indexes
1076
347
            compare(model.get(-1), null)
1077
348
            compare(model.get(3), null)
1078
349
        }
1079
350
1080
351
        function test_shouldPreserveCurrentIndexAndTabWhenMoving_data()
1081
352
        {
1082
353
            return [
1083
354
                {initial: 0, from: 0, to: 2, result: 2}, // moving tab that has the current index
1084
355
                {initial: 1, from: 0, to: 2, result: 0}, // moving from before current index to after current index
1085
356
                {initial: 1, from: 2, to: 0, result: 2}  // moving from after current index to before current index
1086
357
            ]
1087
358
        }
1088
359
        function test_shouldPreserveCurrentIndexAndTabWhenMoving(data)
1089
360
        {
1090
361
            for (var i = 0; i < 3; ++i) {
1091
362
                model.add(createTab())
1092
363
            }
1093
364
            model.currentIndex = data.initial
1094
365
            var currentTabInitial = model.currentTab
1095
366
            model.move(data.from, data.to)
1096
367
            compare(model.currentIndex, data.result)
1097
368
            compare(model.currentTab, currentTabInitial)
1098
369
        }
1099
370
1100
371
        function test_shouldMoveToTopWhenSettingCurrentIndexInStackMode() {
1101
372
            var tab1 = createTab()
1102
373
            model.add(tab1)
1103
374
            var tab2 = createTab()
1104
375
            model.add(tab2)
1105
376
            var tab3 = createTab()
1106
377
            model.add(tab3)
1107
378
            model.behaveAsStack = true
1108
379
            compare(model.currentIndex, 0)
1109
380
1110
381
            model.currentIndex = 2
1111
382
            compare(model.currentIndex, 0)
1112
383
            compare(model.currentTab, tab3)
1113
384
            compare(model.get(1), tab1)
1114
385
            compare(model.get(2), tab2)
1115
386
        }
1116
387
1117
388
        function test_shouldNotInsertNullTab()
1118
389
        {
1119
390
            ignoreWarning("Invalid Tab: null")
1120
391
            compare(model.insert(null, 0), -1)
1121
392
            compare(model.count, 0)
1122
393
        }
1123
394
1124
395
        function test_shouldReturnIndexWhenInsertingTab()
1125
396
        {
1126
397
            for (var i = 0; i < 3; ++i) {
1127
398
                model.add(createTab())
1128
399
            }
1129
400
1130
401
            for (var i = 2; i >= 0; --i) {
1131
402
                compare(model.insert(createTab(), i), i)
1132
403
            }
1133
404
        }
1134
405
1135
406
        function test_shouldUpdateCountWhenInsertingTab()
1136
407
        {
1137
408
            model.insert(createTab(), 0)
1138
409
            compare(countSpy.count, 1)
1139
410
            compare(model.count, 1)
1140
411
        }
1141
412
1142
413
        function test_shouldInsertAtCorrectIndex()
1143
414
        {
1144
415
            model.insert(createTabWithTitle("B"), 0)
1145
416
            model.insert(createTabWithTitle("A"), 0)
1146
417
            verifyTabsOrder(["A", "B"])
1147
418
            model.insert(createTabWithTitle("X"), 1)
1148
419
            verifyTabsOrder(["A", "X", "B"])
1149
420
            model.insert(createTabWithTitle("C"), 3)
1150
421
            verifyTabsOrder(["A", "X", "B", "C"])
1151
422
        }
1152
423
    }
1153
424
}
1154
0
425
1155
=== removed directory 'tests/unittests/tabs-model'
1156
=== removed file 'tests/unittests/tabs-model/CMakeLists.txt'
1157
--- tests/unittests/tabs-model/CMakeLists.txt	2015-06-22 10:29:20 +0000
1158
+++ tests/unittests/tabs-model/CMakeLists.txt	1970-01-01 00:00:00 +0000
1159
@@ -1,18 +0,0 @@
1160
1
find_package(Qt5Core REQUIRED)
1161
2
find_package(Qt5Qml REQUIRED)
1162
3
find_package(Qt5Quick REQUIRED)
1163
4
find_package(Qt5Sql REQUIRED)
1164
5
find_package(Qt5Test REQUIRED)
1165
6
set(TEST tst_TabsModelTests)
1166
7
add_executable(${TEST} tst_TabsModelTests.cpp)
1167
8
include_directories(${webbrowser-app_SOURCE_DIR})
1168
9
target_link_libraries(${TEST}
1169
10
    Qt5::Core
1170
11
    Qt5::Qml
1171
12
    Qt5::Quick
1172
13
    Qt5::Sql
1173
14
    Qt5::Test
1174
15
    webbrowser-app-models
1175
16
)
1176
17
add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml)
1177
18
set_tests_properties(${TEST} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
1178
19
0
1179
=== removed file 'tests/unittests/tabs-model/tst_TabsModelTests.cpp'
1180
--- tests/unittests/tabs-model/tst_TabsModelTests.cpp	2015-09-23 17:14:30 +0000
1181
+++ tests/unittests/tabs-model/tst_TabsModelTests.cpp	1970-01-01 00:00:00 +0000
1182
@@ -1,493 +0,0 @@
1183
1
/*
1184
2
 * Copyright 2013-2015 Canonical Ltd.
1185
3
 *
1186
4
 * This file is part of webbrowser-app.
1187
5
 *
1188
6
 * webbrowser-app is free software; you can redistribute it and/or modify
1189
7
 * it under the terms of the GNU General Public License as published by
1190
8
 * the Free Software Foundation; version 3.
1191
9
 *
1192
10
 * webbrowser-app is distributed in the hope that it will be useful,
1193
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1194
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1195
13
 * GNU General Public License for more details.
1196
14
 *
1197
15
 * You should have received a copy of the GNU General Public License
1198
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1199
17
 */
1200
18
1201
19
// Qt
1202
20
#include <QtCore/QStringList>
1203
21
#include <QtQml/QQmlComponent>
1204
22
#include <QtQml/QQmlEngine>
1205
23
#include <QtQml/QQmlProperty>
1206
24
#include <QtQuick/QQuickItem>
1207
25
#include <QtTest/QSignalSpy>
1208
26
#include <QtTest/QtTest>
1209
27
1210
28
// local
1211
29
#include "tabs-model.h"
1212
30
1213
31
class TabsModelTests : public QObject
1214
32
{
1215
33
    Q_OBJECT
1216
34
1217
35
private:
1218
36
    TabsModel* model;
1219
37
1220
38
    QQuickItem* createTab()
1221
39
    {
1222
40
        QQmlEngine engine;
1223
41
        QQmlComponent component(&engine);
1224
42
        QByteArray data("import QtQuick 2.4\nItem {\nproperty url url\n"
1225
43
                        "property string title\nproperty url icon\n}");
1226
44
        component.setData(data, QUrl());
1227
45
        QObject* object = component.create();
1228
46
        object->setParent(this);
1229
47
        QQuickItem* item = qobject_cast<QQuickItem*>(object);
1230
48
        return item;
1231
49
    }
1232
50
1233
51
    QQuickItem* createTabWithTitle(const QString& title) {
1234
52
        QQuickItem* tab = createTab();
1235
53
        tab->setProperty("title", title);
1236
54
        return tab;
1237
55
    }
1238
56
1239
57
    void verifyTabsOrder(QStringList orderedTitles) {
1240
58
        QCOMPARE(model->rowCount(), orderedTitles.count());
1241
59
        int i = 0;
1242
60
        Q_FOREACH(QString title, orderedTitles) {
1243
61
            QCOMPARE(model->get(i++)->property("title").toString(), title);
1244
62
        }
1245
63
    }
1246
64
1247
65
private Q_SLOTS:
1248
66
    void init()
1249
67
    {
1250
68
        model = new TabsModel;
1251
69
    }
1252
70
1253
71
    void cleanup()
1254
72
    {
1255
73
        while (model->rowCount() > 0) {
1256
74
            delete model->remove(0);
1257
75
        }
1258
76
        delete model;
1259
77
    }
1260
78
1261
79
    void shouldBeInitiallyEmpty()
1262
80
    {
1263
81
        QCOMPARE(model->rowCount(), 0);
1264
82
        QCOMPARE(model->currentTab(), (QObject*) nullptr);
1265
83
    }
1266
84
1267
85
    void shouldExposeRoleNames()
1268
86
    {
1269
87
        QList<QByteArray> roleNames = model->roleNames().values();
1270
88
        QVERIFY(roleNames.contains("url"));
1271
89
        QVERIFY(roleNames.contains("title"));
1272
90
        QVERIFY(roleNames.contains("icon"));
1273
91
        QVERIFY(roleNames.contains("tab"));
1274
92
    }
1275
93
1276
94
    void shouldNotAllowSettingTheIndexToAnInvalidValue_data()
1277
95
    {
1278
96
        QTest::addColumn<int>("index");
1279
97
        QTest::newRow("zero") << 0;
1280
98
        QTest::newRow("too high") << 2;
1281
99
        QTest::newRow("too low") << -2;
1282
100
    }
1283
101
1284
102
    void shouldNotAllowSettingTheIndexToAnInvalidValue()
1285
103
    {
1286
104
        QFETCH(int, index);
1287
105
        model->setCurrentIndex(index);
1288
106
        QCOMPARE(model->currentIndex(), -1);
1289
107
        QCOMPARE(model->currentTab(), (QObject*) nullptr);
1290
108
    }
1291
109
1292
110
    void shouldNotAddNullTab()
1293
111
    {
1294
112
        QCOMPARE(model->add(0), -1);
1295
113
        QCOMPARE(model->rowCount(), 0);
1296
114
    }
1297
115
1298
116
    void shouldReturnIndexWhenAddingTab()
1299
117
    {
1300
118
        for(int i = 0; i < 3; ++i) {
1301
119
            QCOMPARE(model->add(createTab()), i);
1302
120
        }
1303
121
    }
1304
122
1305
123
    void shouldUpdateCountWhenAddingTab()
1306
124
    {
1307
125
        QSignalSpy spy(model, SIGNAL(countChanged()));
1308
126
        model->add(createTab());
1309
127
        QCOMPARE(spy.count(), 1);
1310
128
        QCOMPARE(model->rowCount(), 1);
1311
129
    }
1312
130
1313
131
    void shouldNotInsertNullTab()
1314
132
    {
1315
133
        QCOMPARE(model->insert(0, 0), -1);
1316
134
        QCOMPARE(model->rowCount(), 0);
1317
135
    }
1318
136
1319
137
    void shouldReturnIndexWhenInsertingTab()
1320
138
    {
1321
139
        for(int i = 0; i < 3; ++i) {
1322
140
            model->add(createTab());
1323
141
        }
1324
142
        for(int i = 2; i >= 0; --i) {
1325
143
            QCOMPARE(model->insert(createTab(), i), i);
1326
144
        }
1327
145
    }
1328
146
1329
147
    void shouldUpdateCountWhenInsertingTab()
1330
148
    {
1331
149
        QSignalSpy spy(model, SIGNAL(countChanged()));
1332
150
        model->insert(createTab(), 0);
1333
151
        QCOMPARE(spy.count(), 1);
1334
152
        QCOMPARE(model->rowCount(), 1);
1335
153
    }
1336
154
1337
155
    void shouldInsertAtCorrectIndex()
1338
156
    {
1339
157
        model->insert(createTabWithTitle("B"), 0);
1340
158
        model->insert(createTabWithTitle("A"), 0);
1341
159
        verifyTabsOrder(QStringList({"A", "B"}));
1342
160
        model->insert(createTabWithTitle("X"), 1);
1343
161
        verifyTabsOrder(QStringList({"A", "X", "B"}));
1344
162
        model->insert(createTabWithTitle("C"), 3);
1345
163
        verifyTabsOrder(QStringList({"A", "X", "B", "C"}));
1346
164
    }
1347
165
1348
166
    void shouldClampIndexWhenInsertingTabOutOfBounds()
1349
167
    {
1350
168
        model->add(createTabWithTitle("A"));
1351
169
        model->add(createTabWithTitle("B"));
1352
170
        model->insert(createTabWithTitle("C"), 3);
1353
171
        verifyTabsOrder(QStringList({"A", "B", "C"}));
1354
172
        model->insert(createTabWithTitle("X"), -1);
1355
173
        verifyTabsOrder(QStringList({"X", "A", "B", "C"}));
1356
174
    }
1357
175
1358
176
    void shouldUpdateCountWhenRemovingTab()
1359
177
    {
1360
178
        model->add(createTab());
1361
179
        QSignalSpy spy(model, SIGNAL(countChanged()));
1362
180
        delete model->remove(0);
1363
181
        QCOMPARE(spy.count(), 1);
1364
182
        QCOMPARE(model->rowCount(), 0);
1365
183
    }
1366
184
1367
185
    void shouldNotAllowRemovingAtInvalidIndex()
1368
186
    {
1369
187
        QCOMPARE(model->remove(0), (QObject*) nullptr);
1370
188
        QCOMPARE(model->remove(2), (QObject*) nullptr);
1371
189
        QCOMPARE(model->remove(-2), (QObject*) nullptr);
1372
190
    }
1373
191
1374
192
    void shouldReturnTabWhenRemoving()
1375
193
    {
1376
194
        QQuickItem* tab = createTab();
1377
195
        model->add(tab);
1378
196
        QObject* removed = model->remove(0);
1379
197
        QCOMPARE(removed, tab);
1380
198
        delete removed;
1381
199
    }
1382
200
1383
201
    void shouldNotDeleteTabWhenRemoving()
1384
202
    {
1385
203
        QQuickItem* tab = createTab();
1386
204
        model->add(tab);
1387
205
        model->remove(0);
1388
206
        QCOMPARE(tab->parent(), this);
1389
207
        delete tab;
1390
208
    }
1391
209
1392
210
    void shouldNotifyWhenAddingTab()
1393
211
    {
1394
212
        QSignalSpy spy(model, SIGNAL(rowsInserted(const QModelIndex&, int, int)));
1395
213
        for(int i = 0; i < 3; ++i) {
1396
214
            model->add(createTab());
1397
215
            QCOMPARE(spy.count(), 1);
1398
216
            QList<QVariant> args = spy.takeFirst();
1399
217
            QCOMPARE(args.at(1).toInt(), i);
1400
218
            QCOMPARE(args.at(2).toInt(), i);
1401
219
        }
1402
220
    }
1403
221
1404
222
    void shouldNotifyWhenRemovingTab()
1405
223
    {
1406
224
        QSignalSpy spy(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
1407
225
        for(int i = 0; i < 5; ++i) {
1408
226
            model->add(createTab());
1409
227
        }
1410
228
        delete model->remove(3);
1411
229
        QCOMPARE(spy.count(), 1);
1412
230
        QList<QVariant> args = spy.takeFirst();
1413
231
        QCOMPARE(args.at(1).toInt(), 3);
1414
232
        QCOMPARE(args.at(2).toInt(), 3);
1415
233
        for(int i = 3; i >= 0; --i) {
1416
234
            delete model->remove(i);
1417
235
            QCOMPARE(spy.count(), 1);
1418
236
            args = spy.takeFirst();
1419
237
            QCOMPARE(args.at(1).toInt(), i);
1420
238
            QCOMPARE(args.at(2).toInt(), i);
1421
239
        }
1422
240
    }
1423
241
1424
242
    void shouldNotifyWhenTabPropertiesChange()
1425
243
    {
1426
244
        qRegisterMetaType<QVector<int> >();
1427
245
        QSignalSpy spy(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
1428
246
        QQuickItem* tab = createTab();
1429
247
        model->add(tab);
1430
248
1431
249
        QQmlProperty(tab, "url").write(QUrl("http://ubuntu.com"));
1432
250
        QCOMPARE(spy.count(), 1);
1433
251
        QList<QVariant> args = spy.takeFirst();
1434
252
        QCOMPARE(args.at(0).toModelIndex().row(), 0);
1435
253
        QCOMPARE(args.at(1).toModelIndex().row(), 0);
1436
254
        QVector<int> roles = args.at(2).value<QVector<int> >();
1437
255
        QCOMPARE(roles.size(), 1);
1438
256
        QVERIFY(roles.contains(TabsModel::Url));
1439
257
1440
258
        QQmlProperty(tab, "title").write(QString("Lorem Ipsum"));
1441
259
        QCOMPARE(spy.count(), 1);
1442
260
        args = spy.takeFirst();
1443
261
        QCOMPARE(args.at(0).toModelIndex().row(), 0);
1444
262
        QCOMPARE(args.at(1).toModelIndex().row(), 0);
1445
263
        roles = args.at(2).value<QVector<int> >();
1446
264
        QCOMPARE(roles.size(), 1);
1447
265
        QVERIFY(roles.contains(TabsModel::Title));
1448
266
1449
267
        QQmlProperty(tab, "icon").write(QUrl("image://webicon/123"));
1450
268
        QCOMPARE(spy.count(), 1);
1451
269
        args = spy.takeFirst();
1452
270
        QCOMPARE(args.at(0).toModelIndex().row(), 0);
1453
271
        QCOMPARE(args.at(1).toModelIndex().row(), 0);
1454
272
        roles = args.at(2).value<QVector<int> >();
1455
273
        QCOMPARE(roles.size(), 1);
1456
274
        QVERIFY(roles.contains(TabsModel::Icon));
1457
275
    }
1458
276
1459
277
    void shouldUpdateCurrentTabWhenSettingCurrentIndex()
1460
278
    {
1461
279
        QQuickItem* tab1 = createTab();
1462
280
        model->add(tab1);
1463
281
        QSignalSpy spy(model, SIGNAL(currentTabChanged()));
1464
282
        model->setCurrentIndex(0);
1465
283
        QCOMPARE(model->currentIndex(), 0);
1466
284
        QVERIFY(spy.isEmpty());
1467
285
        QCOMPARE(model->currentTab(), tab1);
1468
286
        QQuickItem* tab2 = createTab();
1469
287
        model->add(tab2);
1470
288
        model->setCurrentIndex(1);
1471
289
        QCOMPARE(model->currentIndex(), 1);
1472
290
        QCOMPARE(spy.count(), 1);
1473
291
        QCOMPARE(model->currentTab(), tab2);
1474
292
    }
1475
293
1476
294
    void shouldSetCurrentTabWhenAddingFirstTab()
1477
295
    {
1478
296
        // Adding a tab to an empty model should update the current tab
1479
297
        // to that tab
1480
298
        QSignalSpy spytab(model, SIGNAL(currentTabChanged()));
1481
299
        QSignalSpy spyindex(model, SIGNAL(currentIndexChanged()));
1482
300
        QCOMPARE(model->currentIndex(), -1);
1483
301
        QCOMPARE(model->currentTab(), (QObject*) nullptr);
1484
302
1485
303
        QQuickItem* tab1 = createTab();
1486
304
        model->add(tab1);
1487
305
1488
306
        QCOMPARE(spytab.count(), 1);
1489
307
        QCOMPARE(spyindex.count(), 1);
1490
308
        QCOMPARE(model->currentIndex(), 0);
1491
309
        QCOMPARE(model->currentTab(), tab1);
1492
310
1493
311
        // But adding further items should keep the index where it was
1494
312
        model->add(createTab());
1495
313
        model->add(createTab());
1496
314
1497
315
        QCOMPARE(spytab.count(), 1);
1498
316
        QCOMPARE(spyindex.count(), 1);
1499
317
        QCOMPARE(model->currentIndex(), 0);
1500
318
        QCOMPARE(model->currentTab(), tab1);
1501
319
    }
1502
320
1503
321
    void shouldSetCurrentTabWhenInsertingFirstTab()
1504
322
    {
1505
323
        // Inserting a tab to an empty model should update the current tab
1506
324
        // to that tab
1507
325
        QSignalSpy spytab(model, SIGNAL(currentTabChanged()));
1508
326
        QSignalSpy spyindex(model, SIGNAL(currentIndexChanged()));
1509
327
        QCOMPARE(model->currentIndex(), -1);
1510
328
        QCOMPARE(model->currentTab(), (QObject*) nullptr);
1511
329
1512
330
        QQuickItem* tab1 = createTab();
1513
331
        model->insert(tab1, 0);
1514
332
1515
333
        QCOMPARE(spytab.count(), 1);
1516
334
        QCOMPARE(spyindex.count(), 1);
1517
335
        QCOMPARE(model->currentIndex(), 0);
1518
336
        QCOMPARE(model->currentTab(), tab1);
1519
337
    }
1520
338
1521
339
    void shouldSetInvalidIndexWhenRemovingLastTab()
1522
340
    {
1523
341
        // Removing the last item should also set the current index to -1
1524
342
        // and the current tab to null
1525
343
        model->add(createTab());
1526
344
1527
345
        QSignalSpy spytab(model, SIGNAL(currentTabChanged()));
1528
346
        QSignalSpy spyindex(model, SIGNAL(currentIndexChanged()));
1529
347
        delete model->remove(0);
1530
348
        QCOMPARE(spytab.count(), 1);
1531
349
        QCOMPARE(spyindex.count(), 1);
1532
350
        QCOMPARE(model->currentIndex(), -1);
1533
351
        QCOMPARE(model->currentTab(), (QObject*) nullptr);
1534
352
    }
1535
353
1536
354
    void shouldNotChangeIndexWhenRemovingAfterCurrent()
1537
355
    {
1538
356
        // When removing a tab after the current one,
1539
357
        // the current tab shouldn’t change.
1540
358
        QQuickItem* tab1 = createTab();
1541
359
        model->add(tab1);
1542
360
        model->add(createTab());
1543
361
1544
362
        QSignalSpy spytab(model, SIGNAL(currentTabChanged()));
1545
363
        QSignalSpy spyindex(model, SIGNAL(currentIndexChanged()));
1546
364
        delete model->remove(1);
1547
365
        QCOMPARE(model->currentTab(), tab1);
1548
366
        QVERIFY(spytab.isEmpty());
1549
367
        QVERIFY(spyindex.isEmpty());
1550
368
    }
1551
369
1552
370
    void shouldUpdateIndexWhenRemovingCurrent()
1553
371
    {
1554
372
        // When removing the current tab, if there is a tab after it,
1555
373
        // it becomes the current one.
1556
374
        QQuickItem* tab1 = createTab();
1557
375
        QQuickItem* tab2 = createTab();
1558
376
        QQuickItem* tab3 = createTab();
1559
377
        model->add(tab1);
1560
378
        model->add(tab2);
1561
379
        model->add(tab3);
1562
380
        model->setCurrentIndex(1);
1563
381
        QCOMPARE(model->currentIndex(), 1);
1564
382
        QCOMPARE(model->currentTab(), tab2);
1565
383
1566
384
        QSignalSpy spytab(model, SIGNAL(currentTabChanged()));
1567
385
        QSignalSpy spyindex(model, SIGNAL(currentIndexChanged()));
1568
386
        delete model->remove(1);
1569
387
        QCOMPARE(spyindex.count(), 0);
1570
388
        QCOMPARE(spytab.count(), 1);
1571
389
        QCOMPARE(model->currentTab(), tab3);
1572
390
1573
391
        // If there is no tab after it but one before, that one becomes current
1574
392
        delete model->remove(1);
1575
393
        QCOMPARE(spyindex.count(), 1);
1576
394
        QCOMPARE(spytab.count(), 2);
1577
395
        QCOMPARE(model->currentIndex(), 0);
1578
396
        QCOMPARE(model->currentTab(), tab1);
1579
397
    }
1580
398
1581
399
    void shouldDecreaseIndexWhenRemovingBeforeCurrent()
1582
400
    {
1583
401
        // When removing a tab before the current tab, the current index
1584
402
        // should decrease to match.
1585
403
        model->add(createTab());
1586
404
        model->add(createTab());
1587
405
        QQuickItem* tab = createTab();
1588
406
        model->add(tab);
1589
407
        model->setCurrentIndex(2);
1590
408
1591
409
        QSignalSpy spytab(model, SIGNAL(currentTabChanged()));
1592
410
        QSignalSpy spyindex(model, SIGNAL(currentIndexChanged()));
1593
411
        delete model->remove(1);
1594
412
        QVERIFY(spytab.isEmpty());
1595
413
        QCOMPARE(spyindex.count(), 1);
1596
414
        QCOMPARE(model->currentIndex(), 1);
1597
415
        QCOMPARE(model->currentTab(), tab);
1598
416
    }
1599
417
1600
418
    void shouldReturnData()
1601
419
    {
1602
420
        QQuickItem* tab = createTab();
1603
421
        QQmlProperty(tab, "url").write(QUrl("http://ubuntu.com/"));
1604
422
        QQmlProperty(tab, "title").write(QString("Lorem Ipsum"));
1605
423
        QQmlProperty(tab, "icon").write(QUrl("image://webicon/123"));
1606
424
        model->add(tab);
1607
425
        QVERIFY(!model->data(QModelIndex(), TabsModel::Url).isValid());
1608
426
        QVERIFY(!model->data(model->index(-1, 0), TabsModel::Url).isValid());
1609
427
        QVERIFY(!model->data(model->index(3, 0), TabsModel::Url).isValid());
1610
428
        QCOMPARE(model->data(model->index(0, 0), TabsModel::Url).toUrl(), QUrl("http://ubuntu.com/"));
1611
429
        QCOMPARE(model->data(model->index(0, 0), TabsModel::Title).toString(), QString("Lorem Ipsum"));
1612
430
        QCOMPARE(model->data(model->index(0, 0), TabsModel::Icon).toUrl(), QUrl("image://webicon/123"));
1613
431
        QCOMPARE(model->data(model->index(0, 0), TabsModel::Tab).value<QQuickItem*>(), tab);
1614
432
        QVERIFY(!model->data(model->index(0, 0), TabsModel::Tab + 3).isValid());
1615
433
    }
1616
434
1617
435
    void shouldReturnTabAtIndex()
1618
436
    {
1619
437
        // valid indexes
1620
438
        QQuickItem* tab1 = createTab();
1621
439
        model->add(tab1);
1622
440
        QQuickItem* tab2 = createTab();
1623
441
        model->add(tab2);
1624
442
        QQuickItem* tab3 = createTab();
1625
443
        model->add(tab3);
1626
444
        QCOMPARE(model->get(0), tab1);
1627
445
        QCOMPARE(model->get(1), tab2);
1628
446
        QCOMPARE(model->get(2), tab3);
1629
447
1630
448
        // invalid indexes
1631
449
        QCOMPARE(model->get(-1), (QObject*) nullptr);
1632
450
        QCOMPARE(model->get(3), (QObject*) nullptr);
1633
451
    }
1634
452
1635
453
private:
1636
454
    void moveTabs(int from, int to, bool moved, bool indexChanged, int newIndex)
1637
455
    {
1638
456
        QSignalSpy spyMoved(model, SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)));
1639
457
        QSignalSpy spyIndex(model, SIGNAL(currentIndexChanged()));
1640
458
        QSignalSpy spyTab(model, SIGNAL(currentTabChanged()));
1641
459
1642
460
        model->move(from, to);
1643
461
        QCOMPARE(spyMoved.count(), moved ? 1 : 0);
1644
462
        if (moved) {
1645
463
            QList<QVariant> args = spyMoved.takeFirst();
1646
464
            QCOMPARE(args.at(1).toInt(), from);
1647
465
            QCOMPARE(args.at(2).toInt(), from);
1648
466
            QCOMPARE(args.at(4).toInt(), to);
1649
467
        }
1650
468
        QCOMPARE(spyIndex.count(), indexChanged ? 1 : 0);
1651
469
        QCOMPARE(model->currentIndex(), newIndex);
1652
470
        QVERIFY(spyTab.isEmpty());
1653
471
    }
1654
472
1655
473
private Q_SLOTS:
1656
474
    void shouldNotifyWhenMovingTabs()
1657
475
    {
1658
476
        for (int i = 0; i < 3; ++i) {
1659
477
            model->add(createTab());
1660
478
        }
1661
479
1662
480
        moveTabs(1, 1, false, false, 0);
1663
481
        moveTabs(4, 1, false, false, 0);
1664
482
        moveTabs(1, 4, false, false, 0);
1665
483
        moveTabs(0, 2, true, true, 2);
1666
484
        moveTabs(1, 0, true, false, 2);
1667
485
        moveTabs(2, 1, true, true, 1);
1668
486
        moveTabs(2, 0, true, true, 2);
1669
487
        moveTabs(2, 1, true, true, 1);
1670
488
        moveTabs(0, 2, true, true, 0);
1671
489
    }
1672
490
};
1673
491
1674
492
QTEST_MAIN(TabsModelTests)
1675
493
#include "tst_TabsModelTests.moc"
Status:	Needs review
Proposed branch:	lp:~uriboni/webbrowser-app/qml-tabs-model
Merge into:	lp:webbrowser-app
Diff against target:	1675 lines (+581/-877) 14 files modified src/app/webbrowser/Browser.qml (+7/-11) src/app/webbrowser/CMakeLists.txt (+0/-1) src/app/webbrowser/TabsBar.qml (+7/-6) src/app/webbrowser/TabsList.qml (+6/-4) src/app/webbrowser/TabsModel.qml (+137/-0) src/app/webbrowser/tabs-model.cpp (+0/-254) src/app/webbrowser/tabs-model.h (+0/-84) src/app/webbrowser/webbrowser-app.cpp (+0/-2) tests/unittests/CMakeLists.txt (+0/-1) tests/unittests/qml/CMakeLists.txt (+0/-1) tests/unittests/qml/tst_QmlTests.cpp (+0/-2) tests/unittests/qml/tst_TabsModel.qml (+424/-0) tests/unittests/tabs-model/CMakeLists.txt (+0/-18) tests/unittests/tabs-model/tst_TabsModelTests.cpp (+0/-493)
To merge this branch:	bzr merge lp:~uriboni/webbrowser-app/qml-tabs-model
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-04-06
PS Jenkins bot	continuous-integration		Approve on 2015-11-09
Olivier Tilloy		2015-09-08	Needs Fixing on 2015-11-06
Review via email: mp+270408@code.launchpad.net