SF.net SVN: fclient:[773] trunk/fclient/src/fclient/impl

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

Revision: 773
          http://fclient.svn.sourceforge.net/fclient/?rev=773&view=rev
Author:   jUrner
Date:     2008-07-27 11:40:36 +0000 (Sun, 27 Jul 2008)

Log Message:
-----------
naming

Added Paths:
-----------
    trunk/fclient/src/fclient/impl/PrefsBrowserWidget.py
    trunk/fclient/src/fclient/impl/PrefsGlobal.py

Removed Paths:
-------------
    trunk/fclient/src/fclient/impl/tpls/Ui_PrefsBrowserWidgetTpl.py
    trunk/fclient/src/fclient/impl/tpls/Ui_PrefsGlobalWidgetTpl.py

Added: trunk/fclient/src/fclient/impl/PrefsBrowserWidget.py
===================================================================
--- trunk/fclient/src/fclient/impl/PrefsBrowserWidget.py	                        (rev 0)
+++ trunk/fclient/src/fclient/impl/PrefsBrowserWidget.py	2008-07-27 11:40:36 UTC (rev 773)
@@ -0,0 +1,113 @@
+ 
+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__)]
+	
+	
+from PyQt4 import QtCore, QtGui
+
+from . import config
+from .lib.qt4ex import dlgpreferences
+
+from .tpls.Ui_PrefsBrowserWidgetTpl import Ui_PrefsBrowserWidget
+#**********************************************************************************
+#
+#**********************************************************************************
+class PrefsBrowserWidget(QtGui.QWidget, Ui_PrefsBrowserWidget):
+	
+	IdEdHomePage = 'edHomePage'
+	IdCkOpenAddressBarInNewTab = 'ckOpenAddressBarInNewTab'
+	IdCkOpenBookmarksInNewTab = 'ckOpenBookmarksInNewTab'
+	IdCkOpenLinksInNewTab = 'ckOpenLinksInNewTab'
+	IdCkOpenHomePageOnNewTabCreated = 'ckOpenHomePageOnNewTabCreated'
+	IdCkBackIsClose = 'ckBackIsClose'
+	IdCkAutoLoadImages = 'ckAutoLoadImages'
+		
+	def __init__(self, parent):
+		QtGui.QWidget.__init__(self, parent)
+		self.setupUi(self)
+		
+		browser = config.ObjectRegistry.get(config.IdViewBrowserWidget, None)
+		self.setEnabled(browser is not None)
+		if browser is not None:
+			self.controlById(self.IdEdHomePage).setText(browser.fcSettings.value('HomePage'))
+			ck = self.controlById(self.IdCkOpenAddressBarInNewTab)
+			ck.setCheckState(QtCore.Qt.Checked if browser.fcSettings.value('OpenAddressBarInNewTab') else QtCore.Qt.Unchecked)
+			ck = self.controlById(self.IdCkOpenBookmarksInNewTab)
+			ck.setCheckState(QtCore.Qt.Checked if browser.fcSettings.value('OpenBookmarksInNewTab') else QtCore.Qt.Unchecked)
+			ck = self.controlById(self.IdCkOpenLinksInNewTab)
+			ck.setCheckState(QtCore.Qt.Checked if browser.fcSettings.value('OpenLinksInNewTab') else QtCore.Qt.Unchecked)
+			ck = self.controlById(self.IdCkOpenHomePageOnNewTabCreated)
+			ck.setCheckState(QtCore.Qt.Checked if browser.fcSettings.value('OpenHomePageOnNewTabCreated') else QtCore.Qt.Unchecked)
+			ck = self.controlById(self.IdCkBackIsClose)
+			ck.setCheckState(QtCore.Qt.Checked if browser.fcSettings.value('BackIsClose') else QtCore.Qt.Unchecked)
+			ck = self.controlById(self.IdCkAutoLoadImages)
+			ck.setCheckState(QtCore.Qt.Checked if browser.fcSettings.value('AutoLoadImages') else QtCore.Qt.Unchecked)
+	
+	def controlById(self, idControl):
+		return getattr(self, idControl)
+		
+	def apply(self):
+		browser = config.ObjectRegistry.get(config.IdViewBrowserWidget, None)
+		if browser is not None:
+			edHomePage = self.controlById(self.IdEdHomePage)
+						
+			browser.fcSettings.setValues(
+					HomePage=edHomePage.text(),
+					OpenAddressBarInNewTab=self.controlById(self.IdCkOpenAddressBarInNewTab).checkState() == QtCore.Qt.Checked,
+					OpenBookmarksInNewTab=self.controlById(self.IdCkOpenBookmarksInNewTab).checkState() == QtCore.Qt.Checked,
+					OpenLinksInNewTab=self.controlById(self.IdCkOpenLinksInNewTab).checkState() == QtCore.Qt.Checked,
+					OpenHomePageOnNewTabCreated=self.controlById(self.IdCkOpenHomePageOnNewTabCreated).checkState() == QtCore.Qt.Checked,
+					BackIsClose=self.controlById(self.IdCkBackIsClose).checkState() == QtCore.Qt.Checked,
+					AutoLoadImages=self.controlById(self.IdCkAutoLoadImages).checkState() == QtCore.Qt.Checked,
+					)
+			
+			
+#***********************************************************************
+#
+#***********************************************************************
+class PrefsPageBrowser(dlgpreferences.Page):
+	
+	UUID = '{c85e63a8-6806-435a-81ce-f4b46872246f}'
+	
+	def __init__(self):
+		dlgpreferences.Page.__init__(self, self.UUID)
+		self._widget = None
+		self.setDirty(True)
+		
+	def displayName(self):
+		return self.trUtf8('Browser')
+	
+	def canApply(self): return True
+	def canHelp(self): return True
+		
+	def setVisible(self, parent, flag):
+		createdNew = False
+		if flag and self._widget is None:
+			createdNew = True
+			self._widget = PrefsBrowserWidget(parent)
+		self._widget.setVisible(flag)
+		return (createdNew, self._widget)		
+	
+
+	def doApply(self):
+		self._widget.apply()
+		return True
+		
+	def doOk(self):
+		return True
+
+
+#***********************************************************************
+#
+#***********************************************************************
+if __name__ == '__main__':
+	from PyQt4 import QtGui
+	import sys
+	
+	app = QtGui.QApplication(sys.argv)
+	w = PrefsBrowserWidget(None)
+	w.show()
+	res = app.exec_()
+	sys.exit(res)
+ 

