Merge branch 'master' of git.sugarlabs.org:sugar/mainline

7 files changed, 25 insertions, 30 deletions

diff --git a/extensions/cpsection/aboutme/view.py b/extensions/cpsection/aboutme/view.py
index 3cbd93e..2d4b1e8 100644
--- a/extensions/cpsection/aboutme/view.py
+++ b/extensions/cpsection/aboutme/view.py
@@ -185,10 +185,6 @@ class AboutMe(SectionView):
 
     def _setup_nick(self):
         self._nick_entry = Gtk.Entry()
-        self._nick_entry.modify_bg(Gtk.StateType.INSENSITIVE,
-                                   style.COLOR_WHITE.get_gdk_color())
-        self._nick_entry.modify_base(Gtk.StateType.INSENSITIVE,
-                                     style.COLOR_WHITE.get_gdk_color())
         self._nick_entry.set_width_chars(25)
         self._nick_box.pack_start(self._nick_entry, False, True, 0)
         self._nick_entry.show()
diff --git a/extensions/cpsection/datetime/view.py b/extensions/cpsection/datetime/view.py
index 64789b4..e768e03 100644
--- a/extensions/cpsection/datetime/view.py
+++ b/extensions/cpsection/datetime/view.py
@@ -43,10 +43,6 @@ class TimeZone(SectionView):
         self._entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY,
                                  'system-search')
         self._entry.add_clear_button()
-        self._entry.modify_bg(Gtk.StateType.INSENSITIVE,
-                        style.COLOR_WHITE.get_gdk_color())
-        self._entry.modify_base(Gtk.StateType.INSENSITIVE,
-                          style.COLOR_WHITE.get_gdk_color())
         self.pack_start(self._entry, False, False, 0)
         self._entry.show()
 
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index 9b89375..b360759 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -153,10 +153,6 @@ class Network(SectionView):
         label_server.show()
         self._entry = Gtk.Entry()
         self._entry.set_alignment(0)
-        self._entry.modify_bg(Gtk.StateType.INSENSITIVE,
-                        style.COLOR_WHITE.get_gdk_color())
-        self._entry.modify_base(Gtk.StateType.INSENSITIVE,
-                          style.COLOR_WHITE.get_gdk_color())
         self._entry.set_size_request(int(Gdk.Screen.width() / 3), -1)
         box_server.pack_start(self._entry, False, True, 0)
         self._entry.show()
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index f8afca3..f28b248 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -55,6 +55,9 @@ class ControlPanel(Gtk.Window):
         self.set_resizable(False)
         self.set_modal(True)
 
+        self.set_can_focus(True)
+        self.connect('key-press-event', self.__key_press_event_cb)
+
         self._toolbar = None
         self._canvas = None
         self._table = None
@@ -90,6 +93,10 @@ class ControlPanel(Gtk.Window):
         self.set_type_hint(Gdk.WindowTypeHint.DIALOG)
         self.get_window().set_accept_focus(True)
 
+    def grab_focus(self):
+        # overwrite grab focus in order to grab focus on the view
+        self._main_view.get_child().grab_focus()
+
     def _set_canvas(self, canvas):
         if self._canvas:
             self._main_view.remove(self._canvas)
@@ -186,8 +193,18 @@ class ControlPanel(Gtk.Window):
         self._table.show()
         self._scrolledwindow.show()
         entry = self._main_toolbar.get_entry()
-        entry.grab_focus()
         entry.set_text('')
+        entry.connect('icon-press', self.__clear_icon_pressed_cb)
+        self.grab_focus()
+
+    def __key_press_event_cb(self, window, event):
+        entry = self._main_toolbar.get_entry()
+        if not entry.has_focus():
+            entry.grab_focus()
+        return False
+
+    def __clear_icon_pressed_cb(self, entry, icon_pos, event):
+        self.grab_focus()
 
     def _update(self, query):
         for option in self._options:
diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index 4d2eb1a..7b99015 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -52,8 +52,6 @@ class ActivitiesTreeView(Gtk.TreeView):
 
         self._query = ''
 
-        self.modify_base(Gtk.StateType.NORMAL,
-                         style.COLOR_WHITE.get_gdk_color())
         self.set_headers_visible(False)
         selection = self.get_selection()
         selection.set_mode(Gtk.SelectionMode.NONE)
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index 21c0672..eda4c4e 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -77,7 +77,8 @@ class ExpandedEntry(Gtk.EventBox):
         # Create a two-column body
         body_box = Gtk.EventBox()
         body_box.set_border_width(style.DEFAULT_SPACING)
-        body_box.modify_bg(Gtk.StateType.NORMAL, style.COLOR_WHITE.get_gdk_color())
+        body_box.modify_bg(Gtk.StateType.NORMAL,
+                           style.COLOR_WHITE.get_gdk_color())
         self._vbox.pack_start(body_box, True, True, 0)
         body = Gtk.HBox()
         body_box.add(body)
@@ -189,11 +190,6 @@ class ExpandedEntry(Gtk.EventBox):
     def _create_title(self):
         entry = Gtk.Entry()
         entry.connect('focus-out-event', self._title_focus_out_event_cb)
-
-        bg_color = style.COLOR_WHITE.get_gdk_color()
-        entry.modify_bg(Gtk.StateType.INSENSITIVE, bg_color)
-        entry.modify_base(Gtk.StateType.INSENSITIVE, bg_color)
-
         return entry
 
     def _create_date(self):
@@ -330,7 +326,8 @@ class ExpandedEntry(Gtk.EventBox):
         vbox.pack_start(halign, False, False, 0)
 
         scrolled_window = Gtk.ScrolledWindow()
-        scrolled_window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
+        scrolled_window.set_policy(Gtk.PolicyType.NEVER,
+                                   Gtk.PolicyType.AUTOMATIC)
         scrolled_window.set_shadow_type(Gtk.ShadowType.ETCHED_IN)
         text_buffer = Gtk.TextBuffer()
         text_view = Gtk.TextView()
@@ -340,8 +337,8 @@ class ExpandedEntry(Gtk.EventBox):
         scrolled_window.add(text_view)
         vbox.pack_start(scrolled_window, True, True, 0)
 
-        # text_view.text_view_widget.connect('focus-out-event',
-        #                  self._description_focus_out_event_cb)
+        text_view.connect('focus-out-event',
+                          self._description_tags_focus_out_event_cb)
 
         return vbox, text_view
 
@@ -359,10 +356,7 @@ class ExpandedEntry(Gtk.EventBox):
     def _title_focus_out_event_cb(self, entry, event):
         self._update_entry()
 
-    def _description_focus_out_event_cb(self, text_view, event):
-        self._update_entry()
-
-    def _tags_focus_out_event_cb(self, text_view, event):
+    def _description_tags_focus_out_event_cb(self, text_view, event):
         self._update_entry()
 
     def _update_entry(self, needs_update=False):
diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py
index 5b2c5ab..6d9cc57 100644
--- a/src/jarabe/journal/listview.py
+++ b/src/jarabe/journal/listview.py
@@ -90,8 +90,6 @@ class BaseListView(Gtk.Bin):
         selection = self.tree_view.get_selection()
         selection.set_mode(Gtk.SelectionMode.NONE)
         self.tree_view.props.fixed_height_mode = True
-        self.tree_view.modify_base(Gtk.StateType.NORMAL,
-                                   style.COLOR_WHITE.get_gdk_color())
         self._scrolled_window.add(self.tree_view)
         self.tree_view.show()