SOURCES: BitTornado-new-wxpython-namespace.patch (NEW) - initial c...
troll
troll at pld-linux.org
Sun Sep 18 03:30:15 CEST 2005
Author: troll Date: Sun Sep 18 01:30:15 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- initial checkin
---- Files affected:
SOURCES:
BitTornado-new-wxpython-namespace.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/BitTornado-new-wxpython-namespace.patch
diff -u /dev/null SOURCES/BitTornado-new-wxpython-namespace.patch:1.1
--- /dev/null Sun Sep 18 03:30:15 2005
+++ SOURCES/BitTornado-new-wxpython-namespace.patch Sun Sep 18 03:30:10 2005
@@ -0,0 +1,2838 @@
+diff -Naur BitTornado-CVS.orig/btcompletedirgui.py BitTornado-CVS/btcompletedirgui.py
+--- BitTornado-CVS.orig/btcompletedirgui.py 2004-05-09 15:07:20.000000000 +0200
++++ BitTornado-CVS/btcompletedirgui.py 2005-09-18 02:52:10.089587432 +0200
+@@ -20,7 +20,7 @@
+ from os import getcwd
+ from os.path import join
+ try:
+- from wxPython.wx import *
++ import wx
+ except:
+ print 'wxPython is either not installed or has not been installed properly.'
+ sys.exit(1)
+@@ -31,14 +31,14 @@
+ True = 1
+ False = 0
+
+-wxEVT_INVOKE = wxNewEventType()
++wxEVT_INVOKE = wx.NewEventType()
+
+ def EVT_INVOKE(win, func):
+ win.Connect(-1, -1, wxEVT_INVOKE, func)
+
+-class InvokeEvent(wxPyEvent):
++class InvokeEvent(wx.PyEvent):
+ def __init__(self, func, args, kwargs):
+- wxPyEvent.__init__(self)
++ wx.PyEvent.__init__(self)
+ self.SetEventType(wxEVT_INVOKE)
+ self.func = func
+ self.args = args
+@@ -46,55 +46,55 @@
+
+ class DownloadInfo:
+ def __init__(self):
+- frame = wxFrame(None, -1, 'BitTorrent complete dir 1.0.1', size = wxSize(550, 250))
++ frame = wx.Frame(None, -1, 'BitTorrent complete dir 1.0.1', size = wx.Size(550, 250))
+ self.frame = frame
+
+- panel = wxPanel(frame, -1)
++ panel = wx.Panel(frame, -1)
+
+- gridSizer = wxFlexGridSizer(cols = 2, rows = 2, vgap = 15, hgap = 8)
++ gridSizer = wx.FlexGridSizer(cols = 2, rows = 2, vgap = 15, hgap = 8)
+
+- gridSizer.Add(wxStaticText(panel, -1, 'directory to build:'))
+- self.dirCtl = wxTextCtrl(panel, -1, '')
++ gridSizer.Add(wx.StaticText(panel, -1, 'directory to build:'))
++ self.dirCtl = wx.TextCtrl(panel, -1, '')
+
+- b = wxBoxSizer(wxHORIZONTAL)
+- b.Add(self.dirCtl, 1, wxEXPAND)
+-# b.Add(10, 10, 0, wxEXPAND)
+- button = wxButton(panel, -1, 'select')
+- b.Add(button, 0, wxEXPAND)
+- EVT_BUTTON(frame, button.GetId(), self.select)
+-
+- gridSizer.Add(b, 0, wxEXPAND)
+-
+- gridSizer.Add(wxStaticText(panel, -1, 'announce url:'))
+- self.annCtl = wxTextCtrl(panel, -1, 'http://my.tracker:6969/announce')
+- gridSizer.Add(self.annCtl, 0, wxEXPAND)
++ b = wx.BoxSizer(wx.HORIZONTAL)
++ b.Add(self.dirCtl, 1, wx.EXPAND)
++# b.Add(10, 10, 0, wx.EXPAND)
++ button = wx.Button(panel, -1, 'select')
++ b.Add(button, 0, wx.EXPAND)
++ wx.EVT_BUTTON(frame, button.GetId(), self.select)
++
++ gridSizer.Add(b, 0, wx.EXPAND)
++
++ gridSizer.Add(wx.StaticText(panel, -1, 'announce url:'))
++ self.annCtl = wx.TextCtrl(panel, -1, 'http://my.tracker:6969/announce')
++ gridSizer.Add(self.annCtl, 0, wx.EXPAND)
+
+- gridSizer.Add(wxStaticText(panel, -1, 'piece size:'))
+- self.piece_length = wxChoice(panel, -1, choices = ['2 ** 21', '2 ** 20', '2 ** 19',
++ gridSizer.Add(wx.StaticText(panel, -1, 'piece size:'))
++ self.piece_length = wx.Choice(panel, -1, choices = ['2 ** 21', '2 ** 20', '2 ** 19',
+ '2 ** 18', '2 ** 17', '2 ** 16', '2 ** 15'])
+ self.piece_length.SetSelection(3)
+ gridSizer.Add(self.piece_length)
+
+ gridSizer.AddGrowableCol(1)
+
+- border = wxBoxSizer(wxVERTICAL)
+- border.Add(gridSizer, 0, wxEXPAND | wxNORTH | wxEAST | wxWEST, 25)
+- b2 = wxButton(panel, -1, 'make')
+-# border.Add(10, 10, 1, wxEXPAND)
+- border.Add(b2, 0, wxALIGN_CENTER | wxSOUTH, 20)
+- EVT_BUTTON(frame, b2.GetId(), self.complete)
++ border = wx.BoxSizer(wx.VERTICAL)
++ border.Add(gridSizer, 0, wx.EXPAND | wx.NORTH | wx.EAST | wx.WEST, 25)
++ b2 = wx.Button(panel, -1, 'make')
++# border.Add(10, 10, 1, wx.EXPAND)
++ border.Add(b2, 0, wx.ALIGN_CENTER | wx.SOUTH, 20)
++ wx.EVT_BUTTON(frame, b2.GetId(), self.complete)
+ panel.SetSizer(border)
+ panel.SetAutoLayout(True)
+
+ def select(self, x):
+- dl = wxDirDialog(self.frame, style = wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON)
+- if dl.ShowModal() == wxID_OK:
++ dl = wx.DirDialog(self.frame, style = wx.DD_DEFAULT_STYLE | wx.DD_NEW_DIR_BUTTON)
++ if dl.ShowModal() == wx.ID_OK:
+ self.dirCtl.SetValue(dl.GetPath())
+
+ def complete(self, x):
+ if self.dirCtl.GetValue() == '':
+- dlg = wxMessageDialog(self.frame, message = 'You must select a directory',
+- caption = 'Error', style = wxOK | wxICON_ERROR)
++ dlg = wx.MessageDialog(self.frame, message = 'You must select a directory',
++ caption = 'Error', style = wx.OK | wx.ICON_ERROR)
+ dlg.ShowModal()
+ dlg.Destroy()
+ return
+@@ -112,31 +112,31 @@
+ self.a = a
+ self.pl = pl
+ self.flag = Event()
+- frame = wxFrame(None, -1, 'BitTorrent make directory', size = wxSize(550, 250))
++ frame = wx.Frame(None, -1, 'BitTorrent make directory', size = wx.Size(550, 250))
+ self.frame = frame
+
+- panel = wxPanel(frame, -1)
++ panel = wx.Panel(frame, -1)
+
+- gridSizer = wxFlexGridSizer(cols = 1, vgap = 15, hgap = 8)
++ gridSizer = wx.FlexGridSizer(cols = 1, vgap = 15, hgap = 8)
+
+- self.currentLabel = wxStaticText(panel, -1, 'checking file sizes')
+- gridSizer.Add(self.currentLabel, 0, wxEXPAND)
+- self.gauge = wxGauge(panel, -1, range = 1000, style = wxGA_SMOOTH)
+- gridSizer.Add(self.gauge, 0, wxEXPAND)
+- gridSizer.Add(10, 10, 1, wxEXPAND)
+- self.button = wxButton(panel, -1, 'cancel')
+- gridSizer.Add(self.button, 0, wxALIGN_CENTER)
++ self.currentLabel = wx.StaticText(panel, -1, 'checking file sizes')
++ gridSizer.Add(self.currentLabel, 0, wx.EXPAND)
++ self.gauge = wx.Gauge(panel, -1, range = 1000, style = wx.GA_SMOOTH)
++ gridSizer.Add(self.gauge, 0, wx.EXPAND)
++ gridSizer.Add(10, 10, 1, wx.EXPAND)
++ self.button = wx.Button(panel, -1, 'cancel')
++ gridSizer.Add(self.button, 0, wx.ALIGN_CENTER)
+ gridSizer.AddGrowableRow(2)
+ gridSizer.AddGrowableCol(0)
+
+- g2 = wxFlexGridSizer(cols = 1, vgap = 15, hgap = 8)
+- g2.Add(gridSizer, 1, wxEXPAND | wxALL, 25)
++ g2 = wx.FlexGridSizer(cols = 1, vgap = 15, hgap = 8)
++ g2.Add(gridSizer, 1, wx.EXPAND | wx.ALL, 25)
+ g2.AddGrowableRow(0)
+ g2.AddGrowableCol(0)
+ panel.SetSizer(g2)
+ panel.SetAutoLayout(True)
+- EVT_BUTTON(frame, self.button.GetId(), self.done)
+- EVT_CLOSE(frame, self.done)
++ wx.EVT_BUTTON(frame, self.button.GetId(), self.done)
++ wx.EVT_CLOSE(frame, self.done)
+ EVT_INVOKE(frame, self.onInvoke)
+ frame.Show(True)
+ Thread(target = self.complete).start()
+@@ -152,8 +152,8 @@
+ except (OSError, IOError), e:
+ self.currentLabel.SetLabel('Error!')
+ self.button.SetLabel('Close')
+- dlg = wxMessageDialog(self.frame, message = 'Error - ' + str(e),
+- caption = 'Error', style = wxOK | wxICON_ERROR)
++ dlg = wx.MessageDialog(self.frame, message = 'Error - ' + str(e),
++ caption = 'Error', style = wx.OK | wx.ICON_ERROR)
+ dlg.ShowModal()
+ dlg.Destroy()
+
+@@ -175,13 +175,13 @@
+
+ def invokeLater(self, func, args = [], kwargs = {}):
+ if not self.flag.isSet():
+- wxPostEvent(self.frame, InvokeEvent(func, args, kwargs))
++ wx.PostEvent(self.frame, InvokeEvent(func, args, kwargs))
+
+ def done(self, event):
+ self.flag.set()
+ self.frame.Destroy()
+
+-class btWxApp(wxApp):
++class btWxApp(wx.App):
+ def OnInit(self):
+ d = DownloadInfo()
+ d.frame.Show(True)
+diff -Naur BitTornado-CVS.orig/btdownloadgui.py BitTornado-CVS/btdownloadgui.py
+--- BitTornado-CVS.orig/btdownloadgui.py 2005-08-20 03:21:00.000000000 +0200
++++ BitTornado-CVS/btdownloadgui.py 2005-09-18 03:04:18.777780400 +0200
+@@ -17,7 +17,7 @@
+ assert version >= '2', "Install Python 2.0 or greater"
+
+ try:
+- from wxPython.wx import *
++ import wx
+ except:
+ print 'wxPython is either not installed or has not been installed properly.'
+ exit(1)
+@@ -52,9 +52,9 @@
+ WXPROFILER = False
+
+ try:
+- wxFULL_REPAINT_ON_RESIZE
++ wx.FULL_REPAINT_ON_RESIZE
+ except:
+- wxFULL_REPAINT_ON_RESIZE = 0 # fix for wx pre-2.5
++ wx.FULL_REPAINT_ON_RESIZE = 0 # fix for wx pre-2.5
+
+ # Note to packagers: edit OLDICONPATH in BitTornado/ConfigDir.py
+
+@@ -104,14 +104,14 @@
+ r.append(hexmap[ord(c)])
+ return ''.join(r)
+
+-wxEVT_INVOKE = wxNewEventType()
++wxEVT_INVOKE = wx.NewEventType()
+
+ def EVT_INVOKE(win, func):
+ win.Connect(-1, -1, wxEVT_INVOKE, func)
+
+-class InvokeEvent(wxPyEvent):
++class InvokeEvent(wx.PyEvent):
+ def __init__(self, func = None, args = None, kwargs = None):
+- wxPyEvent.__init__(self)
++ wx.PyEvent.__init__(self)
+ self.SetEventType(wxEVT_INVOKE)
+ self.func = func
+ self.args = args
+@@ -124,9 +124,9 @@
+ self._errorwindow = None
+ try:
+ self.FONT = configfile.config['gui_font']
+- self.default_font = wxFont(self.FONT, wxDEFAULT, wxNORMAL, wxNORMAL, False)
+- frame = wxFrame(None, -1, 'BitTorrent ' + version + ' download',
+- style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE)
++ self.default_font = wx.Font(self.FONT, wx.DEFAULT, wx.NORMAL, wx.NORMAL, False)
++ frame = wx.Frame(None, -1, 'BitTorrent ' + version + ' download',
++ style = wx.DEFAULT_FRAME_STYLE|wx.FULL_REPAINT_ON_RESIZE)
+ self.flag = flag
+ self.configfile = configfile
+ self.configfileargs = configfile.config
+@@ -172,10 +172,10 @@
+ self.invokeLaterEvent = InvokeEvent()
+ self.invokeLaterList = []
+
+- wxInitAllImageHandlers()
++ wx.InitAllImageHandlers()
+ self.basepath = self.configfile.getIconDir()
+- self.icon = wxIcon(os.path.join(self.basepath,'icon_bt.ico'), wxBITMAP_TYPE_ICO)
+- self.finicon = wxIcon(os.path.join(self.basepath,'icon_done.ico'), wxBITMAP_TYPE_ICO)
++ self.icon = wx.Icon(os.path.join(self.basepath,'icon_bt.ico'), wx.BITMAP_TYPE_ICO)
++ self.finicon = wx.Icon(os.path.join(self.basepath,'icon_done.ico'), wx.BITMAP_TYPE_ICO)
+ self.statusIconFiles={
+ 'startup':os.path.join(self.basepath,'white.ico'),
+ 'disconnected':os.path.join(self.basepath,'black.ico'),
+@@ -185,12 +185,12 @@
+ 'allgood':os.path.join(self.basepath,'green.ico'),
+ }
+ self.statusIcons={}
+- self.filestatusIcons = wxImageList(16, 16)
+- self.filestatusIcons.Add(wxBitmap(os.path.join(self.basepath,'black1.ico'),wxBITMAP_TYPE_ICO))
+- self.filestatusIcons.Add(wxBitmap(os.path.join(self.basepath,'yellow1.ico'), wxBITMAP_TYPE_ICO))
+- self.filestatusIcons.Add(wxBitmap(os.path.join(self.basepath,'green1.ico'), wxBITMAP_TYPE_ICO))
++ self.filestatusIcons = wx.ImageList(16, 16)
++ self.filestatusIcons.Add(wx.Bitmap(os.path.join(self.basepath,'black1.ico'),wx.BITMAP_TYPE_ICO))
++ self.filestatusIcons.Add(wx.Bitmap(os.path.join(self.basepath,'yellow1.ico'), wx.BITMAP_TYPE_ICO))
++ self.filestatusIcons.Add(wx.Bitmap(os.path.join(self.basepath,'green1.ico'), wx.BITMAP_TYPE_ICO))
+
+- self.allocbuttonBitmap = wxBitmap(os.path.join(self.basepath,'alloc.gif'), wxBITMAP_TYPE_GIF)
++ self.allocbuttonBitmap = wx.Bitmap(os.path.join(self.basepath,'alloc.gif'), wx.BITMAP_TYPE_GIF)
+
+ self.starttime = clock()
+
+@@ -200,239 +200,239 @@
+ except:
+ pass
+
+- panel = wxPanel(frame, -1)
++ panel = wx.Panel(frame, -1)
+ self.bgcolor = panel.GetBackgroundColour()
+
+ def StaticText(text, font = self.FONT, underline = False, color = None, panel = panel):
+- x = wxStaticText(panel, -1, text, style = wxALIGN_LEFT)
+- x.SetFont(wxFont(font, wxDEFAULT, wxNORMAL, wxNORMAL, underline))
++ x = wx.StaticText(panel, -1, text, style = wx.ALIGN_LEFT)
++ x.SetFont(wx.Font(font, wx.DEFAULT, wx.NORMAL, wx.NORMAL, underline))
+ if color is not None:
+ x.SetForegroundColour(color)
+ return x
+
+- colSizer = wxFlexGridSizer(cols = 1, vgap = 3)
++ colSizer = wx.FlexGridSizer(cols = 1, vgap = 3)
+
+- border = wxBoxSizer(wxHORIZONTAL)
+- border.Add(colSizer, 1, wxEXPAND | wxALL, 4)
++ border = wx.BoxSizer(wx.HORIZONTAL)
++ border.Add(colSizer, 1, wx.EXPAND | wx.ALL, 4)
+ panel.SetSizer(border)
+ panel.SetAutoLayout(True)
+
+- topboxsizer = wxFlexGridSizer(cols = 3, vgap = 0)
++ topboxsizer = wx.FlexGridSizer(cols = 3, vgap = 0)
+ topboxsizer.AddGrowableCol (0)
+
+- fnsizer = wxFlexGridSizer(cols = 1, vgap = 0)
++ fnsizer = wx.FlexGridSizer(cols = 1, vgap = 0)
+ fnsizer.AddGrowableCol (0)
+ fnsizer.AddGrowableRow (1)
+
+ fileNameText = StaticText('', self.FONT+4)
+- fnsizer.Add(fileNameText, 1, wxALIGN_BOTTOM|wxEXPAND)
++ fnsizer.Add(fileNameText, 1, wx.ALIGN_BOTTOM|wx.EXPAND)
+ self.fileNameText = fileNameText
+
+- fnsizer2 = wxFlexGridSizer(cols = 8, vgap = 0)
++ fnsizer2 = wx.FlexGridSizer(cols = 8, vgap = 0)
+ fnsizer2.AddGrowableCol (0)
+
+ fileSizeText = StaticText('')
+- fnsizer2.Add(fileSizeText, 1, wxALIGN_BOTTOM|wxEXPAND)
++ fnsizer2.Add(fileSizeText, 1, wx.ALIGN_BOTTOM|wx.EXPAND)
+ self.fileSizeText = fileSizeText
+
+ fileDetails = StaticText('Details', self.FONT, True, 'Blue')
+- fnsizer2.Add(fileDetails, 0, wxALIGN_BOTTOM)
++ fnsizer2.Add(fileDetails, 0, wx.ALIGN_BOTTOM)
+
+ fnsizer2.Add(StaticText(' '))
+
+ advText = StaticText('Advanced', self.FONT, True, 'Blue')
+- fnsizer2.Add(advText, 0, wxALIGN_BOTTOM)
++ fnsizer2.Add(advText, 0, wx.ALIGN_BOTTOM)
+ fnsizer2.Add(StaticText(' '))
+
+ prefsText = StaticText('Prefs', self.FONT, True, 'Blue')
+- fnsizer2.Add(prefsText, 0, wxALIGN_BOTTOM)
++ fnsizer2.Add(prefsText, 0, wx.ALIGN_BOTTOM)
+ fnsizer2.Add(StaticText(' '))
+
+ aboutText = StaticText('About', self.FONT, True, 'Blue')
+- fnsizer2.Add(aboutText, 0, wxALIGN_BOTTOM)
++ fnsizer2.Add(aboutText, 0, wx.ALIGN_BOTTOM)
+
+ fnsizer2.Add(StaticText(' '))
+- fnsizer.Add(fnsizer2,0,wxEXPAND)
+- topboxsizer.Add(fnsizer,0,wxEXPAND)
++ fnsizer.Add(fnsizer2,0,wx.EXPAND)
++ topboxsizer.Add(fnsizer,0,wx.EXPAND)
+ topboxsizer.Add(StaticText(' '))
+
+- self.statusIcon = wxEmptyBitmap(32,32)
+- statidata = wxMemoryDC()
++ self.statusIcon = wx.EmptyBitmap(32,32)
++ statidata = wx.MemoryDC()
+ statidata.SelectObject(self.statusIcon)
+- statidata.SetPen(wxTRANSPARENT_PEN)
+- statidata.SetBrush(wxBrush(self.bgcolor,wxSOLID))
++ statidata.SetPen(wx.TRANSPARENT_PEN)
++ statidata.SetBrush(wx.Brush(self.bgcolor,wx.SOLID))
+ statidata.DrawRectangle(0,0,32,32)
+- self.statusIconPtr = wxStaticBitmap(panel, -1, self.statusIcon)
++ self.statusIconPtr = wx.StaticBitmap(panel, -1, self.statusIcon)
+ topboxsizer.Add(self.statusIconPtr)
+
+ self.fnsizer = fnsizer
+ self.fnsizer2 = fnsizer2
+ self.topboxsizer = topboxsizer
+- colSizer.Add(topboxsizer, 0, wxEXPAND)
++ colSizer.Add(topboxsizer, 0, wx.EXPAND)
+
+- self.gauge = wxGauge(panel, -1, range = 1000, style = wxGA_SMOOTH)
+- colSizer.Add(self.gauge, 0, wxEXPAND)
++ self.gauge = wx.Gauge(panel, -1, range = 1000, style = wx.GA_SMOOTH)
++ colSizer.Add(self.gauge, 0, wx.EXPAND)
+
+- timeSizer = wxFlexGridSizer(cols = 2)
++ timeSizer = wx.FlexGridSizer(cols = 2)
+ timeSizer.Add(StaticText('Time elapsed / estimated : '))
+ self.timeText = StaticText(self.activity+' ')
+ timeSizer.Add(self.timeText)
+ timeSizer.AddGrowableCol(1)
+ colSizer.Add(timeSizer)
+
+- destSizer = wxFlexGridSizer(cols = 2, hgap = 8)
++ destSizer = wx.FlexGridSizer(cols = 2, hgap = 8)
+ self.fileDestLabel = StaticText('Download to:')
+ destSizer.Add(self.fileDestLabel)
+ self.fileDestText = StaticText('')
+- destSizer.Add(self.fileDestText, flag = wxEXPAND)
++ destSizer.Add(self.fileDestText, flag = wx.EXPAND)
+ destSizer.AddGrowableCol(1)
+- colSizer.Add(destSizer, flag = wxEXPAND)
++ colSizer.Add(destSizer, flag = wx.EXPAND)
+ self.destSizer = destSizer
+
+- statSizer = wxFlexGridSizer(cols = 3, hgap = 8)
++ statSizer = wx.FlexGridSizer(cols = 3, hgap = 8)
+
+- self.ratesSizer = wxFlexGridSizer(cols = 2)
+- self.infoSizer = wxFlexGridSizer(cols = 2)
++ self.ratesSizer = wx.FlexGridSizer(cols = 2)
++ self.infoSizer = wx.FlexGridSizer(cols = 2)
+
+ self.ratesSizer.Add(StaticText(' Download rate: '))
+ self.downRateText = StaticText('0 kB/s ')
+- self.ratesSizer.Add(self.downRateText, flag = wxEXPAND)
++ self.ratesSizer.Add(self.downRateText, flag = wx.EXPAND)
+
+ self.downTextLabel = StaticText('Downloaded: ')
+ self.infoSizer.Add(self.downTextLabel)
+ self.downText = StaticText('0.00 MiB ')
+- self.infoSizer.Add(self.downText, flag = wxEXPAND)
++ self.infoSizer.Add(self.downText, flag = wx.EXPAND)
+
+ self.ratesSizer.Add(StaticText(' Upload rate: '))
+ self.upRateText = StaticText('0 kB/s ')
+- self.ratesSizer.Add(self.upRateText, flag = wxEXPAND)
++ self.ratesSizer.Add(self.upRateText, flag = wx.EXPAND)
+
+ self.upTextLabel = StaticText('Uploaded: ')
+ self.infoSizer.Add(self.upTextLabel)
+ self.upText = StaticText('0.00 MiB ')
+- self.infoSizer.Add(self.upText, flag = wxEXPAND)
++ self.infoSizer.Add(self.upText, flag = wx.EXPAND)
+
+- shareSizer = wxFlexGridSizer(cols = 2, hgap = 8)
++ shareSizer = wx.FlexGridSizer(cols = 2, hgap = 8)
+ shareSizer.Add(StaticText('Share rating:'))
+ self.shareRatingText = StaticText('')
+ shareSizer.AddGrowableCol(1)
+- shareSizer.Add(self.shareRatingText, flag = wxEXPAND)
++ shareSizer.Add(self.shareRatingText, flag = wx.EXPAND)
+
+ statSizer.Add(self.ratesSizer)
+ statSizer.Add(self.infoSizer)
+- statSizer.Add(shareSizer, flag = wxALIGN_CENTER_VERTICAL)
++ statSizer.Add(shareSizer, flag = wx.ALIGN_CENTER_VERTICAL)
+ colSizer.Add (statSizer)
+
+- torrentSizer = wxFlexGridSizer(cols = 1)
++ torrentSizer = wx.FlexGridSizer(cols = 1)
+ self.peerStatusText = StaticText('')
+- torrentSizer.Add(self.peerStatusText, 0, wxEXPAND)
++ torrentSizer.Add(self.peerStatusText, 0, wx.EXPAND)
+ self.seedStatusText = StaticText('')
+- torrentSizer.Add(self.seedStatusText, 0, wxEXPAND)
++ torrentSizer.Add(self.seedStatusText, 0, wx.EXPAND)
+ torrentSizer.AddGrowableCol(0)
+- colSizer.Add(torrentSizer, 0, wxEXPAND)
++ colSizer.Add(torrentSizer, 0, wx.EXPAND)
+ self.torrentSizer = torrentSizer
+
+- self.errorTextSizer = wxFlexGridSizer(cols = 1)
++ self.errorTextSizer = wx.FlexGridSizer(cols = 1)
+ self.errorText = StaticText('', self.FONT, False, 'Red')
+- self.errorTextSizer.Add(self.errorText, 0, wxEXPAND)
+- colSizer.Add(self.errorTextSizer, 0, wxEXPAND)
++ self.errorTextSizer.Add(self.errorText, 0, wx.EXPAND)
++ colSizer.Add(self.errorTextSizer, 0, wx.EXPAND)
+
+- cancelSizer=wxGridSizer(cols = 2, hgap = 40)
+- self.pauseButton = wxButton(panel, -1, 'Pause')
+- cancelSizer.Add(self.pauseButton, 0, wxALIGN_CENTER)
+-
+- self.cancelButton = wxButton(panel, -1, 'Cancel')
+- cancelSizer.Add(self.cancelButton, 0, wxALIGN_CENTER)
+- colSizer.Add(cancelSizer, 0, wxALIGN_CENTER)
++ cancelSizer=wx.GridSizer(cols = 2, hgap = 40)
++ self.pauseButton = wx.Button(panel, -1, 'Pause')
++ cancelSizer.Add(self.pauseButton, 0, wx.ALIGN_CENTER)
++
++ self.cancelButton = wx.Button(panel, -1, 'Cancel')
++ cancelSizer.Add(self.cancelButton, 0, wx.ALIGN_CENTER)
++ colSizer.Add(cancelSizer, 0, wx.ALIGN_CENTER)
+
+ # Setting options
+
+- slideSizer = wxFlexGridSizer(cols = 7, hgap = 0, vgap = 5)
++ slideSizer = wx.FlexGridSizer(cols = 7, hgap = 0, vgap = 5)
+
+ # dropdown
+
+ self.connChoiceLabel = StaticText('Settings for ')
+- slideSizer.Add (self.connChoiceLabel, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL)
+- self.connChoice = wxChoice (panel, -1, (-1, -1), (self.FONT*11, -1),
++ slideSizer.Add (self.connChoiceLabel, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL)
++ self.connChoice = wx.Choice (panel, -1, (-1, -1), (self.FONT*11, -1),
+ choices = connChoiceList)
+ self.connChoice.SetFont(self.default_font)
+ self.connChoice.SetSelection(0)
+- slideSizer.Add (self.connChoice, 0, wxALIGN_CENTER)
++ slideSizer.Add (self.connChoice, 0, wx.ALIGN_CENTER)
+ self.rateSpinnerLabel = StaticText(' Upload rate (kB/s) ')
+- slideSizer.Add (self.rateSpinnerLabel, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
++ slideSizer.Add (self.rateSpinnerLabel, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
+
+ # max upload rate
+
+- self.rateSpinner = wxSpinCtrl (panel, -1, "", (-1,-1), (50, -1))
++ self.rateSpinner = wx.SpinCtrl (panel, -1, "", (-1,-1), (50, -1))
+ self.rateSpinner.SetFont(self.default_font)
+ self.rateSpinner.SetRange(0,5000)
+ self.rateSpinner.SetValue(0)
+- slideSizer.Add (self.rateSpinner, 0, wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL)
++ slideSizer.Add (self.rateSpinner, 0, wx.ALIGN_CENTER|wx.ALIGN_CENTER_VERTICAL)
+
+ self.rateLowerText = StaticText(' %5d' % (0))
+ self.rateUpperText = StaticText('%5d' % (5000))
+- self.rateslider = wxSlider(panel, -1, 0, 0, 5000, (-1, -1), (80, -1))
++ self.rateslider = wx.Slider(panel, -1, 0, 0, 5000, (-1, -1), (80, -1))
+
+- slideSizer.Add(self.rateLowerText, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
+- slideSizer.Add(self.rateslider, 0, wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL)
+- slideSizer.Add(self.rateUpperText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL)
++ slideSizer.Add(self.rateLowerText, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
++ slideSizer.Add(self.rateslider, 0, wx.ALIGN_CENTER|wx.ALIGN_CENTER_VERTICAL)
++ slideSizer.Add(self.rateUpperText, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL)
+
+- slideSizer.Add(StaticText(''), 0, wxALIGN_LEFT)
++ slideSizer.Add(StaticText(''), 0, wx.ALIGN_LEFT)
+
+ self.bgallocText = StaticText('', self.FONT+2, False, 'Red')
+- slideSizer.Add(self.bgallocText, 0, wxALIGN_LEFT)
++ slideSizer.Add(self.bgallocText, 0, wx.ALIGN_LEFT)
+
+ # max uploads
+
+ self.connSpinnerLabel = StaticText(' Max uploads ')
+- slideSizer.Add (self.connSpinnerLabel, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
+- self.connSpinner = wxSpinCtrl (panel, -1, "", (-1,-1), (50, -1))
++ slideSizer.Add (self.connSpinnerLabel, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
++ self.connSpinner = wx.SpinCtrl (panel, -1, "", (-1,-1), (50, -1))
+ self.connSpinner.SetFont(self.default_font)
+ self.connSpinner.SetRange(4,100)
+ self.connSpinner.SetValue(4)
+- slideSizer.Add (self.connSpinner, 0, wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL)
++ slideSizer.Add (self.connSpinner, 0, wx.ALIGN_CENTER|wx.ALIGN_CENTER_VERTICAL)
+
+ self.connLowerText = StaticText(' %5d' % (4))
+ self.connUpperText = StaticText('%5d' % (100))
+- self.connslider = wxSlider(panel, -1, 4, 4, 100, (-1, -1), (80, -1))
++ self.connslider = wx.Slider(panel, -1, 4, 4, 100, (-1, -1), (80, -1))
+
+- slideSizer.Add(self.connLowerText, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
+- slideSizer.Add(self.connslider, 0, wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL)
+- slideSizer.Add(self.connUpperText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL)
++ slideSizer.Add(self.connLowerText, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
++ slideSizer.Add(self.connslider, 0, wx.ALIGN_CENTER|wx.ALIGN_CENTER_VERTICAL)
++ slideSizer.Add(self.connUpperText, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL)
+
+- colSizer.Add(slideSizer, 1, wxALL|wxALIGN_CENTER|wxEXPAND, 0)
++ colSizer.Add(slideSizer, 1, wx.ALL|wx.ALIGN_CENTER|wx.EXPAND, 0)
+
+ self.unlimitedLabel = StaticText('0 kB/s means unlimited. Tip: your download rate is proportional to your upload rate', self.FONT-2)
+- colSizer.Add(self.unlimitedLabel, 0, wxALIGN_CENTER)
++ colSizer.Add(self.unlimitedLabel, 0, wx.ALIGN_CENTER)
+
+- self.priorityIDs = [wxNewId(),wxNewId(),wxNewId(),wxNewId()]
+- self.prioritycolors = [ wxColour(160,160,160),
+- wxColour(255,64,0),
+- wxColour(0,0,0),
+- wxColour(64,64,255) ]
+-
+-
+- EVT_LEFT_DOWN(aboutText, self.about)
+- EVT_LEFT_DOWN(fileDetails, self.details)
+- EVT_LEFT_DOWN(self.statusIconPtr,self.statusIconHelp)
+- EVT_LEFT_DOWN(advText, self.advanced)
+- EVT_LEFT_DOWN(prefsText, self.openConfigMenu)
+- EVT_CLOSE(frame, self.done)
+- EVT_BUTTON(frame, self.pauseButton.GetId(), self.pause)
+- EVT_BUTTON(frame, self.cancelButton.GetId(), self.done)
++ self.priorityIDs = [wx.NewId(),wx.NewId(),wx.NewId(),wx.NewId()]
++ self.prioritycolors = [ wx.Colour(160,160,160),
++ wx.Colour(255,64,0),
++ wx.Colour(0,0,0),
++ wx.Colour(64,64,255) ]
++
++
++ wx.EVT_LEFT_DOWN(aboutText, self.about)
++ wx.EVT_LEFT_DOWN(fileDetails, self.details)
++ wx.EVT_LEFT_DOWN(self.statusIconPtr,self.statusIconHelp)
++ wx.EVT_LEFT_DOWN(advText, self.advanced)
++ wx.EVT_LEFT_DOWN(prefsText, self.openConfigMenu)
++ wx.EVT_CLOSE(frame, self.done)
++ wx.EVT_BUTTON(frame, self.pauseButton.GetId(), self.pause)
++ wx.EVT_BUTTON(frame, self.cancelButton.GetId(), self.done)
+ EVT_INVOKE(frame, self.onInvoke)
+- EVT_SCROLL(self.rateslider, self.onRateScroll)
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list