Unity

Merge lp:~azzar1/unity/update-dash-string into lp:unity

  1. update-dash-string
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 2990
Proposed branch: lp:~azzar1/unity/update-dash-string
Merge into: lp:unity
Diff against target: 35 lines (+3/-3)
3 files modified
dash/DashView.cpp (+1/-1)
launcher/BFBLauncherIcon.cpp (+1/-1)
tests/autopilot/unity/tests/launcher/test_keynav.py (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/update-dash-string
Reviewer Review Type Date Requested Status
Nick Dedekind (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+139897@code.launchpad.net

Description of the change

Update dash home search hint and bfb tooltip.

To post a comment you must log in.
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

There is an autopilot test that is dependent on the "Dash Home" icon title.

  File "/home/nick/unity/source/unity.other/tests/autopilot/unity/tests/launcher/test_keynav.py", line 241, in test_launcher_keynav_changes_panel
    self.assertThat(self.panels.get_active_panel().title, Eventually(Equals("Dash Home")))
MismatchError: After 10 seconds test on MenuView.panel_title failed: !=:
reference = 'Dash Home'
actual = u'Search your computer and online sources'

review: Needs Fixing
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Fixed.

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dash/DashView.cpp'
2--- dash/DashView.cpp 2012-12-14 10:16:42 +0000
3+++ dash/DashView.cpp 2012-12-14 17:47:21 +0000
4@@ -79,7 +79,7 @@
5
6 DashView::DashView()
7 : nux::View(NUX_TRACKER_LOCATION)
8- , home_lens_(new HomeLens(_("Home"), _("Home screen"), _("Search")))
9+ , home_lens_(new HomeLens(_("Home"), _("Home screen"), _("Search your computer and online sources")))
10 , preview_container_(nullptr)
11 , preview_displaying_(false)
12 , preview_navigation_mode_(previews::Navigation::NONE)
13
14=== modified file 'launcher/BFBLauncherIcon.cpp'
15--- launcher/BFBLauncherIcon.cpp 2012-11-26 16:09:53 +0000
16+++ launcher/BFBLauncherIcon.cpp 2012-12-14 17:47:21 +0000
17@@ -35,7 +35,7 @@
18 , reader_(dash::LensDirectoryReader::GetDefault())
19 , launcher_hide_mode_(hide_mode)
20 {
21- tooltip_text = _("Dash Home");
22+ tooltip_text = _("Search your computer and online sources");
23 icon_name = PKGDATADIR"/launcher_bfb.png";
24 position = Position::BEGIN;
25 SetQuirk(Quirk::VISIBLE, true);
26
27=== modified file 'tests/autopilot/unity/tests/launcher/test_keynav.py'
28--- tests/autopilot/unity/tests/launcher/test_keynav.py 2012-11-30 21:48:28 +0000
29+++ tests/autopilot/unity/tests/launcher/test_keynav.py 2012-12-14 17:47:21 +0000
30@@ -238,4 +238,4 @@
31 """The panel title must change when in key nav mode."""
32
33 self.start_keynav_with_cleanup_cancel()
34- self.assertThat(self.panels.get_active_panel().title, Eventually(Equals("Dash Home")))
35+ self.assertThat(self.panels.get_active_panel().title, Eventually(Equals("Search your computer and online sources")))