Added: trunk/fclient/src/fclient/impl/PrefsGlobal.py
===================================================================
--- trunk/fclient/src/fclient/impl/PrefsGlobal.py	                        (rev 0)
+++ trunk/fclient/src/fclient/impl/PrefsGlobal.py	2008-07-27 11:40:36 UTC (rev 773)
@@ -0,0 +1,62 @@
+
+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__)]
+	
+	
+from PyQt4 import QtGui
+
+from . import config
+from .lib.qt4ex import dlgpreferences
+
+from .tpls.Ui_PrefsGlobalWidgetTpl import Ui_PrefsGlobalWidget
+#**********************************************************************************
+#
+#**********************************************************************************
+class PrefsGlobalWidget(QtGui.QWidget, Ui_PrefsGlobalWidget):
+	
+	def __init__(self, parent):
+		QtGui.QWidget.__init__(self, parent)
+		self.setupUi(self)
+		
+#***********************************************************************
+#
+#***********************************************************************
+class PrefsPageGlobal(dlgpreferences.Page):
+	
+	UUID = '{ba654bd8-4c63-11dd-b8b1-a11c9b5c3981}'
+	
+	def __init__(self):
+		dlgpreferences.Page.__init__(self, self.UUID)
+		self._widget = None
+		self.setDirty(True)
+		
+	def displayName(self):
+		return self.trUtf8('Global')
+	
+	def canApply(self): return True
+	def canHelp(self): return True
+		
+	def setVisible(self, parent, flag):
+		createdNew = False
+		if flag and self._widget is None:
+			createdNew = True
+			self._widget = PrefsGlobalWidget(parent)
+		self._widget.setVisible(flag)
+		return (createdNew, self._widget)		
+	
+
+
+#***********************************************************************
+#
+#***********************************************************************
+if __name__ == '__main__':
+	from PyQt4 import QtGui
+	import sys
+	
+	app = QtGui.QApplication(sys.argv)
+	w = PrefsGlobalWidget(None)
+	w.show()
+	res = app.exec_()
+	sys.exit(res)
+ 

