|
From: <sir...@us...> - 2003-03-03 20:50:12
|
Update of /cvsroot/btplusplus/BT++/src/DlgPref
In directory sc8-pr-cvs1:/tmp/cvs-serv13808/src/DlgPref
Modified Files:
DlgPref.py Controls.py
Log Message:
Modified the tray password behaviour. The tray can now be locked (by menu and automatically) and must be unlocked before using it.
Index: DlgPref.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/DlgPref/DlgPref.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DlgPref.py 19 Feb 2003 20:37:07 -0000 1.1
--- DlgPref.py 3 Mar 2003 20:49:37 -0000 1.2
***************
*** 116,120 ****
['Download', 'MaxSimDown'],
'Max. simultaneous downloads (1 - 10)',
! ValidatorAlpha(1,10) )
self.MaxSimDown.SetHelpText("Maximum number of downloads to preform at the same time.")
--- 116,120 ----
['Download', 'MaxSimDown'],
'Max. simultaneous downloads (1 - 10)',
! validator = ValidatorAlpha(1,10) )
self.MaxSimDown.SetHelpText("Maximum number of downloads to preform at the same time.")
***************
*** 141,145 ****
['Hash', 'NumSimHash'],
'Max. simultaneous files hashed (1 - 5)',
! ValidatorAlpha(1,10) )
self.HasNum.SetHelpText("Maximum number of torrents to hash at the same time.")
--- 141,145 ----
['Hash', 'NumSimHash'],
'Max. simultaneous files hashed (1 - 5)',
! validator = ValidatorAlpha(1,10) )
self.HasNum.SetHelpText("Maximum number of torrents to hash at the same time.")
***************
*** 162,166 ****
['Bind', 'PortMin'],
'Start port',
! ValidatorAlpha(1025,65536) )
self.MinPort.SetHelpText("The lowest port for BT++ to use for transfers. Must be between 1025 and 65536")
--- 162,166 ----
['Bind', 'PortMin'],
'Start port',
! validator = ValidatorAlpha(1025,65536) )
self.MinPort.SetHelpText("The lowest port for BT++ to use for transfers. Must be between 1025 and 65536")
***************
*** 169,173 ****
['Bind', 'PortMax'],
'End port',
! ValidatorAlpha(1025,65536) )
self.MaxPort.SetHelpText("The highest port for BT++ to use for transfers. Must be between 1025 and 65536")
--- 169,173 ----
['Bind', 'PortMax'],
'End port',
! validator = ValidatorAlpha(1025,65536) )
self.MaxPort.SetHelpText("The highest port for BT++ to use for transfers. Must be between 1025 and 65536")
***************
*** 177,180 ****
--- 177,183 ----
wxWindow.__init__(self, parent, -1, name = name)
+ wxStaticBox(self, -1, 'General', wxPoint(5, 5), wxSize(314,40))
+ wxStaticBox(self, -1, 'Tray Password', wxPoint(5,50), wxSize(314,82))
+
self.ConfirmExit = PrefCheckBox( self,
wxPoint(12,22),
***************
*** 183,190 ****
self.ConfirmExit.SetHelpText("If checked the program will prompt you before exiting.")
! self.Password = PrefTextCtrl( self,
! wxPoint(10,40), wxSize(75,20),
! ['LookFeel', 'TrayPass'],
! 'Tray password (leave empty for none)',
! style = 0 )
! self.Password.SetHelpText("If text is entered here it will act as the password when restoring BT++ from a tray icon.")
\ No newline at end of file
--- 186,199 ----
self.ConfirmExit.SetHelpText("If checked the program will prompt you before exiting.")
! self.TPWord = PrefTextCtrl( self,
! wxPoint(11,65), wxSize(75,20),
! ['LookFeel', 'TPWord'],
! 'Tray password (leave empty for none)',
! style = 0,
! help = 'If text is entered here it will act as the password when restoring BT++ from a tray icon.' )
!
! self.TPAuto = PrefCheckBox( self,
! wxPoint(12,89),
! ['LookFeel', 'TPAuto'],
! 'Auto lock tray on minimize.',
! 'If checked the tray will be locked (password-protected) as soon as minimized.' )
Index: Controls.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/DlgPref/Controls.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Controls.py 19 Feb 2003 20:37:07 -0000 1.1
--- Controls.py 3 Mar 2003 20:49:37 -0000 1.2
***************
*** 3,7 ****
class PrefTextCtrl(wxTextCtrl):
! def __init__(self, parent, pos, size, conf, label = '', validator = wxDefaultValidator, style = wxTE_RIGHT):
wxTextCtrl.__init__( self,
parent, -1,
--- 3,7 ----
class PrefTextCtrl(wxTextCtrl):
! def __init__(self, parent, pos, size, conf, label = '', help = '', validator = wxDefaultValidator, style = wxTE_RIGHT):
wxTextCtrl.__init__( self,
parent, -1,
***************
*** 15,18 ****
--- 15,21 ----
if label != '':
wxStaticText(parent, -1, label, wxPoint(pos.x + size.x + 3, pos.y + 4))
+
+ if help != '':
+ self.SetHelpText( help )
def GetValue(self):
***************
*** 35,39 ****
class PrefCheckBox(wxCheckBox):
! def __init__(self, parent, pos, conf, label):
wxCheckBox.__init__( self,
parent, -1,
--- 38,42 ----
class PrefCheckBox(wxCheckBox):
! def __init__(self, parent, pos, conf, label, help = ''):
wxCheckBox.__init__( self,
parent, -1,
***************
*** 44,46 ****
self.Config = { 'Section': conf[0],
! 'Option': conf[1] }
\ No newline at end of file
--- 47,52 ----
self.Config = { 'Section': conf[0],
! 'Option': conf[1] }
!
! if help != '':
! self.SetHelpText( help )
|