SF.net SVN: fclient:[736] trunk/fclient/src/fclient/Ui_ViewBrowser.py
Status: Pre-Alpha
Brought to you by:
jurner
Menu
▾
▴
SF.net SVN: fclient:[736] trunk/fclient/src/fclient/Ui_ViewBrowser.py
|
From: <jU...@us...> - 2008-07-25 07:13:48
|
Revision: 736
http://fclient.svn.sourceforge.net/fclient/?rev=736&view=rev
Author: jUrner
Date: 2008-07-25 07:13:57 +0000 (Fri, 25 Jul 2008)
Log Message:
-----------
complete rework
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-25 07:13:49 UTC (rev 735)
+++ trunk/fclient/src/fclient/Ui_ViewBrowser.py 2008-07-25 07:13:57 UTC (rev 736)
@@ -3,9 +3,8 @@
# x. someday. maybe. reimpl to browse via fcp.
# 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 suck somehow. sometimes fwd is enabled even if no fwd is available. reimpl page history?
-# x. save page / image whatever
+# x. save page to disk
# x. download. idea is to add dls to global download widget and mark them (some color code) as new content.
# alt would be to to do it firefox like in a separate widget. maybe an option to adjust if browser dls should be
# persistent or not
@@ -14,164 +13,138 @@
# x. give feedback on tabs about load / finisched / error. maybe some color code. wait for new QTabWidget features (qt4.5)
# x. close button on tabs. wait for new QTabWidget features (qt4.5)
# x. zoom in/out
-#
+# x. page actions: CopyImageToClipboard,
+# x. when mouse pointer is over an opend image a magnifier cursor appears. no idea how this is handled
#******************************************************************************************
+"""
+
+@newfield signal: signal, signals
+"""
from __future__ import absolute_import
if __name__ == '__main__': # see --> http://bugs.python.org/issue1510172 . works only current dir and below
import os; __path__ = [os.path.dirname(__file__)]
-
-import logging
+
import posixpath
-#import re
-import sys
-logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
+from PyQt4 import QtCore, QtGui, QtWebKit
-from PyQt4 import QtCore, QtGui, QtWebKit, QtNetwork
+from . import config
-from . import config
from .lib import fcp2
+from .lib.qt4ex.lib import tools as qtools
+from .lib.compactpath.qt4 import pathlabelwrap
from . import Ui_DlgPropsBrowserObject
+from . import Ui_DlgDownloadKeyToDisk
from .tpls.Ui_ViewBrowserWidgetTpl import Ui_ViewBrowserWidget
-#**********************************************************************************
+#*****************************************************************************************
#
-#**********************************************************************************
-def htmlPage(title, *contents):
- p = '''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
- <head>
- <title>%s</title>
- </head>
- <body>
- %s
- </body>
-</html>
-''' % (title, ''.join([str(i) for i in contents]))
- return p
+#*****************************************************************************************
+class Page(QtWebKit.QWebPage):
+ def __init__(self, parent):
+ QtWebKit.QWebPage.__init__(self, parent)
-#**********************************************************************************
+ #def acceptNavigationRequest(self, frame, request, typeRequest):
+ # return True
+
+#*****************************************************************************************
#
-#**********************************************************************************
-class Actions(config.ActionsBase):
+#*****************************************************************************************
+class Browser(QtWebKit.QWebView):
+ """ browser customized for freenet
+ """
- def __init__(self, parent):
- config.ActionsBase.__init__(self, parent)
+ MaxProgress = 100
- self.action(
- name='ActionCloseCurrentTab',
- text=self.trUtf8('Close ¤t tab'),
- trigger=parent.onActionCloseCurrentTab,
- #isEnabled=False,
- )
- self.action( # context menu only
- name='ActionCloseBrowserUnderMouse',
- text=self.trUtf8('&Close tab'),
- trigger=None,
- #isEnabled=False,
- )
- self.action(
- name='ActionGoToFProxy',
- text=self.trUtf8('Go to f&Proxy homepage'),
- trigger=parent.onActionGoToFProxy,
- isEnabled=True,
- )
- self.action(
- name='ActionGoToHomePage',
- text=self.trUtf8('Go to &homepage'),
- trigger=parent.onActionGoToHomePage,
- isEnabled=True,
- )
+ def __init__(self, parent=None, userData=None):
+ QtWebKit.QWebView.__init__(self, parent)
+
+ page = Page(self)
+ self.setPage(page)
+
+ #NOTE: we store last progress made to set busy cursor accordingly
+ self._lastProgress = 0
+ self._userData = userData
+
+ # connect actions
+ self.connect(self, QtCore.SIGNAL('loadStarted()'), self.onLoadStarted)
+ self.connect(self, QtCore.SIGNAL('loadProgress(int)'), self.onLoadProgress)
+ self.connect(self, QtCore.SIGNAL('loadFinished(bool)'), self.onLoadFinished)
+ self.connect(self.pageAction(QtWebKit.QWebPage.Stop), QtCore.SIGNAL('triggered()'), self.onActionStopTriggered)
+
+ ################################
+ ## methods
+ ################################
+ #def createWindow(self, typeWindow):
+ # pass
+
+ def load(self, url):
+ self._lastProgress = 0
+ return QtWebKit.QWebView.load(self, url)
- self.action(
- name='ActionCloseAllTabs',
- text=self.trUtf8('Close &all tabs'),
- trigger=parent.onActionCloseAllTabs,
- isEnabled=True,
- )
-
-
-class GlobalFeedback(config.GlobalFeedbackBase):
- """wrapper for global statusbar widgets, menus"""
+ def setLastStatusMessage(self, qString):
+ self._lastStatusMessage = qString
- def __init__(self, parent, idGlobalFeedback):
- config.GlobalFeedbackBase.__init__(self, parent, idGlobalFeedback)
-
- # menus
- self.menus = []
- if self.menuBar is not None and hasattr(parent, 'fcViewObject'):
- menu = QtGui.QMenu(parent.fcViewObject.displayName, self.menuBar)
- parent.populateMenu(menu)
- self.menus.append(menu)
- self.menuBar.addViewMenu(menu)
-
+ def setUrl(self, url):
+ return self.load(url)
+
+ def setContents(self, *args):
+ """sets the contents of the browser without changing its url"""
+ self._lastProgress = 0
+ return QtWebKit.QWebView.setContents(self, *args)
+
+ def setHtml(self, *args):
+ """sets the contents of the browser without changing its url"""
+ self._lastProgress = 0
+ return QtWebKit.QWebView.setHtm(self, *args)
+
+ def setPage(self, page):
+ """sets the contents of the browser without changing its url"""
+ self._lastProgress = 0
+ return QtWebKit.QWebView.setPage(self, page)
+
+ def setUserData(self, userData):
+ self._userData = userData
+
+ def mouseMoveEvent(self, event):
+ if self._lastProgress < self.MaxProgress:
+ self.setCursor(QtCore.Qt.BusyCursor)
+ else:
+ QtWebKit.QWebView.mouseMoveEvent(self, event)
- def setVisible(self, flag):
- if self.menuBar is not None:
- for menu in self.menus:
- menu.children()[0].setVisible(flag)
+ def userData(self):
+ return self._userData
+
+ ###############################
+ ## event handlers
+ ###############################
+ def onActionStopTriggered(self):
+ # check wich cursor to set cos we may have busy cursor set
+ pt = self.mapFromGlobal(self.cursor().pos()) #TODO: self.mapFromGlobal(self.viewPort().cursor().pos()) ??
+ frame = self.page().currentFrame()
+ hitTest = frame.hitTestContent(pt)
+ #if not hitTest.isNull(): #TODO: looks like hitTest.isNull() alwas returns True
+ if hitTest.linkUrl().isValid():
+ self.setCursor(QtCore.Qt.PointingHandCursor)
+ else:
+ self.setCursor(QtCore.Qt.ArrowCursor)
+
+ def onLoadStarted(self):
+ self._lastProgress = 0
-
-
-class Settings(config.SettingsBase):
- _key_ = config.IdViewBrowserWidget
- _settings_ = (
- ('HomePage', 'String', '', config.SettingScopeUser),
- ('HomePageIsStartPage', 'Bool', False, config.SettingScopeUser),
- )
-
-
-class BrowserViewObject(config.ViewObject):
+ def onLoadProgress(self, n):
+ self._lastProgress = n
+
+ def onLoadFinished(self):
+ self._lastProgress = self.MaxProgress
+ self.onActionStopTriggered()
+
+ def onPageDownloadRequested(self, networkRequest):
+ self.emit(QtCore.SIGNAL('downloadRequested(const QNetworkRequest &)'), networkRequest)
- def __init__(self, parent):
- config.ViewObject. __init__(self, parent)
-
- self.name=parent.objectName()
- self.displayName=self.trUtf8('Browser')
- self.icon=QtGui.QIcon()
-
#**********************************************************************************
#
#**********************************************************************************
-## looks we could serve pages via fcp, bypassing fproxy
-## no reason to do so..
-##
-##class NetworkAccessManager(QtNetwork.QNetworkAccessManager):
-##
-## def __init__(self, parent):
-## QtNetwork.QNetworkAccessManager.__init__(self, parent)
-##
-## def createRequest(self, operation, request, outgoingData):
-## print 'createRequest', request.url()
-## reply = QtNetwork.QNetworkAccessManager.createRequest(self, operation, request, outgoingData)
-## #TODO: implement QNetworkReply()
-## return reply
-##
-##
-##class Browser(QtWebKit.QWebView):
-##
-##def __init__(self, browserWidget):
-## QtWebKit.QWebView.__init__(self, browserWidget)
-##
-## self.nam = NetworkAccessManager(self)
-## self.page().setNetworkAccessManager(self.nam)
-##
-#**********************************************************************************
-#
-#**********************************************************************************
-class BrowserActions(config.ActionsBase):
-
- def __init__(self, webView):
- config.ActionsBase.__init__(self, webView)
-
- self.action(
- name='ActionObjectProperties',
- text=self.trUtf8('Properties..'),
- trigger=None,
- isEnabled=True,
- )
-
-
-class BrowserGlobalFeedback(config.GlobalFeedbackBase):
+class BrowserWidgetGlobalFeedback(config.GlobalFeedbackBase):
"""wrapper for global statusbar widgets, menus"""
def __init__(self, parent, idGlobalFeedback):
@@ -186,455 +159,398 @@
self.menuBar.addViewMenu(menu)
# status bar widgets
- self.label1 = None
+ self.labelStatus = None
self.progress = None
+ self.labelFeedbackWrap = None
if self.statusBar is not None:
- self.label1 = QtGui.QLabel(parent.trUtf8('progress: '), self.statusBar)
- self.statusBar.addWidget(self.label1)
+ self.labelStatus = QtGui.QLabel(QtCore.QString(), self.statusBar)
+ self.statusBar.addWidget(self.labelStatus)
self.progress = QtGui.QProgressBar(self.statusBar)
- self.progress.setRange(0, 100)
+ self.progress.setRange(0, Browser.MaxProgress)
self.progress.setValue(0)
self.statusBar.addWidget(self.progress)
+
+ label = QtGui.QLabel(self.statusBar)
+ label.setFrameStyle(QtGui.QLabel.Sunken | QtGui.QLabel.Box)
+ self.labelFeedbackWrap = pathlabelwrap.PathLabelWrap(
+ label,
+ path_module=posixpath,
+ )
+ self.statusBar.addWidget(self.labelFeedbackWrap.label, 1)
- self.labelStatus = QtGui.QLabel(QtCore.QString(), self.statusBar)
- self.statusBar.addWidget(self.labelStatus)
-
-
+
def setVisible(self, flag):
if self.menuBar is not None:
for menu in self.menus:
menu.children()[0].setVisible(flag)
if self.statusBar is not None:
- self.label1.setVisible(flag)
self.progress.setVisible(flag)
self.labelStatus.setVisible(flag)
+ self.labelFeedbackWrap.label.setVisible(flag)
def setProgress(self, n):
if self.progress is not None:
self.progress.setValue(n)
- def setStatusMessage(self, text):
+ def setStatusMessage(self, qString):
if self.labelStatus is not None:
- self.labelStatus.setText(text)
+ self.labelStatus.setText(qString)
+
+ def setFeedback(self, qString):
+ if self.labelFeedbackWrap is not None:
+ self.labelFeedbackWrap.setPath(unicode(qString))
+
+class BrowserWidgetViewObject(config.ViewObject):
+
+ def __init__(self, parent):
+ config.ViewObject. __init__(self, parent)
+
+ self.name=parent.objectName()
+ self.displayName=self.trUtf8('Browser')
+ self.icon=QtGui.QIcon()
+
-class BrowserSettings(config.SettingsBase):
+class BrowserWidgetSettings(config.SettingsBase):
_key_ = config.IdViewBrowserWidget
_settings_ = (
- ('AlwaysOpenLinksInNewTab', 'Bool', False, config.SettingScopeUser),
- ('BackIsClose', 'Bool', False, config.SettingScopeUser),
- ('MaxTabText', 'UInt', 20, config.SettingScopeUser),
- ('IconSize', 'UInt', 32, config.SettingScopeUser)
+ ('OpenLinksInNewTab', 'Bool', False, config.SettingScopeUser),
+ ('OpenAddressBarInNewTab', 'Bool', False, config.SettingScopeUser),
+ ('OpenBookmarksInNewTab', 'Bool', False, config.SettingScopeUser),
+ ('OpenHomePageOnNewTabCreated', 'Bool', False, config.SettingScopeUser),
+ ('BackIsClose', 'Bool', False, config.SettingScopeUser), #TODO: not implemented
+ ('HomePage', 'String', QtCore.QString(), config.SettingScopeUser),
+ ('IconSize', 'UInt', 32, config.SettingScopeUser),
+ ('LoadImages', 'Bool', True, config.SettingScopeUser), #TODO: not yet implemented
+ ('MaxTabText', 'UInt', 20, config.SettingScopeUser), #NOTE: make shure Max >= Min and Max and Min > 0
+ ('MinTabText', 'UInt', 7, config.SettingScopeUser),
)
-
-class Page(QtWebKit.QWebPage):
+class BrowserWidgetActions(config.ActionsBase):
+
def __init__(self, parent):
- QtWebKit.QWebPage.__init__(self, parent)
+ config.ActionsBase.__init__(self, parent)
- def acceptNavigationRequest(self, frame, request, typeRequest):
- return True
+ self.action(
+ name='ActionCloseCurrentTab',
+ text=self.trUtf8('Close ¤t tab'),
+ trigger=parent.onCloseCurrentTab,
+ )
+ self.action( # context menu only
+ name='ActionCloseBrowserUnderMouse',
+ text=self.trUtf8('&Close tab'),
+ trigger=None,
+ )
+ self.action(
+ name='ActionCloseAllTabs',
+ text=self.trUtf8('Close &all tabs'),
+ trigger=parent.onCloseAllTabs,
+ )
+ self.action(
+ name='ActionOpenNewTab',
+ text=self.trUtf8('Open &new tab'),
+ trigger=parent.onOpenNewTab,
+ )
+ self.action(
+ name='ActionGoToFProxy',
+ text=self.trUtf8('Go to f&Proxy homepage'),
+ trigger=parent.onGoToFProxy,
+ )
+ self.action(
+ name='ActionGoToHomePage',
+ text=self.trUtf8('Go to &homepage'),
+ trigger=parent.onGoToHomePage,
+ )
+ self.action(
+ name='ActionObjectProperties',
+ text=self.trUtf8('Properties..'),
+ trigger=None,
+ )
+ self.action(
+ name='ActionZoomIn',
+ text=self.trUtf8('Zoom in'),
+ trigger=parent.onZoomIn,
+ )
+ self.action(
+ name='ActionZoomOut',
+ text=self.trUtf8('Zoom out'),
+ trigger=parent.onZoomOut,
+ )
-
-class Browser(QtWebKit.QWebView):
-
+class LastBrowserState(object):
+ """records the last known state browser"""
- def __init__(self, parent, idGlobalFeedback=config.IdMainWindow, tabWidget=None, navBar=None):
- QtWebKit.QWebView.__init__(self, parent)
-
- self.fcActions = BrowserActions(self)
- self.fcSettings = BrowserSettings(self)
- self.fcGlobalFeedback = BrowserGlobalFeedback(self, idGlobalFeedback)
-
- self.navBar = navBar
- self.tabWidget = tabWidget
-
- settings = self.settings()
- settings.setAttribute(settings.PluginsEnabled, False)
- #settings.setAttribute(settings.AutoLoadImages, False)
-
- page = Page(self)
- self.setPage(page)
- #page = self.page()
-
- self.lastProgress = 0
- self.lastStatusMessage = self.trUtf8('Waiting')
+ __slots__ = ('icon', 'progress', 'statusMessage', 'title', 'url')
+
+ def __init__(self, icon=None, progress=0, statusMessage=None, title=None, url=None):
+ self.progress = 0
+ self.icon = tCore.QIcon() if icon is None else icon
+ self.statusMessage = QtCore.QString() if statusMessage is None else statusMessage
+ self.title = QtCore.QString() if title is None else title
#NOTE: opening a browser in a new tab may take a while to load.
# self.url() will return '' untill the page is found, so we handle
- # it ourself and keep track of the last known url in self.lastUrl
+ # it ourself and keep track of the last known url in self._lastUrl
# to give feedback to the user on the navbar. downside is we have
# to reimplement contextMenuEvent() :-(
- self.lastUrl = QtCore.QUrl()
- #self.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
- page.setLinkDelegationPolicy(page.DelegateAllLinks)
-
- # adjust actions
- act = self.pageAction(page.OpenLinkInNewWindow)
- act.setText(self.trUtf8('Open page in new tab'))
- act = self.pageAction(page.OpenImageInNewWindow)
- act.setText(self.trUtf8('Open image in new tab'))
- act = self.pageAction(page.OpenFrameInNewWindow)
- act.setText(self.trUtf8('Open frame in new tab'))
-
- # adjust action icons
- #TODO: tool buttons do not adjust themselves to huge icons. how to adjust?
- iconSize = self.fcSettings.value('IconSize')
- iconTheme = config.settings.value('IconTheme')
- acts = (
- (page.Back, 'back'),
- (page.Forward, 'forward'),
- (page.Reload, 'reload_page'),
- (page.Stop, 'stop'),
- )
- for a, iconName in acts:
- act = self.pageAction(a)
- act.setIcon(config.resources.getIcon(iconName, iconSize, iconTheme=iconTheme))
-
- # connect actions
- #TODO: download action
- self.connect(self, QtCore.SIGNAL('loadStarted()'), self.onLoadStarted)
- self.connect(self, QtCore.SIGNAL('loadProgress(int)'), self.onLoadProgress)
- self.connect(self, QtCore.SIGNAL('loadFinished(bool)'), self.onLoadFinished)
- self.connect(self, QtCore.SIGNAL('statusBarMessage(const QString &)'), self.onStatusBarMessage)
- self.connect(self, QtCore.SIGNAL('urlChanged(const QUrl &)'), self.onUrlChanged)
- 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)
-
-
- # not needed. we handle OpenLinkInNewWindow et al in contextMenuEvent
- #def createWindow(self, typeWindow):
- # pass
-
- def load(self, url):
- self.lastUrl = QtCore.QUrl(url)
- if self.isCurrentBrowser():
- if self.fcGlobalFeedback is not None and self.isCurrentBrowser():
- self.navBar.setText(self.lastUrl.toString())
- QtWebKit.QWebView.load(self, url)
-
- setUrl = load
-
-
- #################################
- ## overwritten events
- ################################
- def contextMenuEvent(self, event):
-
- frame = self.page().currentFrame()
- page = self.page()
- hitTest = frame.hitTestContent(event.pos())
-
- #if not hitTest.isNull(): #TODO: looks like hitTest.isNull() alwas returns True
-
- menu = QtGui.QMenu()
-
- menu.addAction(self.pageAction(page.OpenLink))
- menu.addAction(self.pageAction(page.OpenLinkInNewWindow))
- menu.addAction(self.pageAction(page.CopyLinkToClipboard))
- ##menu.addAction(DownloadLinkToDisk))
-
- menu.addSeparator()
- menu.addAction(self.pageAction(page.OpenImageInNewWindow))
- menu.addAction(self.pageAction(page.DownloadImageToDisk))
- menu.addAction(self.pageAction(page.CopyImageToClipboard))
-
- menu.addSeparator()
- menu.addAction(self.pageAction(page.OpenFrameInNewWindow))
-
- menu.addSeparator()
- menu.addAction(self.pageAction(page.Copy))
-
- menu.addAction(self.fcActions['ActionObjectProperties'])
-
- downloadsWidget = config.ObjectRegistry.get(config.IdViewCDownloadsWidget)
- self.pageAction(page.DownloadImageToDisk).setEnabled(downloadsWidget is not None)
-
- action = menu.exec_(event.globalPos())
- if action in (self.pageAction(page.OpenLinkInNewWindow), self.pageAction(page.OpenImageInNewWindow), self.pageAction(page.OpenFrameInNewWindow)):
- if self.tabWidget is not None:
- browser = self.__class__(self.tabWidget,
- idGlobalFeedback=self.fcGlobalFeedback.id,
- tabWidget=self.tabWidget,
- navBar=self.navBar,
- )
- self.tabWidget.addTab(browser, self.trUtf8('Loading'))
- self.tabWidget.tabBar().setVisible(self.tabWidget.count())
- if action == self.pageAction(page.OpenLinkInNewWindow):
- browser.load(hitTest.linkUrl())
- elif action == self.pageAction(page.OpenImageInNewWindow):
- browser.load(hitTest.imageUrl())
- elif action == self.pageAction(page.OpenFrameInNewWindow):
- browser.load(hitTest.frame().url())
-
- elif action == self.pageAction(page.DownloadImageToDisk):
- url = hitTest.imageUrl().toString()
- try:
- url = str(url)
- except UnicodeEncodeError:
- #TODO: handle
- return
- try:
- key = fcp2.Key(url)
- except ValueError:
- #TODO: handle
- return
- requestIdentifier = config.fcpClient.getData(key)
- downloadsWidget.addRequest(requestIdentifier)
-
- elif action == self.fcActions['ActionObjectProperties']:
- dlg = Ui_DlgPropsBrowserObject.PropsBrowserObjectDlg(self, hitTest=hitTest)
- if dlg.exec_() == dlg.Accepted:
- pass
-
-
-
- def showEvent(self, event):
- self.fcGlobalFeedback.setVisible(True)
- self.setProgress(self.lastProgress)
- self.setStatusMessage(self.lastStatusMessage)
- if self.navBar is not None:
- self.navBar.setText(self.lastUrl.toString())
-
-
- def hideEvent(self, event):
- self.fcGlobalFeedback.setVisible(False)
-
- def mouseMoveEvent(self, event):
- if self.lastProgress < 100:
- self.setCursor(QtCore.Qt.BusyCursor)
- else:
- QtWebKit.QWebView.mouseMoveEvent(self, event)
-
- ################################
- ## methods
- ################################
- def isCurrentBrowser(self):
- if self.tabWidget is not None:
- return self.tabWidget.currentWidget() == self
- return False
-
-
- def tabIndex(self):
- if self.tabWidget is not None:
- return self.tabWidget.indexOf(self)
- return -1
-
-
- def setStatusMessage(self, text):
- self.lastStatusMessage = text
- if self.fcGlobalFeedback is not None and self.isCurrentBrowser():
- self.fcGlobalFeedback.setStatusMessage(text)
-
-
- def setProgress(self, percent):
- self.lastProgress = percent
- if self.fcGlobalFeedback is not None and self.isCurrentBrowser():
- self.fcGlobalFeedback.setProgress(percent)
-
- ##############################################
- ## event handlers
- ##############################################
- def onActionStopTriggered(self):
- # check wich cursor to set cos we may have busy cursor set
- pt = self.mapFromGlobal(self.cursor().pos()) #TODO: self.mapFromGlobal(self.viewPort().cursor().pos()) ??
- frame = self.page().currentFrame()
- hitTest = frame.hitTestContent(pt)
-
- #if not hitTest.isNull(): #TODO: looks like hitTest.isNull() alwas returns True
-
- if hitTest.linkUrl().isValid() or hitTest.imageUrl().isValid():
- self.setCursor(QtCore.Qt.PointingHandCursor)
- else:
- self.setCursor(QtCore.Qt.ArrowCursor)
-
-
- def onIconChanged(self):
- i = self.tabIndex()
- if i > -1:
- self.tabWidget.setTabIcon(i, self.icon)
-
-
- def onTitleChanged(self, text):
- # add title to tab
- if self.tabWidget is not None:
- i = self.tabIndex()
- if i > -1:
- # truncate text if necessary
- maxText = self.fcSettings.value('MaxTabText')
-
- ellipsis = self.trUtf8('..')
- if text.count() > maxText and text.count() > ellipsis.count() * 2: #TODO: * 2 ???
- n = maxText - ellipsis.count()
- if n < 0:
- n = 0
- text.truncate(n)
- text.append(ellipsis)
- if text.isEmpty():
- text = self.trUtf8('<untitled>')
- self.tabWidget.setTabText(i, text)
-
-
- def onLoadFinished(self, ok):
- self.onActionStopTriggered()
- self.setProgress(100)
- if ok:
- self.setStatusMessage(self.trUtf8('Complete'))
- else:
- self.setStatusMessage(self.trUtf8('Error'))
- self.setProgress(0)
- # something went wrong. most likely fProxy can not be reached
- #
- # no access to the Dom, so we dump some html for feedback
- #TODO: loadFinished() never arrives, so the status bar gets stuck a x percent
- #TODO: there are more reasons why the request may have failed. we don't get any info
- page = htmlPage(
- self.trUtf8('Error'),
- '<h3>%s</h3>' % self.trUtf8('Request failed'),
- self.trUtf8('''one reason may be fProxy can not be reached. check your if fProxy is running
- and check your node config if host and port are ok. hint: this browser can currently
- not deal with ipv6 addresses'''),
-
- '''<br><div style="margin-top: 2em; font-style: italic; text-indent: 1em">
- congratulations. you validatet. is it still "we are stuck at 90%"? how could you ever be certain? try it.
- </div>'''
- )
- self.setHtml(page)
-
-
- def onLoadProgress(self, percent):
- self.setProgress(percent)
-
-
- def onLoadStarted(self):
- self.setCursor(QtCore.Qt.BusyCursor)
- self.setProgress(0)
- self.setStatusMessage(self.trUtf8('Loading'))
-
-
- def onStatusBarMessage(self, text):
- if not text.isEmpty():
- self.setStatusMessage(text)
-
-
- def onUrlChanged(self, url):
- self.lastUrl = QtCore.QUrl(url) # copy url. qt nukes it on return
- if self.navBar is not None and self.isCurrentBrowser():
- self.navBar.setText(self.lastUrl.toString())
-
-#***********************************************************************
+ self.url = QtCore.QUrl() if url is None else url
+
+#**********************************************************************************
#
-#***********************************************************************
+#**********************************************************************************
+#TODO: strip host:port on address bar?
+#TODO: rename home page to start page
class ViewBrowserWidget(QtGui.QWidget, Ui_ViewBrowserWidget):
IdTabBrowsers = 'tabBrowsers'
IdFrameTools = 'frameTools'
- IdFrameNavBar = 'frameNavBar'
- IdEdNavBar = 'edNavBar'
+ IdFrameAddressBar = 'frameAddressBar'
+ IdEdAddressBar = 'edAddressBar'
IdBtBack = 'btBack'
IdBtFwd = 'btFwd'
IdBtReload = 'btReload'
IdBtStop = 'btStop'
+ ForcedMinBrowserTabText = 5 # forced minimum number of chars on browser tabBar
def __init__(self, parent, idGlobalFeedback=config.IdMainWindow):
- QtGui.QWidget.__init__(self, parent)
-
- self._isCreated = False
- self._initialConfigDataArrived = False
-
+ QtGui.QWidget.__init__(self, parent)
+
self.setupUi(self)
config.ObjectRegistry.register(self)
- self.fcActions = Actions(self)
- self.fcSettings = Settings().restore()
- self.fcViewObject = BrowserViewObject(self)
- self.fcGlobalFeedback = GlobalFeedback(self, idGlobalFeedback)
+ self._initialConfigDataArrived = False
+ #XXX ?
+ #self.fproxyHost = None
+ #self.fproxyPort = None
- self.fproxyHost = None
- self.fproxyPort = None
+ self.fcActions = BrowserWidgetActions(self)
+ self.fcSettings = BrowserWidgetSettings(self).restore()
+ self.fcViewObject = BrowserWidgetViewObject(self)
+ self.fcGlobalFeedback = BrowserWidgetGlobalFeedback(self, idGlobalFeedback)
- self.fcpEvents = (
- (config.fcpClient.events.ConfigData, self.onFcpConfigData),
- )
- config.fcpClient.events += self.fcpEvents
-
- navBar = self.controlById(self.IdEdNavBar)
- self.connect(navBar, QtCore.SIGNAL('returnPressed()'), self.onNavBarReturnPressed)
-
# setup tab bar
tabWidget = self.controlById(self.IdTabBrowsers)
tabWidget.clear()
tabWidget.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
- self.connect(tabWidget, QtCore.SIGNAL('currentChanged(int)'), self.onTabBrowsersCurrentChanged)
- self.connect(tabWidget, QtCore.SIGNAL('customContextMenuRequested(const QPoint &)'), self.onTabBrowsersContextMenuEvent)
+ self.connect(tabWidget, QtCore.SIGNAL('currentChanged(int)'), self.onTabCurrentChanged)
+ self.connect(tabWidget, QtCore.SIGNAL('customContextMenuRequested(const QPoint &)'), self.onTabContextMenuEvent)
- self.newTab(tabText=self.trUtf8('Waiting for fproxy'))
+ # setup addressbar
+ addressbar = self.controlById(self.IdEdAddressBar)
+ self.connect(addressbar, QtCore.SIGNAL('returnPressed()'), self.onNavBarReturnPressed)
+
+ # fire up a new broser to make a start
+ self.newBrowser(title=self.trUtf8('Waiting for fproxy'))
+ self.fcActions['ActionGoToHomePage'].trigger()
#########################################
+ ## private methods
+ #########################################
+ def _adjustTabDependendActions(self):
+ tabWidget = self.controlById(self.IdTabBrowsers)
+ self.fcActions['ActionCloseCurrentTab'].setEnabled(tabWidget.count())
+ self.fcActions['ActionCloseAllTabs'].setEnabled(tabWidget.count())
+ self.fcActions['ActionZoomIn'].setEnabled(tabWidget.count())
+ self.fcActions['ActionZoomOut'].setEnabled(tabWidget.count())
+
+ def _downloadImageToDisk(self, hitTestResult):
+ px = hitTestResult.pixmap()
+ if px.isNull():
+ return False
+
+ key = config.qStringToFcpKey(hitTestResult.imageUrl().toString())
+ if key is None:
+ return False
+
+ # thow a dialog box at the user to select a filename
+ # ..qt seems to place the filename part as suggestion into the filename box. so try it
+ caption = config.FclientAppName + self.trUtf8(' - Save Image To..')
+ directory = unicode(config.settings.value('DownloadDir'))
+ fileName = unicode(config.guessFileNameFromKey(key, default=QtCore.QString('')))
+
+ if directory and fileName:
+ directory = os.path.join(directory, fileName)
+ elif not directory:
+ directory = fileName
+ filePath = QtGui.QFileDialog.getSaveFileName(self, caption, directory)
+
+ if filePath:
+ filePath= unicode(filePath)
+ if os.path.exists(filePath):
+ try:
+ os.remove(filePath)
+ except Exception, details:
+ QtGui.QMessageBox.critical(
+ self,
+ caption,
+ self.trUtf8('Could not remove file'), #NOTE: no details please, may contain arbitrary lenght filepath
+ )
+ return False
+ px.save(filePath)
+ return True
+
+ def _downloadKeyToDisk(self, qUrl):
+ """
+ @return: (bool) False if the key in the url is invalid, True otherwise
+ """
+ fcpKey = config.qStringToFcpKey(QtCore.QString(qUrl.encodedPath()))
+ if fcpKey is not None:
+ dlg = Ui_DlgDownloadKeyToDisk.DownloadKeyToDiskDlg(self, fcpKey=fcpKey)
+ if dlg.exec_() == dlg.Accepted:
+ filePath = dlg.filePath()
+ downloadsWidget = config.ObjectRegistry.get(config.IdViewCDownloadsWidget, None)
+ if downloadsWidget is None:
+ raise ValueError('no downloads widget found')
+ downloadsWidget.downloadFile(
+ fcpKey,
+ filePath,
+ persistence=fcp2.ConstPersistence.Forever,
+ handleFilenameCollision=True,
+
+ )
+ return True
+ return False
+
+ def _adjustTabText(self, qString):
+ maxTabText = self.fcSettings.value('MaxTabText')
+ minTabText = self.fcSettings.value('MinTabText')
+ ellipsis = self.trUtf8('..')
+
+ if minTabText < self.ForcedMinBrowserTabText:
+ minTabText = self.ForcedMinBrowserTabText
+ self.fcSettings.setValues(MinTabText=minTabText)
+ if maxTabText < self.ForcedMinBrowserTabText:
+ maxTabText = self.ForcedMinBrowserTabText
+ self.fcSettings.setValues(MaxTabText=maxTabText)
+ if minTabText > maxTabText:
+ minTabText = maxTabText
+ self.fcSettings.setValues(MinTabText=maxTabText)
+
+ if qString.count() < minTabText:
+ qString = qString.append('\x20' * (minTabText - qString.count()))
+ else:
+ if maxTabText < self.ForcedMinBrowserTabText:
+ maxTabText = sminTabText
+ qString = qtools.truncateString(maxTabText, qString, ellipsis)
+ return qString
+
+ #########################################
## methods
#########################################
def controlById(self, idControl):
return getattr(self, idControl)
+
+ def currentBrowser(self):
+ """returns the current browser or None"""
+ tabWidget = self.controlById(self.IdTabBrowsers)
+ return tabWidget.currentWidget()
+
+ def newBrowser(self, title=''):
+ """opens a browser in a new tab"""
+ tabWidget = self.controlById(self.IdTabBrowsers)
+ browser = Browser(self)
+ page = browser.page()
+ settings = browser.settings()
+ title = QtCore.QString(title)
+ iconSize = self.fcSettings.value('IconSize')
+ iconTheme = config.settings.value('IconTheme')
-
- def newTab(self, tabText=''):
- """creates a new tab"""
- tabWidget = self.controlById(self.IdTabBrowsers)
- browser = Browser(self,
- idGlobalFeedback=self.fcGlobalFeedback.id,
- tabWidget=self.controlById(self.IdTabBrowsers),
- navBar=self.controlById(self.IdEdNavBar),
+ # attatch browser state information
+ lastBrowserState = LastBrowserState(
+ icon=browser.icon(),
+ statusMessage=self.trUtf8('Waiting'),
)
- tabWidget.addTab(browser, tabText)
+ browser.setUserData(lastBrowserState)
+
+ # customize browser
+ browser.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
+ ##settings.setAttribute(settings.AutoLoadImages, False)
+ settings.setAttribute(settings.DeveloperExtrasEnabled, False)
+ settings.setAttribute(settings.JavaEnabled, False)
+ settings.setAttribute(settings.JavascriptEnabled, False)
+ settings.setAttribute(settings.JavascriptCanOpenWindows, False)
+ settings.setAttribute(settings.JavascriptCanAccessClipboard, False)
+ settings.setAttribute(settings.PluginsEnabled, False)
+
+ # connect browser signals
+ self.connect(browser, QtCore.SIGNAL('loadStarted()'), self.onBrowserLoadStarted)
+ self.connect(browser, QtCore.SIGNAL('loadProgress(int)'), self.onBrowserLoadProgress)
+ self.connect(browser, QtCore.SIGNAL('loadFinished(bool)'), self.onBrowserLoadFinished)
+ self.connect(browser, QtCore.SIGNAL('iconChanged()'), self.onBrowserIconChanged)
+ self.connect(browser, QtCore.SIGNAL('statusBarMessage(const QString &)'), self.onBrowserStatusBarMessage)
+ self.connect(browser, QtCore.SIGNAL('titleChanged(const QString &)'), self.onBrowserTitleChanged)
+ self.connect(browser, QtCore.SIGNAL('urlChanged(const QUrl &)'), self.onBrowserUrlChanged)
+ self.connect(browser, QtCore.SIGNAL('customContextMenuRequested(const QPoint &)'), self.onBrowserCustomContextMenuRequested)
+ self.connect(browser, QtCore.SIGNAL('linkClicked(const QUrl &)'), self.onBrowserLinkClicked)
+
+ # adjust browser actions
+ act = browser.pageAction(page.OpenLinkInNewWindow)
+ act.setText(self.trUtf8('Open page in new tab'))
+ act = browser.pageAction(page.OpenImageInNewWindow)
+ act.setText(self.trUtf8('Open image in new tab'))
+ act = browser.pageAction(page.OpenFrameInNewWindow)
+ act.setText(self.trUtf8('Open frame in new tab'))
+
+ act = browser.pageAction(page.Back)
+ act.setIcon(config.resources.getIcon('back', iconSize, iconTheme=iconTheme))
+ act = browser.pageAction(page.Forward)
+ act.setIcon(config.resources.getIcon('forward', iconSize, iconTheme=iconTheme))
+ act = browser.pageAction(page.Reload)
+ act.setIcon(config.resources.getIcon('reload_page', iconSize, iconTheme=iconTheme))
+ act = browser.pageAction(page.Stop)
+ act.setIcon(config.resources.getIcon('stop', iconSize, iconTheme=iconTheme))
+
+ # customize page
+ page.setLinkDelegationPolicy(page.DelegateAllLinks)
+
+ # connect page signals
+ self.connect(page, QtCore.SIGNAL('linkHovered(const QString &, const QString &, const QString &)'), self.onPageLinkHovered)
+
+ tabWidget.addTab(browser, self._adjustTabText(title))
+ if tabWidget.currentWidget() == browser:
+ self.fcGlobalFeedback.setStatusMessage(lastBrowserState.statusMessage)
return browser
-
- def load(self, url):
- """loads a page in the current tab
-
- @param url: (QUrl) to load. can be a string as well. if '', fproxys homepage is loaded
- @return: (bool) True if a browser is available for display, False otherwise
+ def load(self, url, force=False, browser=None):
+ """loads an url in the current browser. if there is no current browser, a new browser is created
+ @param force: (bool) if True, a new browser is opend if there is no browser available
+ @param browser: browser to load the url in or None to use the current browser
+ @return: (bool)
"""
- if self.fproxyHost is None or url is None:
- return
-
- # enforce fproxy. we don't want to surf the web
+ browser = self.currentBrowser() if browser is None else browser
+ tabWidget = self.controlById(self.IdTabBrowsers)
+ addressBar = self.controlById(self.IdEdAddressBar)
url = QtCore.QUrl(url)
- url.setHost(self.fproxyHost)
- url.setPort(self.fproxyPort)
+
+ # check if we have a browser at hand
+ if force and browser is None:
+ browser = self.newBrowser()
+ if browser is None:
+ return False
+
+ # load url
url.setScheme('http')
- tabWidget = self.controlById(self.IdTabBrowsers)
- browser = tabWidget.currentWidget()
- if browser is None:
- browser = self.newTab(self.trUtf8('Loading'))
+ url.setHost(config.settings.value('FproxyConnectionHost'))
+ url.setPort(config.settings.value('FproxyConnectionPort'))
+ tabWidget.setTabText(tabWidget.indexOf(browser), self._adjustTabText(self.trUtf8('Loading')))
+ addressBar.setText(url.toString())
+ lastBrowserState = browser.userData()
+ lastBrowserState.url = url
browser.load(url)
+ return True
-
- def setHtml(self, html, baseUrl=None):
- """sets the contents of the current browser to the html passed
-
- @arg html: (QString)
- @arg baseUrl: (QUrl) if specified, base url to interpret resources relative to
- """
- tabWidget = self.controlById(self.IdTabBrowsers)
- browser = tabWidget.currentWidget()
- if browser is None:
- browser = self.newTab(self.trUtf8('Loading'))
- baseUrl = QtCore.QUrl() if baseUrl is None else baseUrl
- browser.setHtml(html, baseUrl)
-
-
#TODO: rework. we need more then one menu
def populateMenu(self, menu):
menu.addAction(self.fcActions['ActionGoToFProxy'])
menu.addAction(self.fcActions['ActionGoToHomePage'])
menu.addAction(self.fcActions['ActionCloseCurrentTab'])
menu.addAction(self.fcActions['ActionCloseAllTabs'])
+ menu.addAction(self.fcActions['ActionOpenNewTab'])
+ menu.addAction(self.fcActions['ActionZoomIn'])
+ menu.addAction(self.fcActions['ActionZoomOut'])
return menu
#########################################
@@ -643,139 +559,278 @@
def hideEvent(self, event):
self.fcGlobalFeedback.setVisible(False)
-
def showEvent(self, event):
self.fcGlobalFeedback.setVisible(True)
- if self._isCreated:
- return
- self._isCreated = True
-
-
def closeEvent(self):
self.viewClose()
-
def viewClose(self):
- config.fcpClient.events -= self.fcpEvents
-
+ pass
+
#########################################
- ## fcp event onrs
+ ## event handlers
#########################################
- #TODO: browser should be disabled untill config data has arrived.
- #disable navbar, tool buttons, actions. on second thought.. we'll see.
- def onFcpConfigData(self, event, msg):
+ #TODO: actions need some comb over
+ def onBrowserCustomContextMenuRequested(self, pt):
+ browser = self.sender()
+ frame = browser.page().currentFrame()
+ page = browser.page()
+ hitTestResult = frame.hitTestContent(pt)
- self.fproxyHost = None
- self.fproxyPort = None
+ #if not hitTest.isNull(): #TODO: looks like hitTest.isNull() alwas returns True
- #TODO: give feedback in case fproxy is disabled
- if not msg.get('current.fproxy.enabled'):
- page = htmlPage(
- self.trUtf8('Error'),
- '<h3>%s</h3>' % self.trUtf8('fProxy is disabled'),
- self.trUtf8('''fProxy must be enabled and running to browse freenet. check your node config.'''),
- )
- self.setHtml(page)
- return
+ menu = QtGui.QMenu()
+
+ menu.addAction(browser.pageAction(page.OpenLink))
+ menu.addAction(browser.pageAction(page.OpenLinkInNewWindow))
+ menu.addAction(browser.pageAction(page.CopyLinkToClipboard))
+ ##menu.addAction(DownloadLinkToDisk))
+
+ menu.addSeparator()
+ menu.addAction(browser.pageAction(page.OpenImageInNewWindow))
+ menu.addAction(browser.pageAction(page.DownloadImageToDisk))
+ menu.addAction(browser.pageAction(page.CopyImageToClipboard))
+
+ menu.addSeparator()
+ menu.addAction(browser.pageAction(page.OpenFrameInNewWindow))
+
+ menu.addSeparator()
+ menu.addAction(browser.pageAction(page.Copy))
+ menu.addAction(self.fcActions['ActionObjectProperties'])
- fproxyHosts = msg.get('current.fproxy.bindTo')
- if fproxyHosts:
- #TODO: ups, looks like we can not deal with ipv6 addrs
- # do an in depth scan to see wich host might be usable ;-)
- for host in fproxyHosts:
- if ':'not in host: #TODO: more here
- break
- self.fproxyHost = host
- self.fproxyPort = msg.get('current.fproxy.port')
-
- # auto load some page if we are starting up
- if not self._initialConfigDataArrived:
- self._initialConfigDataArrived = True
- navBar = self.controlById(self.IdEdNavBar)
- text = navBar.text()
- if text.isEmpty():
- if self.fcSettings.value('HomePageIsStartPage'):
- self.fcActions['ActionGoToHomePage'].trigger()
- else:
- self.fcActions['ActionGoToFProxy'].trigger()
- else:
- self.load(text)
-
- #########################################
- ##
- #########################################
- def onActionCloseCurrentTab(self, action):
+ action = menu.exec_(pt)
+
+ if action == browser.pageAction(page.OpenLinkInNewWindow):
+ browser = self.newBrowser(title=self.trUtf8('Loading'))
+ self.load(hitTestResult.linkUrl(), browser=browser)
+ elif action == browser.pageAction(page.OpenImageInNewWindow):
+ browser = self.newBrowser(title=self.trUtf8('Loading'))
+ self.load(hitTestResult.imageUrl(), browser=browser)
+ elif action == browser.pageAction(page.OpenFrameInNewWindow):
+ browser = self.newBrowser(title=self.trUtf8('Loading'))
+ self.load(hitTestResult.frame().url(), browser=browser)
+ elif action == browser.pageAction(page.DownloadImageToDisk):
+ self._downloadImageToDisk(hitTestResult)
+ elif action == self.fcActions['ActionObjectProperties']:
+ dlg = Ui_DlgPropsBrowserObject.PropsBrowserObjectDlg(self, hitTestResult=hitTestResult)
+ if dlg.exec_() == dlg.Accepted:
+ pass
+
+ #TODO: nav buttons seem to get confused on error
+ def onBrowserLoadFinished(self, ok):
+ browser = self.sender()
+ lastBrowserState = browser.userData()
tabWidget = self.controlById(self.IdTabBrowsers)
- tabWidget.removeTab(tabWidget.currentIndex())
-
+
+ lastBrowserState.progress = Browser.MaxProgress
+ if ok:
+ lastBrowserState.statusMessage = self.trUtf8('Complete')
+ if lastBrowserState.title.isEmpty():
+ tabWidget.setTabText(tabWidget.indexOf(browser), self._adjustTabText(self.trUtf8('Complete')))
+ if browser == self.currentBrowser():
+ self.fcGlobalFeedback.setStatusMessage(lastBrowserState.statusMessage)
+ else:
+ # something went wrong. most likely fProxy can not be reached
+ lastBrowserState.statusMessage = self.trUtf8('Error')
+ tabWidget.setTabText(tabWidget.indexOf(browser), self._adjustTabText(self.trUtf8('Error')))
+ if browser == self.currentBrowser():
+ self.fcGlobalFeedback.setStatusMessage(lastBrowserState.statusMessage)
+
+ settings = browser.settings()
+ settings.setAttribute(settings.JavascriptEnabled, True)
+ try:
+ p = (
+ '<h3>%s</h3>' % self.trUtf8('Error: request failed'),
+ self.trUtf8('Possible reasons:'),
+ '<ul>',
+ '<li>',
+ self.trUtf8('fProxy can not be reached. check if fproxy is running and check your node config if fproxy host and port are set'),
+ '</li>',
+ '<li>',
+ self.trUtf8('maybe your os can not deal with ipv6 addresses. make shure fProxy is reachable via an ipv4 address'),
+ '</li>',
+ '<li>',
+ self.trUtf8('there is no problem. try it again..'),
+ '</li>',
+ '</ul>'
+ )
+ p = ''.join([unicode(i) for i in p])
+ browser.page().mainFrame().evaluateJavaScript('document.write("<div>%s</div>");' % p)
+ finally:
+ settings.setAttribute(settings.JavascriptEnabled, False)
- def onTabBrowsersContextMenuEvent(self, pt):
- menu = QtGui.QMenu()
+ def onBrowserIconChanged(self, qIcon):
+ browser = self.sender()
+ qIcon = QtCore.QIcon(qIcon) # copy it - qt nukes it on return
- #TODO: enable / disable actions
- actCloseBrowserUnderMouse = self.fcActions['ActionCloseBrowserUnderMouse']
- menu.addAction(actCloseBrowserUnderMouse)
- menu.addAction(self.fcActions['ActionCloseAllTabs'])
+ lastBrowserState = browser.userData()
+ if not qIcon.isNull():
+ lastBrowserState = qIcon
+ self.tabWidget.setTabIcon(i, lastBrowserState.icon)
+
+ def onBrowserLoadProgress(self, n):
+ browser = self.sender()
+ lastBrowserState = browser.userData()
- tab = self.controlById(self.IdTabBrowsers)
- pt = tab.mapToGlobal(pt)
+ lastBrowserState.progress = n
+ if self.sender() == self.currentBrowser():
+ self.fcGlobalFeedback.setProgress(n)
+
+ def onBrowserLinkClicked(self, qUrl):
+ browser = self.sender()
+ qUrl = QtCore.QUrl(qUrl)
+ query = unicode(qUrl.encodedQuery())
+
+ if query.lower() == 'forcedownload':
+ if not self._downloadKeyToDisk(qUrl):
+ self.fcGlobalFeedback.setFeedback(self.trUtf8('Invalid key!'))
+ else: # assume fproxy is doing the right thing
+ if self.fcSettings.value('OpenLinksInNewTab'):
+ browser = self.newBrowser(title=self.trUtf8('Loading'))
+ self.load(qUrl, browser=browser)
- act = menu.exec_(pt)
- if act == actCloseBrowserUnderMouse:
- pt = tab.tabBar().mapFromGlobal(pt)
- i = tab.tabBar().tabAt(pt)
- if i > -1:
- tab.removeTab(i)
-
+ def onBrowserLoadStarted(self):
+ browser = self.sender()
+ lastBrowserState = browser.userData()
+ tabWidget = self.controlById(self.IdTabBrowsers)
+
+ lastBrowserState.statusMessage = self.trUtf8('Loading')
+ tabWidget.setTabText(tabWidget.indexOf(browser), self._adjustTabText(self.trUtf8('Loading')))
+ if browser == self.currentBrowser():
+ self.fcGlobalFeedback.setProgress(0)
+ self.fcGlobalFeedback.setStatusMessage(lastBrowserState.statusMessage)
- def onTabBrowsersCurrentChanged(self, index):
- browser = self.controlById(self.IdTabBrowsers).currentWidget()
- if browser is None:
- return
- actions = (
- (self.IdBtBack, QtWebKit.QWebPage.Back),
- (self.IdBtFwd, QtWebKit.QWebPage.Forward),
- (self.IdBtReload, QtWebKit.QWebPage.Reload),
- (self.IdBtStop, QtWebKit.QWebPage.Stop),
- )
- for idControl, webAction in actions:
- bt = self.controlById(idControl)
- bt.setDefaultAction(browser.pageAction(webAction))
-
+ def onBrowserStatusBarMessage(self, qString):
+ browser = self.sender()
+ qString = QtCore.QString(qString) # copy it - qt nukes it on return
- def onNavBarReturnPressed(self):
- ed = self.controlById(self.IdEdNavBar)
+ lastBrowserState = browser.userData()
+ if not qString.isEmpty():
+ lastBrowserState.statusMessage = qString
+ if browser == self.currentBrowser():
+ self.fcGlobalFeedback.setStatusMessage(lastBrowserState.statusMessage)
+
+ def onBrowserTitleChanged(self, qString):
+ browser = self.sender()
+ qString = QtCore.QString(qString) # copy it - qt nukes it on return
+ maxTabText = self.fcSettings.value('MaxTabText')
tabWidget = self.controlById(self.IdTabBrowsers)
- if not tabWidget.count():
- self.newTab(tabText=self.trUtf8(''))
- self.load(ed.text())
+ lastBrowserState = browser.userData()
+ if not qString.isEmpty():
+ lastBrowserState.title = qString
+ tabWidget.setTabText(tabWidget.indexOf(browser), self._adjustTabText( lastBrowserState.title))
+ def onBrowserUrlChanged(self, qUrl):
+ browser = self.sender()
+ qUrl = QtCore.QUrl(qUrl) # copy it - qt nukes it on return
+
+ lastBrowserState = browser.userData()
+ if qUrl.isValid():
+ lastBrowserState.url = qUrl
+ addressbar = self.controlById(self.IdEdAddressBar)
+ addressbar.setText(lastBrowserState.url.toString())
- def onActionCloseAllTabs(self, action):
+ def onCloseAllTabs(self, action):
tabWidget = self.controlById(self.IdTabBrowsers)
tabWidget.clear()
+ self._adjustTabDependendActions()
+
+ def onCloseCurrentTab(self, action):
+ tabWidget = self.controlById(self.IdTabBrowsers)
+ i = tabWidget.currentIndex()
+ if i > -1:
+ tabWidget.removeTab(i)
+ self._adjustTabDependendActions()
+
+ #TODO: open in new tab option?
+ def onGoToFProxy(self, action):
+ url = QtCore.QUrl()
+ self.load(url, force=True)
+ #TODO: open in new tab option?
+ def onGoToHomePage(self, action):
+ home = self.fcSettings.value('HomePage')
+ qUrl = QtCore.QUrl(home)
+ self.load(qUrl, force=True)
+
+ def onNavBarReturnPressed(self):
+ text = self.controlById(self.IdEdAddressBar).text()
+ if text.isEmpty():
+ return
+ qUrl = QtCore.QUrl(text)
+ browser = self.currentBrowser()
+ if browser is None or self.fcSettings.value('OpenAddressBarInNewTab'):
+ browser = self.newBrowser(title=self.trUtf8('Loading'))
+ self.load(qUrl, browser=browser)
- def onActionGoToFProxy(self, action):
- if self.fproxyHost is None:
- #TODO: handle
- return
+ #TODO: we get no load progress feedback here?
+ #TODO: more choices for page to load
+ def onOpenNewTab(self, action):
+ browser = self.newBrowser(title=self.trUtf8('Empty'))
+ if self.fcSettings.value('OpenHomePageOnNewTabCreated'):
+ homePage = self.fcSettings.value('HomePage')
+ self.load(QtCore.QUrl(homePage), browser=browser)
- url = QtCore.QUrl()
+ def onPageLinkHovered(self, link, title, textContent):
+ self.fcGlobalFeedback.setFeedback(QtCore.QString(link))
+
+ def onTabContextMenuEvent(self, pt):
+ menu = QtGui.QMenu()
tabWidget = self.controlById(self.IdTabBrowsers)
- if not tabWidget.count():
- self.newTab(tabText=self.trUtf8('Waiting for fproxy'))
- self.load(url)
+ pt = tabWidget.mapToGlobal(pt)
+ pt2 = tabWidget.tabBar().mapFromGlobal(pt)
+ i = tabWidget.tabBar().tabAt(pt2)
+ # setup menu
+ self._adjustTabDependendActions()
+ actCloseBrowserUnderMouse = self.fcActions['ActionCloseBrowserUnderMouse']
+ actCloseBrowserUnderMouse.setEnabled(i >-1)
+ menu.addAction(actCloseBrowserUnderMouse)
+ menu.addAction(self.fcActions['ActionCloseAllTabs'])
+ act = menu.exec_(pt)
+ if act == actCloseBrowserUnderMouse:
+ tabWidget.removeTab(i)
+ self._adjustTabDependendActions()
- def onActionGoToHomePage(self, action):
- home = self.fcSettings.value('HomePage')
- url = QtCore.QUrl(home)
+ def onTabCurrentChanged(self, i):
tabWidget = self.controlById(self.IdTabBrowsers)
- if not tabWidget.count():
- self.newTab(tabText=self.trUtf8('Waiting for fproxy'))
- self.load(url)
+ browser = tabWidget.widget(i)
+ if browser is not None:
+ page = browser.page()
+ lastBrowserState = browser.userData()
+ addressbar = self.controlById(self.IdEdAddressBar)
+
+ # update status info
+ addressbar.setText(lastBrowserState.url.toString())
+ self.fcGlobalFeedback.setStatusMessage(lastBrowserState.statusMessage)
+ self.fcGlobalFeedback.setProgress(lastBrowserState.progress)
+
+ # adjust actions on addressbar
+ self.controlById(self.IdBtBack).setDefaultAction(browser.pageAction(page.Back))
+ self.controlById(self.IdBtFwd).setDefaultAction(browser.pageAction(page.Forward))
+ self.controlById(self.IdBtReload).setDefaultAction(browser.pageAction(page.Reload))
+ self.controlById(self.IdBtStop).setDefaultAction(browser.pageAction(page.Stop))
+ self.controlById(self.IdBtBack).setDefaultAction(browser.pageAction(page.Back))
+ #TODO: enable/disable, but no view gives non feedback on max/min zoom
+ def onZoomIn(self, action):
+ browser = self.currentBrowser()
+ if browser is not None:
+ oldMultiplier = browser.textSizeMultiplier()
+ browser.setTextSizeMultiplier(browser.textSizeMultiplier() + 0.2)
+ if browser.textSizeMultiplier() <= oldMultiplier:
+ menu.addAction(self.fcActions['ActionZoomIn']).setEnabled(False)
+
+ def onZoomOut(self, action):
+ browser = self.currentBrowser()
+ if browser is not None:
+ oldMultiplier = browser.textSizeMultiplier()
+ browser.setTextSizeMultiplier(browser.textSizeMultiplier() - 0.2)
+ print browser.textSizeMultiplier()
+ if browser.textSizeMultiplier() >= oldMultiplier:
+ menu.addAction(self.fcActions['ActionZoomOut']).setEnabled(False)
+
+
#**********************************************************************************
#
#**********************************************************************************
@@ -785,6 +840,7 @@
from .Ui_MainWindow import MainWindow
from .Ui_View import ViewWidget
from .Ui_ViewConnection import ViewConnectionWidget
+ from .Ui_ViewDownloads import ViewDownloadsWidget
app = QtGui.QApplication(sys.argv)
@@ -796,6 +852,7 @@
viewWidget.addTopViews(
ViewConnectionWidget(mainWindow),
browserWidget,
+ ViewDownloadsWidget(mainWindow),
)
viewWidget.addBottomViews(ViewLoggerWidget(mainWindow))
@@ -803,5 +860,33 @@
res = app.exec_()
sys.exit(res)
-
-
+#**********************************************************************************
+#
+#**********************************************************************************
+## looks we could serve pages via fcp, bypassing fproxy
+## no reason to do so..
+##
+##class NetworkAccessManager(QtNetwork.QNetworkAccessManager):
+##
+## def __init__(self, parent):
+## QtNetwork.QNetworkAccessManager.__init__(self, parent)
+##
+## def createRequest(self, operation, request, outgoingData):
+## print 'createRequest', request.url()
+## reply = QtNetwork.QNetworkAccessManager.createRequest(self, operation, request, outgoingData)
+## #TODO: implement QNetworkReply()
+## return reply
+##
+##
+##class Browser(QtWebKit.QWebView):
+##
+##def __init__(self, browserWidget):
+## QtWebKit.QWebView.__init__(self, browserWidget)
+##
+## self.nam = NetworkAccessManager(self)
+## self.page().setNetworkAccessManager(self.nam)
+##
+#**********************************************************************************
+#
+#**********************************************************************************
+
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