Deleted: trunk/fclient/src/fclient/impl/tpls/Ui_PrefsBrowserWidgetTpl.py
===================================================================
--- trunk/fclient/src/fclient/impl/tpls/Ui_PrefsBrowserWidgetTpl.py	2008-07-27 11:37:58 UTC (rev 772)
+++ trunk/fclient/src/fclient/impl/tpls/Ui_PrefsBrowserWidgetTpl.py	2008-07-27 11:40:36 UTC (rev 773)
@@ -1,96 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/tpls/PrefsBrowserWidgetTpl.ui'
-#
-# Created: Fri Jul 25 10:02:49 2008
-#      by: PyQt4 UI code generator 4.4.3-snapshot-20080705
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_PrefsBrowserWidget(object):
-    def setupUi(self, PrefsBrowserWidget):
-        PrefsBrowserWidget.setObjectName("PrefsBrowserWidget")
-        PrefsBrowserWidget.resize(532, 186)
-        self.gridLayout_3 = QtGui.QGridLayout(PrefsBrowserWidget)
-        self.gridLayout_3.setObjectName("gridLayout_3")
-        self.horizontalLayout_2 = QtGui.QHBoxLayout()
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.label = QtGui.QLabel(PrefsBrowserWidget)
-        self.label.setObjectName("label")
-        self.horizontalLayout_2.addWidget(self.label)
-        self.edHomePage = QtGui.QLineEdit(PrefsBrowserWidget)
-        self.edHomePage.setDragEnabled(True)
-        self.edHomePage.setObjectName("edHomePage")
-        self.horizontalLayout_2.addWidget(self.edHomePage)
-        self.gridLayout_3.addLayout(self.horizontalLayout_2, 0, 0, 1, 1)
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.groupBox = QtGui.QGroupBox(PrefsBrowserWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth())
-        self.groupBox.setSizePolicy(sizePolicy)
-        self.groupBox.setObjectName("groupBox")
-        self.gridLayout = QtGui.QGridLayout(self.groupBox)
-        self.gridLayout.setObjectName("gridLayout")
-        self.ckOpenLinksInNewTab = QtGui.QCheckBox(self.groupBox)
-        self.ckOpenLinksInNewTab.setObjectName("ckOpenLinksInNewTab")
-        self.gridLayout.addWidget(self.ckOpenLinksInNewTab, 0, 0, 1, 1)
-        self.ckOpenBookmarksInNewTab = QtGui.QCheckBox(self.groupBox)
-        self.ckOpenBookmarksInNewTab.setObjectName("ckOpenBookmarksInNewTab")
-        self.gridLayout.addWidget(self.ckOpenBookmarksInNewTab, 4, 0, 1, 1)
-        self.ckOpenAddressBarInNewTab = QtGui.QCheckBox(self.groupBox)
-        self.ckOpenAddressBarInNewTab.setObjectName("ckOpenAddressBarInNewTab")
-        self.gridLayout.addWidget(self.ckOpenAddressBarInNewTab, 1, 0, 1, 1)
-        self.horizontalLayout.addWidget(self.groupBox)
-        self.groupBox_2 = QtGui.QGroupBox(PrefsBrowserWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.groupBox_2.sizePolicy().hasHeightForWidth())
-        self.groupBox_2.setSizePolicy(sizePolicy)
-        self.groupBox_2.setObjectName("groupBox_2")
-        self.gridLayout_2 = QtGui.QGridLayout(self.groupBox_2)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.ckOpenHomePageOnNewTabCreated = QtGui.QCheckBox(self.groupBox_2)
-        self.ckOpenHomePageOnNewTabCreated.setObjectName("ckOpenHomePageOnNewTabCreated")
-        self.gridLayout_2.addWidget(self.ckOpenHomePageOnNewTabCreated, 0, 0, 1, 1)
-        self.ckBackIsClose = QtGui.QCheckBox(self.groupBox_2)
-        self.ckBackIsClose.setObjectName("ckBackIsClose")
-        self.gridLayout_2.addWidget(self.ckBackIsClose, 1, 0, 1, 1)
-        self.ckAutoLoadImages = QtGui.QCheckBox(self.groupBox_2)
-        self.ckAutoLoadImages.setObjectName("ckAutoLoadImages")
-        self.gridLayout_2.addWidget(self.ckAutoLoadImages, 2, 0, 1, 1)
-        self.horizontalLayout.addWidget(self.groupBox_2)
-        self.gridLayout_3.addLayout(self.horizontalLayout, 1, 0, 1, 1)
-        spacerItem = QtGui.QSpacerItem(20, 297, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.gridLayout_3.addItem(spacerItem, 2, 0, 1, 1)
-
-        self.retranslateUi(PrefsBrowserWidget)
-        QtCore.QMetaObject.connectSlotsByName(PrefsBrowserWidget)
-
-    def retranslateUi(self, PrefsBrowserWidget):
-        PrefsBrowserWidget.setWindowTitle(QtGui.QApplication.translate("PrefsBrowserWidget", "Form", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Homepage:", None, QtGui.QApplication.UnicodeUTF8))
-        self.groupBox.setTitle(QtGui.QApplication.translate("PrefsBrowserWidget", "Open in new tab", None, QtGui.QApplication.UnicodeUTF8))
-        self.ckOpenLinksInNewTab.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Links", None, QtGui.QApplication.UnicodeUTF8))
-        self.ckOpenBookmarksInNewTab.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Bookmarks", None, QtGui.QApplication.UnicodeUTF8))
-        self.ckOpenAddressBarInNewTab.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Address bar", None, QtGui.QApplication.UnicodeUTF8))
-        self.groupBox_2.setTitle(QtGui.QApplication.translate("PrefsBrowserWidget", "Others", None, QtGui.QApplication.UnicodeUTF8))
-        self.ckOpenHomePageOnNewTabCreated.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Open home page when a new tab is created", None, QtGui.QApplication.UnicodeUTF8))
-        self.ckBackIsClose.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Back is close", None, QtGui.QApplication.UnicodeUTF8))
-        self.ckAutoLoadImages.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Auto load images", None, QtGui.QApplication.UnicodeUTF8))
-
-
-if __name__ == "__main__":
-    import sys
-    app = QtGui.QApplication(sys.argv)
-    PrefsBrowserWidget = QtGui.QWidget()
-    ui = Ui_PrefsBrowserWidget()
-    ui.setupUi(PrefsBrowserWidget)
-    PrefsBrowserWidget.show()
-    sys.exit(app.exec_())
-

Deleted: trunk/fclient/src/fclient/impl/tpls/Ui_PrefsGlobalWidgetTpl.py
===================================================================
--- trunk/fclient/src/fclient/impl/tpls/Ui_PrefsGlobalWidgetTpl.py	2008-07-27 11:37:58 UTC (rev 772)
+++ trunk/fclient/src/fclient/impl/tpls/Ui_PrefsGlobalWidgetTpl.py	2008-07-27 11:40:36 UTC (rev 773)
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/tpls/PrefsGlobalWidgetTpl.ui'
-#
-# Created: Tue Jul  8 17:51:29 2008
-#      by: PyQt4 UI code generator 4.3.3
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_PrefsGlobalWidget(object):
-    def setupUi(self, PrefsGlobalWidget):
-        PrefsGlobalWidget.setObjectName("PrefsGlobalWidget")
-        PrefsGlobalWidget.resize(QtCore.QSize(QtCore.QRect(0,0,465,247).size()).expandedTo(PrefsGlobalWidget.minimumSizeHint()))
-
-        self.gridlayout = QtGui.QGridLayout(PrefsGlobalWidget)
-        self.gridlayout.setObjectName("gridlayout")
-
-        self.label = QtGui.QLabel(PrefsGlobalWidget)
-        self.label.setWordWrap(True)
-        self.label.setObjectName("label")
-        self.gridlayout.addWidget(self.label,0,0,1,1)
-
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-
-        self.ckStoreSettingsLocally = QtGui.QCheckBox(PrefsGlobalWidget)
-        self.ckStoreSettingsLocally.setObjectName("ckStoreSettingsLocally")
-        self.hboxlayout.addWidget(self.ckStoreSettingsLocally)
-
-        self.edStoreSettingsLocally = QtGui.QLineEdit(PrefsGlobalWidget)
-        self.edStoreSettingsLocally.setObjectName("edStoreSettingsLocally")
-        self.hboxlayout.addWidget(self.edStoreSettingsLocally)
-
-        self.btStoreSettingsLocally = QtGui.QPushButton(PrefsGlobalWidget)
-        self.btStoreSettingsLocally.setObjectName("btStoreSettingsLocally")
-        self.hboxlayout.addWidget(self.btStoreSettingsLocally)
-        self.gridlayout.addLayout(self.hboxlayout,1,0,1,1)
-
-        spacerItem = QtGui.QSpacerItem(20,40,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout.addItem(spacerItem,2,0,1,1)
-
-        self.retranslateUi(PrefsGlobalWidget)
-        QtCore.QMetaObject.connectSlotsByName(PrefsGlobalWidget)
-
-    def retranslateUi(self, PrefsGlobalWidget):
-        PrefsGlobalWidget.setWindowTitle(QtGui.QApplication.translate("PrefsGlobalWidget", "Form", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("PrefsGlobalWidget", "Specify directory to store settings to. If unchecked, settings are stored in an os dependend location.", None, QtGui.QApplication.UnicodeUTF8))
-        self.btStoreSettingsLocally.setText(QtGui.QApplication.translate("PrefsGlobalWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-
-
-
-if __name__ == "__main__":
-    import sys
-    app = QtGui.QApplication(sys.argv)
-    PrefsGlobalWidget = QtGui.QWidget()
-    ui = Ui_PrefsGlobalWidget()
-    ui.setupUi(PrefsGlobalWidget)
-    PrefsGlobalWidget.show()
-    sys.exit(app.exec_())


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