Merge lp:~jamalta/gwibber/298898 into lp:gwibber/1.2

[Jamal Fanaian]

[Alexander Sack (asac)]

The implementation is not yet complete imho; at least we should do two things:

1. fix the case when the user starts typing while he is at some pos < len ? I think when that happens we should reset the pos to len so the changed text gets saved as the new "current" (topmost) text.

2. the history buffer shouldn't grow indefinitely; please constraint it to 20-50 messages; consider to make the history buffer size configurable.

review: Needs Fixing

[Jamal Fanaian (jamalta)]

> The implementation is not yet complete imho; at least we should do two things:
>
> 1. fix the case when the user starts typing while he is at some pos < len ? I
> think when that happens we should reset the pos to len so the changed text
> gets saved as the new "current" (topmost) text.
>
> 2. the history buffer shouldn't grow indefinitely; please constraint it to
> 20-50 messages; consider to make the history buffer size configurable.

I will work on a fix for the 2nd issue.

Regarding the 1st issue, are you talking about the user typing something when they move up the buffer (pos < len) and then move again, thus losing what they typed? I think if the buffer gets switched to "current" (pos = len), it might confuse the user as they are now at the end of the buffer without realising it. I can think of one alternative, which is to save changes to the position when the user moves from it. This would end up working as it works when scrolling up and down the bash history. Which way of doing it do you think is better? I have implemented the first method, but I don't think it is the best way of doing things.

Thanks for your input. I really appreciate it, as it is very helpful.

[lp:~jamalta/gwibber/298898]

348. By Jamal Fanaian on 2009-07-13

Added a max limit to the messages history. When a message is sent the limit will be checked and the list will be sliced if necessary.

[Jamal Fanaian (jamalta)]

> The implementation is not yet complete imho; at least we should do two things:
>
> 1. fix the case when the user starts typing while he is at some pos < len ? I
> think when that happens we should reset the pos to len so the changed text
> gets saved as the new "current" (topmost) text.
>
> 2. the history buffer shouldn't grow indefinitely; please constraint it to
> 20-50 messages; consider to make the history buffer size configurable.

The last commit added saving of the buffer whenever the position is moved, so if the message is changed it will not be lost. This, to me, seemed to be the best way to implement this. Please comment if you feel otherwise and I will resolve it.

Thanks again for your time.

[lp:~jamalta/gwibber/298898]

349. By Jamal Fanaian on 2009-07-13

Changed messages in buffer will now be saved

350. By Jamal Fanaian on 2009-07-13

Removed feature to modify the message history

Unmerged revisions

350. By Jamal Fanaian on 2009-07-13

Removed feature to modify the message history

349. By Jamal Fanaian on 2009-07-13

Changed messages in buffer will now be saved

348. By Jamal Fanaian on 2009-07-13

Added a max limit to the messages history. When a message is sent the limit will be checked and the list will be sliced if necessary.

347. By Jamal Fanaian on 2009-07-09

Created a message history list that gets appended on message send. Added a key_press_event to the input editor to detect for Ctrl+Up and Ctrl+Down and move through the message history.

=== modified file 'gwibber/client.py'
--- gwibber/client.py	2009-06-21 01:17:53 +0000
+++ gwibber/client.py	2009-07-09 17:38:10 +0000
@@ -106,6 +106,10 @@
     self.indicator_items = {}
     layout = gtk.VBox()
 
+    self.messages_history = []
+    self.messages_history_pos = 0
+    self.messages_history_cur = None
+
     if self.preferences["facebook_beta"]:
       from microblog import facebookstream
       microblog.PROTOCOLS["facebook"] = facebookstream
@@ -209,6 +213,7 @@
     self.input.connect("populate-popup", self.on_input_context_menu)
     self.input.connect("activate", self.on_input_activate)
     self.input.connect("changed", self.on_input_change)
+    self.input.connect("key_press_event", self.on_input_key_press)
     self.input.set_max_length(MAX_MESSAGE_LENGTH)
 
     self.cancel_button = gtk.Button(_("Cancel"))
@@ -663,6 +668,33 @@
         self.statusbar.push(1, _("Characters remaining: %s") % (
         self.input.get_max_length() - i_textlen))
 
+  def on_input_key_press(self, w, e):
+    def set_input_history(i):
+      # Append current text
+      if self.messages_history_pos == len(self.messages_history):
+        self.messages_history_cur = self.input.get_text()
+
+      self.messages_history_pos += i
+
+      if self.messages_history_pos < 0:
+        self.messages_history_pos = 0
+
+      if self.messages_history_pos >= len(self.messages_history):
+        self.messages_history_pos = len(self.messages_history)
+        text = self.messages_history_cur
+      else:
+        text = self.messages_history[self.messages_history_pos]
+
+      self.input.set_text(text)
+      self.input.set_position(-1)
+
+    if e.keyval == gtk.keysyms.Up and e.state & gtk.gdk.CONTROL_MASK:
+      set_input_history(-1)
+      return True
+    elif e.keyval == gtk.keysyms.Down and e.state & gtk.gdk.CONTROL_MASK:
+      set_input_history(1)
+      return True
+
   def on_theme_change(self, *args):
     for tab in self.tabs:
       view = tab.get_child()
@@ -983,6 +1015,10 @@
 
   def on_input_activate(self, e):
     text = self.input.get_text().strip()
+
+    self.messages_history.append(text)
+    self.messages_history_pos = len(self.messages_history)
+ 
     if text:
       # don't allow submission if text length is greater than allowed
       if len(text.decode("utf-8")) > MAX_MESSAGE_LENGTH: