Merge lp:~bratsche/gwibber/input-focus into lp:gwibber

[Cody Russell]

Sets the focus children so that the text input widget has the focus.

[Ken VanDine (ken-vandine)]

Awesome, thanks!

review: Approve

=== modified file 'gwibber/client.py'
--- gwibber/client.py	2010-03-17 17:17:13 +0000
+++ gwibber/client.py	2010-03-17 17:37:30 +0000
@@ -26,7 +26,7 @@
     self.ui = gtk.Builder()
 
     self.model = gwui.Model()
-    
+
     self.service = self.model.daemon
     self.service.connect_to_signal("LoadingStarted", self.on_loading_started)
     self.service.connect_to_signal("LoadingComplete", self.on_loading_complete)
@@ -51,7 +51,7 @@
       self.service.Refresh()
 
     self.setup_ui()
-    
+
     # set state online/offline
     if not self.connection.isConnected():
       log.logger.info("Setting to Offline")
@@ -74,7 +74,7 @@
         resources.get_ui_asset("gwibber.svg"), 24, 24))
     self.set_icon_name("gwibber")
     self.connect("delete-event", self.on_window_close)
-   
+
     # Load the application menu
     menu_ui = self.setup_menu()
     self.add_accel_group(menu_ui.get_accel_group())
@@ -92,7 +92,7 @@
 
     menubar = menu_ui.get_widget("/menubar_main")
     menubar.append(menu_spin)
-    
+
     view_class = getattr(gwui,
         "MultiStreamUi" if len(self.model.settings["streams"]) > 1
         else "SingleStreamUi")
@@ -104,7 +104,7 @@
     self.stream_view.connect("stream-closed", self.on_stream_closed)
     if isinstance(self.stream_view, gwui.MultiStreamUi):
       self.stream_view.connect("pane-closed", self.on_pane_closed)
-    
+
     self.input = gwui.Input()
     self.input.connect("submit", self.on_input_activate)
     self.input.connect("changed", self.on_input_changed)
@@ -113,6 +113,8 @@
     self.input_splitter.pack1(self.stream_view, resize=True)
     self.input_splitter.pack2(self.input, resize=False)
 
+    self.input_splitter.set_focus_child(self.input)
+
     self.button_send = gtk.Button(_("Send"))
     self.button_send.connect("clicked", self.on_button_send_clicked)
 
@@ -125,7 +127,7 @@
     content.pack_start(self.input_splitter, True)
     content.pack_start(self.message_target, False)
     content.set_border_width(5)
-    
+
     layout = gtk.VBox()
     layout.pack_start(menubar, False)
     layout.pack_start(content, True)
@@ -147,16 +149,16 @@
     if self.stream_view:
       state = self.stream_view.get_state()
       self.stream_view.destroy()
-    
+
     self.stream_view = self.view_class(self.model)
     self.stream_view.connect("action", self.on_action)
     self.stream_view.connect("search", self.on_perform_search)
     self.stream_view.connect("stream-changed", self.on_stream_changed)
     self.stream_view.connect("stream-closed", self.on_stream_closed)
-    
+
     if isinstance(self.stream_view, gwui.MultiStreamUi):
       self.stream_view.connect("pane-closed", self.on_pane_closed)
-    
+
     self.input_splitter.add1(self.stream_view)
     self.stream_view.show_all()
     if state: self.stream_view.set_state(state)
@@ -223,7 +225,7 @@
       ("help_report", None, _("Report A Problem..."), None, None, lambda *a: util.load_url(BUG_URL)),
     ])
 
-    
+
     ui = gtk.UIManager()
     ui.insert_action_group(self.actions, pos=0)
     ui.add_ui_from_string(ui_string)
@@ -243,7 +245,7 @@
     if "reply" in features:
       if message["sender"].get("nick", 0) and not "thread" in features:
         self.input.set_text("@%s: " % message["sender"]["nick"])
-      
+
       self.message_target.set_target(message)
       self.input.textview.grab_focus()
       buf = self.input.textview.get_buffer()
@@ -254,7 +256,7 @@
 
   def get_message(self, id):
     return dict(self.model.messages.get_record(id).items())
