Merge r345 of 1.6-nacl.

CHANGES

@@ -1,4 +1,67 @@
 ------------------------------------------------------------
+revno: 409
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: 1.6
+timestamp: Fri 2009-06-05 15:08:47 +0800
+message:
+  merged experimental-nacl
+    ------------------------------------------------------------
+    revno: 202.2.53
+    committer: Andrew Psaltis <ampsaltis@gmail.com>
+    branch nick: experimental-nacl
+    timestamp: Thu 2009-06-04 22:19:33 -0400
+    message:
+      If a network dialog is up when a scan is initiated externally, drop the dialog.
+    ------------------------------------------------------------
+    revno: 202.2.52
+    committer: Andrew Psaltis <ampsaltis@gmail.com>
+    branch nick: experimental-nacl
+    timestamp: Thu 2009-06-04 22:10:05 -0400
+    message:
+      Merge r408 of mainline 1.6.
+------------------------------------------------------------
+revno: 408
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: 1.6
+timestamp: Thu 2009-06-04 22:24:14 +0800
+message:
+  add .sourceforge.net to the URLs in the translator
+------------------------------------------------------------
+revno: 407
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: 1.6
+timestamp: Thu 2009-06-04 21:39:36 +0800
+message:
+  updated CHANGES, setup.py version, and NEWS
+------------------------------------------------------------
+revno: 406
+committer: Andrew Psaltis <ampsaltis@gmail.com>
+branch nick: 1.6
+timestamp: Sat 2009-05-30 23:18:22 -0400
+message:
+  Merge r342 of experimental-nacl.
+    ------------------------------------------------------------
+    revno: 202.2.51
+    committer: Andrew Psaltis <ampsaltis@gmail.com>
+    branch nick: experimental-nacl
+    timestamp: Sat 2009-05-30 23:12:53 -0400
+    message:
+      Increased time between wireless scans to 2 seconds.
+    ------------------------------------------------------------
+    revno: 202.2.50
+    committer: Andrew Psaltis <ampsaltis@gmail.com>
+    branch nick: experimental-nacl
+    timestamp: Sat 2009-05-30 23:11:37 -0400
+    message:
+      Merged with r405 of mainline 1.6
+------------------------------------------------------------
+revno: 405
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: 1.6
+timestamp: Thu 2009-05-28 11:10:10 +0800
+message:
+  updated CHANGES and setup.py version
+------------------------------------------------------------
 revno: 404
 committer: Dan O'Reilly <oreilldf@gmail.com>
 branch nick: 1.6

NEWS

@@ -17,7 +17,7 @@ Minor Changes and Other Enhancements:
 - Better autoconnection behavior
 - Tray/GUI will survive the daemon being killed
 - Reasons for connection failures will now bubble back to the GUI
-- Add/Remove wired profile system is now more user-friendly
+- Add/remove wired profile system is now more user-friendly
 - Support for using resolvconf instead of directly editing /etc/resolv.conf
 - Wicd won't blindly kill dhcp clients / wpa_supplicant any more
 - Added an option to automatically switch from a wireless network to a wired 

curses/netentry_curses.py

@@ -171,7 +171,7 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
         self._w.body.body.append(self.set_default)
         
         self.prof_name = name
-        title = ">"+language['configuring_wired'].replace('$A',self.prof_name)
+        title = language['configuring_wired'].replace('$A',self.prof_name)
         self._w.header = urwid.Text( ('header',title),align='right' )
 
         self.set_values()
@@ -241,7 +241,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
         self.encrypt_types = misc.LoadEncryptionMethods()
         self.set_values()
 
-        title = ">"+language['configuring_wireless'].replace('$A',wireless.GetWirelessProperty(networkID,'essid')).replace('$B',wireless.GetWirelessProperty(networkID,'bssid'))
+        title = language['configuring_wireless'].replace('$A',wireless.GetWirelessProperty(networkID,'essid')).replace('$B',wireless.GetWirelessProperty(networkID,'bssid'))
         self._w.header = urwid.Text(('header',title),align='right' )
     
     def encryption_toggle(self,chkbox,new_state,user_data=None):

curses/wicd-curses.py

@@ -560,7 +560,8 @@ class appGUI():
         self.prev_state    = False
         self.connecting    = False
         self.screen_locked = False
-        self.do_diag_lock = False
+        self.do_diag_lock = False #Whether the screen is locked beneath a dialog
+        self.diag_type = 'none' # The type of dialog that is up
         self.scanning = False
 
         self.pref = None
@@ -573,7 +574,6 @@ class appGUI():
         self.scanning = True
         wireless.Scan(False)
 
