SF.net SVN: fclient:[871] trunk/fclient/fclient/impl
Status: Pre-Alpha
Brought to you by:
jurner
|
From: <jU...@us...> - 2008-08-03 19:18:46
|
Revision: 871
http://fclient.svn.sourceforge.net/fclient/?rev=871&view=rev
Author: jUrner
Date: 2008-08-03 19:18:54 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
this and that
Modified Paths:
--------------
trunk/fclient/fclient/impl/DlgDownloadKeyToDisk.py
trunk/fclient/fclient/impl/DlgSingleAppError.py
trunk/fclient/fclient/impl/MainWindow.py
trunk/fclient/fclient/impl/Prefs.py
trunk/fclient/fclient/impl/View.py
trunk/fclient/fclient/impl/ViewBrowser.py
trunk/fclient/fclient/impl/ViewConnection.py
trunk/fclient/fclient/impl/ViewDownloads.py
trunk/fclient/fclient/impl/ViewLogger.py
trunk/fclient/fclient/impl/config.py
trunk/fclient/fclient/impl/lib/fcp2/client.py
trunk/fclient/fclient/impl/lib/fcp2/consts.py
trunk/fclient/fclient/impl/lib/fcp2/key.py
trunk/fclient/fclient/impl/lib/numbers.py
Modified: trunk/fclient/fclient/impl/DlgDownloadKeyToDisk.py
===================================================================
--- trunk/fclient/fclient/impl/DlgDownloadKeyToDisk.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/DlgDownloadKeyToDisk.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -22,7 +22,7 @@
class Settings(config.SettingsBase):
_key_ = 'DlgDownloadKeyToDisk'
_settings_ = (
- ('Geometry', 'ByteArray', QtCore.QByteArray(), config.SettingScopePrivate),
+ ('Geometry', 'ByteArray', QtCore.QByteArray()),
)
@@ -49,6 +49,7 @@
# setup key editbox
ed = self.controlById(self.IdEdKey)
+ print fcpKey
if fcpKey is not None:
ed.setText(fcpKey.toString())
Modified: trunk/fclient/fclient/impl/DlgSingleAppError.py
===================================================================
--- trunk/fclient/fclient/impl/DlgSingleAppError.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/DlgSingleAppError.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -21,8 +21,8 @@
class Settings(config.SettingsBase):
_key_ = 'DlgSingleAppError'
_settings_ = (
- ('Geometry', 'ByteArray', QtCore.QByteArray(), config.SettingScopePrivate),
- ('SplitterPos', 'ByteArray', QtCore.QByteArray(), config.SettingScopePrivate),
+ ('Geometry', 'ByteArray', QtCore.QByteArray()),
+ ('SplitterPos', 'ByteArray', QtCore.QByteArray()),
)
Modified: trunk/fclient/fclient/impl/MainWindow.py
===================================================================
--- trunk/fclient/fclient/impl/MainWindow.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/MainWindow.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -20,7 +20,7 @@
_key_ = config.IdMainWindow
_settings_ = (
- ('Geometry', 'ByteArray', QtCore.QByteArray(), config.SettingScopePrivate),
+ ('Geometry', 'ByteArray', QtCore.QByteArray()),
)
Modified: trunk/fclient/fclient/impl/Prefs.py
===================================================================
--- trunk/fclient/fclient/impl/Prefs.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/Prefs.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -3,7 +3,7 @@
import os; __path__ = [os.path.dirname(__file__)]
-from PyQt4 import QtGui
+from PyQt4 import QtCore, QtGui
from . import config
from .lib.qt4ex import dlgpreferences
@@ -17,7 +17,7 @@
class Settings(config.SettingsBase):
_key_ = config.IdDlgPrefs
_settings_ = (
- ('DlgState', 'String', '', config.SettingScopePrivate),
+ ('DlgState', 'String', QtCore.QString('')),
)
Modified: trunk/fclient/fclient/impl/View.py
===================================================================
--- trunk/fclient/fclient/impl/View.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/View.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -2,8 +2,8 @@
#TODO:
#
# x. shortcuts for "Go to" menus and items
+# x. detatch tabs
#
-#
#***************************************************************************
from __future__ import absolute_import
if __name__ == '__main__': # see --> http://bugs.python.org/issue1510172 . works only current dir and below
@@ -60,11 +60,11 @@
class Settings(config.SettingsBase):
_key_ = config.IdViewWidget
_settings_ = (
- ('LastViewTop', 'String', '', config.SettingScopePrivate),
- ('LastViewBottom', 'String', '', config.SettingScopePrivate),
- ('SplitterPos', 'ByteArray', QtCore.QByteArray(), config.SettingScopePrivate),
- ('ShowTopTabBar', 'Bool', True, config.SettingScopePrivate),
- ('ShowBottomTabBar', 'Bool', True, config.SettingScopePrivate),
+ ('LastViewTop', 'String', QtCore.QString('')),
+ ('LastViewBottom', 'String', QtCore.QString('')),
+ ('SplitterPos', 'ByteArray', QtCore.QByteArray()),
+ ('ShowTopTabBar', 'Bool', True),
+ ('ShowBottomTabBar', 'Bool', True),
)
Modified: trunk/fclient/fclient/impl/ViewBrowser.py
===================================================================
--- trunk/fclient/fclient/impl/ViewBrowser.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/ViewBrowser.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -36,6 +36,9 @@
# more menu entries
# x. dropping. accept keys +1. what else to accept?
# x. option to upload content from browser? "upload current page" / image ..whatevs
+# x. print contents
+# x. save page
+# x. a note on "save link". if it points to a html page, no media is saved, just the html
#******************************************************************************************
"""
@@ -60,9 +63,26 @@
#*****************************************************************************************
#
#*****************************************************************************************
+# to browse via fcp...
+#from PyQt4 import QtNetwork
+#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 Page(QtWebKit.QWebPage):
def __init__(self, parent):
QtWebKit.QWebPage.__init__(self, parent)
+
+ #self.setNetworkAccessManager(NetworkAccessManager(self))
#def acceptNavigationRequest(self, frame, request, typeRequest):
# return True
@@ -214,18 +234,18 @@
class BrowserWidgetSettings(config.SettingsBase):
_key_ = config.IdViewBrowserWidget
_settings_ = (
- ('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),
- ('AutoLoadImages', 'Bool', True, config.SettingScopeUser), #TODO: not yet implemented
- ('MaxTabText', 'UInt', 15, config.SettingScopeUser), #NOTE: make shure Max >= Min and Max and Min > 0
- ('MinTabText', 'UInt', 15, config.SettingScopeUser),
+ ('OpenLinksInNewTab', 'Bool', False),
+ ('OpenAddressBarInNewTab', 'Bool', False),
+ ('OpenBookmarksInNewTab', 'Bool', False),
+ ('OpenHomePageOnNewTabCreated', 'Bool', False),
+ ('BackIsClose', 'Bool', False), #TODO: not implemented
+ ('HomePage', 'String', QtCore.QString()),
+ ('AutoLoadImages', 'Bool', True), #TODO: not yet implemented
+ ('MaxTabText', 'UInt', 15), #NOTE: make shure Max >= Min and Max and Min > 0
+ ('MinTabText', 'UInt', 15),
- ('TabProgressBarColor', 'QColor', QtGui.QColor('blue'), config.SettingScopeUser),
- ('TabProgressBarAlpha', 'UInt', 55, config.SettingScopeUser),
+ ('TabProgressBarColor', 'QColor', QtGui.QColor('blue')),
+ ('TabProgressBarAlpha', 'UInt', 55),
)
def setValues(self, **kws):
@@ -647,7 +667,7 @@
dlg = DlgDownloadKeyToDisk.DlgDownloadKeyToDisk(self, fcpKey=fcpKey)
if dlg.exec_() == dlg.Accepted:
fileName = dlg.fileName()
- downloadsWidget = config.ObjectRegistry.get(config.IdViewCDownloadsWidget, None)
+ downloadsWidget = config.ObjectRegistry.get(config.IdViewDownloadsWidget, None)
if downloadsWidget is None:
raise ValueError('no downloads widget found')
downloadsWidget.downloadFile(
@@ -822,7 +842,7 @@
page = browser.page()
hitTestResult = frame.hitTestContent(pt)
pt = browser.mapToGlobal(pt)
-
+
#if not hitTest.isNull(): #TODO: looks like hitTest.isNull() alwas returns True
menu = QtGui.QMenu()
@@ -936,6 +956,7 @@
url = browser.userData().url
self.load(url, browser=browser)
+
def onBrowserStatusBarMessage(self, qString):
browser = self.sender()
qString = QtCore.QString(qString) # copy it - qt nukes it on return
@@ -1129,33 +1150,3 @@
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
Modified: trunk/fclient/fclient/impl/ViewConnection.py
===================================================================
--- trunk/fclient/fclient/impl/ViewConnection.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/ViewConnection.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -50,16 +50,16 @@
class Settings(config.SettingsBase):
_key_ = config.IdViewConnectionWidget
_settings_ = (
- ('FcpAutoConnect', 'Bool', True, config.SettingScopeUser),
- ('FcpConnectionName', 'String', config.FcConnectionName, config.SettingScopeExpert),
- ('FcpConnectionHost', 'String', fcp2.Client.DefaultFcpHost, config.SettingScopeUser),
- ('FcpConnectionPort', 'UInt', fcp2.Client.DefaultFcpPort, config.SettingScopeUser),
- ('FcpConnectionTimerTimeout', 'UInt', 500, config.SettingScopeExpert),
- ('FcpConnectionTimerMaxDuration', 'UInt', 20, config.SettingScopeExpert),
- ('FcpPollTimerTimeout', 'UInt', 200, config.SettingScopeExpert),
+ ('FcpAutoConnect', 'Bool', True),
+ ('FcpConnectionName', 'String', config.FcConnectionName),
+ ('FcpConnectionHost', 'String', fcp2.Client.DefaultFcpHost),
+ ('FcpConnectionPort', 'UInt', fcp2.Client.DefaultFcpPort),
+ ('FcpConnectionTimerTimeout', 'UInt', 500),
+ ('FcpConnectionTimerMaxDuration', 'UInt', 20),
+ ('FcpPollTimerTimeout', 'UInt', 200),
- ('FproxyConnectionHost', 'String','127.0.0.1', config.SettingScopeUser),
- ('FproxyConnectionPort', 'UInt', 8888, config.SettingScopeUser),
+ ('FproxyConnectionHost', 'String','127.0.0.1'),
+ ('FproxyConnectionPort', 'UInt', 8888),
)
def setValues(self, **kws):
Modified: trunk/fclient/fclient/impl/ViewDownloads.py
===================================================================
--- trunk/fclient/fclient/impl/ViewDownloads.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/ViewDownloads.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -25,13 +25,20 @@
# x. it may take a while untill the final DataFound message arrives when a request is % completed. feedback would be nice
# x. DataFound for a request the file has been removed by the user. no idea what happens. have to test this
# x. when the node is about to start up, looks like persistents may arrive or not. check
- # x. how to get early information about mimetype/size? maybe use FcpClient.getFileInfo()
- # x. show/hide header izems
- # x. sort by header
- # x. indicate over all time / dl speed
- # x. indicate status / remove items by status
- # x. ...whatevs
- #**************************************************************************************************************
+# x. how to get early information about mimetype/size? maybe use FcpClient.getFileInfo()
+# x. show/hide header izems
+# x. sort by header
+# x. indicate over all time / dl speed
+# x. indicate status / remove items by status
+# x. item properties
+# x. how to handle inserting huge number of dls?
+# idea: insert with lowest priority to get the node to know them, increase priority when a slot in
+# MaxSimultaneousDls (if set) is free. atatch progressBar no sooner as priority > MinDlPriority
+# x. how to handle huge numbers of dls. the node will flood us on startup with persistents. looks
+# like the only way to control the flood is to have one connection/dl. maybe wait for freenet devels
+# to realize that this is a serious problem...
+# x. byte amount postfixes must be transllated ++ use Kib or Kb or let the user decide?
+#**************************************************************************************************************
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__)]
@@ -134,7 +141,7 @@
self.action(
name='ActionDownloadKeyToDisk',
text=self.trUtf8('Download &key...'),
- trigger=parent.onDownloadKey,
+ trigger=parent.onDlgDownloadKey,
)
self.action(
name='ActionRemoveSelectedDownloads',
@@ -152,7 +159,7 @@
class DownloadsWidgetSettings(config.SettingsBase):
- _key_ = config.IdViewCDownloadsWidget
+ _key_ = config.IdViewDownloadsWidget
_settings_ = (
)
#**********************************************************************************
@@ -209,8 +216,12 @@
def __init__(self, parent, idGlobalFeedback=config.IdMainWindow):
QtGui.QWidget.__init__(self, parent)
self._isCreated = False
+ self.fcHeaderLabels = {} # fcpIdentifier --> treeItem
+ self.fcpRequests = {}
+ self.fcRequestStatus = {}
+
+ self.setupUi(self)
- self.setupUi(self)
config.ObjectRegistry.register(self)
self.fcSettings = DownloadsWidgetSettings(self).restore()
self.fcActions = DownloadsWidgetActions(self)
@@ -226,8 +237,6 @@
(config.fcpClient.events.RequestRemoved, self.onFcpRequestRemoved),
)
config.fcpClient.events += self.fcpEvents
- self.fcHeadeLabels = {} # fcpIdentifier --> treeItem
- self.fcpRequests = {}
############################
## private methods
@@ -275,7 +284,7 @@
def retranslateUi(self, parent):
Ui_ViewDownloadsWidget.retranslateUi(self, parent)
tree = self.controlById(self.IdTree)
- self.fcHeadeLabels = {
+ self.fcHeaderLabels = {
self.HeaderIndexName: self.trUtf8('Name'),
self.HeaderIndexSize: self.trUtf8('Size'),
self.HeaderIndexMimeType: self.trUtf8('MimeType'),
@@ -283,7 +292,15 @@
self.HeaderIndexProgress: self.trUtf8('Progress'),
self.HeaderIndexElapsed: self.trUtf8('Elapsed'),
}
- tree.setHeaderLabels([i[1] for i in sorted(self.fcHeadeLabels.items())])
+ tree.setHeaderLabels([i[1] for i in sorted(self.fcHeaderLabels.items())])
+
+ self.fcRequestStatus = {
+ None: self.trUtf8('Pending'),
+ fcp2.ConstRequestStatus.Started: self.trUtf8('Loading'),
+ fcp2.ConstRequestStatus.Completed: self.trUtf8('Complete'),
+ fcp2.ConstRequestStatus.Error: self.trUtf8('Error'),
+ }
+ #TODO: retranslate all tree items
def closeEvent(self):
self.viewClose()
@@ -328,17 +345,23 @@
**kws
)
item = self._createItemFromFcpRequest(fcpRequest)
+ item.setData(
+ self.HeaderIndexStatus,
+ QtCore.Qt.DisplayRole,
+ QtCore.QVariant(self.fcRequestStatus[None]),
+ )
def populateMenu(self, menu):
menu.addAction(self.fcActions['ActionDownloadKeyToDisk'])
return menu
- #########################################
- ## event handlers
- #########################################
- def onDownloadKey(self, action):
- dlg = DlgDownloadKeyToDisk.DlgDownloadKeyToDisk(self, fcpKey=None)
+
+ def execDlgDownloadKey(self, fcpKey=None):
+ """pops up the dialog to allow the user to download a key to disk
+ @param fcpKey: key to initialize the key with or None
+ """
+ dlg = DlgDownloadKeyToDisk.DlgDownloadKeyToDisk(self, fcpKey=fcpKey)
if dlg.exec_() == dlg.Accepted:
self.downloadFile(
dlg.fcpKey(),
@@ -346,7 +369,13 @@
persistence=fcp2.ConstPersistence.Forever,
handleFilenameCollision=True,
)
-
+
+ #########################################
+ ## event handlers
+ #########################################
+ def onDlgDownloadKey(self, action):
+ self.execDlgDownloadKey(fcpKey=None)
+
def onRemoveSelectedDownloads(self, action):
tree = self.controlById(self.IdTree)
selectedItems = tree.selectedItems()
@@ -415,16 +444,24 @@
QtCore.Qt.DisplayRole,
QtCore.QVariant(fcpRequest['MetadataContentType'])
)
+ item.setData(
+ self.HeaderIndexStatus,
+ QtCore.Qt.DisplayRole,
+ QtCore.QVariant(self.fcRequestStatus[fcp2.ConstRequestStatus.Completed]),
+ )
self._adjustStatusBar(item, 'complete')
def onFcpRequestFailed(self, fcpEvent, fcpRequest):
item = self.fcpRequests.get(rfcpRequest['Identifier'], None)
if item is not None:
self._adjustStatusBar(item, 'error')
+ item.setData(
+ self.HeaderIndexStatus,
+ QtCore.Qt.DisplayRole,
+ QtCore.QVariant(self.fcRequestStatus[fcp2.ConstRequestStatus.Error]),
+ )
- pass
-
#TODO: not tested
def onFcpRequestModified(self, fcpEvent, fcpRequest):
@@ -476,7 +513,12 @@
else:
if requestData.get('ClientName', None) == self.objectName():
item = self._createItemFromFcpRequest(fcpRequest)
-
+ item.setData(
+ self.HeaderIndexStatus,
+ QtCore.Qt.DisplayRole,
+ QtCore.QVariant(self.fcRequestStatus[fcp2.ConstRequestStatus.Started]),
+ )
+
#**********************************************************************************
#
#**********************************************************************************
@@ -493,7 +535,6 @@
viewWidget = View.ViewWidget(mainWindow)
mainWindow.setCentralWidget(viewWidget)
-
viewWidget.addTopViews(
ViewConnection.ViewConnectionWidget(None),
ViewDownloadsWidget(None),
Modified: trunk/fclient/fclient/impl/ViewLogger.py
===================================================================
--- trunk/fclient/fclient/impl/ViewLogger.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/ViewLogger.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -100,17 +100,17 @@
_key_ = config.IdViewLoggerWidget
_settings_ = (
- ('MaxLines', 'UInt', 1000, config.SettingScopeUser),
- ('Verbosity', 'PyString', 'Info', config.SettingScopePrivate),
+ ('MaxLines', 'UInt', 1000),
+ ('Verbosity', 'PyString', 'Info'),
#TODO: Chatty does not seem to work. check in fcp2.client
- ('ColorFgVerbosityCRITICAL', 'QColor', QtGui.QColor('red'), config.SettingScopeUser),
- ('ColorFgVerbosityERROR', 'QColor', QtGui.QColor('red'), config.SettingScopeUser),
- ('ColorFgVerbosityWARNING', 'QColor', QtGui.QColor('red'), config.SettingScopeUser),
- ('ColorFgVerbosityINFO', 'QColor', QtGui.QColor('black'), config.SettingScopeUser),
- ('ColorFgVerbosityMESSAGE', 'QColor', QtGui.QColor('blue'), config.SettingScopeUser),
- ('ColorFgVerbosityDEBUG', 'QColor', QtGui.QColor('slategray'), config.SettingScopeUser),
- ('ColorFgVerbosityCHATTY', 'QColor', QtGui.QColor('lightslategray'), config.SettingScopeUser),
+ ('ColorFgVerbosityCRITICAL', 'QColor', QtGui.QColor('red')),
+ ('ColorFgVerbosityERROR', 'QColor', QtGui.QColor('red')),
+ ('ColorFgVerbosityWARNING', 'QColor', QtGui.QColor('red')),
+ ('ColorFgVerbosityINFO', 'QColor', QtGui.QColor('black')),
+ ('ColorFgVerbosityMESSAGE', 'QColor', QtGui.QColor('blue')),
+ ('ColorFgVerbosityDEBUG', 'QColor', QtGui.QColor('slategray')),
+ ('ColorFgVerbosityCHATTY', 'QColor', QtGui.QColor('lightslategray')),
)
Modified: trunk/fclient/fclient/impl/config.py
===================================================================
--- trunk/fclient/fclient/impl/config.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/config.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -41,7 +41,7 @@
IdViewWidget = 'ViewWidget'
IdViewBrowserWidget = 'ViewBrowserWidget'
IdViewConnectionWidget = 'ViewConnectionWidget'
-IdViewCDownloadsWidget = 'ViewDownloadsWidget'
+IdViewDownloadsWidget = 'ViewDownloadsWidget'
IdViewLoggerWidget = 'ViewDownloadsWidget'
IdViewLoggerWidget = 'ViewLoggerWidget'
IdDlgPrefs = 'DlgPrefs'
@@ -72,11 +72,6 @@
#**********************************************************************************
#
#**********************************************************************************
-SettingScopeExpert = 0x1
-SettingScopePrivate = 0x2
-SettingScopeUser = 0x4
-SettingSkopeMask = SettingScopeExpert | SettingScopePrivate | SettingScopeUser
-
class SettingsBase(settings.SettingsBase):
"""application wide base class for settings"""
@@ -103,17 +98,17 @@
class Settings(SettingsBase):
_key_ = 'ConfigSettings'
_settings_ = (
- ('DlgSingleAppErrorGeometry', 'ByteArray', QtCore.QByteArray(), SettingScopePrivate),
+ ('DlgSingleAppErrorGeometry', 'ByteArray', QtCore.QByteArray()),
- ('Version', 'String', QtCore.QString(FcVersion), SettingScopePrivate),
- ('SingleAppHost', 'String', QtCore.QString('localhost'), SettingScopeExpert),
- ('SingleAppPort', 'UInt', 45663, SettingScopeExpert),
+ ('Version', 'String', QtCore.QString(FcVersion)),
+ ('SingleAppHost', 'String', QtCore.QString('localhost')),
+ ('SingleAppPort', 'UInt', 45663),
- ('SettingsDir', 'String', QtCore.QString(FcSettingsDir), SettingScopeUser), # if not None, settings are stored locally in the app folder
- ('SettingsAllUsers', 'Bool', False, SettingScopeUser), # store settings for all users?
- ('IconTheme', 'String', QtCore.QString('crystal'), SettingScopeUser), #TODO: global icon theme?
- ('IconSize', 'UInt', 32, SettingScopeUser),
- ('DownloadDir', 'String', FcDownloadDir, SettingScopeUser),
+ ('SettingsDir', 'String', QtCore.QString(FcSettingsDir)), # if not None, settings are stored locally in the app folder
+ ('SettingsAllUsers', 'Bool', False), # store settings for all users?
+ ('IconTheme', 'String', QtCore.QString('crystal')), #TODO: global icon theme?
+ ('IconSize', 'UInt', 32),
+ ('DownloadDir', 'String', FcDownloadDir),
)
SettingsBase._config_settings_ = Settings()
Modified: trunk/fclient/fclient/impl/lib/fcp2/client.py
===================================================================
--- trunk/fclient/fclient/impl/lib/fcp2/client.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/lib/fcp2/client.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -920,6 +920,7 @@
del initialRequest.params['Started']
initialRequest['RequestStatus'] |= consts.ConstRequestStatus.Restored
+ initialRequest['RequestStatus'] |= consts.ConstRequestStatus.Started
self.events.RequestStarted(initialRequest)
return True
Modified: trunk/fclient/fclient/impl/lib/fcp2/consts.py
===================================================================
--- trunk/fclient/fclient/impl/lib/fcp2/consts.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/lib/fcp2/consts.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -450,12 +450,13 @@
of the bitflags it picked up while running through the client.
"""
Null = 0x0
- Restored = 0x1
- Compressing = 0x2
- Compressed = 0x4
- Success = 0x8
- Error = 0x10
- Removed = 0x20
+ Started = 0x1
+ Restored = 0x2
+ Compressing = 0x4
+ Compressed = 0x8
+ Success = 0x10
+ Error = 0x20
+ Removed = 0x40
Completed =0x10000000
RemovedFromQueue = 0x2000000
Modified: trunk/fclient/fclient/impl/lib/fcp2/key.py
===================================================================
--- trunk/fclient/fclient/impl/lib/fcp2/key.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/lib/fcp2/key.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -351,7 +351,6 @@
edition = int(edition)
return clss(d['keyData'], docName=d['docName'], edition=edition, tail=d['tail'], pManifest=bool(d['pManifest']))
-
#****************************************************************************************************
#
#****************************************************************************************************
Modified: trunk/fclient/fclient/impl/lib/numbers.py
===================================================================
--- trunk/fclient/fclient/impl/lib/numbers.py 2008-08-03 08:21:56 UTC (rev 870)
+++ trunk/fclient/fclient/impl/lib/numbers.py 2008-08-03 19:18:54 UTC (rev 871)
@@ -8,7 +8,7 @@
#***************************************************************
class ByteSizeNames:
Binary = ('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB')
- Common = ('', 'Kb', 'Mb', 'Gb', 'Tb', 'Pb', 'Eb', 'Zb', 'Yb')
+ Common = ('B', 'Kb', 'Mb', 'Gb', 'Tb', 'Pb', 'Eb', 'Zb', 'Yb')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|