From f2f7299c9893cdb1dae8d241cdb58caa98ef74d3 Mon Sep 17 00:00:00 2001
From: Andrew Psaltis <ampsaltis@gmail.com>
Date: Sat, 14 Mar 2009 20:54:45 -0400
Subject: [PATCH] Fixed some keypress shenanigans curses/wicd-curses.py: Fixed
 mouse events being passed to keypress functions (again)
 curses/prefs_curses.py: Fixed some translations curses/curses_misc.py:  
 Fixed mouse handling in TabColumns   Fixed callbacks to non-global keypresses
 in OptCols

---
 curses/curses_misc.py  | 14 +++++++++++++-
 curses/prefs_curses.py |  4 ++--
 curses/wicd-curses.py  | 16 +++++++++-------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/curses/curses_misc.py b/curses/curses_misc.py
index 399c512..f2d1ba0 100644
--- a/curses/curses_misc.py
+++ b/curses/curses_misc.py
@@ -224,6 +224,17 @@ class TabColumns(urwid.WidgetWrap):
         
         return key
         #    self.listbox.body = lw
+    def mouse_event(self,size,event,button,x,y,focus):
+        wid = self.pile.get_focus().get_body()
+        if wid == self.columns:
+            self.active_tab.set_attr('body')
+
+        self._w.mouse_event(size,event,button,x,y,focus)
+        if wid == self.columns:
+            self.active_tab.set_attr('body')
+            self.columns.get_focus().set_attr('tab active')
+            self.active_tab = self.columns.get_focus()
+            self.gen_pile(self.tab_map[self.active_tab])
 
 
 ### Combo box code begins here
@@ -531,7 +542,8 @@ class ClickCols(urwid.WidgetWrap):
         self.args = args
     def mouse_event(self,size,event,button,x,y,focus):
         if event == "mouse press":
-            self.callback(self.args)
+            # The keypress dealie in wicd-curses.py expects a list of keystrokes
+            self.callback([self.args])
 
 # htop-style menu menu-bar on the bottom of the screen
 class OptCols(urwid.WidgetWrap):
diff --git a/curses/prefs_curses.py b/curses/prefs_curses.py
index b2a37bf..b220597 100644
--- a/curses/prefs_curses.py
+++ b/curses/prefs_curses.py
@@ -68,8 +68,8 @@ class PrefsDialog(urwid.WidgetWrap):
 
         global_dns_cat_t = ('header',language['global_dns_servers'])
         global_dns_t     = ('editcp',language['use_global_dns'])
-        dns_dom_t        = ('editcp','    DNS Domain:   ')
-        search_dom_t     = ('editcp','    Search domain:')
+        dns_dom_t        = ('editcp','    '+language['dns_domain']+':   ')
+        search_dom_t     = ('editcp','    '+language['search_domain']+':')
         dns1_t           = ('editcp','    DNS server 1: ')
         dns2_t           = ('editcp','    DNS server 2: ')
         dns3_t           = ('editcp','    DNS server 3: ')
diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py
index 52bbab6..34fff9d 100755
--- a/curses/wicd-curses.py
+++ b/curses/wicd-curses.py
@@ -896,20 +896,22 @@ class appGUI():
                                                 data[5],
                                                 data[4], False)
             
-        if self.diag:
-            if 'esc' in keys:
-                self.restore_primary()
-            if 'meta enter' in keys:
-                self.diag.save_settings()
-                self.restore_primary()
         for k in keys:
-            self.frame.keypress(self.size,k)
             if urwid.is_mouse_event(k):
                 event, button, col, row = k
                 self.frame.mouse_event( self.size,
                         event, button, col, row,
                         focus=True)
                 continue
+            if self.diag:
+                if  k == 'esc':
+                    self.restore_primary()
+                    break
+                if k == 'meta enter':
+                    self.diag.save_settings()
+                    self.restore_primary()
+                    break
+            self.frame.keypress(self.size,k)
             if k == "window resize":
                 self.size = ui.get_cols_rows()
                 continue