gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 20:38:00 +01:00
Code Issues Projects Releases Wiki Activity

Fixed some keypress shenanigans

Browse Source 
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
This commit is contained in:
Andrew Psaltis
2009-03-14 20:54:45 -04:00
parent 857d19b0ec
commit f2f7299c98
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
curses/curses_misc.py
View File

@@ -224,6 +224,17 @@ class TabColumns(urwid.WidgetWrap):
return key return key
# self.listbox.body = lw # 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 ### Combo box code begins here
@@ -531,7 +542,8 @@ class ClickCols(urwid.WidgetWrap):
self.args = args self.args = args
def mouse_event(self,size,event,button,x,y,focus): def mouse_event(self,size,event,button,x,y,focus):
if event == "mouse press": 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 # htop-style menu menu-bar on the bottom of the screen
class OptCols(urwid.WidgetWrap): class OptCols(urwid.WidgetWrap):

4
curses/prefs_curses.py
View File

@@ -68,8 +68,8 @@ class PrefsDialog(urwid.WidgetWrap):
global_dns_cat_t = ('header',language['global_dns_servers']) global_dns_cat_t = ('header',language['global_dns_servers'])
global_dns_t = ('editcp',language['use_global_dns']) global_dns_t = ('editcp',language['use_global_dns'])
dns_dom_t = ('editcp',' DNS Domain: ') dns_dom_t = ('editcp',' '+language['dns_domain']+': ')
search_dom_t = ('editcp',' Search domain:') search_dom_t = ('editcp',' '+language['search_domain']+':')
dns1_t = ('editcp',' DNS server 1: ') dns1_t = ('editcp',' DNS server 1: ')
dns2_t = ('editcp',' DNS server 2: ') dns2_t = ('editcp',' DNS server 2: ')
dns3_t = ('editcp',' DNS server 3: ') dns3_t = ('editcp',' DNS server 3: ')

16
curses/wicd-curses.py
View File

@@ -896,20 +896,22 @@ class appGUI():
data[5], data[5],
data[4], False) 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: for k in keys:
self.frame.keypress(self.size,k)
if urwid.is_mouse_event(k): if urwid.is_mouse_event(k):
event, button, col, row = k event, button, col, row = k
self.frame.mouse_event( self.size, self.frame.mouse_event( self.size,
event, button, col, row, event, button, col, row,
focus=True) focus=True)
continue 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": if k == "window resize":
self.size = ui.get_cols_rows() self.size = ui.get_cols_rows()
continue continue