Merge lp:~osomon/webbrowser-app/domain-with-only-one-entry into lp:webbrowser-app

[Olivier Tilloy]

Go directly to the entry instead of expanding the timeline view when there is only one entry for a given domain.
This change has been requested by design.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:343
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/397/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3971
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/280
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/280/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/295
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4051
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4051/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1572
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1572/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1323
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1334

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/397/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

works fine

review: Approve

=== modified file 'src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp'
--- src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp	2013-08-06 15:45:18 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp	2013-09-25 07:54:26 +0000
@@ -79,6 +79,16 @@
     return m_lastVisit;
 }
 
+const int HistoryDomainModel::count() const
+{
+    return rowCount();
+}
+
+const QUrl HistoryDomainModel::firstUrl() const
+{
+    return data(index(0, 0), HistoryModel::Url).toUrl();
+}
+
 bool HistoryDomainModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
 {
     if (m_domain.isEmpty()) {
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/history-domain-model.h'
--- src/Ubuntu/Components/Extras/Browser/history-domain-model.h	2013-08-06 15:45:18 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domain-model.h	2013-09-25 07:54:26 +0000
@@ -23,6 +23,7 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QSortFilterProxyModel>
 #include <QtCore/QString>
+#include <QtCore/QUrl>
 
 class HistoryTimeframeModel;
 
@@ -33,6 +34,8 @@
     Q_PROPERTY(HistoryTimeframeModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
     Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged)
     Q_PROPERTY(QDateTime lastVisit READ lastVisit NOTIFY lastVisitChanged)
+    Q_PROPERTY(int count READ count)
+    Q_PROPERTY(QUrl firstUrl READ firstUrl)
 
 public:
     HistoryDomainModel(QObject* parent=0);
@@ -45,6 +48,10 @@
 
     const QDateTime& lastVisit() const;
 
+    const int count() const;
+
+    const QUrl firstUrl() const;
+
 Q_SIGNALS:
     void sourceModelChanged() const;
     void domainChanged() const;
 
=== modified file 'src/app/TimelineView.qml'
--- src/app/TimelineView.qml	2013-09-24 10:03:11 +0000
+++ src/app/TimelineView.qml	2013-09-25 07:54:26 +0000
@@ -288,9 +288,13 @@
                                 timeline.currentIndex = -1
                             } else {
                                 domainsView.currentIndex = index
-                                timeline.currentIndex = timelineIndex
                                 entriesView.domain = model.domain
                                 entriesView.model = model.entries
+                                if (model.entries.count === 1) {
+                                    historyEntryClicked(model.entries.firstUrl)
+                                } else {
+                                    timeline.currentIndex = timelineIndex
+                                }
                             }
                         }
                     }
 
=== modified file 'tests/unittests/history-domain-model/tst_HistoryDomainModelTests.cpp'
--- tests/unittests/history-domain-model/tst_HistoryDomainModelTests.cpp	2013-07-12 13:49:42 +0000
+++ tests/unittests/history-domain-model/tst_HistoryDomainModelTests.cpp	2013-09-25 07:54:26 +0000
@@ -105,6 +105,18 @@
         model->setDomain("");
         QCOMPARE(model->rowCount(), 2);
     }
+
+    void shouldExposeCountAndFirstUrl()
+    {
+        QCOMPARE(model->count(), 0);
+        QVERIFY(model->firstUrl().isEmpty());
+        history->add(QUrl("http://example.org"), "Example Domain", QUrl());
+        QCOMPARE(model->count(), 1);
+        QCOMPARE(model->firstUrl(), QUrl("http://example.org"));
+        history->add(QUrl("http://example.com"), "Example Domain", QUrl());
+        QCOMPARE(model->count(), 2);
+        QCOMPARE(model->firstUrl(), QUrl("http://example.com"));
+    }
 };
 
 QTEST_MAIN(HistoryDomainModelTests)