Update of /cvsroot/btplusplus/BT++/src/DlgMain
In directory sc8-pr-cvs1:/tmp/cvs-serv13808/src/DlgMain
Modified Files:
TaskManager.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: TaskManager.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/DlgMain/TaskManager.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TaskManager.py 22 Feb 2003 18:02:11 -0000 1.3
--- TaskManager.py 3 Mar 2003 20:49:38 -0000 1.4
***************
*** 2,6 ****
from TimedUpdate import TimedUpdate
from ConfigFile import Config
! from Images import GetIcon
class TaskManager(wxTaskBarIcon):
--- 2,6 ----
from TimedUpdate import TimedUpdate
from ConfigFile import Config
! from Images import GetIcon, GetBitmap
class TaskManager(wxTaskBarIcon):
***************
*** 10,13 ****
--- 10,14 ----
self.Icon = GetIcon('Icon_Small')
+ self.Locked = false
self.Paused = 0
self.Old = -1
***************
*** 15,33 ****
self.Menu = wxMenu( '' )
self.itemExit = wxMenuItem( self.Menu, 1, 'Exit' )
self.itemRestore = wxMenuItem( self.Menu, 2, 'Restore' )
! self.itemPauseAll = wxMenuItem( self.Menu, 3, 'Pause all' )
! self.itemResumeAll = wxMenuItem( self.Menu, 4, 'Resume all' )
self.Menu.AppendItem( self.itemPauseAll )
self.Menu.AppendItem( self.itemResumeAll )
self.Menu.AppendSeparator()
self.Menu.AppendItem( self.itemRestore )
self.Menu.AppendItem( self.itemExit )
! EVT_MENU( self, self.itemExit.GetId(), self.Menu_Exit )
! EVT_MENU( self, self.itemRestore.GetId(), self.Menu_Restore )
! EVT_MENU( self, self.itemPauseAll.GetId(), self.Menu_PauseAll )
EVT_MENU( self, self.itemResumeAll.GetId(), self.Menu_ResumeAll )
def SetIcon(self):
--- 16,52 ----
self.Menu = wxMenu( '' )
+
self.itemExit = wxMenuItem( self.Menu, 1, 'Exit' )
self.itemRestore = wxMenuItem( self.Menu, 2, 'Restore' )
! self.itemLock = wxMenuItem( self.Menu, 3, 'Lock' )
! self.itemPauseAll = wxMenuItem( self.Menu, 4, 'Pause all' )
! self.itemResumeAll = wxMenuItem( self.Menu, 5, 'Resume all' )
!
! self.itemExit .SetBitmap( GetBitmap('Menu_Cancel') )
! self.itemRestore .SetBitmap( GetBitmap('Menu_Restore') )
! self.itemLock .SetBitmap( GetBitmap('Menu_Lock') )
! self.itemPauseAll .SetBitmap( GetBitmap('Menu_Pause') )
! self.itemResumeAll.SetBitmap( GetBitmap('Menu_Resume') )
self.Menu.AppendItem( self.itemPauseAll )
self.Menu.AppendItem( self.itemResumeAll )
self.Menu.AppendSeparator()
+ self.Menu.AppendItem( self.itemLock )
self.Menu.AppendItem( self.itemRestore )
self.Menu.AppendItem( self.itemExit )
! # Menu for locked state
! self.MenuLocked = wxMenu( '' )
! self.itemUnlock = wxMenuItem( self.MenuLocked, 6, 'Unlock' )
!
! self.itemUnlock.SetBitmap( GetBitmap('Menu_Unlock') )
! self.MenuLocked.AppendItem( self.itemUnlock )
!
! EVT_MENU( self, self.itemExit .GetId(), self.Menu_Exit )
! EVT_MENU( self, self.itemRestore .GetId(), self.Menu_Restore )
! EVT_MENU( self, self.itemLock .GetId(), self.Menu_Lock )
! EVT_MENU( self, self.itemPauseAll .GetId(), self.Menu_PauseAll )
EVT_MENU( self, self.itemResumeAll.GetId(), self.Menu_ResumeAll )
+ EVT_MENU( self, self.itemUnlock .GetId(), self.Menu_Unlock )
def SetIcon(self):
***************
*** 43,48 ****
def OnLButtonDClick(self, evt = wxMenuEvent() ):
! if self.CheckPass() == false:
! return
self.RemoveIcon()
--- 62,67 ----
def OnLButtonDClick(self, evt = wxMenuEvent() ):
! if self.Locked == true:
! self.Menu_Unlock(None)
self.RemoveIcon()
***************
*** 52,55 ****
--- 71,78 ----
def OnRButtonDown(self, evt):
+ if self.Locked == true:
+ self.PopupMenu( self.MenuLocked )
+ return
+
if self.Paused:
self.itemResumeAll.Enable(true)
***************
*** 59,65 ****
--- 82,95 ----
self.itemPauseAll.Enable(true)
+ if Config.Get('LookFeel', 'TPWord') != '':
+ self.itemLock.Enable(true)
+ else:
+ self.itemLock.Enable(false)
+
self.PopupMenu( self.Menu )
def Minimize(self, evt):
+ if Config.Get('LookFeel', 'TPAuto') == 1:
+ self.Menu_Lock(None)
self.Parent.Show(false)
self.SetIcon()
***************
*** 73,79 ****
def Menu_PauseAll(self, evt):
- if self.CheckPass() == false:
- return
-
self.Paused = 1
self.Old = Config.Get('Download', 'AutoStart')
--- 103,106 ----
***************
*** 88,94 ****
def Menu_ResumeAll(self, evt):
- if self.CheckPass() == false:
- return
-
if self.Paused == 0:
return
--- 115,118 ----
***************
*** 102,114 ****
self.Paused = 0
! def CheckPass(self):
! pas = Config.Get('LookFeel', 'TrayPass')
if pas == '':
! return true
dlg = wxTextEntryDialog(self.Parent, 'Your BT++ has been locked. Please enter the reactivation password.', 'Reactivation password', '', wxOK | wxCANCEL | wxTE_PASSWORD | wxCENTRE)
if dlg.ShowModal() == wxID_OK:
if dlg.GetValue() == pas:
! return true
!
! return false
--- 126,140 ----
self.Paused = 0
! def Menu_Lock(self, evt):
! if Config.Get('LookFeel', 'TPWord') != '':
! self.Locked = true
!
! def Menu_Unlock(self, evt):
! pas = Config.Get('LookFeel', 'TPWord')
if pas == '':
! self.Locked = false
dlg = wxTextEntryDialog(self.Parent, 'Your BT++ has been locked. Please enter the reactivation password.', 'Reactivation password', '', wxOK | wxCANCEL | wxTE_PASSWORD | wxCENTRE)
if dlg.ShowModal() == wxID_OK:
if dlg.GetValue() == pas:
! self.Locked = false
|
