diff --git a/twander.py b/twander.py index 05d24d4..a35b4ee 100755 --- a/twander.py +++ b/twander.py @@ -6,7 +6,7 @@ # Program Information PROGNAME = "twander" -RCSID = "$Id: twander.py,v 3.177 2005/01/27 10:53:44 tundra Exp $" +RCSID = "$Id: twander.py,v 3.178 2005/01/27 11:06:26 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -659,6 +659,7 @@ TTLAUTO = "Auto:" TTLFILES = "Total Files:" +TTLFILTER = "Filter:" TTLSIZE = "Total Size:" TTLSORTFLD = "Sort By:" TTLSORTREV = "Rev:" @@ -2309,13 +2310,12 @@ if SORTREVERSE: srtfld += "-" - sortedby = "%s %s " % (TTLSORTFLD, srtfld) - - + sortedby = "%s %s " % (TTLSORTFLD, srtfld) autostate = YesOrNo[AUTOREFRESH] + refreshing + filter = "%s %s" % (TTLFILTER, UI.FilterWildcard[0]) - mainwin.title("%s %s %s: %s %s %s %s %s %s%s %s %s" % - (PROGNAME, VERSION, FULLNAME, CurrentDir, TTLFILES, + mainwin.title("%s %s %s: %s %s %s %s %s %s %s%s %s %s" % + (PROGNAME, VERSION, FULLNAME, CurrentDir, filter, TTLFILES, str(self.DirList.size()), TTLSIZE, FileLength(self.TotalSize), sortedby, sepsort, TTLAUTO, autostate)) # Make sure the titlebar gets updated @@ -2903,7 +2903,7 @@ # This function can be called to use wildcards to: 1) Filter file list or 2) Select files if FilterWildcard: - UI.FilterWildcard = wild + UI.FilterWildcard = (wc, wild) RefreshDirList(None) else: @@ -3430,7 +3430,7 @@ return # Reset any active filtering - UI.FilterWildcard = None + UI.FilterWildcard = ("None", None) # Transform double forward-slashes into a single # forward-slash. This keeps the Directory Stack @@ -3719,7 +3719,7 @@ # Filter through any filtering wildcard (if any). - if UI.FilterWildcard: + if UI.FilterWildcard[1]: for list in dList, fList: # Find the entries that don't match the wildcard. @@ -3729,7 +3729,7 @@ remove = [] for x in list: - if not UI.FilterWildcard.match(x): + if not UI.FilterWildcard[1].match(x): remove.append(x) # And remove those non-matching entries @@ -4407,7 +4407,7 @@ # Clearout any active wildcard filtering if asked to if ClearFilterWildcard: - UI.FilterWildcard = None + UI.FilterWildcard = ("None", None) # Get current selection and active @@ -4841,7 +4841,7 @@ UI.CurrentDir = "" # Initialize storage for filtering wildcard -UI.FilterWildcard = None +UI.FilterWildcard = ("None", None) # Initialize various menu data structures ClearHistory(None)