-  
+
   def on_refresh(self, *args):
     self.service.Refresh()
 
@@ -262,7 +264,7 @@
     id = self.model.streams.put_record(CouchRecord(data, kind))
     self.model.refresh()
     self.service.PerformOp('{"id": "%s"}' % id)
-    
+
     if "operation" in data:
       stream = str(self.model.features[data["operation"]]["stream"])
     else: stream = "search"
@@ -348,7 +350,7 @@
   def on_message_action_menu(self, msg):
     theme = gtk.icon_theme_get_default()
     menu = gtk.Menu()
-    
+
     for a in actions.MENU_ITEMS:
       if a.include(self, msg):
         image = gtk.image_new_from_icon_name(a.icon, gtk.ICON_SIZE_MENU)
@@ -399,14 +401,14 @@
         self.service.Send(json.dumps(data))
       self.message_target.end()
     else: self.service.SendMessage(text)
-  
+
   def on_new_stream(self, *args):
     if isinstance(self.stream_view, gwui.MultiStreamUi):
       self.stream_view.new_stream()
     else:
       self.set_view("MultiStreamUi")
       self.stream_view.new_stream()
-  
+
   def on_loading_started(self, *args):
     self.loading_spinner.set_from_animation(
       gtk.gdk.PixbufAnimation(resources.get_ui_asset("progress.gif")))

=== modified file 'gwibber/gwui.py'
--- gwibber/gwui.py	2010-03-17 17:17:13 +0000
+++ gwibber/gwui.py	2010-03-17 17:37:30 +0000
@@ -30,11 +30,11 @@
     gobject.GObject.__init__(self)
 
     self.daemon = util.getbus("Service")
-    
+
     self.account_monitor = util.getbus("Accounts")
     self.account_monitor.connect_to_signal("AccountChanged", self.on_stream_changed)
     self.account_monitor.connect_to_signal("AccountDeleted", self.on_stream_changed)
-    
+
     self.streams_monitor = util.getbus("Streams")
     self.streams_monitor.connect_to_signal("StreamChanged", self.on_stream_changed)
     self.streams_monitor.connect_to_signal("StreamClosed", self.on_stream_changed)
@@ -69,7 +69,7 @@
   def find_all(self, **params):
     for stream in self.get_streams():
       if self.match(stream, params): yield stream
-      
+
       if "items" in stream:
         for stream in stream["items"]:
           if self.match(stream, params): yield stream
@@ -130,7 +130,7 @@
       }
 
       default_streams = self.services[account["protocol"]]["default_streams"]
-      
+
       if len(default_streams) > 1:
         for feature in default_streams:
           aname = self.features[feature]["stream"]
@@ -174,7 +174,7 @@
             "color": util.Color(account["color"]),
             "protocol": account["protocol"],
           })
