From 1831cb9e34bb93035dbb585ee6db2eacd31d9d6c Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Tue, 16 Jul 2013 13:40:06 -0300 Subject: [PATCH 1/5] Draft: Split main preferences page into 2 --- src/Mod/Arch/InitGui.py | 1 + src/Mod/Draft/Draft_rc.py | 737 ++++++----- src/Mod/Draft/InitGui.py | 1 + src/Mod/Draft/Resources/Draft.qrc | 1 + src/Mod/Draft/Resources/ui/userprefs-base.ui | 1148 ++++------------- .../Draft/Resources/ui/userprefs-visual.ui | 905 +++++++++++++ 6 files changed, 1540 insertions(+), 1253 deletions(-) create mode 100644 src/Mod/Draft/Resources/ui/userprefs-visual.ui diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 7d7fd9f5e..51bb05d36 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -112,6 +112,7 @@ class ArchWorkbench(Workbench): if hasattr(FreeCADGui,"draftToolBar"): if not hasattr(FreeCADGui.draftToolBar,"loadedPreferences"): FreeCADGui.addPreferencePage(":/ui/userprefs-base.ui","Draft") + FreeCADGui.addPreferencePage(":/ui/userprefs-visual.ui","Draft") FreeCADGui.addPreferencePage(":/ui/userprefs-import.ui","Draft") FreeCADGui.draftToolBar.loadedPreferences = True Log ('Loading Arch module... done\n') diff --git a/src/Mod/Draft/Draft_rc.py b/src/Mod/Draft/Draft_rc.py index 7375cb072..827db0187 100644 --- a/src/Mod/Draft/Draft_rc.py +++ b/src/Mod/Draft/Draft_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Sat Jul 6 16:32:11 2013 +# Created: Tue Jul 16 13:38:17 2013 # by: The Resource Compiler for PyQt (Qt v4.8.4) # # WARNING! All changes made in this file will be lost! @@ -41485,6 +41485,189 @@ qt_resource_data = "\ \x00\x6c\x00\x6b\x00\x79\x08\x00\x00\x00\x00\x06\x00\x00\x00\x11\ \x64\x72\x61\x66\x74\x20\x43\x6f\x6d\x6d\x61\x6e\x64\x20\x42\x61\ \x72\x07\x00\x00\x00\x05\x64\x72\x61\x66\x74\x01\ +\x00\x00\x0b\x48\ +\x00\ +\x00\x6a\x70\x78\x9c\xed\x5d\x5b\x6f\xdb\xb8\x12\x7e\xcf\xaf\x20\ +\xfc\x50\xec\x01\x7a\xe2\x4b\x2e\x4e\x5a\xc7\x8b\x5e\x93\x02\x2d\ +\xb6\x5b\x67\xbb\x8f\x0b\x5a\xa2\x6d\x9e\x4a\xa2\x4b\x52\x71\xbc\ +\x38\x3f\x7e\x87\x17\x59\x17\xcb\xb2\x65\xd9\x56\x9b\x75\x81\x22\ +\x12\x49\x0d\x47\xc3\x99\x8f\x33\x43\x52\xee\xfd\xfa\xe8\x7b\xe8\ +\x81\x70\x41\x59\x70\xd3\x68\x9f\xb6\x1a\x88\x04\x0e\x73\x69\x30\ +\xbe\x69\xfc\x71\xff\xfe\xbf\x57\x8d\x5f\xfb\x27\xbd\x90\xc6\x8d\ +\xce\xa1\x51\xff\x04\xf5\x1c\x0f\x0b\xd1\xbf\x0d\xe9\x8b\x17\x6f\ +\x29\xf6\xd8\x18\xfe\x7a\xe3\x01\x91\x12\x1e\x16\x6f\x39\x1e\xc9\ +\x5e\xd3\x34\x82\xd6\x33\xea\x8e\x89\x44\xfa\xfe\xa6\xf1\xfb\x9f\ +\xfa\xb6\x81\x02\xec\x93\x9b\x46\x21\x11\xd5\x19\xea\x4d\x39\x9b\ +\x12\x2e\xe7\xf6\x89\x31\x61\x3e\x91\x7c\xae\x2b\x51\x8f\x13\x47\ +\xea\x2b\xd4\x7b\xec\xb7\x7a\xcd\x47\x7b\x33\x57\x37\x73\x7b\x03\ +\x2c\xc8\x49\xbf\xdb\xbe\xea\x35\xcd\xa5\x29\x9e\x10\x3a\x9e\xc8\ +\xfe\x55\x0b\xca\xed\xb5\xa6\xd9\x8c\x88\xf6\x9a\x51\xe7\x79\x9c\ +\xcc\x68\xe0\xb2\xd9\x3d\x95\x1e\xb1\xcc\x08\xc9\x81\xf9\xfe\x2d\ +\x09\x08\xc7\x1e\x12\xf6\x65\x7a\x4d\x5b\xb1\x4c\xd2\xc3\x73\x16\ +\xc6\xc2\xf9\xfa\x9a\x3d\x7e\xd4\x45\x96\x62\xa6\x4b\x31\xc5\x0e\ +\x10\x6a\xd8\x17\x08\x42\x7f\x48\x78\xff\xb2\xd7\xb4\x57\x86\xfd\ +\x64\x0f\x4b\x24\x7c\xcc\xc7\x34\xc8\x50\xb8\x2e\xa4\x40\x25\xf1\ +\x63\x49\x26\x07\xf3\x96\xb3\x70\x0a\x3c\x47\xc3\x39\x8e\xee\x4d\ +\xf3\xa5\xce\x65\x2c\xac\x84\xbc\xbe\x52\x11\x82\xb8\x06\x39\xe2\ +\x5a\xe6\xa6\x50\x68\xb6\x1b\xd0\x58\x49\x1d\xec\x99\xd2\xbf\x3a\ +\x71\x8f\xf1\xab\xe4\x10\xba\x5b\x22\x34\x61\x9c\xfe\xcd\x02\x99\ +\x43\x2a\x4b\x6c\x59\x38\x1f\xf1\x90\x78\x11\x25\x4f\xdd\xa4\x1e\ +\xcf\x91\x0e\x79\x94\xa9\x06\x0b\x09\xbd\x25\x23\x1c\x7a\x12\x79\ +\x34\x20\xc8\x61\x1e\xe3\x19\x21\xe5\x4b\xca\x14\x1a\xb6\x12\x7c\ +\x37\xd3\x8c\x2f\xbd\x87\xd2\x32\xc2\x97\x44\x30\xd0\xc5\x85\x6f\ +\x00\x6d\x09\x34\x95\x00\x17\x99\x17\x21\xa0\x5f\xfd\xdf\xe5\x8b\ +\x17\x77\x0b\x7a\xbd\xa6\x2e\x5c\xf7\x02\xcb\x46\x40\xff\x26\x77\ +\x34\x80\x41\x12\xd2\x05\x1b\xbb\x69\xb4\xb2\x52\x83\x16\xa9\x92\ +\x08\x02\xce\x5b\x29\x04\x58\xd4\x5a\xeb\xef\xb4\x52\x40\x10\xb3\ +\x95\x25\xb8\x42\xd2\x46\x70\x25\x24\x9d\xd6\x18\x0d\x86\x9f\x39\ +\x19\xbd\x51\x23\xfc\x3a\x94\x12\xc4\x18\x59\x96\xaa\x9b\x42\x9d\ +\x1e\xfd\xa1\xa9\x2b\x54\x26\xc6\xbc\x7b\x3a\xcd\xd7\x27\x39\x21\ +\xc8\xb5\x3a\xa5\x09\xa2\x11\xfc\x0f\xc8\x0c\xb1\xe1\xff\x00\xfc\ +\xb2\x36\x58\x62\x74\x34\xb9\x4c\xaf\xba\x2c\x23\x72\x4e\x5c\x05\ +\xd1\xea\x4f\xba\x62\xcc\x09\x09\x54\x95\xb9\x48\x57\x0e\xbd\x90\ +\xa8\x3a\xfd\x37\x3d\x46\x4b\x9d\x6c\xc6\xaf\x92\xe9\xbb\x40\x4d\ +\x28\x2b\xd5\xc9\xb1\xb2\xb0\x86\xe7\x6c\x2b\x1a\xd5\xd5\x67\x2c\ +\x27\xeb\x7b\xfa\xc4\xdc\x66\x34\x8f\xee\xca\xce\x7b\x4d\x03\x77\ +\x0b\x2c\x4c\x55\x57\x46\xc6\x6e\x35\x64\x3c\xdb\x05\x32\x6a\xd3\ +\xae\x0d\x19\xd7\xa0\xfb\x11\x1b\x77\x82\x8d\x83\x29\x0d\x92\x1e\ +\x47\x84\x8b\x02\xca\x87\xb1\xe7\x91\x2b\x9d\x8d\x31\x51\x69\x93\ +\x96\xc5\xee\x70\xf1\x01\x03\x64\x65\x7a\xb6\x3e\x57\x27\xe5\x7d\ +\x95\xa2\x5a\x02\xbd\x16\xef\x74\x44\xb0\x7c\x04\x3b\xab\x86\x60\ +\xe7\x5b\x22\xd8\x20\xc0\x53\x24\xe6\xfe\x90\x79\xa2\x66\xdf\x6e\ +\xcd\x3b\x1c\x11\xec\x90\xde\xdd\xba\x60\xa1\xbc\x7f\x27\x12\x9a\ +\x76\x74\xf0\x92\xec\x5b\x59\x28\x01\x1d\x9d\xbc\x02\x88\x3c\xdf\ +\x1c\x22\x63\x75\x9f\x10\xe7\x5b\xde\x8c\xed\xa8\x8a\x4a\x53\xb6\ +\xa6\x80\xe4\x84\x0a\x44\x47\x08\x38\x44\x33\x1c\x48\x24\x19\x0a\ +\x05\x41\xca\x08\xf4\x68\x36\x13\xd3\x39\x67\xbe\xae\x50\x74\x87\ +\x98\x23\x2c\x22\x43\xd9\xde\x22\x0a\xb0\x1d\x3f\x00\x0f\x21\xe7\ +\x80\x9b\xd6\x10\x71\xe0\x26\xdc\x0b\xec\x70\x26\x04\x12\x44\xa8\ +\x14\x5b\x05\xab\x2c\xa3\xe5\xc0\x14\x0b\xc8\x23\x2d\xa1\x78\xff\ +\x2e\x35\x6f\x97\x48\xf3\x6c\xae\xe7\x7f\xb5\xdb\xdb\xab\x3a\xe8\ +\xb7\xa6\x43\xdc\xe7\x08\x23\xcb\x02\x0d\x5c\xea\x60\x95\x34\x33\ +\xca\x6e\x15\x6d\xc6\xf8\x37\x55\x36\xf5\x30\x04\x45\x89\x59\x1b\ +\xe1\xe9\x94\x60\x0e\x2a\x1f\x2a\xa2\xc8\xe5\x78\xa6\xfe\x2a\x36\ +\x74\x83\x0a\x0a\x58\x60\x04\x13\x36\x43\x7f\x5a\x9e\x3e\x6b\x9e\ +\x24\xc7\xf0\x2a\x9b\x3b\x3a\x95\xd4\x1d\xba\xd7\xbd\xde\x47\x9d\ +\x1e\x95\x3e\x4f\xe9\xaf\xf6\xa2\xf3\x97\xdb\xab\xfc\x87\x91\x85\ +\x76\x11\xab\xbe\x0d\xc3\xc0\x00\x3c\xcf\x6a\xb3\x82\xf0\x11\xdc\ +\x12\x37\x01\xe6\xa7\xe8\x37\xb0\x08\x3e\xa3\x82\x3c\x57\xb6\x31\ +\xcf\x3e\x31\xa3\xc0\x25\x07\x26\xf6\xa1\xf1\xef\x55\x5f\x11\xab\ +\xc3\x79\xf5\x19\xa6\x84\xba\x2b\x51\xf8\xcc\x25\x47\x35\x5f\x81\ +\xed\xed\x6a\x61\xde\x3a\x10\x5f\x9b\xa9\x82\x1e\x01\x98\x25\x41\ +\x62\x42\xc8\xe6\x3a\xb1\xf3\x58\x6f\xcd\x8b\x1c\x83\xbd\x9d\x04\ +\x7b\x00\x05\xe4\xcd\x84\x31\x41\xf8\x12\x48\x82\xa9\x12\xc7\xd4\ +\xad\x09\xf6\x7c\x1a\x50\x3f\xf4\x07\xc0\xfb\xa6\xf2\x39\x6b\x15\ +\x0b\xa8\x92\x7c\xca\x01\xf9\x7d\x22\x1a\x5d\x68\xbf\x75\xd2\x67\ +\x13\x12\x20\x87\x13\xe3\xc5\x60\x9d\x6b\x8b\xdc\x92\x72\x06\x52\ +\x05\x34\x23\xae\x8e\xa0\x99\x0b\x9a\x15\x11\x73\xdb\xdc\xfe\x2b\ +\x4f\x12\x1e\x28\x65\x19\x7c\xbd\x45\x20\x5c\x75\x2b\x90\xc7\x1c\ +\x0d\x4b\x35\x42\x67\xeb\x08\x9d\xab\x85\x7d\x68\xe8\x2c\x56\xaf\ +\x9f\x1b\x3a\xef\x08\x27\x3a\xb1\xe1\xe0\x00\x89\x29\x71\xe8\x68\ +\x0e\x28\xe9\x52\xb5\x45\x85\xf1\x39\x72\x94\x12\xc1\x2b\x02\x5c\ +\x2a\x23\x51\x72\x11\xc9\xc2\x67\x9e\x7c\x39\x35\x96\xf3\x6c\x2c\ +\x5f\x2a\x1c\x86\x0a\x1d\xeb\x81\x5f\x8c\xa5\x26\x3c\x24\x08\xbb\ +\x2e\x38\xd0\x00\xca\x2a\x90\x14\x12\x07\x2e\xe6\x2e\xd2\x30\x85\ +\xa0\x99\x33\x41\x96\xca\x61\x72\x14\xb6\x33\xa5\x02\x47\x4c\x5e\ +\xe1\xc8\x96\x08\xd8\xf2\x60\xb9\xbb\x25\x2a\xdf\xa5\xb4\x01\x71\ +\x22\x98\x17\xd6\x8c\xc7\xc7\x95\xd7\x02\x61\x1f\x68\xe5\x75\x9d\ +\x0b\x8b\x1f\x15\x0e\xe7\xaf\x80\x5e\xb4\x2b\xac\x81\x16\xac\xac\ +\xb6\x3b\x57\x07\x59\x5b\xd5\x36\x61\x1d\x94\x2f\x09\x83\x78\x8a\ +\xc8\x95\xae\x4c\xd1\x4a\xb4\xdb\x62\xd3\x60\x3c\x91\x6f\xb6\x6d\ +\xf0\x96\x53\x77\xe7\x7b\x05\x63\x67\xa2\x3a\x40\x97\xd8\x12\x53\ +\x22\xa3\x56\x61\x59\xf0\x43\x2a\x89\x3c\x06\xf9\xa5\xd2\x62\x3a\ +\x16\xb3\xc1\xd7\x3e\xd2\x62\x7f\x40\xbc\x37\x5e\x1e\xb4\x12\xb4\ +\x2d\xf7\x19\xf2\x43\x78\xe7\xfe\x08\x7b\x02\x7c\x05\x7d\xbd\x4f\ +\x53\x37\x2f\xf0\x14\x0d\x7b\x07\x1a\x7f\xb1\x9f\x75\x93\xe2\x70\ +\x8b\x04\x78\xe8\xed\x41\x29\x36\x36\x25\xe5\x32\x1b\x4f\x39\x61\ +\x52\xde\x0c\xcf\x85\xf2\xac\x1f\xa8\xa0\xc0\x9f\xb1\xae\xb8\xa9\ +\x5a\xa4\x19\x92\x00\x5c\x29\x2a\x10\x76\x24\x7d\x20\x89\xa4\x35\ +\x62\x81\x37\x37\x8f\x84\xc2\x64\x46\x1c\xe6\xfb\xe0\x96\xef\xc3\ +\x30\x5f\x19\x66\xd5\x4a\x89\xe6\xb0\x9a\x91\x96\x30\x26\x23\x25\ +\xb5\x40\x74\x7b\x34\xab\xd5\x66\xd5\xaa\xe6\xe9\xa7\xcc\xf2\x80\ +\xf6\xb3\x52\xdf\xd4\x60\x23\x7b\x96\xa1\xbe\xa8\xa1\x38\x00\x3a\ +\x06\x0d\x3b\x09\x1a\xde\xb2\x10\x94\x6b\x55\xe8\xe0\xea\xda\x28\ +\x80\x28\x4e\xe4\xd4\x02\xf3\x2a\x75\x6d\x15\x15\xb0\x5c\xce\x08\ +\x00\x32\xc1\x00\xda\x1a\xe9\xd5\x3e\x8e\xed\x71\xd2\x25\x0e\xf5\ +\x81\xf3\xfc\xd0\xe5\x7c\xfb\xc0\x25\x3f\xd4\x32\xb2\xee\x5f\xc3\ +\xbf\xd3\xeb\xab\xeb\xc5\xbf\xee\x15\xc4\x5e\xb6\x72\x27\xb1\x97\ +\xa5\xd5\x3e\x6d\xa5\xff\x6d\xdf\x4b\x49\xf7\x6c\x10\x21\xcb\x71\ +\x3a\xc9\x9d\x4e\x2a\x6e\x74\x6d\x17\xaf\xe9\x1f\x7e\x3a\xf9\x84\ +\x69\xa0\x6d\x51\x20\x02\xe1\xdc\xbc\xbe\x29\xe5\xea\x38\xa5\xac\ +\x96\xf5\xa1\xf2\x50\xc5\x9b\x98\x6b\x99\x46\x94\x86\x1a\x05\xd5\ +\xc1\x01\x44\x05\x2a\xcc\x56\xe1\x00\x55\x5b\x92\x4e\xd1\xc0\xa6\ +\xf6\x27\x2a\xdf\xaf\xdc\x70\x70\xf5\xe7\x48\x7c\x0f\x31\x27\x62\ +\x31\xf3\xf8\x11\x99\xd3\xbd\x9c\x43\x68\xb7\x0e\x92\x2c\x53\x10\ +\xfd\xce\xd8\xe9\x53\x04\xe8\xfd\xe5\xc7\x16\x99\x9f\xcd\xf2\x63\ +\xf7\x00\x98\x42\xef\x37\x75\xa9\x4f\x82\xbc\x0d\xa6\x95\xf3\x65\ +\xbb\xcb\x96\x5d\x56\x9b\x94\xd6\xec\x33\xdb\x60\x57\xce\xa3\x44\ +\x06\xdd\xea\x9b\x3e\x8a\x5f\xe2\x38\x7d\x1c\x3c\x22\xd9\x68\x49\ +\xa3\xcc\xd2\xf2\x65\xb1\x8c\xda\x97\xdd\x6e\xb7\xd3\xbe\x38\xdc\ +\x02\x73\xa4\xff\xa6\x3f\x7d\x4c\x44\xae\xc7\x8d\x12\xbd\x17\x44\ +\x08\xad\xd3\x4e\x0d\x11\x82\x7a\xbd\xc8\xd0\x9f\xe2\xfc\x53\x1d\ +\x8a\xaf\xab\x41\x71\x71\xb6\x69\x43\x28\x1e\x01\x43\xf5\x01\x71\ +\x71\x26\xe2\x08\xc4\x3b\x01\xe2\x8f\xe0\xc9\xbe\x73\xa9\x5c\xc2\ +\x60\xe5\xe2\x12\x55\xb1\x35\xaa\xdd\xdb\x7d\xe3\xc9\x73\x70\x4a\ +\xa3\xf4\xb3\x1a\xe4\x30\xb8\xe1\x26\x11\x9f\x07\x77\xa7\x27\x1f\ +\xe2\x9d\x31\x89\x27\x45\xe8\x4c\xd4\xee\xf1\x67\xdf\x43\x26\x5f\ +\xbe\xe2\x14\x7b\xe6\x52\xad\xa7\x45\x1d\x09\x39\xf7\xb2\x4d\x05\ +\x0e\x44\xd4\xd2\x96\x10\x4e\x47\xe6\xf2\x04\xf8\x31\x57\x3e\x0b\ +\x58\xd4\x4c\x31\x89\x46\xd8\xa7\xde\x3c\xaf\xdf\xe7\x77\xc4\x7b\ +\x20\xca\x15\x7b\x1e\x13\x37\x0f\x69\x56\x67\x54\x1d\x2f\x32\xcc\ +\x9c\xe4\x3c\xff\xe2\x35\xf3\x5c\x73\xbf\x97\x25\x05\xd5\xc7\xf6\ +\x84\xb1\x47\xc7\x01\x8c\xc6\x12\x75\x30\x72\x65\x5f\xaf\x54\xfd\ +\x17\xa5\xc3\xff\x5f\xdc\xde\x73\x4c\x41\x75\xc6\x71\xc9\xd7\x37\ +\x40\x41\x1f\x33\x21\xb2\x3c\x0f\x25\xe7\x14\x83\x58\xc7\x19\x25\ +\x37\xe5\x54\xe2\xe0\x60\xce\x94\xb2\xed\x84\xb2\xb0\x67\xf4\x0c\ +\xfb\xd3\x97\xe8\x23\xc1\x2e\x80\x3e\xe6\x1c\x22\x6c\x6d\x19\xfb\ +\x9c\x62\x56\x1e\xff\xf5\x87\x2c\x77\xbd\x53\x55\xac\x3b\x0f\x59\ +\x42\x29\x01\xce\xcc\x61\xdf\x1f\x55\x2b\x97\x44\xb6\xc9\xe0\xc6\ +\xa3\xcb\x24\xba\xc8\x1b\xbf\x55\x9d\x35\xb3\xbd\x55\xee\xbe\x5b\ +\x6f\xf7\xd7\xf5\x75\xff\x86\x72\x07\x26\xb9\x1a\xe5\x6f\x39\xa8\ +\x71\x08\x2c\x07\x35\x8e\xc2\x00\xa0\x65\x52\xe7\x20\x18\x06\x6a\ +\x1c\x03\xc3\x40\x8d\x43\xf0\x1a\x3b\xdf\x44\xdd\xc3\x10\x33\x51\ +\xe3\x50\xc4\x4c\x54\x1a\x8e\xda\x5d\x95\x8a\x89\xc8\x76\xf1\xf2\ +\xc3\x6a\x6f\xe5\xab\x4d\xac\x26\xc2\x10\x13\x0a\x27\xc2\xcd\x1f\ +\xd1\x5d\x59\xf7\xe9\xae\x4d\xe3\xb4\xe4\x39\x75\x36\x32\xa1\x5b\ +\x24\x09\x1b\xa4\xd9\x2d\x54\x4c\x90\xa4\x90\x30\x27\x28\xca\x4a\ +\x9f\xa2\x28\x8b\x00\x54\x3d\x32\x92\xcf\xe1\x21\x6a\x36\x59\x29\ +\x8a\x1f\x06\xbf\x2d\x4e\x37\x54\x58\x44\x29\xe7\x85\xa5\x06\xf0\ +\x29\xba\x62\x1f\x41\xd0\xe8\x97\xa4\x6c\xff\x53\x1f\x0e\x7d\x59\ +\x95\xc3\xff\x59\x10\xa8\x53\x71\x7d\xbe\xb3\x2d\x02\x45\xa6\x33\ +\x98\xe0\x29\x19\xe8\x32\xf4\x5e\xe5\x3e\xcc\x31\x9c\xba\x92\x71\ +\xd7\x85\xaf\x73\x4c\xc6\x1d\xf2\xb0\xdd\x13\x3e\x6a\x37\x20\xf0\ +\x96\x32\x4a\xf7\x8d\xca\xa8\x7c\x95\xf9\x41\x19\xd8\xd3\x3d\xe6\ +\x56\x7e\x31\x3c\x85\x05\xd1\xb4\x9e\xfe\xf4\xf0\x26\x10\x10\x5b\ +\x7f\xe4\x57\xa5\x6c\x7f\x79\xe1\xbb\x84\xc5\xa7\xd5\xd9\x6a\x72\ +\x67\x49\x91\x23\x1d\x3e\x5f\x52\xe2\x94\xfe\x66\x59\x49\xd9\x74\ +\x2c\xa4\x84\x24\x13\x62\xb4\xd3\xcb\x22\xf5\x6c\x76\xbe\xdd\x34\ +\x2e\x1b\xc8\x7c\xe8\xfb\xa6\xd1\x6e\x37\x9a\xaa\xe5\x94\x3e\xfa\ +\x78\x3a\x0a\x03\x47\x09\xaa\xff\xfd\xb3\xbe\x7f\xcf\x99\xff\x09\ +\x7c\xa9\x01\x0b\xb9\x03\x4a\x98\x69\xa5\xbe\xf6\x1e\x0a\xc9\x7c\ +\xd3\xa3\xd0\x9c\x24\x4b\x0c\x97\x89\x2f\xc2\x27\x80\x24\xfe\x08\ +\xbc\x1a\x8f\x47\x49\x02\x57\xf4\xed\x07\xe0\x61\x34\x6c\xc1\x89\ +\x11\x95\xca\xcc\x29\x0a\x4d\x45\xc0\x7c\x11\xfe\x74\xa2\x04\xa7\ +\x2b\xb4\x00\xb2\xfd\x16\x33\x92\xf8\xcc\x5e\x3e\x23\x9f\x43\x31\ +\x89\xea\x57\x31\x63\x98\x15\xd5\x38\xc9\xe0\x6b\x2e\x37\xcb\xb2\ +\x5b\xc5\x92\xa2\xb6\x33\xb6\xec\x32\x78\xbe\x80\x16\x95\x07\x61\ +\x65\xdd\x78\x2d\x0f\xea\x61\xd8\xb2\xc7\x53\xf2\x45\x14\xd7\x1e\ +\x48\x46\x26\x18\x5b\xc1\xcc\xa2\xf6\x20\xcc\x44\xeb\x77\xf9\xcc\ +\xc4\xb5\x07\x61\x26\xb5\xab\x23\x9f\xa3\x4c\x93\xea\x6c\xa5\x0b\ +\xf4\x8f\x5d\xa8\xd3\xd0\x0a\x48\x85\x86\x5c\x87\x05\x01\xd1\x40\ +\x6a\x81\x73\x71\x6f\x7a\x15\xc0\x00\xd0\xce\x39\xe3\xa7\x96\xac\ +\x02\x37\x9a\x04\x04\x1d\x07\xd8\xeb\x3b\x9e\xda\x2d\xe8\xfe\xa2\ +\x36\x28\xaa\x00\xcb\x94\xea\x16\x9c\x38\x84\x3e\x24\x69\x65\xb6\ +\xd6\xeb\x1f\xb5\x30\x4d\x0c\x49\x8f\xc9\x3e\xcc\x6b\xef\xcc\x76\ +\xc8\x05\x4d\x55\x6c\x24\x02\x93\x9f\xb0\x33\x92\xba\x46\x72\x3e\ +\x55\xf3\xa2\x7e\xbd\xd4\xaa\x4c\xef\xb1\x7f\xdd\x59\xfc\xf2\x86\ +\xfa\xe9\x8d\xb3\xee\x75\xfc\xe3\x1b\x4d\xf5\xf4\x32\x21\x97\x08\ +\x49\x03\x3d\x69\x67\xa9\x9d\xb7\xbb\x69\x72\x57\xed\x3c\x72\xe6\ +\x52\xd8\xa1\x49\x89\xf6\xa0\x92\x5e\xec\x3b\xdd\xaf\x8c\x95\x4c\ +\x53\x32\x3e\xab\x22\xe3\x8b\x6e\x3b\x43\xee\xfc\x07\x94\x71\x74\ +\x7e\x69\xbf\x92\xbd\xb8\x4a\x8b\xe2\xf2\xa2\x8a\x64\xcf\x2e\xce\ +\x7f\x02\xed\x8d\xb6\xf2\xef\x57\xb2\x67\x67\x19\xc9\x76\x2b\xe9\ +\xac\x62\xf7\x87\x97\x6c\xde\xf9\xd5\x3d\x23\x43\x16\x7d\x2b\xe9\ +\x6f\xa7\x73\xb9\x09\xd0\xac\x96\x72\xf2\x16\xea\x7b\xcd\x90\xf6\ +\x4f\xfe\x01\x73\x97\x6e\x70\ \x00\x00\x09\xb5\ \x00\ \x00\x4b\x27\x78\x9c\xed\x5c\x5b\x73\xdb\xb6\x12\x7e\xf7\xaf\xc0\ @@ -41643,276 +41826,168 @@ qt_resource_data = "\ \x29\xcc\x8c\x7b\xd7\x67\x66\xb2\xc1\x7c\x9a\x4a\x32\x65\x74\x40\ \x19\x6d\xf1\x44\x1c\xdb\x22\x23\xbc\x6e\xd6\x13\xde\xda\xfb\x3f\ \x76\xfc\xff\x17\ -\x00\x00\x10\xc0\ +\x00\x00\x09\xfb\ \x00\ -\x00\xae\x67\x78\x9c\xed\x1d\x6b\x6f\xdb\x38\xf2\x7b\x7e\x05\x91\ -\x0f\xbd\x1e\xd0\x8d\x63\xe7\xdd\x75\x7c\x68\xd3\x27\xd0\xee\xa6\ -\x75\xda\xde\xde\x97\x05\x2d\xd1\x36\xaf\xb2\xe4\x25\xe9\x24\x5e\ -\xdc\x8f\xbf\x19\x92\xb2\x1e\x91\xe5\xc8\xb2\x2c\xbb\x75\x51\x20\ -\x16\x49\x91\xc3\xe1\xbc\x38\x33\xa4\xda\xff\xba\x1f\x79\xe4\x96\ -\x09\xc9\x03\xff\x72\xbf\x79\x70\xb8\x4f\x98\xef\x04\x2e\xf7\x07\ -\x97\xfb\x5f\x6e\xde\xfc\x72\xbe\xff\xaf\xce\x5e\x7b\xc2\xa3\x46\ -\xc7\xd0\xa8\xb3\x47\xda\x8e\x47\xa5\xec\xbc\x9d\xf0\xe7\xcf\x5f\ -\x71\xea\x05\x03\xf8\xeb\x0d\xba\x4c\x29\x78\x59\xbe\x12\xb4\xaf\ -\xda\x0d\xd3\x08\x5a\xdf\x71\x77\xc0\x14\xd1\xcf\x97\xfb\x9f\xbe\ -\xe9\xc7\x7d\xe2\xd3\x11\xbb\xdc\xcf\xed\x04\x07\x23\xed\xb1\x08\ -\xc6\x4c\xa8\xa9\x7d\x63\xc0\x82\x11\x53\x62\xaa\x2b\x49\x5b\x30\ -\x47\xe9\x5f\xa4\x7d\xdf\x39\x6c\x37\xee\xed\xc3\x14\x1f\xa6\xf6\ -\x01\x40\x50\xc3\xce\x59\xf3\xbc\xdd\x30\x3f\x4d\xf1\x90\xf1\xc1\ -\x50\x75\xce\x0f\xa1\xdc\xfe\xd6\x7d\x36\xc2\x4e\xdb\x8d\x70\xf0\ -\x2c\x48\xee\xb8\xef\x06\x77\x37\x5c\x79\xcc\x02\x23\x95\x00\xe0\ -\x3b\x6f\x99\xcf\x04\xf5\x88\xb4\x93\x69\x37\x6c\xc5\xc3\x2e\x3d\ -\x3a\x0d\x26\x11\x72\xbe\xbe\x0c\xee\x3f\xe8\x22\xdb\x63\x6a\x48\ -\x39\xa6\x0e\x74\xb4\x6f\x27\xe0\x4f\x46\x3d\x26\x3a\xa7\xed\x86\ -\xfd\x65\xc0\x8f\x8f\xf0\xa0\x8b\x11\x15\x03\xee\xa7\x7a\xb8\xc8\ -\xed\x81\x2b\x36\x8a\x30\x19\x5f\xcc\xb7\x22\x98\x8c\x01\xe6\x70\ -\x39\x07\xe1\xb3\x69\xfe\x60\x70\x15\x21\x2b\x03\x5f\x7a\xd1\x49\ -\x37\x03\x6b\x0f\x81\xca\xc5\x9d\x1d\x0d\x08\x57\x71\x87\x7a\xa6\ -\xf4\xcf\x56\x34\x70\x34\xa3\x8c\x8e\xde\x3d\xe8\x68\x18\x08\xfe\ -\x77\xe0\xab\x59\x57\xcd\x8b\x59\x5f\xe9\xde\x1e\x20\x49\x93\xf8\ -\xb5\x60\xfd\xab\x21\x73\xbe\xc7\x91\x85\x15\x63\xa8\x70\xb0\xa2\ -\x17\xdc\xff\xd9\x6c\xc5\xba\xcd\xc0\x5e\x10\x78\x37\x7c\x9c\x68\ -\x33\x43\xe2\xfb\x3e\x51\x43\x2e\x09\xfc\xd7\xfd\x31\xf7\x19\x14\ -\x30\x8b\xd4\xbb\x40\x7c\xef\x01\x7f\x0f\xe1\x97\xff\x0f\x45\xe8\ -\x78\xcc\xa8\x38\x20\x5f\x24\xeb\x4f\x80\x52\xb9\xef\x30\x42\x3d\ -\x8f\x04\xfd\xd8\x5b\x38\xa0\x24\x54\x60\x95\x0c\x08\xf7\x75\xdd\ -\x0b\xa1\xbb\xb1\x1d\x1e\xa4\xd6\x29\x7b\xb1\xb2\xe7\xc3\xee\x55\ -\xf6\x64\xde\x71\xf7\x01\xe4\xcb\x8f\x83\x38\x7e\xed\xa3\xcc\x20\ -\x52\xb9\xc0\x95\x97\xfb\x87\xa9\x71\x1d\xdb\xf7\x10\x06\xd6\xe3\ -\x7e\x8b\x86\x75\xca\x8c\x7b\x4d\xd5\x70\xf1\xb0\x1f\x03\xb7\x11\ -\xca\xcd\x47\x8e\xa6\x45\x19\x90\x59\x8c\x0e\x1b\x49\x42\x5c\x40\ -\x97\x9f\x3e\xd0\x1e\xf3\x42\x62\xf4\xf0\x21\x49\xd7\x45\x16\xcc\ -\xac\x15\xf7\x15\x13\x7d\x0a\xa4\x34\x0a\x5c\xb6\xfc\x82\x51\x8f\ -\x0f\xfc\x11\xf3\x1f\x0c\x06\xd3\xfd\xa4\x9e\x3f\x7f\x81\xf5\x9f\ -\x51\x60\xff\x6f\xf6\x78\x23\x28\xf7\x60\xb4\xa8\xe4\xeb\x15\x43\ -\x78\x00\x8c\x38\x96\xaa\x42\x67\xc4\xe6\xc1\xa8\x17\x64\xb2\x39\ -\x56\x20\x9b\x1f\x2f\xcf\xe5\x37\x96\xc5\x91\x0f\xbf\xbc\xd7\x68\ -\x46\xb6\xbc\x1b\x72\xe0\xc9\x88\x71\xa1\x7c\xe2\x31\x72\xc7\x81\ -\xa3\x91\x81\x9e\x93\x1b\xe8\xb5\x47\x85\x79\x43\x97\x8f\x3d\x6a\ -\x79\xde\xbc\x13\x6a\x2b\xec\x8f\xc2\xd3\x98\x0a\xaa\x98\x96\x01\ -\xf0\xe2\x33\x1c\x03\xba\x54\x54\x7e\x4f\xf6\x33\x91\x4c\x8f\xfc\ -\x46\x30\x76\xf5\xe2\x15\xb9\x81\x16\xb7\x9c\xdd\x11\x39\x95\x80\ -\x31\xd2\x0f\x84\x1e\x85\x2b\x89\x6d\x85\xa1\x12\xea\x28\xb0\x29\ -\xd6\xc2\xd3\x5f\xf8\x47\x4d\x8d\x9b\xc9\xc7\x0f\xe8\xea\x31\x6c\ -\x17\xd1\x83\x59\x9d\x2c\x3c\xce\x1b\xae\x91\x1e\xaf\x1c\x00\x76\ -\xb5\xcb\x40\xb0\x90\xf7\xda\x0d\xa3\xa2\x67\xfa\x3b\x51\x5d\x5a\ -\x9b\xb7\x1e\xaf\xcc\xb3\x84\xe6\x02\xa5\x3d\x5f\x66\xb2\x3e\x9d\ -\x78\xd0\x75\xe0\x05\x99\x2b\x58\xb9\xa0\x82\x71\x5f\x4e\x94\x0a\ -\xfc\x0c\x59\x05\x75\x3d\x53\xb7\xb4\xb0\x42\xa9\xe0\xc6\x27\xa9\ -\x65\x81\x0f\xa2\x21\xe8\xfd\x17\x4c\xec\xb4\x89\x97\x47\x33\xa9\ -\x71\x75\x77\x69\x26\xc4\xb2\x14\x95\x0a\xe6\xe2\x46\x00\xff\x24\ -\x2b\x06\x20\xad\x7c\xac\x32\x3f\x92\x95\x3d\x6f\xc2\xb0\x4e\xff\ -\x4d\x12\xf4\x83\x41\x56\x2e\xae\x2c\x39\x6c\xa6\xb4\xaa\xc4\xea\ -\x58\xa0\x0f\xe7\x32\x50\xd7\xa7\xe3\x4d\xe7\x9e\x45\xd2\xa1\x38\ -\xff\x48\x9c\xb5\x9c\x82\x2d\xe1\xed\x18\x28\x01\xbe\xc5\x05\x22\ -\xe8\xe7\x63\xa2\x65\x2d\xf7\xab\xc0\x87\x5f\x13\x6d\x8e\x6d\x3c\ -\x33\x1d\xad\xc6\x72\x7e\xc8\x54\x56\x21\x91\x1e\x83\xb6\xc4\x15\ -\xf4\xce\xb7\x06\x2f\x47\xac\xc4\x50\x84\x86\x6f\x89\x3d\x6f\x11\ -\xbe\x3b\x3e\x9e\xcf\x78\xcd\xd6\x49\x0e\xeb\xb5\x4e\x4e\x6a\xd3\ -\x5e\x11\xae\x7e\x3e\x26\x5c\x40\x9f\x0b\x4d\x41\xd8\xc0\x32\xed\ -\xa1\xac\x81\x07\xbb\x63\xee\x67\x6d\x5b\x25\x94\xf7\x22\x97\x5e\ -\xf6\xcc\x1e\xab\xc6\x66\x13\x5c\x9d\x29\x78\x4b\x81\xce\x53\x23\ -\x5b\x67\x66\x2b\xe1\xd6\x2c\xd4\x6b\x01\x92\x8f\x2d\xda\x96\x92\ -\x7a\xc5\xfb\xab\xa3\x92\xfb\xab\xc3\x52\xaa\x8d\x72\x2d\xb4\x6b\ -\xd1\x6a\x8b\x3c\x41\x27\x65\xf4\x19\x23\xb3\x09\xa2\xd2\x82\x39\ -\xf2\x3e\x67\x82\x7c\x67\xd3\xb5\xf8\x55\x60\x40\x27\x04\x60\x53\ -\x49\xbf\x9c\x73\x43\x0e\x39\x0e\x56\x97\x6f\xc5\x51\xc2\xab\x6f\ -\x74\xea\x95\x9a\xfa\x12\x6c\x84\xd1\x2d\xa0\xdf\xb4\x14\xe9\xea\ -\xe2\x05\xbc\x02\xad\x19\x34\x46\xb3\x23\x45\x3d\x0c\x54\x80\xf6\ -\x1a\xbf\x9b\xf5\xd8\x6e\xe8\xc2\xc2\xa4\x2a\xf9\xdf\xec\x1d\xf7\ -\xd5\x7c\x52\xc5\x16\x29\x74\x9a\x88\xe3\xf1\x61\x22\xf6\x38\xab\ -\xb5\x71\xc7\xd6\x61\x22\x04\x19\x81\x95\xee\x70\x8e\xc8\x32\xa8\ -\x5b\xa9\x2d\xd3\x6a\x96\xd9\x96\x6f\xaa\xc4\x3d\x2d\x27\x71\xa5\ -\x9d\xdb\x0a\x24\xad\x33\x11\x02\x48\xf6\xbd\xef\xb2\xfb\x6c\xf3\ -\xa5\xb9\x16\xf3\x05\x66\x83\xb3\xda\x49\x70\x53\xba\x93\xe0\x51\ -\xc1\x8a\x25\x78\x3e\xef\xed\x24\xf8\xca\x25\xf8\xb2\x91\x89\x17\ -\x9e\xda\x58\x01\x7e\x56\x4e\x80\x53\x33\xb5\xb5\xc8\xef\xf5\x6c\ -\x3f\x61\x36\x9a\xd1\x77\xe2\x7b\x27\xbe\x37\x29\xaa\xda\x8c\x53\ -\xd1\x32\xb9\x28\xe5\xb6\xfd\xd6\x5d\xab\x33\xd2\xf4\x2b\x35\x48\ -\xb3\x0f\xdc\x67\xaf\x5d\xae\x1e\x48\x33\x74\x19\x31\xa8\x28\x13\ -\x1d\xca\x72\x68\x47\xb3\xd5\xfe\xb5\x84\xe3\x3a\x4c\x9c\xac\x22\ -\x5f\x2b\x8e\xf2\xb5\xf8\x1e\xe2\x33\xd3\x93\x36\x2b\xbc\x99\x32\ -\xb0\x6e\x4e\x3c\x7e\x3c\x23\x3e\x3e\x59\x71\x79\xc2\xd5\x3d\xd8\ -\x64\xc5\x3e\x01\x08\xc9\x1d\xf5\x31\xd9\x70\x96\x4a\xa4\x03\x07\ -\x8d\x98\xaf\x58\x04\x23\x5d\x61\x93\x91\x08\x95\x21\xc9\x57\x41\ -\xcd\x5d\x7a\x0b\x30\x18\xf5\x6e\x63\x44\xd4\x77\x63\xbe\x6b\xea\ -\x88\x40\x4a\x22\x99\xc4\xc4\xe8\x12\xbe\xeb\x22\x51\x4d\x00\x2a\ -\xf0\xd9\x3d\xdf\x58\x55\x5f\x37\x99\x9f\x55\x41\xe6\x65\x5c\xb4\ -\x59\x29\xb9\x4e\x30\x9e\xc6\x92\xe7\x7a\x0c\x8c\xd0\xb1\x0a\x29\ -\x0a\xac\xdc\x11\x90\xda\x33\x12\x00\xb5\x8b\x3b\x2e\x59\x58\x24\ -\x4d\x7b\xea\xdd\xd1\x29\x50\x9e\xa2\x02\xd3\x2d\x89\x1f\xfc\x32\ -\xeb\xb1\x0a\x56\x78\xeb\x05\x3d\xea\x91\x15\x8c\x61\x31\x90\x1a\ -\xa6\x07\xf8\xeb\x80\x20\x87\x8e\xf5\xcf\x6a\x75\xc6\x78\x3a\xda\ -\xe0\x4c\xc0\xba\xf9\xa7\x79\x5e\x09\x03\x95\x88\xd9\xff\x16\x88\ -\x11\xf5\xbc\xe9\x33\x02\x88\x64\x42\x93\x21\x86\x3a\x6c\xcc\xf0\ -\x99\x55\x16\x63\xce\x24\x41\xe0\x24\xf3\xa0\x9c\xb9\x07\x24\x64\ -\xbd\x60\xac\x6d\x9f\x74\x52\x7c\x8f\x02\x67\x85\x31\xff\x90\x11\ -\xc3\xb7\x81\xaf\xa4\x62\xd4\xad\x24\xb3\xbd\xab\x07\x49\x02\x90\ -\x98\xdc\x7a\x94\x89\x86\xe2\x25\x00\xf1\x7b\x18\x7e\xdd\xf1\x44\ -\x16\x4f\x9c\x54\xc2\x12\xe7\xab\xd5\x29\xda\x84\x8a\x6b\x07\x74\ -\x52\x83\x39\x05\xc6\x82\x54\x31\x7e\xb1\x19\x2d\x98\xdd\x02\xa5\ -\x9a\x49\xfc\x40\xc5\xde\xef\x19\x07\xf7\x58\xbf\xe3\x7b\x53\x78\ -\x81\xf9\x04\x40\x07\x3b\x07\x8a\xae\x6e\x3e\x7f\xa8\x84\x29\x5e\ -\x24\xe1\x0e\xc1\x7d\xea\x72\x49\x7b\x5e\xe4\x75\x47\x87\xcd\x3f\ -\xb7\x59\x05\x99\x05\xea\x6e\xb0\xbb\x7d\xe5\x4e\xdf\xfc\x1d\xee\ -\xce\xe9\xbb\x6a\xa7\x6f\xb3\xa4\x83\x54\x50\x97\x4f\xe4\x2c\xd3\ -\x54\xcb\x02\xe0\x49\x39\x66\x0e\x07\x4b\x70\x1c\x00\x22\xe5\x01\ -\x9e\xd2\xc3\xe2\x43\x93\xc7\x13\x10\x60\x55\x45\xf1\x10\xd9\x53\ -\xee\xf7\xb9\x0f\x70\x97\x60\xd4\x05\xb1\x45\x41\xfd\x41\x1d\xee\ -\x9c\x05\x19\x52\x0b\x48\x5d\x4e\xfa\x7d\x9e\xf6\x14\xdb\x39\x8c\ -\xef\xd7\xa3\xf6\x01\x7b\x9f\x0d\xf2\xb6\x54\xfa\x54\x7d\x12\xa4\ -\x80\xcf\xb2\x80\xbe\x2f\x71\xe0\x2b\x4b\xdf\xcf\xf8\x52\x2b\x6d\ -\x50\xe1\x24\x70\x9c\x89\x20\x74\x40\xd1\x74\x8d\x19\xb6\x6a\x08\ -\x6a\x53\xa0\x53\x85\x9a\xb3\x9b\xdc\x77\xb9\x43\xd1\xc8\x35\x91\ -\x09\x3c\xef\xc9\x60\x56\x25\x7c\x18\x8b\x12\x01\xe8\x3d\x1f\x4d\ -\x46\x95\x68\xed\x3e\xf5\xe4\x3a\xd4\x36\xcc\xe1\x67\xd2\xd9\x3b\ -\x8d\x3d\x1f\xd3\x55\x84\x69\xf3\x77\xc8\xcc\x47\x1b\x78\xf5\xf4\ -\x9f\x2b\x76\x3e\x1a\xae\x4d\x4b\x09\x54\xf9\x3d\xa6\xe3\x0a\xdc\ -\x65\x02\xc4\x48\xdc\x4e\xa8\x42\x86\xcc\x01\x64\x03\xb5\x7f\x7e\ -\x76\x43\x55\xab\x68\xc5\x6b\x76\x00\xfa\xe2\xe2\x62\xf9\x10\x74\ -\x5e\x5e\xf5\xf1\x7a\x22\xdb\x46\xec\xbe\x36\x0b\xbe\xa5\xb2\xb7\ -\x6a\x8b\xa5\x59\x89\xc5\x52\x62\x13\x01\x16\x4b\xc2\xd7\xd6\x35\ -\xbb\x7a\x13\xb8\x99\xb9\x19\x86\x81\x3e\x61\xc3\x7c\x76\x0b\x6c\ -\x8d\x1e\x08\x0c\xfe\x54\x29\x49\xba\x30\x64\x78\xc5\x48\x0c\xa4\ -\x6d\x76\x27\x20\x16\x71\x2e\x2f\xe9\x8f\x7b\xcc\xa6\x00\xd1\x2e\ -\x7b\x04\x2e\x76\xdb\x88\x8c\x13\xab\xf1\xcb\x4e\x64\x89\xa8\x47\ -\xc1\xab\x47\xb6\x7d\x31\xab\x8e\x50\x14\x38\xa9\x5f\xe4\xda\x9d\ -\x05\x99\xce\x79\xd2\x8e\xc7\xa4\x1d\x25\x16\x04\xbb\xcb\xd2\xae\ -\x93\x61\x14\x4a\xc6\x9b\x38\xb0\x6c\xec\x51\x9f\x91\x98\x21\x6d\ -\xaf\xe3\x91\xc4\x9d\x60\xa7\xa1\x87\x96\x20\x18\xba\x41\x35\xdb\ -\x33\x14\x88\xdf\x2c\x4c\xd7\x1a\x26\x25\x28\x4c\xa5\x84\x4c\x2c\ -\x28\xbc\xf4\xa8\x37\xe1\xa0\x3b\xa2\xcf\x22\xfa\x6a\xa2\x72\x25\ -\xf2\xe0\xb3\x5c\x12\x89\x58\x9a\xa1\x66\x4c\xd2\xe8\xc3\x23\x6c\ -\x12\xa2\x74\x8d\x03\xf2\x7b\x18\xd9\xd6\xd6\xc1\x34\xfd\xc6\x1d\ -\x07\x28\x45\x91\x74\xad\x02\x14\xff\x06\xc7\x9a\x1d\xf5\x9d\x96\ -\xcf\x21\x29\x40\xee\x88\x8a\x5d\xf4\x79\x3e\x99\x17\xb8\x51\x2d\ -\xd3\xed\x5d\xf6\x16\x96\x84\x70\xde\xc8\xcc\xe7\xfc\x19\x16\x20\ -\x45\x4b\xf6\xdf\xae\x37\x95\x16\xcb\xe5\xcd\xfe\x16\x64\x2f\xe0\ -\x7a\xb2\x76\xff\xfd\x07\x79\x7a\x13\x8c\x33\xa3\x1f\x6b\x82\xe0\ -\x3f\xe4\xe9\x1b\x01\xbc\x55\x23\x0c\x7f\x00\x0c\x5d\x30\x68\x4b\ -\x81\x50\xb7\x48\x6a\x56\x93\x51\x56\xee\x92\xc7\x98\xb5\x39\x10\ -\xdc\x4d\xe8\x4f\x1d\xae\xb7\xc6\x63\x15\xfa\xf3\x0b\x6c\xd1\x71\ -\xd0\xad\x76\xe6\x9b\x09\x6c\xa6\xe0\x5b\x79\xf4\x3d\xdf\x8f\xb3\ -\xf3\xe5\x97\xf1\xe5\x17\xd9\x61\xe6\x9f\x65\xa8\xc5\xc5\x9f\xf6\ -\xd3\x19\x07\x48\x4c\xa6\x98\xa4\x9c\x1e\x23\xb7\x5c\x72\x4c\xc3\ -\xd1\xe2\x25\xeb\x4e\x59\xd8\x09\xe0\x7d\x8e\xb7\x2c\x66\xde\xc7\ -\x12\x88\x26\x3a\x7b\x88\x86\xa9\xac\x55\x66\x10\xc1\x9e\x72\x2d\ -\xd6\xbc\x4d\xe4\x81\xe1\xde\xfe\x58\xe2\xe4\x11\x96\x76\x7e\x46\ -\x74\x65\xb4\x3c\x3f\x47\x19\x49\xd6\xde\x8c\x5d\x83\xe1\xfe\x2a\ -\x98\xc0\x84\xe7\x45\x87\x5c\x5d\x1b\xc6\x88\x36\x30\xd2\xa7\x4f\ -\xb5\x1b\xe4\x01\xaf\xab\x3b\x06\x0c\xcb\x28\x30\xb5\x96\x04\x78\ -\xe6\x61\x79\x86\x72\x99\xc3\x47\x00\x79\x76\x14\xa9\x44\x10\x29\ -\x3b\xea\x65\x70\x8d\x51\xaf\x8b\x83\x8b\xf3\x8b\xd9\xbf\xb3\xf3\ -\x56\xbb\x61\x2b\x0b\x0f\x95\x15\x06\xb3\x7d\x35\x0f\x0e\x93\xff\ -\x96\x1f\xa5\xa0\xfd\xd2\x0d\xa9\xfd\x67\x92\x3b\xf5\x04\x58\xf3\ -\x42\xd3\xdc\xd7\x0c\x22\x09\x06\xb1\x1e\x7f\xb0\x6e\x7d\x31\xe9\ -\xfc\xc4\xa3\x9a\x32\x0b\xb8\x6f\x90\x16\xc6\x02\xcd\x6d\x7b\x6a\ -\xc8\xd1\x0b\x7c\x40\xba\x98\x69\xd8\x9f\x12\xb0\x23\x18\x41\x17\ -\x35\xd8\x0c\x53\x22\xff\x9a\x50\xc1\xe4\x4c\x44\x8d\xc2\x6e\x4a\ -\x24\x24\xe7\x44\xb8\x9b\x87\x6b\x89\x70\x23\x2f\xbf\x36\xb4\xb3\ -\xa5\x9c\x5c\xf5\x16\xbc\xe4\xdd\x61\x0b\x32\xed\xe7\xf2\xf6\x7b\ -\xbc\xa3\xdc\xc7\x7c\x57\x01\xd4\x88\xa7\xfc\x88\x07\x4c\x9e\x79\ -\x1a\xbc\x66\x1e\xcf\xb7\x29\xac\xa6\xec\xc2\x8e\xe8\xb1\xbb\xae\ -\xd3\xfc\x5d\x57\xf3\xf4\xec\xec\xac\xd5\x3c\x29\xb3\xf7\x2a\x6e\ -\xa2\x44\xf9\x3f\xa1\x51\x81\xc7\xdf\x78\xb8\x4c\x4e\x10\x08\x97\ -\xfb\x54\x31\x19\x8b\x9a\x91\xa7\x98\x9e\xc4\xee\x0f\xc8\x11\xb9\ -\x24\x87\xa0\xae\x9b\x25\xb2\x92\x73\xc4\xc5\xe9\x5a\xa4\xc5\x8c\ -\x16\xb7\x56\x5a\x14\x75\x5f\xe4\xeb\xaf\x9d\xfb\x62\xe5\x87\x07\ -\x96\x95\x97\xaf\xf8\x88\xf9\xfa\x30\xf4\x16\x48\xcc\xfc\x0d\x6c\ -\x6e\x46\xdd\x79\x35\xf9\x74\x6b\x11\x1f\x2e\x1f\x5d\x6f\xbd\x04\ -\xa9\xda\xde\x28\x70\xe0\x2f\x8b\x81\x16\xe4\xcd\xcd\xe5\x9f\x9b\ -\xc0\x03\xa5\xe5\x3b\x95\x46\x1e\xf3\x65\x6d\x3e\xeb\xef\x64\xed\ -\x4a\x5c\xc5\x05\x9c\x45\x3f\x81\x59\x17\x5d\x60\xa3\x85\x23\xa6\ -\xda\xb9\x98\x97\xd1\x9f\xf8\x8e\x31\xe0\xd4\x90\x2a\x9d\x19\x4a\ -\x89\x0a\x59\xe4\x60\xef\x2b\xb6\xb6\xe7\x5b\x5c\xde\xef\xc3\x4e\ -\x11\xca\x71\x73\xe8\xc1\x7e\x51\x27\xa7\x98\x0e\xc3\x2d\xa6\x12\ -\x4c\x1f\x7a\xa1\x92\x48\x00\xac\xc4\x9e\x31\xe7\x14\x57\x63\x19\ -\x82\xf7\x07\x40\x0e\x8a\xa5\x51\x64\xfd\x48\x60\xb2\x36\x57\xe4\ -\x61\xca\xf1\x63\xc1\x28\x27\xeb\xf7\x63\xa9\x48\xe4\xed\x74\x51\ -\x96\x2e\x3a\x2d\xa7\x8a\x16\x64\x78\x2d\x4c\x88\xc1\x16\xc4\xc8\ -\x82\x0d\xf7\xaa\xe7\x07\xd4\x7f\x04\x51\x19\xae\x89\x19\x4f\x1f\ -\xba\xc1\xe5\x91\xfa\x5e\x22\x77\x66\x7b\xaf\x76\x6f\x3b\x93\x0e\ -\xad\x1a\xbc\xdc\x38\xbd\x90\xf8\xb6\x54\x3c\x14\x35\xc0\xf2\x1d\ -\x39\x3b\x03\x6c\xd5\x9b\xdd\x05\x37\x3b\x3d\x4e\x40\xf6\x01\xdf\ -\x9b\x78\xb3\xe0\xf2\x39\x46\x59\xf7\x0a\xe2\x2c\xf5\xbb\xb3\xaf\ -\x39\xda\x0f\xc4\x66\x08\xa1\x83\xbd\xf7\x00\x2f\xf5\xd1\xee\xa2\ -\xb1\x37\xe5\xc4\x19\xa2\x01\xf6\xe4\xaf\x49\xa0\x7e\x7d\x21\x38\ -\xf5\xcc\x4f\x4c\x65\x0a\x07\x92\x6a\xea\xa5\x9b\x4a\xea\xcb\xb0\ -\xa5\x2d\x61\x82\xf7\xcd\xcf\x3d\x80\xc7\xfc\x1a\x05\x7e\x10\x36\ -\x43\x20\x49\x9f\x8e\xb8\x37\xcd\x1a\xf7\xd9\x3b\xe6\xdd\x32\xfc\ -\x36\xf0\xb3\xa8\x73\xf3\x92\x06\x55\x1b\x96\xd4\x00\xb3\x97\xf1\ -\xfe\xf3\x97\x81\xe7\x9a\xe7\x4a\x92\x19\x70\x8c\xad\xfa\x7a\x6a\ -\x59\x49\x6f\xb8\x68\x4b\xe5\x7c\xd5\x2e\x89\x02\x27\xfc\x32\x7d\ -\x7a\xcb\xde\xe3\x1f\xc9\xb9\xd1\xd8\xc3\x4f\xc1\xca\x21\x63\x95\ -\x0a\xbb\x7c\xfd\xb8\x60\x22\x3b\x05\xb9\x12\x0f\xc5\x1b\xee\xb1\ -\xab\x61\x10\x80\x8c\x7d\xa0\x5c\xfa\x50\xe7\x98\xba\x45\x46\x37\ -\xf7\x8b\x1a\xdd\x47\x87\xf9\x08\x2a\x85\x9f\xe2\x01\x27\x37\x4d\ -\xfd\xf6\x7e\x52\x9d\xd1\xe6\xa0\x3f\xc1\x24\xb5\xe1\x37\xac\xc2\ -\xf3\x5a\xc5\x18\xa4\x9c\xd0\x34\x50\xed\x84\x66\xb6\xd0\x6c\x55\ -\x74\x52\xb0\xc4\x65\x86\xdf\x4c\xf6\x64\xea\xe0\x54\x94\x4e\x89\ -\x2f\xdb\xa4\x08\x4d\x5e\x8c\x5c\xe3\x25\x9f\x63\xc1\x47\x1c\x73\ -\x2b\x65\x78\x2f\x21\x06\x41\xcd\x2b\xb3\x7b\x10\x35\x51\xd2\x5b\ -\xd0\xe1\x98\xd1\x51\xc9\x1d\x6d\x98\xfb\xad\x01\xba\x9e\x01\xb4\ -\x9e\xaf\x77\x4b\x86\xc3\xc6\x47\xdd\x91\x7c\xa6\x9d\x50\xe0\x9a\ -\xe7\x0c\x3b\xa1\x7c\xe0\xef\x09\x1d\x8d\x7f\x25\x1f\x80\x42\x41\ -\x87\x53\x21\x82\x3b\x63\x41\x6f\xe2\x61\xaa\x95\x1d\xa5\xe2\x23\ -\xf3\x29\xde\x4d\xa5\xca\x72\xc7\x78\x5e\x05\x8a\x9c\xd4\x77\x8a\ -\x08\x87\x3f\xab\x77\xf8\x8b\xfa\x86\xbf\xe2\xc2\x81\xcd\x70\x8d\ -\xf8\xb7\x10\xd4\xb8\x04\x16\x82\x1a\x57\xa1\x0b\xa2\x65\x58\xe7\ -\x22\x18\x00\x6a\x5c\x03\x03\x40\x8d\x4b\xf0\x92\x3a\xdf\x65\xdd\ -\xcb\x10\x01\x51\xe3\x52\x44\x40\x94\x5a\x8e\xda\x4d\x95\x92\xa1\ -\xad\x66\x7e\x5e\xd8\x7c\x6b\xe5\x2b\xb4\xe2\x0e\xf5\x62\xee\x4a\ -\xe3\xc6\x8d\x39\x0f\x36\xd1\x5c\x59\xd5\x87\xcf\xe3\x77\x8e\x04\ -\x7d\xe3\xe2\x0d\x31\x61\x9d\xb9\xf6\x90\x17\xec\xf1\xe3\x48\xa2\ -\x82\x91\x5b\x8b\xbc\x03\x12\x7a\x86\xa0\x57\x8f\xf5\x15\xee\x3f\ -\xb8\x39\x06\x86\x3d\xbe\xef\xfe\x8e\x1f\x28\xf0\x5d\x2a\xca\xdc\ -\xa1\x5e\xcc\x0a\x4b\x2c\xe0\x8f\x68\x8a\x7d\x00\x44\x93\xa7\x71\ -\xdc\xd6\x78\xbc\xfb\xf3\xbc\xa8\xf0\x96\x48\xa0\x92\xe2\x67\xd9\ -\xcf\xbc\xbf\xf0\x74\xba\x32\x6c\xed\xbb\x5f\xdf\xc2\x6e\x5a\xe1\ -\x23\xf0\x50\xe0\x54\x2e\x79\x16\xb8\x56\xf3\xcf\xa7\xee\x5c\xab\ -\x6b\x75\xad\x2e\xc8\xe8\xdf\x6a\xd7\xea\x3b\x3c\xd5\x83\xd7\xfd\ -\x61\x84\x50\xda\xa3\x3e\x14\x54\x8d\x60\x8e\x0a\xc4\x14\xef\x16\ -\x55\xf6\x8b\xe6\xc8\x24\x88\x17\x19\x2f\x7c\xe2\xa9\x5f\xc7\x86\ -\x73\x9e\x0c\xd4\xaf\xe8\xa7\xc5\xeb\xc6\xa3\x6c\xb1\x30\xf4\xe8\ -\xba\xcc\x45\xa7\x2d\xaa\xa4\x50\x64\x5a\xbf\x19\x34\x03\x75\x65\ -\x7b\x59\x8f\x1b\xcb\x0e\x86\x24\xb0\xa9\xfa\xa9\x6e\xab\xb0\x55\ -\xf2\xac\x4f\x6b\x59\xab\x30\x34\x67\xba\x43\x3a\x66\x5d\x5d\x46\ -\xde\x60\xdc\xda\xac\x56\x5d\x42\x39\xff\x3a\xc3\x9d\x4c\x5e\xa7\ -\x4c\xfe\x81\x25\xb2\xfd\x22\x91\x4d\xd5\xe8\x17\x21\xf9\x32\x02\ -\x11\x19\xec\xc7\x95\x86\xc9\xca\x44\x5f\x51\xbb\x58\xa3\x58\x0b\ -\x2b\x39\x67\x19\x31\xe6\xa8\xf7\xe5\xfe\xe9\x3e\x19\x51\x31\xe0\ -\xfe\xe5\x7e\xb3\xb9\x8f\xc9\xc6\xed\x31\xbf\x1f\xd1\x71\x98\x2d\ -\xdd\xf9\xeb\x5a\x3f\xbf\x11\xc1\xe8\x23\x6c\xdd\xba\xc1\x44\x60\ -\x76\x6d\xaa\x15\xbc\xe7\x4c\xa4\x0a\x46\x66\x44\xa9\x21\x89\x97\ -\x18\x28\x35\xa3\x74\x34\x9f\xc4\x78\x04\xf0\xa7\xcb\x75\x13\x10\ -\xa8\xcc\x77\x65\xe7\xd3\x37\xfd\x1e\x08\x19\x5b\xb0\x67\x28\x19\ -\x03\x01\xd8\x43\x03\x3b\x78\xc5\xa9\x17\x0c\x0e\x86\x48\xd8\xba\ -\x42\x23\x20\x3d\x6e\x3e\x20\x57\xf8\x2d\xc6\x97\x13\xa5\xf4\x26\ -\x2f\x03\x90\xeb\x89\x1c\x86\xf5\xf3\x80\x31\xc0\xca\x72\x90\xa4\ -\x44\x47\x26\x34\x0f\x71\x37\x0f\x24\xec\x6d\x65\x60\xd9\x9c\xd9\ -\x6c\x04\xcd\x2a\xd7\x02\xca\xa2\xf5\x7a\xb8\xa8\xeb\x01\xcb\xc6\ -\x79\xb3\x51\x14\xd5\xae\x09\x47\xc6\xf7\x33\x07\x98\x59\xed\x5a\ -\x80\x09\xd3\x0a\xb3\x81\x89\x6a\xd7\x02\x4c\x22\x05\x3c\x1b\xa2\ -\x54\x93\xf2\x60\x25\x0b\xb0\xa7\xb6\x60\x52\x0b\x52\xa9\x45\x2e\ -\xec\x44\x7c\x66\x0e\xa7\x98\x59\xcc\x9e\xcd\xa8\x12\x00\x80\xbe\ -\x33\x6e\x7d\xc3\x4c\x3a\xdf\x8e\x8b\x96\xc1\xc0\xa7\x5e\xc7\xf1\ -\xf0\xd6\x03\xf7\x29\x5e\xb4\x80\xfe\x1c\x53\xaa\x5b\xc0\x86\x88\ -\xf1\xdb\x78\x5f\xa9\xbb\x64\xda\x8d\x59\x13\xd3\xa5\x17\xa8\x0e\ -\xa8\xc1\xd7\xe6\x5a\x87\x59\x9f\x58\x6c\x30\x82\x9f\x6e\xb2\x1a\ -\x09\x7f\x13\x35\x1d\xa3\x91\xa7\xa7\x97\x08\x02\xb7\xef\x3b\x17\ -\x00\xf0\x7d\xf8\x38\xed\x1c\x9d\x5d\xb4\x1b\xd3\x50\x9d\xe1\xdb\ -\x0f\x3b\x72\x19\x7e\x6e\x4e\x9b\xa4\xe9\xde\x8e\x9b\x67\xc9\xee\ -\xce\x9b\x59\xdd\x99\x9f\xd2\x2e\x4d\x02\xb5\x6b\xc5\xf4\xec\xfe\ -\x8c\x6a\x71\x8c\x38\x4d\xe0\xf8\xa8\x0c\x8e\x4f\xce\x9a\xa9\xee\ -\x8e\x2b\xc3\xf1\xf1\xea\x70\x7c\x5a\x2d\x8e\x4f\x93\x84\xd7\x3a\ -\x3b\x5c\x25\x8e\x5b\x67\xad\x0d\xc4\x71\xf8\x5d\x99\x8a\x31\xdb\ -\x5a\x29\x66\x9b\xa7\x6b\xc3\xec\xf2\x12\x22\xbc\x02\xad\x5a\xcc\ -\x9e\x9c\x27\x19\xf9\xf4\xa4\x0c\x66\x8f\x4e\x8e\xb7\x40\xf6\x86\ -\x97\x3c\x55\x8b\xd9\xa3\xa3\x14\x66\xcf\x56\x49\xb3\x55\x62\xf6\ -\xac\xbc\xc4\x8d\x3e\x94\x51\x2d\x92\x9b\x29\xfa\x6d\x5d\x94\x92\ -\x0c\xc7\xe8\x2b\x49\x74\x97\xa9\x26\x37\xc5\x76\x88\x5d\xfa\x59\ -\xb1\xf5\x90\xb6\xd0\x4a\x49\x89\x56\xeb\xf4\x31\xc6\xc8\x7c\x2c\ -\xc7\x1f\xa1\xbe\xdd\x98\xf0\xce\xde\xff\x01\xff\x94\xb5\x4d\ +\x00\x57\x7d\x78\x9c\xed\x5c\x5b\x6f\xdb\x3a\x12\x7e\xcf\xaf\x20\ +\xfc\xb2\x5d\xa0\x27\xbe\xe4\xda\xc0\xf1\x41\xdb\xf4\x12\xa0\x3d\ +\x9b\xc2\x49\xbb\x67\x5f\x02\x5a\xa2\x6d\x6e\x24\x51\x4b\x52\xb1\ +\x5d\xec\x8f\xdf\xe1\x45\xd6\xd5\x8e\x6d\x39\x72\xb6\xc7\x45\x80\ +\x4a\x24\x3d\x33\x1c\xce\x7c\x43\x0e\x49\x75\x7f\x9f\xfa\x1e\x7a\ +\x24\x5c\x50\x16\x5c\x36\xda\x87\xad\x06\x22\x81\xc3\x5c\x1a\x8c\ +\x2e\x1b\x77\xb7\x1f\x7f\x3b\x6f\xfc\xde\x3b\xe8\x46\x34\x69\x74\ +\x0c\x8d\x7a\x07\xa8\xeb\x78\x58\x88\xde\xa7\x88\x5e\x5c\x5c\x51\ +\xec\xb1\x11\xfc\xef\x8d\xfa\x44\x4a\xf8\xb1\xb8\xe2\x78\x28\xbb\ +\x4d\xd3\x08\x5a\x4f\xa8\x3b\x22\x12\xe9\xf7\xcb\xc6\xb7\x1f\xfa\ +\xb5\x81\x02\xec\x93\xcb\xc6\x52\x22\x8a\x19\xea\x86\x9c\x85\x84\ +\xcb\x99\xfd\xc5\x88\x30\x9f\x48\x3e\xd3\x95\xa8\xcb\x89\x23\xf5\ +\x13\xea\x4e\x7b\xad\x6e\x73\x6a\x5f\x66\xea\x65\x66\x5f\x40\x04\ +\x39\xee\x9d\xb5\xcf\xbb\x4d\xf3\x68\x8a\xc7\x84\x8e\xc6\xb2\x77\ +\xde\x82\x72\xfb\xac\x69\x36\x63\xa2\xdd\x66\xcc\xbc\x4c\x92\x09\ +\x0d\x5c\x36\xb9\xa5\xd2\x23\x56\x18\x21\x39\x08\xdf\xfb\x44\x02\ +\xc2\xb1\x87\x84\xed\x4c\xb7\x69\x2b\x8a\x24\x3d\x3c\x63\x51\xa2\ +\x9c\xef\xef\xd8\xf4\x8b\x2e\xb2\x14\x73\x2c\x45\x88\x1d\x20\xd4\ +\xb0\x1d\x08\x22\x7f\x40\x78\xef\xb4\xdb\xb4\x4f\x46\xfc\x34\x87\ +\x02\x09\x1f\xf3\x11\x0d\x72\x14\xde\x2c\xa5\x40\x25\xf1\x13\x4d\ +\xa6\x07\xf3\x13\x67\x51\x08\x32\xc7\xc3\x39\x8a\xdf\x4d\xf3\x02\ +\x73\x99\x28\xab\x44\x5f\x7a\xd0\x51\xbf\x44\x6b\x45\xa1\x96\xea\ +\xce\x72\x03\xc3\x95\xd4\xc1\x9e\x29\xbd\xef\x24\x8c\x93\x1e\x95\ +\x10\xfa\x5c\x20\x34\x66\x9c\xfe\x64\x81\x9c\x93\x6a\xbf\x99\xd3\ +\xca\x53\x2b\x28\x49\x9b\xf8\x0d\x27\xc3\xf7\x63\xe2\x3c\xa4\x95\ +\xa5\x2a\x42\xa8\x70\x54\xc5\x80\x4d\xef\xdb\x9d\x14\xd9\x12\xed\ +\x31\xe6\xdd\xd2\x30\xd3\x66\xae\xc4\xeb\x21\x92\x63\x2a\x10\xfc\ +\x69\x7a\xc4\x7d\x0d\x05\xc4\x2a\x75\xc2\xf8\xc3\x00\xfc\x7b\x0c\ +\x4f\xc1\xdf\x24\xc2\x61\x48\x30\x3f\x44\x77\x82\x0c\x23\xb0\x54\ +\x1a\x38\x04\x61\xcf\x43\x6c\x98\xfa\x95\x62\x28\x10\xe6\xaa\x4a\ +\x30\x44\x03\x5d\xf7\x96\x6b\x32\x96\xe0\x61\x6e\x9c\xca\x07\xab\ +\xbc\x3f\x64\x2a\xcb\x3b\xf3\x99\xba\x05\xc9\x37\xe7\xa3\x74\xfc\ +\x21\x50\x98\x81\x84\x74\xc1\x2b\x2f\x1b\xad\x1c\x5f\xc7\xd2\x1e\ +\x03\x63\xcd\xf7\x47\xc2\xd6\xa9\xc2\xf7\x06\xcb\xf1\xd3\x6c\xbf\ +\x32\xb7\x19\xe3\xe6\x8a\xdc\x34\x94\x81\x99\xa5\xec\xb0\x99\x35\ +\xeb\xa6\xb1\xeb\xb9\xd1\x67\xaa\xab\xba\xc0\xea\xf6\xff\xed\x0b\ +\x1e\x10\x2f\xa6\xe3\xa9\x97\xac\xff\xac\x63\x18\xc6\x26\x68\x20\ +\x09\x1f\x62\x30\x59\x9f\xb9\x64\x73\xc3\xc0\x1e\x1d\x05\x3e\x09\ +\x0a\xcc\x40\xad\xdf\xe4\xc5\xc5\x5b\x55\xff\x85\x60\x15\x14\xff\ +\x9b\x2a\x18\xca\xe4\xed\xfb\x7b\xa2\xa4\x01\x21\xd2\x63\xb1\xe9\ +\xa0\x15\x95\xa9\x20\x9f\xf0\xc2\x28\xf4\x75\xf1\xfd\xf1\x52\x3d\ +\x42\x6b\x10\x0e\x4b\x88\xde\xb9\x1e\x12\x80\x7b\xdd\xc5\xcf\x73\ +\x8a\xdd\xa6\x2e\x5c\x5b\x89\x82\xfe\x24\x9f\x61\x44\x16\x5b\xb9\ +\x6a\x91\x29\x89\x23\xf2\x71\x2b\x13\x90\xe7\xb5\x36\x18\x77\x5a\ +\x99\xb8\x9c\x88\x95\x27\xb8\x40\xd7\x46\x75\x6b\xe8\x7a\x11\x70\ +\x33\x7f\xc0\x4a\x81\x5b\x55\x28\xe0\x5e\x3e\x0c\x4b\x71\xfb\xd6\ +\x82\xb6\x42\xd6\xbb\x6b\x6d\xd0\x0a\x68\x27\x63\x0a\x28\x9b\x40\ +\x31\x94\x47\x1e\x41\x13\x0a\x18\xad\x20\xf1\x02\xdd\x02\xd5\x01\ +\xe6\xe6\x17\xba\x3c\xf4\xb0\x45\x71\xf3\x9b\x78\xfe\xa1\xe8\x61\ +\x78\x0b\x31\xc7\x92\x68\x54\x87\x1f\xbe\x56\x3c\x80\xa4\xc4\xe2\ +\x21\x4b\x27\x12\x44\x73\xfe\xc8\x09\x79\xff\xf6\x0a\xdd\x42\x8b\ +\x47\x4a\x26\x48\xcc\x04\x68\x0c\x0d\x19\xd7\x5c\xa8\x14\xaa\x2d\ +\x37\xfe\x88\x1d\x65\x67\xb5\xa0\xf4\x1d\xfd\xaa\xfd\xfe\x65\x22\ +\x73\xc1\xae\x56\x01\xb8\xc4\x1e\xcc\xe8\x94\xe9\x71\x11\xbb\x66\ +\x9e\x5f\x35\x01\xec\x68\x57\x91\x60\xc7\xc1\xe9\xfe\xec\x59\xa6\ +\x67\x27\xdb\x9d\x9d\x39\x2c\x9c\xa5\xbc\x6e\x40\xd0\x03\x09\x61\ +\x6a\xe6\x70\x26\xa0\x19\xf3\x7d\x1c\x40\x33\x06\xae\xc8\x27\x14\ +\x7c\xd2\x16\x09\xd3\x1e\x7b\x13\x3c\x13\x60\xc0\x98\xab\x88\x88\ +\x02\xf6\xdb\x9c\xe2\x73\xcc\xc9\x3e\x79\x6c\x00\x93\xf4\x2d\xf0\ +\xb0\x1a\xc8\xb1\x19\x80\xfe\x7a\x92\x47\x40\x58\x3f\x3e\x27\x80\ +\xa8\x4e\xf8\x2f\x18\x42\x76\xed\x3f\xed\xf3\x67\x71\xa0\xa3\xcd\ +\x1d\xe8\x0f\xc6\x7d\x88\x39\xb3\xd7\x08\x14\x09\x21\x47\x8d\x20\ +\x94\x23\x36\xf8\x37\x2c\xd6\x85\x59\xeb\x40\x21\x25\x02\x29\xe1\ +\x04\xf1\xa0\x9c\xb8\x87\x28\x76\x3d\x16\xaa\xf8\x54\x58\x1f\x0d\ +\x30\x78\x96\xa5\x32\x77\xc4\xf8\xd7\xe0\x57\x10\xf1\xb0\xfb\x2c\ +\x8b\x9c\xbe\x66\x92\x15\x20\xd3\xb9\x5a\x62\xa9\xe9\xea\x3b\x10\ +\xe2\x1f\x46\x86\xbd\x4f\x94\xfb\xc4\x1a\x4b\xfe\xd2\x25\xcf\x13\ +\x6b\xfb\xc5\x4b\x1e\x32\xc4\x91\x67\x16\xc2\xca\xe2\x61\x96\x17\ +\xac\x0e\xbe\x5b\x5f\x71\x9c\xed\x57\x1c\x8b\x75\x5d\xdf\x8a\x63\ +\xb9\x35\xad\xe1\xff\xae\x31\xaf\x1f\x37\x2f\xd5\xef\xab\xcd\x66\ +\xff\x60\xe5\xce\x52\xcf\x5c\xfa\x9f\x7f\xa2\x57\xb7\x2c\xfc\xfb\ +\x0e\x25\xf8\x17\x7a\xf5\x91\x83\xbb\xed\x50\x86\x3f\x41\x86\x3e\ +\x75\x49\x25\x11\x76\x0d\xff\xed\xa3\x6a\xf8\x7f\xbe\x21\xfc\x5f\ +\xab\xb5\x75\x00\x13\x6f\x70\x32\x87\xaa\x8d\x18\xe4\x91\x47\xe2\ +\xed\x2c\x02\xec\xf1\x7f\xb1\xa6\xb7\x85\xff\xfd\x90\x06\x65\xf0\ +\x2f\xa0\xfc\xe9\x89\xb4\x8f\xa7\xd4\x8f\xfc\x3e\xc8\xbc\xaa\x5e\ +\x4e\x97\xeb\xa5\x7d\x7a\x76\x76\xd6\x69\x9f\x54\xd1\xce\xba\x69\ +\x31\x82\xcc\x96\x94\xda\x92\x70\xc1\xf4\x61\xfa\xaf\x33\x59\x34\ +\x76\x08\x87\x31\xee\xd2\x00\x4b\xa2\x26\xf7\x84\x6b\xab\x13\xe8\ +\x95\x4a\x4f\x91\xe9\x21\x3a\x42\x97\xa8\x75\xd8\x6a\xb5\x4b\x71\ +\x67\x35\x19\x1f\xb1\x17\xe5\x95\x58\xba\xeb\xb6\x16\xd5\x35\xc2\ +\xf3\xdc\xeb\x5f\x6a\x78\xde\x35\x2e\x77\x2a\x4e\xcb\x37\xc5\xe5\ +\x2b\xea\x93\x40\x68\x8b\x7b\x29\xc8\xfc\xc4\xa4\x70\x8f\xcd\xb5\ +\x60\xf3\xf2\x2c\xa1\xc5\xe6\x72\x48\x39\xdf\x1c\x52\x96\x00\x55\ +\xa7\x16\xa0\x72\xa9\x7f\xb3\xc7\xaa\x27\xe6\x90\x27\xd5\xc0\x6a\ +\xf9\xda\x7b\x31\x56\xdd\x32\x0f\xc2\x63\xe0\xec\x30\x6d\xb0\x1c\ +\x66\xf7\xd0\xb4\x15\x68\xba\x62\xd1\xc0\x23\x8b\x00\xca\xd5\xb5\ +\x16\xa6\xfe\x02\x13\xc8\x64\x5f\x55\x83\xa3\xda\xaa\x74\xd1\x60\ +\x86\x86\x51\xe0\x98\xa9\xa2\x1c\x63\xa9\x77\x3b\x31\x92\xb1\x8b\ +\x1c\x1e\x7c\x57\xad\x55\x2e\x58\x8e\x91\x4b\x87\x43\xc2\x09\x94\ +\x0b\x04\x1e\xc8\x26\x26\x97\x6c\x08\xc6\xd9\x62\xc9\x09\x56\xc9\ +\x62\x2c\x90\x00\xc1\x2a\x24\x8b\x45\x34\x1c\xd2\x69\x69\x87\x9a\ +\x9b\x18\x7c\x30\x02\x73\x90\x24\xaf\x22\x63\x09\x3d\x98\x1c\xb7\ +\x5b\xe9\x7f\xdd\xa6\xad\xd9\x4a\xf8\x49\xb8\x9c\x6c\x89\xcb\x1a\ +\xe1\x48\x26\x90\xb7\x8f\x45\xa5\xf3\xe6\x35\x26\xce\xeb\x1c\x61\ +\xab\xb0\xc7\xf3\x63\x4c\x82\x65\x87\xd8\xcc\x71\x34\xed\x75\x8e\ +\x76\x39\x74\xa3\xf6\x3e\x43\x4e\x7d\x2a\xe9\x23\x11\xf1\x76\x8d\ +\x5a\x32\x9a\x9f\xcc\xb7\x87\x26\x8a\x36\x7e\xc4\x14\x22\xa9\x57\ +\xc5\x45\x17\x47\xd9\x3b\x61\x05\xba\x49\x04\xca\xb2\xad\xe7\x70\ +\x84\x20\x4a\x8a\x44\x88\x5f\xd3\x03\xb2\x95\x19\x5a\xa9\x76\x1b\ +\x9c\x5d\x4d\x56\x51\xab\x9d\x5e\xed\x07\x38\x0c\x8b\xbb\x75\x95\ +\xcf\xab\x6e\xef\xb4\x6a\xc5\xcc\x65\xa7\xb5\xe1\xb4\xf3\x3d\xc4\ +\x58\xc9\x31\x0d\xd4\x79\x81\xdd\x4d\x3d\x97\x2f\xc8\xf6\x53\xcf\ +\x9a\x76\xac\x2a\x9c\x9e\x51\xc9\xc0\xb9\x31\xa9\x3d\x50\xb0\x27\ +\x3a\xa4\x30\xe4\x0f\x64\x56\x0b\xa8\x02\x43\x27\x16\xe0\xa5\xe2\ +\x69\xb5\x4d\x1a\x31\xa6\x8a\xd9\xae\xf6\x88\x1c\xc9\x4b\x13\x67\ +\xf5\x70\xc7\x5e\xa5\xae\xef\x7a\x2e\x77\x5c\x11\xe0\xdb\x1b\x02\ +\xbc\x0a\x7d\xbb\xc5\xf6\xe5\xb3\xcd\x3d\xb6\xd7\x84\xed\xa7\xd5\ +\xb0\x5d\x58\x3b\xda\x02\xa6\x3b\x11\x87\xe5\xba\xbc\x0e\x5c\x92\ +\x5f\x47\xdb\x24\x68\xbb\x96\x74\x28\xf4\x46\xf5\x6a\x1f\x2b\x4c\ +\xe9\x3e\x56\x24\x05\xbb\x8d\x15\x15\x53\xd0\x9d\x4d\x8f\xb1\xbd\ +\xf5\xe4\x6e\x43\xc5\x72\x8c\xda\x87\x8a\x9a\x42\xc5\x13\x7b\x18\ +\x4f\x85\x0a\x6c\xcc\xa8\x96\x48\x51\xcf\xc6\x19\xf4\x46\x43\xca\ +\x3e\x50\xec\x03\xc5\x4b\x0a\x14\x99\x55\xc1\xf6\x12\xc4\x15\xfc\ +\xff\x7a\x98\xcd\x0a\xeb\xe5\x87\xbd\xcd\x96\x1c\xdd\x1f\xb3\x49\ +\xa0\xf3\xae\xe4\x11\x20\x02\xba\xa2\x77\x78\x44\x79\x96\x6e\xd9\ +\x80\xac\xbe\x0c\x02\x96\xf1\xe5\xf5\x94\x48\xff\xcf\x17\x64\x94\ +\x16\x55\x5f\xde\xa9\x6e\xbc\x4c\x64\xda\xb5\x7f\x9c\x3e\x8b\x7b\ +\x6c\x7a\x31\x3a\x75\x63\x5e\xa4\xdd\xc2\x5c\x28\x01\x0f\xa8\xed\ +\xfa\xfc\x2f\x6d\x36\xb9\xca\xee\x4f\xc6\x5d\x98\x1f\x74\x9b\xf6\ +\xa1\x4a\x71\xde\xc2\xcc\x97\x52\xee\x8f\xd6\x6b\x7e\xbc\x5e\xf3\ +\x93\x6c\xf3\x6d\xee\xa3\xcc\x73\x33\xab\xed\xa3\x98\x04\x6f\xa4\ +\xb7\xe6\x51\xfc\x95\x97\xad\x7f\x04\x24\x49\x18\x55\x3f\xcd\xd3\ +\xaa\xb6\x94\x6a\x57\xdb\x57\x89\x35\xa5\xd4\xad\x7f\xf2\x9c\x4b\ +\xab\x05\x78\xf6\x85\x06\xe4\x83\x4b\x65\x01\xcf\x3c\xa8\x20\x50\ +\xf1\xc4\x91\xc4\x95\x4f\x70\xd8\x5b\x2a\xa9\xde\xea\x5b\xe8\xce\ +\x0a\x36\xb3\x58\x0f\x1b\xaa\xbc\x16\x24\x4d\xf7\x4c\x77\xda\x8c\ +\xf0\xaf\x88\xa9\xd5\x3d\x71\x8d\xdb\xaa\x65\x8e\xb8\x69\xcc\x2d\ +\x45\x2c\xb0\x49\x8f\xad\x3e\xf7\xdb\x7a\x9a\x63\x79\x67\xf6\x69\ +\x8e\x2d\xa5\x39\x60\x8c\xdf\x45\x52\x82\x1a\x8b\x99\x0e\xa8\x1b\ +\xe8\xba\x2a\x17\x9e\xcb\xd0\x4f\x93\xd6\xc0\x17\xdf\x17\x1e\x10\ +\xb5\x1d\xea\x72\xac\xd7\x3c\xea\x73\x1e\x34\xc8\xa2\xa2\xba\xe6\ +\x5e\xe1\xb8\x8b\x66\x99\x47\x0a\x55\x96\x1b\x20\x4e\xdc\xde\xf1\ +\xb1\xfa\x74\x9a\x9b\xab\x19\x71\x42\x82\x5e\xbb\x03\x33\x0d\xf3\ +\x98\xad\x1e\x78\x11\xe9\x75\x4e\xa0\x56\x3f\x65\x87\xb5\xc0\xe9\ +\x59\x71\xd6\x7a\xee\x5f\x01\x63\x33\x18\x12\x4f\x91\x0a\xf7\xbb\ +\x56\x44\x8f\x04\x3b\xbe\x5b\x4a\x79\xe4\x28\xeb\xd1\x9a\xa8\x51\ +\xc0\x0c\x8b\x18\x9d\x32\xc4\x88\xf1\xe2\xb8\x0c\x2f\xf2\x68\x51\ +\x22\x5c\x1e\x29\xd6\x3f\x79\x94\x6a\x94\x6a\x61\x63\x5b\xec\xcf\ +\xf6\x73\x7e\x97\x8d\xd3\x06\x32\xdf\xe5\xbb\x6c\xb4\xdb\x0d\x75\ +\xd4\xb3\x1b\xd2\xa9\x8f\xc3\xf8\xac\x6a\xef\x3f\x37\xfa\xfd\x23\ +\x67\xfe\x57\xea\x93\x3e\x8b\xb8\x3a\xdb\x98\x6b\xa5\x3e\xce\x18\ +\x09\xc9\x7c\xc3\x51\x68\x49\xd2\x25\x46\xca\xd4\x07\x1c\x53\x48\ +\x96\x7c\xb3\x51\x0d\xe9\x54\x92\xc0\x15\xbd\x6f\x37\x91\x18\xc7\ +\xf5\x71\xe1\x81\x51\x31\x56\xcb\x06\xa0\xd2\x34\x6b\x09\x71\x38\ +\x56\xda\xc6\x76\x31\x01\xe4\x72\x8c\x97\x4b\x92\xba\x5b\x51\x2e\ +\xc9\xbc\x72\x91\x18\x8a\xc2\xd6\x44\x79\x4a\x31\x45\xed\xd5\x23\ +\x96\xcd\x20\x94\xab\x28\xa9\xad\x49\x47\x26\xdb\xbf\x40\x98\x79\ +\x6d\x2d\xc2\xc4\x6b\x91\x72\x61\x92\xda\x5a\x84\xc9\x9c\xc4\x2f\ +\x97\x28\xd7\xa4\xba\x58\xd9\x02\xfd\xed\x55\x4e\x84\x06\x0a\xa1\ +\x21\x05\x62\x5d\x40\xcc\xd1\x77\xd3\x8b\xf9\xbb\xe1\x2a\x40\x00\ +\xa0\x5d\x92\xb3\x55\x5f\xb7\x0b\xe2\x24\x01\x20\xf1\x28\xc0\x5e\ +\xcf\xf1\xa8\xca\x52\xbe\x52\xc9\x48\x75\xc5\xd2\x94\xea\x16\x9c\ +\x38\x84\x3e\x96\xd2\x7a\xa3\x3f\xaf\x6a\x6a\x0d\x35\x8f\xc9\x1e\ +\xe0\xfd\x87\x40\x1d\x91\x4d\xc8\xa9\x62\xa3\x0c\x08\x0a\xc2\x82\ +\xad\x7a\x46\x72\x16\xaa\x78\xa1\x7b\xa6\x67\xf0\xf3\x44\xc3\xb4\ +\xd7\x3e\x39\x9f\x7f\x04\x56\x7d\x05\xb6\xf3\x26\xf5\x1d\xd8\xa6\ +\xfa\x79\x91\x92\x4b\x84\x54\xf7\x48\x41\x11\x79\x72\xc7\xad\x56\ +\x8e\xdc\x51\x19\x39\xf3\x28\xec\xb0\xa4\xd5\x9a\x7e\x85\xfa\x6e\ +\x33\xa2\xbd\x83\xff\x01\x47\x37\x00\x13\ \x00\x00\x07\xb5\ \x00\ \x00\x1a\x6e\x78\x9c\xed\x58\x5d\x6f\xe3\xb8\x15\x7d\xcf\xaf\x50\ @@ -53366,6 +53441,11 @@ qt_resource_name = "\ \x00\x44\ \x00\x72\x00\x61\x00\x66\x00\x74\x00\x5f\x00\x63\x00\x73\x00\x2e\x00\x71\x00\x6d\ \x00\x13\ +\x0f\x69\x32\x79\ +\x00\x75\ +\x00\x73\x00\x65\x00\x72\x00\x70\x00\x72\x00\x65\x00\x66\x00\x73\x00\x2d\x00\x76\x00\x69\x00\x73\x00\x75\x00\x61\x00\x6c\x00\x2e\ +\x00\x75\x00\x69\ +\x00\x13\ \x02\xb7\x50\xf9\ \x00\x75\ \x00\x73\x00\x65\x00\x72\x00\x70\x00\x72\x00\x65\x00\x66\x00\x73\x00\x2d\x00\x69\x00\x6d\x00\x70\x00\x6f\x00\x72\x00\x74\x00\x2e\ @@ -53629,7 +53709,7 @@ qt_resource_name = "\ qt_resource_struct = "\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x01\ -\x00\x00\x00\x10\x00\x02\x00\x00\x00\x02\x00\x00\x00\x59\ +\x00\x00\x00\x10\x00\x02\x00\x00\x00\x03\x00\x00\x00\x59\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x38\x00\x00\x00\x21\ \x00\x00\x00\x38\x00\x02\x00\x00\x00\x05\x00\x00\x00\x1c\ \x00\x00\x00\x1a\x00\x02\x00\x00\x00\x17\x00\x00\x00\x05\ @@ -53661,64 +53741,65 @@ qt_resource_struct = "\ \x00\x00\x00\x64\x00\x01\x00\x00\x00\x01\x00\x00\x0a\xf1\ \x00\x00\x00\x96\x00\x01\x00\x00\x00\x01\x00\x00\x13\x00\ \x00\x00\x00\x7c\x00\x01\x00\x00\x00\x01\x00\x00\x0f\x23\ -\x00\x00\x06\xce\x00\x01\x00\x00\x00\x01\x00\x0b\x07\x34\ -\x00\x00\x04\x7c\x00\x00\x00\x00\x00\x01\x00\x0a\x64\x1d\ -\x00\x00\x09\x34\x00\x01\x00\x00\x00\x01\x00\x0b\xde\x2a\ -\x00\x00\x0b\xc4\x00\x01\x00\x00\x00\x01\x00\x0c\xba\x35\ -\x00\x00\x05\x86\x00\x01\x00\x00\x00\x01\x00\x0a\xa3\xc8\ -\x00\x00\x07\x16\x00\x00\x00\x00\x00\x01\x00\x0b\x24\x7e\ -\x00\x00\x08\x2a\x00\x01\x00\x00\x00\x01\x00\x0b\x8d\x2c\ -\x00\x00\x0b\x26\x00\x01\x00\x00\x00\x01\x00\x0c\x90\xf2\ -\x00\x00\x07\x8a\x00\x00\x00\x00\x00\x01\x00\x0b\x4e\x4d\ -\x00\x00\x09\xce\x00\x01\x00\x00\x00\x01\x00\x0c\x1e\xcb\ -\x00\x00\x0c\x14\x00\x01\x00\x00\x00\x01\x00\x0c\xd6\x59\ -\x00\x00\x04\xc2\x00\x01\x00\x00\x00\x01\x00\x0a\x7d\x3f\ -\x00\x00\x08\xdc\x00\x00\x00\x00\x00\x01\x00\x0b\xbb\xd0\ -\x00\x00\x08\x50\x00\x01\x00\x00\x00\x01\x00\x0b\x92\xf0\ -\x00\x00\x06\xf0\x00\x00\x00\x00\x00\x01\x00\x0b\x11\xe8\ -\x00\x00\x04\xe6\x00\x01\x00\x00\x00\x01\x00\x0a\x82\xbe\ -\x00\x00\x07\x5e\x00\x01\x00\x00\x00\x01\x00\x0b\x3d\x43\ -\x00\x00\x04\x9e\x00\x01\x00\x00\x00\x01\x00\x0a\x72\xd3\ -\x00\x00\x0b\x4e\x00\x00\x00\x00\x00\x01\x00\x0c\x9c\x61\ -\x00\x00\x03\xfc\x00\x01\x00\x00\x00\x01\x00\x0a\x3e\x8b\ -\x00\x00\x05\xd6\x00\x01\x00\x00\x00\x01\x00\x0a\xbe\xe7\ -\x00\x00\x0a\xde\x00\x01\x00\x00\x00\x01\x00\x0c\x79\xc3\ -\x00\x00\x0b\x00\x00\x01\x00\x00\x00\x01\x00\x0c\x87\x5e\ -\x00\x00\x05\xb4\x00\x00\x00\x00\x00\x01\x00\x0a\xac\xce\ -\x00\x00\x03\xca\x00\x01\x00\x00\x00\x01\x00\x0a\x36\xd2\ -\x00\x00\x08\xba\x00\x01\x00\x00\x00\x01\x00\x0b\xb4\x7c\ -\x00\x00\x0a\x28\x00\x00\x00\x00\x00\x01\x00\x0c\x2f\x13\ -\x00\x00\x06\x2a\x00\x01\x00\x00\x00\x01\x00\x0a\xd0\x57\ -\x00\x00\x0a\x4c\x00\x00\x00\x00\x00\x01\x00\x0c\x45\xc6\ -\x00\x00\x07\xe4\x00\x00\x00\x00\x00\x01\x00\x0b\x66\x00\ -\x00\x00\x05\x38\x00\x01\x00\x00\x00\x01\x00\x0a\x92\xbe\ -\x00\x00\x0b\xe4\x00\x00\x00\x00\x00\x01\x00\x0c\xc4\xe3\ -\x00\x00\x06\x84\x00\x00\x00\x00\x00\x01\x00\x0a\xe7\x96\ -\x00\x00\x04\x28\x00\x00\x00\x00\x00\x01\x00\x0a\x46\x92\ -\x00\x00\x0c\x44\x00\x00\x00\x00\x00\x01\x00\x0c\xe2\x32\ -\x00\x00\x0a\x94\x00\x00\x00\x00\x00\x01\x00\x0c\x63\x4d\ -\x00\x00\x04\x4c\x00\x01\x00\x00\x00\x01\x00\x0a\x5b\xb2\ -\x00\x00\x0a\xbc\x00\x01\x00\x00\x00\x01\x00\x0c\x72\x74\ -\x00\x00\x09\x56\x00\x01\x00\x00\x00\x01\x00\x0b\xe6\xd3\ -\x00\x00\x0b\x74\x00\x01\x00\x00\x00\x01\x00\x0c\xa4\xee\ -\x00\x00\x06\xac\x00\x01\x00\x00\x00\x01\x00\x0a\xf9\xd5\ -\x00\x00\x07\xbc\x00\x01\x00\x00\x00\x01\x00\x0b\x5c\x4f\ -\x00\x00\x09\xac\x00\x00\x00\x00\x00\x01\x00\x0c\x0a\x3a\ -\x00\x00\x05\x5c\x00\x01\x00\x00\x00\x01\x00\x0a\x99\x87\ -\x00\x00\x08\x0a\x00\x00\x00\x00\x00\x01\x00\x0b\x77\xb8\ -\x00\x00\x06\x0a\x00\x01\x00\x00\x00\x01\x00\x0a\xca\xd8\ -\x00\x00\x09\xf8\x00\x01\x00\x00\x00\x01\x00\x0c\x25\x40\ -\x00\x00\x08\x92\x00\x01\x00\x00\x00\x01\x00\x0b\xa9\x0a\ -\x00\x00\x09\x0c\x00\x01\x00\x00\x00\x01\x00\x0b\xce\x54\ -\x00\x00\x0b\x9a\x00\x01\x00\x00\x00\x01\x00\x0c\xaf\xb3\ -\x00\x00\x0a\x70\x00\x01\x00\x00\x00\x01\x00\x0c\x58\x9d\ -\x00\x00\x05\x08\x00\x01\x00\x00\x00\x01\x00\x0a\x8a\x9c\ -\x00\x00\x08\x72\x00\x00\x00\x00\x00\x01\x00\x0b\x99\x38\ -\x00\x00\x06\x58\x00\x00\x00\x00\x00\x01\x00\x0a\xd8\x3c\ -\x00\x00\x07\x3e\x00\x01\x00\x00\x00\x01\x00\x0b\x33\xcf\ -\x00\x00\x09\x7a\x00\x00\x00\x00\x00\x01\x00\x0b\xee\x24\ +\x00\x00\x06\xfa\x00\x01\x00\x00\x00\x01\x00\x0b\x0b\xbb\ +\x00\x00\x04\xa8\x00\x00\x00\x00\x00\x01\x00\x0a\x68\xa4\ +\x00\x00\x09\x60\x00\x01\x00\x00\x00\x01\x00\x0b\xe2\xb1\ +\x00\x00\x0b\xf0\x00\x01\x00\x00\x00\x01\x00\x0c\xbe\xbc\ +\x00\x00\x05\xb2\x00\x01\x00\x00\x00\x01\x00\x0a\xa8\x4f\ +\x00\x00\x07\x42\x00\x00\x00\x00\x00\x01\x00\x0b\x29\x05\ +\x00\x00\x08\x56\x00\x01\x00\x00\x00\x01\x00\x0b\x91\xb3\ +\x00\x00\x0b\x52\x00\x01\x00\x00\x00\x01\x00\x0c\x95\x79\ +\x00\x00\x07\xb6\x00\x00\x00\x00\x00\x01\x00\x0b\x52\xd4\ +\x00\x00\x09\xfa\x00\x01\x00\x00\x00\x01\x00\x0c\x23\x52\ +\x00\x00\x0c\x40\x00\x01\x00\x00\x00\x01\x00\x0c\xda\xe0\ +\x00\x00\x04\xee\x00\x01\x00\x00\x00\x01\x00\x0a\x81\xc6\ +\x00\x00\x09\x08\x00\x00\x00\x00\x00\x01\x00\x0b\xc0\x57\ +\x00\x00\x08\x7c\x00\x01\x00\x00\x00\x01\x00\x0b\x97\x77\ +\x00\x00\x07\x1c\x00\x00\x00\x00\x00\x01\x00\x0b\x16\x6f\ +\x00\x00\x05\x12\x00\x01\x00\x00\x00\x01\x00\x0a\x87\x45\ +\x00\x00\x07\x8a\x00\x01\x00\x00\x00\x01\x00\x0b\x41\xca\ +\x00\x00\x04\xca\x00\x01\x00\x00\x00\x01\x00\x0a\x77\x5a\ +\x00\x00\x0b\x7a\x00\x00\x00\x00\x00\x01\x00\x0c\xa0\xe8\ +\x00\x00\x04\x28\x00\x01\x00\x00\x00\x01\x00\x0a\x43\x12\ +\x00\x00\x06\x02\x00\x01\x00\x00\x00\x01\x00\x0a\xc3\x6e\ +\x00\x00\x0b\x0a\x00\x01\x00\x00\x00\x01\x00\x0c\x7e\x4a\ +\x00\x00\x0b\x2c\x00\x01\x00\x00\x00\x01\x00\x0c\x8b\xe5\ +\x00\x00\x05\xe0\x00\x00\x00\x00\x00\x01\x00\x0a\xb1\x55\ +\x00\x00\x03\xf6\x00\x01\x00\x00\x00\x01\x00\x0a\x3b\x59\ +\x00\x00\x08\xe6\x00\x01\x00\x00\x00\x01\x00\x0b\xb9\x03\ +\x00\x00\x0a\x54\x00\x00\x00\x00\x00\x01\x00\x0c\x33\x9a\ +\x00\x00\x06\x56\x00\x01\x00\x00\x00\x01\x00\x0a\xd4\xde\ +\x00\x00\x0a\x78\x00\x00\x00\x00\x00\x01\x00\x0c\x4a\x4d\ +\x00\x00\x08\x10\x00\x00\x00\x00\x00\x01\x00\x0b\x6a\x87\ +\x00\x00\x05\x64\x00\x01\x00\x00\x00\x01\x00\x0a\x97\x45\ +\x00\x00\x0c\x10\x00\x00\x00\x00\x00\x01\x00\x0c\xc9\x6a\ +\x00\x00\x06\xb0\x00\x00\x00\x00\x00\x01\x00\x0a\xec\x1d\ +\x00\x00\x04\x54\x00\x00\x00\x00\x00\x01\x00\x0a\x4b\x19\ +\x00\x00\x0c\x70\x00\x00\x00\x00\x00\x01\x00\x0c\xe6\xb9\ +\x00\x00\x0a\xc0\x00\x00\x00\x00\x00\x01\x00\x0c\x67\xd4\ +\x00\x00\x04\x78\x00\x01\x00\x00\x00\x01\x00\x0a\x60\x39\ +\x00\x00\x0a\xe8\x00\x01\x00\x00\x00\x01\x00\x0c\x76\xfb\ +\x00\x00\x09\x82\x00\x01\x00\x00\x00\x01\x00\x0b\xeb\x5a\ +\x00\x00\x0b\xa0\x00\x01\x00\x00\x00\x01\x00\x0c\xa9\x75\ +\x00\x00\x06\xd8\x00\x01\x00\x00\x00\x01\x00\x0a\xfe\x5c\ +\x00\x00\x07\xe8\x00\x01\x00\x00\x00\x01\x00\x0b\x60\xd6\ +\x00\x00\x09\xd8\x00\x00\x00\x00\x00\x01\x00\x0c\x0e\xc1\ +\x00\x00\x05\x88\x00\x01\x00\x00\x00\x01\x00\x0a\x9e\x0e\ +\x00\x00\x08\x36\x00\x00\x00\x00\x00\x01\x00\x0b\x7c\x3f\ +\x00\x00\x06\x36\x00\x01\x00\x00\x00\x01\x00\x0a\xcf\x5f\ +\x00\x00\x0a\x24\x00\x01\x00\x00\x00\x01\x00\x0c\x29\xc7\ +\x00\x00\x08\xbe\x00\x01\x00\x00\x00\x01\x00\x0b\xad\x91\ +\x00\x00\x09\x38\x00\x01\x00\x00\x00\x01\x00\x0b\xd2\xdb\ +\x00\x00\x0b\xc6\x00\x01\x00\x00\x00\x01\x00\x0c\xb4\x3a\ +\x00\x00\x0a\x9c\x00\x01\x00\x00\x00\x01\x00\x0c\x5d\x24\ +\x00\x00\x05\x34\x00\x01\x00\x00\x00\x01\x00\x0a\x8f\x23\ +\x00\x00\x08\x9e\x00\x00\x00\x00\x00\x01\x00\x0b\x9d\xbf\ +\x00\x00\x06\x84\x00\x00\x00\x00\x00\x01\x00\x0a\xdc\xc3\ +\x00\x00\x07\x6a\x00\x01\x00\x00\x00\x01\x00\x0b\x38\x56\ +\x00\x00\x09\xa6\x00\x00\x00\x00\x00\x01\x00\x0b\xf2\xab\ +\x00\x00\x03\xa2\x00\x01\x00\x00\x00\x01\x00\x0a\x27\xa1\ +\x00\x00\x03\xce\x00\x01\x00\x00\x00\x01\x00\x0a\x31\x5a\ \x00\x00\x03\x76\x00\x01\x00\x00\x00\x01\x00\x0a\x1c\x55\ -\x00\x00\x03\xa2\x00\x01\x00\x00\x00\x01\x00\x0a\x26\x0e\ " def qInitResources(): diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py index f1ae9612c..a54152db1 100644 --- a/src/Mod/Draft/InitGui.py +++ b/src/Mod/Draft/InitGui.py @@ -130,6 +130,7 @@ class DraftWorkbench (Workbench): if hasattr(FreeCADGui,"draftToolBar"): if not hasattr(FreeCADGui.draftToolBar,"loadedPreferences"): FreeCADGui.addPreferencePage(":/ui/userprefs-base.ui","Draft") + FreeCADGui.addPreferencePage(":/ui/userprefs-visual.ui","Draft") FreeCADGui.addPreferencePage(":/ui/userprefs-import.ui","Draft") FreeCADGui.draftToolBar.loadedPreferences = True Log ('Loading Draft module...done\n') diff --git a/src/Mod/Draft/Resources/Draft.qrc b/src/Mod/Draft/Resources/Draft.qrc index 2ab449808..62d171766 100644 --- a/src/Mod/Draft/Resources/Draft.qrc +++ b/src/Mod/Draft/Resources/Draft.qrc @@ -86,5 +86,6 @@ translations/Draft_pt-PT.qm ui/userprefs-base.ui ui/userprefs-import.ui + ui/userprefs-visual.ui diff --git a/src/Mod/Draft/Resources/ui/userprefs-base.ui b/src/Mod/Draft/Resources/ui/userprefs-base.ui index f373dda63..7a4e56e0c 100755 --- a/src/Mod/Draft/Resources/ui/userprefs-base.ui +++ b/src/Mod/Draft/Resources/ui/userprefs-base.ui @@ -44,16 +44,33 @@ + + + + Draft interface mode - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -79,302 +96,6 @@ - - - - - - Default color - - - - - - - the default color for new objects - - - - 0 - 0 - 0 - - - - color - - - Mod/Draft - - - - - - - Snap color - - - - - - - the default color for snap symbols - - - - 0 - 0 - 0 - - - - snapcolor - - - Mod/Draft - - - - - - - Construction color - - - - - - - This is the default color for objects being drawn while in construction mode. - - - - 44 - 125 - 255 - - - - constructioncolor - - - Mod/Draft - - - - - - - Default linewidth - - - - - - - the default linewidth for new objects - - - 2 - - - linewidth - - - Mod/Draft - - - - - - - - - - - Constrain mod - - - - - - - The Constraining modifier key - - - modconstrain - - - Mod/Draft - - - - shift - - - - - ctrl - - - - - alt - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Snap mod - - - - - - - The snap modifier key - - - 1 - - - modsnap - - - Mod/Draft - - - - shift - - - - - ctrl - - - - - alt - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Alt mod - - - - - - - The alt modifier key - - - 2 - - - modalt - - - Mod/Draft - - - - shift - - - - - ctrl - - - - - alt - - - - - - - - - - - - Construction group name - - - - - - - This is the default group name for construction geometry - - - Construction - - - constructiongroupname - - - Mod/Draft - - - - - - - - - - - check this if you want to use the color/linewidth from the toolbar as default - - - Save current color and linewidth across sessions - - - saveonexit - - - Mod/Draft - - - - - @@ -418,209 +139,6 @@ - - - - - - If this is checked, you will always snap to existing objects while drawing. If not, you will be snapping only when pressing CTRL. - - - Always snap to objects (disable snap mod key) - - - true - - - alwaysSnap - - - Mod/Draft - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - The radius for snapping to special points. Set to 0 for no distance (infinite) - - - Snap range - - - - - - - px - - - snapRange - - - Mod/Draft - - - - - - - - - - - If this is checked, snapping will not occur against objects with more than the indicated number of edges - - - Snap maximum - - - false - - - maxSnap - - - Mod/Draft - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - Maximum number of edges to be considered for snapping - - - Maximum number of edges - - - - - - - false - - - 999 - - - 24 - - - maxSnapEdges - - - Mod/Draft - - - - - - - - - - - If checked, the Snap toolbar will be shown whenever you use snapping - - - Show Draft Snap toolbar - - - true - - - showSnapBar - - - Mod/Draft - - - - - - - Hide Draft snap toolbar after use - - - hideSnapBar - - - Mod/Draft - - - - - - - - - - - if checked, a widget indicating the current working plane orientation appears during drawing operations - - - Show Working Plane tracker - - - showPlaneTracker - - - Mod/Draft - - - - - - - - - - - If this is checked, objects will appear as filled as default. Otherwise, they will appear as wireframe - - - Fill objects by default - - - fillmode - - - Mod/Draft - - - - - @@ -630,6 +148,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -663,28 +194,16 @@ - + - - - If checked, a grid will appear when drawing - + - Use grid - - - false - - - grid - - - Mod/Draft + Internal precision level - + Qt::Horizontal @@ -696,100 +215,6 @@ - - - - false - - - If checked, the Draft grid will always be visible when the Draft workbench is active. Otherwise only when using a command - - - Always show - - - alwaysShowGrid - - - Mod/Draft - - - - - - - false - - - Grid spacing - - - - - - - false - - - The spacing between each grid line - - - 4 - - - 9999.989999999999782 - - - 1.000000000000000 - - - gridSpacing - - - Mod/Draft - - - - - - - false - - - Main lines every - - - - - - - false - - - Mainlines will be drawn thicker. Specify here how many squares between mainlines. - - - 10 - - - gridEvery - - - Mod/Draft - - - - - - - - - - - Internal precision level - - - @@ -812,8 +237,19 @@ + + + + - + + + Dimensions precision level + + + + + Qt::Horizontal @@ -825,13 +261,6 @@ - - - - Dimensions precision level - - - @@ -904,34 +333,93 @@ Values with differences below this value will be treated as same. - + - + + + When this is checked, the Draft tools will create Part primitives instead of Draft objects, when available. + - Default text height + Use Part Primitives when available + + + UsePartPrimitives + + + Mod/Draft + + + + + + + + + + + + Snapping + + + + + + + + Constrain mod - - + + + Qt::Horizontal + + - 60 - 16777215 + 40 + 20 + + + + - Default height for texts and dimensions - - - 0.200000000000000 + The Constraining modifier key - textheight + modconstrain Mod/Draft + + + shift + + + + + ctrl + + + + + alt + + + + + + + + + + + + Snap mod + @@ -948,47 +436,49 @@ Values with differences below this value will be treated as same. - - - Default text font - - - - - + - This is the default font name for all Draft texts and dimensions. -It can be a font name such as "Arial", a default style such as "sans", "serif" -or "mono", or a family such as "Arial,Helvetica,sans" or a name with a style -such as "Arial:Bold" + The snap modifier key - - Arial - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 1 - textfont + modsnap Mod/Draft + + + shift + + + + + ctrl + + + + + alt + + - + - + - Default template sheet + Alt mod - + Qt::Horizontal @@ -1001,38 +491,53 @@ such as "Arial:Bold" - - - - 300 - 0 - - + - The default template to use when creating a new drawing sheet + The alt modifier key + + + 2 - template + modalt Mod/Draft + + + shift + + + + + ctrl + + + + + alt + + - + - + - When this is checked, the Draft tools will create Part primitives instead of Draft objects, when available. + If checked, the Snap toolbar will be shown whenever you use snapping - Use Part Primitives + Show Draft Snap toolbar + + + true - UsePartPrimitives + showSnapBar Mod/Draft @@ -1042,155 +547,56 @@ such as "Arial:Bold" - + - + - Dimensions & Leader arrow style + Hide Draft snap toolbar after use - - - - - dimsymbol + hideSnapBar Mod/Draft - - - Dot 5 - - - - - Dot 7 - - - - - Dot 9 - - - - - Circle 5 - - - - - Circle 7 - - - - - Circle 9 - - - - - Slash 5 - - - - - Slash 7 - - - - - Slash 9 - - - - - Backslash 5 - - - - - Backslash 7 - - - - - Backslash 9 - - + + + + + horizontalLayoutWidget_3 + horizontalLayoutWidget_4 + horizontalLayoutWidget_5 + + + + + + Construction geometry + + - + - + - Vertical dimensions text orientation + Construction group name - + - This is the orientation of the dimension texts when those dimensions are vertical. Default is left, which is the ISO standard. + This is the default group name for construction geometry - - dimorientation - - - Mod/Draft - - - - Left (ISO standard) - - - - - Right - - - - - - - - - - - Alternate SVG Patterns location - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 300 - 0 - - - - Here you can specify a directory containing SVG files containing <pattern> definitions that can be added to the standard Draft hatch patterns + Construction - patternFile + constructiongroupname Mod/Draft @@ -1200,11 +606,11 @@ such as "Arial:Bold" - + - + - Default ShapeString Font File + Construction geometry color @@ -1222,18 +628,19 @@ such as "Arial:Bold" - - - - 300 - 0 - - + - Select a font file + This is the default color for objects being drawn while in construction mode. + + + + 44 + 125 + 255 + - FontFile + constructioncolor Mod/Draft @@ -1242,6 +649,19 @@ such as "Arial:Bold" + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -1250,21 +670,11 @@ such as "Arial:Bold" qPixmapFromMimeSource - - Gui::FileChooser - QWidget -
Gui/FileDialog.h
- Gui::ColorButton QPushButton
Gui/Widgets.h
 - - Gui::PrefFileChooser - Gui::FileChooser -
