Merge lp:~osomon/webbrowser-app/update-tabsview-label into lp:webbrowser-app

[Olivier Tilloy]

Update the tabs view header text to match the latest visual design.

[Günter Schwann (schwann)]

"Currently viewing" indicates, that the number of current active tab is is shown here. Instead it's always the total number of tabs.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/173/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/691/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/693
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/693/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/620/console

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

> "Currently viewing" indicates, that the number of current active tab is is
> shown here. Instead it's always the total number of tabs.

No, I believe that "Currently viewing" is meant to indicate that this section shows all the pages currently open, and the number in parenthesis indicates how many of them there are. I’ll confirm with Jouni though.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/176/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/702
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/704
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/704/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/629

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Jouni confirmed that the number in parentheses means the total number of open tabs:

  <oSoMoN> jounih: btw, have you seen my e-mail about the meaning of "Currently viewing"?
  <jounih> oSoMoN: just reading now. In my design it means the number of tabs currently open

[Günter Schwann (schwann)]

ok then

review: Approve

[lp:~osomon/webbrowser-app/update-tabsview-label]

209. By Olivier Tilloy on 2013-07-05

Merge the latest changes from trunk, and resolve conflicts.

=== modified file 'src/Ubuntu/Components/Extras/Browser/TabsList.qml'
--- src/Ubuntu/Components/Extras/Browser/TabsList.qml	2013-07-04 11:37:16 +0000
+++ src/Ubuntu/Components/Extras/Browser/TabsList.qml	2013-07-05 16:05:31 +0000
@@ -40,7 +40,7 @@
         height: units.gu(2)
         font.bold: true
         // TRANSLATORS: %1 refers to the number of open tabs
-        text: i18n.tr("Open pages %1").arg(model.count)
+        text: i18n.tr("Currently viewing (%1)").arg('<font color="#DD4814">%1</font>'.arg(model.count))
     }
 
     ListView {