SF.net SVN: fclient:[800] trunk/fclient/src/fclient/impl/ViewBrowser.py

[<jU...@us...>]

Revision: 800
          http://fclient.svn.sourceforge.net/fclient/?rev=800&view=rev
Author:   jUrner
Date:     2008-07-28 12:20:45 +0000 (Mon, 28 Jul 2008)

Log Message:
-----------
some fixes related to movin connection settings backto connection widget

Modified Paths:
--------------
    trunk/fclient/src/fclient/impl/ViewBrowser.py

Modified: trunk/fclient/src/fclient/impl/ViewBrowser.py
===================================================================
--- trunk/fclient/src/fclient/impl/ViewBrowser.py	2008-07-28 12:19:49 UTC (rev 799)
+++ trunk/fclient/src/fclient/impl/ViewBrowser.py	2008-07-28 12:20:45 UTC (rev 800)
@@ -237,15 +237,18 @@
 				)
 				
 		def setValues(self, **kws):
+			config.SettingsBase.setValues(self, **kws)
+			
 			autoLoadImages = kws.get('AutoLoadImages', None)
 			if autoLoadImages is not None:
 				browserWidget = self.parent()
 				tabWidget = browserWidget.controlById(browserWidget.IdTabBrowsers)
 				for i in xrange(tabWidget.count()):
 					browser = tabWidget.widget(i)
-					settings = browser.settings()
-					settings.setAttribute(settings.AutoLoadImages, autoLoadImages)
-			config.SettingsBase.setValues(self, **kws)
+					if hasattr(browser, 'settings'):		# QTabWidget may return a Null QWidget
+						settings = browser.settings()
+						settings.setAttribute(settings.AutoLoadImages, autoLoadImages)
+			
 		
 			#backIsClose = kws.get('BackIsClose', None)
 			#if backIsClose is not None:
@@ -437,6 +440,7 @@
 		self.setupUi(self)
 		config.ObjectRegistry.register(self)
 		
+		self._isCreated = False
 		self._initialConfigDataArrived = False
 		
 		self.fcSettings = BrowserWidgetSettings(self).restore()
@@ -471,10 +475,6 @@
 		frameSearch = self.controlById(self.IdFrameSearch)
 		frameSearch.setVisible(False)
 				
-		# fire up a new broser to make a start
-		self.newBrowser(title=self.trUtf8('Waiting for fproxy'))
-		self.fcActions['ActionGoToHomePage'].trigger()
-			
 	#########################################
 	## private methods
 	#########################################
@@ -587,10 +587,14 @@
 		if browser is None:
 			return False
 				
+		connectionWidget = config.ObjectRegistry.get(config.IdViewConnectionWidget, None)
+		if connectionWidget is None:
+			raise ValueError('No connection widget found')
+		
 		# load url
 		url.setScheme('http')
-		url.setHost(config.settings.value('FproxyConnectionHost'))
-		url.setPort(config.settings.value('FproxyConnectionPort'))
+		url.setHost(connectionWidget.fcSettings.value('FproxyConnectionHost'))
+		url.setPort(connectionWidget.fcSettings.value('FproxyConnectionPort'))
 		tabWidget.setTabText(tabWidget.indexOf(browser), self._adjustTabText(self.trUtf8('Loading')))
 		addressBar.setText(url.toString())
 		lastBrowserState = browser.userData()
@@ -676,6 +680,11 @@
 		
 	def showEvent(self, event):
 		self.fcGlobalFeedback.setVisible(True)
+		if not self._isCreated:
+			self._isCreated = True
+			# fire up a new broser to make a start
+			self.newBrowser(title=self.trUtf8('Waiting for fproxy'))
+			self.fcActions['ActionGoToHomePage'].trigger()
 		
 	def viewClose(self):
 		pass


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.