-      
+
       items.append(item)
 
     searches = {
@@ -192,13 +192,13 @@
       sId = search["_id"]
       searches["items"].append({
         "name": search["name"],
-        "account": None, 
+        "account": None,
         "view": self.messages.execute_view("transient_time", "messages")[[sId, {}]:[sId, 0]],
         "stream": "search",
         "transient": sId,
         "color": None,
       })
-      
+
     items.append(searches)
     return items
 
@@ -222,7 +222,7 @@
 
   def on_click_link(self, view, frame, req):
     uri = req.get_uri()
-    
+
     if uri.startswith("file:///"): return False
     elif uri.startswith("gwibber:"):
       url = urlparse.urlparse(uri)
@@ -230,7 +230,7 @@
       query = urlparse.parse_qs(url.query)
       query = dict((x,y[0]) for x,y in query.items())
       self.emit("action", uri, cmd, query)
-    else: util.load_url(uri) 
+    else: util.load_url(uri)
     return True
 
   def render(self, theme, template, **kwargs):
@@ -245,7 +245,7 @@
     theme_path = resources.get_theme_path(theme)
     template_path = resources.get_template_path(template, theme)
     lookup_paths = list(resources.get_template_dirs()) + [theme_path]
-    
+
     template = open(template_path).read()
     template = Template(template, lookup=TemplateLookup(directories=lookup_paths))
     content = template.render(theme=util.get_theme_colors(), resources=resources, _=_, **kwargs)
@@ -253,7 +253,7 @@
     # Avoid navigation redraw crashes
     if isinstance(self, Navigation) and not self.get_property("visible"):
       return content
-    
+
     self.load_html_string(content, "file://%s/" % os.path.dirname(template_path))
     return content
 
@@ -273,7 +273,7 @@
     self.selected_stream = None
     self.tree_enabled = False
     self.small_icons = False
-    
+
   def render(self):
     return WebUi.render(self, self.model.settings["theme"], "navigation.mako",
       streams=self.model.get_streams(),
@@ -334,7 +334,7 @@
     self.splitter = gtk.HPaned()
     self.splitter.add1(self.navigation_scroll)
     self.splitter.add2(layout)
-    
+
     self.splitter.set_position(self.model.settings["sidebar_splitter"])
     self.handle_splitter_position_change(self.model.settings["sidebar_splitter"])
     self.splitter.connect("notify", self.on_splitter_drag)
@@ -368,8 +368,8 @@
   def on_splitter_drag(self, pane, ev):
     if ev.name == 'position':
       pos = pane.get_position()
-      self.handle_splitter_position_change(pos)      
-      
+      self.handle_splitter_position_change(pos)
+
   def on_stream_closed(self, widget, id, kind):
     self.emit("stream-closed", id, kind)
 
@@ -378,7 +378,7 @@
     self.emit("stream-changed", stream)
     self.update_search_visibility()
     self.update()
-    
+
   def update_search_visibility(self):
     stream = self.navigation.selected_stream
     if stream is not None:
@@ -428,14 +428,14 @@
     self.scroll.add_with_viewport(self.container)
 
     self.pack_start(self.scroll, True)
-  
+
   def on_stream_closed(self, widget, id, kind):
     self.emit("stream-closed", id, kind)
 
   def on_pane_closed(self, widget):
     widget.destroy()
     self.emit("pane-closed", len(self.container))
-    
+
   def on_search(self, widget, query):
     self.emit("search", query)
 
@@ -483,7 +483,7 @@
     # Build the top navigation bar
     close_icon = gtk.image_new_from_stock("gtk-close", gtk.ICON_SIZE_MENU)
     down_arrow = gtk.Arrow(gtk.ARROW_DOWN, gtk.SHADOW_NONE)
-    
+
     btn_arrow = gtk.Button()
     btn_arrow.set_relief(gtk.RELIEF_NONE)
     btn_arrow.add(down_arrow)
@@ -514,7 +514,7 @@
     # Build the main message view
     self.message_view = MessageStreamView(self.model)
     self.message_view.connect("action", self.on_action)
-    
+
     self.message_scroll = gtk.ScrolledWindow()
     self.message_scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
     self.message_scroll.set_shadow_type(gtk.SHADOW_IN)
@@ -530,7 +530,7 @@
   def on_dropdown(self, button):
     w, h = self.arrow.window.get_geometry()[2:4]
     x, y = self.arrow.window.get_origin()
-    
+
     window = gtk.Window()
     window.move(x, y + h)
     window.set_decorated(False)
@@ -566,7 +566,7 @@
 
     is_search = stream["stream"] == "search" and stream["name"] == "Search"
     self.search_box.set_visible(not is_search)
-    
+
     if stream["account"]:
       fname = resources.get_ui_asset("icons/breakdance/16x16/%s.png" % stream["protocol"])
       self.icon_protocol.set_from_file(fname)
@@ -604,10 +604,10 @@
     self.model = model
     self.model.connect("changed", self.on_account_changed)
     self.accounts = []
-    
+
     self.target = None
     self.action = None
-    
+
     self.targetbar = WebUi()
     self.targetbar.connect("action", self.on_action)
     self.targetbar.set_size_request(0, 24)
@@ -661,11 +661,11 @@
 
   def render(self, views):
     accounts = CouchDatabase(COUCH_DB_ACCOUNTS).get_records(COUCH_TYPE_ACCOUNT, True)
-    
+
     accounts = dict((a.id, a.value) for a in accounts)
     messages = []
     seen = {}
-    
+
     for view in views:
       view.options["descending"] = True
       view.options["limit"] = 100
@@ -698,8 +698,8 @@
       else:
         if message["txtid"]:
           seen[message["txtid"]] = n
-    
-    WebUi.render(self, self.model.settings["theme"], "template.mako", 
+
+    WebUi.render(self, self.model.settings["theme"], "template.mako",
         message_store=messages,
         preferences=self.model.settings,
         services=self.model.services,
@@ -712,14 +712,14 @@
 
   def __init__(self):
     gtk.HBox.__init__(self, spacing=2)
-    
+
     self.entry = gtk.Entry()
     self.entry.connect("activate", self.on_search)
     self.entry.connect("changed", self.on_changed)
 
     self.button = gtk.Button("Search")
     self.button.connect("clicked", self.on_search)
-    
+
     self.pack_start(self.entry, True)
     self.pack_start(self.button, False)
 
@@ -731,7 +731,7 @@
   def on_search(self, *args):
     self.emit("search", self.entry.get_text())
     self.clear()
-    
+
   def clear(self):
     self.entry.set_text("")
 
@@ -748,7 +748,7 @@
 
   def focus(self):
     self.entry.grab_focus()
-    
+
 class Input(gtk.Frame):
   __gsignals__ = {
     "submit": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, int)),
@@ -767,6 +767,9 @@
     scroll.add(self.textview)
     self.add(scroll)
 
+    self.set_focus_child(scroll)
+    scroll.set_focus_child(self.textview)
+
   def get_text(self):
     return self.textview.get_text()
 
@@ -780,7 +783,7 @@
     text = self.textview.get_text()
     chars = self.textview.get_char_count()
     self.emit("changed", text, chars)
-  
+
   def do_submit_event(self, tv):
     text = tv.get_text()
     chars = tv.get_char_count()
@@ -798,13 +801,13 @@
 
     self.overlay_color = util.get_theme_colors()["text"].darker(3).hex
     self.overlay_text = '<span weight="bold" size="xx-large" foreground="%s">%s</span>'
-    
+
     self.shortener = util.getbus("URLShorten")
 
     self.connection = util.getbus("Connection")
     self.connection.connect_to_signal("ConnectionOnline", self.on_connection_online)
     self.connection.connect_to_signal("ConnectionOffline", self.on_connection_offline)
-    
+
     self.get_buffer().connect("insert-text", self.on_add_text)
     self.get_buffer().connect("changed", self.on_text_changed)
     self.connect("expose-event", self.expose_view)
@@ -820,7 +823,7 @@
     self.set_right_margin(2)
     self.set_pixels_above_lines(2)
     self.set_pixels_below_lines(2)
-    
+
     self.base_color = util.get_style().base[gtk.STATE_NORMAL]
     self.error_color = gtk.gdk.color_parse("indianred")
 
@@ -849,7 +852,7 @@
         buf = self.get_buffer()
         buf.stop_emission("insert-text")
         service = self.model.settings["urlshorter"] or "is.gd"
-        
+
         def add_shortened(shortened_url):
             "Internal add-shortened-url-to-buffer function: a closure"
             iter_start = buf.get_iter_at_mark(mark_start)
@@ -860,7 +863,7 @@
             "Internal shortening-url-died function: a closure"
             iter = buf.get_iter_at_mark(mark)
             buf.insert(iter, text) # shortening failed
-        
+
         # set a mark at iter, so that the callback knows where to insert
         mark_start = buf.create_mark(None, iter, True)
         # insert a placeholder character
@@ -870,9 +873,9 @@
         iter_end = buf.get_iter_at_mark(buf.get_insert())
         mark_end = buf.create_mark(None, iter_end, True)
         self.shortener.Shorten(text, service,
-            reply_handler=add_shortened, 
+            reply_handler=add_shortened,
             error_handler=error_shortened)
-        
+
   def set_overlay_text(self, text):
     self.pango_overlay.set_markup(self.overlay_text % (self.overlay_color, text))