Merged some salty stuff...

curses/README

@@ -16,24 +16,41 @@ ask me.  I try to be on the #wicd Freenode IRC channel most of the time.
 
 Controls:
 
-F5     : refresh wireless networks
-F8 or Q: quit 
-D      : disconnect from all active networks
-ESC    : if connecting to a network, stop doing so
-ENTER  : Attempt connection to selected network
-P      : Display preferences dialog
-C      : Display network configuration for selected network 
-A      : Display "About" dialog
-I      : Raise the "Scan for hidden networks" dialog
-H      : Raise help dialog
-S      : Provide instructions for configuring scripts
-delete : Delete selected wired network profile (from the wired ComboBox)
-F2     : Rename selected wired network profile (from the wired ComboBox)
-O      : Raise ad-hoc network dialog
+F5          : refresh wireless networks
+F8 or Q or q: quit 
+D           : disconnect from all active networks
+ESC         : if connecting to a network, stop doing so
+ENTER       : Attempt connection to selected network
+P           : Display preferences dialog
+C           : Display network configuration for selected network 
+A           : Display "About" dialog
+I           : Raise the "Scan for hidden networks" dialog
+H or h or ? : Raise help dialog
+S           : Provide instructions for configuring scripts
+delete      : Delete selected wired network profile (from the wired ComboBox)
+F2          : Rename selected wired network profile (from the wired ComboBox)
+O           : Raise ad-hoc network dialog
 
 IN DIALOGS (Meta usually is "Alt"):
 ESC or Q: Quit dialog without saving information (if present)
 Meta+Left/Right: Change tabs Left/Right (if tabs present)
 Meta+Enter : Quit dialog and save information
 
+FAQ (WIP):
+
+What is wicd-curses?
+    See above. :-)
+
+Why didn't you call it wicd-urwid?  There is a hachoir-urwid package out there.
+    I first called this "urwicd".  However, due to the relative obscurity of
+    the urwid package, and the fact that many more people know what "curses"
+    is, I named it wicd-curses.  After all, it _does_ use curses (by default,
+    anyway).
+
+Why don't you support lower-case keybindings for most of the commands?
+    I was trying to prevent mass chaos from happening because of mashing keys.
+    Of course, if you unwittingly have caps-lock on, that's going to cause said
+    chaos, too, so you might want to check that (or ask me about changing the
+    keymaps to ctrl/meta+KEY)
+
 ~NaCl

curses/wicd-curses.py

@@ -712,6 +712,7 @@ class appGUI():
         # immediately.
         if from_idle and not self.connecting:
             self.update_netlist()
+            self.update_status()
             self.update_ui()
             return False
         toAppend = ''
@@ -851,7 +852,7 @@ class appGUI():
                 continue
             self.frame.keypress( self.size, k )
         return True
-    # TODO: Update this to use the networkentry stuff
+
     def connect(self, nettype, networkid, networkentry=None):
         """ Initiates the connection process in the daemon. """
         if nettype == "wireless":

in/man=wicd-curses.8.in

@@ -19,7 +19,7 @@ All of these are case sensitive.
 .BR enter
 Connect to selected network
 .TP
-.BR "F8 " or " Q"
+.BR "F8 " or " Q " or " q"
 Quit the client.
 .TP
 .BR D
@@ -37,7 +37,7 @@ Bring up the preferences controller
 .BR I
 Bring up hidden network scanning dialog
 .TP
-.BR H
+.BR "H " or " h " or " ?"
 Bring up a rather simplistic help dialog.  Of course, it mentions this man page first. :-)
 .\".PP
 .\"The following is a work in progress and might not be fully functional as of yet.