Merge lp:~3v1n0/unity/neko-reloaded into lp:unity

[Marco Trevisan (Treviño)]

Dash: fix the neko regression we have since a couple of cycles

[Iain Lane (laney)]

Yep!

review: Approve

[Gord Allott (gordallott)]

you star

review: Approve (best review)

[Neil J. Patel (njpatel)]

Excellent work!

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Thanks "fathers", it means a lot! :-D

PS: Yeah, launcher is missing, too bad it was FF coming.

[Omer Akram (om26er)]

Works as expected, I must add.

review: Approve (qa)

[Brandon Schaefer (brandontschaefer)]

Im sorry we had to remove this from U7, must approve

review: Approve

[Alejandro J. Cura (alecu)]

You guys rock, thanks for all the hard work you've put into this.

[Charles Kerr (charlesk)]

This is the only remaining feature we needed. Guys, we can all go home now

review: Approve

[Ted Gould (ted)]

review: Approve

[Michal Hruby (mhr3)]

😱 oh dear, how did I miss this? Definitely 👍

review: Approve

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2016-07-04 16:53:41 +0000
+++ dash/DashView.cpp	2017-04-07 18:30:29 +0000
@@ -122,6 +122,7 @@
   , last_activated_timestamp_(0)
   , activate_on_finish_(false)
   , visible_(false)
+  , neko_mode_(false)
   , opening_column_x_(-1)
   , opening_row_y_(-1)
   , opening_column_width_(0)
@@ -138,6 +139,10 @@
     QueueDraw();
   });
 
+  gsize tmp_sz;
+  glib::String neko((gchar*)g_base64_decode("VU5JVFlfTkVLTw==", &tmp_sz));
+  neko_mode_ = g_getenv(neko) != nullptr;
+
   SetupViews();
   SetupUBusConnections();
   AddChild(overlay_window_buttons_.GetPointer());
@@ -1290,6 +1295,7 @@
   nux::ObjectPtr<ScopeView> view(new ScopeView(scope, search_bar_->show_filters()));
   AddChild(view.GetPointer());
   view->scale = scale();
+  view->neko_mode = neko_mode_;
   view->SetVisible(false);
   view->result_activated.connect(sigc::mem_fun(this, &DashView::OnResultActivated));
 
