Merge lp:~osomon/webbrowser-app/expand-all-domains-consistently into lp:webbrowser-app

[Olivier Tilloy]

Reverted revision 343: now all domains expand consistently in the activity view, even if they contain only one entry.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:370
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/467/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/350
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/350/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/823
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/414
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/414/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2324
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2324/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1998
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2012

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

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp'
--- src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp	2013-09-25 07:29:24 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp	2013-10-04 15:09:32 +0000
@@ -79,16 +79,6 @@
     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-09-25 07:29:24 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domain-model.h	2013-10-04 15:09:32 +0000
@@ -23,7 +23,6 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QSortFilterProxyModel>
 #include <QtCore/QString>
-#include <QtCore/QUrl>
 
 class HistoryTimeframeModel;
 
@@ -34,8 +33,6 @@
     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);
@@ -48,10 +45,6 @@
 
     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-10-03 10:49:02 +0000
+++ src/app/TimelineView.qml	2013-10-04 15:09:32 +0000
@@ -291,13 +291,9 @@
                             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-09-25 07:46:49 +0000
+++ tests/unittests/history-domain-model/tst_HistoryDomainModelTests.cpp	2013-10-04 15:09:32 +0000
@@ -105,18 +105,6 @@
         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)