Merge lp:~azzar1/unity/rm-numlock-warn into lp:unity

[Andrea Azzarone]

[LockSceen] Remove numlock warning.

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

Ooook... It was a too hard experiment...

But why not enabling this when chassis type is desktop pc (as per https://www.freedesktop.org/wiki/Software/systemd/hostnamed/)?

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

Mh, no.. Ok, in a laptop in case, but still it's something that is not valid for any kind of it, so let's get rid of this "feature" .

review: Approve

=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2016-03-31 05:57:11 +0000
+++ unity-shared/TextInput.cpp	2016-07-14 12:54:56 +0000
@@ -104,7 +104,6 @@
   , scale(1.0)
   , bg_layer_(new nux::ColorLayer(nux::Color(0xff595853), true))
   , caps_lock_on(false)
-  , num_lock_on(false)
   , last_width_(-1)
   , last_height_(-1)
 {
@@ -146,9 +145,8 @@
 
   // Caps lock warning
   warning_ = new IconTexture(LoadWarningIcon(DEFAULT_ICON_SIZE.CP(scale)));
-  warning_->SetVisible(caps_lock_on() || num_lock_on());
+  warning_->SetVisible(caps_lock_on());
   layout_->AddView(warning_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-  num_lock_on.changed.connect(sigc::mem_fun(this, &TextInput::OnLockStateChanged));
   caps_lock_on.changed.connect(sigc::mem_fun(this, &TextInput::OnLockStateChanged));
 
   show_lock_warnings.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::CheckLocks)));
@@ -249,7 +247,6 @@
 {
   GdkKeymap* keymap = gdk_keymap_get_default();
   caps_lock_on = gdk_keymap_get_caps_lock_state(keymap) ? true : false;
-  num_lock_on = gdk_keymap_get_num_lock_state(keymap) ? true : false;
 }
 
 void TextInput::OnLockStateChanged(bool)
@@ -260,8 +257,8 @@
     return;
   }
 
-  warning_->SetVisible(caps_lock_on() || num_lock_on());
-  warning_->SetOpacity((num_lock_on() && !caps_lock_on()) ? 0.3 : 1.0);
+  warning_->SetVisible(caps_lock_on());
+  warning_->SetOpacity(1.0);
   warning_tooltip_.Release();
   QueueRelayout();
   QueueDraw();
@@ -345,18 +342,10 @@
 
   pango_layout_set_height(layout, -1); //avoid wrap lines
 
-  if (caps_lock_on() && num_lock_on())
-  {
-    pango_layout_set_text(layout, _("Caps lock and Num lock are on"), -1);
-  }
-  else if (caps_lock_on())
+  if (caps_lock_on())
   {
     pango_layout_set_text(layout, _("Caps lock is on"), -1);
   }
-  else if (num_lock_on())
-  {
-    pango_layout_set_text(layout, _("Num lock is on"), -1);
-  }
 
   nux::Size extents;
   pango_layout_get_pixel_size(layout, &extents.width, &extents.height);
 
=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	2016-03-31 05:57:11 +0000
+++ unity-shared/TextInput.h	2016-07-14 12:54:56 +0000
@@ -124,7 +124,6 @@
   SearchBarSpinner* spinner_;
 
   nux::Property<bool> caps_lock_on;
-  nux::Property<bool> num_lock_on;
   int last_width_;
   int last_height_;