Menu
▾
▴
[BT++ CVS] BT++/src/TabTrans TabTrans.py,1.3,1.4 Renderer.py,1.4,1.5 GridTable.py,1.6,1.7 Grid.py,1.10,1.11
|
From: <sir...@us...> - 2003-03-09 12:10:06
|
Update of /cvsroot/btplusplus/BT++/src/TabTrans
In directory sc8-pr-cvs1:/tmp/cvs-serv17691/src/TabTrans
Modified Files:
TabTrans.py Renderer.py GridTable.py Grid.py
Log Message:
- Made History working.
- Added option for History.
- Fixes.
Index: TabTrans.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/TabTrans.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TabTrans.py 2 Mar 2003 16:36:28 -0000 1.3
--- TabTrans.py 9 Mar 2003 12:10:02 -0000 1.4
***************
*** 10,14 ****
def __init__(self, parent):
! wxPanel.__init__(self, parent, -1, wxPoint(0,65), wxSize(786,347))
self.Grid = Grid( self )
--- 10,14 ----
def __init__(self, parent):
! wxPanel.__init__(self, parent, -1, wxPoint(0,65), wxSize(786,347), style = 0)
self.Grid = Grid( self )
Index: Renderer.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/Renderer.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Renderer.py 28 Feb 2003 21:31:51 -0000 1.4
--- Renderer.py 9 Mar 2003 12:10:02 -0000 1.5
***************
*** 1,4 ****
from wxPython.wx import *
- from wxPython.grid import *
###########################################################################################################
--- 1,3 ----
Index: GridTable.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/GridTable.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GridTable.py 3 Mar 2003 15:52:12 -0000 1.6
--- GridTable.py 9 Mar 2003 12:10:02 -0000 1.7
***************
*** 1,11 ****
from wxPython.wx import *
- from wxPython.grid import *
from TabLog.LogWindow import Log
from LoaderManager import LoaderManager
import Renderer
! class GridTable(wxPyGridTableBase):
Sizes = {
'ColLabel': 18,
--- 1,13 ----
+ from os import path, rename
from wxPython.wx import *
from TabLog.LogWindow import Log
from LoaderManager import LoaderManager
+ from ConfigFile import Config
import Renderer
+ from TabHistory.HistLoaderManager import ManagerUp
! class GridTable:
Sizes = {
'ColLabel': 18,
***************
*** 27,34 ****
def __init__(self, grid):
- wxPyGridTableBase.__init__(self)
-
self.Grid = grid
! self.Manager = LoaderManager(self.Refresh, Log)
def Update(self):
--- 29,40 ----
def __init__(self, grid):
self.Grid = grid
! self.Manager = LoaderManager( [ Config.Get('Paths', 'Torrent'),
! Config.Get('Paths', 'Temp'),
! Config.Get('Paths', 'Incoming'),
! Config.Get('Paths', 'History') ],
! self.Refresh,
! Log,
! self.MoveToHistory )
def Update(self):
***************
*** 76,87 ****
###########################################################################################################
- def IsEmptyCell(self, row, col):
- if col > 6:
- return true
- if row > self.GetNumberRows() - 1:
- return true
-
- return false
-
def GetColLabelValue(self, col):
if col == 0: return 'Filename'
--- 82,85 ----
***************
*** 146,149 ****
--- 144,183 ----
###########################################################################################################
+ def MoveToHistory(self, loader):
+
+ loader.PauseDownload()
+ loader.Hashed = true
+ loader.Finished = true
+ loader.Obj['Storage'].close()
+
+ loader.UpdateStatus( fractionDone = 1,
+ timeEst = 0,
+ downRate = 0,
+ upRate = 0,
+ activity = 'Done' )
+
+ if loader.Config['DirTorFinish'] != '':
+ try:
+ rename( loader.Config['TorFull'], path.join(loader.Config['DirTorFinish'], loader.Config['Tor']) )
+ loader.OnInfo( 'Download complete.' )
+ except:
+ loader.OnError('Could not move torrent.')
+
+ if loader.Config['DirFilFinish'] != '':
+ try:
+ rename( loader.Config['Filename'], path.join(loader.Config['DirFilFinish'], loader.Config['File']) )
+ except:
+ loader.OnError('Could not move downloaded file.')
+
+ new = ManagerUp.CreateNewLoader(loader.Config['Tor'])
+ if new == None:
+ return
+
+ if Config.Get('Download', 'KeepUpload'):
+ new.StartDownload()
+
+ ###########################################################################################################
+ ###########################################################################################################
+
def Destroy(self, evt = wxCloseEvent()):
self.Manager.Destroy()
Index: Grid.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/Grid.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Grid.py 3 Mar 2003 15:37:05 -0000 1.10
--- Grid.py 9 Mar 2003 12:10:02 -0000 1.11
***************
*** 22,25 ****
--- 22,47 ----
'PosX': -1
}
+
+ DrawTools = {
+ 'HighlightOutline': wxPen( wxColour( 10, 36,106) ),
+ 'HighlightColor': wxBrush( wxColour(194,200,218), wxSOLID),
+
+ 'EmptyBackground': wxBrush( wxColour(255,255,255), wxSOLID),
+
+ 'LabelFontColor': wxColour(0, 0, 0),
+ 'LabelFont': wxFont( 8,
+ wxDEFAULT,
+ wxNORMAL,
+ wxNORMAL,
+ false,
+ '',
+ wxFONTENCODING_SYSTEM ),
+
+ 'LabelOutlineC1': wxPen( wxColor(255,255,255) ),
+ 'LabelOutlineC2': wxPen( wxColor(128,128,128) ),
+ 'LabelOutlineC3': wxPen( wxColor( 64, 64, 64) ),
+ 'LabelFill': wxBrush( wxColor(212,208,200), wxSOLID ),
+ 'LabelSizeCursor': wxStockCursor( wxCURSOR_SIZEWE )
+ }
def __init__(self, parent):
***************
*** 80,114 ****
EVT_MOTION( self, self.OnMouseMove )
- self.DrawTools = {
- 'HighlightOutline': wxPen( wxColour( 10, 36,106) ),
- 'HighlightColor': wxBrush( wxColour(194,200,218), wxSOLID),
-
- 'EmptyBackground': wxBrush( wxColour(255,255,255), wxSOLID),
-
- 'LabelFontColor': wxColour(0, 0, 0),
- 'LabelFont': wxFont( 8,
- wxDEFAULT,
- wxNORMAL,
- wxNORMAL,
- false,
- '',
- wxFONTENCODING_SYSTEM ),
-
- 'LabelOutlineC1': wxPen( wxColor(255,255,255) ),
- 'LabelOutlineC2': wxPen( wxColor(128,128,128) ),
- 'LabelOutlineC3': wxPen( wxColor( 64, 64, 64) ),
- 'LabelFill': wxBrush( wxColor(212,208,200), wxSOLID ),
- 'LabelSizeCursor': wxStockCursor( wxCURSOR_SIZEWE ),
-
- 'ArrowBitmap': GetBitmap('Grid_Arrow')
- }
-
EVT_PAINT( self, self.OnPaint )
EVT_SIZE( self, self.OnSize )
###########################################################################################################
def Update(self):
self.Table.Update()
###########################################################################################################
--- 102,115 ----
EVT_MOTION( self, self.OnMouseMove )
EVT_PAINT( self, self.OnPaint )
EVT_SIZE( self, self.OnSize )
+ self.DrawTools['ArrowBitmap'] = GetBitmap('Grid_Arrow')
+
###########################################################################################################
def Update(self):
self.Table.Update()
+ self.OnSize(None)
###########################################################################################################
***************
*** 303,306 ****
--- 304,310 ----
if code == WXK_CONTROL:
self.Selection['Add'] = true
+ return
+
+ evt.Skip()
###########################################################################################################
***************
*** 311,314 ****
--- 315,321 ----
if code == WXK_CONTROL:
self.Selection['Add'] = false
+ return
+
+ evt.Skip()
###########################################################################################################
***************
*** 378,381 ****
--- 385,392 ----
self.PrepareDC(ondc)
ondc.BeginDrawing()
+
+ ondc.SetBackground( self.DrawTools['EmptyBackground'] )
+ ondc.Clear()
+
ondc.Blit(0, 0, w, h, dc, 0, 0 )
|
