SF.net SVN: fclient:[681] trunk/fclient/src/fclient/Ui_ViewBrowser.py

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

Revision: 681
          http://fclient.svn.sourceforge.net/fclient/?rev=681&view=rev
Author:   jUrner
Date:     2008-07-19 09:19:07 +0000 (Sat, 19 Jul 2008)

Log Message:
-----------
added "close all tabs" action ++ this and that

Modified Paths:
--------------
    trunk/fclient/src/fclient/Ui_ViewBrowser.py

Modified: trunk/fclient/src/fclient/Ui_ViewBrowser.py
===================================================================
--- trunk/fclient/src/fclient/Ui_ViewBrowser.py	2008-07-19 09:02:08 UTC (rev 680)
+++ trunk/fclient/src/fclient/Ui_ViewBrowser.py	2008-07-19 09:19:07 UTC (rev 681)
@@ -44,23 +44,29 @@
 		config.ActionsBase.__init__(self, parent)
 	
 		self.action(
-				name='ActionCloseCurrentBrowser',
-				text=self.trUtf8('&Close tab'),
-				trigger=parent.onActionCloseCurrentBrowser,
+				name='ActionCloseCurrentTab',
+				text=self.trUtf8('Close &current tab'),
+				trigger=parent.onActionCloseCurrentTab,
 				#isEnabled=False,
 				)
 		self.action(			# context menu only
 				name='ActionCloseBrowserUnderMouse',
-				text=self.trUtf8('&Close tab'),
+				text=self.trUtf8('&Close tab under mouse'),
 				trigger=None,
 				#isEnabled=False,
 				)
 		self.action(
 				name='ActionGoToFProxy',
-				text=self.trUtf8('F&Proxy homepage'),
+				text=self.trUtf8('Go to f&Proxy homepage'),
 				trigger=parent.onActionGoToFProxy,
 				isEnabled=True,
 				)
+		self.action(
+				name='ActionCloseAllTabs',
+				text=self.trUtf8('Close &all tabs'),
+				trigger=parent.onActionCloseAllTabs,
+				isEnabled=True,
+				)
 
 
 class GlobalFeedback(config.GlobalFeedbackBase):
@@ -255,8 +261,6 @@
 			act = self.pageAction(a)
 			act.setIcon(config.resources.getIcon(iconName, iconSize, iconTheme=iconTheme))
 				
-		self.connect(self.pageAction(QtWebKit.QWebPage.Stop), QtCore.SIGNAL('triggered()'), self.onActionStopTriggered)
-		
 		# connect actions
 		#TODO: download action
 		self.connect(self, QtCore.SIGNAL('loadStarted()'), self.onLoadStarted)
@@ -267,12 +271,14 @@
 		self.connect(self, QtCore.SIGNAL('titleChanged(const QString &)'), self.onTitleChanged)
 		self.connect(self, QtCore.SIGNAL('iconChanged()'), self.onIconChanged)
 		
+		self.connect(self.pageAction(QtWebKit.QWebPage.Stop), QtCore.SIGNAL('triggered()'), self.onActionStopTriggered)
+		
 		#TODO:
 		#
-		# x. set busy cursor if loading
-		# x. page history is cleared if we get an error on loading a page. reimpl page history
+		# x. page history is cleared if we get an error on loading a page. reimpl page history?
 		# x. back-is close like behaviour
 		# x. always open links in new tabs
+		# x. backand forward buttons sucks somehow. sometimed fwd is enabled even if no fwd is available. reimpl page history?
 	
 	
 	# not needed. we handle OpenLinkInNewWindow et al in contextMenuEvent
@@ -581,7 +587,8 @@
 	#TODO: rework. we need more then one menu
 	def populateMenu(self, menu):
 		menu.addAction(self.fcActions['ActionGoToFProxy'])
-		menu.addAction(self.fcActions['ActionCloseCurrentBrowser'])
+		menu.addAction(self.fcActions['ActionCloseCurrentTab'])
+		menu.addAction(self.fcActions['ActionCloseAllTabs'])
 		return menu
 	
 	#########################################
@@ -602,7 +609,6 @@
 	def closeEvent(self):
 		self.viewClose()
 		
-	
 	#########################################
 	## fcp event onrs
 	#########################################	
@@ -646,7 +652,7 @@
 	#########################################
 	## 
 	#########################################
-	def onActionCloseCurrentBrowser(self, action):
+	def onActionCloseCurrentTab(self, action):
 		tabWidget = self.controlById(self.IdTabBrowsers)
 		tabWidget.removeTab(tabWidget.currentIndex())
 			
@@ -688,10 +694,14 @@
 		tabWidget = self.controlById(self.IdTabBrowsers)
 		if not tabWidget.count():
 			self.newTab(tabText=self.trUtf8(''))
-		
 		self.load(ed.text())
 		
 	
+	def onActionCloseAllTabs(self, action):
+		tabWidget = self.controlById(self.IdTabBrowsers)
+		tabWidget.clear()
+		
+	
 	def onActionGoToFProxy(self, action):
 		if self.fproxyHost is None:
 			#TODO: on


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