@@ -1427,6 +1433,24 @@
 {
   if (active_scope_view_.IsValid())
   {
+    const std::array<const gchar*, 2> nekos = {
+      "d2VsY29tZSBiYWNrIHVuaXR5=",
+      "ZmFyZXdlbGwgdW5pdHk=",
+    };
+
+    for (unsigned i = 0; i < nekos.size(); ++i)
+    {
+      gsize tmp_sz;
+      glib::String neko((gchar*)g_base64_decode(nekos[i], &tmp_sz));
+      if (search_bar_->search_string() == neko.Str())
+      {
+        for (auto const& view : scope_views_)
+          view.second->neko_mode = (i != 0);
+
+        return;
+      }
+    }
+
     if (!activate_delay_ && !search_bar_->in_live_search())
       active_scope_view_->ActivateFirst();
     else

=== modified file 'dash/DashView.h'
--- dash/DashView.h	2016-03-17 07:36:44 +0000
+++ dash/DashView.h	2017-04-07 18:30:29 +0000
@@ -175,6 +175,7 @@
   bool activate_on_finish_;
   glib::Source::UniquePtr activate_delay_;
   bool visible_;
+  bool neko_mode_;
 
   nux::ObjectPtr<nux::IOpenGLBaseTexture> dash_view_copy_;
   nux::ObjectPtr<nux::IOpenGLBaseTexture> search_view_copy_;

=== modified file 'dash/ResultRendererTile.cpp'
--- dash/ResultRendererTile.cpp	2016-02-09 18:16:51 +0000
+++ dash/ResultRendererTile.cpp	2017-04-07 18:30:29 +0000
@@ -90,8 +90,9 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(ResultRendererTile);
 
-ResultRendererTile::ResultRendererTile(NUX_FILE_LINE_DECL)
+ResultRendererTile::ResultRendererTile(NUX_FILE_LINE_DECL, bool neko_mode)
   : ResultRenderer(NUX_FILE_LINE_PARAM)
+  , neko_mode_(neko_mode)
 {
   UpdateWidthHeight();
   scale.changed.connect([this] (double) { UpdateWidthHeight(); });
@@ -271,9 +272,21 @@
   int tile_gsize  = style.GetTileGIconSize().CP(scale);
 
   std::string const& icon_hint = row.icon_hint;
-  std::string const& icon_name = !icon_hint.empty() ? icon_hint : DEFAULT_GICON;
-
-  glib::Object<GIcon> icon(g_icon_new_for_string(icon_name.c_str(), NULL));
+  std::string icon_name = !icon_hint.empty() ? icon_hint : DEFAULT_GICON;
+
+  if (neko_mode_)
+  {
+    const std::array<const gchar*, 2> pool = {
+      "aHR0cDovL3BsYWNla2l0dGVuLmNvbS9nLyVpLyVpLw==",
+      "aHR0cDovL3BsYWNla2l0dGVuLmNvbS8laS8laS8=",
+    };
+    gsize tmp0;
+    int tmp1 = tile_size - (rand() % RawPixel(16).CP(scale));
+    glib::String tmp2((gchar*)g_base64_decode(pool[rand() % pool.size()], &tmp0));
+    icon_name = glib::String(g_strdup_printf(tmp2, tmp1, tmp1)).Str();
+  }
+
+  glib::Object<GIcon> icon(g_icon_new_for_string(icon_name.c_str(), nullptr));
   TextureContainer* container = row.renderer<TextureContainer*>();
 
   if (container)

=== modified file 'dash/ResultRendererTile.h'
--- dash/ResultRendererTile.h	2015-10-03 01:08:12 +0000
+++ dash/ResultRendererTile.h	2017-04-07 18:30:29 +0000
@@ -59,7 +59,7 @@
 public:
   NUX_DECLARE_OBJECT_TYPE(ResultRendererTile, ResultRenderer);
 
-  ResultRendererTile(NUX_FILE_LINE_PROTO);
+  ResultRendererTile(NUX_FILE_LINE_PROTO, bool neko_mode = false);
   virtual ~ResultRendererTile() {}
 
   virtual void Render(nux::GraphicsEngine& GfxContext,
@@ -95,6 +95,8 @@
                                   int width, int height);
 
   void UpdateWidthHeight();
+
+  bool neko_mode_;
 };
 
 }

=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2015-12-09 12:46:58 +0000
+++ dash/ScopeView.cpp	2017-04-07 18:30:29 +0000
@@ -143,6 +143,7 @@
 , filters_expanded(false)
 , can_refine_search(false)
 , scale(DEFAULT_SCALE)
+, neko_mode(false)
 , scope_(scope)
 , no_results_active_(false)
 , last_good_filter_model_(-1)
@@ -172,6 +173,8 @@
     conn_manager_.Add(scope_->filters.changed.connect(sigc::mem_fun(this, &ScopeView::SetupFilters)));
     SetupFilters(scope->filters);
 
+    neko_mode.changed.connect([this] (bool) { SetupCategories(scope_->categories); });
+
     scope_->connected.changed.connect([this](bool is_connected)
     {
       // We need to search again if we were reconnected after being connected before.
@@ -485,7 +488,7 @@
   }
   else
   {
-    results_view->SetModelRenderer(new ResultRendererTile(NUX_TRACKER_LOCATION));
+    results_view->SetModelRenderer(new ResultRendererTile(NUX_TRACKER_LOCATION, neko_mode()));
   }
 
   if (scope_)

=== modified file 'dash/ScopeView.h'
--- dash/ScopeView.h	2015-11-06 18:11:30 +0000
+++ dash/ScopeView.h	2017-04-07 18:30:29 +0000
@@ -72,6 +72,7 @@
   nux::Property<ScopeViewType> view_type;
   nux::Property<bool> can_refine_search;
   nux::Property<double> scale;
+  nux::Property<bool> neko_mode;
 
   sigc::signal<void, ResultView::ActivateType, LocalResult const&, GVariant*, std::string const&> result_activated;