1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 12_make_guis_use_2.4.dpatch by J�r�my Bobbio <jeremy.bobbio@etu.upmc.fr>
4
## All lines beginning with `## DP:' are a description of the patch.
5
## DP: Fix GUIs to work on python-wxgtk2.6.
8
diff -urNad bittornado~/btcompletedirgui.py bittornado/btcompletedirgui.py
9
--- bittornado~/btcompletedirgui.py 2006-10-08 17:49:47.000000000 -0700
10
+++ bittornado/btcompletedirgui.py 2006-10-08 17:52:10.000000000 -0700
13
b = wxBoxSizer(wxHORIZONTAL)
14
b.Add(self.dirCtl, 1, wxEXPAND)
15
-# b.Add(10, 10, 0, wxEXPAND)
16
+ b.Add((10, 10), 0, wxEXPAND)
17
button = wxButton(panel, -1, 'select')
18
b.Add(button, 0, wxEXPAND)
19
EVT_BUTTON(frame, button.GetId(), self.select)
21
border = wxBoxSizer(wxVERTICAL)
22
border.Add(gridSizer, 0, wxEXPAND | wxNORTH | wxEAST | wxWEST, 25)
23
b2 = wxButton(panel, -1, 'make')
24
-# border.Add(10, 10, 1, wxEXPAND)
25
+ border.Add((10, 10), 1, wxEXPAND)
26
border.Add(b2, 0, wxALIGN_CENTER | wxSOUTH, 20)
27
EVT_BUTTON(frame, b2.GetId(), self.complete)
28
panel.SetSizer(border)
30
gridSizer.Add(self.currentLabel, 0, wxEXPAND)
31
self.gauge = wxGauge(panel, -1, range = 1000, style = wxGA_SMOOTH)
32
gridSizer.Add(self.gauge, 0, wxEXPAND)
33
- gridSizer.Add(10, 10, 1, wxEXPAND)
34
+ gridSizer.Add((10, 10), 1, wxEXPAND)
35
self.button = wxButton(panel, -1, 'cancel')
36
gridSizer.Add(self.button, 0, wxALIGN_CENTER)
37
gridSizer.AddGrowableRow(2)
38
diff -urNad bittornado~/btmaketorrentgui.py bittornado/btmaketorrentgui.py
39
--- bittornado~/btmaketorrentgui.py 2006-10-08 17:52:05.000000000 -0700
40
+++ bittornado/btmaketorrentgui.py 2006-10-08 17:53:07.000000000 -0700
42
b = wxBoxSizer(wxHORIZONTAL)
43
self.dirCtl = wxTextCtrl(panel, -1, '')
44
b.Add(self.dirCtl, 1, wxEXPAND)
45
-# b.Add(10, 10, 0, wxEXPAND)
46
+ b.Add((10, 10), 0, wxEXPAND)
48
button = wxButton(panel, -1, 'dir', size = (30,20))
49
EVT_BUTTON(frame, button.GetId(), self.selectdir)
51
border = wxBoxSizer(wxVERTICAL)
52
border.Add(gridSizer, 0, wxEXPAND | wxNORTH | wxEAST | wxWEST, 25)
53
b2 = wxButton(panel, -1, 'make')
54
-# border.Add(10, 10, 1, wxEXPAND)
55
+ border.Add((10, 10), 1, wxEXPAND)
56
border.Add(b2, 0, wxALIGN_CENTER | wxSOUTH, 20)
57
EVT_BUTTON(frame, b2.GetId(), self.complete)
58
panel.SetSizer(border)
59
panel.SetAutoLayout(True)
61
-# panel.DragAcceptFiles(True)
62
-# EVT_DROP_FILES(panel, self.selectdrop)
63
+ panel.DragAcceptFiles(True)
64
+ EVT_DROP_FILES(panel, self.selectdrop)
66
def selectdir(self, x):
67
dl = wxDirDialog(self.frame, style = wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON)
69
self.dirCtl.SetValue(dl.GetPath())
71
def selectfile(self, x):
72
- dl = wxFileDialog (self.frame, 'Choose file or directory to use', '', '', '', wxOPEN)
73
+ dl = wxFileDialog (self.frame, 'Choose file or directory to use', style = wxOPEN)
74
if dl.ShowModal() == wxID_OK:
75
self.dirCtl.SetValue(dl.GetPath())