From de8b8c11f8a992cad993fbff62ccac90700c4273 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Fri, 27 Feb 2009 00:13:00 -0500 Subject: [PATCH 01/10] Get rid of unneeded "use_tray" variable being passed around in wicd-client. Add some methods for executing multiple scripts to be use for global scripts later. Remove some rogue extra whitespace in networking.py --- wicd/misc.py | 21 +++++++++++++++----- wicd/networking.py | 10 +++++----- wicd/wicd-client.py | 47 +++++++++++++++------------------------------ 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/wicd/misc.py b/wicd/misc.py index d42418c..0a8f03d 100644 --- a/wicd/misc.py +++ b/wicd/misc.py @@ -57,7 +57,7 @@ ROUTE = 2 GKSUDO = 1 KDESU = 2 KTSUSS = 3 -sudo_dict = { +_sudo_dict = { AUTO : "", GKSUDO : "gksudo", KDESU : "kdesu", @@ -171,9 +171,20 @@ def WriteLine(my_file, text): """ write a line to a file """ my_file.write(text + "\n") -def ExecuteScript(script): +def ExecuteScripts(scripts_dir, verbose=False): + """ Execute every executable file in a given directory. """ + for obj in os.listdir(scripts_dir): + obj = os.path.abspath(os.path.join(scripts_dir, obj)) + if os.path.isfile(obj) and os.access(obj, os.X_OK): + ExecuteScript(os.path.abspath(obj), verbose=verbose) + +def ExecuteScript(script, verbose=False): """ Execute a command and send its output to the bit bucket. """ - call("%s > /dev/null 2>&1" % script, shell=True) + if verbose: + print "Executing %s" % script + ret = call("%s > /dev/null 2>&1" % script, shell=True) + if verbose: + "%s returned %s" % (script, ret) def ReadFile(filename): """ read in a file and return it's contents as a string """ @@ -409,7 +420,7 @@ def get_sudo_cmd(msg, prog_num=0): def choose_sudo_prog(prog_num=0): """ Try to intelligently decide which graphical sudo program to use. """ if prog_num: - return find_path(sudo_dict[prog_num]) + return find_path(_sudo_dict[prog_num]) desktop_env = detect_desktop_environment() env_path = os.environ['PATH'].split(":") paths = [] @@ -667,4 +678,4 @@ def timeout_add(time, func, milli=False): else: if not milli: time = time * 1000 return gobject.timeout_add(time, func) - \ No newline at end of file + diff --git a/wicd/networking.py b/wicd/networking.py index b324663..4f9b797 100644 --- a/wicd/networking.py +++ b/wicd/networking.py @@ -396,7 +396,7 @@ class ConnectThread(threading.Thread): print 'Setting the broadcast address...' + self.network['broadcast'] iface.SetAddress(broadcast=self.network['broadcast']) - @abortable + @abortable def set_ip_address(self, iface): """ Set the IP address for the given interface. @@ -420,7 +420,7 @@ class ConnectThread(threading.Thread): self.abort_connection(dhcp_status) return - @abortable + @abortable def set_dns_addresses(self): """ Set the DNS address(es). @@ -443,7 +443,7 @@ class ConnectThread(threading.Thread): self.network.get('dns_domain'), self.network.get('search_domain')) - @abortable + @abortable def release_dhcp_clients(self, iface): """ Release all running dhcp clients. """ print "Releasing DHCP leases..." @@ -474,7 +474,7 @@ class ConnectThread(threading.Thread): finally: self.lock.release() - @abortable + @abortable def put_iface_up(self, iface): """ Bring up given interface. """ print 'Putting interface up...' @@ -819,7 +819,7 @@ class WirelessConnectThread(ConnectThread): print 'Stopping wpa_supplicant' wiface.StopWPA() - @abortable + @abortable def generate_psk_and_authenticate(self, wiface): """ Generates a PSK and authenticates if necessary. diff --git a/wicd/wicd-client.py b/wicd/wicd-client.py index cc04b19..85fcbae 100755 --- a/wicd/wicd-client.py +++ b/wicd/wicd-client.py @@ -109,12 +109,12 @@ class TrayIcon(object): Base Class for implementing a tray icon to display network status. """ - def __init__(self, use_tray, animate): + def __init__(self, animate): if USE_EGG: - self.tr = self.EggTrayIconGUI(use_tray) + self.tr = self.EggTrayIconGUI() else: - self.tr = self.StatusTrayIconGUI(use_tray) - self.icon_info = self.TrayConnectionInfo(self.tr, use_tray, animate) + self.tr = self.StatusTrayIconGUI() + self.icon_info = self.TrayConnectionInfo(self.tr, animate) def is_embedded(self): if USE_EGG: @@ -125,7 +125,7 @@ class TrayIcon(object): class TrayConnectionInfo(object): """ Class for updating the tray icon status. """ - def __init__(self, tr, use_tray=True, animate=True): + def __init__(self, tr, animate=True): """ Initialize variables needed for the icon status methods. """ self.last_strength = -2 self.still_wired = False @@ -133,7 +133,6 @@ class TrayIcon(object): self.tried_reconnect = False self.connection_lost_counter = 0 self.tr = tr - self.use_tray = use_tray self.last_sndbytes = -1 self.last_rcvbytes = -1 self.max_snd_gain = 10000 @@ -203,7 +202,7 @@ class TrayIcon(object): @catchdbus def update_tray_icon(self, state=None, info=None): """ Updates the tray icon and current connection status. """ - if not self.use_tray or not DBUS_AVAIL: return False + if not DBUS_AVAIL: return False if not state or not info: [state, info] = daemon.GetConnectionStatus() @@ -330,7 +329,7 @@ class TrayIcon(object): tray icons. """ - def __init__(self, use_tray): + def __init__(self): menu = """ @@ -361,7 +360,6 @@ class TrayIcon(object): props.parent) self.gui_win = None self.current_icon_path = None - self.use_tray = use_tray self._is_scanning = False net_menuitem = self.manager.get_widget("/Menubar/Menu/Connect/") net_menuitem.connect("activate", self.on_net_menu_activate) @@ -571,14 +569,9 @@ class TrayIcon(object): for machines running versions of GTK < 2.10. """ - def __init__(self, use_tray=True): + def __init__(self): """Initializes the tray icon""" - TrayIcon.TrayIconGUI.__init__(self, use_tray) - self.use_tray = use_tray - if not use_tray: - self.toggle_wicd_gui() - return - + TrayIcon.TrayIconGUI.__init__(self) self.tooltip = gtk.Tooltips() self.eb = gtk.EventBox() self.tray = egg.trayicon.TrayIcon("WicdTrayIcon") @@ -601,7 +594,6 @@ class TrayIcon(object): def set_from_file(self, val=None): """ Calls set_from_file on the gtk.Image for the tray icon. """ - if not self.use_tray: return self.pic.set_from_file(val) def set_tooltip(self, val): @@ -611,7 +603,6 @@ class TrayIcon(object): tray icon. """ - if not self.use_tray: return self.tooltip.set_tip(self.eb, val) @@ -622,13 +613,8 @@ class TrayIcon(object): Uses gtk.StatusIcon to implement a tray icon. """ - def __init__(self, use_tray=True): - TrayIcon.TrayIconGUI.__init__(self, use_tray) - self.use_tray = use_tray - if not use_tray: - self.toggle_wicd_gui() - return - + def __init__(self): + TrayIcon.TrayIconGUI.__init__(self) gtk.StatusIcon.__init__(self) self.current_icon_path = '' @@ -645,7 +631,6 @@ class TrayIcon(object): def set_from_file(self, path=None): """ Sets a new tray icon picture. """ - if not self.use_tray: return if path != self.current_icon_path: self.current_icon_path = path gtk.StatusIcon.set_from_file(self, path) @@ -716,9 +701,6 @@ def main(argv): argv -- The arguments passed to the script. """ - use_tray = True - animate = True - try: opts, args = getopt.getopt(sys.argv[1:], 'nha', ['help', 'no-tray', 'no-animate']) @@ -727,6 +709,8 @@ def main(argv): usage() sys.exit(2) + use_tray = True + animate = True for opt, a in opts: if opt in ('-h', '--help'): usage() @@ -750,7 +734,7 @@ def main(argv): sys.exit(0) # Set up the tray icon GUI and backend - tray_icon = TrayIcon(use_tray, animate) + tray_icon = TrayIcon(animate) # Check to see if wired profile chooser was called before icon # was launched (typically happens on startup or daemon restart). @@ -767,7 +751,8 @@ def main(argv): 'org.wicd.daemon.wireless') bus.add_signal_receiver(tray_icon.tr.tray_scan_started, 'SendStartScanSignal', 'org.wicd.daemon.wireless') - bus.add_signal_receiver(lambda: handle_no_dbus() or tray_icon.icon_info.set_not_connected_state(), + bus.add_signal_receiver(lambda: (handle_no_dbus() or + tray_icon.icon_info.set_not_connected_state()), "DaemonClosing", 'org.wicd.daemon') bus.add_signal_receiver(lambda: setup_dbus(force=False), "DaemonStarting", "org.wicd.daemon") From e40afce1041439046465a68d38ec82e42b4ccf7f Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Fri, 27 Feb 2009 00:40:19 -0500 Subject: [PATCH 02/10] Initial crack at global scripts support. Also includes some setup.py tweaks. --- in/wicd=wpath.py.in | 4 ++++ setup.py | 56 +++++++++++++++++++++++++++------------------ wicd/networking.py | 17 +++++++++++--- 3 files changed, 52 insertions(+), 25 deletions(-) diff --git a/in/wicd=wpath.py.in b/in/wicd=wpath.py.in index fa4a753..2d27b0e 100755 --- a/in/wicd=wpath.py.in +++ b/in/wicd=wpath.py.in @@ -26,6 +26,10 @@ curses_revision = '%CURSES_REVNO%' lib = '%LIB%' share = '%SHARE%' etc = '%ETC%' +scripts = '%SCRIPTS%' +disconnectscripts = '%DISCONNECTSCRIPTS%' +preconnectscripts = '%PRECONNECTSCRIPTS%' +postconnectscripts = '%POSTCONNECTSCRIPTS%' images = '%IMAGES%' encryption = '%ENCRYPTION%' bin = '%BIN%' diff --git a/setup.py b/setup.py index 92ffc2c..68af3ab 100755 --- a/setup.py +++ b/setup.py @@ -51,6 +51,10 @@ class configure(Command): ('lib=', None, 'set the lib directory'), ('share=', None, 'set the share directory'), ('etc=', None, 'set the etc directory'), + ('scripts=', None, 'set the global scripts directory'), + ('disconnectscripts=', None, 'set the global disconnect scripts directory'), + ('preconnectscripts=', None, 'set the global preconnect scripts directory'), + ('postconnectscripts=', None, 'set the global postconnect scripts directory'), ('images=', None, 'set the image directory'), ('encryption=', None, 'set the encryption template directory'), ('bin=', None, 'set the bin directory'), @@ -96,6 +100,10 @@ class configure(Command): self.lib = '/usr/lib/wicd/' self.share = '/usr/share/wicd/' self.etc = '/etc/wicd/' + self.scripts = self.etc + "scripts/" + self.preconnectscripts = self.scripts + "preconnect/" + self.postconnectscripts = self.scripts + "postconnect/" + self.disconnectscripts = self.scripts + "disconnect/" self.icons = '/usr/share/icons/hicolor/' self.images = '/usr/share/pixmaps/wicd/' self.encryption = self.etc + 'encryption/templates/' @@ -175,10 +183,12 @@ class configure(Command): # If we don't get anything from *-config, or it didn't run properly, # or the path is not a proper absolute path, raise an error try: - pmtemp = subprocess.Popen(["pkg-config","--variable=pm_sleephooks","pm-utils"], stdout=subprocess.PIPE) + pmtemp = subprocess.Popen(["pkg-config", "--variable=pm_sleephooks", + "pm-utils"], stdout=subprocess.PIPE) returncode = pmtemp.wait() # let it finish, and get the exit code pmutils_candidate = pmtemp.stdout.readline().strip() # read stdout - if len(pmutils_candidate) == 0 or returncode != 0 or not os.path.isabs(pmutils_candidate): + if len(pmutils_candidate) == 0 or returncode != 0 or \ + not os.path.isabs(pmutils_candidate): raise ValueError else: self.pmutils = pmutils_candidate @@ -189,7 +199,8 @@ class configure(Command): kdetemp = subprocess.Popen(["kde-config","--prefix"], stdout=subprocess.PIPE) returncode = kdetemp.wait() # let it finish, and get the exit code kdedir_candidate = kdetemp.stdout.readline().strip() # read stdout - if len(kdedir_candidate) == 0 or returncode != 0 or not os.path.isabs(kdedir_candidate): + if len(kdedir_candidate) == 0 or returncode != 0 or \ + not os.path.isabs(kdedir_candidate): raise ValueError else: self.kdedir = kdedir_candidate + '/share/autostart' @@ -218,11 +229,10 @@ class configure(Command): def finalize_options(self): - if self.distro_detect_failed == True: - if not self.no_install_init: - if self.init == 'FAIL' or self.initfile == 'FAIL': - print 'ERROR: Failed to detect distro. Configure cannot continue. ' + \ - 'Please specify --init and --initfile to continue with configuration.' + if self.distro_detect_failed and not self.no_install_init and \ + 'FAIL' in [self.init, self.initfile]: + print 'ERROR: Failed to detect distro. Configure cannot continue. ' + \ + 'Please specify --init and --initfile to continue with configuration.' # loop through the argument definitions in user_options @@ -408,6 +418,10 @@ try: (wpath.lib, ['wicd/wicd-client.py', 'wicd/monitor.py', 'wicd/wicd-daemon.py', 'wicd/configscript.py', 'wicd/suspend.py', 'wicd/autoconnect.py']), #'wicd/wicd-gui.py', (wpath.backends, ['wicd/backends/be-external.py', 'wicd/backends/be-ioctl.py']), (wpath.autostart, ['other/wicd-tray.desktop', ]), + (wpath.scripts, []), + (wpath.disconnectscripts, []), + (wpath.preconnectscripts, []), + (wpath.postconnectscripts, []), ] if not wpath.no_install_ncurses: data.append(( wpath.lib, ['curses/curses_misc.py'])) @@ -456,14 +470,16 @@ except Exception, e: python setup.py configure has not yet been run.''' -wpactrl_ext = Extension(name = 'wpactrl', sources = ['depends/python-wpactrl/wpa_ctrl.c', 'depends/python-wpactrl/wpactrl.c'], - extra_compile_args = ["-fno-strict-aliasing"]) +wpactrl_ext = Extension(name = 'wpactrl', + sources = ['depends/python-wpactrl/wpa_ctrl.c', + 'depends/python-wpactrl/wpactrl.c'], + extra_compile_args = ["-fno-strict-aliasing"]) -iwscan_ext = Extension(name = 'iwscan', - libraries = ['iw'], - sources = ['depends/python-iwscan/pyiwscan.c']) +iwscan_ext = Extension(name = 'iwscan', libraries = ['iw'], + sources = ['depends/python-iwscan/pyiwscan.c']) -setup(cmdclass={'configure' : configure, 'get_translations' : get_translations, 'uninstall' : uninstall, 'test' : test, 'cleargenerated' : cleargenerated}, +setup(cmdclass={'configure' : configure, 'get_translations' : get_translations, + 'uninstall' : uninstall, 'test' : test, 'cleargenerated' : cleargenerated}, name="Wicd", version=VERSION_NUM, description="A wireless and wired network manager", @@ -476,16 +492,12 @@ encryption types, such as WPA and WEP. Wicd will automatically connect at startup to any preferred network within range. """, author="Adam Blackburn, Dan O'Reilly", - author_email="compwiz18@users.sourceforge.net, imdano@users.sourceforge.net", + author_email="compwiz18@users.sourceforge.net, oreilldf@gmail.com", url="http://wicd.net", license="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html", - ## scripts=['configscript.py', 'autoconnect.py', 'gui.py', 'wicd.py', 'daemon.py', 'suspend.py', 'monitor.py'], - py_modules=['wicd.networking', 'wicd.misc', 'wicd.gui', 'wicd.wnettools', 'wicd.wpath', - 'wicd.prefs', 'wicd.netentry', 'wicd.dbusmanager', 'wicd.logfile', 'wicd.backend', - 'wicd.configmanager', 'wicd.guiutil'], + py_modules=['wicd.networking', 'wicd.misc', 'wicd.gui', 'wicd.wnettools', + 'wicd.wpath', 'wicd.prefs', 'wicd.netentry', 'wicd.dbusmanager', + 'wicd.logfile', 'wicd.backend', 'wicd.configmanager', 'wicd.guiutil'], ext_modules=[iwscan_ext, wpactrl_ext], data_files=data ) -##print "Running post-install configuration..." -##os.system("other/postinst") -##print 'Done.' diff --git a/wicd/networking.py b/wicd/networking.py index c308790..26c71bc 100644 --- a/wicd/networking.py +++ b/wicd/networking.py @@ -202,10 +202,12 @@ class Controller(object): def Disconnect(self, *args, **kargs): """ Disconnect from the network. """ iface = self.iface - if self.disconnect_script != None: + misc.ExecuteScripts(wpath.disconnectscripts, self.debug) + if self.disconnect_script: print 'Running disconnect script' misc.ExecuteScript(expand_script_macros(self.disconnect_script, - 'disconnection', *args)) + 'disconnection', *args), + self.debug) iface.ReleaseDHCP() iface.SetAddress('0.0.0.0') iface.FlushRoutes() @@ -368,6 +370,10 @@ class ConnectThread(threading.Thread): self.SetStatus('interface_down') iface.Down() + @abortable + def run_global_scripts_if_needed(self, script_dir): + misc.ExecuteScripts(script_dir, verbose=self.debug) + @abortable def run_script_if_needed(self, script, msg, bssid='wired', essid='wired'): """ Execute a given script if needed. @@ -379,7 +385,8 @@ class ConnectThread(threading.Thread): """ if script: print 'Executing %s script' % (msg) - misc.ExecuteScript(expand_script_macros(script, msg, bssid, essid)) + misc.ExecuteScript(expand_script_macros(script, msg, bssid, essid), + self.debug) @abortable def flush_routes(self, iface): @@ -761,6 +768,7 @@ class WirelessConnectThread(ConnectThread): self.is_connecting = True # Run pre-connection script. + self.run_global_scripts_if_needed(wpath.preconnectscripts) self.run_script_if_needed(self.before_script, 'pre-connection', self.network['bssid'], self.network['essid']) @@ -803,6 +811,7 @@ class WirelessConnectThread(ConnectThread): self.set_dns_addresses() # Run post-connection script. + self.run_global_scripts_if_needed(wpath.postconnectscripts) self.run_script_if_needed(self.after_script, 'post-connection', self.network['bssid'], self.network['essid']) @@ -971,6 +980,7 @@ class WiredConnectThread(ConnectThread): self.is_connecting = True # Run pre-connection script. + self.run_global_scripts_if_needed(wpath.preconnectscripts) self.run_script_if_needed(self.before_script, 'pre-connection', 'wired', 'wired') @@ -989,6 +999,7 @@ class WiredConnectThread(ConnectThread): self.set_dns_addresses() # Run post-connection script. + self.run_global_scripts_if_needed(wpath.postconnectscripts) self.run_script_if_needed(self.after_script, 'post-connection', 'wired', 'wired') From edbfd1855326ed40da73d83d29dc4b960940cbd8 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Sat, 28 Feb 2009 15:34:34 -0500 Subject: [PATCH 03/10] Don't use the thread module in networking.py. --- wicd/networking.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wicd/networking.py b/wicd/networking.py index c308790..efb62c5 100644 --- a/wicd/networking.py +++ b/wicd/networking.py @@ -45,7 +45,6 @@ import re import time import threading import os -import thread from signal import SIGTERM # wicd imports @@ -267,7 +266,7 @@ class ConnectThread(threading.Thread): is_connecting = None should_die = False - lock = thread.allocate_lock() + lock = threading.Lock() def __init__(self, network, interface_name, before_script, after_script, disconnect_script, gdns1, gdns2, gdns3, gdns_dom, gsearch_dom, @@ -470,7 +469,7 @@ class ConnectThread(threading.Thread): try: if self._should_die: self.connect_aborted('aborted') - thread.exit() + raise SystemExit finally: self.lock.release() From 5f6807732ab90b77b09d88bae7ad3f3bf92efc93 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Sun, 1 Mar 2009 22:43:28 -0500 Subject: [PATCH 04/10] Don't provide separate options for pre/post/disconnect scripts. Just a parent scripts directory. --- in/wicd=wpath.py.in | 6 ++-- setup.py | 84 +++++++++++++++++++++++---------------------- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/in/wicd=wpath.py.in b/in/wicd=wpath.py.in index 2d27b0e..8f82101 100755 --- a/in/wicd=wpath.py.in +++ b/in/wicd=wpath.py.in @@ -27,9 +27,9 @@ lib = '%LIB%' share = '%SHARE%' etc = '%ETC%' scripts = '%SCRIPTS%' -disconnectscripts = '%DISCONNECTSCRIPTS%' -preconnectscripts = '%PRECONNECTSCRIPTS%' -postconnectscripts = '%POSTCONNECTSCRIPTS%' +disconnectscripts = '%SCRIPTS%disconnect' +preconnectscripts = '%SCRIPTS%preconnect' +postconnectscripts = '%SCRIPTS%postconnect' images = '%IMAGES%' encryption = '%ENCRYPTION%' bin = '%BIN%' diff --git a/setup.py b/setup.py index 68af3ab..b8bf723 100755 --- a/setup.py +++ b/setup.py @@ -42,6 +42,7 @@ except Exception, e: print 'failed to find revision number:' print e + class configure(Command): description = "configure the paths that Wicd will be installed to" @@ -52,9 +53,6 @@ class configure(Command): ('share=', None, 'set the share directory'), ('etc=', None, 'set the etc directory'), ('scripts=', None, 'set the global scripts directory'), - ('disconnectscripts=', None, 'set the global disconnect scripts directory'), - ('preconnectscripts=', None, 'set the global preconnect scripts directory'), - ('postconnectscripts=', None, 'set the global postconnect scripts directory'), ('images=', None, 'set the image directory'), ('encryption=', None, 'set the encryption template directory'), ('bin=', None, 'set the bin directory'), @@ -95,15 +93,11 @@ class configure(Command): ('no-install-ncurses', None, 'do not install the ncurses client') ] - def initialize_options(self): self.lib = '/usr/lib/wicd/' self.share = '/usr/share/wicd/' self.etc = '/etc/wicd/' self.scripts = self.etc + "scripts/" - self.preconnectscripts = self.scripts + "preconnect/" - self.postconnectscripts = self.scripts + "postconnect/" - self.disconnectscripts = self.scripts + "disconnect/" self.icons = '/usr/share/icons/hicolor/' self.images = '/usr/share/pixmaps/wicd/' self.encryption = self.etc + 'encryption/templates/' @@ -210,10 +204,11 @@ class configure(Command): kde4temp = subprocess.Popen(["kde4-config","--prefix"], stdout=subprocess.PIPE) returncode = kde4temp.wait() # let it finish, and get the exit code kde4dir_candidate = kde4temp.stdout.readline().strip() # read stdout - if len(kde4dir_candidate) == 0 or returncode != 0 or not os.path.isabs(kde4dir_candidate): + if len(kde4dir_candidate) == 0 or returncode != 0 or \ + not os.path.isabs(kde4dir_candidate): raise ValueError else: - self.kdedir = kde4dir_candidate + '/share/autostart' + self.kdedir = kde4dir_candidate + '/share/autostart' except (OSError, ValueError): # If neither kde-config nor kde4-config are not present or # return an error, then we can assume that kde isn't installed @@ -227,14 +222,12 @@ class configure(Command): self.initfilename = os.path.basename(self.initfile) self.wicdgroup = 'users' - def finalize_options(self): if self.distro_detect_failed and not self.no_install_init and \ 'FAIL' in [self.init, self.initfile]: print 'ERROR: Failed to detect distro. Configure cannot continue. ' + \ 'Please specify --init and --initfile to continue with configuration.' - - + # loop through the argument definitions in user_options for argument in self.user_options: # argument name is the first item in the user_options list @@ -257,12 +250,15 @@ class configure(Command): values = list() for argument in self.user_options: if argument[0].endswith('='): - print argument[0][:-1],'is', - print getattr(self, argument[0][:-1]) - values.append((argument[0][:-1], getattr(self, argument[0][:-1].replace('-','_')))) + cur_arg = argument[0][:-1] + cur_arg_value = getattr(self, cur_arg) + print "%s is %s" % (cur_arg, cur_arg_value) + values.append((cur_arg, cur_arg_value.replace('-', '_'))) else: - print "Found switch",argument,getattr(self, argument[0].replace('-','_')) - values.append((argument[0], bool(getattr(self, argument[0].replace('-','_'))))) + cur_arg = argument[0] + cur_arg_value = getattr(self, cur_arg.replace('-', '_')) + print "Found switch %s %s" % (argument, cur_arg_value) + values.append((cur_arg, bool(cur_arg_value))) print 'Replacing values in template files...' for item in os.listdir('in'): @@ -275,7 +271,8 @@ class configure(Command): item_out = open(final_name, 'w') for line in item_in.readlines(): for item, value in values: - line = line.replace('%' + str(item.upper().replace('-','_')) + '%', str(value)) + line = line.replace('%' + str(item.upper().replace('-','_')) + \ + '%', str(value)) # other things to replace that aren't arguments line = line.replace('%VERSION%', str(VERSION_NUM)) @@ -363,7 +360,8 @@ class get_translations(Command): 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') + os.system('msgfmt --output-file=translations/' + lang_identifier + + '/LC_MESSAGES/wicd.mo ' + lang_identifier + '.po') os.remove(lang_identifier+'.po') @@ -383,7 +381,7 @@ class uninstall(Command): try: import wpath -except: +except ImportError: print '''Error importing wpath.py. You can safely ignore this message. It is probably because you haven't run python setup.py configure yet or you are running it for the first time.''' @@ -410,12 +408,15 @@ try: (wpath.icons + '22x22/apps/', ['icons/22px/wicd-client.png']), (wpath.icons + '16x16/apps/', ['icons/16px/wicd-client.png']), (wpath.images, [('images/' + b) for b in os.listdir('images') if not b.startswith('.')]), - (wpath.encryption, [('encryption/templates/' + b) for b in os.listdir('encryption/templates') if not b.startswith('.')]), + (wpath.encryption, [('encryption/templates/' + b) for b in + os.listdir('encryption/templates') if not b.startswith('.')]), (wpath.networks, []), (wpath.bin, ['scripts/wicd-client', ]), (wpath.sbin, ['scripts/wicd', ]), (wpath.share, ['data/wicd.glade', ]), - (wpath.lib, ['wicd/wicd-client.py', 'wicd/monitor.py', 'wicd/wicd-daemon.py', 'wicd/configscript.py', 'wicd/suspend.py', 'wicd/autoconnect.py']), #'wicd/wicd-gui.py', + (wpath.lib, ['wicd/wicd-client.py', 'wicd/monitor.py', + 'wicd/wicd-daemon.py', 'wicd/configscript.py', + 'wicd/suspend.py', 'wicd/autoconnect.py']), (wpath.backends, ['wicd/backends/be-external.py', 'wicd/backends/be-ioctl.py']), (wpath.autostart, ['other/wicd-tray.desktop', ]), (wpath.scripts, []), @@ -424,12 +425,12 @@ try: (wpath.postconnectscripts, []), ] if not wpath.no_install_ncurses: - data.append(( wpath.lib, ['curses/curses_misc.py'])) - data.append(( wpath.lib, ['curses/prefs_curses.py'])) - data.append(( wpath.lib, ['curses/wicd-curses.py'])) - data.append(( wpath.lib, ['curses/netentry_curses.py'])) - data.append(( wpath.lib, ['curses/configscript_curses.py'])) - data.append(( wpath.bin, ['scripts/wicd-curses'])) + data.append((wpath.lib, ['curses/curses_misc.py'])) + data.append((wpath.lib, ['curses/prefs_curses.py'])) + data.append((wpath.lib, ['curses/wicd-curses.py'])) + data.append((wpath.lib, ['curses/netentry_curses.py'])) + data.append((wpath.lib, ['curses/configscript_curses.py'])) + data.append((wpath.bin, ['scripts/wicd-curses'])) if not wpath.no_install_man: data.append(( wpath.mandir + 'man8/', ['man/wicd-curses.8'])) piddir = os.path.dirname(wpath.pidfile) @@ -437,22 +438,23 @@ try: piddir += '/' data.append (( piddir, [] )) if not wpath.no_install_docs: - data.append(( wpath.docdir, [ 'INSTALL', 'LICENSE', 'AUTHORS', 'README', 'CHANGES','other/WHEREAREMYFILES' ])) + data.append((wpath.docdir, ['INSTALL', 'LICENSE', 'AUTHORS', + 'README', 'CHANGES', 'other/WHEREAREMYFILES'])) if not wpath.no_install_kde: - data.append(( wpath.kdedir, [ 'other/wicd-tray.desktop' ])) + data.append((wpath.kdedir, ['other/wicd-tray.desktop'])) if not wpath.no_install_init: - data.append(( wpath.init, [ wpath.initfile ])) + data.append((wpath.init, [ wpath.initfile ])) if not wpath.no_install_man: - data.append(( wpath.mandir + 'man8/', [ 'man/wicd.8' ])) - data.append(( wpath.mandir + 'man5/', [ 'man/wicd-manager-settings.conf.5' ])) - data.append(( wpath.mandir + 'man5/', [ 'man/wicd-wired-settings.conf.5' ])) - data.append(( wpath.mandir + 'man5/', [ 'man/wicd-wireless-settings.conf.5' ])) - data.append(( wpath.mandir + 'man1/', [ 'man/wicd-client.1' ])) + data.append((wpath.mandir + 'man8/', [ 'man/wicd.8' ])) + data.append((wpath.mandir + 'man5/', [ 'man/wicd-manager-settings.conf.5' ])) + data.append((wpath.mandir + 'man5/', [ 'man/wicd-wired-settings.conf.5' ])) + data.append((wpath.mandir + 'man5/', [ 'man/wicd-wireless-settings.conf.5' ])) + data.append((wpath.mandir + 'man1/', [ 'man/wicd-client.1' ])) if not wpath.no_install_acpi: - data.append(( wpath.resume, ['other/80-wicd-connect.sh' ])) - data.append(( wpath.suspend, ['other/50-wicd-suspend.sh' ])) + data.append((wpath.resume, ['other/80-wicd-connect.sh' ])) + data.append((wpath.suspend, ['other/50-wicd-suspend.sh' ])) if not wpath.no_install_pmutils: - data.append(( wpath.pmutils, ['other/55wicd' ])) + data.append((wpath.pmutils, ['other/55wicd' ])) print 'Using pid path', os.path.basename(wpath.pidfile) print 'Language support for', for language in os.listdir('translations/'): @@ -462,8 +464,8 @@ try: if codes[0].lower() == codes[1].lower(): short_language = codes[0].lower() print short_language, - data.append((wpath.translations + short_language + '/LC_MESSAGES/', ['translations/' + language + '/LC_MESSAGES/wicd.mo'])) - print + data.append((wpath.translations + short_language + '/LC_MESSAGES/', + ['translations/' + language + '/LC_MESSAGES/wicd.mo'])) except Exception, e: print str(e) print '''Error setting up data array. This is normal if From 6dd064207908006e9d7449a2f6e263dc1ddc7c97 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Sun, 1 Mar 2009 23:15:34 -0500 Subject: [PATCH 05/10] Apply lang patch from David Paleino --- wicd/misc.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wicd/misc.py b/wicd/misc.py index 1a53b5c..cc57deb 100644 --- a/wicd/misc.py +++ b/wicd/misc.py @@ -353,7 +353,11 @@ def get_gettext(): if osLanguage: langs += osLanguage.split(":") try: - lc, encoding = locale.getdefaultlocale() + # This avoids a bug: locale.getdefaultlocale() prefers + # LC_CTYPE over LANG/LANGUAGE + lc, encoding = locale.getdefaultlocale(envvars=('LC_MESSAGES', + 'LC_ALL', 'LANG', + 'LANGUAGE')) except ValueError, e: print str(e) print "Default locale unavailable, falling back to en_US" From a1169cb1df67ef355e08e7faac87d98888575c68 Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Wed, 4 Mar 2009 00:02:14 -0500 Subject: [PATCH 06/10] Added translations.py, and adapted all gtk and curses ui files to use it. Moved the language dict functions and get_gettext to translations.py. Also killed the functions and laid the dict bare in the file Removed all instances of language[number] from wicd. --- curses/netentry_curses.py | 10 +- curses/prefs_curses.py | 4 +- curses/wicd-curses.py | 7 +- setup.py | 12 +- wicd/gui.py | 2 +- wicd/misc.py | 221 ------------------------------------- wicd/netentry.py | 8 +- wicd/prefs.py | 2 +- wicd/translations.py | 226 ++++++++++++++++++++++++++++++++++++++ wicd/wicd-client.py | 7 +- 10 files changed, 254 insertions(+), 245 deletions(-) create mode 100644 wicd/translations.py diff --git a/curses/netentry_curses.py b/curses/netentry_curses.py index c00c887..52f89cc 100644 --- a/curses/netentry_curses.py +++ b/curses/netentry_curses.py @@ -28,7 +28,9 @@ from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool -language = misc.get_language_list_gui() +from wicd.translations import language +for i in language.keys(): + language[i] = language[i].decode('utf8') daemon = None wired = None @@ -56,9 +58,9 @@ class AdvancedSettingsDialog(urwid.WidgetWrap): use_global_dns_t = language['use_global_dns'] dns_dom_t = ('editcp',language['dns_domain']+': ') search_dom_t = ('editcp',language['search_domain']+':') - dns1_t = ('editcp',language['dns']+ ' ' + language['1']+':'+' '*8) - dns2_t = ('editcp',language['dns']+ ' ' + language['2']+':'+' '*8) - dns3_t = ('editcp',language['dns']+ ' ' + language['3']+':'+' '*8) + dns1_t = ('editcp',language['dns']+ ' 1'+':'+' '*8) + dns2_t = ('editcp',language['dns']+ ' 2'+':'+' '*8) + dns3_t = ('editcp',language['dns']+ ' 3'+':'+' '*8) cancel_t = 'Cancel' ok_t = 'OK' diff --git a/curses/prefs_curses.py b/curses/prefs_curses.py index 992bc84..c13d756 100755 --- a/curses/prefs_curses.py +++ b/curses/prefs_curses.py @@ -28,7 +28,9 @@ daemon = None wireless = None wired = None -language = misc.get_language_list_gui() +from wicd.translations import language +for i in language.keys(): + language[i] = language[i].decode('utf8') class PrefsDialog(urwid.WidgetWrap): def __init__(self,body,pos,ui,dbus=None): diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index 0428085..cc4dce3 100644 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -67,9 +67,10 @@ from optparse import OptionParser CURSES_REVNO=wpath.curses_revision -language = misc.get_language_list_gui() -# We need 'Connecting' without the '...' -language['connecting']=misc.get_language_list_tray()['connecting'] +# Fix strings in wicd-curses +from wicd.translations import language +for i in language.keys(): + language[i] = language[i].decode('utf8') ######################################## ##### SUPPORT CLASSES diff --git a/setup.py b/setup.py index b8bf723..ae80399 100755 --- a/setup.py +++ b/setup.py @@ -162,7 +162,6 @@ class configure(Command): self.init = '/etc/rc.d/' else: self.init = 'FAIL' - self.initfile = 'FAIL' self.no_install_init = True self.distro_detect_failed = True print 'WARNING: Unable to detect the distribution in use. ' + \ @@ -490,16 +489,17 @@ Wicd supports wired and wireless networks, and capable of creating and tracking profiles for both. It has a template-based wireless encryption system, which allows the user to easily add encryption methods used. It ships with some common -encryption types, such as WPA and WEP. Wicd will automatically +encryption types, such as WPA and WEP. Wicdl will automatically connect at startup to any preferred network within range. """, author="Adam Blackburn, Dan O'Reilly", - author_email="compwiz18@users.sourceforge.net, oreilldf@gmail.com", + author_email="compwiz18@gmail.com, oreilldf@gmail.com", url="http://wicd.net", license="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html", - py_modules=['wicd.networking', 'wicd.misc', 'wicd.gui', 'wicd.wnettools', - 'wicd.wpath', 'wicd.prefs', 'wicd.netentry', 'wicd.dbusmanager', - 'wicd.logfile', 'wicd.backend', 'wicd.configmanager', 'wicd.guiutil'], + py_modules=['wicd.networking','wicd.misc','wicd.gui','wicd.wnettools', + 'wicd.wpath','wicd.prefs','wicd.netentry','wicd.dbusmanager', + 'wicd.logfile','wicd.backend','wicd.configmanager', + 'wicd.guiutil','wicd.translations'], ext_modules=[iwscan_ext, wpactrl_ext], data_files=data ) diff --git a/wicd/gui.py b/wicd/gui.py index 1f23fb8..4be5bfb 100644 --- a/wicd/gui.py +++ b/wicd/gui.py @@ -43,12 +43,12 @@ from wicd.misc import noneToString from wicd.netentry import WiredNetworkEntry, WirelessNetworkEntry from wicd.prefs import PreferencesDialog from wicd.guiutil import error, GreyLabel, LabelEntry, SmallLabel +from wicd.translations import language if __name__ == '__main__': wpath.chdir(__file__) proxy_obj = daemon = wireless = wired = bus = None -language = misc.get_language_list_gui() DBUS_AVAIL = False def setup_dbus(force=True): diff --git a/wicd/misc.py b/wicd/misc.py index cc57deb..dac2743 100644 --- a/wicd/misc.py +++ b/wicd/misc.py @@ -19,7 +19,6 @@ import os import locale -import gettext import sys import re import gobject @@ -339,36 +338,6 @@ def noneToString(text): else: return str(text) -def get_gettext(): - """ Set up gettext for translations. """ - # Borrowed from an excellent post on how to do this at - # http://www.learningpython.com/2006/12/03/translating-your-pythonpygtk-application/ - local_path = wpath.translations - langs = [] - osLanguage = os.environ.get('LANGUAGE', None) - if osLanguage: - langs += osLanguage.split(":") - osLanguage = None - osLanguage = os.environ.get('LC_MESSAGES', None) - if osLanguage: - langs += osLanguage.split(":") - try: - # This avoids a bug: locale.getdefaultlocale() prefers - # LC_CTYPE over LANG/LANGUAGE - lc, encoding = locale.getdefaultlocale(envvars=('LC_MESSAGES', - 'LC_ALL', 'LANG', - 'LANGUAGE')) - except ValueError, e: - print str(e) - print "Default locale unavailable, falling back to en_US" - if (lc): - langs += [lc] - langs += ["en_US"] - lang = gettext.translation('wicd', local_path, languages=langs, - fallback=True) - _ = lang.gettext - return _ - def to_unicode(x): """ Attempts to convert a string to utf-8. """ # If this is a unicode string, encode it and return @@ -478,196 +447,6 @@ def find_path(cmd): return os.path.join(path, cmd) return None -def get_language_list_gui(): - """ Returns a dict of translatable strings used by the GUI. - - Translations are done at http://wicd.net/translator. Please - translate if you can. - - """ - _ = get_gettext() - language = {} - language['connect'] = _("Connect") - language['ip'] = _("IP") - language['netmask'] = _("Netmask") - language['gateway'] = _('Gateway') - language['dns'] = _('DNS') - language['use_static_ip'] = _('Use Static IPs') - language['use_static_dns'] = _('Use Static DNS') - language['use_encryption'] = _('Use Encryption') - language['advanced_settings'] = _('Advanced Settings') - language['properties'] = _('Properties') - language['wired_network'] = _('Wired Network') - language['wired_network_instructions'] = _('To connect to a wired network,' - ' you must create a network profile. To create a network profile, type a' - ' name that describes this network, and press Add.') - language['automatic_connect'] = _('Automatically connect to this network') - language['secured'] = _('Secured') - language['unsecured'] = _('Unsecured') - language['channel'] = _('Channel') - language['preferences'] = _('Preferences') - language['wpa_supplicant_driver'] = _('WPA Supplicant Driver') - language['wireless_interface'] = _('Wireless Interface') - language['wired_interface'] = _('Wired Interface') - language['hidden_network'] = _('Hidden Network') - language['hidden_network_essid'] = _('Hidden Network ESSID') - language['connected_to_wireless'] = _('Connected to $A at $B (IP: $C)') - language['connected_to_wired'] = _('Connected to wired network (IP: $A)') - language['not_connected'] = _('Not connected') - language['no_wireless_networks_found'] = _('No wireless networks found.') - language['killswitch_enabled'] = _('Wireless Kill Switch Enabled') - language['key'] = _('Key') - language['username'] = _('Username') - language['password'] = _('Password') - language['anonymous_identity'] = _('Anonymous Identity') - language['identity'] = _('Identity') - language['authentication'] = _('Authentication') - language['path_to_pac_file'] = _('Path to PAC File') - language['select_a_network'] = _('Choose from the networks below:') - language['connecting'] = _('Connecting...') - language['wired_always_on'] = _('Always show wired interface') - language['auto_reconnect'] = _('Automatically reconnect on connection loss') - language['create_adhoc_network'] = _('Create an Ad-Hoc Network') - language['essid'] = _('ESSID') - language['use_wep_encryption'] = _('Use Encryption (WEP only)') - language['before_script'] = _('Run script before connect') - language['after_script'] = _('Run script after connect') - language['disconnect_script'] = _('Run disconnect script') - language['script_settings'] = _('Scripts') - language['use_ics'] = _('Activate Internet Connection Sharing') - language['madwifi_for_adhoc'] = _('Check if using madwifi/atheros drivers') - language['default_wired'] = _('Use as default profile (overwrites any previous default)') - language['use_debug_mode'] = _('Enable debug mode') - language['use_global_dns'] = _('Use global DNS servers') - language['use_default_profile'] = _('Use default profile on wired autoconnect') - language['show_wired_list'] = _('Prompt for profile on wired autoconnect') - language['use_last_used_profile'] = _('Use last used profile on wired autoconnect') - language['choose_wired_profile'] = _('Select or create a wired profile to connect with') - language['wired_network_found'] = _('Wired connection detected') - language['stop_showing_chooser'] = _('Stop Showing Autoconnect pop-up temporarily') - language['display_type_dialog'] = _('Use dBm to measure signal strength') - language['scripts'] = _('Scripts') - #language['invalid_address'] = _('Invalid address in $A entry.') - language['global_settings'] = _('Use these settings for all networks sharing this essid') - language['encrypt_info_missing'] = _('Required encryption information is missing.') - language['enable_encryption'] = _('This network requires encryption to be enabled.') - language['wicd_auto_config'] = _('Automatic (recommended)') - language["gen_settings"] = _("General Settings") - language["ext_programs"] = _("External Programs") - language["dhcp_client"] = _("DHCP Client") - language["wired_detect"] = _("Wired Link Detection") - language["route_flush"] = _("Route Table Flushing") - language["backend"] = _("Backend") - language["backend_alert"] = _("Changes to your backend won't occur until the daemon is restarted.") - language['dns_domain'] = _("DNS domain") - language['search_domain'] = _("Search domain") - language['global_dns_not_enabled'] = _("Global DNS has not been enabled in general preferences.") - language['scripts_need_pass'] = _('You must enter your password to configure scripts') - language['no_sudo_prog'] = _("Could not find a graphical sudo program. The script editor could not be launched." + - " You'll have to edit scripts directly your configuration file.") - - language['0'] = _('0') - language['1'] = _('1') - language['2'] = _('2') - language['3'] = _('3') - language['4'] = _('4') - language['5'] = _('5') - language['6'] = _('6') - language['7'] = _('7') - language['8'] = _('8') - language['9'] = _('9') - - language['interface_down'] = _('Putting interface down...') - language['resetting_ip_address'] = _('Resetting IP address...') - language['interface_up'] = _('Putting interface up...') - language['setting_encryption_info'] = _('Setting encryption info') - language['removing_old_connection'] = _('Removing old connection...') - language['generating_psk'] = _('Generating PSK...') - language['generating_wpa_config'] = _('Generating WPA configuration file...') - language['flushing_routing_table'] = _('Flushing the routing table...') - language['configuring_interface'] = _('Configuring wireless interface...') - language['validating_authentication'] = _('Validating authentication...') - language['setting_broadcast_address'] = _('Setting broadcast address...') - language['setting_static_dns'] = _('Setting static DNS servers...') - language['setting_static_ip'] = _('Setting static IP addresses...') - language['running_dhcp'] = _('Obtaining IP address...') - language['dhcp_failed'] = _('Connection Failed: Unable to Get IP Address') - language['no_dhcp_offers'] = _('Connection Failed: No DHCP offers received.') - language['aborted'] = _('Connection Cancelled') - language['bad_pass'] = _('Connection Failed: Could not authenticate (bad password?)') - language['done'] = _('Done connecting...') - language['scanning'] = _('Scanning') - language['scanning_stand_by'] = _('Scanning networks... stand by...') - language['cannot_start_daemon'] = _("Unable to connect to wicd daemon DBus interface. " + \ - "This typically means there was a problem starting the daemon. " + \ - "Check the wicd log for more info") - language['lost_dbus'] = _("The wicd daemon has shut down, the UI will not function properly until it is restarted.") - language['configuring_wireless'] = _("Configuring preferences for wireless network \"$A\" ($B)") - language['configuring_wired'] = _("Configuring preferences for wired profile \"$A\"") - language['scan'] = _('Scan') - language['always_switch_to_wired'] = _("Always switch to wired connection when available") - language['wired_autoconnect_settings'] = _("Wired Autoconnect Settings") - language['always_use_wext'] = _("You should almost always use wext as the WPA supplicant driver") - language['debugging'] = _("Debugging") - language['wpa_supplicant'] = _("WPA Supplicant") - language['automatic_reconnection'] = _("Automatic Reconnection") - language['global_dns_servers'] = _("Global DNS servers") - language['network_interfaces'] = _("Network Interfaces") - language['connecting_to_daemon'] = _("Connecting to daemon...") - language['cannot_connect_to_daemon'] = _("Can't connect to the daemon, trying to start it automatically...") - language['could_not_connect'] = _("Could not connect to wicd's D-Bus interface. Check the wicd log for error messages.") - language["exception"] = _("EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:") - language["brought_to_you"] = _("Brought to you by:") - language["cannot_edit_scripts_1"] = _('To avoid various complications, wicd-curses does not support directly editing the scripts directly. However, you can edit them manually. First, (as root), open the "$A" config file, and look for the section labeled by the $B in question. In this case, this is:') - language["cannot_edit_scripts_2"] = _('Once here, you can adjust (or add) the "beforescript", "afterscript", and "disconnectscript" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively. Alternatively, you can configure the wireless networks by ESSID, by looking for the "[]" field in the config file.') - language["add_new_profile"] = _("Add a new profile") - language["add_new_wired_profile"] = _("Add a new wired profile") - language["no_delete_last_profile"] = _("wicd-curses does not support deleting the last wired profile. Try renaming it ('F2')") - language["rename_wired_profile"] = _("Rename wired profile") - language["select_hidden_essid"] = _("Select Hidden Network ESSID") - language["esc_to_cancel"] = _("Press ESC to cancel") - language["press_to_quit"] = _("Press F8 or Q to quit.") - - language['terminated'] = _("Terminated by user") - language['wicd_curses'] = _("Wicd Curses Interface") - language['dbus_fail'] = _("DBus failure! This is most likely caused by the wicd daemon stopping while wicd-curses is running. Please restart the daemon, and then restart wicd-curses.") - - # Fix strings in wicd-curses - for i in language.keys(): - try : - language[i] = language[i].decode('utf8') - except: - print "\"%s\"" % language[i] - raise - - - return language - -def get_language_list_tray(): - """ Returns a dict of translatable strings used by the tray icon. - - Translations are done at http://wicd.net/translator. Please - translate if you can. - - """ - _ = get_gettext() - language = {} - language['connected_to_wireless'] = _('Connected to $A at $B (IP: $C)') - language['connected_to_wired'] = _('Connected to wired network (IP: $A)') - language['not_connected'] = _('Not connected') - language['killswitch_enabled'] = _('Wireless Kill Switch Enabled') - language['connecting'] = _('Connecting') - language['wired'] = _('Wired Network') - language['scanning'] = _('Scanning') - language['no_wireless_networks_found'] = _('No wireless networks found.') - language['daemon_unavailable'] = _("The wicd daemon is unavailable, so your request cannot be completed") - language['cannot_start_daemon'] = _("Unable to connect to wicd daemon DBus interface." + \ - "This typically means there was a problem starting the daemon." + \ - "Check the wicd log for more info") - language['no_daemon_tooltip'] = _("Wicd daemon unreachable") - language['lost_dbus'] = _("The wicd daemon has shut down, the UI will not function properly until it is restarted.") - return language - def noneToBlankString(text): """ Converts NoneType or "None" to a blank string. """ if text in (None, "None"): diff --git a/wicd/netentry.py b/wicd/netentry.py index 0e1f8fc..58e0be9 100644 --- a/wicd/netentry.py +++ b/wicd/netentry.py @@ -24,7 +24,7 @@ import dbusmanager from misc import noneToString, stringToNone, noneToBlankString, to_bool from guiutil import error, SmallLabel, LabelEntry, GreyLabel, LeftAlignedLabel, string_input -language = misc.get_language_list_gui() +from translations import language # These get set when a NetworkEntry is instantiated. daemon = None @@ -57,9 +57,9 @@ class AdvancedSettingsDialog(gtk.Dialog): self.txt_gateway = LabelEntry(language['gateway']) self.txt_search_dom = LabelEntry(language['search_domain']) self.txt_domain = LabelEntry(language['dns_domain']) - self.txt_dns_1 = LabelEntry(language['dns'] + ' ' + language['1']) - self.txt_dns_2 = LabelEntry(language['dns'] + ' ' + language['2']) - self.txt_dns_3 = LabelEntry(language['dns'] + ' ' + language['3']) + self.txt_dns_1 = LabelEntry(language['dns'] + ' 1') + self.txt_dns_2 = LabelEntry(language['dns'] + ' 2') + self.txt_dns_3 = LabelEntry(language['dns'] + ' 3') self.chkbox_static_ip = gtk.CheckButton(language['use_static_ip']) self.chkbox_static_dns = gtk.CheckButton(language['use_static_dns']) self.chkbox_global_dns = gtk.CheckButton(language['use_global_dns']) diff --git a/wicd/prefs.py b/wicd/prefs.py index 2adfc6d..d25267b 100644 --- a/wicd/prefs.py +++ b/wicd/prefs.py @@ -39,7 +39,7 @@ daemon = None wireless = None wired = None -language = misc.get_language_list_gui() +from translations import language def setup_dbus(): global daemon, wireless, wired diff --git a/wicd/translations.py b/wicd/translations.py new file mode 100644 index 0000000..e9523b1 --- /dev/null +++ b/wicd/translations.py @@ -0,0 +1,226 @@ +#!/usr/bin/env python +# -* coding: utf-8 -*- +# ^^ why do I need this? + +# +# Copyright (C) 2007 - 2009 Adam Blackburn +# Copyright (C) 2007 - 2009 Dan O'Reilly +# Copyright (C) 2009 Andrew Psaltis +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License Version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +import locale +import os +import wpath +import gettext + + +def get_gettext(): + """ Set up gettext for translations. """ + # Borrowed from an excellent post on how to do this at + # http://www.learningpython.com/2006/12/03/translating-your-pythonpygtk-application/ + local_path = wpath.translations + langs = [] + osLanguage = os.environ.get('LANGUAGE', None) + if osLanguage: + langs += osLanguage.split(":") + osLanguage = None + osLanguage = os.environ.get('LC_MESSAGES', None) + if osLanguage: + langs += osLanguage.split(":") + try: + # This avoids a bug: locale.getdefaultlocale() prefers + # LC_CTYPE over LANG/LANGUAGE + lc, encoding = locale.getdefaultlocale(envvars=('LC_MESSAGES', + 'LC_ALL', 'LANG', + 'LANGUAGE')) + except ValueError, e: + print str(e) + print "Default locale unavailable, falling back to en_US" + if (lc): + langs += [lc] + langs += ["en_US"] + lang = gettext.translation('wicd', local_path, languages=langs, + fallback=True) + _ = lang.gettext + return _ + +_ = get_gettext() +language = {} +language['connect'] = _('Connect') +language['ip'] = _('IP') +language['netmask'] = _('Netmask') +language['gateway'] = _('Gateway') +language['dns'] = _('DNS') +language['use_static_ip'] = _('Use Static IPs') +language['use_static_dns'] = _('Use Static DNS') +language['use_encryption'] = _('Use Encryption') +language['advanced_settings'] = _('Advanced Settings') +language['properties'] = _('Properties') +language['wired_network'] = _('Wired Network') +language['wired_network_instructions'] = _('To connect to a wired network,' +' you must create a network profile. To create a network profile, type a' +' name that describes this network, and press Add.') +language['automatic_connect'] = _('Automatically connect to this network') +language['secured'] = _('Secured') +language['unsecured'] = _('Unsecured') +language['channel'] = _('Channel') +language['preferences'] = _('Preferences') +language['wpa_supplicant_driver'] = _('WPA Supplicant Driver') +language['wireless_interface'] = _('Wireless Interface') +language['wired_interface'] = _('Wired Interface') +language['hidden_network'] = _('Hidden Network') +language['hidden_network_essid'] = _('Hidden Network ESSID') +language['connected_to_wireless'] = _('Connected to $A at $B (IP: $C)') +language['connected_to_wired'] = _('Connected to wired network (IP: $A)') +language['not_connected'] = _('Not connected') +language['no_wireless_networks_found'] = _('No wireless networks found.') +language['killswitch_enabled'] = _('Wireless Kill Switch Enabled') +language['key'] = _('Key') +language['username'] = _('Username') +language['password'] = _('Password') +language['anonymous_identity'] = _('Anonymous Identity') +language['identity'] = _('Identity') +language['authentication'] = _('Authentication') +language['path_to_pac_file'] = _('Path to PAC File') +language['select_a_network'] = _('Choose from the networks below:') +#language['connecting...'] = _('Connecting...') +language['wired_always_on'] = _('Always show wired interface') +language['auto_reconnect'] = _('Automatically reconnect on connection loss') +language['create_adhoc_network'] = _('Create an Ad-Hoc Network') +language['essid'] = _('ESSID') +language['use_wep_encryption'] = _('Use Encryption (WEP only)') +language['before_script'] = _('Run script before connect') +language['after_script'] = _('Run script after connect') +language['disconnect_script'] = _('Run disconnect script') +language['script_settings'] = _('Scripts') +language['use_ics'] = _('Activate Internet Connection Sharing') +language['madwifi_for_adhoc'] = _('Check if using madwifi/atheros drivers') +language['default_wired'] = _('Use as default profile (overwrites any previous default)') +language['use_debug_mode'] = _('Enable debug mode') +language['use_global_dns'] = _('Use global DNS servers') +language['use_default_profile'] = _('Use default profile on wired autoconnect') +language['show_wired_list'] = _('Prompt for profile on wired autoconnect') +language['use_last_used_profile'] = _('Use last used profile on wired autoconnect') +language['choose_wired_profile'] = _('Select or create a wired profile to connect with') +language['wired_network_found'] = _('Wired connection detected') +language['stop_showing_chooser'] = _('Stop Showing Autoconnect pop-up temporarily') +language['display_type_dialog'] = _('Use dBm to measure signal strength') +language['scripts'] = _('Scripts') +language['invalid_address'] = _('Invalid address in $A entry.') +language['global_settings'] = _('Use these settings for all networks sharing this essid') +language['encrypt_info_missing'] = _('Required encryption information is missing.') +language['enable_encryption'] = _('This network requires encryption to be enabled.') +language['wicd_auto_config'] = _('Automatic (recommended)') +language["gen_settings"] = _('General Settings') +language["ext_programs"] = _('External Programs') +language["dhcp_client"] = _('DHCP Client') +language["wired_detect"] = _('Wired Link Detection') +language["route_flush"] = _('Route Table Flushing') +language["backend"] = _('Backend') +language["backend_alert"] = _('Changes to your backend won\'t occur until the daemon is restarted.') +language['dns_domain'] = _('DNS domain') +language['search_domain'] = _('Search domain') +language['global_dns_not_enabled'] = _('Global DNS has not been enabled in general preferences.') +language['scripts_need_pass'] = _('You must enter your password to configure scripts') +language['no_sudo_prog'] = _('Could not find a graphical sudo program. The script editor could not be launched.' + + ' You\'ll have to edit scripts directly your configuration file.') + +language['interface_down'] = _('Putting interface down...') +language['resetting_ip_address'] = _('Resetting IP address...') +language['interface_up'] = _('Putting interface up...') +language['setting_encryption_info'] = _('Setting encryption info') +language['removing_old_connection'] = _('Removing old connection...') +language['generating_psk'] = _('Generating PSK...') +language['generating_wpa_config'] = _('Generating WPA configuration file...') +language['flushing_routing_table'] = _('Flushing the routing table...') +language['configuring_interface'] = _('Configuring wireless interface...') +language['validating_authentication'] = _('Validating authentication...') +language['setting_broadcast_address'] = _('Setting broadcast address...') +language['setting_static_dns'] = _('Setting static DNS servers...') +language['setting_static_ip'] = _('Setting static IP addresses...') +language['running_dhcp'] = _('Obtaining IP address...') +language['dhcp_failed'] = _('Connection Failed: Unable to Get IP Address') +language['no_dhcp_offers'] = _('Connection Failed: No DHCP offers received.') +language['aborted'] = _('Connection Cancelled') +language['bad_pass'] = _('Connection Failed: Could not authenticate (bad password?)') +language['done'] = _('Done connecting...') +language['scanning'] = _('Scanning') +language['scanning_stand_by'] = _('Scanning networks... stand by...') +language['cannot_start_daemon'] = _('Unable to connect to wicd daemon DBus interface. " + \ + "This typically means there was a problem starting the daemon. " + \ + "Check the wicd log for more info') +language['lost_dbus'] = _('The wicd daemon has shut down, the UI will not function properly until it is restarted.') +language['configuring_wireless'] = _('Configuring preferences for wireless network "$A" ($B)') +language['configuring_wired'] = _('Configuring preferences for wired profile "$A"') +language['scan'] = _('Scan') +language['always_switch_to_wired'] = _('Always switch to wired connection when available') +language['wired_autoconnect_settings'] = _('Wired Autoconnect Settings') +language['always_use_wext'] = _('You should almost always use wext as the WPA supplicant driver') +language['debugging'] = _('Debugging') +language['wpa_supplicant'] = _('WPA Supplicant') +language['automatic_reconnection'] = _('Automatic Reconnection') +language['global_dns_servers'] = _('Global DNS servers') +language['network_interfaces'] = _('Network Interfaces') +language['connecting_to_daemon'] = _('Connecting to daemon...') +language['cannot_connect_to_daemon'] = _('Can\'t connect to the daemon, trying to start it automatically...') +language['could_not_connect'] = _('Could not connect to wicd\'s D-Bus interface. Check the wicd log for error messages.') +language["exception"] = _('EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:') +language["brought_to_you"] = _('Brought to you by:') +language["add_new_profile"] = _('Add a new profile') +language["add_new_wired_profile"] = _('Add a new wired profile') +language["no_delete_last_profile"] = _('wicd-curses does not support deleting the last wired profile. Try renaming it (\'F2\')') +language["rename_wired_profile"] = _('Rename wired profile') +language["select_hidden_essid"] = _('Select Hidden Network ESSID') +language["esc_to_cancel"] = _('Press ESC to cancel') +language["press_to_quit"] = _('Press F8 or Q to quit.') + +language['terminated'] = _('Terminated by user') +language['wicd_curses'] = _('Wicd Curses Interface') +language['dbus_fail'] = _('DBus failure! This is most likely caused by the wicd daemon stopping while wicd-curses is running. Please restart the daemon, and then restart wicd-curses.') + +# These are in the tray list, but not in the non-tray list +language['connecting'] = _('Connecting') +language['daemon_unavailable'] = _('The wicd daemon is unavailable, so your request cannot be completed') +language['no_daemon_tooltip'] = _('Wicd daemon unreachable') + +# Translations added on Wed Mar 4 03:36:24 UTC 2009 +language['make_wired_profile'] = _('To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add.') +language['access_cards'] = _('Wicd needs to access your computer\'s network cards.') +#language['CHANGE_ME'] = _('Create Ad-Hoc network') +#language['CHANGE_ME'] = _('Wired Autoconnect Setting:') +language['bad_pass'] = _('Connection Failed: Bad password') +language['cannot_edit_scripts_1'] = _('To avoid various complications, wicd-curses does not support directly editing the scripts directly. However, you can edit them manually. First, (as root)", open the "$A" config file, and look for the section labeled by the $B in question. In this case, this is:') +language['cannot_edit_scripts_2'] = _('Once there, you can adjust (or add) the "beforescript", "afterscript", and "disconnectscript" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively. Note that you will be specifying the full path to the scripts - not the actual script contents. You will need to add/edit the script contents separately. Refer to the wicd manual page for more information.') +language['cannot_edit_scripts_3'] = _('You can also configure the wireless networks by looking for the "[]" field in the config file.') +language['wired_networks'] = _('Wired Networks') +language['wireless_networks'] = _('Wireless Networks') +language['about'] = _('About Wicd') +language['more_help'] = _('For more detailed help, consult the wicd-curses(8) man page.') +language['case_sensitive'] = _('All controls are case sensitive') +language['help_help'] = _('Display this help dialog') +language['connect_help'] = _('Connect to selected network') +language['disconn_help'] = _('Disconnect from all networks') +language['about_help'] = _('Stop a network connection in progress') +language['refresh_help'] = _('Refresh network list') +language['prefs_help'] = _('Preferences dialog') +language['scan_help'] = _('Scan for hidden networks') +language['scripts_help'] = _('Select scripts') +language['adhoc_help'] = _('Set up Ad-hoc network') +language['config_help'] = _('Configure Selected Network') +#language[''] = _('Press H or ? for help') # Defunct in curses-uimod +language['raw_screen_arg'] = _('use urwid\'s raw screen controller') +language['ok'] = _('OK') +language['cancel'] = _('Cancel') + + diff --git a/wicd/wicd-client.py b/wicd/wicd-client.py index e69c5fd..f82dd08 100755 --- a/wicd/wicd-client.py +++ b/wicd/wicd-client.py @@ -53,6 +53,8 @@ from wicd import gui from wicd import dbusmanager from wicd.guiutil import error +from wicd.translations import language + ICON_AVAIL = True USE_EGG = False # Import egg.trayicon if we're using an older gtk version @@ -72,9 +74,6 @@ if __name__ == '__main__': daemon = wireless = wired = lost_dbus_id = None DBUS_AVAIL = False -language = misc.get_language_list_tray() - - def catchdbus(func): def wrapper(*args, **kwargs): try: @@ -179,7 +178,7 @@ class TrayIcon(object): def set_connecting_state(self, info): """ Sets the icon info for a connecting state. """ if info[0] == 'wired' and len(info) == 1: - cur_network = language['wired'] + cur_network = language['wired_network'] else: cur_network = info[1] self.tr.set_tooltip(language['connecting'] + " to " + From 3627230b3cb1637faef6ebfedc44c785d26f37fa Mon Sep 17 00:00:00 2001 From: Adam Blackburn Date: Wed, 4 Mar 2009 19:44:55 +0800 Subject: [PATCH 07/10] Removed old images --- images/wicd-blue.png | Bin 4000 -> 0 bytes images/wicd-client.png | Bin 29039 -> 0 bytes images/wicd-green.png | Bin 4108 -> 0 bytes images/wicd-orange.png | Bin 4158 -> 0 bytes images/wicd-purple.png | Bin 4135 -> 0 bytes images/wicd-red.png | Bin 4106 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/wicd-blue.png delete mode 100644 images/wicd-client.png delete mode 100644 images/wicd-green.png delete mode 100644 images/wicd-orange.png delete mode 100644 images/wicd-purple.png delete mode 100644 images/wicd-red.png diff --git a/images/wicd-blue.png b/images/wicd-blue.png deleted file mode 100644 index 460b80f01f463a2ec6f222bc3896b47289867a26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4000 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 diff --git a/images/wicd-green.png b/images/wicd-green.png deleted file mode 100644 index 67dde2b320f10cc5728ffbfa94a71094b7175f0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4108 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 diff --git a/images/wicd-purple.png b/images/wicd-purple.png deleted file mode 100644 index bc781567d44d0f1c1a17ceda4c6477f04f1a3315..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4135 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 diff --git a/images/wicd-red.png b/images/wicd-red.png deleted file mode 100644 index 42eb9aa753750e5010375d88a6bfb4c3b5428c8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4106 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 IM6N<$f>Mu@cmMzZ From 34fbabf8a7096c330aba7e53fb67cc7b3aa2dbb0 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Wed, 4 Mar 2009 18:32:15 -0500 Subject: [PATCH 08/10] Fix setup.py bug where - was getting turned into _ in paths. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b8bf723..a9fa0d0 100755 --- a/setup.py +++ b/setup.py @@ -253,7 +253,7 @@ class configure(Command): cur_arg = argument[0][:-1] cur_arg_value = getattr(self, cur_arg) print "%s is %s" % (cur_arg, cur_arg_value) - values.append((cur_arg, cur_arg_value.replace('-', '_'))) + values.append((cur_arg, getattr(self, cur_arg.replace('-','_')))) else: cur_arg = argument[0] cur_arg_value = getattr(self, cur_arg.replace('-', '_')) From 45eae059e5c6f629850e11b45de4e8e16984d1b8 Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Fri, 6 Mar 2009 19:28:09 -0500 Subject: [PATCH 09/10] Made the wicd-curses script add WHEREAREMYFILES Moved WHEREAREMYFILES to /var/lib/wicd, and adapted setup.py, wpath.py, and the wicd-client script to support it Fixed a typo in setup.py --- in/other=WHEREAREMYFILES.in | 11 ++++++++--- in/scripts=wicd-client.in | 4 ++-- in/scripts=wicd-curses.in | 7 +++++++ in/wicd=wpath.py.in | 1 + setup.py | 7 +++++-- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/in/other=WHEREAREMYFILES.in b/in/other=WHEREAREMYFILES.in index cec81a3..ce51f7c 100644 --- a/in/other=WHEREAREMYFILES.in +++ b/in/other=WHEREAREMYFILES.in @@ -1,13 +1,18 @@ WHERE ARE MY FILES?! -If you are reading this, you are probably wondering why your Wicd configuration -files are not here. What follows is a summary of the folders that Wicd uses. +If you are reading this in %VARLIB%, then you may ignore (but please don't +delete) this file. The only reason it is here is that it is definitely +constant between package updates. + +If you are reading this from your home directory, you are probably wondering +why your Wicd configuration files are not in ~/.wicd. What follows is a +summary of the folders that Wicd uses. For a more detailed (and complete) description what is in each directory, consult the man pages for wicd(8) and wicd-curses(8). ~/.wicd - User-dependent configuration files, only used by wicd-curses + User-dependent configuration files %ETC% Global configuration files diff --git a/in/scripts=wicd-client.in b/in/scripts=wicd-client.in index 776581f..a451b88 100755 --- a/in/scripts=wicd-client.in +++ b/in/scripts=wicd-client.in @@ -7,8 +7,8 @@ if [ ! -d "$HOME/.wicd" ]; then mkdir -p "$HOME/.wicd" fi # Make sure the user knows WHEREAREMYFILES ;-) -if [ -e "%DOCDIR%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then - ln -s "%DOCDIR%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" +if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then + ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" fi if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then if [ ! -f "$HOME/.wicd/CLIENT_CURSES_WARNING" ]; then diff --git a/in/scripts=wicd-curses.in b/in/scripts=wicd-curses.in index 9b56c42..19ff689 100755 --- a/in/scripts=wicd-curses.in +++ b/in/scripts=wicd-curses.in @@ -1,2 +1,9 @@ #!/bin/bash +if [ ! -d "$HOME/.wicd" ]; then + mkdir -p "$HOME/.wicd" +fi +if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then + ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" +fi + exec python -O %LIB%wicd-curses.py $@ diff --git a/in/wicd=wpath.py.in b/in/wicd=wpath.py.in index 8f82101..a4f17ef 100755 --- a/in/wicd=wpath.py.in +++ b/in/wicd=wpath.py.in @@ -33,6 +33,7 @@ postconnectscripts = '%SCRIPTS%postconnect' images = '%IMAGES%' encryption = '%ENCRYPTION%' bin = '%BIN%' +varlib = '%VARLIB%' networks = '%NETWORKS%' log = '%LOG%' resume = '%RESUME%' diff --git a/setup.py b/setup.py index dd9f851..a880da2 100755 --- a/setup.py +++ b/setup.py @@ -68,6 +68,7 @@ class configure(Command): ('icons=', None, "set the base directory for the .desktop file's icons"), ('translations=', None, 'set the directory translations are stored in'), ('autostart=', None, 'set the directory that will be autostarted on desktop login'), + ('varlib=',None , 'set the path for wicd\'s variable state data'), ('init=', None, 'set the directory for the init file'), ('docdir=', None, 'set the directory for the documentation'), ('mandir=', None, 'set the directory for the man pages'), @@ -104,7 +105,8 @@ class configure(Command): self.bin = '/usr/bin/' self.sbin = '/usr/sbin/' self.backends = self.lib + 'backends' - self.networks = '/var/lib/wicd/configurations/' + self.varlib = '/var/lib/wicd/' + self.networks = self.varlib + 'configurations/' self.log = '/var/log/wicd/' self.resume = '/etc/acpi/resume.d/' self.suspend = '/etc/acpi/suspend.d/' @@ -438,7 +440,8 @@ try: data.append (( piddir, [] )) if not wpath.no_install_docs: data.append((wpath.docdir, ['INSTALL', 'LICENSE', 'AUTHORS', - 'README', 'CHANGES', 'other/WHEREAREMYFILES'])) + 'README', 'CHANGES', ])) + data.append((wpath.varlib, ['other/WHEREAREMYFILES'])) if not wpath.no_install_kde: data.append((wpath.kdedir, ['other/wicd-tray.desktop'])) if not wpath.no_install_init: From 46ddb419660c70d030aef08fdbe03b97b0bf8d27 Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Sat, 7 Mar 2009 11:34:22 -0500 Subject: [PATCH 10/10] Fixed translations.py support in wicd-curses. --- curses/netentry_curses.py | 4 ---- curses/prefs_curses.py | 2 -- curses/wicd-curses.py | 2 -- wicd/translations.py | 1 - 4 files changed, 9 deletions(-) mode change 100755 => 100644 curses/prefs_curses.py mode change 100644 => 100755 curses/wicd-curses.py diff --git a/curses/netentry_curses.py b/curses/netentry_curses.py index 99e9086..0beed28 100644 --- a/curses/netentry_curses.py +++ b/curses/netentry_curses.py @@ -26,11 +26,7 @@ from curses_misc import TextDialog,DynWrap,MaskingEdit,ComboBox,error import wicd.misc as misc from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool - - from wicd.translations import language -for i in language.keys(): - language[i] = language[i].decode('utf8') daemon = None wired = None diff --git a/curses/prefs_curses.py b/curses/prefs_curses.py old mode 100755 new mode 100644 index c13d756..20d45d2 --- a/curses/prefs_curses.py +++ b/curses/prefs_curses.py @@ -29,8 +29,6 @@ wireless = None wired = None from wicd.translations import language -for i in language.keys(): - language[i] = language[i].decode('utf8') class PrefsDialog(urwid.WidgetWrap): def __init__(self,body,pos,ui,dbus=None): diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py old mode 100644 new mode 100755 index 71b2319..323d7e8 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -866,7 +866,6 @@ def main(): # Import the screen based on whatever the user picked. # The raw_display will have some features that may be useful to users # later - parser.set_defaults(screen='raw') if options.screen == 'raw': import urwid.raw_display ui = urwid.raw_display.Screen() @@ -955,7 +954,6 @@ setup_dbus() ######################################## if __name__ == '__main__': parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REVNO,daemon.Hello())) - # raw = True. curses = False parser.set_defaults(screen='raw') parser.add_option("-r", "--raw-screen",action="store_const",const='raw' ,dest='screen',help="use urwid's raw screen controller (default)") diff --git a/wicd/translations.py b/wicd/translations.py index e9523b1..397236c 100644 --- a/wicd/translations.py +++ b/wicd/translations.py @@ -1,6 +1,5 @@ #!/usr/bin/env python # -* coding: utf-8 -*- -# ^^ why do I need this? # # Copyright (C) 2007 - 2009 Adam Blackburn