[Python-checkins] python/dist/src/Mac/Tools/IDE PackageManager.py,1.5,1.6

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory sc8-pr-cvs1:/tmp/cvs-serv26719

Modified Files:
	PackageManager.py 
Log Message:
Adapted GUI for per-user install. Doesn't do anything yet, though


Index: PackageManager.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PackageManager.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PackageManager.py	16 Mar 2003 21:04:50 -0000	1.5
--- PackageManager.py	15 Apr 2003 21:59:42 -0000	1.6
***************
*** 249,253 ****
  		return pkg.installed()
  		
! 	def installpackage(self, sel, output, recursive, force):
  		pkg = self.packages[sel]
  		list, messages = self.pimpinstaller.prepareInstall(pkg, force, recursive)
--- 249,253 ----
  		return pkg.installed()
  		
! 	def installpackage(self, sel, output, recursive, force, user):
  		pkg = self.packages[sel]
  		list, messages = self.pimpinstaller.prepareInstall(pkg, force, recursive)
***************
*** 270,289 ****
  		self.closepimp()
  	
! 	def setupwidgets(self): 
  		self.w = W.Window((580, 400), "Python Install Manager", minsize = (400, 200), tabbable = 0)
- ##		self.w.divline = W.HorizontalLine((0, 20, 0, 0))
  		self.w.titlebar = W.TextBox((4, 4, 40, 12), 'Packages:')
  		data = self.getbrowserdata()
! 		self.w.packagebrowser = W.MultiList((4, 20, 0, -70), data, self.listhit, cols=3)
! 		self.w.installed_l = W.TextBox((4, -66, 60, 12), 'Installed:')
! 		self.w.installed = W.TextBox((64, -66, 0, 12), '')
! 		self.w.message_l = W.TextBox((4, -48, 60, 12), 'Status:')
! 		self.w.message = W.TextBox((64, -48, 0, 12), '')
! 		self.w.homepage_button = W.Button((4, -28, 96, 18), 'View homepage', self.do_homepage)
! 		self.w.verbose_button = W.CheckBox((-358, -26, 60, 18), 'Verbose')
! 		self.w.recursive_button = W.CheckBox((-284, -26, 140, 18), 'Install dependencies', self.updatestatus)
  		self.w.recursive_button.set(1)
! 		self.w.force_button = W.CheckBox((-160, -26, 80, 18), 'Overwrite', self.updatestatus)
! 		self.w.install_button = W.Button((-76, -28, 56, 18), 'Install', self.do_install)
  		self.w.open()
  		
--- 270,294 ----
  		self.closepimp()
  	
! 	def setupwidgets(self):
! 		INSTALL_POS = -30
! 		STATUS_POS = INSTALL_POS - 62
  		self.w = W.Window((580, 400), "Python Install Manager", minsize = (400, 200), tabbable = 0)
  		self.w.titlebar = W.TextBox((4, 4, 40, 12), 'Packages:')
  		data = self.getbrowserdata()
! 		self.w.packagebrowser = W.MultiList((4, 20, 0, STATUS_POS-2), data, self.listhit, cols=3)
! 		
! 		self.w.installed_l = W.TextBox((4, STATUS_POS, 60, 12), 'Installed:')
! 		self.w.installed = W.TextBox((64, STATUS_POS, 0, 12), '')
! 		self.w.message_l = W.TextBox((4, STATUS_POS+20, 60, 12), 'Status:')
! 		self.w.message = W.TextBox((64, STATUS_POS+20, 0, 12), '')
! 		self.w.homepage_button = W.Button((4, STATUS_POS+40, 96, 18), 'View homepage', self.do_homepage)
! 		
! 		self.w.divline = W.HorizontalLine((0, INSTALL_POS, 0, 0))
! 		self.w.verbose_button = W.CheckBox((-358, INSTALL_POS+4, 60, 18), 'Verbose')
! 		self.w.recursive_button = W.CheckBox((-284, INSTALL_POS+4, 140, 18), 'Install dependencies', self.updatestatus)
  		self.w.recursive_button.set(1)
! 		self.w.force_button = W.CheckBox((-160, INSTALL_POS+4, 70, 18), 'Overwrite', self.updatestatus)
! 		self.w.user_button = W.CheckBox((-90, INSTALL_POS+4, 100, 18), 'User Only')
! 		self.w.install_button = W.Button((4, INSTALL_POS+4, 56, 18), 'Install', self.do_install)
  		self.w.open()
  		
***************
*** 300,303 ****
--- 305,309 ----
  			self.w.recursive_button.enable(0)
  			self.w.force_button.enable(0)
+ 			self.w.user_button.enable(0)
  		else:
  			sel = sel[0]
***************
*** 311,314 ****
--- 317,321 ----
  			self.w.recursive_button.enable(1)
  			self.w.force_button.enable(1)
+ 			self.w.user_button.enable(0) # XXXX
  		
  	def listhit(self, *args, **kwargs):
***************
*** 323,327 ****
  		recursive = self.w.recursive_button.get()
  		force = self.w.force_button.get()
! 		messages = self.installpackage(sel, output, recursive, force)
  		self.updatestatus()
  		if messages:
--- 330,335 ----
  		recursive = self.w.recursive_button.get()
  		force = self.w.force_button.get()
! 		user = self.w.user_button.get()
! 		messages = self.installpackage(sel, output, recursive, force, user)
  		self.updatestatus()
  		if messages: