1.1 --- a/examples/Common/QtConfigurator/__init__.py Tue Nov 08 18:34:07 2005 +0000
1.2 +++ b/examples/Common/QtConfigurator/__init__.py Tue Nov 08 18:35:25 2005 +0000
1.3 @@ -13,12 +13,12 @@
1.4 }
1.5
1.6 widget_resources = {
1.7 - "hard-disk" : ("config_hard_disk.ui", "hard_disk"),
1.8 - "memory-unit" : ("config_memory_unit.ui", "memory_unit"),
1.9 - "storage-unit" : ("config_storage_unit.ui", "storage_unit")
1.10 - #"hard-disks" : ("config_hard_disks.ui", "hard_disks"),
1.11 - #"memory-units" : ("config_memory_units.ui", "memory_units"),
1.12 - #"storage-units" : ("config_storage_units.ui", "storage_units")
1.13 + "hard_disk" : ("config_hard_disk.ui", "hard_disk"),
1.14 + "memory_unit" : ("config_memory_unit.ui", "memory_unit"),
1.15 + "storage_unit" : ("config_storage_unit.ui", "storage_unit")
1.16 + #"hard_disks" : ("config_hard_disks.ui", "hard_disks"),
1.17 + #"memory_units" : ("config_memory_units.ui", "memory_units"),
1.18 + #"storage_units" : ("config_storage_units.ui", "storage_units")
1.19 }
1.20
1.21 document_resources = {
1.22 @@ -102,12 +102,12 @@
1.23 self.request_refresh(current_text)
1.24
1.25 def addHardDisk(self):
1.26 - #hard_disks = self.prepare_widget("configuration", "hard-disks")
1.27 + #hard_disks = self.prepare_widget("configuration", "hard_disks")
1.28 #tab_pages = hard_disks.child("tab pages")
1.29 #tab = tab_pages.child("tab")
1.30 #self.child("hard_disks").addTab(tab, hard_disks.tabLabel(tab))
1.31 #self.factory.connect(tab, self)
1.32 - hard_disk = self.prepare_widget("configuration", "hard-disk", self.child("hard_disks"))
1.33 + hard_disk = self.prepare_widget("configuration", "hard_disk", self.child("hard_disks"))
1.34 self.child("hard_disks").layout().add(hard_disk)
1.35 hard_disk.show()
1.36 self.factory.connect(hard_disk, self)
1.37 @@ -118,12 +118,12 @@
1.38 self.request_refresh()
1.39
1.40 def addMemoryUnit(self):
1.41 - #memory_units = self.prepare_widget("configuration", "memory-units")
1.42 + #memory_units = self.prepare_widget("configuration", "memory_units")
1.43 #tab_pages = memory_units.child("tab pages")
1.44 #tab = tab_pages.child("tab")
1.45 #self.child("memory_units").addTab(tab, memory_units.tabLabel(tab))
1.46 #self.factory.connect(tab, self)
1.47 - memory_unit = self.prepare_widget("configuration", "memory-unit", self.child("memory_units"))
1.48 + memory_unit = self.prepare_widget("configuration", "memory_unit", self.child("memory_units"))
1.49 self.child("memory_units").layout().add(memory_unit)
1.50 memory_unit.show()
1.51 self.factory.connect(memory_unit, self)
1.52 @@ -134,12 +134,12 @@
1.53 self.request_refresh()
1.54
1.55 def addStorageUnit(self):
1.56 - #storage_units = self.prepare_widget("configuration", "storage-units")
1.57 + #storage_units = self.prepare_widget("configuration", "storage_units")
1.58 #tab_pages = storage_units.child("tab pages")
1.59 #tab = tab_pages.child("tab")
1.60 #self.child("storage_units").addTab(tab, storage_units.tabLabel(tab))
1.61 #self.factory.connect(tab, self)
1.62 - storage_unit = self.prepare_widget("configuration", "storage-unit", self.child("storage_units"))
1.63 + storage_unit = self.prepare_widget("configuration", "storage_unit", self.child("storage_units"))
1.64 self.child("storage_units").layout().add(storage_unit)
1.65 storage_unit.show()
1.66 self.factory.connect(storage_unit, self)
1.67 @@ -198,11 +198,27 @@
1.68
1.69 else:
1.70 import XSLForms.Resources.PyQtWebResources
1.71 +
1.72 + # NOTE: To be enabled for in-page updates, when eventually supported.
1.73 + #from WebStack.Resources.ResourceMap import MapResource
1.74 + #from WebStack.Resources.Static import DirectoryResource
1.75 +
1.76 class Configurator(ConfiguratorResource, XSLForms.Resources.PyQtWebResources.XSLFormsResource):
1.77 def __init__(self, *args, **kw):
1.78 XSLForms.Resources.PyQtWebResources.XSLFormsResource.__init__(self, "configuration")
1.79 ConfiguratorResource.__init__(self, *args, **kw)
1.80 +
1.81 resource = Configurator(*args, **kw)
1.82 +
1.83 + # NOTE: To be enabled for in-page updates, when eventually supported.
1.84 + #configurator_resource = Configurator(*args, **kw)
1.85 + #directory = configurator_resource.resource_dir
1.86 + #resource = MapResource({
1.87 + # "styles" : DirectoryResource(os.path.join(directory, "styles"), {"css" : "text/css"}),
1.88 + # "scripts" : DirectoryResource(os.path.join(directory, "scripts"), {"js" : "text/javascript"}),
1.89 + # None : configurator_resource
1.90 + # })
1.91 +
1.92 # Do not initialise or populate the resource here: both happen when a
1.93 # Web request is received (initialisation when no form document is
1.94 # found; population when a form document is prepared for output).