]> git.pld-linux.org Git - packages/BitTornado.git/blame - BitTornado-new-wxpython-namespace.patch
projects / packages / BitTornado.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- upgraded to version 0.3.15
[packages/BitTornado.git] / BitTornado-new-wxpython-namespace.patch
CommitLineData
692a2188
MC		 1diff -Naur BitTornado-CVS.orig/btcompletedirgui.py BitTornado-CVS/btcompletedirgui.py
2--- BitTornado-CVS.orig/btcompletedirgui.py 2004-05-09 15:07:20.000000000 +0200
3+++ BitTornado-CVS/btcompletedirgui.py 2005-09-18 02:52:10.089587432 +0200
4@@ -20,7 +20,7 @@
5 from os import getcwd
6 from os.path import join
7 try:
8- from wxPython.wx import *
9+ import wx
10 except:
11 print 'wxPython is either not installed or has not been installed properly.'
12 sys.exit(1)
13@@ -31,14 +31,14 @@
14 True = 1
15 False = 0
16
17-wxEVT_INVOKE = wxNewEventType()
18+wxEVT_INVOKE = wx.NewEventType()
19
20 def EVT_INVOKE(win, func):
21 win.Connect(-1, -1, wxEVT_INVOKE, func)
22
23-class InvokeEvent(wxPyEvent):
24+class InvokeEvent(wx.PyEvent):
25 def __init__(self, func, args, kwargs):
26- wxPyEvent.__init__(self)
27+ wx.PyEvent.__init__(self)
28 self.SetEventType(wxEVT_INVOKE)
29 self.func = func
30 self.args = args
31@@ -46,55 +46,55 @@
32
33 class DownloadInfo:
34 def __init__(self):
35- frame = wxFrame(None, -1, 'BitTorrent complete dir 1.0.1', size = wxSize(550, 250))
36+ frame = wx.Frame(None, -1, 'BitTorrent complete dir 1.0.1', size = wx.Size(550, 250))
37 self.frame = frame
38
39- panel = wxPanel(frame, -1)
40+ panel = wx.Panel(frame, -1)
41
42- gridSizer = wxFlexGridSizer(cols = 2, rows = 2, vgap = 15, hgap = 8)
43+ gridSizer = wx.FlexGridSizer(cols = 2, rows = 2, vgap = 15, hgap = 8)
44
45- gridSizer.Add(wxStaticText(panel, -1, 'directory to build:'))
46- self.dirCtl = wxTextCtrl(panel, -1, '')
47+ gridSizer.Add(wx.StaticText(panel, -1, 'directory to build:'))
48+ self.dirCtl = wx.TextCtrl(panel, -1, '')
49
50- b = wxBoxSizer(wxHORIZONTAL)
51- b.Add(self.dirCtl, 1, wxEXPAND)
52-# b.Add(10, 10, 0, wxEXPAND)
53- button = wxButton(panel, -1, 'select')
54- b.Add(button, 0, wxEXPAND)
55- EVT_BUTTON(frame, button.GetId(), self.select)
56-
57- gridSizer.Add(b, 0, wxEXPAND)
58-
59- gridSizer.Add(wxStaticText(panel, -1, 'announce url:'))
60- self.annCtl = wxTextCtrl(panel, -1, 'http://my.tracker:6969/announce')
61- gridSizer.Add(self.annCtl, 0, wxEXPAND)
62+ b = wx.BoxSizer(wx.HORIZONTAL)
63+ b.Add(self.dirCtl, 1, wx.EXPAND)
64+# b.Add(10, 10, 0, wx.EXPAND)
65+ button = wx.Button(panel, -1, 'select')
66+ b.Add(button, 0, wx.EXPAND)
67+ wx.EVT_BUTTON(frame, button.GetId(), self.select)
68+
69+ gridSizer.Add(b, 0, wx.EXPAND)
70+
71+ gridSizer.Add(wx.StaticText(panel, -1, 'announce url:'))
72+ self.annCtl = wx.TextCtrl(panel, -1, 'http://my.tracker:6969/announce')
73+ gridSizer.Add(self.annCtl, 0, wx.EXPAND)
74
75- gridSizer.Add(wxStaticText(panel, -1, 'piece size:'))
76- self.piece_length = wxChoice(panel, -1, choices = ['2 ** 21', '2 ** 20', '2 ** 19',
77+ gridSizer.Add(wx.StaticText(panel, -1, 'piece size:'))
78+ self.piece_length = wx.Choice(panel, -1, choices = ['2 ** 21', '2 ** 20', '2 ** 19',
79 '2 ** 18', '2 ** 17', '2 ** 16', '2 ** 15'])
80 self.piece_length.SetSelection(3)
81 gridSizer.Add(self.piece_length)
82
83 gridSizer.AddGrowableCol(1)
84
85- border = wxBoxSizer(wxVERTICAL)
86- border.Add(gridSizer, 0, wxEXPAND | wxNORTH | wxEAST | wxWEST, 25)
87- b2 = wxButton(panel, -1, 'make')
88-# border.Add(10, 10, 1, wxEXPAND)
89- border.Add(b2, 0, wxALIGN_CENTER | wxSOUTH, 20)
90- EVT_BUTTON(frame, b2.GetId(), self.complete)
91+ border = wx.BoxSizer(wx.VERTICAL)
92+ border.Add(gridSizer, 0, wx.EXPAND | wx.NORTH | wx.EAST | wx.WEST, 25)
93+ b2 = wx.Button(panel, -1, 'make')
94+# border.Add(10, 10, 1, wx.EXPAND)
95+ border.Add(b2, 0, wx.ALIGN_CENTER | wx.SOUTH, 20)
96+ wx.EVT_BUTTON(frame, b2.GetId(), self.complete)
97 panel.SetSizer(border)
98 panel.SetAutoLayout(True)
99
100 def select(self, x):
101- dl = wxDirDialog(self.frame, style = wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON)
102- if dl.ShowModal() == wxID_OK:
103+ dl = wx.DirDialog(self.frame, style = wx.DD_DEFAULT_STYLE | wx.DD_NEW_DIR_BUTTON)
104+ if dl.ShowModal() == wx.ID_OK:
105 self.dirCtl.SetValue(dl.GetPath())
106
107 def complete(self, x):
108 if self.dirCtl.GetValue() == '':
109- dlg = wxMessageDialog(self.frame, message = 'You must select a directory',
110- caption = 'Error', style = wxOK | wxICON_ERROR)
111+ dlg = wx.MessageDialog(self.frame, message = 'You must select a directory',
112+ caption = 'Error', style = wx.OK | wx.ICON_ERROR)
113 dlg.ShowModal()
114 dlg.Destroy()
115 return
116@@ -112,31 +112,31 @@
117 self.a = a
118 self.pl = pl
119 self.flag = Event()
120- frame = wxFrame(None, -1, 'BitTorrent make directory', size = wxSize(550, 250))
121+ frame = wx.Frame(None, -1, 'BitTorrent make directory', size = wx.Size(550, 250))
122 self.frame = frame
123
124- panel = wxPanel(frame, -1)
125+ panel = wx.Panel(frame, -1)
126
127- gridSizer = wxFlexGridSizer(cols = 1, vgap = 15, hgap = 8)
128+ gridSizer = wx.FlexGridSizer(cols = 1, vgap = 15, hgap = 8)
129
130- self.currentLabel = wxStaticText(panel, -1, 'checking file sizes')
131- gridSizer.Add(self.currentLabel, 0, wxEXPAND)
132- self.gauge = wxGauge(panel, -1, range = 1000, style = wxGA_SMOOTH)
133- gridSizer.Add(self.gauge, 0, wxEXPAND)
134- gridSizer.Add(10, 10, 1, wxEXPAND)
135- self.button = wxButton(panel, -1, 'cancel')
136- gridSizer.Add(self.button, 0, wxALIGN_CENTER)
137+ self.currentLabel = wx.StaticText(panel, -1, 'checking file sizes')
138+ gridSizer.Add(self.currentLabel, 0, wx.EXPAND)
139+ self.gauge = wx.Gauge(panel, -1, range = 1000, style = wx.GA_SMOOTH)
140+ gridSizer.Add(self.gauge, 0, wx.EXPAND)
141+ gridSizer.Add(10, 10, 1, wx.EXPAND)
142+ self.button = wx.Button(panel, -1, 'cancel')
143+ gridSizer.Add(self.button, 0, wx.ALIGN_CENTER)
144 gridSizer.AddGrowableRow(2)
145 gridSizer.AddGrowableCol(0)
146
147- g2 = wxFlexGridSizer(cols = 1, vgap = 15, hgap = 8)
148- g2.Add(gridSizer, 1, wxEXPAND | wxALL, 25)
149+ g2 = wx.FlexGridSizer(cols = 1, vgap = 15, hgap = 8)
150+ g2.Add(gridSizer, 1, wx.EXPAND | wx.ALL, 25)
151 g2.AddGrowableRow(0)
152 g2.AddGrowableCol(0)
153 panel.SetSizer(g2)
154 panel.SetAutoLayout(True)
155- EVT_BUTTON(frame, self.button.GetId(), self.done)
156- EVT_CLOSE(frame, self.done)
157+ wx.EVT_BUTTON(frame, self.button.GetId(), self.done)
158+ wx.EVT_CLOSE(frame, self.done)
159 EVT_INVOKE(frame, self.onInvoke)
160 frame.Show(True)
161 Thread(target = self.complete).start()
162@@ -152,8 +152,8 @@
163 except (OSError, IOError), e:
164 self.currentLabel.SetLabel('Error!')
165 self.button.SetLabel('Close')
166- dlg = wxMessageDialog(self.frame, message = 'Error - ' + str(e),
167- caption = 'Error', style = wxOK | wxICON_ERROR)
168+ dlg = wx.MessageDialog(self.frame, message = 'Error - ' + str(e),
169+ caption = 'Error', style = wx.OK | wx.ICON_ERROR)
170 dlg.ShowModal()
171 dlg.Destroy()
172
173@@ -175,13 +175,13 @@
174
175 def invokeLater(self, func, args = [], kwargs = {}):
176 if not self.flag.isSet():
177- wxPostEvent(self.frame, InvokeEvent(func, args, kwargs))
178+ wx.PostEvent(self.frame, InvokeEvent(func, args, kwargs))
179
180 def done(self, event):
181 self.flag.set()
182 self.frame.Destroy()
183
184-class btWxApp(wxApp):
185+class btWxApp(wx.App):
186 def OnInit(self):
187 d = DownloadInfo()
188 d.frame.Show(True)
189diff -Naur BitTornado-CVS.orig/btdownloadgui.py BitTornado-CVS/btdownloadgui.py
190--- BitTornado-CVS.orig/btdownloadgui.py 2005-08-20 03:21:00.000000000 +0200
191+++ BitTornado-CVS/btdownloadgui.py 2005-09-18 03:04:18.777780400 +0200
192@@ -17,7 +17,7 @@
193 assert version >= '2', "Install Python 2.0 or greater"
194
195 try:
196- from wxPython.wx import *
197+ import wx
198 except:
199 print 'wxPython is either not installed or has not been installed properly.'
200 exit(1)
201@@ -52,9 +52,9 @@
202 WXPROFILER = False
203
204 try:
205- wxFULL_REPAINT_ON_RESIZE
206+ wx.FULL_REPAINT_ON_RESIZE
207 except:
208- wxFULL_REPAINT_ON_RESIZE = 0 # fix for wx pre-2.5
209+ wx.FULL_REPAINT_ON_RESIZE = 0 # fix for wx pre-2.5
210
211 # Note to packagers: edit OLDICONPATH in BitTornado/ConfigDir.py
212
213@@ -104,14 +104,14 @@
214 r.append(hexmap[ord(c)])
215 return ''.join(r)
216
217-wxEVT_INVOKE = wxNewEventType()
218+wxEVT_INVOKE = wx.NewEventType()
219
220 def EVT_INVOKE(win, func):
221 win.Connect(-1, -1, wxEVT_INVOKE, func)
222
223-class InvokeEvent(wxPyEvent):
224+class InvokeEvent(wx.PyEvent):
225 def __init__(self, func = None, args = None, kwargs = None):
226- wxPyEvent.__init__(self)
227+ wx.PyEvent.__init__(self)
228 self.SetEventType(wxEVT_INVOKE)
229 self.func = func
230 self.args = args
231@@ -124,9 +124,9 @@
232 self._errorwindow = None
233 try:
234 self.FONT = configfile.config['gui_font']
235- self.default_font = wxFont(self.FONT, wxDEFAULT, wxNORMAL, wxNORMAL, False)
236- frame = wxFrame(None, -1, 'BitTorrent ' + version + ' download',
237- style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE)
238+ self.default_font = wx.Font(self.FONT, wx.DEFAULT, wx.NORMAL, wx.NORMAL, False)
239+ frame = wx.Frame(None, -1, 'BitTorrent ' + version + ' download',
240+ style = wx.DEFAULT_FRAME_STYLE|wx.FULL_REPAINT_ON_RESIZE)
241 self.flag = flag
242 self.configfile = configfile
243 self.configfileargs = configfile.config
244@@ -172,10 +172,10 @@
245 self.invokeLaterEvent = InvokeEvent()
246 self.invokeLaterList = []
247
248- wxInitAllImageHandlers()
249+ wx.InitAllImageHandlers()
250 self.basepath = self.configfile.getIconDir()
251- self.icon = wxIcon(os.path.join(self.basepath,'icon_bt.ico'), wxBITMAP_TYPE_ICO)
252- self.finicon = wxIcon(os.path.join(self.basepath,'icon_done.ico'), wxBITMAP_TYPE_ICO)
253+ self.icon = wx.Icon(os.path.join(self.basepath,'icon_bt.ico'), wx.BITMAP_TYPE_ICO)
254+ self.finicon = wx.Icon(os.path.join(self.basepath,'icon_done.ico'), wx.BITMAP_TYPE_ICO)
255 self.statusIconFiles={
256 'startup':os.path.join(self.basepath,'white.ico'),
257 'disconnected':os.path.join(self.basepath,'black.ico'),
258@@ -185,12 +185,12 @@
259 'allgood':os.path.join(self.basepath,'green.ico'),
260 }
261 self.statusIcons={}
262- self.filestatusIcons = wxImageList(16, 16)
263- self.filestatusIcons.Add(wxBitmap(os.path.join(self.basepath,'black1.ico'),wxBITMAP_TYPE_ICO))
264- self.filestatusIcons.Add(wxBitmap(os.path.join(self.basepath,'yellow1.ico'), wxBITMAP_TYPE_ICO))
265- self.filestatusIcons.Add(wxBitmap(os.path.join(self.basepath,'green1.ico'), wxBITMAP_TYPE_ICO))
266+ self.filestatusIcons = wx.ImageList(16, 16)
267+ self.filestatusIcons.Add(wx.Bitmap(os.path.join(self.basepath,'black1.ico'),wx.BITMAP_TYPE_ICO))
268+ self.filestatusIcons.Add(wx.Bitmap(os.path.join(self.basepath,'yellow1.ico'), wx.BITMAP_TYPE_ICO))
269+ self.filestatusIcons.Add(wx.Bitmap(os.path.join(self.basepath,'green1.ico'), wx.BITMAP_TYPE_ICO))
270
271- self.allocbuttonBitmap = wxBitmap(os.path.join(self.basepath,'alloc.gif'), wxBITMAP_TYPE_GIF)
272+ self.allocbuttonBitmap = wx.Bitmap(os.path.join(self.basepath,'alloc.gif'), wx.BITMAP_TYPE_GIF)
273
274 self.starttime = clock()
275
276@@ -200,239 +200,239 @@
277 except:
278 pass
279
280- panel = wxPanel(frame, -1)
281+ panel = wx.Panel(frame, -1)
282 self.bgcolor = panel.GetBackgroundColour()
283
284 def StaticText(text, font = self.FONT, underline = False, color = None, panel = panel):
285- x = wxStaticText(panel, -1, text, style = wxALIGN_LEFT)
286- x.SetFont(wxFont(font, wxDEFAULT, wxNORMAL, wxNORMAL, underline))
287+ x = wx.StaticText(panel, -1, text, style = wx.ALIGN_LEFT)
288+ x.SetFont(wx.Font(font, wx.DEFAULT, wx.NORMAL, wx.NORMAL, underline))
289 if color is not None:
290 x.SetForegroundColour(color)
291 return x
292
293- colSizer = wxFlexGridSizer(cols = 1, vgap = 3)
294+ colSizer = wx.FlexGridSizer(cols = 1, vgap = 3)
295
296- border = wxBoxSizer(wxHORIZONTAL)
297- border.Add(colSizer, 1, wxEXPAND | wxALL, 4)
298+ border = wx.BoxSizer(wx.HORIZONTAL)
299+ border.Add(colSizer, 1, wx.EXPAND | wx.ALL, 4)
300 panel.SetSizer(border)
301 panel.SetAutoLayout(True)
302
303- topboxsizer = wxFlexGridSizer(cols = 3, vgap = 0)
304+ topboxsizer = wx.FlexGridSizer(cols = 3, vgap = 0)
305 topboxsizer.AddGrowableCol (0)
306
307- fnsizer = wxFlexGridSizer(cols = 1, vgap = 0)
308+ fnsizer = wx.FlexGridSizer(cols = 1, vgap = 0)
309 fnsizer.AddGrowableCol (0)
310 fnsizer.AddGrowableRow (1)
311
312 fileNameText = StaticText('', self.FONT+4)
313- fnsizer.Add(fileNameText, 1, wxALIGN_BOTTOM|wxEXPAND)
314+ fnsizer.Add(fileNameText, 1, wx.ALIGN_BOTTOM|wx.EXPAND)
315 self.fileNameText = fileNameText
316
317- fnsizer2 = wxFlexGridSizer(cols = 8, vgap = 0)
318+ fnsizer2 = wx.FlexGridSizer(cols = 8, vgap = 0)
319 fnsizer2.AddGrowableCol (0)
320
321 fileSizeText = StaticText('')
322- fnsizer2.Add(fileSizeText, 1, wxALIGN_BOTTOM|wxEXPAND)
323+ fnsizer2.Add(fileSizeText, 1, wx.ALIGN_BOTTOM|wx.EXPAND)
324 self.fileSizeText = fileSizeText
325
326 fileDetails = StaticText('Details', self.FONT, True, 'Blue')
327- fnsizer2.Add(fileDetails, 0, wxALIGN_BOTTOM)
328+ fnsizer2.Add(fileDetails, 0, wx.ALIGN_BOTTOM)
329
330 fnsizer2.Add(StaticText(' '))
331
332 advText = StaticText('Advanced', self.FONT, True, 'Blue')
333- fnsizer2.Add(advText, 0, wxALIGN_BOTTOM)
334+ fnsizer2.Add(advText, 0, wx.ALIGN_BOTTOM)
335 fnsizer2.Add(StaticText(' '))
336
337 prefsText = StaticText('Prefs', self.FONT, True, 'Blue')
338- fnsizer2.Add(prefsText, 0, wxALIGN_BOTTOM)
339+ fnsizer2.Add(prefsText, 0, wx.ALIGN_BOTTOM)
340 fnsizer2.Add(StaticText(' '))
341
342 aboutText = StaticText('About', self.FONT, True, 'Blue')
343- fnsizer2.Add(aboutText, 0, wxALIGN_BOTTOM)
344+ fnsizer2.Add(aboutText, 0, wx.ALIGN_BOTTOM)
345
346 fnsizer2.Add(StaticText(' '))
347- fnsizer.Add(fnsizer2,0,wxEXPAND)
348- topboxsizer.Add(fnsizer,0,wxEXPAND)
349+ fnsizer.Add(fnsizer2,0,wx.EXPAND)
350+ topboxsizer.Add(fnsizer,0,wx.EXPAND)
351 topboxsizer.Add(StaticText(' '))
352
353- self.statusIcon = wxEmptyBitmap(32,32)
354- statidata = wxMemoryDC()
355+ self.statusIcon = wx.EmptyBitmap(32,32)
356+ statidata = wx.MemoryDC()
357 statidata.SelectObject(self.statusIcon)
358- statidata.SetPen(wxTRANSPARENT_PEN)
359- statidata.SetBrush(wxBrush(self.bgcolor,wxSOLID))
360+ statidata.SetPen(wx.TRANSPARENT_PEN)
361+ statidata.SetBrush(wx.Brush(self.bgcolor,wx.SOLID))
362 statidata.DrawRectangle(0,0,32,32)
363- self.statusIconPtr = wxStaticBitmap(panel, -1, self.statusIcon)
364+ self.statusIconPtr = wx.StaticBitmap(panel, -1, self.statusIcon)
365 topboxsizer.Add(self.statusIconPtr)
366
367 self.fnsizer = fnsizer
368 self.fnsizer2 = fnsizer2
369 self.topboxsizer = topboxsizer
370- colSizer.Add(topboxsizer, 0, wxEXPAND)
371+ colSizer.Add(topboxsizer, 0, wx.EXPAND)
372
373- self.gauge = wxGauge(panel, -1, range = 1000, style = wxGA_SMOOTH)
374- colSizer.Add(self.gauge, 0, wxEXPAND)
375+ self.gauge = wx.Gauge(panel, -1, range = 1000, style = wx.GA_SMOOTH)
376+ colSizer.Add(self.gauge, 0, wx.EXPAND)
377
378- timeSizer = wxFlexGridSizer(cols = 2)
379+ timeSizer = wx.FlexGridSizer(cols = 2)
380 timeSizer.Add(StaticText('Time elapsed / estimated : '))
381 self.timeText = StaticText(self.activity+' ')
382 timeSizer.Add(self.timeText)
383 timeSizer.AddGrowableCol(1)
384 colSizer.Add(timeSizer)
385
386- destSizer = wxFlexGridSizer(cols = 2, hgap = 8)
387+ destSizer = wx.FlexGridSizer(cols = 2, hgap = 8)
388 self.fileDestLabel = StaticText('Download to:')
389 destSizer.Add(self.fileDestLabel)
390 self.fileDestText = StaticText('')
391- destSizer.Add(self.fileDestText, flag = wxEXPAND)
392+ destSizer.Add(self.fileDestText, flag = wx.EXPAND)
393 destSizer.AddGrowableCol(1)
394- colSizer.Add(destSizer, flag = wxEXPAND)
395+ colSizer.Add(destSizer, flag = wx.EXPAND)
396 self.destSizer = destSizer
397
398- statSizer = wxFlexGridSizer(cols = 3, hgap = 8)
399+ statSizer = wx.FlexGridSizer(cols = 3, hgap = 8)
400
401- self.ratesSizer = wxFlexGridSizer(cols = 2)
402- self.infoSizer = wxFlexGridSizer(cols = 2)
403+ self.ratesSizer = wx.FlexGridSizer(cols = 2)
404+ self.infoSizer = wx.FlexGridSizer(cols = 2)
405
406 self.ratesSizer.Add(StaticText(' Download rate: '))
407 self.downRateText = StaticText('0 kB/s ')
408- self.ratesSizer.Add(self.downRateText, flag = wxEXPAND)
409+ self.ratesSizer.Add(self.downRateText, flag = wx.EXPAND)
410
411 self.downTextLabel = StaticText('Downloaded: ')
412 self.infoSizer.Add(self.downTextLabel)
413 self.downText = StaticText('0.00 MiB ')
414- self.infoSizer.Add(self.downText, flag = wxEXPAND)
415+ self.infoSizer.Add(self.downText, flag = wx.EXPAND)
416
417 self.ratesSizer.Add(StaticText(' Upload rate: '))
418 self.upRateText = StaticText('0 kB/s ')
419- self.ratesSizer.Add(self.upRateText, flag = wxEXPAND)
420+ self.ratesSizer.Add(self.upRateText, flag = wx.EXPAND)
421
422 self.upTextLabel = StaticText('Uploaded: ')
423 self.infoSizer.Add(self.upTextLabel)
424 self.upText = StaticText('0.00 MiB ')
425- self.infoSizer.Add(self.upText, flag = wxEXPAND)
426+ self.infoSizer.Add(self.upText, flag = wx.EXPAND)
427
428- shareSizer = wxFlexGridSizer(cols = 2, hgap = 8)
429+ shareSizer = wx.FlexGridSizer(cols = 2, hgap = 8)
430 shareSizer.Add(StaticText('Share rating:'))
431 self.shareRatingText = StaticText('')
432 shareSizer.AddGrowableCol(1)
433- shareSizer.Add(self.shareRatingText, flag = wxEXPAND)
434+ shareSizer.Add(self.shareRatingText, flag = wx.EXPAND)
435
436 statSizer.Add(self.ratesSizer)
437 statSizer.Add(self.infoSizer)
438- statSizer.Add(shareSizer, flag = wxALIGN_CENTER_VERTICAL)
439+ statSizer.Add(shareSizer, flag = wx.ALIGN_CENTER_VERTICAL)
440 colSizer.Add (statSizer)
441
442- torrentSizer = wxFlexGridSizer(cols = 1)
443+ torrentSizer = wx.FlexGridSizer(cols = 1)
444 self.peerStatusText = StaticText('')
445- torrentSizer.Add(self.peerStatusText, 0, wxEXPAND)
446+ torrentSizer.Add(self.peerStatusText, 0, wx.EXPAND)
447 self.seedStatusText = StaticText('')
448- torrentSizer.Add(self.seedStatusText, 0, wxEXPAND)
449+ torrentSizer.Add(self.seedStatusText, 0, wx.EXPAND)
450 torrentSizer.AddGrowableCol(0)
451- colSizer.Add(torrentSizer, 0, wxEXPAND)
452+ colSizer.Add(torrentSizer, 0, wx.EXPAND)
453 self.torrentSizer = torrentSizer
454
455- self.errorTextSizer = wxFlexGridSizer(cols = 1)
456+ self.errorTextSizer = wx.FlexGridSizer(cols = 1)
457 self.errorText = StaticText('', self.FONT, False, 'Red')
458- self.errorTextSizer.Add(self.errorText, 0, wxEXPAND)
459- colSizer.Add(self.errorTextSizer, 0, wxEXPAND)
460+ self.errorTextSizer.Add(self.errorText, 0, wx.EXPAND)
461+ colSizer.Add(self.errorTextSizer, 0, wx.EXPAND)
462
463- cancelSizer=wxGridSizer(cols = 2, hgap = 40)
464- self.pauseButton = wxButton(panel, -1, 'Pause')
465- cancelSizer.Add(self.pauseButton, 0, wxALIGN_CENTER)
466-
467- self.cancelButton = wxButton(panel, -1, 'Cancel')
468- cancelSizer.Add(self.cancelButton, 0, wxALIGN_CENTER)
469- colSizer.Add(cancelSizer, 0, wxALIGN_CENTER)
470+ cancelSizer=wx.GridSizer(cols = 2, hgap = 40)
471+ self.pauseButton = wx.Button(panel, -1, 'Pause')
472+ cancelSizer.Add(self.pauseButton, 0, wx.ALIGN_CENTER)
473+
474+ self.cancelButton = wx.Button(panel, -1, 'Cancel')
475+ cancelSizer.Add(self.cancelButton, 0, wx.ALIGN_CENTER)
476+ colSizer.Add(cancelSizer, 0, wx.ALIGN_CENTER)
477
478 # Setting options
479
480- slideSizer = wxFlexGridSizer(cols = 7, hgap = 0, vgap = 5)
481+ slideSizer = wx.FlexGridSizer(cols = 7, hgap = 0, vgap = 5)
482
483 # dropdown
484
485 self.connChoiceLabel = StaticText('Settings for ')
486- slideSizer.Add (self.connChoiceLabel, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL)
487- self.connChoice = wxChoice (panel, -1, (-1, -1), (self.FONT*11, -1),
488+ slideSizer.Add (self.connChoiceLabel, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL)
489+ self.connChoice = wx.Choice (panel, -1, (-1, -1), (self.FONT*11, -1),
490 choices = connChoiceList)
491 self.connChoice.SetFont(self.default_font)
492 self.connChoice.SetSelection(0)
493- slideSizer.Add (self.connChoice, 0, wxALIGN_CENTER)
494+ slideSizer.Add (self.connChoice, 0, wx.ALIGN_CENTER)
495 self.rateSpinnerLabel = StaticText(' Upload rate (kB/s) ')
496- slideSizer.Add (self.rateSpinnerLabel, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
497+ slideSizer.Add (self.rateSpinnerLabel, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
498
499 # max upload rate
500
501- self.rateSpinner = wxSpinCtrl (panel, -1, "", (-1,-1), (50, -1))
502+ self.rateSpinner = wx.SpinCtrl (panel, -1, "", (-1,-1), (50, -1))
503 self.rateSpinner.SetFont(self.default_font)
504 self.rateSpinner.SetRange(0,5000)
505 self.rateSpinner.SetValue(0)
506- slideSizer.Add (self.rateSpinner, 0, wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL)
507+ slideSizer.Add (self.rateSpinner, 0, wx.ALIGN_CENTER|wx.ALIGN_CENTER_VERTICAL)
508
509 self.rateLowerText = StaticText(' %5d' % (0))
510 self.rateUpperText = StaticText('%5d' % (5000))
511- self.rateslider = wxSlider(panel, -1, 0, 0, 5000, (-1, -1), (80, -1))
512+ self.rateslider = wx.Slider(panel, -1, 0, 0, 5000, (-1, -1), (80, -1))
513
514- slideSizer.Add(self.rateLowerText, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
515- slideSizer.Add(self.rateslider, 0, wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL)
516- slideSizer.Add(self.rateUpperText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL)
517+ slideSizer.Add(self.rateLowerText, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
518+ slideSizer.Add(self.rateslider, 0, wx.ALIGN_CENTER|wx.ALIGN_CENTER_VERTICAL)
519+ slideSizer.Add(self.rateUpperText, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL)
520
521- slideSizer.Add(StaticText(''), 0, wxALIGN_LEFT)
522+ slideSizer.Add(StaticText(''), 0, wx.ALIGN_LEFT)
523
524 self.bgallocText = StaticText('', self.FONT+2, False, 'Red')
525- slideSizer.Add(self.bgallocText, 0, wxALIGN_LEFT)
526+ slideSizer.Add(self.bgallocText, 0, wx.ALIGN_LEFT)
527
528 # max uploads
529
530 self.connSpinnerLabel = StaticText(' Max uploads ')
531- slideSizer.Add (self.connSpinnerLabel, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
532- self.connSpinner = wxSpinCtrl (panel, -1, "", (-1,-1), (50, -1))
533+ slideSizer.Add (self.connSpinnerLabel, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
534+ self.connSpinner = wx.SpinCtrl (panel, -1, "", (-1,-1), (50, -1))
535 self.connSpinner.SetFont(self.default_font)
536 self.connSpinner.SetRange(4,100)
537 self.connSpinner.SetValue(4)
538- slideSizer.Add (self.connSpinner, 0, wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL)
539+ slideSizer.Add (self.connSpinner, 0, wx.ALIGN_CENTER|wx.ALIGN_CENTER_VERTICAL)
540
541 self.connLowerText = StaticText(' %5d' % (4))
542 self.connUpperText = StaticText('%5d' % (100))
543- self.connslider = wxSlider(panel, -1, 4, 4, 100, (-1, -1), (80, -1))
544+ self.connslider = wx.Slider(panel, -1, 4, 4, 100, (-1, -1), (80, -1))
545
546- slideSizer.Add(self.connLowerText, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
547- slideSizer.Add(self.connslider, 0, wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL)
548- slideSizer.Add(self.connUpperText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL)
549+ slideSizer.Add(self.connLowerText, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
550+ slideSizer.Add(self.connslider, 0, wx.ALIGN_CENTER|wx.ALIGN_CENTER_VERTICAL)
551+ slideSizer.Add(self.connUpperText, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL)
552
553- colSizer.Add(slideSizer, 1, wxALL|wxALIGN_CENTER|wxEXPAND, 0)
554+ colSizer.Add(slideSizer, 1, wx.ALL|wx.ALIGN_CENTER|wx.EXPAND, 0)
555
556 self.unlimitedLabel = StaticText('0 kB/s means unlimited. Tip: your download rate is proportional to your upload rate', self.FONT-2)
557- colSizer.Add(self.unlimitedLabel, 0, wxALIGN_CENTER)
558+ colSizer.Add(self.unlimitedLabel, 0, wx.ALIGN_CENTER)
559
560- self.priorityIDs = [wxNewId(),wxNewId(),wxNewId(),wxNewId()]
561- self.prioritycolors = [ wxColour(160,160,160),
562- wxColour(255,64,0),
563- wxColour(0,0,0),
564- wxColour(64,64,255) ]
565-
566-
567- EVT_LEFT_DOWN(aboutText, self.about)
568- EVT_LEFT_DOWN(fileDetails, self.details)
569- EVT_LEFT_DOWN(self.statusIconPtr,self.statusIconHelp)
570- EVT_LEFT_DOWN(advText, self.advanced)
571- EVT_LEFT_DOWN(prefsText, self.openConfigMenu)
572- EVT_CLOSE(frame, self.done)
573- EVT_BUTTON(frame, self.pauseButton.GetId(), self.pause)
574- EVT_BUTTON(frame, self.cancelButton.GetId(), self.done)
575+ self.priorityIDs = [wx.NewId(),wx.NewId(),wx.NewId(),wx.NewId()]
576+ self.prioritycolors = [ wx.Colour(160,160,160),
577+ wx.Colour(255,64,0),
578+ wx.Colour(0,0,0),
579+ wx.Colour(64,64,255) ]
580+
581+
582+ wx.EVT_LEFT_DOWN(aboutText, self.about)
583+ wx.EVT_LEFT_DOWN(fileDetails, self.details)
584+ wx.EVT_LEFT_DOWN(self.statusIconPtr,self.statusIconHelp)
585+ wx.EVT_LEFT_DOWN(advText, self.advanced)
586+ wx.EVT_LEFT_DOWN(prefsText, self.openConfigMenu)
587+ wx.EVT_CLOSE(frame, self.done)
588+ wx.EVT_BUTTON(frame, self.pauseButton.GetId(), self.pause)
589+ wx.EVT_BUTTON(frame, self.cancelButton.GetId(), self.done)
590 EVT_INVOKE(frame, self.onInvoke)
591- EVT_SCROLL(self.rateslider, self.onRateScroll)
592- EVT_SCROLL(self.connslider, self.onConnScroll)
593- EVT_CHOICE(self.connChoice, -1, self.onConnChoice)
594- EVT_SPINCTRL(self.connSpinner, -1, self.onConnSpinner)
595- EVT_SPINCTRL(self.rateSpinner, -1, self.onRateSpinner)
596+ wx.EVT_SCROLL(self.rateslider, self.onRateScroll)
597+ wx.EVT_SCROLL(self.connslider, self.onConnScroll)
598+ wx.EVT_CHOICE(self.connChoice, -1, self.onConnChoice)
599+ wx.EVT_SPINCTRL(self.connSpinner, -1, self.onConnSpinner)
600+ wx.EVT_SPINCTRL(self.rateSpinner, -1, self.onRateSpinner)
601 if (sys.platform == 'win32'):
602- self.frame.tbicon = wxTaskBarIcon()
603- EVT_ICONIZE(self.frame, self.onIconify)
604- EVT_TASKBAR_LEFT_DCLICK(self.frame.tbicon, self.onTaskBarActivate)
605- EVT_TASKBAR_RIGHT_UP(self.frame.tbicon, self.onTaskBarMenu)
606- EVT_MENU(self.frame.tbicon, self.TBMENU_RESTORE, self.onTaskBarActivate)
607- EVT_MENU(self.frame.tbicon, self.TBMENU_CLOSE, self.done)
608+ self.frame.tbicon = wx.TaskBarIcon()
609+ wx.EVT_ICONIZE(self.frame, self.onIconify)
610+ wx.EVT_TASKBAR_LEFT_DCLICK(self.frame.tbicon, self.onTaskBarActivate)
611+ wx.EVT_TASKBAR_RIGHT_UP(self.frame.tbicon, self.onTaskBarMenu)
612+ wx.EVT_MENU(self.frame.tbicon, self.TBMENU_RESTORE, self.onTaskBarActivate)
613+ wx.EVT_MENU(self.frame.tbicon, self.TBMENU_CLOSE, self.done)
614 colSizer.AddGrowableCol (0)
615 colSizer.AddGrowableRow (6)
616 self.frame.Show()
617@@ -468,7 +468,7 @@
618 if not self.uiflag.isSet():
619 self.invokeLaterList.append((func,args,kwargs))
620 if len(self.invokeLaterList) == 1:
621- wxPostEvent(self.frame, self.invokeLaterEvent)
622+ wx.PostEvent(self.frame, self.invokeLaterEvent)
623 else:
624 def onInvoke(self, event):
625 if not self.uiflag.isSet():
626@@ -479,7 +479,7 @@
627
628 def invokeLater(self, func, args = [], kwargs = {}):
629 if not self.uiflag.isSet():
630- wxPostEvent(self.frame, InvokeEvent(func, args, kwargs))
631+ wx.PostEvent(self.frame, InvokeEvent(func, args, kwargs))
632
633
634 def getStatusIcon(self, name, bitmap=False):
635@@ -488,9 +488,9 @@
636 if type(i) == type(self.icon) and not bitmap:
637 return i
638 if bitmap:
639- i = wxBitmap(self.statusIconFiles[name], wxBITMAP_TYPE_ICO)
640+ i = wx.Bitmap(self.statusIconFiles[name], wx.BITMAP_TYPE_ICO)
641 else:
642- i = wxIcon(self.statusIconFiles[name], wxBITMAP_TYPE_ICO)
643+ i = wx.Icon(self.statusIconFiles[name], wx.BITMAP_TYPE_ICO)
644 self.statusIcons[name] = i
645 return i
646
647@@ -499,7 +499,7 @@
648 if name == self.statusIconValue:
649 return
650 self.statusIconValue = name
651- statidata = wxMemoryDC()
652+ statidata = wx.MemoryDC()
653 statidata.SelectObject(self.statusIcon)
654 statidata.BeginDrawing()
655 try:
656@@ -507,16 +507,16 @@
657 except:
658 statidata.DrawBitmap(self.getStatusIcon(name,True),0,0,True)
659 statidata.EndDrawing()
660- statidata.SelectObject(wxNullBitmap)
661+ statidata.SelectObject(wx.NullBitmap)
662 self.statusIconPtr.Refresh()
663
664
665 def createStatusIcon(self, name):
666- iconbuffer = wxEmptyBitmap(32,32)
667- bbdata = wxMemoryDC()
668+ iconbuffer = wx.EmptyBitmap(32,32)
669+ bbdata = wx.MemoryDC()
670 bbdata.SelectObject(iconbuffer)
671- bbdata.SetPen(wxTRANSPARENT_PEN)
672- bbdata.SetBrush(wxBrush(self.bgcolor,wxSOLID))
673+ bbdata.SetPen(wx.TRANSPARENT_PEN)
674+ bbdata.SetBrush(wx.Brush(self.bgcolor,wx.SOLID))
675 bbdata.DrawRectangle(0,0,32,32)
676 try:
677 bbdata.DrawIcon(self.getStatusIcon(name),0,0)
678@@ -534,10 +534,10 @@
679 self.gaugemode = selection
680 if selection < 0:
681 self.gauge.SetForegroundColour(self.configfile.getcheckingcolor())
682- self.gauge.SetBackgroundColour(wxSystemSettings_GetColour(wxSYS_COLOUR_MENU))
683+ self.gauge.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_MENU))
684 elif selection == 0:
685 self.gauge.SetForegroundColour(self.configfile.getdownloadcolor())
686- self.gauge.SetBackgroundColour(wxSystemSettings_GetColour(wxSYS_COLOUR_MENU))
687+ self.gauge.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_MENU))
688 else:
689 self.gauge.SetForegroundColour(self.configfile.getseedingcolor())
690 self.gauge.SetBackgroundColour(self.configfile.getdownloadcolor())
691@@ -567,7 +567,7 @@
692 self.frame.Raise()
693 self.frame.tbicon.RemoveIcon()
694 self.taskbaricon = False
695- except wxPyDeadObjectError:
696+ except wx.PyDeadObjectError:
697 pass
698 except:
699 self.exception()
700@@ -576,7 +576,7 @@
701 TBMENU_CLOSE = 1001
702
703 def onTaskBarMenu(self, evt):
704- menu = wxMenu()
705+ menu = wx.Menu()
706 menu.Append(self.TBMENU_RESTORE, "Restore BitTorrent")
707 menu.Append(self.TBMENU_CLOSE, "Close")
708 self.frame.tbicon.PopupMenu(menu)
709@@ -721,33 +721,33 @@
710 if (self.aboutBox is not None):
711 try:
712 self.aboutBox.Close ()
713- except wxPyDeadObjectError, e:
714+ except wx.PyDeadObjectError, e:
715 self.aboutBox = None
716
717- self.aboutBox = wxFrame(None, -1, 'About BitTorrent', size = (1,1),
718- style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE)
719+ self.aboutBox = wx.Frame(None, -1, 'About BitTorrent', size = (1,1),
720+ style = wx.DEFAULT_FRAME_STYLE|wx.FULL_REPAINT_ON_RESIZE)
721 try:
722 self.aboutBox.SetIcon(self.icon)
723 except:
724 pass
725
726- panel = wxPanel(self.aboutBox, -1)
727+ panel = wx.Panel(self.aboutBox, -1)
728
729 def StaticText(text, font = self.FONT, underline = False, color = None, panel = panel):
730- x = wxStaticText(panel, -1, text, style = wxALIGN_LEFT)
731- x.SetFont(wxFont(font, wxDEFAULT, wxNORMAL, wxNORMAL, underline))
732+ x = wx.StaticText(panel, -1, text, style = wx.ALIGN_LEFT)
733+ x.SetFont(wx.Font(font, wx.DEFAULT, wx.NORMAL, wx.NORMAL, underline))
734 if color is not None:
735 x.SetForegroundColour(color)
736 return x
737
738- colSizer = wxFlexGridSizer(cols = 1, vgap = 3)
739+ colSizer = wx.FlexGridSizer(cols = 1, vgap = 3)
740
741- titleSizer = wxBoxSizer(wxHORIZONTAL)
742+ titleSizer = wx.BoxSizer(wx.HORIZONTAL)
743 aboutTitle = StaticText('BitTorrent ' + version + ' ', self.FONT+4)
744 titleSizer.Add (aboutTitle)
745 linkDonate = StaticText('Donate to Bram', self.FONT, True, 'Blue')
746- titleSizer.Add (linkDonate, 1, wxALIGN_BOTTOM&wxEXPAND)
747- colSizer.Add(titleSizer, 0, wxEXPAND)
748+ titleSizer.Add (linkDonate, 1, wx.ALIGN_BOTTOM&wx.EXPAND)
749+ colSizer.Add(titleSizer, 0, wx.EXPAND)
750
751 colSizer.Add(StaticText('created by Bram Cohen, Copyright 2001-2003,'))
752 colSizer.Add(StaticText('experimental version maintained by John Hoffman 2003'))
753@@ -757,7 +757,7 @@
754
755 si = ( 'exact Version String: ' + version + '\n' +
756 'Python version: ' + sys.version + '\n' +
757- 'wxWindows version: ' + wxVERSION_STRING + '\n' )
758+ 'wxWidgets version: ' + wx.VERSION_STRING + '\n' )
759 try:
760 si += 'Psyco version: ' + hex(psyco.__version__)[2:] + '\n'
761 except:
762@@ -777,36 +777,36 @@
763 colSizer.Add (babble4)
764 colSizer.Add (babble6)
765
766- okButton = wxButton(panel, -1, 'Ok')
767- colSizer.Add(okButton, 0, wxALIGN_RIGHT)
768+ okButton = wx.Button(panel, -1, 'Ok')
769+ colSizer.Add(okButton, 0, wx.ALIGN_RIGHT)
770 colSizer.AddGrowableCol(0)
771
772- border = wxBoxSizer(wxHORIZONTAL)
773- border.Add(colSizer, 1, wxEXPAND | wxALL, 4)
774+ border = wx.BoxSizer(wx.HORIZONTAL)
775+ border.Add(colSizer, 1, wx.EXPAND | wx.ALL, 4)
776 panel.SetSizer(border)
777 panel.SetAutoLayout(True)
778
779 def donatelink(self):
780 Thread(target = open_new('https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=bram@bitconjurer.org&item_name=BitTorrent&amount=5.00&submit=donate')).start()
781- EVT_LEFT_DOWN(linkDonate, donatelink)
782+ wx.EVT_LEFT_DOWN(linkDonate, donatelink)
783 def aboutlink(self):
784 Thread(target = open_new('http://bitconjurer.org/BitTorrent/')).start()
785- EVT_LEFT_DOWN(babble2, aboutlink)
786+ wx.EVT_LEFT_DOWN(babble2, aboutlink)
787 def shadlink(self):
788 Thread(target = open_new('http://www.bittornado.com/')).start()
789- EVT_LEFT_DOWN(babble3, shadlink)
790+ wx.EVT_LEFT_DOWN(babble3, shadlink)
791 def explink(self):
792 Thread(target = open_new('http://ei.kefro.st/projects/btclient/')).start()
793- EVT_LEFT_DOWN(babble4, explink)
794+ wx.EVT_LEFT_DOWN(babble4, explink)
795 def licenselink(self):
796 Thread(target = open_new('http://ei.kefro.st/projects/btclient/LICENSE.TXT')).start()
797- EVT_LEFT_DOWN(babble6, licenselink)
798- EVT_LEFT_DOWN(credits, self.credits)
799+ wx.EVT_LEFT_DOWN(babble6, licenselink)
800+ wx.EVT_LEFT_DOWN(credits, self.credits)
801
802 def closeAbout(e, self = self):
803 if self.aboutBox:
804 self.aboutBox.Close()
805- EVT_BUTTON(self.aboutBox, okButton.GetId(), closeAbout)
806+ wx.EVT_BUTTON(self.aboutBox, okButton.GetId(), closeAbout)
807 def kill(e, self = self):
808 try:
809 self.aboutBox.RemoveIcon()
810@@ -814,7 +814,7 @@
811 pass
812 self.aboutBox.Destroy()
813 self.aboutBox = None
814- EVT_CLOSE(self.aboutBox, kill)
815+ wx.EVT_CLOSE(self.aboutBox, kill)
816
817 self.aboutBox.Show()
818 border.Fit(panel)
819@@ -846,35 +846,35 @@
820 if (self.detailBox is not None):
821 try:
822 self.detailBox.Close()
823- except wxPyDeadObjectError, e:
824+ except wx.PyDeadObjectError, e:
825 self.detailBox = None
826
827- self.detailBox = wxFrame(None, -1, 'Torrent Details ', size = wxSize(405,230),
828- style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE)
829+ self.detailBox = wx.Frame(None, -1, 'Torrent Details ', size = wx.Size(405,230),
830+ style = wx.DEFAULT_FRAME_STYLE|wx.FULL_REPAINT_ON_RESIZE)
831 try:
832 self.detailBox.SetIcon(self.icon)
833 except:
834 pass
835
836- panel = wxPanel(self.detailBox, -1, size = wxSize (400,220))
837+ panel = wx.Panel(self.detailBox, -1, size = wx.Size (400,220))
838
839 def StaticText(text, font = self.FONT, underline = False, color = None, panel = panel):
840- x = wxStaticText(panel, -1, text, style = wxALIGN_CENTER_VERTICAL)
841- x.SetFont(wxFont(font, wxDEFAULT, wxNORMAL, wxNORMAL, underline))
842+ x = wx.StaticText(panel, -1, text, style = wx.ALIGN_CENTER_VERTICAL)
843+ x.SetFont(wx.Font(font, wx.DEFAULT, wx.NORMAL, wx.NORMAL, underline))
844 if color is not None:
845 x.SetForegroundColour(color)
846 return x
847
848- colSizer = wxFlexGridSizer(cols = 1, vgap = 3)
849+ colSizer = wx.FlexGridSizer(cols = 1, vgap = 3)
850 colSizer.AddGrowableCol(0)
851
852- titleSizer = wxBoxSizer(wxHORIZONTAL)
853+ titleSizer = wx.BoxSizer(wx.HORIZONTAL)
854 aboutTitle = StaticText('Details about ' + self.filename, self.FONT+4)
855
856 titleSizer.Add (aboutTitle)
857 colSizer.Add (titleSizer)
858
859- detailSizer = wxFlexGridSizer(cols = 2, vgap = 6)
860+ detailSizer = wx.FlexGridSizer(cols = 2, vgap = 6)
861
862 if info.has_key('length'):
863 fileListID = None
864@@ -886,37 +886,37 @@
865 file_length = info['length']
866 name = "file size"
867 else:
868- detail1Sizer = wxFlexGridSizer(cols = 1, vgap = 6)
869+ detail1Sizer = wx.FlexGridSizer(cols = 1, vgap = 6)
870 detail1Sizer.Add(StaticText('directory name : ' + info['name']))
871 colSizer.Add (detail1Sizer)
872- bgallocButton = wxBitmapButton(panel, -1, self.allocbuttonBitmap, size = (52,20))
873+ bgallocButton = wx.BitmapButton(panel, -1, self.allocbuttonBitmap, size = (52,20))
874 def bgalloc(self, frame = self):
875 if frame.dow.storagewrapper is not None:
876 frame.dow.storagewrapper.bgalloc()
877- EVT_BUTTON(self.detailBox, bgallocButton.GetId(), bgalloc)
878+ wx.EVT_BUTTON(self.detailBox, bgallocButton.GetId(), bgalloc)
879
880- bgallocbuttonSizer = wxFlexGridSizer(cols = 4, hgap = 4, vgap = 0)
881- bgallocbuttonSizer.Add(StaticText('(right-click to set priority)',self.FONT-1),0,wxALIGN_BOTTOM)
882- bgallocbuttonSizer.Add(StaticText('(finish allocation)'), -1, wxALIGN_CENTER_VERTICAL)
883- bgallocbuttonSizer.Add(bgallocButton, -1, wxALIGN_CENTER)
884+ bgallocbuttonSizer = wx.FlexGridSizer(cols = 4, hgap = 4, vgap = 0)
885+ bgallocbuttonSizer.Add(StaticText('(right-click to set priority)',self.FONT-1),0,wx.ALIGN_BOTTOM)
886+ bgallocbuttonSizer.Add(StaticText('(finish allocation)'), -1, wx.ALIGN_CENTER_VERTICAL)
887+ bgallocbuttonSizer.Add(bgallocButton, -1, wx.ALIGN_CENTER)
888 bgallocbuttonSizer.AddGrowableCol(0)
889- colSizer.Add(bgallocbuttonSizer, -1, wxEXPAND)
890+ colSizer.Add(bgallocbuttonSizer, -1, wx.EXPAND)
891
892 file_length = 0
893
894- fileListID = wxNewId()
895- fileList = wxListCtrl(panel, fileListID,
896- wxPoint(-1,-1), (325,100), wxLC_REPORT)
897+ fileListID = wx.NewId()
898+ fileList = wx.ListCtrl(panel, fileListID,
899+ wx.Point(-1,-1), (325,100), wx.LC_REPORT)
900 self.fileList = fileList
901- fileList.SetImageList(self.filestatusIcons, wxIMAGE_LIST_SMALL)
902+ fileList.SetImageList(self.filestatusIcons, wx.IMAGE_LIST_SMALL)
903
904 fileList.SetAutoLayout (True)
905 fileList.InsertColumn(0, "file")
906- fileList.InsertColumn(1, "", format=wxLIST_FORMAT_RIGHT, width=55)
907+ fileList.InsertColumn(1, "", format=wx.LIST_FORMAT_RIGHT, width=55)
908 fileList.InsertColumn(2, "")
909
910 for i in range(len(info['files'])):
911- x = wxListItem()
912+ x = wx.ListItem()
913 fileList.InsertItem(x)
914
915 x = 0
916@@ -937,15 +937,15 @@
917 fileList.SetItem(item)
918 x += 1
919 file_length += file['length']
920- fileList.SetColumnWidth(0,wxLIST_AUTOSIZE)
921- fileList.SetColumnWidth(2,wxLIST_AUTOSIZE)
922+ fileList.SetColumnWidth(0,wx.LIST_AUTOSIZE)
923+ fileList.SetColumnWidth(2,wx.LIST_AUTOSIZE)
924
925 name = 'archive size'
926- colSizer.Add(fileList, 1, wxEXPAND)
927+ colSizer.Add(fileList, 1, wx.EXPAND)
928 colSizer.AddGrowableRow(3)
929
930- detailSizer.Add(StaticText('info_hash :'),0,wxALIGN_CENTER_VERTICAL)
931- detailSizer.Add(wxTextCtrl(panel, -1, tohex(info_hash), size = (325, -1), style = wxTE_READONLY))
932+ detailSizer.Add(StaticText('info_hash :'),0,wx.ALIGN_CENTER_VERTICAL)
933+ detailSizer.Add(wx.TextCtrl(panel, -1, tohex(info_hash), size = (325, -1), style = wx.TE_READONLY))
934 num_pieces = int((file_length+piece_length-1)/piece_length)
935 detailSizer.Add(StaticText(name + ' : '))
936 detailSizer.Add(StaticText('%s (%s bytes)' % (size_format(file_length), comma_format(file_length))))
937@@ -956,22 +956,22 @@
938 detailSizer.Add(StaticText('1'))
939
940 if announce_list is None:
941- detailSizer.Add(StaticText('announce url : '),0,wxALIGN_CENTER_VERTICAL)
942- detailSizer.Add(wxTextCtrl(panel, -1, announce, size = (325, -1), style = wxTE_READONLY))
943+ detailSizer.Add(StaticText('announce url : '),0,wx.ALIGN_CENTER_VERTICAL)
944+ detailSizer.Add(wx.TextCtrl(panel, -1, announce, size = (325, -1), style = wx.TE_READONLY))
945 else:
946 detailSizer.Add(StaticText(''))
947- trackerList = wxListCtrl(panel, -1, wxPoint(-1,-1), (325,75), wxLC_REPORT)
948+ trackerList = wx.ListCtrl(panel, -1, wx.Point(-1,-1), (325,75), wx.LC_REPORT)
949 trackerList.SetAutoLayout (True)
950 trackerList.InsertColumn(0, "")
951 trackerList.InsertColumn(1, "announce urls")
952
953 for tier in range(len(announce_list)):
954 for t in range(len(announce_list[tier])):
955- i = wxListItem()
956+ i = wx.ListItem()
957 trackerList.InsertItem(i)
958 if announce is not None:
959 for l in [1,2]:
960- i = wxListItem()
961+ i = wx.ListItem()
962 trackerList.InsertItem(i)
963
964 x = 0
965@@ -984,8 +984,8 @@
966 if announce is not None:
967 trackerList.SetStringItem(x+1, 0, 'single:')
968 trackerList.SetStringItem(x+1, 1, announce)
969- trackerList.SetColumnWidth(0,wxLIST_AUTOSIZE)
970- trackerList.SetColumnWidth(1,wxLIST_AUTOSIZE)
971+ trackerList.SetColumnWidth(0,wx.LIST_AUTOSIZE)
972+ trackerList.SetColumnWidth(1,wx.LIST_AUTOSIZE)
973 detailSizer.Add(trackerList)
974
975 if announce is None and announce_list is not None:
976@@ -1011,10 +1011,10 @@
977 detailSizer.Add(StaticText('<cannot read date>'))
978
979 detailSizer.AddGrowableCol(1)
980- colSizer.Add (detailSizer, 1, wxEXPAND)
981+ colSizer.Add (detailSizer, 1, wx.EXPAND)
982
983- okButton = wxButton(panel, -1, 'Ok')
984- colSizer.Add(okButton, 0, wxALIGN_RIGHT)
985+ okButton = wx.Button(panel, -1, 'Ok')
986+ colSizer.Add(okButton, 0, wx.ALIGN_RIGHT)
987 colSizer.AddGrowableCol(0)
988
989 if not self.configfileargs['gui_stretchwindow']:
990@@ -1022,8 +1022,8 @@
991 else:
992 panel.SetAutoLayout(True)
993
994- border = wxBoxSizer(wxHORIZONTAL)
995- border.Add(colSizer, 1, wxEXPAND | wxALL, 4)
996+ border = wx.BoxSizer(wx.HORIZONTAL)
997+ border.Add(colSizer, 1, wx.EXPAND | wx.ALL, 4)
998 panel.SetSizer(border)
999 panel.SetAutoLayout(True)
1000
1001@@ -1032,20 +1032,20 @@
1002 s = []
1003 i = -1
1004 while True:
1005- i = self.fileList.GetNextItem(i,state=wxLIST_STATE_SELECTED)
1006+ i = self.fileList.GetNextItem(i,state=wx.LIST_STATE_SELECTED)
1007 if i == -1:
1008 break
1009 s.append(i)
1010 if not s: # just in case
1011 return
1012 oldstate = self.dow.fileselector[s[0]]
1013- kind=wxITEM_RADIO
1014+ kind=wx.ITEM_RADIO
1015 for i in s[1:]:
1016 if self.dow.fileselector[i] != oldstate:
1017 oldstate = None
1018- kind = wxITEM_NORMAL
1019+ kind = wx.ITEM_NORMAL
1020 break
1021- menu = wxMenu()
1022+ menu = wx.Menu()
1023 menu.Append(self.priorityIDs[1], "download first", kind=kind)
1024 menu.Append(self.priorityIDs[2], "download normally", kind=kind)
1025 menu.Append(self.priorityIDs[3], "download later", kind=kind)
1026@@ -1069,16 +1069,16 @@
1027 break
1028
1029 for id in self.priorityIDs:
1030- EVT_MENU(self.detailBox, id, onSelection)
1031+ wx.EVT_MENU(self.detailBox, id, onSelection)
1032
1033 self.detailBox.PopupMenu(menu, evt.GetPoint())
1034
1035- EVT_LIST_ITEM_RIGHT_CLICK(self.detailBox, fileListID, onRightClick)
1036+ wx.EVT_LIST_ITEM_RIGHT_CLICK(self.detailBox, fileListID, onRightClick)
1037
1038 def closeDetail(evt, self = self):
1039 if self.detailBox:
1040 self.detailBox.Close()
1041- EVT_BUTTON(self.detailBox, okButton.GetId(), closeDetail)
1042+ wx.EVT_BUTTON(self.detailBox, okButton.GetId(), closeDetail)
1043 def kill(evt, self = self):
1044 try:
1045 self.detailBox.RemoveIcon()
1046@@ -1088,14 +1088,14 @@
1047 self.detailBox = None
1048 self.fileList = None
1049 self.dow.filedatflag.clear()
1050- EVT_CLOSE(self.detailBox, kill)
1051+ wx.EVT_CLOSE(self.detailBox, kill)
1052
1053 def trackerurl(self, turl = turl):
1054 try:
1055 Thread(target = open_new(turl)).start()
1056 except:
1057 pass
1058- EVT_LEFT_DOWN(trackerUrl, trackerurl)
1059+ wx.EVT_LEFT_DOWN(trackerUrl, trackerurl)
1060
1061 self.detailBox.Show ()
1062 border.Fit(panel)
1063@@ -1112,35 +1112,35 @@
1064 if (self.creditsBox is not None):
1065 try:
1066 self.creditsBox.Close()
1067- except wxPyDeadObjectError, e:
1068+ except wx.PyDeadObjectError, e:
1069 self.creditsBox = None
1070
1071- self.creditsBox = wxFrame(None, -1, 'Credits', size = (1,1),
1072- style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE)
1073+ self.creditsBox = wx.Frame(None, -1, 'Credits', size = (1,1),
1074+ style = wx.DEFAULT_FRAME_STYLE|wx.FULL_REPAINT_ON_RESIZE)
1075 try:
1076 self.creditsBox.SetIcon(self.icon)
1077 except:
1078 pass
1079
1080- panel = wxPanel(self.creditsBox, -1)
1081+ panel = wx.Panel(self.creditsBox, -1)
1082
1083 def StaticText(text, font = self.FONT, underline = False, color = None, panel = panel):
1084- x = wxStaticText(panel, -1, text, style = wxALIGN_LEFT)
1085- x.SetFont(wxFont(font, wxDEFAULT, wxNORMAL, wxNORMAL, underline))
1086+ x = wx.StaticText(panel, -1, text, style = wx.ALIGN_LEFT)
1087+ x.SetFont(wx.Font(font, wx.DEFAULT, wx.NORMAL, wx.NORMAL, underline))
1088 if color is not None:
1089 x.SetForegroundColour(color)
1090 return x
1091
1092- colSizer = wxFlexGridSizer(cols = 1, vgap = 3)
1093+ colSizer = wx.FlexGridSizer(cols = 1, vgap = 3)
1094
1095- titleSizer = wxBoxSizer(wxHORIZONTAL)
1096+ titleSizer = wx.BoxSizer(wx.HORIZONTAL)
1097 aboutTitle = StaticText('Credits', self.FONT+4)
1098 titleSizer.Add (aboutTitle)
1099 colSizer.Add (titleSizer)
1100 colSizer.Add (StaticText(
1101 'The following people have all helped with this\n' +
1102 'version of BitTorrent in some way (in no particular order) -\n'));
1103- creditSizer = wxFlexGridSizer(cols = 3)
1104+ creditSizer = wx.FlexGridSizer(cols = 3)
1105 creditSizer.Add(StaticText(
1106 'Bill Bumgarner\n' +
1107 'David Creswick\n' +
1108@@ -1178,20 +1178,20 @@
1109 'Jon Wolf\n' +
1110 'Christoph Hohmann\n' +
1111 'Micah Anderson'))
1112- colSizer.Add (creditSizer, flag = wxALIGN_CENTER_HORIZONTAL)
1113- okButton = wxButton(panel, -1, 'Ok')
1114- colSizer.Add(okButton, 0, wxALIGN_RIGHT)
1115+ colSizer.Add (creditSizer, flag = wx.ALIGN_CENTER_HORIZONTAL)
1116+ okButton = wx.Button(panel, -1, 'Ok')
1117+ colSizer.Add(okButton, 0, wx.ALIGN_RIGHT)
1118 colSizer.AddGrowableCol(0)
1119
1120- border = wxBoxSizer(wxHORIZONTAL)
1121- border.Add(colSizer, 1, wxEXPAND | wxALL, 4)
1122+ border = wx.BoxSizer(wx.HORIZONTAL)
1123+ border.Add(colSizer, 1, wx.EXPAND | wx.ALL, 4)
1124 panel.SetSizer(border)
1125 panel.SetAutoLayout(True)
1126
1127 def closeCredits(e, self = self):
1128 if self.creditsBox:
1129 self.creditsBox.Close()
1130- EVT_BUTTON(self.creditsBox, okButton.GetId(), closeCredits)
1131+ wx.EVT_BUTTON(self.creditsBox, okButton.GetId(), closeCredits)
1132 def kill(e, self = self):
1133 try:
1134 self.creditsBox.RemoveIcon()
1135@@ -1199,7 +1199,7 @@
1136 pass
1137 self.creditsBox.Destroy()
1138 self.creditsBox = None
1139- EVT_CLOSE(self.creditsBox, kill)
1140+ wx.EVT_CLOSE(self.creditsBox, kill)
1141
1142 self.creditsBox.Show()
1143 border.Fit(panel)
1144@@ -1213,86 +1213,86 @@
1145 if (self.statusIconHelpBox is not None):
1146 try:
1147 self.statusIconHelpBox.Close()
1148- except wxPyDeadObjectError, e:
1149+ except wx.PyDeadObjectError, e:
1150 self.statusIconHelpBox = None
1151
1152- self.statusIconHelpBox = wxFrame(None, -1, 'Help with the BitTorrent Status Light', size = (1,1),
1153- style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE)
1154+ self.statusIconHelpBox = wx.Frame(None, -1, 'Help with the BitTorrent Status Light', size = (1,1),
1155+ style = wx.DEFAULT_FRAME_STYLE|wx.FULL_REPAINT_ON_RESIZE)
1156 try:
1157 self.statusIconHelpBox.SetIcon(self.icon)
1158 except:
1159 pass
1160
1161- panel = wxPanel(self.statusIconHelpBox, -1)
1162+ panel = wx.Panel(self.statusIconHelpBox, -1)
1163
1164 def StaticText(text, font = self.FONT, underline = False, color = None, panel = panel):
1165- x = wxStaticText(panel, -1, text, style = wxALIGN_LEFT)
1166- x.SetFont(wxFont(font, wxDEFAULT, wxNORMAL, wxNORMAL, underline))
1167+ x = wx.StaticText(panel, -1, text, style = wx.ALIGN_LEFT)
1168+ x.SetFont(wx.Font(font, wx.DEFAULT, wx.NORMAL, wx.NORMAL, underline))
1169 if color is not None:
1170 x.SetForegroundColour(color)
1171 return x
1172
1173- fullsizer = wxFlexGridSizer(cols = 1, vgap = 13)
1174- colsizer = wxFlexGridSizer(cols = 2, hgap = 13, vgap = 13)
1175+ fullsizer = wx.FlexGridSizer(cols = 1, vgap = 13)
1176+ colsizer = wx.FlexGridSizer(cols = 2, hgap = 13, vgap = 13)
1177
1178 disconnectedicon=self.createStatusIcon('disconnected')
1179- colsizer.Add(wxStaticBitmap(panel, -1, disconnectedicon))
1180+ colsizer.Add(wx.StaticBitmap(panel, -1, disconnectedicon))
1181 colsizer.Add(StaticText(
1182 'Waiting to connect to the tracker.\n' +
1183 'If the status light stays black for a long time the tracker\n' +
1184 'you are trying to connect to may not be working. Unless you\n' +
1185 'are receiving a message telling you otherwise, please wait,\n' +
1186- 'and BitTorrent will automatically try to reconnect for you.'), 1, wxALIGN_CENTER_VERTICAL)
1187+ 'and BitTorrent will automatically try to reconnect for you.'), 1, wx.ALIGN_CENTER_VERTICAL)
1188
1189 noconnectionsicon=self.createStatusIcon('noconnections')
1190- colsizer.Add(wxStaticBitmap(panel, -1, noconnectionsicon))
1191+ colsizer.Add(wx.StaticBitmap(panel, -1, noconnectionsicon))
1192 colsizer.Add(StaticText(
1193 'You have no connections with other clients.\n' +
1194 'Please be patient. If after several minutes the status\n' +
1195- 'light remains red, this torrent may be old and abandoned.'), 1, wxALIGN_CENTER_VERTICAL)
1196+ 'light remains red, this torrent may be old and abandoned.'), 1, wx.ALIGN_CENTER_VERTICAL)
1197
1198 noincomingicon=self.createStatusIcon('noincoming')
1199- colsizer.Add(wxStaticBitmap(panel, -1, noincomingicon))
1200+ colsizer.Add(wx.StaticBitmap(panel, -1, noincomingicon))
1201 colsizer.Add(StaticText(
1202 'You have not received any incoming connections from others.\n' +
1203 'It may only be because no one has tried. If you never see\n' +
1204 'the status light turn green, it may indicate your system\n' +
1205 'is behind a firewall or proxy server. Please look into\n' +
1206 'routing BitTorrent through your firewall in order to receive\n' +
1207- 'the best possible download rate.'), 1, wxALIGN_CENTER_VERTICAL)
1208+ 'the best possible download rate.'), 1, wx.ALIGN_CENTER_VERTICAL)
1209
1210 nocompletesicon=self.createStatusIcon('nocompletes')
1211- colsizer.Add(wxStaticBitmap(panel, -1, nocompletesicon))
1212+ colsizer.Add(wx.StaticBitmap(panel, -1, nocompletesicon))
1213 colsizer.Add(StaticText(
1214 'There are no complete copies among the clients you are\n' +
1215 'connected to. Don\'t panic, other clients in the torrent\n' +
1216 "you can't see may have the missing data.\n" +
1217 'If the status light remains blue, you may have problems\n' +
1218- 'completing your download.'), 1, wxALIGN_CENTER_VERTICAL)
1219+ 'completing your download.'), 1, wx.ALIGN_CENTER_VERTICAL)
1220
1221 allgoodicon=self.createStatusIcon('allgood')
1222- colsizer.Add(wxStaticBitmap(panel, -1, allgoodicon))
1223+ colsizer.Add(wx.StaticBitmap(panel, -1, allgoodicon))
1224 colsizer.Add(StaticText(
1225- 'The torrent is operating properly.'), 1, wxALIGN_CENTER_VERTICAL)
1226+ 'The torrent is operating properly.'), 1, wx.ALIGN_CENTER_VERTICAL)
1227
1228- fullsizer.Add(colsizer, 0, wxALIGN_CENTER)
1229- colsizer2 = wxFlexGridSizer(cols = 1, hgap = 13)
1230+ fullsizer.Add(colsizer, 0, wx.ALIGN_CENTER)
1231+ colsizer2 = wx.FlexGridSizer(cols = 1, hgap = 13)
1232
1233 colsizer2.Add(StaticText(
1234 'Please note that the status light is not omniscient, and that it may\n' +
1235 'be wrong in many instances. A torrent with a blue light may complete\n' +
1236 "normally, and an occasional yellow light doesn't mean your computer\n" +
1237- 'has suddenly become firewalled.'), 1, wxALIGN_CENTER_VERTICAL)
1238+ 'has suddenly become firewalled.'), 1, wx.ALIGN_CENTER_VERTICAL)
1239
1240 colspacer = StaticText(' ')
1241 colsizer2.Add(colspacer)
1242
1243- okButton = wxButton(panel, -1, 'Ok')
1244- colsizer2.Add(okButton, 0, wxALIGN_CENTER)
1245- fullsizer.Add(colsizer2, 0, wxALIGN_CENTER)
1246+ okButton = wx.Button(panel, -1, 'Ok')
1247+ colsizer2.Add(okButton, 0, wx.ALIGN_CENTER)
1248+ fullsizer.Add(colsizer2, 0, wx.ALIGN_CENTER)
1249
1250- border = wxBoxSizer(wxHORIZONTAL)
1251- border.Add(fullsizer, 1, wxEXPAND | wxALL, 4)
1252+ border = wx.BoxSizer(wx.HORIZONTAL)
1253+ border.Add(fullsizer, 1, wx.EXPAND | wx.ALL, 4)
1254
1255 panel.SetSizer(border)
1256 panel.SetAutoLayout(True)
1257@@ -1300,7 +1300,7 @@
1258
1259 def closeHelp(self, frame = self):
1260 frame.statusIconHelpBox.Close()
1261- EVT_BUTTON(self.statusIconHelpBox, okButton.GetId(), closeHelp)
1262+ wx.EVT_BUTTON(self.statusIconHelpBox, okButton.GetId(), closeHelp)
1263
1264 self.statusIconHelpBox.Show ()
1265 border.Fit(panel)
1266@@ -1323,150 +1323,150 @@
1267 if (self.advBox is not None):
1268 try:
1269 self.advBox.Close ()
1270- except wxPyDeadObjectError, e:
1271+ except wx.PyDeadObjectError, e:
1272 self.advBox = None
1273
1274- self.advBox = wxFrame(None, -1, 'BitTorrent Advanced', size = wxSize(200,200),
1275- style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE)
1276+ self.advBox = wx.Frame(None, -1, 'BitTorrent Advanced', size = wx.Size(200,200),
1277+ style = wx.DEFAULT_FRAME_STYLE|wx.FULL_REPAINT_ON_RESIZE)
1278 try:
1279 self.advBox.SetIcon(self.icon)
1280 except:
1281 pass
1282
1283- panel = wxPanel(self.advBox, -1, size = wxSize (200,200))
1284+ panel = wx.Panel(self.advBox, -1, size = wx.Size (200,200))
1285
1286 def StaticText(text, font = self.FONT, underline = False, color = None, panel = panel):
1287- x = wxStaticText(panel, -1, text, style = wxALIGN_LEFT)
1288- x.SetFont(wxFont(font, wxDEFAULT, wxNORMAL, wxNORMAL, underline))
1289+ x = wx.StaticText(panel, -1, text, style = wx.ALIGN_LEFT)
1290+ x.SetFont(wx.Font(font, wx.DEFAULT, wx.NORMAL, wx.NORMAL, underline))
1291 if color is not None:
1292 x.SetForegroundColour(color)
1293 return x
1294
1295- colSizer = wxFlexGridSizer (cols = 1, vgap = 1)
1296+ colSizer = wx.FlexGridSizer (cols = 1, vgap = 1)
1297 colSizer.Add (StaticText('Advanced Info for ' + self.filename, self.FONT+4))
1298
1299 try: # get system font width
1300- fw = wxSystemSettings_GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize()+1
1301+ fw = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT).GetPointSize()+1
1302 except:
1303- fw = wxSystemSettings_GetFont(wxSYS_SYSTEM_FONT).GetPointSize()+1
1304+ fw = wx.SystemSettings_GetFont(wx.SYS_SYSTEM_FONT).GetPointSize()+1
1305
1306- spewList = wxListCtrl(panel, -1, wxPoint(-1,-1), (fw*66,350), wxLC_REPORT|wxLC_HRULES|wxLC_VRULES)
1307+ spewList = wx.ListCtrl(panel, -1, wx.Point(-1,-1), (fw*66,350), wx.LC_REPORT|wx.LC_HRULES|wx.LC_VRULES)
1308 self.spewList = spewList
1309 spewList.SetAutoLayout (True)
1310
1311- colSizer.Add(spewList, -1, wxEXPAND)
1312+ colSizer.Add(spewList, -1, wx.EXPAND)
1313
1314 colSizer.Add(StaticText(''))
1315 self.storagestats1 = StaticText('')
1316 self.storagestats2 = StaticText('')
1317- colSizer.Add(self.storagestats1, -1, wxEXPAND)
1318- colSizer.Add(self.storagestats2, -1, wxEXPAND)
1319- spinnerSizer = wxFlexGridSizer(cols=4,vgap=0,hgap=0)
1320+ colSizer.Add(self.storagestats1, -1, wx.EXPAND)
1321+ colSizer.Add(self.storagestats2, -1, wx.EXPAND)
1322+ spinnerSizer = wx.FlexGridSizer(cols=4,vgap=0,hgap=0)
1323 cstats = ' Listening on '
1324 if self.connection_stats['interfaces']:
1325 cstats += ', '.join(self.connection_stats['interfaces']) + ' on '
1326 cstats += 'port ' + str(self.connection_stats['port'])
1327 if self.connection_stats['upnp']:
1328 cstats += ', UPnP port forwarded'
1329- spinnerSizer.Add(StaticText(cstats), -1, wxEXPAND)
1330+ spinnerSizer.Add(StaticText(cstats), -1, wx.EXPAND)
1331 spinnerSizer.AddGrowableCol(0)
1332- spinnerSizer.Add(StaticText('Max download rate (kB/s) '),0,wxALIGN_CENTER_VERTICAL)
1333- self.downrateSpinner = wxSpinCtrl (panel, -1, "", (-1,-1), (50, -1))
1334+ spinnerSizer.Add(StaticText('Max download rate (kB/s) '),0,wx.ALIGN_CENTER_VERTICAL)
1335+ self.downrateSpinner = wx.SpinCtrl (panel, -1, "", (-1,-1), (50, -1))
1336 self.downrateSpinner.SetFont(self.default_font)
1337 self.downrateSpinner.SetRange(0,5000)
1338 self.downrateSpinner.SetValue(self.config['max_download_rate'])
1339 spinnerSizer.Add (self.downrateSpinner, 0)
1340- EVT_SPINCTRL(self.downrateSpinner, -1, self.onDownRateSpinner)
1341- spinnerSizer.Add(StaticText(' (0 = unlimited) '),0,wxALIGN_CENTER_VERTICAL)
1342- colSizer.Add(spinnerSizer,0,wxEXPAND)
1343+ wx.EVT_SPINCTRL(self.downrateSpinner, -1, self.onDownRateSpinner)
1344+ spinnerSizer.Add(StaticText(' (0 = unlimited) '),0,wx.ALIGN_CENTER_VERTICAL)
1345+ colSizer.Add(spinnerSizer,0,wx.EXPAND)
1346
1347 colSizer.Add(StaticText(''))
1348
1349- buttonSizer = wxFlexGridSizer (cols = 5, hgap = 20)
1350+ buttonSizer = wx.FlexGridSizer (cols = 5, hgap = 20)
1351
1352- reannounceButton = wxButton(panel, -1, 'Manual Announce')
1353+ reannounceButton = wx.Button(panel, -1, 'Manual Announce')
1354 buttonSizer.Add (reannounceButton)
1355
1356- extannounceButton = wxButton(panel, -1, 'External Announce')
1357+ extannounceButton = wx.Button(panel, -1, 'External Announce')
1358 buttonSizer.Add (extannounceButton)
1359
1360- bgallocButton = wxButton(panel, -1, 'Finish Allocation')
1361+ bgallocButton = wx.Button(panel, -1, 'Finish Allocation')
1362 buttonSizer.Add (bgallocButton)
1363
1364 buttonSizer.Add(StaticText(''))
1365
1366- okButton = wxButton(panel, -1, 'Ok')
1367+ okButton = wx.Button(panel, -1, 'Ok')
1368 buttonSizer.Add (okButton)
1369
1370- colSizer.Add (buttonSizer, 0, wxALIGN_CENTER)
1371+ colSizer.Add (buttonSizer, 0, wx.ALIGN_CENTER)
1372 colSizer.AddGrowableCol(0)
1373 colSizer.AddGrowableRow(1)
1374
1375 panel.SetSizer(colSizer)
1376 panel.SetAutoLayout(True)
1377
1378- spewList.InsertColumn(0, "Optimistic Unchoke", format=wxLIST_FORMAT_CENTER, width=fw*2)
1379+ spewList.InsertColumn(0, "Optimistic Unchoke", format=wx.LIST_FORMAT_CENTER, width=fw*2)
1380 spewList.InsertColumn(1, "Peer ID", width=0)
1381 spewList.InsertColumn(2, "IP", width=fw*11)
1382- spewList.InsertColumn(3, "Local/Remote", format=wxLIST_FORMAT_CENTER, width=fw*3)
1383- spewList.InsertColumn(4, "Up", format=wxLIST_FORMAT_RIGHT, width=fw*6)
1384- spewList.InsertColumn(5, "Interested", format=wxLIST_FORMAT_CENTER, width=fw*2)
1385- spewList.InsertColumn(6, "Choking", format=wxLIST_FORMAT_CENTER, width=fw*2)
1386- spewList.InsertColumn(7, "Down", format=wxLIST_FORMAT_RIGHT, width=fw*6)
1387- spewList.InsertColumn(8, "Interesting", format=wxLIST_FORMAT_CENTER, width=fw*2)
1388- spewList.InsertColumn(9, "Choked", format=wxLIST_FORMAT_CENTER, width=fw*2)
1389- spewList.InsertColumn(10, "Snubbed", format=wxLIST_FORMAT_CENTER, width=fw*2)
1390- spewList.InsertColumn(11, "Downloaded", format=wxLIST_FORMAT_RIGHT, width=fw*7)
1391- spewList.InsertColumn(12, "Uploaded", format=wxLIST_FORMAT_RIGHT, width=fw*7)
1392- spewList.InsertColumn(13, "Completed", format=wxLIST_FORMAT_RIGHT, width=fw*6)
1393- spewList.InsertColumn(14, "Peer Download Speed", format=wxLIST_FORMAT_RIGHT, width=fw*6)
1394+ spewList.InsertColumn(3, "Local/Remote", format=wx.LIST_FORMAT_CENTER, width=fw*3)
1395+ spewList.InsertColumn(4, "Up", format=wx.LIST_FORMAT_RIGHT, width=fw*6)
1396+ spewList.InsertColumn(5, "Interested", format=wx.LIST_FORMAT_CENTER, width=fw*2)
1397+ spewList.InsertColumn(6, "Choking", format=wx.LIST_FORMAT_CENTER, width=fw*2)
1398+ spewList.InsertColumn(7, "Down", format=wx.LIST_FORMAT_RIGHT, width=fw*6)
1399+ spewList.InsertColumn(8, "Interesting", format=wx.LIST_FORMAT_CENTER, width=fw*2)
1400+ spewList.InsertColumn(9, "Choked", format=wx.LIST_FORMAT_CENTER, width=fw*2)
1401+ spewList.InsertColumn(10, "Snubbed", format=wx.LIST_FORMAT_CENTER, width=fw*2)
1402+ spewList.InsertColumn(11, "Downloaded", format=wx.LIST_FORMAT_RIGHT, width=fw*7)
1403+ spewList.InsertColumn(12, "Uploaded", format=wx.LIST_FORMAT_RIGHT, width=fw*7)
1404+ spewList.InsertColumn(13, "Completed", format=wx.LIST_FORMAT_RIGHT, width=fw*6)
1405+ spewList.InsertColumn(14, "Peer Download Speed", format=wx.LIST_FORMAT_RIGHT, width=fw*6)
1406
1407 def reannounce(self, frame = self):
1408 if (clock() - frame.reannouncelast > 60):
1409 frame.reannouncelast = clock()
1410 frame.dow.reannounce()
1411- EVT_BUTTON(self.advBox, reannounceButton.GetId(), reannounce)
1412+ wx.EVT_BUTTON(self.advBox, reannounceButton.GetId(), reannounce)
1413
1414 self.advextannouncebox = None
1415 def reannounce_external(self, frame = self):
1416 if (frame.advextannouncebox is not None):
1417 try:
1418 frame.advextannouncebox.Close ()
1419- except wxPyDeadObjectError, e:
1420+ except wx.PyDeadObjectError, e:
1421 frame.advextannouncebox = None
1422
1423- frame.advextannouncebox = wxFrame(None, -1, 'External Announce', size = (1,1),
1424- style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE)
1425+ frame.advextannouncebox = wx.Frame(None, -1, 'External Announce', size = (1,1),
1426+ style = wx.DEFAULT_FRAME_STYLE|wx.FULL_REPAINT_ON_RESIZE)
1427 try:
1428 frame.advextannouncebox.SetIcon(frame.icon)
1429 except:
1430 pass
1431
1432- panel = wxPanel(frame.advextannouncebox, -1)
1433+ panel = wx.Panel(frame.advextannouncebox, -1)
1434
1435- fullsizer = wxFlexGridSizer(cols = 1, vgap = 13)
1436- msg = wxStaticText(panel, -1, "Enter tracker anounce URL:")
1437+ fullsizer = wx.FlexGridSizer(cols = 1, vgap = 13)
1438+ msg = wx.StaticText(panel, -1, "Enter tracker anounce URL:")
1439 msg.SetFont(frame.default_font)
1440 fullsizer.Add(msg)
1441
1442- frame.advexturl = wxTextCtrl(parent = panel, id = -1, value = '',
1443- size = (255, 20), style = wxTE_PROCESS_TAB)
1444+ frame.advexturl = wx.TextCtrl(parent = panel, id = -1, value = '',
1445+ size = (255, 20), style = wx.TE_PROCESS_TAB)
1446 frame.advexturl.SetFont(frame.default_font)
1447 frame.advexturl.SetValue(frame.lastexternalannounce)
1448 fullsizer.Add(frame.advexturl)
1449
1450- buttonSizer = wxFlexGridSizer (cols = 2, hgap = 10)
1451+ buttonSizer = wx.FlexGridSizer (cols = 2, hgap = 10)
1452
1453- okButton = wxButton(panel, -1, 'OK')
1454+ okButton = wx.Button(panel, -1, 'OK')
1455 buttonSizer.Add (okButton)
1456
1457- cancelButton = wxButton(panel, -1, 'Cancel')
1458+ cancelButton = wx.Button(panel, -1, 'Cancel')
1459 buttonSizer.Add (cancelButton)
1460
1461- fullsizer.Add (buttonSizer, 0, wxALIGN_CENTER)
1462+ fullsizer.Add (buttonSizer, 0, wx.ALIGN_CENTER)
1463
1464- border = wxBoxSizer(wxHORIZONTAL)
1465- border.Add(fullsizer, 1, wxEXPAND | wxALL, 4)
1466+ border = wx.BoxSizer(wx.HORIZONTAL)
1467+ border.Add(fullsizer, 1, wx.EXPAND | wx.ALL, 4)
1468
1469 panel.SetSizer(border)
1470 panel.SetAutoLayout(True)
1471@@ -1479,22 +1479,22 @@
1472 frame.reannouncelast = clock()
1473 frame.dow.reannounce(special)
1474 frame.advextannouncebox.Close()
1475- EVT_BUTTON(frame.advextannouncebox, okButton.GetId(), ok)
1476+ wx.EVT_BUTTON(frame.advextannouncebox, okButton.GetId(), ok)
1477
1478 def cancel(self, frame = frame):
1479 frame.advextannouncebox.Close()
1480- EVT_BUTTON(frame.advextannouncebox, cancelButton.GetId(), cancel)
1481+ wx.EVT_BUTTON(frame.advextannouncebox, cancelButton.GetId(), cancel)
1482
1483 frame.advextannouncebox.Show ()
1484 fullsizer.Fit(panel)
1485 frame.advextannouncebox.Fit()
1486
1487- EVT_BUTTON(self.advBox, extannounceButton.GetId(), reannounce_external)
1488+ wx.EVT_BUTTON(self.advBox, extannounceButton.GetId(), reannounce_external)
1489
1490 def bgalloc(self, frame = self):
1491 if frame.dow.storagewrapper is not None:
1492 frame.dow.storagewrapper.bgalloc()
1493- EVT_BUTTON(self.advBox, bgallocButton.GetId(), bgalloc)
1494+ wx.EVT_BUTTON(self.advBox, bgallocButton.GetId(), bgalloc)
1495
1496 def closeAdv(evt, self = self):
1497 self.advBox.Close()
1498@@ -1510,11 +1510,11 @@
1499 if (self.advextannouncebox is not None):
1500 try:
1501 self.advextannouncebox.Close()
1502- except wxPyDeadObjectError, e:
1503+ except wx.PyDeadObjectError, e:
1504 pass
1505 self.advextannouncebox = None
1506- EVT_BUTTON(self.advBox, okButton.GetId(), closeAdv)
1507- EVT_CLOSE(self.advBox, killAdv)
1508+ wx.EVT_BUTTON(self.advBox, okButton.GetId(), closeAdv)
1509+ wx.EVT_CLOSE(self.advBox, killAdv)
1510
1511 self.advBox.Show ()
1512 colSizer.Fit(panel)
1513@@ -1531,25 +1531,25 @@
1514 def onDisplayUsage(self, text):
1515 try:
1516 self.done(None)
1517- w = wxFrame(None, -1, 'BITTORRENT USAGE',
1518- style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE)
1519- panel = wxPanel(w, -1)
1520- sizer = wxFlexGridSizer(cols = 1)
1521- sizer.Add(wxTextCtrl(panel, -1, text,
1522- size = (500,300), style = wxTE_READONLY|wxTE_MULTILINE))
1523- okButton = wxButton(panel, -1, 'Ok')
1524+ w = wx.Frame(None, -1, 'BITTORRENT USAGE',
1525+ style = wx.DEFAULT_FRAME_STYLE|wx.FULL_REPAINT_ON_RESIZE)
1526+ panel = wx.Panel(w, -1)
1527+ sizer = wx.FlexGridSizer(cols = 1)
1528+ sizer.Add(wx.TextCtrl(panel, -1, text,
1529+ size = (500,300), style = wx.TE_READONLY|wx.TE_MULTILINE))
1530+ okButton = wx.Button(panel, -1, 'Ok')
1531
1532 def closeUsage(self, frame = self):
1533 frame.usageBox.Close()
1534- EVT_BUTTON(w, okButton.GetId(), closeUsage)
1535+ wx.EVT_BUTTON(w, okButton.GetId(), closeUsage)
1536 def kill(self, frame = self):
1537 frame.usageBox.Destroy()
1538 frame.usageBox = None
1539- EVT_CLOSE(w, kill)
1540+ wx.EVT_CLOSE(w, kill)
1541
1542- sizer.Add(okButton, 0, wxALIGN_RIGHT)
1543- border = wxBoxSizer(wxHORIZONTAL)
1544- border.Add(sizer, 1, wxEXPAND | wxALL, 4)
1545+ sizer.Add(okButton, 0, wx.ALIGN_RIGHT)
1546+ border = wx.BoxSizer(wx.HORIZONTAL)
1547+ border.Add(sizer, 1, wx.EXPAND | wx.ALL, 4)
1548
1549 panel.SetSizer(border)
1550 panel.SetAutoLayout(True)
1551@@ -1746,7 +1746,7 @@
1552 else:
1553 kickbanlen = 0
1554 for x in range(spewlen-spewList.GetItemCount()):
1555- i = wxListItem()
1556+ i = wx.ListItem()
1557 spewList.InsertItem(i)
1558 for x in range(spewlen,spewList.GetItemCount()):
1559 spewList.DeleteItem(len(spew)+1)
1560@@ -1997,16 +1997,16 @@
1561 start_dir1 = start_dir
1562 if isdir(join(start_dir,default)):
1563 start_dir = join(start_dir,default)
1564- dl = wxDirDialog(self.frame,
1565+ dl = wx.DirDialog(self.frame,
1566 'Choose a directory to save to, pick a partial download to resume',
1567- defaultPath = start_dir, style = wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON)
1568+ defaultPath = start_dir, style = wx.DD_DEFAULT_STYLE | wx.DD_NEW_DIR_BUTTON)
1569 else:
1570- dl = wxFileDialog(self.frame,
1571+ dl = wx.FileDialog(self.frame,
1572 'Choose file to save as, pick a partial download to resume',
1573 defaultDir = start_dir, defaultFile = default, wildcard = '*',
1574- style = wxSAVE)
1575+ style = wx.SAVE)
1576
1577- if dl.ShowModal() != wxID_OK:
1578+ if dl.ShowModal() != wx.ID_OK:
1579 f.set()
1580 self.done(None)
1581 return
1582@@ -2100,28 +2100,28 @@
1583 if (self.detailBox is not None):
1584 try:
1585 self.detailBox.Close ()
1586- except wxPyDeadObjectError, e:
1587+ except wx.PyDeadObjectError, e:
1588 self.detailBox = None
1589 if (self.aboutBox is not None):
1590 try:
1591 self.aboutBox.Close ()
1592- except wxPyDeadObjectError, e:
1593+ except wx.PyDeadObjectError, e:
1594 self.aboutBox = None
1595 if (self.creditsBox is not None):
1596 try:
1597 self.creditsBox.Close ()
1598- except wxPyDeadObjectError, e:
1599+ except wx.PyDeadObjectError, e:
1600 self.creditsBox = None
1601 if (self.advBox is not None):
1602 try:
1603 self.advBox.Close ()
1604- except wxPyDeadObjectError, e:
1605+ except wx.PyDeadObjectError, e:
1606 self.advBox = None
1607
1608 if (self.statusIconHelpBox is not None):
1609 try:
1610 self.statusIconHelpBox.Close ()
1611- except wxPyDeadObjectError, e:
1612+ except wx.PyDeadObjectError, e:
1613 self.statusIconHelpBox = None
1614 self.configfile.Close()
1615 try:
1616@@ -2143,15 +2143,15 @@
1617
1618 def on_errorwindow(self, err):
1619 if self._errorwindow is None:
1620- w = wxFrame(None, -1, 'BITTORRENT ERROR', size = (1,1),
1621- style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE)
1622- panel = wxPanel(w, -1)
1623+ w = wx.Frame(None, -1, 'BITTORRENT ERROR', size = (1,1),
1624+ style = wx.DEFAULT_FRAME_STYLE|wx.FULL_REPAINT_ON_RESIZE)
1625+ panel = wx.Panel(w, -1)
1626
1627- sizer = wxFlexGridSizer(cols = 1)
1628+ sizer = wx.FlexGridSizer(cols = 1)
1629 t = ( 'BitTorrent ' + version + '\n' +
1630 'OS: ' + sys.platform + '\n' +
1631 'Python version: ' + sys.version + '\n' +
1632- 'wxWindows version: ' + wxVERSION_STRING + '\n' )
1633+ 'wxWidgets version: ' + wx.VERSION_STRING + '\n' )
1634 try:
1635 t += 'Psyco version: ' + hex(psyco.__version__)[2:] + '\n'
1636 except:
1637@@ -2163,24 +2163,24 @@
1638 t += '\n'
1639 except:
1640 pass
1641- sizer.Add(wxTextCtrl(panel, -1, t + '\n' + err,
1642- size = (500,300), style = wxTE_READONLY|wxTE_MULTILINE))
1643+ sizer.Add(wx.TextCtrl(panel, -1, t + '\n' + err,
1644+ size = (500,300), style = wx.TE_READONLY|wx.TE_MULTILINE))
1645
1646- sizer.Add(wxStaticText(panel, -1,
1647+ sizer.Add(wx.StaticText(panel, -1,
1648 '\nHelp us iron out the bugs in the engine!'))
1649- linkMail = wxStaticText(panel, -1,
1650+ linkMail = wx.StaticText(panel, -1,
1651 'Please report this error to '+report_email)
1652- linkMail.SetFont(wxFont(self.FONT, wxDEFAULT, wxNORMAL, wxNORMAL, True))
1653+ linkMail.SetFont(wx.Font(self.FONT, wx.DEFAULT, wx.NORMAL, wx.NORMAL, True))
1654 linkMail.SetForegroundColour('Blue')
1655 sizer.Add(linkMail)
1656
1657 def maillink(self):
1658 Thread(target = open_new("mailto:" + report_email
1659 + "?subject=autobugreport")).start()
1660- EVT_LEFT_DOWN(linkMail, maillink)
1661+ wx.EVT_LEFT_DOWN(linkMail, maillink)
1662
1663- border = wxBoxSizer(wxHORIZONTAL)
1664- border.Add(sizer, 1, wxEXPAND | wxALL, 4)
1665+ border = wx.BoxSizer(wx.HORIZONTAL)
1666+ border.Add(sizer, 1, wx.EXPAND | wx.ALL, 4)
1667
1668 panel.SetSizer(border)
1669 panel.SetAutoLayout(True)
1670@@ -2191,10 +2191,10 @@
1671 self._errorwindow = w
1672
1673
1674-class btWxApp(wxApp):
1675+class btWxApp(wx.App):
1676 def __init__(self, x, params):
1677 self.params = params
1678- wxApp.__init__(self, x)
1679+ wx.App.__init__(self, x)
1680
1681 def OnInit(self):
1682 doneflag = Event()
1683@@ -2202,11 +2202,11 @@
1684 d = DownloadInfoFrame(doneflag, self.configfile)
1685 self.SetTopWindow(d.frame)
1686 if len(self.params) == 0:
1687- b = wxFileDialog (d.frame, 'Choose .torrent file to use',
1688+ b = wx.FileDialog (d.frame, 'Choose .torrent file to use',
1689 defaultDir = '', defaultFile = '', wildcard = '*.torrent',
1690- style = wxOPEN)
1691+ style = wx.OPEN)
1692
1693- if b.ShowModal() == wxID_OK:
1694+ if b.ShowModal() == wx.ID_OK:
1695 self.params.append (b.GetPath())
1696
1697 thread = Thread(target = next, args = [self.params, d, doneflag, self.configfile])
1698diff -Naur BitTornado-CVS.orig/btmaketorrentgui.py BitTornado-CVS/btmaketorrentgui.py
1699--- BitTornado-CVS.orig/btmaketorrentgui.py 2004-07-02 18:39:32.000000000 +0200
1700+++ BitTornado-CVS/btmaketorrentgui.py 2005-09-18 03:08:46.383098208 +0200
1701@@ -22,7 +22,7 @@
1702 from os import getcwd
1703 from os.path import join, isdir
1704 try:
1705- from wxPython.wx import *
1706+ import wx
1707 except:
1708 print 'wxPython is either not installed or has not been installed properly.'
1709 sys.exit(1)
1710@@ -33,14 +33,14 @@
1711 True = 1
1712 False = 0
1713
1714-wxEVT_INVOKE = wxNewEventType()
1715+wxEVT_INVOKE = wx.NewEventType()
1716
1717 def EVT_INVOKE(win, func):
1718 win.Connect(-1, -1, wxEVT_INVOKE, func)
1719
1720-class InvokeEvent(wxPyEvent):
1721+class InvokeEvent(wx.PyEvent):
1722 def __init__(self, func, args, kwargs):
1723- wxPyEvent.__init__(self)
1724+ wx.PyEvent.__init__(self)
1725 self.SetEventType(wxEVT_INVOKE)
1726 self.func = func
1727 self.args = args
1728@@ -48,99 +48,99 @@
1729
1730 class DownloadInfo:
1731 def __init__(self):
1732- frame = wxFrame(None, -1, 'BitTorrent Torrent File Maker', size = wxSize(550, 410))
1733+ frame = wx.Frame(None, -1, 'BitTorrent Torrent File Maker', size = wx.Size(550, 410))
1734 self.frame = frame
1735
1736- panel = wxPanel(frame, -1)
1737+ panel = wx.Panel(frame, -1)
1738
1739- gridSizer = wxFlexGridSizer(cols = 2, rows = 2, vgap = 0, hgap = 8)
1740+ gridSizer = wx.FlexGridSizer(cols = 2, rows = 2, vgap = 0, hgap = 8)
1741
1742- gridSizer.Add(wxStaticText(panel, -1, 'make torrent of:'))
1743+ gridSizer.Add(wx.StaticText(panel, -1, 'make torrent of:'))
1744
1745- b = wxBoxSizer(wxHORIZONTAL)
1746- self.dirCtl = wxTextCtrl(panel, -1, '')
1747- b.Add(self.dirCtl, 1, wxEXPAND)
1748-# b.Add(10, 10, 0, wxEXPAND)
1749+ b = wx.BoxSizer(wx.HORIZONTAL)
1750+ self.dirCtl = wx.TextCtrl(panel, -1, '')
1751+ b.Add(self.dirCtl, 1, wx.EXPAND)
1752+# b.Add(10, 10, 0, wx.EXPAND)
1753
1754- button = wxButton(panel, -1, 'dir', size = (30,20))
1755- EVT_BUTTON(frame, button.GetId(), self.selectdir)
1756+ button = wx.Button(panel, -1, 'dir', size = (30,20))
1757+ wx.EVT_BUTTON(frame, button.GetId(), self.selectdir)
1758 b.Add(button, 0)
1759
1760- button2 = wxButton(panel, -1, 'file', size = (30,20))
1761- EVT_BUTTON(frame, button2.GetId(), self.selectfile)
1762+ button2 = wx.Button(panel, -1, 'file', size = (30,20))
1763+ wx.EVT_BUTTON(frame, button2.GetId(), self.selectfile)
1764 b.Add(button2, 0)
1765
1766- gridSizer.Add(b, 0, wxEXPAND)
1767- gridSizer.Add(wxStaticText(panel, -1, ''))
1768- gridSizer.Add(wxStaticText(panel, -1, ''))
1769-
1770- gridSizer.Add(wxStaticText(panel, -1, 'announce url:'))
1771- self.annCtl = wxTextCtrl(panel, -1, 'http://my.tracker:6969/announce')
1772- gridSizer.Add(self.annCtl, 0, wxEXPAND)
1773- gridSizer.Add(wxStaticText(panel, -1, ''))
1774- gridSizer.Add(wxStaticText(panel, -1, ''))
1775-
1776- a = wxFlexGridSizer(cols = 1)
1777- a.Add(wxStaticText(panel, -1, 'announce list:'))
1778- a.Add(wxStaticText(panel, -1, ''))
1779- abutton = wxButton(panel, -1, 'copy\nannounces\nfrom\ntorrent', size = (50,70))
1780- EVT_BUTTON(frame, abutton.GetId(), self.announcecopy)
1781- a.Add(abutton, 0, wxEXPAND)
1782- gridSizer.Add(a, 0, wxEXPAND)
1783+ gridSizer.Add(b, 0, wx.EXPAND)
1784+ gridSizer.Add(wx.StaticText(panel, -1, ''))
1785+ gridSizer.Add(wx.StaticText(panel, -1, ''))
1786+
1787+ gridSizer.Add(wx.StaticText(panel, -1, 'announce url:'))
1788+ self.annCtl = wx.TextCtrl(panel, -1, 'http://my.tracker:6969/announce')
1789+ gridSizer.Add(self.annCtl, 0, wx.EXPAND)
1790+ gridSizer.Add(wx.StaticText(panel, -1, ''))
1791+ gridSizer.Add(wx.StaticText(panel, -1, ''))
1792+
1793+ a = wx.FlexGridSizer(cols = 1)
1794+ a.Add(wx.StaticText(panel, -1, 'announce list:'))
1795+ a.Add(wx.StaticText(panel, -1, ''))
1796+ abutton = wx.Button(panel, -1, 'copy\nannounces\nfrom\ntorrent', size = (50,70))
1797+ wx.EVT_BUTTON(frame, abutton.GetId(), self.announcecopy)
1798+ a.Add(abutton, 0, wx.EXPAND)
1799+ gridSizer.Add(a, 0, wx.EXPAND)
1800
1801- self.annListCtl = wxTextCtrl(panel, -1, '\n\n\n\n\n', wxPoint(-1,-1), (400,120),
1802- wxTE_MULTILINE|wxHSCROLL|wxTE_DONTWRAP)
1803- gridSizer.Add(self.annListCtl, -1, wxEXPAND)
1804+ self.annListCtl = wx.TextCtrl(panel, -1, '\n\n\n\n\n', wx.Point(-1,-1), (400,120),
1805+ wx.TE_MULTILINE|wx.HSCROLL|wx.TE_DONTWRAP)
1806+ gridSizer.Add(self.annListCtl, -1, wx.EXPAND)
1807
1808- gridSizer.Add(wxStaticText(panel, -1, ''))
1809- exptext = wxStaticText(panel, -1,
1810+ gridSizer.Add(wx.StaticText(panel, -1, ''))
1811+ exptext = wx.StaticText(panel, -1,
1812 "a list of announces separated by commas " +
1813 "or whitespace and on several lines -\n" +
1814 "trackers on the same line will be tried randomly," +
1815 "and all the trackers on one line\n" +
1816 "will be tried before the trackers on the next line.")
1817- exptext.SetFont(wxFont(6, wxDEFAULT, wxNORMAL, wxNORMAL, False))
1818+ exptext.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, False))
1819 gridSizer.Add(exptext)
1820
1821- gridSizer.Add(wxStaticText(panel, -1, ''))
1822- gridSizer.Add(wxStaticText(panel, -1, ''))
1823+ gridSizer.Add(wx.StaticText(panel, -1, ''))
1824+ gridSizer.Add(wx.StaticText(panel, -1, ''))
1825
1826- gridSizer.Add(wxStaticText(panel, -1, 'piece size:'))
1827- self.piece_length = wxChoice(panel, -1,
1828+ gridSizer.Add(wx.StaticText(panel, -1, 'piece size:'))
1829+ self.piece_length = wx.Choice(panel, -1,
1830 choices = ['automatic', '2MiB', '1MiB', '512KiB', '256KiB', '128KiB', '64KiB', '32KiB'])
1831 self.piece_length_list = [0, 21, 20, 19, 18, 17, 16, 15]
1832 self.piece_length.SetSelection(0)
1833 gridSizer.Add(self.piece_length)
1834
1835- gridSizer.Add(wxStaticText(panel, -1, ''))
1836- gridSizer.Add(wxStaticText(panel, -1, ''))
1837+ gridSizer.Add(wx.StaticText(panel, -1, ''))
1838+ gridSizer.Add(wx.StaticText(panel, -1, ''))
1839
1840- gridSizer.Add(wxStaticText(panel, -1, 'comment:'))
1841- self.commentCtl = wxTextCtrl(panel, -1, '')
1842- gridSizer.Add(self.commentCtl, 0, wxEXPAND)
1843+ gridSizer.Add(wx.StaticText(panel, -1, 'comment:'))
1844+ self.commentCtl = wx.TextCtrl(panel, -1, '')
1845+ gridSizer.Add(self.commentCtl, 0, wx.EXPAND)
1846
1847 gridSizer.AddGrowableCol(1)
1848
1849- border = wxBoxSizer(wxVERTICAL)
1850- border.Add(gridSizer, 0, wxEXPAND | wxNORTH | wxEAST | wxWEST, 25)
1851- b2 = wxButton(panel, -1, 'make')
1852-# border.Add(10, 10, 1, wxEXPAND)
1853- border.Add(b2, 0, wxALIGN_CENTER | wxSOUTH, 20)
1854- EVT_BUTTON(frame, b2.GetId(), self.complete)
1855+ border = wx.BoxSizer(wx.VERTICAL)
1856+ border.Add(gridSizer, 0, wx.EXPAND | wx.NORTH | wx.EAST | wx.WEST, 25)
1857+ b2 = wx.Button(panel, -1, 'make')
1858+# border.Add(10, 10, 1, wx.EXPAND)
1859+ border.Add(b2, 0, wx.ALIGN_CENTER | wx.SOUTH, 20)
1860+ wx.EVT_BUTTON(frame, b2.GetId(), self.complete)
1861 panel.SetSizer(border)
1862 panel.SetAutoLayout(True)
1863
1864 # panel.DragAcceptFiles(True)
1865-# EVT_DROP_FILES(panel, self.selectdrop)
1866+# wx.EVT_DROP_FILES(panel, self.selectdrop)
1867
1868 def selectdir(self, x):
1869- dl = wxDirDialog(self.frame, style = wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON)
1870- if dl.ShowModal() == wxID_OK:
1871+ dl = wx.DirDialog(self.frame, style = wx.DD_DEFAULT_STYLE | wx.DD_NEW_DIR_BUTTON)
1872+ if dl.ShowModal() == wx.ID_OK:
1873 self.dirCtl.SetValue(dl.GetPath())
1874
1875 def selectfile(self, x):
1876- dl = wxFileDialog (self.frame, 'Choose file or directory to use', '', '', '', wxOPEN)
1877- if dl.ShowModal() == wxID_OK:
1878+ dl = wx.FileDialog (self.frame, 'Choose file or directory to use', '', '', '', wx.OPEN)
1879+ if dl.ShowModal() == wx.ID_OK:
1880 self.dirCtl.SetValue(dl.GetPath())
1881
1882 def selectdrop(self, x):
1883@@ -150,8 +150,8 @@
1884 self.dirCtl.SetValue(x[0])
1885
1886 def announcecopy(self, x):
1887- dl = wxFileDialog (self.frame, 'Choose .torrent file to use', '', '', '*.torrent', wxOPEN)
1888- if dl.ShowModal() == wxID_OK:
1889+ dl = wx.FileDialog (self.frame, 'Choose .torrent file to use', '', '', '*.torrent', wx.OPEN)
1890+ if dl.ShowModal() == wx.ID_OK:
1891 try:
1892 h = open(dl.GetPath(), 'rb')
1893 metainfo = bdecode(h.read())
1894@@ -187,8 +187,8 @@
1895
1896 def complete(self, x):
1897 if self.dirCtl.GetValue() == '':
1898- dlg = wxMessageDialog(self.frame, message = 'You must select a\n file or directory',
1899- caption = 'Error', style = wxOK | wxICON_ERROR)
1900+ dlg = wx.MessageDialog(self.frame, message = 'You must select a\n file or directory',
1901+ caption = 'Error', style = wx.OK | wx.ICON_ERROR)
1902 dlg.ShowModal()
1903 dlg.Destroy()
1904 return
1905@@ -217,41 +217,41 @@
1906
1907 if isdir(d):
1908 self.choicemade = Event()
1909- frame = wxFrame(None, -1, 'BitTorrent make torrent', size = (1,1))
1910+ frame = wx.Frame(None, -1, 'BitTorrent make torrent', size = (1,1))
1911 self.frame = frame
1912- panel = wxPanel(frame, -1)
1913- gridSizer = wxFlexGridSizer(cols = 1, vgap = 8, hgap = 8)
1914+ panel = wx.Panel(frame, -1)
1915+ gridSizer = wx.FlexGridSizer(cols = 1, vgap = 8, hgap = 8)
1916 gridSizer.AddGrowableRow(1)
1917- gridSizer.Add(wxStaticText(panel, -1,
1918- 'Do you want to make a separate .torrent'),0,wxALIGN_CENTER)
1919- gridSizer.Add(wxStaticText(panel, -1,
1920- 'for every item in this directory?'),0,wxALIGN_CENTER)
1921- gridSizer.Add(wxStaticText(panel, -1, ''))
1922+ gridSizer.Add(wx.StaticText(panel, -1,
1923+ 'Do you want to make a separate .torrent'),0,wx.ALIGN_CENTER)
1924+ gridSizer.Add(wx.StaticText(panel, -1,
1925+ 'for every item in this directory?'),0,wx.ALIGN_CENTER)
1926+ gridSizer.Add(wx.StaticText(panel, -1, ''))
1927
1928- b = wxFlexGridSizer(cols = 3, hgap = 10)
1929- yesbut = wxButton(panel, -1, 'Yes')
1930+ b = wx.FlexGridSizer(cols = 3, hgap = 10)
1931+ yesbut = wx.Button(panel, -1, 'Yes')
1932 def saidyes(e, self = self):
1933 self.frame.Destroy()
1934 self.separatetorrents = True
1935 self.begin()
1936- EVT_BUTTON(frame, yesbut.GetId(), saidyes)
1937+ wx.EVT_BUTTON(frame, yesbut.GetId(), saidyes)
1938 b.Add(yesbut, 0)
1939
1940- nobut = wxButton(panel, -1, 'No')
1941+ nobut = wx.Button(panel, -1, 'No')
1942 def saidno(e, self = self):
1943 self.frame.Destroy()
1944 self.begin()
1945- EVT_BUTTON(frame, nobut.GetId(), saidno)
1946+ wx.EVT_BUTTON(frame, nobut.GetId(), saidno)
1947 b.Add(nobut, 0)
1948
1949- cancelbut = wxButton(panel, -1, 'Cancel')
1950+ cancelbut = wx.Button(panel, -1, 'Cancel')
1951 def canceled(e, self = self):
1952 self.frame.Destroy()
1953- EVT_BUTTON(frame, cancelbut.GetId(), canceled)
1954+ wx.EVT_BUTTON(frame, cancelbut.GetId(), canceled)
1955 b.Add(cancelbut, 0)
1956- gridSizer.Add(b, 0, wxALIGN_CENTER)
1957- border = wxBoxSizer(wxHORIZONTAL)
1958- border.Add(gridSizer, 1, wxEXPAND | wxALL, 4)
1959+ gridSizer.Add(b, 0, wx.ALIGN_CENTER)
1960+ border = wx.BoxSizer(wx.HORIZONTAL)
1961+ border.Add(gridSizer, 1, wx.EXPAND | wx.ALL, 4)
1962
1963 panel.SetSizer(border)
1964 panel.SetAutoLayout(True)
1965@@ -264,35 +264,35 @@
1966
1967 def begin(self):
1968 if self.separatetorrents:
1969- frame = wxFrame(None, -1, 'BitTorrent make directory', size = wxSize(550, 250))
1970+ frame = wx.Frame(None, -1, 'BitTorrent make directory', size = wx.Size(550, 250))
1971 else:
1972- frame = wxFrame(None, -1, 'BitTorrent make torrent', size = wxSize(550, 250))
1973+ frame = wx.Frame(None, -1, 'BitTorrent make torrent', size = wx.Size(550, 250))
1974 self.frame = frame
1975
1976- panel = wxPanel(frame, -1)
1977- gridSizer = wxFlexGridSizer(cols = 1, vgap = 15, hgap = 8)
1978+ panel = wx.Panel(frame, -1)
1979+ gridSizer = wx.FlexGridSizer(cols = 1, vgap = 15, hgap = 8)
1980
1981 if self.separatetorrents:
1982- self.currentLabel = wxStaticText(panel, -1, 'checking file sizes')
1983+ self.currentLabel = wx.StaticText(panel, -1, 'checking file sizes')
1984 else:
1985- self.currentLabel = wxStaticText(panel, -1, 'building ' + self.d + '.torrent')
1986- gridSizer.Add(self.currentLabel, 0, wxEXPAND)
1987- self.gauge = wxGauge(panel, -1, range = 1000, style = wxGA_SMOOTH)
1988- gridSizer.Add(self.gauge, 0, wxEXPAND)
1989- gridSizer.Add((10, 10), 1, wxEXPAND)
1990- self.button = wxButton(panel, -1, 'cancel')
1991- gridSizer.Add(self.button, 0, wxALIGN_CENTER)
1992+ self.currentLabel = wx.StaticText(panel, -1, 'building ' + self.d + '.torrent')
1993+ gridSizer.Add(self.currentLabel, 0, wx.EXPAND)
1994+ self.gauge = wx.Gauge(panel, -1, range = 1000, style = wx.GA_SMOOTH)
1995+ gridSizer.Add(self.gauge, 0, wx.EXPAND)
1996+ gridSizer.Add((10, 10), 1, wx.EXPAND)
1997+ self.button = wx.Button(panel, -1, 'cancel')
1998+ gridSizer.Add(self.button, 0, wx.ALIGN_CENTER)
1999 gridSizer.AddGrowableRow(2)
2000 gridSizer.AddGrowableCol(0)
2001
2002- g2 = wxFlexGridSizer(cols = 1, vgap = 15, hgap = 8)
2003- g2.Add(gridSizer, 1, wxEXPAND | wxALL, 25)
2004+ g2 = wx.FlexGridSizer(cols = 1, vgap = 15, hgap = 8)
2005+ g2.Add(gridSizer, 1, wx.EXPAND | wx.ALL, 25)
2006 g2.AddGrowableRow(0)
2007 g2.AddGrowableCol(0)
2008 panel.SetSizer(g2)
2009 panel.SetAutoLayout(True)
2010- EVT_BUTTON(frame, self.button.GetId(), self.done)
2011- EVT_CLOSE(frame, self.done)
2012+ wx.EVT_BUTTON(frame, self.button.GetId(), self.done)
2013+ wx.EVT_CLOSE(frame, self.done)
2014 EVT_INVOKE(frame, self.onInvoke)
2015 frame.Show(True)
2016 Thread(target = self.complete).start()
2017@@ -313,8 +313,8 @@
2018 except (OSError, IOError), e:
2019 self.currentLabel.SetLabel('Error!')
2020 self.button.SetLabel('Close')
2021- dlg = wxMessageDialog(self.frame, message = 'Error - ' + str(e),
2022- caption = 'Error', style = wxOK | wxICON_ERROR)
2023+ dlg = wx.MessageDialog(self.frame, message = 'Error - ' + str(e),
2024+ caption = 'Error', style = wx.OK | wx.ICON_ERROR)
2025 dlg.ShowModal()
2026 dlg.Destroy()
2027
2028@@ -336,13 +336,13 @@
2029
2030 def invokeLater(self, func, args = [], kwargs = {}):
2031 if not self.flag.isSet():
2032- wxPostEvent(self.frame, InvokeEvent(func, args, kwargs))
2033+ wx.PostEvent(self.frame, InvokeEvent(func, args, kwargs))
2034
2035 def done(self, event):
2036 self.flag.set()
2037 self.frame.Destroy()
2038
2039-class btWxApp(wxApp):
2040+class btWxApp(wx.App):
2041 def OnInit(self):
2042 d = DownloadInfo()
2043 d.frame.Show(True)
2044diff -Naur BitTornado-CVS.orig/bt-t-make.py BitTornado-CVS/bt-t-make.py
2045--- BitTornado-CVS.orig/bt-t-make.py 2004-05-09 15:07:20.000000000 +0200
2046+++ BitTornado-CVS/bt-t-make.py 2005-09-18 03:19:00.240777656 +0200
2047@@ -23,7 +23,7 @@
2048 from os.path import join, isdir
2049 from traceback import print_exc
2050 try:
2051- from wxPython.wx import *
2052+ import wx
2053 except:
2054 print 'wxPython is either not installed or has not been installed properly.'
2055 sys.exit(1)
2056@@ -42,14 +42,14 @@
2057 DROP_HERE = ''
2058
2059
2060-wxEVT_INVOKE = wxNewEventType()
2061+wxEVT_INVOKE = wx.NewEventType()
2062
2063 def EVT_INVOKE(win, func):
2064 win.Connect(-1, -1, wxEVT_INVOKE, func)
2065
2066-class InvokeEvent(wxPyEvent):
2067+class InvokeEvent(wx.PyEvent):
2068 def __init__(self, func, args, kwargs):
2069- wxPyEvent.__init__(self)
2070+ wx.PyEvent.__init__(self)
2071 self.SetEventType(wxEVT_INVOKE)
2072 self.func = func
2073 self.args = args
2074@@ -66,7 +66,7 @@
2075 self.switchlock = Lock()
2076 self.working = False
2077 self.queue = []
2078- wxInitAllImageHandlers()
2079+ wx.InitAllImageHandlers()
2080 self.thostselection = self.calls['getCurrentTHost']()
2081 self.thostselectnum = 0
2082 self.choices = None
2083@@ -74,76 +74,76 @@
2084 self.announce = ''
2085 self.announce_list = None
2086
2087- self.windowStyle = wxSYSTEM_MENU|wxCAPTION|wxMINIMIZE_BOX
2088+ self.windowStyle = wx.SYSTEM_MENU|wx.CAPTION|wx.MINIMIZE_BOX
2089 if self.config['stayontop']:
2090- self.windowStyle |= wxSTAY_ON_TOP
2091- frame = wxFrame(None, -1, 'T-Make',
2092- size = wxSize(-1, -1),
2093+ self.windowStyle |= wx.STAY_ON_TOP
2094+ frame = wx.Frame(None, -1, 'T-Make',
2095+ size = wx.Size(-1, -1),
2096 style = self.windowStyle)
2097 self.frame = frame
2098- panel = wxPanel(frame, -1)
2099- mainSizer = wxBoxSizer(wxVERTICAL)
2100- groupSizer = wxFlexGridSizer(cols = 1, vgap = 0, hgap = 0)
2101+ panel = wx.Panel(frame, -1)
2102+ mainSizer = wx.BoxSizer(wx.VERTICAL)
2103+ groupSizer = wx.FlexGridSizer(cols = 1, vgap = 0, hgap = 0)
2104 # self.dropTarget = self.calls['newDropTarget']((200,200))
2105 self.dropTarget = self.calls['newDropTarget']()
2106- self.dropTargetPtr = wxStaticBitmap(panel, -1, self.dropTarget)
2107+ self.dropTargetPtr = wx.StaticBitmap(panel, -1, self.dropTarget)
2108 self.calls['setDropTargetRefresh'](self.dropTargetPtr.Refresh)
2109 self.dropTargetWidth = self.dropTarget.GetWidth()
2110- EVT_LEFT_DOWN(self.dropTargetPtr,self.dropTargetClick)
2111- EVT_ENTER_WINDOW(self.dropTargetPtr,self.calls['dropTargetHovered'])
2112- EVT_LEAVE_WINDOW(self.dropTargetPtr,self.calls['dropTargetUnhovered'])
2113- groupSizer.Add(self.dropTargetPtr,0,wxALIGN_CENTER)
2114- lowerSizer1 = wxGridSizer(cols = 6)
2115- dirlink = wxStaticText(panel, -1, 'dir')
2116- dirlink.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, True))
2117+ wx.EVT_LEFT_DOWN(self.dropTargetPtr,self.dropTargetClick)
2118+ wx.EVT_ENTER_WINDOW(self.dropTargetPtr,self.calls['dropTargetHovered'])
2119+ wx.EVT_LEAVE_WINDOW(self.dropTargetPtr,self.calls['dropTargetUnhovered'])
2120+ groupSizer.Add(self.dropTargetPtr,0,wx.ALIGN_CENTER)
2121+ lowerSizer1 = wx.GridSizer(cols = 6)
2122+ dirlink = wx.StaticText(panel, -1, 'dir')
2123+ dirlink.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.NORMAL, True))
2124 dirlink.SetForegroundColour('blue')
2125- EVT_LEFT_UP(dirlink,self.selectdir)
2126- lowerSizer1.Add(dirlink, -1, wxALIGN_LEFT)
2127- lowerSizer1.Add(wxStaticText(panel, -1, ''), -1, wxALIGN_CENTER)
2128- lowerSizer1.Add(wxStaticText(panel, -1, ''), -1, wxALIGN_CENTER)
2129- lowerSizer1.Add(wxStaticText(panel, -1, ''), -1, wxALIGN_CENTER)
2130- lowerSizer1.Add(wxStaticText(panel, -1, ''), -1, wxALIGN_CENTER)
2131- filelink = wxStaticText(panel, -1, 'file')
2132- filelink.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, True))
2133+ wx.EVT_LEFT_UP(dirlink,self.selectdir)
2134+ lowerSizer1.Add(dirlink, -1, wx.ALIGN_LEFT)
2135+ lowerSizer1.Add(wx.StaticText(panel, -1, ''), -1, wx.ALIGN_CENTER)
2136+ lowerSizer1.Add(wx.StaticText(panel, -1, ''), -1, wx.ALIGN_CENTER)
2137+ lowerSizer1.Add(wx.StaticText(panel, -1, ''), -1, wx.ALIGN_CENTER)
2138+ lowerSizer1.Add(wx.StaticText(panel, -1, ''), -1, wx.ALIGN_CENTER)
2139+ filelink = wx.StaticText(panel, -1, 'file')
2140+ filelink.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.NORMAL, True))
2141 filelink.SetForegroundColour('blue')
2142- EVT_LEFT_UP(filelink,self.selectfile)
2143- lowerSizer1.Add(filelink, -1, wxALIGN_RIGHT)
2144+ wx.EVT_LEFT_UP(filelink,self.selectfile)
2145+ lowerSizer1.Add(filelink, -1, wx.ALIGN_RIGHT)
2146
2147- groupSizer.Add(lowerSizer1, -1, wxALIGN_CENTER)
2148+ groupSizer.Add(lowerSizer1, -1, wx.ALIGN_CENTER)
2149
2150- self.gauge = wxGauge(panel, -1, range = 1000,
2151- style = wxGA_HORIZONTAL, size = (-1,15))
2152- groupSizer.Add(self.gauge, 0, wxEXPAND)
2153- self.statustext = wxStaticText(panel, -1, 'ready',
2154- style = wxALIGN_CENTER|wxST_NO_AUTORESIZE)
2155- self.statustext.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxBOLD, False))
2156- groupSizer.Add(self.statustext, -1, wxEXPAND)
2157- self.choices = wxChoice(panel, -1, (-1, -1), (self.dropTargetWidth, -1),
2158+ self.gauge = wx.Gauge(panel, -1, range = 1000,
2159+ style = wx.GA_HORIZONTAL, size = (-1,15))
2160+ groupSizer.Add(self.gauge, 0, wx.EXPAND)
2161+ self.statustext = wx.StaticText(panel, -1, 'ready',
2162+ style = wx.ALIGN_CENTER|wx.ST_NO_AUTORESIZE)
2163+ self.statustext.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.BOLD, False))
2164+ groupSizer.Add(self.statustext, -1, wx.EXPAND)
2165+ self.choices = wx.Choice(panel, -1, (-1, -1), (self.dropTargetWidth, -1),
2166 choices = [])
2167- self.choices.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, False))
2168- EVT_CHOICE(self.choices, -1, self.set_thost)
2169- groupSizer.Add(self.choices, 0, wxEXPAND)
2170- cancellink = wxStaticText(panel, -1, 'cancel')
2171- cancellink.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, True))
2172+ self.choices.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.NORMAL, False))
2173+ wx.EVT_CHOICE(self.choices, -1, self.set_thost)
2174+ groupSizer.Add(self.choices, 0, wx.EXPAND)
2175+ cancellink = wx.StaticText(panel, -1, 'cancel')
2176+ cancellink.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.NORMAL, True))
2177 cancellink.SetForegroundColour('red')
2178- EVT_LEFT_UP(cancellink,self.cancel)
2179- groupSizer.Add(cancellink, -1, wxALIGN_CENTER)
2180- advlink = wxStaticText(panel, -1, 'advanced')
2181- advlink.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, True))
2182+ wx.EVT_LEFT_UP(cancellink,self.cancel)
2183+ groupSizer.Add(cancellink, -1, wx.ALIGN_CENTER)
2184+ advlink = wx.StaticText(panel, -1, 'advanced')
2185+ advlink.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.NORMAL, True))
2186 advlink.SetForegroundColour('blue')
2187- EVT_LEFT_UP(advlink,self.calls['switchToAdvanced'])
2188- groupSizer.Add(advlink, -1, wxALIGN_CENTER)
2189- mainSizer.Add(groupSizer, 0, wxALIGN_CENTER)
2190+ wx.EVT_LEFT_UP(advlink,self.calls['switchToAdvanced'])
2191+ groupSizer.Add(advlink, -1, wx.ALIGN_CENTER)
2192+ mainSizer.Add(groupSizer, 0, wx.ALIGN_CENTER)
2193
2194 self.refresh_thostlist()
2195 self._set_thost()
2196
2197 if platform == 'win32':
2198 self.dropTargetPtr.DragAcceptFiles(True)
2199- EVT_DROP_FILES(self.dropTargetPtr, self.selectdrop)
2200+ wx.EVT_DROP_FILES(self.dropTargetPtr, self.selectdrop)
2201
2202-# border = wxBoxSizer(wxHORIZONTAL)
2203-# border.Add(mainSizer, 1, wxEXPAND | wxALL, 0)
2204+# border = wx.BoxSizer(wx.HORIZONTAL)
2205+# border.Add(mainSizer, 1, wx.EXPAND | wx.ALL, 0)
2206 panel.SetSizer(mainSizer)
2207 panel.SetAutoLayout(True)
2208 # border.Fit(panel)
2209@@ -152,13 +152,13 @@
2210 frame.Show(True)
2211
2212 EVT_INVOKE(frame, self.onInvoke)
2213- EVT_CLOSE(frame, self._close)
2214+ wx.EVT_CLOSE(frame, self._close)
2215
2216
2217 def selectdir(self, x = None):
2218 self.calls['dropTargetHovered']()
2219- dl = wxDirDialog(self.frame, style = wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON)
2220- if dl.ShowModal() == wxID_OK:
2221+ dl = wx.DirDialog(self.frame, style = wx.DD_DEFAULT_STYLE | wx.DD_NEW_DIR_BUTTON)
2222+ if dl.ShowModal() == wx.ID_OK:
2223 self.calls['dropTargetDropped']()
2224 self.complete(dl.GetPath())
2225 else:
2226@@ -166,8 +166,8 @@
2227
2228 def selectfile(self, x = None):
2229 self.calls['dropTargetHovered']()
2230- dl = wxFileDialog (self.frame, 'Choose file to use', '', '', '', wxOPEN)
2231- if dl.ShowModal() == wxID_OK:
2232+ dl = wx.FileDialog (self.frame, 'Choose file to use', '', '', '', wx.OPEN)
2233+ if dl.ShowModal() == wx.ID_OK:
2234 self.calls['dropTargetDropped']()
2235 self.complete(dl.GetPath())
2236 else:
2237@@ -266,7 +266,7 @@
2238
2239 def invokeLater(self, func, args = [], kwargs = {}):
2240 if not self.uiflag.isSet():
2241- wxPostEvent(self.frame, InvokeEvent(func, args, kwargs))
2242+ wx.PostEvent(self.frame, InvokeEvent(func, args, kwargs))
2243
2244 def build_setgauge(self, x):
2245 self.invokeLater(self.on_setgauge, [x])
2246@@ -319,219 +319,219 @@
2247 self.switchlock = Lock()
2248 self.working = False
2249 self.queue = []
2250- wxInitAllImageHandlers()
2251+ wx.InitAllImageHandlers()
2252 self.thostselection = self.calls['getCurrentTHost']()
2253 self.thostselectnum = 0
2254 self.choices = None
2255 self.choices1 = None
2256
2257- self.windowStyle = wxSYSTEM_MENU|wxCAPTION|wxMINIMIZE_BOX
2258+ self.windowStyle = wx.SYSTEM_MENU|wx.CAPTION|wx.MINIMIZE_BOX
2259 if self.config['stayontop']:
2260- self.windowStyle |= wxSTAY_ON_TOP
2261- frame = wxFrame(None, -1, 'T-Make',
2262- size = wxSize(-1, -1),
2263+ self.windowStyle |= wx.STAY_ON_TOP
2264+ frame = wx.Frame(None, -1, 'T-Make',
2265+ size = wx.Size(-1, -1),
2266 style = self.windowStyle)
2267 self.frame = frame
2268- panel = wxPanel(frame, -1)
2269+ panel = wx.Panel(frame, -1)
2270
2271- fullSizer = wxFlexGridSizer(cols = 1, vgap = 0, hgap = 8)
2272+ fullSizer = wx.FlexGridSizer(cols = 1, vgap = 0, hgap = 8)
2273
2274- colSizer = wxFlexGridSizer(cols = 2, vgap = 0, hgap = 8)
2275- leftSizer = wxFlexGridSizer(cols = 1, vgap = 3)
2276+ colSizer = wx.FlexGridSizer(cols = 2, vgap = 0, hgap = 8)
2277+ leftSizer = wx.FlexGridSizer(cols = 1, vgap = 3)
2278
2279- self.stayontop_checkbox = wxCheckBox(panel, -1, "stay on top")
2280+ self.stayontop_checkbox = wx.CheckBox(panel, -1, "stay on top")
2281 self.stayontop_checkbox.SetValue(self.config['stayontop'])
2282- EVT_CHECKBOX(frame, self.stayontop_checkbox.GetId(), self.setstayontop)
2283- leftSizer.Add(self.stayontop_checkbox, -1, wxALIGN_CENTER)
2284- leftSizer.Add(wxStaticText(panel, -1, ''))
2285-
2286- button = wxButton(panel, -1, 'use image...')
2287- EVT_BUTTON(frame, button.GetId(), self.selectDropTarget)
2288- leftSizer.Add(button, -1, wxALIGN_CENTER)
2289+ wx.EVT_CHECKBOX(frame, self.stayontop_checkbox.GetId(), self.setstayontop)
2290+ leftSizer.Add(self.stayontop_checkbox, -1, wx.ALIGN_CENTER)
2291+ leftSizer.Add(wx.StaticText(panel, -1, ''))
2292+
2293+ button = wx.Button(panel, -1, 'use image...')
2294+ wx.EVT_BUTTON(frame, button.GetId(), self.selectDropTarget)
2295+ leftSizer.Add(button, -1, wx.ALIGN_CENTER)
2296
2297- self.groupSizer1Box = wxStaticBox(panel, -1, '')
2298- groupSizer1 = wxStaticBoxSizer(self.groupSizer1Box, wxHORIZONTAL)
2299- groupSizer = wxFlexGridSizer(cols = 1, vgap = 0)
2300+ self.groupSizer1Box = wx.StaticBox(panel, -1, '')
2301+ groupSizer1 = wx.StaticBoxSizer(self.groupSizer1Box, wx.HORIZONTAL)
2302+ groupSizer = wx.FlexGridSizer(cols = 1, vgap = 0)
2303 self.dropTarget = self.calls['newDropTarget']((200,200))
2304 # self.dropTarget = self.calls['newDropTarget']()
2305- self.dropTargetPtr = wxStaticBitmap(panel, -1, self.dropTarget)
2306+ self.dropTargetPtr = wx.StaticBitmap(panel, -1, self.dropTarget)
2307 self.calls['setDropTargetRefresh'](self.dropTargetPtr.Refresh)
2308 self.dropTargetWidth = self.dropTarget.GetWidth()
2309- EVT_LEFT_DOWN(self.dropTargetPtr,self.dropTargetClick)
2310- EVT_ENTER_WINDOW(self.dropTargetPtr,self.calls['dropTargetHovered'])
2311- EVT_LEAVE_WINDOW(self.dropTargetPtr,self.calls['dropTargetUnhovered'])
2312- groupSizer.Add(self.dropTargetPtr,0,wxALIGN_CENTER)
2313- lowerSizer1 = wxGridSizer(cols = 3)
2314- dirlink = wxStaticText(panel, -1, 'dir')
2315- dirlink.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, True))
2316+ wx.EVT_LEFT_DOWN(self.dropTargetPtr,self.dropTargetClick)
2317+ wx.EVT_ENTER_WINDOW(self.dropTargetPtr,self.calls['dropTargetHovered'])
2318+ wx.EVT_LEAVE_WINDOW(self.dropTargetPtr,self.calls['dropTargetUnhovered'])
2319+ groupSizer.Add(self.dropTargetPtr,0,wx.ALIGN_CENTER)
2320+ lowerSizer1 = wx.GridSizer(cols = 3)
2321+ dirlink = wx.StaticText(panel, -1, 'dir')
2322+ dirlink.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.NORMAL, True))
2323 dirlink.SetForegroundColour('blue')
2324- EVT_LEFT_UP(dirlink,self.selectdir)
2325- lowerSizer1.Add(dirlink, -1, wxALIGN_LEFT)
2326- lowerSizer1.Add(wxStaticText(panel, -1, ''), -1, wxALIGN_CENTER)
2327- filelink = wxStaticText(panel, -1, 'file')
2328- filelink.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, True))
2329+ wx.EVT_LEFT_UP(dirlink,self.selectdir)
2330+ lowerSizer1.Add(dirlink, -1, wx.ALIGN_LEFT)
2331+ lowerSizer1.Add(wx.StaticText(panel, -1, ''), -1, wx.ALIGN_CENTER)
2332+ filelink = wx.StaticText(panel, -1, 'file')
2333+ filelink.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.NORMAL, True))
2334 filelink.SetForegroundColour('blue')
2335- EVT_LEFT_UP(filelink,self.selectfile)
2336- lowerSizer1.Add(filelink, -1, wxALIGN_RIGHT)
2337+ wx.EVT_LEFT_UP(filelink,self.selectfile)
2338+ lowerSizer1.Add(filelink, -1, wx.ALIGN_RIGHT)
2339
2340- groupSizer.Add(lowerSizer1, -1, wxALIGN_CENTER)
2341+ groupSizer.Add(lowerSizer1, -1, wx.ALIGN_CENTER)
2342
2343- self.gauge = wxGauge(panel, -1, range = 1000,
2344- style = wxGA_HORIZONTAL, size = (-1,15))
2345- groupSizer.Add(self.gauge, 0, wxEXPAND)
2346- self.statustext = wxStaticText(panel, -1, 'ready',
2347- style = wxALIGN_CENTER|wxST_NO_AUTORESIZE)
2348- self.statustext.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxBOLD, False))
2349- groupSizer.Add(self.statustext, -1, wxEXPAND)
2350- self.choices = wxChoice(panel, -1, (-1, -1), (self.dropTargetWidth, -1),
2351+ self.gauge = wx.Gauge(panel, -1, range = 1000,
2352+ style = wx.GA_HORIZONTAL, size = (-1,15))
2353+ groupSizer.Add(self.gauge, 0, wx.EXPAND)
2354+ self.statustext = wx.StaticText(panel, -1, 'ready',
2355+ style = wx.ALIGN_CENTER|wx.ST_NO_AUTORESIZE)
2356+ self.statustext.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.BOLD, False))
2357+ groupSizer.Add(self.statustext, -1, wx.EXPAND)
2358+ self.choices = wx.Choice(panel, -1, (-1, -1), (self.dropTargetWidth, -1),
2359 choices = [])
2360- self.choices.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, False))
2361- EVT_CHOICE(self.choices, -1, self.set_thost)
2362- groupSizer.Add(self.choices, 0, wxEXPAND)
2363- cancellink = wxStaticText(panel, -1, 'cancel')
2364- cancellink.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, True))
2365+ self.choices.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.NORMAL, False))
2366+ wx.EVT_CHOICE(self.choices, -1, self.set_thost)
2367+ groupSizer.Add(self.choices, 0, wx.EXPAND)
2368+ cancellink = wx.StaticText(panel, -1, 'cancel')
2369+ cancellink.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.NORMAL, True))
2370 cancellink.SetForegroundColour('red')
2371- EVT_LEFT_UP(cancellink,self.cancel)
2372- groupSizer.Add(cancellink, -1, wxALIGN_CENTER)
2373- dummyadvlink = wxStaticText(panel, -1, 'advanced')
2374- dummyadvlink.SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, False))
2375+ wx.EVT_LEFT_UP(cancellink,self.cancel)
2376+ groupSizer.Add(cancellink, -1, wx.ALIGN_CENTER)
2377+ dummyadvlink = wx.StaticText(panel, -1, 'advanced')
2378+ dummyadvlink.SetFont(wx.Font(7, wx.DEFAULT, wx.NORMAL, wx.NORMAL, False))
2379 dummyadvlink.SetForegroundColour('blue')
2380- EVT_LEFT_UP(dirlink,self.selectdir)
2381- groupSizer.Add(dummyadvlink, -1, wxALIGN_CENTER)
2382+ wx.EVT_LEFT_UP(dirlink,self.selectdir)
2383+ groupSizer.Add(dummyadvlink, -1, wx.ALIGN_CENTER)
2384 groupSizer1.Add(groupSizer)
2385- leftSizer.Add(groupSizer1, -1, wxALIGN_CENTER)
2386+ leftSizer.Add(groupSizer1, -1, wx.ALIGN_CENTER)
2387
2388- leftSizer.Add(wxStaticText(panel, -1, 'make torrent of:'),0,wxALIGN_CENTER)
2389+ leftSizer.Add(wx.StaticText(panel, -1, 'make torrent of:'),0,wx.ALIGN_CENTER)
2390
2391- self.dirCtl = wxTextCtrl(panel, -1, '', size = (250,-1))
2392- leftSizer.Add(self.dirCtl, 1, wxEXPAND)
2393+ self.dirCtl = wx.TextCtrl(panel, -1, '', size = (250,-1))
2394+ leftSizer.Add(self.dirCtl, 1, wx.EXPAND)
2395
2396- b = wxBoxSizer(wxHORIZONTAL)
2397- button = wxButton(panel, -1, 'dir')
2398- EVT_BUTTON(frame, button.GetId(), self.selectdir)
2399+ b = wx.BoxSizer(wx.HORIZONTAL)
2400+ button = wx.Button(panel, -1, 'dir')
2401+ wx.EVT_BUTTON(frame, button.GetId(), self.selectdir)
2402 b.Add(button, 0)
2403
2404- button2 = wxButton(panel, -1, 'file')
2405- EVT_BUTTON(frame, button2.GetId(), self.selectfile)
2406+ button2 = wx.Button(panel, -1, 'file')
2407+ wx.EVT_BUTTON(frame, button2.GetId(), self.selectfile)
2408 b.Add(button2, 0)
2409
2410- leftSizer.Add(b, 0, wxALIGN_CENTER)
2411+ leftSizer.Add(b, 0, wx.ALIGN_CENTER)
2412
2413- leftSizer.Add(wxStaticText(panel, -1, ''))
2414+ leftSizer.Add(wx.StaticText(panel, -1, ''))
2415
2416- simple_link = wxStaticText(panel, -1, 'back to basic mode')
2417- simple_link.SetFont(wxFont(-1, wxDEFAULT, wxNORMAL, wxNORMAL, True))
2418+ simple_link = wx.StaticText(panel, -1, 'back to basic mode')
2419+ simple_link.SetFont(wx.Font(-1, wx.DEFAULT, wx.NORMAL, wx.NORMAL, True))
2420 simple_link.SetForegroundColour('blue')
2421- EVT_LEFT_UP(simple_link,self.calls['switchToBasic'])
2422- leftSizer.Add(simple_link, -1, wxALIGN_CENTER)
2423+ wx.EVT_LEFT_UP(simple_link,self.calls['switchToBasic'])
2424+ leftSizer.Add(simple_link, -1, wx.ALIGN_CENTER)
2425
2426- colSizer.Add(leftSizer, -1, wxALIGN_CENTER_VERTICAL)
2427+ colSizer.Add(leftSizer, -1, wx.ALIGN_CENTER_VERTICAL)
2428
2429- gridSizer = wxFlexGridSizer(cols = 2, vgap = 6, hgap = 8)
2430+ gridSizer = wx.FlexGridSizer(cols = 2, vgap = 6, hgap = 8)
2431
2432- gridSizer.Add(wxStaticText(panel, -1, 'Torrent host:'), -1,
2433- wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
2434+ gridSizer.Add(wx.StaticText(panel, -1, 'Torrent host:'), -1,
2435+ wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
2436
2437- self.choices1 = wxChoice(panel, -1, (-1, -1), (-1, -1),
2438+ self.choices1 = wx.Choice(panel, -1, (-1, -1), (-1, -1),
2439 choices = [])
2440- EVT_CHOICE(self.choices1, -1, self.set_thost1)
2441- gridSizer.Add(self.choices1, 0, wxEXPAND)
2442+ wx.EVT_CHOICE(self.choices1, -1, self.set_thost1)
2443+ gridSizer.Add(self.choices1, 0, wx.EXPAND)
2444
2445- b = wxBoxSizer(wxHORIZONTAL)
2446- button1 = wxButton(panel, -1, 'set default')
2447- EVT_BUTTON(frame, button1.GetId(), self.set_default_thost)
2448+ b = wx.BoxSizer(wx.HORIZONTAL)
2449+ button1 = wx.Button(panel, -1, 'set default')
2450+ wx.EVT_BUTTON(frame, button1.GetId(), self.set_default_thost)
2451 b.Add(button1, 0)
2452- b.Add(wxStaticText(panel, -1, ' '))
2453- button2 = wxButton(panel, -1, 'delete')
2454- EVT_BUTTON(frame, button2.GetId(), self.delete_thost)
2455+ b.Add(wx.StaticText(panel, -1, ' '))
2456+ button2 = wx.Button(panel, -1, 'delete')
2457+ wx.EVT_BUTTON(frame, button2.GetId(), self.delete_thost)
2458 b.Add(button2, 0)
2459- b.Add(wxStaticText(panel, -1, ' '))
2460- button3 = wxButton(panel, -1, 'save as...')
2461- EVT_BUTTON(frame, button3.GetId(), self.save_thost)
2462+ b.Add(wx.StaticText(panel, -1, ' '))
2463+ button3 = wx.Button(panel, -1, 'save as...')
2464+ wx.EVT_BUTTON(frame, button3.GetId(), self.save_thost)
2465 b.Add(button3, 0)
2466
2467- gridSizer.Add(wxStaticText(panel, -1, ''))
2468- gridSizer.Add(b, 0, wxALIGN_CENTER)
2469+ gridSizer.Add(wx.StaticText(panel, -1, ''))
2470+ gridSizer.Add(b, 0, wx.ALIGN_CENTER)
2471
2472- gridSizer.Add(wxStaticText(panel, -1, ''))
2473- gridSizer.Add(wxStaticText(panel, -1, ''))
2474+ gridSizer.Add(wx.StaticText(panel, -1, ''))
2475+ gridSizer.Add(wx.StaticText(panel, -1, ''))
2476
2477- gridSizer.Add(wxStaticText(panel, -1, 'single tracker url:'),0,
2478- wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
2479- self.annCtl = wxTextCtrl(panel, -1, 'http://my.tracker:6969/announce')
2480- gridSizer.Add(self.annCtl, 0, wxEXPAND)
2481-
2482- a = wxFlexGridSizer(cols = 1, vgap = 3)
2483- a.Add(wxStaticText(panel, -1, 'tracker list:'),0,wxALIGN_RIGHT)
2484- a.Add(wxStaticText(panel, -1, ''))
2485- abutton = wxButton(panel, -1, 'copy\nannounces\nfrom\ntorrent', size = (70,70))
2486- EVT_BUTTON(frame, abutton.GetId(), self.announcecopy)
2487- a.Add(abutton, -1, wxALIGN_CENTER)
2488- a.Add(wxStaticText(panel, -1, DROP_HERE), -1, wxALIGN_CENTER)
2489- gridSizer.Add(a, -1, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
2490-
2491-
2492- self.annListCtl = wxTextCtrl(panel, -1, '\n\n\n\n\n', wxPoint(-1,-1), (300,120),
2493- wxTE_MULTILINE|wxHSCROLL|wxTE_DONTWRAP)
2494- gridSizer.Add(self.annListCtl, -1, wxEXPAND)
2495+ gridSizer.Add(wx.StaticText(panel, -1, 'single tracker url:'),0,
2496+ wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
2497+ self.annCtl = wx.TextCtrl(panel, -1, 'http://my.tracker:6969/announce')
2498+ gridSizer.Add(self.annCtl, 0, wx.EXPAND)
2499+
2500+ a = wx.FlexGridSizer(cols = 1, vgap = 3)
2501+ a.Add(wx.StaticText(panel, -1, 'tracker list:'),0,wx.ALIGN_RIGHT)
2502+ a.Add(wx.StaticText(panel, -1, ''))
2503+ abutton = wx.Button(panel, -1, 'copy\nannounces\nfrom\ntorrent', size = (70,70))
2504+ wx.EVT_BUTTON(frame, abutton.GetId(), self.announcecopy)
2505+ a.Add(abutton, -1, wx.ALIGN_CENTER)
2506+ a.Add(wx.StaticText(panel, -1, DROP_HERE), -1, wx.ALIGN_CENTER)
2507+ gridSizer.Add(a, -1, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
2508+
2509+
2510+ self.annListCtl = wx.TextCtrl(panel, -1, '\n\n\n\n\n', wx.Point(-1,-1), (300,120),
2511+ wx.TE_MULTILINE|wx.HSCROLL|wx.TE_DONTWRAP)
2512+ gridSizer.Add(self.annListCtl, -1, wx.EXPAND)
2513
2514- gridSizer.Add(wxStaticText(panel, -1, ''))
2515- exptext = wxStaticText(panel, -1,
2516+ gridSizer.Add(wx.StaticText(panel, -1, ''))
2517+ exptext = wx.StaticText(panel, -1,
2518 "a list of tracker urls separated by commas or whitespace\n" +
2519 "and on several lines -trackers on the same line will be\n" +
2520 "tried randomly, and all the trackers on one line\n" +
2521 "will be tried before the trackers on the next line.")
2522- exptext.SetFont(wxFont(6, wxDEFAULT, wxNORMAL, wxNORMAL, False))
2523- gridSizer.Add(exptext, -1, wxALIGN_CENTER)
2524+ exptext.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, False))
2525+ gridSizer.Add(exptext, -1, wx.ALIGN_CENTER)
2526
2527 self.refresh_thostlist()
2528 self._set_thost()
2529
2530 if platform == 'win32':
2531 self.dropTargetPtr.DragAcceptFiles(True)
2532- EVT_DROP_FILES(self.dropTargetPtr, self.selectdrop)
2533+ wx.EVT_DROP_FILES(self.dropTargetPtr, self.selectdrop)
2534 self.groupSizer1Box.DragAcceptFiles(True)
2535- EVT_DROP_FILES(self.groupSizer1Box, self.selectdrop)
2536+ wx.EVT_DROP_FILES(self.groupSizer1Box, self.selectdrop)
2537 abutton.DragAcceptFiles(True)
2538- EVT_DROP_FILES(abutton, self.announcedrop)
2539+ wx.EVT_DROP_FILES(abutton, self.announcedrop)
2540 self.annCtl.DragAcceptFiles(True)
2541- EVT_DROP_FILES(self.annCtl, self.announcedrop)
2542+ wx.EVT_DROP_FILES(self.annCtl, self.announcedrop)
2543 self.annListCtl.DragAcceptFiles(True)
2544- EVT_DROP_FILES(self.annListCtl, self.announcedrop)
2545+ wx.EVT_DROP_FILES(self.annListCtl, self.announcedrop)
2546
2547- gridSizer.Add(wxStaticText(panel, -1, ''))
2548- gridSizer.Add(wxStaticText(panel, -1, ''))
2549+ gridSizer.Add(wx.StaticText(panel, -1, ''))
2550+ gridSizer.Add(wx.StaticText(panel, -1, ''))
2551
2552- gridSizer.Add(wxStaticText(panel, -1, 'piece size:'),0,
2553- wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
2554- self.piece_length = wxChoice(panel, -1,
2555+ gridSizer.Add(wx.StaticText(panel, -1, 'piece size:'),0,
2556+ wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
2557+ self.piece_length = wx.Choice(panel, -1,
2558 choices = ['automatic', '2MiB', '1MiB', '512KiB', '256KiB', '128KiB', '64KiB', '32KiB'])
2559 self.piece_length_list = [0, 21, 20, 19, 18, 17, 16, 15]
2560 self.piece_length.SetSelection(0)
2561 gridSizer.Add(self.piece_length)
2562
2563- gridSizer.Add(wxStaticText(panel, -1, 'comment:'),0,
2564- wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)
2565- self.commentCtl = wxTextCtrl(panel, -1, '')
2566- gridSizer.Add(self.commentCtl, 0, wxEXPAND)
2567-
2568- gridSizer.Add(wxStaticText(panel, -1, ''))
2569- gridSizer.Add(wxStaticText(panel, -1, ''))
2570-
2571- b1 = wxButton(panel, -1, 'Cancel', size = (-1, 30))
2572- EVT_BUTTON(frame, b1.GetId(), self.cancel)
2573- gridSizer.Add(b1, 0, wxEXPAND)
2574- b2 = wxButton(panel, -1, 'MAKE TORRENT', size = (-1, 30))
2575- EVT_BUTTON(frame, b2.GetId(), self.complete)
2576- gridSizer.Add(b2, 0, wxEXPAND)
2577+ gridSizer.Add(wx.StaticText(panel, -1, 'comment:'),0,
2578+ wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
2579+ self.commentCtl = wx.TextCtrl(panel, -1, '')
2580+ gridSizer.Add(self.commentCtl, 0, wx.EXPAND)
2581+
2582+ gridSizer.Add(wx.StaticText(panel, -1, ''))
2583+ gridSizer.Add(wx.StaticText(panel, -1, ''))
2584+
2585+ b1 = wx.Button(panel, -1, 'Cancel', size = (-1, 30))
2586+ wx.EVT_BUTTON(frame, b1.GetId(), self.cancel)
2587+ gridSizer.Add(b1, 0, wx.EXPAND)
2588+ b2 = wx.Button(panel, -1, 'MAKE TORRENT', size = (-1, 30))
2589+ wx.EVT_BUTTON(frame, b2.GetId(), self.complete)
2590+ gridSizer.Add(b2, 0, wx.EXPAND)
2591
2592 gridSizer.AddGrowableCol(1)
2593- colSizer.Add(gridSizer, -1, wxALIGN_CENTER_VERTICAL)
2594+ colSizer.Add(gridSizer, -1, wx.ALIGN_CENTER_VERTICAL)
2595 fullSizer.Add(colSizer)
2596
2597
2598- border = wxBoxSizer(wxHORIZONTAL)
2599- border.Add(fullSizer, 1, wxEXPAND | wxALL, 15)
2600+ border = wx.BoxSizer(wx.HORIZONTAL)
2601+ border.Add(fullSizer, 1, wx.EXPAND | wx.ALL, 15)
2602 panel.SetSizer(border)
2603 panel.SetAutoLayout(True)
2604 border.Fit(panel)
2605@@ -539,20 +539,20 @@
2606 frame.Show(True)
2607
2608 EVT_INVOKE(frame, self.onInvoke)
2609- EVT_CLOSE(frame, self._close)
2610+ wx.EVT_CLOSE(frame, self._close)
2611
2612 def setstayontop(self, x):
2613 if self.stayontop_checkbox.GetValue():
2614- self.windowStyle |= wxSTAY_ON_TOP
2615+ self.windowStyle |= wx.STAY_ON_TOP
2616 else:
2617- self.windowStyle &= ~wxSTAY_ON_TOP
2618+ self.windowStyle &= ~wx.STAY_ON_TOP
2619 self.frame.SetWindowStyle(self.windowStyle)
2620 self.config['stayontop'] = self.stayontop_checkbox.GetValue()
2621
2622 def selectdir(self, x = None):
2623 self.calls['dropTargetHovered']()
2624- dl = wxDirDialog(self.frame, style = wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON)
2625- if dl.ShowModal() == wxID_OK:
2626+ dl = wx.DirDialog(self.frame, style = wx.DD_DEFAULT_STYLE | wx.DD_NEW_DIR_BUTTON)
2627+ if dl.ShowModal() == wx.ID_OK:
2628 self.dirCtl.SetValue(dl.GetPath())
2629 self.calls['dropTargetDropped']()
2630 else:
2631@@ -560,8 +560,8 @@
2632
2633 def selectfile(self, x = None):
2634 self.calls['dropTargetHovered']()
2635- dl = wxFileDialog (self.frame, 'Choose file to use', '', '', '', wxOPEN)
2636- if dl.ShowModal() == wxID_OK:
2637+ dl = wx.FileDialog (self.frame, 'Choose file to use', '', '', '', wx.OPEN)
2638+ if dl.ShowModal() == wx.ID_OK:
2639 self.dirCtl.SetValue(dl.GetPath())
2640 self.calls['dropTargetDropped']()
2641 else:
2642@@ -573,8 +573,8 @@
2643 self.complete(f)
2644
2645 def announcecopy(self, x):
2646- dl = wxFileDialog (self.frame, 'Choose .torrent file to use', '', '', '*.torrent', wxOPEN)
2647- if dl.ShowModal() == wxID_OK:
2648+ dl = wx.FileDialog (self.frame, 'Choose .torrent file to use', '', '', '*.torrent', wx.OPEN)
2649+ if dl.ShowModal() == wx.ID_OK:
2650 self._announcecopy(dl.GetPath(), True)
2651
2652 def announcedrop(self, dat):
2653@@ -619,14 +619,14 @@
2654
2655 def complete(self, x):
2656 if not self.dirCtl.GetValue():
2657- dlg = wxMessageDialog(self.frame, message = 'You must select a\nfile or directory',
2658- caption = 'Error', style = wxOK | wxICON_ERROR)
2659+ dlg = wx.MessageDialog(self.frame, message = 'You must select a\nfile or directory',
2660+ caption = 'Error', style = wx.OK | wx.ICON_ERROR)
2661 dlg.ShowModal()
2662 dlg.Destroy()
2663 return
2664 if not self.annCtl.GetValue():
2665- dlg = wxMessageDialog(self.frame, message = 'You must specify a\nsingle tracker url',
2666- caption = 'Error', style = wxOK | wxICON_ERROR)
2667+ dlg = wx.MessageDialog(self.frame, message = 'You must specify a\nsingle tracker url',
2668+ caption = 'Error', style = wx.OK | wx.ICON_ERROR)
2669 dlg.ShowModal()
2670 dlg.Destroy()
2671 return
2672@@ -649,10 +649,10 @@
2673 if warnings:
2674 warnings += ('Are you sure you wish to produce a .torrent\n' +
2675 'with these parameters?')
2676- dlg = wxMessageDialog(self.frame,
2677+ dlg = wx.MessageDialog(self.frame,
2678 message = warnings,
2679- caption = 'Warning', style = wxYES_NO | wxICON_QUESTION)
2680- if dlg.ShowModal() != wxID_YES:
2681+ caption = 'Warning', style = wx.YES_NO | wx.ICON_QUESTION)
2682+ if dlg.ShowModal() != wx.ID_YES:
2683 dlg.Destroy()
2684 return
2685 params['real_announce_list'] = annlist
2686@@ -684,10 +684,10 @@
2687 self.switchlock.release()
2688
2689 def selectDropTarget(self, x):
2690- dl = wxFileDialog (self.frame, 'Choose image to use', join(basepath,'targets'),
2691+ dl = wx.FileDialog (self.frame, 'Choose image to use', join(basepath,'targets'),
2692 join(join(basepath,'targets'), self.config['target']),
2693- 'Supported images (*.bmp,*.gif)|*.*', wxOPEN|wxHIDE_READONLY)
2694- if dl.ShowModal() == wxID_OK:
2695+ 'Supported images (*.bmp,*.gif)|*.*', wx.OPEN|wx.HIDE_READONLY)
2696+ if dl.ShowModal() == wx.ID_OK:
2697 try:
2698 self.calls['changeDropTarget'](dl.GetPath())
2699 self.config['target'] = dl.GetPath()
2700@@ -760,8 +760,8 @@
2701
2702 def save_thost(self, x):
2703 if not self.annCtl.GetValue():
2704- dlg = wxMessageDialog(self.frame, message = 'You must specify a\nsingle tracker url',
2705- caption = 'Error', style = wxOK | wxICON_ERROR)
2706+ dlg = wx.MessageDialog(self.frame, message = 'You must specify a\nsingle tracker url',
2707+ caption = 'Error', style = wx.OK | wx.ICON_ERROR)
2708 dlg.ShowModal()
2709 dlg.Destroy()
2710 return
2711@@ -786,10 +786,10 @@
2712 if warnings:
2713 warnings += ('Are you sure you wish to save a torrent host\n' +
2714 'with these parameters?')
2715- dlg = wxMessageDialog(self.frame,
2716+ dlg = wx.MessageDialog(self.frame,
2717 message = warnings,
2718- caption = 'Warning', style = wxYES_NO | wxICON_QUESTION)
2719- if dlg.ShowModal() != wxID_YES:
2720+ caption = 'Warning', style = wx.YES_NO | wx.ICON_QUESTION)
2721+ if dlg.ShowModal() != wx.ID_YES:
2722 dlg.Destroy()
2723 return
2724 metainfo['announce-list'] = annlist
2725@@ -801,10 +801,10 @@
2726 d = self.thostselection
2727 else:
2728 d = '.thost'
2729- dl = wxFileDialog (self.frame, 'Save tracker data as',
2730+ dl = wx.FileDialog (self.frame, 'Save tracker data as',
2731 join(basepath,'thosts'), d, '*.thost',
2732- wxSAVE|wxOVERWRITE_PROMPT)
2733- if dl.ShowModal() != wxID_OK:
2734+ wx.SAVE|wx.OVERWRITE_PROMPT)
2735+ if dl.ShowModal() != wx.ID_OK:
2736 return
2737 d = dl.GetPath()
2738
2739@@ -818,10 +818,10 @@
2740 self.refresh_thostlist()
2741
2742 def delete_thost(self, x):
2743- dlg = wxMessageDialog(self.frame,
2744+ dlg = wx.MessageDialog(self.frame,
2745 message = 'Are you sure you want to delete\n'+self.thostselection[:-6]+'?',
2746- caption = 'Warning', style = wxYES_NO | wxICON_EXCLAMATION)
2747- if dlg.ShowModal() != wxID_YES:
2748+ caption = 'Warning', style = wx.YES_NO | wx.ICON_EXCLAMATION)
2749+ if dlg.ShowModal() != wx.ID_YES:
2750 dlg.Destroy()
2751 return
2752 dlg.Destroy()
2753@@ -835,7 +835,7 @@
2754
2755 def invokeLater(self, func, args = [], kwargs = {}):
2756 if not self.uiflag.isSet():
2757- wxPostEvent(self.frame, InvokeEvent(func, args, kwargs))
2758+ wx.PostEvent(self.frame, InvokeEvent(func, args, kwargs))
2759
2760 def build_setgauge(self, x):
2761 self.invokeLater(self.on_setgauge, [x])
2762@@ -904,15 +904,15 @@
2763 def failed(self, e):
2764 e = str(e)
2765 self.call.build_failed(e)
2766- dlg = wxMessageDialog(self.frame, message = 'Error - ' + e,
2767- caption = 'Error', style = wxOK | wxICON_ERROR)
2768+ dlg = wx.MessageDialog(self.frame, message = 'Error - ' + e,
2769+ caption = 'Error', style = wx.OK | wx.ICON_ERROR)
2770 dlg.ShowModal()
2771 dlg.Destroy()
2772
2773
2774 class T_make:
2775 def __init__(self):
2776- self.configobj = wxConfig('BitTorrent_T-make',style=wxCONFIG_USE_LOCAL_FILE)
2777+ self.configobj = wx.Config('BitTorrent_T-make',style=wx.CONFIG_USE_LOCAL_FILE)
2778 self.getConfig()
2779 self.currentTHost = self.config['thost']
2780 # self.d = AdvancedDownloadInfo(self.config, self.getCalls())
2781@@ -969,7 +969,7 @@
2782
2783 def newDropTarget(self, wh = None):
2784 if wh:
2785- self.dropTarget = wxEmptyBitmap(wh[0],wh[1])
2786+ self.dropTarget = wx.EmptyBitmap(wh[0],wh[1])
2787 try:
2788 self.changeDropTarget(self.config['target'])
2789 except:
2790@@ -983,7 +983,7 @@
2791 self.config['target'] = 'default.gif'
2792 self.saveConfig()
2793 except:
2794- self.dropTarget = wxEmptyBitmap(100,100)
2795+ self.dropTarget = wx.EmptyBitmap(100,100)
2796 return self.dropTarget
2797
2798 def setDropTargetRefresh(self, refreshfunc):
2799@@ -994,13 +994,13 @@
2800 w1,h1 = self.dropTarget.GetWidth(),self.dropTarget.GetHeight()
2801 w,h = bmp.GetWidth(),bmp.GetHeight()
2802 x1,y1 = int((w1-w)/2.0),int((h1-h)/2.0)
2803- bbdata = wxMemoryDC()
2804+ bbdata = wx.MemoryDC()
2805 bbdata.SelectObject(self.dropTarget)
2806- bbdata.SetPen(wxTRANSPARENT_PEN)
2807- bbdata.SetBrush(wxBrush(wx.wxSystemSettings_GetColour(wxSYS_COLOUR_MENU),wxSOLID))
2808+ bbdata.SetPen(wx.TRANSPARENT_PEN)
2809+ bbdata.SetBrush(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_MENU),wx.SOLID))
2810 bbdata.DrawRectangle(0,0,w1,h1)
2811- bbdata.SetPen(wxBLACK_PEN)
2812- bbdata.SetBrush(wxTRANSPARENT_BRUSH)
2813+ bbdata.SetPen(wx.BLACK_PEN)
2814+ bbdata.SetBrush(wx.TRANSPARENT_BRUSH)
2815 bbdata.DrawRectangle(x1-1,y1-1,w+2,h+2)
2816 bbdata.DrawBitmap(bmp,x1,y1,True)
2817 try:
2818@@ -1022,9 +1022,9 @@
2819 name = join(join(basepath,'targets'),new)
2820 garbage, e = os.path.splitext(new.lower())
2821 if e == '.gif':
2822- bmp = wxBitmap(name, wxBITMAP_TYPE_GIF)
2823+ bmp = wx.Bitmap(name, wx.BITMAP_TYPE_GIF)
2824 elif e == '.bmp':
2825- bmp = wxBitmap(name, wxBITMAP_TYPE_BMP)
2826+ bmp = wx.Bitmap(name, wx.BITMAP_TYPE_BMP)
2827 else:
2828 assert False
2829 return bmp
2830@@ -1054,7 +1054,7 @@
2831
2832
2833
2834-class btWxApp(wxApp):
2835+class btWxApp(wx.App):
2836 def OnInit(self):
2837 self.APP = T_make()
2838 return True
BitTornado - an improved bittorrent client
This page took 0.511714 seconds and 4 git commands to generate.