Gui/PrefWidgets.h
- Gui::PrefSpinBox QSpinBox @@ -1298,102 +708,6 @@ such as "Arial:Bold" - - gui::prefcheckbox_2 - clicked(bool) - gui::prefdoublespinbox_3 - setEnabled(bool) - - - 92 - 379 - - - 417 - 381 - - - - - gui::prefcheckbox_2 - clicked(bool) - gui::prefspinbox_4 - setEnabled(bool) - - - 79 - 373 - - - 571 - 374 - - - - - gui::prefcheckbox_4 - clicked(bool) - gui::prefspinbox_6 - setEnabled(bool) - - - 67 - 270 - - - 571 - 272 - - - - - gui::prefcheckbox_4 - clicked(bool) - label_23 - setEnabled(bool) - - - 62 - 270 - - - 516 - 272 - - - - - gui::prefcheckbox_2 - clicked(bool) - label_15 - setEnabled(bool) - - - 58 - 365 - - - 354 - 381 - - - - - gui::prefcheckbox_2 - clicked(bool) - label_16 - setEnabled(bool) - - - 33 - 367 - - - 516 - 381 - - - gui::prefcheckbox_7 clicked(bool) @@ -1410,21 +724,5 @@ such as "Arial:Bold" - - gui::prefcheckbox_2 - clicked(bool) - gui::prefcheckbox_10 - setEnabled(bool) - - - 72 - 375 - - - 226 - 373 - - - diff --git a/src/Mod/Draft/Resources/ui/userprefs-visual.ui b/src/Mod/Draft/Resources/ui/userprefs-visual.ui new file mode 100644 index 000000000..5be051815 --- /dev/null +++ b/src/Mod/Draft/Resources/ui/userprefs-visual.ui @@ -0,0 +1,905 @@ + + + Gui::Dialog::DlgSettingsDraft + + + + 0 + 0 + 718 + 808 + + + + General settings + + + + 6 + + + 9 + + + + + Visual Settings + + + + + + + + Default line color + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + the default color for new objects + + + + 0 + 0 + 0 + + + + color + + + Mod/Draft + + + + + + + + + + + Default line width + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + the default linewidth for new objects + + + 2 + + + linewidth + + + Mod/Draft + + + + + + + + + + + Snap symbols color + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + the default color for snap symbols + + + + 0 + 0 + 0 + + + + snapcolor + + + Mod/Draft + + + + + + + + + + + check this if you want to use the color/linewidth from the toolbar as default + + + Save current color and linewidth across sessions + + + saveonexit + + + Mod/Draft + + + + + + + + + + + if checked, a widget indicating the current working plane orientation appears during drawing operations + + + Show Working Plane tracker + + + showPlaneTracker + + + Mod/Draft + + + + + + + + + + + If this is checked, objects will appear as filled as default. Otherwise, they will appear as wireframe + + + Fill objects by default + + + fillmode + + + Mod/Draft + + + + + + + + + + + Default template sheet + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 300 + 0 + + + + The default template to use when creating a new drawing sheet + + + template + + + Mod/Draft + + + + + + + + + + + Alternate SVG Patterns location + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 300 + 0 + + + + Here you can specify a directory containing SVG files containing <pattern> definitions that can be added to the standard Draft hatch patterns + + + patternFile + + + Mod/Draft + + + + + + + + + + + Hatch patterns resolution + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 512 + + + 128 + + + HatchPatternResolution + + + Mod/Draft + + + + + + + + + + + + Grid + + + + + + + + If checked, a grid will appear when drawing + + + Use grid + + + false + + + grid + + + Mod/Draft + + + + + + + + + + + false + + + If checked, the Draft grid will always be visible when the Draft workbench is active. Otherwise only when using a command + + + Always show the grid + + + alwaysShowGrid + + + Mod/Draft + + + + + + + + + + + false + + + Grid spacing + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + The spacing between each grid line + + + 4 + + + 9999.989999999999782 + + + 1.000000000000000 + + + gridSpacing + + + Mod/Draft + + + + + + + + + + + false + + + Main lines every + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + Mainlines will be drawn thicker. Specify here how many squares between mainlines. + + + 10 + + + gridEvery + + + Mod/Draft + + + + + + + + + + + + Texts and dimensions + + + + + + + + Default text height + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 60 + 16777215 + + + + Default height for texts and dimensions + + + 0.200000000000000 + + + textheight + + + Mod/Draft + + + + + + + + + + + Default text font + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + This is the default font name for all Draft texts and dimensions. +It can be a font name such as "Arial", a default style such as "sans", "serif" +or "mono", or a family such as "Arial,Helvetica,sans" or a name with a style +such as "Arial:Bold" + + + Arial + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + textfont + + + Mod/Draft + + + + + + + + + + + Dimensions & Leader arrow style + + + + + + + dimsymbol + + + Mod/Draft + + + + Dot 5 + + + + + Dot 7 + + + + + Dot 9 + + + + + Circle 5 + + + + + Circle 7 + + + + + Circle 9 + + + + + Slash 5 + + + + + Slash 7 + + + + + Slash 9 + + + + + Backslash 5 + + + + + Backslash 7 + + + + + Backslash 9 + + + + + + + + + + + + Vertical dimensions text orientation + + + + + + + This is the orientation of the dimension texts when those dimensions are vertical. Default is left, which is the ISO standard. + + + dimorientation + + + Mod/Draft + + + + Left (ISO standard) + + + + + Right + + + + + + + + + + + + Default ShapeString Font File + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 300 + 0 + + + + Select a font file + + + FontFile + + + Mod/Draft + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + qPixmapFromMimeSource + + + Gui::FileChooser + QWidget +
Gui/FileDialog.h
+ + + Gui::ColorButton + QPushButton +
Gui/Widgets.h
+ + + Gui::PrefFileChooser + Gui::FileChooser +
Gui/PrefWidgets.h
+ + + Gui::PrefSpinBox + QSpinBox +
Gui/PrefWidgets.h
+ + + Gui::PrefColorButton + Gui::ColorButton +
Gui/PrefWidgets.h
+ + + Gui::PrefCheckBox + QCheckBox +
Gui/PrefWidgets.h
+ + + Gui::PrefComboBox + QComboBox +
Gui/PrefWidgets.h
+ + + Gui::PrefLineEdit + QLineEdit +
Gui/PrefWidgets.h
+ + + Gui::PrefDoubleSpinBox + QDoubleSpinBox +
Gui/PrefWidgets.h
+ + + + + + gui::prefcheckbox_2 + clicked(bool) + gui::prefdoublespinbox_3 + setEnabled(bool) + + + 92 + 379 + + + 417 + 381 + + + + + gui::prefcheckbox_2 + clicked(bool) + gui::prefspinbox_4 + setEnabled(bool) + + + 79 + 373 + + + 571 + 374 + + + + + gui::prefcheckbox_2 + clicked(bool) + label_15 + setEnabled(bool) + + + 58 + 365 + + + 354 + 381 + + + + + gui::prefcheckbox_2 + clicked(bool) + label_16 + setEnabled(bool) + + + 33 + 367 + + + 516 + 381 + + + + + gui::prefcheckbox_2 + clicked(bool) + gui::prefcheckbox_10 + setEnabled(bool) + + + 72 + 375 + + + 226 + 373 + + + + + From ea4d33f6109c20b6f77990670a4f2b6ea7420351 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Tue, 16 Jul 2013 15:43:07 -0300 Subject: [PATCH 2/5] Draft: Enabled hatch patterns for all fillable Draft objects --- src/Mod/Draft/Draft.py | 212 ++++++++++++++++++++--------------------- 1 file changed, 102 insertions(+), 110 deletions(-) diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index ba9f50d16..119905c08 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -98,7 +98,7 @@ def typecheck (args_and_types, name="?"): def getParamType(param): if param in ["dimsymbol","dimPrecision","dimorientation","precision","defaultWP", "snapRange","gridEvery","linewidth","UiMode","modconstrain","modsnap", - "modalt"]: + "modalt","HatchPatternResolution"]: return "int" elif param in ["constructiongroupname","textfont","patternFile","template","maxSnapEdges", "snapModes","FontFile"]: @@ -427,6 +427,16 @@ def loadSvgPatterns(): p = importSVG.getContents(altpat+os.sep+f,'pattern') if p: FreeCAD.svgpatterns.update(p) + +def svgpatterns(): + """svgpatterns(): returns a dictionnary with installed SVG patterns""" + if hasattr(FreeCAD,"svgpatterns"): + return FreeCAD.svgpatterns + else: + loadSvgPatterns() + if hasattr(FreeCAD,"svgpatterns"): + return FreeCAD.svgpatterns + return {} def loadTexture(filename,size=None): """loadTexture(filename,[size]): returns a SoSFImage from a file. If size @@ -542,7 +552,7 @@ def makeRectangle(length, height, placement=None, face=True, support=None): obj.Support = support if placement: obj.Placement = placement if gui: - _ViewProviderRectangle(obj.ViewObject) + _ViewProviderDraft(obj.ViewObject) if not face: obj.ViewObject.DisplayMode = "Wireframe" formatObject(obj) select(obj) @@ -637,8 +647,8 @@ def makeWire(pointslist,closed=False,placement=None,face=True,support=None): if DraftGeomUtils.isReallyClosed(pointslist): closed = True pointslist = nlist - print pointslist - print closed + #print pointslist + #print closed if placement: typecheck([(placement,FreeCAD.Placement)], "makeWire") if len(pointslist) == 2: fname = "Line" else: fname = "DWire" @@ -708,7 +718,7 @@ def makeBSpline(pointslist,closed=False,placement=None,face=True,support=None): obj.Support = support if placement: obj.Placement = placement if gui: - _ViewProviderBSpline(obj.ViewObject) + _ViewProviderWire(obj.ViewObject) if not face: obj.ViewObject.DisplayMode = "Wireframe" formatObject(obj) select(obj) @@ -744,7 +754,7 @@ def makeCopy(obj,force=None,reparent=False): newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name)) _Rectangle(newobj) if gui: - _ViewProviderRectangle(newobj.ViewObject) + _ViewProviderDraft(newobj.ViewObject) elif (getType(obj) == "Dimension") or (force == "Dimension"): newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name)) _Dimension(newobj) @@ -769,7 +779,7 @@ def makeCopy(obj,force=None,reparent=False): newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name)) _BSpline(newobj) if gui: - _ViewProviderBSpline(newobj.ViewObject) + _ViewProviderWire(newobj.ViewObject) elif (getType(obj) == "Block") or (force == "BSpline"): newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name)) _Block(newobj) @@ -793,12 +803,6 @@ def makeCopy(obj,force=None,reparent=False): ArchWindow._Window(newobj) if gui: Archwindow._ViewProviderWindow(newobj.ViewObject) - elif (getType(obj) == "Cell") or (force == "Cell"): - import ArchCell - newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name)) - ArchCell._Cell(newobj) - if gui: - ArchCell._ViewProviderCell(newobj.ViewObject) elif (getType(obj) == "Sketch") or (force == "Sketch"): newobj = FreeCAD.ActiveDocument.addObject("Sketcher::SketchObject",getRealName(obj.Name)) for geo in obj.Geometries: @@ -1265,9 +1269,9 @@ def offset(obj,delta,copy=False,bind=False,sym=False,occ=False): obj.Tool = None obj.Points = p elif getType(obj) == "BSpline": - print delta + #print delta obj.Points = delta - print "done" + #print "done" elif getType(obj) == "Rectangle": length,height,plac = getRect(p,obj) obj.Placement = plac @@ -1368,10 +1372,8 @@ def getSVG(obj,scale=1,linewidth=0.35,fontsize=12,fillstyle="shape color",direct return Vector(lx,ly,0) def getPattern(pat): - if not hasattr(FreeCAD,"svgpatterns"): - loadSvgPatterns() - if pat in FreeCAD.svgpatterns: - return FreeCAD.svgpatterns[pat] + if pat in svgpatterns(): + return svgpatterns()[pat] return '' def getPath(edges): @@ -2410,41 +2412,94 @@ class _DraftObject: class _ViewProviderDraft: "The base class for Draft Viewproviders" - def __init__(self, obj): - obj.Proxy = self - self.Object = obj.Object + def __init__(self, vobj): + vobj.Proxy = self + self.Object = vobj.Object + vobj.addProperty("App::PropertyFile","Texture", + "Base","Defines a texture image or a hatch pattern") + vobj.addProperty("App::PropertyFloat","PatternSize", + "Base","Sets the size of the pattern") + vobj.PatternSize = 1 def __getstate__(self): return None - def __setstate__(self,state): + def __setstate__(self, state): return None - def attach(self, obj): - self.Object = obj.Object + def attach(self,vobj): + self.texture = None + self.texcoords = None + self.Object = vobj.Object return - def updateData(self, fp, prop): + def updateData(self, obj, prop): return - def getDisplayModes(self,obj): + def getDisplayModes(self, vobj): modes=[] return modes - def setDisplayMode(self,mode): + def setDisplayMode(self, mode): return mode - def onChanged(self, vp, prop): + def onChanged(self, vobj, prop): + # treatment of patterns and image textures + if prop in ["Texture"]: + if hasattr(self.Object,"Shape") and vobj.Texture: + if self.Object.Shape.Faces: + from pivy import coin + from PyQt4 import QtCore + r = vobj.RootNode.getChild(2).getChild(0).getChild(2) + if vobj.Texture in svgpatterns().keys(): + path = ":/patterns/"+vobj.Texture+".svg" + else: + path = vobj.Texture + i = QtCore.QFileInfo(path) + if self.texture: + r.removeChild(self.texture) + self.texture = None + if self.texcoords: + r.removeChild(self.texcoords) + self.texcoords = None + if i.exists(): + size = None + if ":/patterns" in path: + size = getParam("HatchPAtternResolution") + if not size: + size = 128 + im = loadTexture(path, size) + if im: + self.texture = coin.SoTexture2() + self.texture.image = im + r.insertChild(self.texture,1) + if size: + s =1 + if hasattr(vobj,"PatternSize"): + if vobj.PatternSize: + s = vobj.PatternSize + self.texcoords = coin.SoTextureCoordinatePlane() + self.texcoords.directionS.setValue(s,0,0) + self.texcoords.directionT.setValue(0,s,0) + r.insertChild(self.texcoords,2) + elif prop == "PatternSize": + if hasattr(self,"texcoords"): + if self.texcoords: + s = 1 + if vobj.PatternSize: + s = vobj.PatternSize + self.texcoords.directionS.setValue(s,0,0) + self.texcoords.directionT.setValue(0,s,0) return - def execute(self,obj): + def execute(self,vobj): return - def setEdit(self,vp,mode): + def setEdit(self,vobj,mode): FreeCADGui.runCommand("Draft_Edit") return True - def unsetEdit(self,vp,mode): + def unsetEdit(self,vobj,mode): if FreeCAD.activeDraftCommand: FreeCAD.activeDraftCommand.finish() FreeCADGui.Control.closeDialog() @@ -2467,7 +2522,8 @@ class _ViewProviderDraftAlt(_ViewProviderDraft): "a view provider that doesn't swallow its base object" def __init__(self,vobj): - _ViewProviderDraft.__init__(self,vobj) + vobj.Proxy = self + self.Object = vobj.Object def claimChildren(self): return [] @@ -2476,7 +2532,8 @@ class _ViewProviderDraftPart(_ViewProviderDraftAlt): "a view provider that displays a Part icon instead of a Draft icon" def __init__(self,vobj): - _ViewProviderDraftAlt.__init__(self,vobj) + vobj.Proxy = self + self.Object = vobj.Object def getIcon(self): return ":/icons/Tree_Part.svg" @@ -3057,45 +3114,9 @@ class _Rectangle(_DraftObject): fp.Shape = shape fp.Placement = plm -class _ViewProviderRectangle(_ViewProviderDraft): - "A View Provider for the Rectangle object" - def __init__(self, vobj): - _ViewProviderDraft.__init__(self,vobj) - vobj.addProperty("App::PropertyFile","TextureImage", - "Base","Uses an image as a texture map") - def attach(self,vobj): - self.texture = None - self.texcoords = None - self.Object = vobj.Object - - def onChanged(self, vp, prop): - if prop == "TextureImage": - from pivy import coin - from PyQt4 import QtCore - r = vp.RootNode.getChild(2).getChild(0).getChild(2) - i = QtCore.QFileInfo(vp.TextureImage) - if self.texture: - r.removeChild(self.texture) - self.texture = None - if self.texcoords: - r.removeChild(self.texcoords) - self.texcoords = None - if i.exists(): - size = None - if ":/patterns" in vp.TextureImage: - size = 256 - im = loadTexture(vp.TextureImage, size) - if im: - self.texture = coin.SoTexture2() - self.texture.image = im - r.insertChild(self.texture,1) - if size: - self.texcoords = coin.SoTextureCoordinatePlane() - self.texcoords.directionS.setValue(1,0,0) - self.texcoords.directionT.setValue(0,1,0) - r.insertChild(self.texcoords,2) - return +# for compatibility with older versions +_ViewProviderRectange = _ViewProviderDraft class _Circle(_DraftObject): "The Circle object" @@ -3298,6 +3319,7 @@ class _ViewProviderWire(_ViewProviderDraft): self.pt.addChild(col) self.pt.addChild(self.coords) self.pt.addChild(dimSymbol()) + _ViewProviderDraft.attach(self,obj) def updateData(self, obj, prop): if prop == "Points": @@ -3313,10 +3335,13 @@ class _ViewProviderWire(_ViewProviderDraft): rn.addChild(self.pt) else: rn.removeChild(self.pt) + _ViewProviderDraft.onChanged(self,vp,prop) return def claimChildren(self): - return [self.Object.Base,self.Object.Tool] + if hasattr(self.Object,"Base"): + return [self.Object.Base,self.Object.Tool] + return [] class _Polygon(_DraftObject): "The Polygon object" @@ -3378,9 +3403,7 @@ class _DrawingView(_DraftObject): obj.addProperty("App::PropertyLink","Source","Base","The linked object") obj.addProperty("App::PropertyEnumeration","FillStyle","Drawing View","Shape Fill Style") fills = ['shape color'] - if not hasattr(FreeCAD,"svgpatterns"): - loadSvgPatterns() - for f in FreeCAD.svgpatterns.keys(): + for f in svgpatterns().keys(): fills.append(f) obj.FillStyle = fills obj.LineWidth = 0.35 @@ -3446,39 +3469,8 @@ class _BSpline(_DraftObject): fp.Shape = spline.toShape() fp.Placement = plm -class _ViewProviderBSpline(_ViewProviderDraft): - "A View Provider for the BSPline object" - def __init__(self, obj): - from pivy import coin - _ViewProviderDraft.__init__(self,obj) - obj.addProperty("App::PropertyBool","EndArrow", - "Base","Displays a dim symbol at the end of the wire") - col = coin.SoBaseColor() - col.rgb.setValue(obj.LineColor[0], - obj.LineColor[1], - obj.LineColor[2]) - self.coords = coin.SoCoordinate3() - self.pt = coin.SoAnnotation() - self.pt.addChild(col) - self.pt.addChild(self.coords) - self.pt.addChild(dimSymbol()) - - def updateData(self, obj, prop): - if prop == "Points": - if obj.Points: - p = obj.Points[-1] - if hasattr(self,"coords"): - self.coords.point.setValue((p.x,p.y,p.z)) - return - - def onChanged(self, vp, prop): - if prop == "EndArrow": - rn = vp.RootNode - if vp.EndArrow: - rn.addChild(self.pt) - else: - rn.removeChild(self.pt) - return +# for compatibility with older versions +_ViewProviderBSpline = _ViewProviderWire class _Block(_DraftObject): "The Block object" @@ -3714,7 +3706,7 @@ class _Array(_DraftObject): return Part.makeCompound(base) def polarArray(self,shape,center,angle,num,axis): - print "angle ",angle," num ",num + #print "angle ",angle," num ",num import Part if angle == 360: fraction = angle/num From 3a75c0e086d3492a156a4dbad083a33c881f5d30 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Tue, 16 Jul 2013 16:30:44 -0300 Subject: [PATCH 3/5] 0001184: Support for arc segments in Draft wires Draft wires can now be based on a sketch with arcs, by using the Upgrade tool on a sketch. --- src/Mod/Draft/Draft.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 119905c08..e7db49a3d 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -2167,7 +2167,7 @@ def upgrade(objects,delete=False,force=None): elif wires and (not faces) and (not openwires): # we have a sketch: Extract a face - if (len(objects) == 1) and objects[0].isDerivedFrom("Sketcher::SketchObject") and (not curves): + if (len(objects) == 1) and objects[0].isDerivedFrom("Sketcher::SketchObject"): result = makeSketchFace(objects[0]) if result: msg(translate("draft", "Found 1 closed sketch object: making a face from it\n")) @@ -3249,9 +3249,6 @@ class _Wire(_DraftObject): if fp.Base.Shape.isClosed(): shape = Part.Face(shape) fp.Shape = shape - p = [] - for v in shape.Vertexes: p.append(v.Point) - if fp.Points != p: fp.Points = p elif fp.Base and fp.Tool: if fp.Base.isDerivedFrom("Part::Feature") and fp.Tool.isDerivedFrom("Part::Feature"): if (not fp.Base.Shape.isNull()) and (not fp.Tool.Shape.isNull()): From 5255443469e98c0654463da625ae7c018804f0bf Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Tue, 16 Jul 2013 19:09:16 -0300 Subject: [PATCH 4/5] Arch: First draft of a Space tool --- src/Mod/Arch/Arch.py | 1 + src/Mod/Arch/ArchCommands.py | 4 +- src/Mod/Arch/ArchComponent.py | 3 +- src/Mod/Arch/ArchSpace.py | 160 ++++++++++ src/Mod/Arch/Arch_rc.py | 292 +++++++++++++++++- src/Mod/Arch/InitGui.py | 4 +- src/Mod/Arch/Resources/Arch.qrc | 2 + src/Mod/Arch/Resources/icons/Arch_Space.svg | 202 ++++++++++++ .../Arch/Resources/icons/Arch_Space_Tree.svg | 165 ++++++++++ 9 files changed, 816 insertions(+), 17 deletions(-) create mode 100644 src/Mod/Arch/ArchSpace.py create mode 100644 src/Mod/Arch/Resources/icons/Arch_Space.svg create mode 100644 src/Mod/Arch/Resources/icons/Arch_Space_Tree.svg diff --git a/src/Mod/Arch/Arch.py b/src/Mod/Arch/Arch.py index 77c0b9534..0a32f924b 100644 --- a/src/Mod/Arch/Arch.py +++ b/src/Mod/Arch/Arch.py @@ -39,3 +39,4 @@ from ArchSectionPlane import * from ArchWindow import * from ArchAxis import * from ArchRoof import * +from ArchSpace import * diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py index 8212772fa..f6083bc94 100644 --- a/src/Mod/Arch/ArchCommands.py +++ b/src/Mod/Arch/ArchCommands.py @@ -317,9 +317,11 @@ def getCutVolume(cutplane,shapes): """getCutVolume(cutplane,shapes): returns a cut face and a cut volume from the given shapes and the given cutting plane""" import Part + if not isinstance(shapes,list): + shapes = [shapes] placement = FreeCAD.Placement(cutplane.Placement) # building boundbox - bb = shapes[0].BoundBox + bb = shapes[0].BoundBox for sh in shapes[1:]: bb.add(sh.BoundBox) bb.enlarge(1) diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py index 786f48914..73fc1d574 100644 --- a/src/Mod/Arch/ArchComponent.py +++ b/src/Mod/Arch/ArchComponent.py @@ -270,11 +270,12 @@ class Component: self.Type = "Component" self.Subvolume = None + def execute(self,obj): + return def __getstate__(self): return self.Type - def __setstate__(self,state): if state: self.Type = state diff --git a/src/Mod/Arch/ArchSpace.py b/src/Mod/Arch/ArchSpace.py new file mode 100644 index 000000000..9a7669e46 --- /dev/null +++ b/src/Mod/Arch/ArchSpace.py @@ -0,0 +1,160 @@ +#*************************************************************************** +#* * +#* Copyright (c) 2013 * +#* Yorik van Havre * +#* * +#* This program is free software; you can redistribute it and/or modify * +#* it under the terms of the GNU Lesser General Public License (LGPL) * +#* as published by the Free Software Foundation; either version 2 of * +#* the License, or (at your option) any later version. * +#* for detail see the LICENCE text file. * +#* * +#* This program is distributed in the hope that it will be useful, * +#* but WITHOUT ANY WARRANTY; without even the implied warranty of * +#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +#* GNU Library General Public License for more details. * +#* * +#* You should have received a copy of the GNU Library General Public * +#* License along with this program; if not, write to the Free Software * +#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +#* USA * +#* * +#*************************************************************************** + +import FreeCAD,FreeCADGui,ArchComponent,ArchCommands,math +from DraftTools import translate +from PyQt4 import QtCore + +def makeSpace(objects): + """makeSpace(objects): Creates a space objects from the given boundary objects""" + if not objects: + return + if not isinstance(objects,list): + objects = [objects] + obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","Space") + _Space(obj) + _ViewProviderSpace(obj.ViewObject) + if len(objects) == 1: + obj.Base = objects[0] + objects[0].ViewObject.hide() + else: + obj.Objects = objects + + +class _CommandSpace: + "the Arch Space command definition" + def GetResources(self): + return {'Pixmap' : 'Arch_Space', + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Arch_Space","Space"), + 'Accel': "S, P", + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_Space","Creates a space object from selected boundary objects")} + + def IsActive(self): + if FreeCADGui.Selection.getSelection(): + return True + else: + return False + + def Activated(self): + FreeCAD.ActiveDocument.openTransaction(str(translate("Arch","Create Space"))) + FreeCADGui.doCommand("import Arch") + FreeCADGui.doCommand("Arch.makeSpace(FreeCADGui.Selection.getSelection())") + FreeCAD.ActiveDocument.commitTransaction() + FreeCAD.ActiveDocument.recompute() + + +class _Space(ArchComponent.Component): + "A space object" + def __init__(self,obj): + obj.Proxy = self + obj.addProperty("App::PropertyLink","Base","Base", + str(translate("Arch","A base shape defining this space"))) + obj.addProperty("App::PropertyLinkList","Objects","Base", + str(translate("Arch","The objects that make the boundaries of this space object"))) + self.Type = "Space" + + def execute(self,obj): + self.getShape(obj) + + def onChanged(self,obj,prop): + if prop in ["Objects","Base"]: + self.getShape(obj) + + def getShape(self,obj): + "computes a shape" + import Part + shape = None + faces = [] + + # 1: if we have a base shape, we use it + + if obj.Base: + if obj.Base.isDerivedFrom("Part::Feature"): + if obj.Base.Shape.Solids: + shape = obj.Base.Shape.Solids[0] + + # 2: if not, add all bounding boxes of considered objects and build a first shape + if shape: + bb = shape.BoundBox + else: + bb = None + for obj in obj.Objects: + if obj.isDerivedFrom("Part::Feature"): + if not bb: + bb = obj.Shape.BoundBox + else: + bb.add(obj.Shape.BoundBox) + if not bb: + return + shape = Part.makeBox(bb.XLength,bb.YLength,bb.ZLength,FreeCAD.Vector(bb.XMin,bb.YMin,bb.ZMin)) + + # 3: identify all faces pointing towards the center of our shape + goodfaces = [] + for obj in obj.Objects: + if obj.isDerivedFrom("Part::Feature"): + faces.extend(obj.Shape.Faces) + for face in faces: + pt = face.CenterOfMass + norm = face.normalAt(1,1) #TODO calculate for curved faces + v1 = bb.Center.sub(pt) + if v1.getAngle(norm) < math.pi/2: + goodfaces.append(face) + faces = goodfaces + + # 4: get cutvolumes from faces + cutvolumes = [] + for f in faces: + cutface,cutvolume,invcutvolume = ArchCommands.getCutVolume(f,shape) + if cutvolume: + cutvolumes.append(cutvolume) + for v in cutvolumes: + shape = shape.cut(v) + + # 5: get the final shape + if shape: + if shape.Solids: + shape = shape.Solids[0] + obj.Shape = shape + + +class _ViewProviderSpace(ArchComponent.ViewProviderComponent): + "A View Provider for Section Planes" + def __init__(self,vobj): + vobj.Transparency = 85 + vobj.LineWidth = 1 + vobj.LineColor = (1.0,0.0,0.0,1.0) + vobj.DrawStyle = "Dotted" + ArchComponent.ViewProviderComponent.__init__(self,vobj) + + def getIcon(self): + import Arch_rc + return ":/icons/Arch_Space_Tree.svg" + + def claimChildren(self): + if self.Object.Base: + return [self.Object.Base] + else: + return [] + + +FreeCADGui.addCommand('Arch_Space',_CommandSpace()) diff --git a/src/Mod/Arch/Arch_rc.py b/src/Mod/Arch/Arch_rc.py index 37b7e01be..ad170ea5e 100644 --- a/src/Mod/Arch/Arch_rc.py +++ b/src/Mod/Arch/Arch_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Sun Jul 7 11:06:17 2013 +# Created: Tue Jul 16 18:10:49 2013 # by: The Resource Compiler for PyQt (Qt v4.8.4) # # WARNING! All changes made in this file will be lost! @@ -31365,6 +31365,116 @@ qt_resource_data = "\ \x55\x4c\x69\x8a\x07\xe9\x7b\x88\xe6\x87\xfa\x1b\xc0\x5e\xa3\xb6\ \x8e\x99\x2c\x6e\xae\xae\x6d\x7d\x71\x73\xf5\x1f\x81\x50\x39\x69\ \ +\x00\x00\x06\xbf\ +\x00\ +\x00\x19\x91\x78\x9c\xed\x57\xdd\x6f\xe3\x44\x10\x7f\xef\x5f\x61\ +\x7c\x2f\x20\x62\x7b\xbf\x6c\xef\xba\x49\x11\xe2\x04\x42\x02\x21\ +\xc1\x9d\x78\x3c\x6d\xec\x4d\x62\xea\xd8\xd1\xda\x69\x92\xfe\xf5\ +\xcc\xfa\xdb\x8d\xdb\xde\x01\xc7\x0b\x38\x6a\x13\xcf\xc7\xce\xce\ +\xcc\x6f\x66\x67\x97\xdf\x9c\xf7\x99\xf5\xa0\x74\x99\x16\xf9\xca\ +\xc6\x2e\xb2\x2d\x95\xc7\x45\x92\xe6\xdb\x95\xfd\xfe\xdd\xf7\x0e\ +\xb7\xad\xb2\x92\x79\x22\xb3\x22\x57\x2b\x3b\x2f\xec\x6f\xee\x6e\ +\x96\x5f\x38\x8e\xf5\x9d\x56\xb2\x52\x89\x75\x4a\xab\x9d\xf5\x63\ +\x7e\x5f\xc6\xf2\xa0\xac\x2f\x77\x55\x75\x88\x3c\xef\x74\x3a\xb9\ +\x69\x4b\x74\x0b\xbd\xf5\xbe\xb2\x1c\xe7\xee\xe6\x66\x59\x3e\x6c\ +\x6f\x2c\xcb\x02\xbb\x79\x19\x25\xf1\xca\x6e\x15\x0e\x47\x9d\xd5\ +\x82\x49\xec\xa9\x4c\xed\x55\x5e\x95\x1e\x76\xb1\x67\x0f\xe2\xf1\ +\x20\x1e\x1b\xeb\xe9\x83\x8a\x8b\xfd\xbe\xc8\xcb\x5a\x33\x2f\xdf\ +\x8c\x84\x75\xb2\xe9\xa5\xcd\x6e\x4e\xb4\x16\xc2\x42\x08\x0f\x11\ +\x8f\x10\x07\x24\x9c\xf2\x92\x57\xf2\xec\x4c\x55\x61\x8f\x73\xaa\ +\x04\x21\xe4\x01\x6f\x90\xfc\x38\xa9\xe8\x9c\x41\x28\x9e\xdd\x4c\ +\xcd\x1d\x5b\x87\xf0\x1f\xe0\xaf\x57\xe8\x08\x6e\x59\x1c\x75\xac\ +\x36\xa0\xa9\xdc\x5c\x55\xde\xdb\x77\x6f\x7b\xa6\x83\xdc\xa4\x4a\ +\x46\xcb\x74\xd1\x9f\xd8\x9d\xa4\x24\x97\x7b\x55\x1e\x64\xac\x4a\ +\xaf\xa3\xd7\xfa\xa7\x34\xa9\x76\x2b\x3b\x60\x87\x73\xfd\xbe\x53\ +\xe9\x76\x57\x8d\x08\x69\xb2\xb2\xc1\x43\xc2\x03\x54\xbf\x77\x7b\ +\x88\x7a\x24\x21\x97\x92\x46\xb4\x5d\x78\xcc\x62\xdc\x65\x96\x16\ +\x82\x8a\xa9\x76\x52\xc4\x66\x4b\x2b\xfb\x5b\x1d\xef\x3e\xfc\x66\ +\x76\xe6\x76\x81\xec\xd7\x29\x8e\xd5\xe1\x58\x7d\x50\xe7\x4a\xe5\ +\xcd\x82\xe0\xca\xc8\xaf\x9a\x6d\xd4\xdc\x89\x4f\x23\x8c\x63\xfb\ +\x0e\x28\xcb\x44\x6d\x4a\xc3\x69\xdc\x31\x6f\xe0\x0f\xa9\x79\xc0\ +\x85\x9c\x28\xa9\x7f\xd0\x32\x49\x01\x89\x8d\x5c\x23\x39\xe5\x50\ +\x1a\x86\xad\x0e\x68\x95\x55\x71\xe8\x64\xdb\x30\x01\x05\x64\x1a\ +\x4f\x9b\xa7\xd8\x6c\x4a\x05\xe1\x44\x23\x5a\x59\x5d\x32\xd5\x48\ +\x3b\x71\x91\x15\x3a\x7a\xb3\x91\x9b\x0d\x59\xdf\xd6\xa4\x02\x62\ +\x91\x56\x97\x08\xdf\xda\x96\xf7\xaa\x35\x8e\x67\xac\xe1\x57\xac\ +\x6d\xa4\x44\xe8\x59\x6b\x4b\x6f\xea\x76\x4b\xed\xb3\x72\x80\xf0\ +\x1e\x54\x6c\x2a\xb2\x33\xd3\xa7\xb5\xba\x18\x10\x4e\x45\x69\xd2\ +\x6f\x67\x40\xc8\xe1\xc3\x19\xa2\x62\x45\x16\x25\xf0\x0f\xcf\x4a\ +\x5c\x1a\x09\x0c\x45\x06\x5f\x68\x56\xe6\xd1\x40\xf5\x85\x65\xda\ +\x1d\x38\x85\x4e\xb7\x29\x40\xa2\x96\x23\xd8\xa5\xf5\x33\xd5\x81\ +\xa0\x8e\x7c\x03\x84\xf0\x21\x26\x26\x16\x32\xbb\xc2\x48\x67\x06\ +\x22\x9b\x81\xda\xca\x96\xd9\x49\x5e\xca\x7e\xcd\xba\xde\xa3\x9d\ +\x56\xd0\x9f\xde\x5c\xa3\xc9\x99\x5a\x9f\x1a\xa1\x48\xf8\x4e\xd0\ +\x0b\x6c\x5b\xf2\xfb\x3c\xad\xa0\x19\x1d\x4b\xa5\xeb\xb2\xf9\x25\ +\x7f\x5f\xaa\x2b\xa9\x77\x5a\xe6\x25\x74\x8f\xfd\xca\xde\xcb\x4a\ +\xa7\xe7\x2f\xa1\xe1\x53\x9f\x84\xdc\x5f\x20\x97\x50\x81\x21\xac\ +\x7c\x01\x9d\x84\x09\x4c\xa0\x37\xd1\x05\x71\x31\x09\x38\x23\x6c\ +\xe1\x70\xea\x22\x82\xfc\x20\x58\x38\x04\x23\x17\x0b\x5f\xf8\x5f\ +\xf5\x36\x62\x48\x1d\xa6\xbe\x4b\x39\x84\x70\xa0\x42\xba\x44\xe8\ +\xd2\x40\xf8\x10\xb8\x8e\xba\x99\x95\xdd\xcc\xca\x6a\x10\x15\x2e\ +\x0b\x42\x46\x83\x21\xf2\x9f\x52\x9d\x0e\xfe\x98\xfa\x74\xe6\x6a\ +\xe6\x33\x56\xa8\x83\xfe\xad\x1a\xfd\x0c\x28\xc5\x8c\xbd\x80\x51\ +\x86\x11\xff\xe7\x10\xba\x40\xe6\xe3\x06\x82\xfb\x44\x30\xf8\x4d\ +\x10\x71\x39\x14\x22\x9d\x82\x8f\x10\xdf\x25\x01\x43\x64\x02\xbe\ +\x20\x24\x6e\x28\x42\x1a\x4c\xc0\x77\x2d\xbb\x99\x95\x05\xf0\x51\ +\xe6\x52\xe6\x63\xce\x5f\x05\xdf\x6b\x01\x9d\x41\xa7\x89\xe3\x33\ +\x58\x99\x4d\xbf\x79\xae\xd2\xff\x32\x6c\x7b\xcc\x61\x16\x3c\x8f\ +\xcc\x8f\xb4\x86\xe6\xac\xe1\x79\x6b\xfc\xaf\xe1\x72\x12\xf2\x97\ +\xb3\x33\x9f\xc9\xf9\xac\xcf\x23\xe4\x6f\xc2\xee\xe3\xb0\x3d\x57\ +\x20\x94\x7d\x7a\x9d\x3d\x87\xaf\x26\xcc\x4b\xcf\x4c\x30\xf5\xaf\ +\xfe\xe0\x35\xc3\x54\xf2\x90\xaa\xd3\x30\xe6\xac\x65\xbf\xb3\x83\ +\xdc\xaa\x3a\xd7\x60\xb7\x49\x76\xcb\x58\x17\x3a\x51\xba\x63\x05\ +\xf5\x33\x61\xb5\x70\x68\xee\x0b\x37\xd3\xdd\x99\x55\x7b\x3e\x9a\ +\xe7\x97\x3b\x99\x14\x27\x48\xc8\x53\xe6\x63\x51\x40\x0a\xa8\xcb\ +\xb9\x40\x3c\xa4\x4f\xd9\x75\x12\xa9\x1b\xc0\x98\x46\xaf\x74\x4d\ +\xde\x71\x00\xc7\x52\x88\xc4\x35\xf3\xa8\x35\x04\xd4\xc9\xe4\x45\ +\x81\x53\xf5\x57\x87\xdb\x72\x57\x9c\xb6\xda\x04\xa7\xd2\x47\xf5\ +\x54\x13\x66\xd2\xa3\xb9\x8b\x38\xc7\x26\xc9\xed\x04\x3c\x92\x30\ +\xba\xce\x7a\x5d\x9c\xe7\x17\x38\xa5\x39\x38\xeb\xb4\x33\x35\x16\ +\xe4\x2a\x24\xad\x44\x37\x65\x63\xe4\x87\xcf\x88\x9c\x87\xda\x7e\ +\xca\xba\xcc\xb0\x8a\xf5\x1f\x00\x14\xe7\x20\xab\x1d\xec\x7c\x23\ +\xb3\xf2\x6a\x77\x65\x2e\x0f\x4e\x5e\x24\xaa\x9c\xdf\x7d\xbb\xc4\ +\x0b\x12\xad\xfd\xbd\x3c\xa7\xfb\xf4\x51\x25\xa6\x21\xb4\x90\xdc\ +\xab\x4a\x26\xb2\x92\x03\xfc\x3a\x0a\xd4\x91\xdf\x4d\xda\x70\x0b\ +\x8b\x7e\x7d\xfb\x7d\xdf\x99\xe2\x38\xfa\xbd\xd0\xf7\x43\x53\x31\ +\x02\x72\x0d\x83\xfd\xca\xee\xbb\xa5\x99\xdf\xe3\xc8\x94\xac\xac\ +\xee\xd2\x3d\x80\xca\x5c\xb9\xbe\x86\x9b\x0f\x14\x42\xcf\x98\x08\ +\x9b\x31\x74\x58\xb4\x59\x56\xab\xe6\x4a\x35\x7b\x0b\x4d\xe2\x7d\ +\x6a\x94\xbc\xdf\xaa\x34\xcb\x7e\x34\x46\x46\x1d\xb4\x5d\x34\xad\ +\x32\x75\x57\xdb\x6c\x7e\x76\x5e\x78\xad\x1b\x5d\x0b\x1c\x79\xb9\ +\xf4\xba\x30\xd4\x6f\xdb\x21\x3c\x13\x5c\xf6\x11\xce\xe4\x5a\x65\ +\x2b\xfb\x27\xc3\xb4\xae\xb8\x5b\x5d\x1c\x0f\x7b\xc8\x4f\xab\xde\ +\x85\xd5\x64\xbd\x1f\xc5\x9b\xf6\xde\x76\x76\x54\x3f\xb7\x1b\x70\ +\x6a\xd4\xe6\x75\x71\xaf\xa2\x37\xdc\x37\x9f\xf6\xb5\x01\x6d\xc4\ +\xba\x57\xd3\x9d\xc0\x66\xb4\x3e\x56\xd5\x98\xf6\x47\x91\xe6\x11\ +\x6c\x23\x4f\x3a\x2a\x04\x4e\xe9\x0c\x00\x51\x0d\xda\xc3\x91\xd5\ +\x12\x12\x09\x8d\x40\x6b\x79\x89\xf8\x82\x8d\x89\xcd\xc9\x02\xa7\ +\xcd\x5e\xea\x7b\xa5\xa3\xbc\xc8\xd5\xed\x43\x5a\xa6\xeb\x34\x33\ +\x2b\xd4\x3f\x33\x75\x9b\xa4\xe5\x01\x7c\x86\x9b\xae\xd9\xc5\x6d\ +\x01\x77\xbc\x4d\x56\x9c\x7a\xbe\xca\x25\x7c\x39\x6b\x19\xdf\x6f\ +\xeb\xed\x45\x32\x86\x6a\x3e\x66\xb2\x52\xb5\xfb\xc3\xc1\xe6\x9a\ +\xa1\x05\xe6\x5f\x8e\xda\x67\x38\x24\x20\x2f\x3f\x5b\x04\x06\x53\ +\x1c\x08\x1a\x2c\x18\x34\x20\xc4\x18\x66\x16\x73\x91\x2f\x04\x47\ +\x78\xe1\xfb\x30\x26\x23\x1c\xf2\x49\xd3\x37\x19\xa0\x02\xd1\xb9\ +\x16\x9e\x43\x24\xab\x42\x3b\xd0\x98\x1e\x64\x75\xd4\xca\x94\x6f\ +\x7f\x60\x8e\x73\xf7\x9a\xd2\xd5\x75\xcb\xd4\xaa\x81\x2d\xd4\x6b\ +\x6c\x9e\xe9\x41\x04\x2b\xc0\xc4\x8f\x46\xe3\x67\xe7\x1f\x0b\x84\ +\x08\xc3\x85\xef\x42\xbb\x0f\x11\x62\x96\x2f\x5c\x81\x42\xce\x17\ +\xdc\xcc\xdf\x84\xf3\x9a\x04\xb7\x84\x00\xae\x03\xe6\x0e\xcf\x45\ +\xe0\xf3\xd9\xd0\x3c\xda\x4f\xa0\xf7\x3f\xd8\x5e\x06\xdb\xe7\x49\ +\xfd\x7c\xf2\xaf\xa1\x7d\x95\x7a\xe6\x12\x02\xd0\x16\xfe\x02\x03\ +\xca\x79\x88\x42\x66\x51\x80\x03\x48\x61\xb1\xc0\xdc\x15\x3e\x25\ +\x38\xb4\x18\x72\xfd\x80\xf9\x22\x58\x04\x30\x0b\x04\x70\x72\xd1\ +\x59\x8c\x04\x30\x09\xc0\xca\x3e\x01\x2c\xe1\x00\x11\x16\xfa\xaf\ +\x60\xe4\xb5\x88\xfd\xf7\x40\xf4\x6f\xb6\x87\x31\x42\xf6\xf3\x68\ +\x08\x5c\x4a\x59\x80\x02\x7f\xc1\x60\xe8\x42\x08\x73\x0b\x2d\x18\ +\xcc\xdd\x9c\x32\x8e\x2d\x07\x04\x7c\xc4\x02\xec\x8b\x85\xe3\xbb\ +\x82\x21\x2a\x66\x72\xfe\xc2\x91\xf4\x2a\x02\x6a\x01\x7d\xcc\x94\ +\x09\xf7\x23\x8c\xa5\xff\x63\xe2\xd3\x30\xd1\x1f\x52\xfe\xe8\xa6\ +\x54\xf7\x04\xa8\x6b\x22\x10\x09\x4c\xa9\x53\x22\xe0\xde\x33\x73\ +\x1a\xfc\xbd\xfa\x1d\xb2\xa7\x1e\x14\x80\x32\xf9\xcf\x66\x6f\xe9\ +\x6d\xef\x6e\x96\x66\x7e\xbd\xbb\xf9\x13\xf5\x97\x97\x20\ \x00\x00\x0b\x26\ \x00\ \x00\x5f\x19\x78\x9c\xed\x5c\xdb\x72\xe3\x36\x12\x7d\xf7\x57\x70\ @@ -31546,6 +31656,151 @@ qt_resource_data = "\ \xd6\x3c\x7b\x1b\x0c\x34\xd1\xc5\x5a\x70\x62\x48\x7c\x18\x6c\xc7\ \xb1\x5f\x18\x9d\x9e\xf6\x47\xe7\x27\xa7\xfe\x9b\xbd\xce\x4f\xfe\ \x06\xf2\x9a\xfe\xf0\ +\x00\x00\x08\xea\ +\x00\ +\x00\x21\x8a\x78\x9c\xe5\x59\x6d\x8f\xa3\x38\x12\xfe\xde\xbf\x82\ +\xcb\x7c\x99\xd6\x05\xe3\x17\x6c\x70\xa6\xd3\x2b\xdd\x8d\xf6\xb4\ +\xd2\x9e\x76\x75\x3b\xa3\xfb\x38\x72\xc0\x49\xb3\x4d\x20\x02\xd2\ +\x49\xe6\xd7\x5f\x99\x17\x07\x1a\x92\xee\x7d\x99\xd6\x49\xcb\x68\ +\x26\xe0\x2a\x53\x76\xd5\x53\x8f\xab\x98\xbb\xef\x8e\xdb\xd4\x79\ +\xd2\x45\x99\xe4\xd9\x72\x46\x10\x9e\x39\x3a\x8b\xf2\x38\xc9\x36\ +\xcb\xd9\xe7\x4f\xdf\xbb\xe1\xcc\x29\x2b\x95\xc5\x2a\xcd\x33\xbd\ +\x9c\x65\xf9\xec\xbb\xfb\x9b\xbb\xbf\xb9\xae\xf3\xcf\x42\xab\x4a\ +\xc7\xce\x21\xa9\x1e\x9c\x1f\xb2\xc7\x32\x52\x3b\xed\xbc\x7f\xa8\ +\xaa\xdd\xc2\xf3\x0e\x87\x03\x4a\xda\x41\x94\x17\x1b\xef\xd6\x71\ +\xdd\xfb\x9b\x9b\xbb\xf2\x69\x73\xe3\x38\x0e\xd8\xcd\xca\x45\x1c\ +\x2d\x67\xed\x84\xdd\xbe\x48\x6b\xc5\x38\xf2\x74\xaa\xb7\x3a\xab\ +\x4a\x8f\x20\xe2\xcd\xce\xea\xd1\x59\x3d\x32\xd6\x93\x27\x1d\xe5\ +\xdb\x6d\x9e\x95\xf5\xcc\xac\x7c\xd7\x53\x2e\xe2\xb5\xd5\x36\xab\ +\x39\xb0\x5a\x89\x48\x29\x3d\x4c\x3d\x4a\x5d\xd0\x70\xcb\x53\x56\ +\xa9\xa3\x3b\x9c\x0a\x6b\x9c\x9a\x4a\x31\xc6\x1e\xc8\xce\x9a\xaf\ +\xd3\x5a\x1c\x53\x70\xc5\xc5\xc5\xd4\xd2\xbe\x75\x70\xff\x0e\xfe\ +\xda\x09\xdd\x00\x2a\xf3\x7d\x11\xe9\x35\xcc\xd4\x28\xd3\x95\xf7\ +\xf1\xd3\x47\x2b\x74\x31\x8a\xab\xb8\xf7\x9a\xce\xfb\x03\xbb\x83\ +\x90\x64\x6a\xab\xcb\x9d\x8a\x74\xe9\x75\xe3\xf5\xfc\x43\x12\x57\ +\x0f\xcb\x99\xf0\x77\xc7\xfa\xf9\x41\x27\x9b\x87\xaa\x37\x90\xc4\ +\xcb\x19\xec\x90\x86\x02\xd7\xcf\xdd\x1a\x16\x16\x49\x18\x31\xda\ +\xa8\xb6\x2f\xee\x8b\xfc\x10\xf9\x4e\x21\x25\x93\xc3\xd9\x71\x1e\ +\x99\x25\x2d\x67\x3f\xab\xa2\xfa\xf2\x8f\xfc\x88\x3a\x37\xda\xb7\ +\xe4\xfb\x6a\xb7\xaf\xbe\xe8\x63\xa5\xb3\xe6\x75\xb0\x91\xde\xae\ +\x6a\xb1\x99\x86\x06\x3b\xea\x21\x9c\xcc\xee\x61\xe4\x2e\xd6\xeb\ +\xd2\x48\x9a\xcd\x98\x27\xd8\x0d\xad\x65\x20\x85\x88\x68\x55\xfc\ +\xab\x50\x71\x02\x38\x6c\xf4\x1a\xcd\xa1\x84\xb1\x20\x68\xe7\xc0\ +\xac\xb2\xca\x77\x9d\x6e\xeb\x24\x18\x01\x9d\x66\x9f\xcd\x95\xaf\ +\xd7\xa5\x06\x67\xe2\xde\x58\x59\x9d\x52\xdd\x68\xbb\x51\x9e\xe6\ +\xc5\xe2\xdd\x5a\xad\xd7\x74\xf5\xa1\x1e\xca\x21\x46\x49\x75\x5a\ +\x90\x0f\x33\xc7\x7b\xd1\x5a\x48\x26\xac\x91\x17\xac\xad\x95\xc2\ +\xf8\xa2\xb5\x3b\x6f\xb8\xed\x76\xd4\x46\x65\x07\xee\xdd\xe9\xc8\ +\xe4\x63\x67\xc6\x06\xb5\x3a\x19\x08\x0e\x55\x59\x6c\x97\x73\xc6\ +\xc7\xee\xcb\x11\xbc\xe2\x2c\x1c\x46\xe1\x1f\x32\xa9\x71\x6a\x34\ +\x08\xa4\x18\xfc\xe0\x49\x9d\xaf\x06\xa8\x57\x5e\xd3\xae\xc0\xcd\ +\x8b\x64\x93\x00\x24\x6a\x3d\x4a\x10\xab\xaf\xe1\x1c\x70\x6a\x6f\ +\x6f\x80\x90\xf0\xec\x13\xe3\x0b\x95\x8e\x30\xd2\x99\x01\xcf\xa6\ +\x30\x6d\x39\x53\xe9\x41\x9d\x4a\xfb\xce\x3a\xdb\x17\x0f\x85\x06\ +\x76\x7a\x37\x81\xa6\xbe\xed\xa1\x09\x86\x25\xb5\xe2\x4d\x3b\xf8\ +\x39\x4b\x2a\xa0\xa1\x7d\xa9\x8b\x5f\x4c\x2a\xff\x94\x7d\x2e\xb5\ +\xd5\x8a\xc0\xa5\x3e\x47\x61\xc8\x18\x3d\xbf\x3a\x02\x37\xd2\x10\ +\x85\x42\x72\xd8\x50\x37\xba\x9e\xd4\x5d\x4f\xea\x16\x80\x28\x89\ +\x7c\x11\xf8\x4c\x8c\x96\xf4\xa9\x50\x59\x09\x24\xb5\x5d\xce\xb6\ +\xaa\x2a\x92\xe3\x7b\x38\x57\x04\xe5\x8c\xf2\x39\x86\x3f\xe7\x27\ +\x97\x30\x1f\x71\x1f\x13\x31\x77\x03\x1f\x11\xc9\xb0\x4f\x6f\xbf\ +\xb5\x8b\x5d\x72\xdd\xc9\xdc\x1d\xef\xe9\xba\x9b\xaf\xee\x9c\x71\ +\x1a\x84\xb0\x73\x44\x99\x24\x80\xdc\x70\x0e\x54\xed\x4b\x42\x81\ +\xfc\xd9\x9c\x22\x42\x45\xe8\x53\x7f\xee\x86\x0c\x61\x8a\xb9\x00\ +\x67\x50\x82\xc1\x1b\x5c\xf2\xdb\x41\x28\x09\xe3\x88\x41\x7c\xd8\ +\x20\x94\x32\x40\x6c\x1c\xca\xb1\xee\x7a\x52\x77\x10\x4a\xeb\xf9\ +\xdf\x42\x80\x2e\x79\x0d\x05\xba\x53\xb4\xf4\x0d\x49\xd0\xc5\x6f\ +\x45\x83\xdf\x00\xa5\xc4\xf7\xaf\x60\xd4\x27\x38\xfc\xf3\x10\x5a\ +\xe7\x24\x46\x42\x86\x9c\x4a\x1f\xee\x29\xa6\x28\x04\xae\x63\x43\ +\xf0\x51\xca\x11\x15\x3e\xa6\x03\xf0\x89\x80\xa2\x40\x06\x3d\x1a\ +\x58\x4f\xea\xae\x27\x75\x01\x7c\xc0\x00\xcc\xe7\x24\x0c\x5f\x04\ +\xdf\x4b\x0e\x9d\x40\xa7\xf1\xe3\x05\xac\x4c\x86\xdf\x5c\xa3\xf0\ +\x5f\x87\xad\xc5\x1c\xf1\xc5\x65\x64\xbe\xd2\x1a\x9e\xb2\x46\xa6\ +\xad\x85\xbf\x0f\x97\x03\x97\x5f\x8f\xce\x74\x24\xa7\xa3\x3e\x8d\ +\x90\x3f\x08\xbb\xd7\x61\x7b\x2a\x41\x98\xff\xdb\xf3\xec\x12\xbe\ +\x1a\x37\xdf\x79\xa6\x48\xac\xef\x6c\x6d\x63\xaa\xd5\xf8\x29\xd1\ +\x87\x73\x25\xb9\x52\x76\x65\x3b\xb5\xd1\x75\xac\xc1\x6e\x13\xec\ +\x56\xb0\xca\x8b\x58\x17\x9d\x48\xd4\xd7\x40\xd4\xc2\xa1\x69\xc8\ +\x6e\x86\xab\x33\x6f\xb5\x72\x3c\x2d\x2f\x1f\x54\x9c\x1f\x20\x20\ +\xcf\x85\x5f\xf3\x1c\x42\xc0\x11\x7f\x2e\x30\xe1\xe3\x12\x51\x0e\ +\xb8\x92\x23\x21\x58\x62\x50\xd1\xcb\x80\xe3\xf1\xcc\x7d\x51\x80\ +\x2b\xdd\x54\x9d\x34\x6c\xa7\xfe\xe9\x10\x5b\x3e\xe4\x87\x4d\x61\ +\xdc\x52\x15\x7b\xfd\x7c\x26\x94\xfb\x7b\xd3\xe6\xb9\xfb\x26\xbc\ +\x6d\x73\xd1\xd3\x30\x73\xdd\xd5\x2a\x3f\x4e\xbf\xe0\x90\x64\xb0\ +\x4d\xb7\x6d\x57\x88\xa4\x23\x67\xb4\x1a\x5d\x03\x43\x30\x0f\x2e\ +\xa8\x1c\xcf\x59\xfd\x5c\x74\x9a\x10\xe5\xab\x5f\x01\x22\xee\x4e\ +\x55\x0f\xb0\xf2\xb5\x4a\xcb\xd1\xea\xca\x4c\xed\xdc\x2c\x8f\x75\ +\x39\xbd\xfa\xf6\x15\x57\x34\x5a\xfb\x5b\x75\x4c\xb6\xc9\x57\x1d\ +\x1b\x2a\x68\xc1\xb8\xd5\x95\x8a\x55\xa5\xce\xc0\xeb\x46\x20\x83\ +\x78\xd7\xc6\x40\x83\xbb\xf8\xcf\xc7\xef\x2d\x27\x45\xd1\xe2\xbf\ +\x79\xf1\x78\xa6\x13\xa3\xa0\x56\xd0\x35\x2d\x67\x96\x27\x4d\x73\ +\x14\x2d\x4c\xb2\xaa\xea\x3e\xd9\x02\x9c\x4c\x37\xfb\x77\x68\x2a\ +\x21\x05\xac\x60\xa0\x6c\x6a\xfc\xf3\x4b\x9b\xd7\x16\xba\xe9\x56\ +\x27\x1b\xfc\x38\xda\x26\x66\x92\xf7\x4b\x95\xa4\xe9\x0f\xc6\x48\ +\x8f\x3b\xdb\x97\x26\x55\xaa\xef\x6b\x9b\xcd\x6d\xb7\x0b\xaf\xdd\ +\x46\x47\x7e\xbd\x5d\xde\x79\x9d\x1b\xea\xa7\xcd\xd9\x3d\x03\x5c\ +\x5a\x0f\xa7\x6a\xa5\xd3\xe5\xec\x47\x23\x74\x46\xd2\x4d\x91\xef\ +\x77\x5b\x88\x4f\x3b\xbd\x73\xab\x89\xba\xed\x73\x1a\x62\x5f\xc3\ +\x36\x16\x59\x9e\x69\xe0\xf3\x22\x7f\xd4\x86\xde\x57\xac\xae\x25\ +\xcc\x63\x83\xd1\x05\x85\x26\x23\xec\x86\x0c\x15\x81\x99\xc5\x6a\ +\x5f\x55\xfd\xb1\x5f\xf3\x24\x5b\x80\xe5\x2c\xee\x46\xcf\x67\x51\ +\x7b\x74\xe0\xfa\xea\xc4\xe0\x4a\x5d\xa4\x00\x91\x6a\xe1\x77\x63\ +\xb1\x02\x0e\x28\x0a\x75\x5a\xf8\x48\x04\x62\x3e\xb0\x6c\x84\xcd\ +\xe1\x02\x07\xce\x56\x15\x8f\xba\x68\xd6\xfe\x94\x94\xc9\x2a\x49\ +\x8d\xad\xfa\x36\xd5\x1f\xe2\xa4\xdc\xc1\xe6\x17\x49\x66\xd6\xf6\ +\x21\x87\x4e\x7a\x9d\xe6\x07\x2b\xd7\x99\x82\x1f\x77\xa5\xa2\xc7\ +\x4d\xbd\xe8\x85\x8a\x20\xad\xf7\xa9\xaa\xce\x0c\x0d\xfe\xff\xb7\ +\x43\x03\x14\x08\xc6\x49\x30\xf7\x29\x82\x53\x02\x8a\x61\x47\x00\ +\xff\xfb\x42\x12\x36\xe7\x50\xfc\x06\x8c\x12\x3e\xa0\x75\xe3\x69\ +\x26\x31\x9b\x22\xe9\x0c\xdc\x57\xe5\x85\x0b\x04\xf4\xa4\xaa\x7d\ +\xa1\x4d\x9a\xda\x23\xb1\x1f\xa3\x97\x26\x8d\x7a\x56\x93\x93\x06\ +\x9e\x90\x97\x91\xb9\x86\x47\x0d\xbc\x01\x6a\x7a\xdc\x2b\x30\xbb\ +\xfd\x49\x4c\xa1\x95\x09\x11\x0d\x28\x17\x9c\x38\x3c\x40\x34\x0c\ +\x89\xcf\xe7\x50\xcf\x87\x58\x0a\xe1\x70\x01\x87\x1c\xf6\x05\x99\ +\xfb\x01\xf4\x41\x02\x9a\x83\x49\xcf\x7c\x9d\xbd\x25\xc2\xa6\x20\ +\x74\x46\xdd\xff\x15\xa6\x6c\x84\x37\xfd\xa0\x6c\x18\x11\xe7\x78\ +\x54\xa3\x72\x03\x5a\x2e\x22\x28\x86\xea\x22\x30\xed\x17\xc6\x4c\ +\x84\xa6\x1d\xb5\x77\x7d\x05\x01\xc5\x0d\x0b\x70\xe0\xcf\x09\x04\ +\xc4\x67\x92\x89\xdb\x31\x02\xf5\x71\x97\x17\x95\x0b\x71\xd1\xcd\ +\x57\x2b\xef\x21\xdf\x6a\xef\x94\x17\xc9\xa3\xf7\xb1\x3d\xdb\x4a\ +\xef\x47\xb5\xf2\x3e\x16\x6a\x5d\x79\x09\xc0\xaf\xac\x4b\x35\xb4\ +\xcb\x36\x17\x5f\x78\x8c\x77\xc9\x72\x06\xe0\x08\xa0\x43\xe4\x13\ +\x1f\x30\x5a\xbd\xd3\x33\x3d\xcb\x8f\x7d\xe8\xd7\xd8\xdc\x3a\x14\ +\x1a\xfb\x00\x36\x13\xce\x05\x87\x1a\x0d\x1a\x6d\x27\x72\xa0\xe4\ +\x32\x60\xe4\x54\x38\xd0\x70\xa2\x00\x40\x09\x08\x0c\x11\x07\x4d\ +\xe6\xb8\xdd\x5d\x6f\xa8\xd3\x9f\xe3\x9e\xd8\xce\xed\x8f\xd9\x39\ +\x78\x6e\x67\x39\xd6\xc8\x59\x3c\x31\xa3\x67\xc4\x4a\xad\x89\xf1\ +\xa2\xce\x89\xd2\x4b\xe0\x02\xce\xec\x4e\x63\x52\x7e\xbc\x2e\xaf\ +\x6b\xdc\xd6\x53\x93\x72\xd3\x60\x43\x2f\x6d\x5c\xca\x7b\x0a\x96\ +\xb3\x00\x4b\xe3\x56\xb3\x4e\x61\xd3\x64\x4a\x48\x5b\xf3\xd0\xcb\ +\xb1\xfa\xb1\xd8\xa7\xda\x64\xcd\x57\x28\x01\x6d\x9a\x0f\xc9\xbe\ +\x49\x73\x0e\x6c\x62\x2e\x22\x5f\x95\xeb\x75\x7a\xff\xce\x5c\xef\ +\x51\xce\xdb\x1f\x1c\xa3\xef\x88\xaa\x88\xfa\x4d\xd6\x10\xea\xe3\ +\xb4\x07\xd6\xe5\x84\x61\xca\x4c\x7e\x73\xea\x8b\x80\x43\xab\xd1\ +\xbb\xb3\x62\xa0\x32\x38\x8b\x84\xa4\x80\xb5\xfa\x4b\x14\x0d\x6f\ +\x67\xcf\xb3\x08\x2a\x64\x81\x25\x25\x73\xdb\xff\xd4\x69\x44\x18\ +\xa2\xbe\x84\x9c\x72\x09\x47\x2c\x10\x21\x70\x23\x43\x12\x68\x1c\ +\x86\xda\x66\x4b\xf6\x86\x48\x88\xa4\x08\x19\x35\x69\x64\xc5\x2e\ +\x1c\x11\x81\x4f\x68\x7f\xc8\x4e\xc1\xe6\x53\x59\x6b\xa4\xb5\x11\ +\x58\x31\x75\x46\x33\xa8\xd3\xda\x60\x60\xc3\x4a\x1b\x0b\x44\x3a\ +\xcf\xd7\x44\x2f\x67\x51\xa7\x71\x31\x8d\xc6\xcd\xe4\xf3\x3c\x1a\ +\xf5\x8a\xcf\x12\x69\xdc\x36\x0e\x12\xc9\xbf\x90\x48\x50\x4e\xbe\ +\x7f\x37\xee\xfb\x6e\x9f\x67\x56\x9b\x47\x06\xa7\xaf\xc3\xd5\x9d\ +\xb7\xf9\x16\x45\xc4\x74\x19\x41\x5f\x2c\x22\x80\x0e\xfd\x30\xc0\ +\x00\x57\x88\x3c\x30\x47\x80\x21\x80\x75\xab\x06\xb8\xa5\xd0\x96\ +\x61\x98\xe1\xa4\x0e\xc0\x9a\x30\x0e\xd4\x08\x48\x86\x92\x43\x84\ +\xa1\x43\xe0\x74\xe0\xe6\x0e\xe0\x43\x10\x83\x52\x24\x24\xa0\x27\ +\x08\x31\x43\x4c\x20\xce\x38\xa6\x17\x6a\x0d\x53\x5f\x48\x4b\x3c\ +\x57\xca\x0d\xdc\xbf\xde\xa8\xf8\xe8\x9b\x04\x6f\x39\x57\x16\xf2\ +\x56\xa4\x35\xc4\x1d\x46\xe6\x2b\x9d\x24\x58\xbe\x65\x4d\xda\x07\ +\xd3\x76\x1a\x39\x14\x49\x28\x95\x4c\xfd\xc6\x20\x2d\x79\x08\xdc\ +\x02\x80\x09\x78\x48\xa4\x04\xee\x31\x65\x38\x38\xcf\x1c\xd2\xe6\ +\xfb\x31\xf1\x25\xfb\x33\xf0\x21\x6c\xac\xfe\xba\xf8\x18\x36\x6f\ +\x93\x68\x21\x54\x76\xd7\xb8\x22\xf8\x63\x40\xb2\x8c\xca\x7b\x4c\ +\x5c\x73\x0e\x90\x09\x87\x7a\xc5\x0f\xe6\x44\xc2\x01\x01\x25\x0d\ +\x9b\xe8\x5c\x26\x31\x30\xc1\xc1\xe6\x7f\xa9\x46\x1c\x7c\xde\x8b\ +\x7e\xd2\x80\xe4\xf8\x65\xd4\xfc\x05\x9a\x98\xfa\xa0\xb9\x33\x5f\ +\x57\xee\x6f\xfe\x07\xcd\x1d\xa1\x65\ \x00\x00\x06\xd1\ \x00\ \x00\x27\xd8\x78\x9c\xed\x59\x5b\x6f\xe3\xb6\x12\x7e\xcf\xaf\xd0\ @@ -33405,10 +33660,19 @@ qt_resource_name = "\ \x00\x72\x00\x63\x00\x68\x00\x5f\x00\x42\x00\x75\x00\x69\x00\x6c\x00\x64\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x73\x00\x76\x00\x67\ \ \x00\x13\ +\x06\x64\xa3\x67\ +\x00\x41\ +\x00\x72\x00\x63\x00\x68\x00\x5f\x00\x53\x00\x70\x00\x61\x00\x63\x00\x65\x00\x5f\x00\x54\x00\x72\x00\x65\x00\x65\x00\x2e\x00\x73\ +\x00\x76\x00\x67\ +\x00\x13\ \x08\x0a\x92\x67\ \x00\x41\ \x00\x72\x00\x63\x00\x68\x00\x5f\x00\x4d\x00\x65\x00\x72\x00\x67\x00\x65\x00\x57\x00\x61\x00\x6c\x00\x6c\x00\x73\x00\x2e\x00\x73\ \x00\x76\x00\x67\ +\x00\x0e\ +\x06\xac\xdc\x27\ +\x00\x41\ +\x00\x72\x00\x63\x00\x68\x00\x5f\x00\x53\x00\x70\x00\x61\x00\x63\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x14\ \x03\x50\x84\x07\ \x00\x70\ @@ -33457,8 +33721,8 @@ qt_resource_name = "\ qt_resource_struct = "\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x01\ -\x00\x00\x00\x10\x00\x02\x00\x00\x00\x01\x00\x00\x00\x3b\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x20\x00\x00\x00\x1b\ +\x00\x00\x00\x10\x00\x02\x00\x00\x00\x01\x00\x00\x00\x3d\ +\x00\x00\x00\x00\x00\x02\x00\x00\x00\x22\x00\x00\x00\x1b\ \x00\x00\x00\x1a\x00\x02\x00\x00\x00\x17\x00\x00\x00\x04\ \x00\x00\x01\x2e\x00\x00\x00\x00\x00\x01\x00\x02\x9d\x23\ \x00\x00\x02\x92\x00\x00\x00\x00\x00\x01\x00\x06\x6c\x9e\ @@ -33484,21 +33748,23 @@ qt_resource_struct = "\ \x00\x00\x00\xe0\x00\x00\x00\x00\x00\x01\x00\x01\xbc\xaa\ \x00\x00\x02\x3e\x00\x00\x00\x00\x00\x01\x00\x05\x84\xf1\ \x00\x00\x05\x56\x00\x01\x00\x00\x00\x01\x00\x07\x5b\xb5\ -\x00\x00\x06\xbc\x00\x01\x00\x00\x00\x01\x00\x07\xb3\x28\ +\x00\x00\x07\x0a\x00\x01\x00\x00\x00\x01\x00\x07\xc2\xd9\ \x00\x00\x05\x9c\x00\x00\x00\x00\x00\x01\x00\x07\x6a\x2c\ \x00\x00\x04\x12\x00\x00\x00\x00\x00\x01\x00\x07\x05\x81\ -\x00\x00\x07\xec\x00\x01\x00\x00\x00\x01\x00\x08\x0a\xfd\ -\x00\x00\x06\x8e\x00\x01\x00\x00\x00\x01\x00\x07\xac\x53\ +\x00\x00\x08\x3a\x00\x01\x00\x00\x00\x01\x00\x08\x1a\xae\ +\x00\x00\x06\xdc\x00\x01\x00\x00\x00\x01\x00\x07\xbc\x04\ \x00\x00\x04\x4c\x00\x01\x00\x00\x00\x01\x00\x07\x13\xf0\ \x00\x00\x04\x9e\x00\x01\x00\x00\x00\x01\x00\x07\x27\x77\ \x00\x00\x03\xb6\x00\x01\x00\x00\x00\x01\x00\x06\xea\xdf\ -\x00\x00\x07\x86\x00\x00\x00\x00\x00\x01\x00\x07\xe7\xb9\ +\x00\x00\x07\xd4\x00\x00\x00\x00\x00\x01\x00\x07\xf7\x6a\ +\x00\x00\x06\x62\x00\x01\x00\x00\x00\x01\x00\x07\xa1\x29\ +\x00\x00\x06\xba\x00\x01\x00\x00\x00\x01\x00\x07\xb3\x16\ \x00\x00\x05\xdc\x00\x00\x00\x00\x00\x01\x00\x07\x84\x06\ \x00\x00\x05\x7c\x00\x01\x00\x00\x00\x01\x00\x07\x62\x64\ \x00\x00\x03\x94\x00\x01\x00\x00\x00\x01\x00\x06\xe1\xe6\ -\x00\x00\x06\x62\x00\x01\x00\x00\x00\x01\x00\x07\xa1\x29\ +\x00\x00\x06\x8e\x00\x01\x00\x00\x00\x01\x00\x07\xa7\xec\ \x00\x00\x03\x38\x00\x01\x00\x00\x00\x01\x00\x06\xcf\xc5\ -\x00\x00\x07\x5c\x00\x01\x00\x00\x00\x01\x00\x07\xe0\x24\ +\x00\x00\x07\xaa\x00\x01\x00\x00\x00\x01\x00\x07\xef\xd5\ \x00\x00\x04\x7a\x00\x01\x00\x00\x00\x01\x00\x07\x1d\x48\ \x00\x00\x03\x0e\x00\x01\x00\x00\x00\x01\x00\x06\xc6\x1d\ \x00\x00\x03\x74\x00\x01\x00\x00\x00\x01\x00\x06\xd9\x78\ @@ -33506,12 +33772,12 @@ qt_resource_struct = "\ \x00\x00\x05\x0a\x00\x00\x00\x00\x00\x01\x00\x07\x43\x72\ \x00\x00\x06\x3a\x00\x01\x00\x00\x00\x01\x00\x07\x98\xc4\ \x00\x00\x05\x34\x00\x01\x00\x00\x00\x01\x00\x07\x53\xf3\ -\x00\x00\x06\xe6\x00\x00\x00\x00\x00\x01\x00\x07\xbb\x6d\ +\x00\x00\x07\x34\x00\x00\x00\x00\x00\x01\x00\x07\xcb\x1e\ \x00\x00\x04\xc2\x00\x01\x00\x00\x00\x01\x00\x07\x2c\x8e\ -\x00\x00\x07\x30\x00\x01\x00\x00\x00\x01\x00\x07\xd7\xaa\ -\x00\x00\x07\x10\x00\x01\x00\x00\x00\x01\x00\x07\xcd\x70\ +\x00\x00\x07\x7e\x00\x01\x00\x00\x00\x01\x00\x07\xe7\x5b\ +\x00\x00\x07\x5e\x00\x01\x00\x00\x00\x01\x00\x07\xdd\x21\ \x00\x00\x05\xbc\x00\x01\x00\x00\x00\x01\x00\x07\x7d\xee\ -\x00\x00\x07\xb2\x00\x00\x00\x00\x00\x01\x00\x07\xf9\x88\ +\x00\x00\x08\x00\x00\x00\x00\x00\x00\x01\x00\x08\x09\x39\ \x00\x00\x03\xe8\x00\x00\x00\x00\x00\x01\x00\x06\xf3\x21\ \x00\x00\x04\xec\x00\x00\x00\x00\x00\x01\x00\x07\x34\x76\ \x00\x00\x02\xda\x00\x01\x00\x00\x00\x01\x00\x06\xbe\xcd\ diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 51bb05d36..4cf4ece7a 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -72,8 +72,8 @@ class ArchWorkbench(Workbench): self.archtools = ["Arch_Wall","Arch_Structure", "Arch_Floor","Arch_Building","Arch_Site", "Arch_Window","Arch_Roof","Arch_Axis", - "Arch_SectionPlane","Arch_Add","Arch_Remove", - "Arch_Fixture"] + "Arch_SectionPlane","Arch_Space","Arch_Add", + "Arch_Remove","Arch_Fixture"] self.meshtools = ["Arch_SplitMesh","Arch_MeshToShape", "Arch_SelectNonSolidMeshes","Arch_RemoveShape", "Arch_CloseHoles","Arch_MergeWalls"] diff --git a/src/Mod/Arch/Resources/Arch.qrc b/src/Mod/Arch/Resources/Arch.qrc index 4aafc08b0..304c659ae 100644 --- a/src/Mod/Arch/Resources/Arch.qrc +++ b/src/Mod/Arch/Resources/Arch.qrc @@ -32,6 +32,8 @@ icons/Arch_MergeWalls.svg icons/Arch_Wall_Tree_Assembly.svg icons/Arch_Fixture.svg + icons/Arch_Space.svg + icons/Arch_Space_Tree.svg ui/archprefs-base.ui translations/Arch_af.qm translations/Arch_de.qm diff --git a/src/Mod/Arch/Resources/icons/Arch_Space.svg b/src/Mod/Arch/Resources/icons/Arch_Space.svg new file mode 100644 index 000000000..1e302c4dd --- /dev/null +++ b/src/Mod/Arch/Resources/icons/Arch_Space.svg @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Space_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Space_Tree.svg new file mode 100644 index 000000000..65ca3cf5e --- /dev/null +++ b/src/Mod/Arch/Resources/icons/Arch_Space_Tree.svg @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + From 27b8be4e9b510857b5010367fe1cff12cc91ffd8 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Tue, 16 Jul 2013 19:59:56 -0300 Subject: [PATCH 5/5] Arch: forgot to update the cmake file... --- src/Mod/Arch/CMakeLists.txt | 1 + src/WindowsInstaller/ModArch.wxi | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Mod/Arch/CMakeLists.txt b/src/Mod/Arch/CMakeLists.txt index 76d09e80d..16584b8c4 100644 --- a/src/Mod/Arch/CMakeLists.txt +++ b/src/Mod/Arch/CMakeLists.txt @@ -21,6 +21,7 @@ SET(Arch_SRCS ArchVRM.py ArchRoof.py importWebGL.py + ArchSpace.py ) SOURCE_GROUP("" FILES ${Arch_SRCS}) diff --git a/src/WindowsInstaller/ModArch.wxi b/src/WindowsInstaller/ModArch.wxi index 7e28c9302..0c4c5f4b8 100644 --- a/src/WindowsInstaller/ModArch.wxi +++ b/src/WindowsInstaller/ModArch.wxi @@ -45,6 +45,7 @@ +