-
     def init_other_optcols(self):
         # The "tabbed" preferences dialog
         self.prefCols = OptCols( [ ('meta enter','OK'),
@@ -585,7 +585,7 @@ class appGUI():
 
     # Does what it says it does
     def lock_screen(self):
-        if self.diag:
+        if self.diag_type == 'pref':
             self.do_diag_lock = True
             return True
         self.frame.set_body(self.screen_locker)
@@ -784,9 +784,12 @@ class appGUI():
     #@wrap_exceptions
     def dbus_scan_started(self):
         self.scanning = True
+        if self.diag_type == 'conf':
+            self.restore_primary()
         self.lock_screen()
 
     def restore_primary(self):
+        self.diag_type = 'none'
         if self.do_diag_lock or self.scanning:
             self.frame.set_body(self.screen_locker)
             self.do_diag_lock = False
@@ -822,6 +825,7 @@ class appGUI():
                         self.diag = WirelessSettingsDialog(pos,self.frame)
                         self.diag.ready_widgets(ui,self.frame)
                         self.frame.set_body(self.diag)
+                    self.diag_type = 'conf'
             # Guess what!  I actually need to put this here, else I'll have
             # tons of references to self.frame lying around. ^_^
             if "enter" in keys:
@@ -848,13 +852,13 @@ class appGUI():
                 self.pref.ready_widgets(ui,self.frame)
                 self.frame.set_footer(urwid.Pile([self.prefCols,self.footer2]))
                 self.diag = self.pref
+                self.diag_type = 'pref'
                 self.frame.set_body(self.diag)
                 # Halt here, keypress gets passed to the dialog otherwise
                 return True
             if "A" in keys:
                 about_dialog(self.frame)
             if "C" in keys:
-                # Same as "enter" for now
                 focus = self.frame.body.get_focus()
                 if focus == self.wiredCB:
                     self.special = focus

setup.py

@@ -20,12 +20,13 @@
 from distutils.core import setup, Command
 from distutils.extension import Extension
 import os
+import sys
 import shutil
 import subprocess
 
 # Be sure to keep this updated!
 # VERSIONNUMBER
-VERSION_NUM = '1.6.0b3'
+VERSION_NUM = '1.6.0'
 # REVISION_NUM is automatically updated
 REVISION_NUM = 'unknown'
 CURSES_REVNO = 'uimod'
@@ -411,24 +412,22 @@ class get_translations(Command):
         import urllib, shutil
         shutil.rmtree('translations/')
         os.makedirs('translations')
-        filename, headers = urllib.urlretrieve('http://wicd.net/translator/idlist')
+        filename, headers = urllib.urlretrieve('http://wicd.sourceforge.net/translator/idlist/')
         id_file = open(filename, 'r')
         lines = id_file.readlines()
         # remove the \n from the end of lines, and remove blank entries
         lines = [ x.strip() for x in lines if not x.strip() is '' ]
         for id in lines:
-            # http://wicd.net/translator/download_po.php?language=11
+            pofile, poheaders = urllib.urlretrieve('http://wicd.sourceforge.net/translator/download/'+str(id)+'/')
-            pofile, poheaders = urllib.urlretrieve('http://wicd.net/translator/download/'+str(id))
+            try:
-            #for i in `cat ids`; do
-            #wget "http://wicd.sourceforge.net/translator/download_po.php?language=$i&version=$1" -O "language_$i"
-            #iden=`python -c "import sys; print open('language_$i','r').readlines()[1].strip()[2:]"`
-            #mv "language_$i" po/$iden.po
-            #mkdir -p $iden/LC_MESSAGES/
-            #msgfmt --output-file=$iden/LC_MESSAGES/wicd.mo po/$iden.po
                 lang_identifier = open(pofile,'r').readlines()[0].strip()
+                first_line = lang_identifier
                 lang_identifier = lang_identifier[lang_identifier.rindex('(')+1:lang_identifier.rindex(')')]
+                print first_line
+            except:
+                print >> sys.stderr, 'error downloading language %s' % id
+            else:
                 shutil.move(pofile, lang_identifier+'.po')
-            print 'Got',lang_identifier
                 os.makedirs('translations/'+lang_identifier+'/LC_MESSAGES')
                 os.system('msgfmt --output-file=translations/' + lang_identifier +
                           '/LC_MESSAGES/wicd.mo ' + lang_identifier + '.po')

wicd/translations.py

@@ -55,7 +55,7 @@ def get_gettext():
     _ = lang.gettext
     return _
 
-# Generated automatically on Sun, 17 May 2009 19:17:27 CDT
+# Generated automatically on Fri, 05 Jun 2009 03:13:27 CDT
 _ = get_gettext()
 language = {}
 language['resetting_ip_address'] = _('''Resetting IP address...''')
@@ -214,5 +214,5 @@ language['connection_established'] = _('''Connection established''')
 language['disconnected'] = _('''Disconnected''')
 language['establishing_connection'] = _('''Establishing connection...''')
 language['association_failed'] = _('''Connection failed: Could not contact the wireless access point.''')
-language['access_denied'] = _('''Unable to contact the wicd dameon due to an access denied error from DBus.  Please check your DBus configuration.''')
+language['access_denied'] = _('''Unable to contact the Wicd daemon due to an access denied error from DBus.  Please check your DBus configuration.''')
 language['disconnecting_active'] = _('''Disconnecting active connections...''')