[BT++ CVS] BT++/src LoaderManager.py,1.13,1.14 Loader.py,1.8,1.9

[<sir...@us...>]

Update of /cvsroot/btplusplus/BT++/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19487/src

Modified Files:
	LoaderManager.py Loader.py 
Log Message:
- Fixed core bug.
- Modified 'AddTorrent' downloading.
- History shows uploaded (transfered) MB.
- Fixed bug in right-click-menu of the history tab.
- Corrected some of the grid info display.

Index: LoaderManager.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/LoaderManager.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** LoaderManager.py	30 Mar 2003 15:30:52 -0000	1.13
--- LoaderManager.py	31 Mar 2003 14:15:32 -0000	1.14
***************
*** 4,7 ****
--- 4,8 ----
  from BTConstants              import *
  from core.CurrentRateMeasure  import GlobalMeasure
+ from time import strftime
  
  class LoaderManager:

Index: Loader.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/Loader.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Loader.py	28 Mar 2003 21:09:34 -0000	1.8
--- Loader.py	31 Mar 2003 14:15:35 -0000	1.9
***************
*** 76,80 ****
                             downRate     = 0,
                             upRate       = 0,
!                            activity     = 'Paused' )
   
          self.Config['Tor']     = tor
--- 76,82 ----
                             downRate     = 0,
                             upRate       = 0,
!                            activity     = 'Paused',
!                            up           = 0,
!                            down         = 0 )
   
          self.Config['Tor']     = tor
***************
*** 228,232 ****
  ###########################################################################################################
      
!     def UpdateStatus(self, fractionDone = None, timeEst = None, downRate = None, upRate = None, activity = None):
          
          if fractionDone != None:
--- 230,234 ----
  ###########################################################################################################
      
!     def UpdateStatus(self, fractionDone = None, timeEst = None, downRate = None, upRate = None, activity = None, up = None, down = None):
          
          if fractionDone != None:
***************
*** 251,254 ****
--- 253,262 ----
              self.Info['SpeedUp']   = float(upRate) / (1 << 10)
          
+         if up != None:
+             self.Info['SizeUp']    = up
+             
+         if down != None:
+             self.Info['SizeDown']  = down
+         
          try:    
              self.Refresh()
***************
*** 524,531 ****
                                        self.FlagEnd,
                                        2.0, # DISPLAY INTERVAL
!                                       0 ) # STDOUT DISPLAY
  
          self.UpdateStatus(activity = 'Downloading')
!         
          self.Obj['Rerequester'].d(0)
          self.Obj['RawServer'].listen_forever( self.Obj['Encrypter'] )
--- 532,541 ----
                                        self.FlagEnd,
                                        2.0, # DISPLAY INTERVAL
!                                       0, # STDOUT DISPLAY
!                                       self.Obj['UpMeasure'].get_total,
!                                       self.Obj['DownMeasure'].get_total )
  
          self.UpdateStatus(activity = 'Downloading')
! 
          self.Obj['Rerequester'].d(0)
          self.Obj['RawServer'].listen_forever( self.Obj['Encrypter'] )