Merge lp:~townsend/unity/fix-lp1168019 into lp:unity

[Christopher Townsend]

Do not display the scope bar at the bottom when the Command "Lens" is opened as it's not really not a Lens/Scope.

= Issue =
The Command "Lens" is not really a lens and as such, the scope bar at the bottom should not be visible when the Command "Lens" is opened.

= Fix =
Add logic to detect when the command lens is opened and if so, set the scope bar to invisible.

= Test =
Add unit test to ensure that the scope bar is indeed invisible when the command lens is active.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3479
http://jenkins.qa.ubuntu.com/job/unity-ci/312/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/201/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/199/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/200/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/312/rebuild

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/232/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/1773/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/188/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3480
http://jenkins.qa.ubuntu.com/job/unity-ci/315/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/204/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/202/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/203/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/315/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3481
http://jenkins.qa.ubuntu.com/job/unity-ci/318/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/207/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/206

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/318/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Finally figured out what was causing the Jenkins failures. I believe the amd64 ci failure last posted by jenkins is not caused by my MP. Globally approving this.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-07-18 20:04:23 +0000
+++ dash/DashView.cpp	2013-08-27 15:51:23 +0000
@@ -1262,6 +1262,15 @@
     return;
   }
 
+  if (IsCommandLensOpen() && scope_bar_->IsVisible())
+  {
+    scope_bar_->SetVisible(false);
+  }
+  else if (!scope_bar_->IsVisible())
+  {
+    scope_bar_->SetVisible(true);
+  }
+
   if (active_scope_view_.IsValid())
     active_scope_view_->SetVisible(false);
 
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-08-01 05:01:01 +0000
+++ tests/CMakeLists.txt	2013-08-27 15:51:23 +0000
@@ -24,6 +24,8 @@
                 ${CMAKE_BINARY_DIR}/tests/data/unity/scopes/testscope3.scope)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/unity/scopes/testscope4.scope
                 ${CMAKE_BINARY_DIR}/tests/data/unity/scopes/testscope4.scope)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/unity/scopes/commands.scope
+                ${CMAKE_BINARY_DIR}/tests/data/unity/scopes/commands.scope)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/unity/sounds/brownnoise.mp3
                 ${CMAKE_BINARY_DIR}/tests/data/unity/sounds/brownnoise.mp3 COPYONLY)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/unity/sounds/pinknoise.mp3
 
=== added file 'tests/data/unity/scopes/commands.scope'
--- tests/data/unity/scopes/commands.scope	1970-01-01 00:00:00 +0000
+++ tests/data/unity/scopes/commands.scope	2013-08-27 15:51:23 +0000
@@ -0,0 +1,8 @@
+[Scope]
+DBusName=com.canonical.Unity.Test.Scope
+DBusPath=/com/canonical/unity/scope/commands
+Icon=
+Type=commands
+Name=Commands
+Description=This is an Ubuntu search plugin that enables information from local binaries to be searched and displayed in the Dash. If you do not wish to search this content source, you can disable this search plugin.
+SearchHint=Run a command
 
=== modified file 'tests/test_dashview.cpp'
--- tests/test_dashview.cpp	2013-03-21 11:36:49 +0000
+++ tests/test_dashview.cpp	2013-08-27 15:51:23 +0000
@@ -28,6 +28,7 @@
 #include <NuxCore/ObjectPtr.h>
 
 #include "dash/DashView.h"
+#include "dash/ScopeBar.h"
 #include "dash/ApplicationStarter.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PanelStyle.h"
@@ -51,6 +52,7 @@
                                   "testscope2.scope",
                                   "testscope3.scope",
                                   "testscope4.scope",
+                                  "commands.scope",
                                   NULL };
 
 }
@@ -79,6 +81,7 @@
     }
 
     using DashView::scope_views_;
+    using DashView::scope_bar_;
   };
 
 protected:
@@ -93,7 +96,7 @@
   Scopes::Ptr scopes(new MockGSettingsScopes(scopes_default));
   nux::ObjectPtr<MockDashView> view(new MockDashView(scopes, application_starter_));
 
-  EXPECT_EQ(view->scope_views_.size(), 4) << "Error: Incorrect number of scope views (" << view->scope_views_.size() << " != 4)";
+  EXPECT_EQ(view->scope_views_.size(), 5) << "Error: Incorrect number of scope views (" << view->scope_views_.size() << " != 5)";
 }
 
 
@@ -112,5 +115,18 @@
   scopes->GetScopeAtIndex(0)->activated.emit(result, NOT_HANDLED, glib::HintsMap());
 }
 
+TEST_F(TestDashView, TestScopeBarIsInvisibleWithCommandScope)
+{
+  ScopeBar scope_bar;
+  Scopes::Ptr scopes(new MockGSettingsScopes(scopes_default));
+  nux::ObjectPtr<MockDashView> view(new MockDashView(scopes, application_starter_));
+
+  ASSERT_TRUE(view->scope_bar_->IsVisible());
+
+  view->scope_bar_->Activate("commands.scope");
+
+  EXPECT_FALSE(view->scope_bar_->IsVisible());
+}
+
 }
 }