From 7413dfe0a14823d1172de5f9d2ce00caf0553411 Mon Sep 17 00:00:00 2001 From: Tim Sutton Date: Mon, 17 Nov 2014 12:20:53 +0200 Subject: [PATCH 1/3] Updated icons for minimum needs manager --- .../img/icons/add_icon/icon_21829.svg | 5 + .../resources/img/icons/add_icon/license.txt | 8 + .../img/icons/edit_icon/icon_8070.svg | 9 + .../resources/img/icons/edit_icon/license.txt | 8 + .../img/icons/remove_icon/icon_78560.svg | 65 ++ .../img/icons/remove_icon/license.txt | 8 + safe_qgis/resources/resources.qrc | 4 + safe_qgis/tools/about_dialog.py | 18 + safe_qgis/ui/about_dialog_base.ui | 70 +- safe_qgis/ui/needs_manager_dialog_base.ui | 22 +- safe_qgis/ui/resources_rc.py | 698 ++++++++++++------ 11 files changed, 649 insertions(+), 266 deletions(-) create mode 100644 safe_qgis/resources/img/icons/add_icon/icon_21829.svg create mode 100644 safe_qgis/resources/img/icons/add_icon/license.txt create mode 100644 safe_qgis/resources/img/icons/edit_icon/icon_8070.svg create mode 100644 safe_qgis/resources/img/icons/edit_icon/license.txt create mode 100644 safe_qgis/resources/img/icons/remove_icon/icon_78560.svg create mode 100644 safe_qgis/resources/img/icons/remove_icon/license.txt diff --git a/safe_qgis/resources/img/icons/add_icon/icon_21829.svg b/safe_qgis/resources/img/icons/add_icon/icon_21829.svg new file mode 100644 index 0000000000..bd99b669e9 --- /dev/null +++ b/safe_qgis/resources/img/icons/add_icon/icon_21829.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/safe_qgis/resources/img/icons/add_icon/license.txt b/safe_qgis/resources/img/icons/add_icon/license.txt new file mode 100644 index 0000000000..ef9e8ce096 --- /dev/null +++ b/safe_qgis/resources/img/icons/add_icon/license.txt @@ -0,0 +1,8 @@ +Thank you for using The Noun Project. This icon is licensed under Creative +Commons Attribution and must be attributed as: + + Add by Michael Zenaty from The Noun Project + +If you have a Premium Account or have purchased a license for this icon, you +don't need to worry about attribution! We will share the profits from your +purchase with this icon's designer. diff --git a/safe_qgis/resources/img/icons/edit_icon/icon_8070.svg b/safe_qgis/resources/img/icons/edit_icon/icon_8070.svg new file mode 100644 index 0000000000..430995994d --- /dev/null +++ b/safe_qgis/resources/img/icons/edit_icon/icon_8070.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/safe_qgis/resources/img/icons/edit_icon/license.txt b/safe_qgis/resources/img/icons/edit_icon/license.txt new file mode 100644 index 0000000000..16c9168636 --- /dev/null +++ b/safe_qgis/resources/img/icons/edit_icon/license.txt @@ -0,0 +1,8 @@ +Thank you for using The Noun Project. This icon is licensed under Creative +Commons Attribution and must be attributed as: + + Edit by Hugo Garduño from The Noun Project + +If you have a Premium Account or have purchased a license for this icon, you +don't need to worry about attribution! We will share the profits from your +purchase with this icon's designer. diff --git a/safe_qgis/resources/img/icons/remove_icon/icon_78560.svg b/safe_qgis/resources/img/icons/remove_icon/icon_78560.svg new file mode 100644 index 0000000000..d619d574cb --- /dev/null +++ b/safe_qgis/resources/img/icons/remove_icon/icon_78560.svg @@ -0,0 +1,65 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/safe_qgis/resources/img/icons/remove_icon/license.txt b/safe_qgis/resources/img/icons/remove_icon/license.txt new file mode 100644 index 0000000000..2b059e47cf --- /dev/null +++ b/safe_qgis/resources/img/icons/remove_icon/license.txt @@ -0,0 +1,8 @@ +Thank you for using The Noun Project. This icon is licensed under Creative +Commons Attribution and must be attributed as: + + Remove by Dalpat Prajapati from The Noun Project + +If you have a Premium Account or have purchased a license for this icon, you +don't need to worry about attribution! We will share the profits from your +purchase with this icon's designer. diff --git a/safe_qgis/resources/resources.qrc b/safe_qgis/resources/resources.qrc index 5b910159ad..6bcbea7f52 100644 --- a/safe_qgis/resources/resources.qrc +++ b/safe_qgis/resources/resources.qrc @@ -15,6 +15,10 @@ img/icons/show-impact-merge.svg img/icons/toggle-rubber-bands.svg img/icons/set-extents-tool.svg + + img/icons/edit_icon/icon_8070.svg + img/icons/add_icon/icon_21829.svg + img/icons/remove_icon/icon_78560.svg img/north_arrows/simple_north_arrow.png diff --git a/safe_qgis/tools/about_dialog.py b/safe_qgis/tools/about_dialog.py index 00a4687134..249817a9c1 100644 --- a/safe_qgis/tools/about_dialog.py +++ b/safe_qgis/tools/about_dialog.py @@ -52,3 +52,21 @@ def __init__(self, parent=None): # Set Disclaimer Text self.disclaimer_text.setFontPointSize(11) self.disclaimer_text.setText(disclaimer()) + + # Set Attributions text + image_credits_text = '' + for index, limitation in enumerate(self.attributions()): + image_credits_text += '%s. %s \n' % (index + 1, limitation) + self.image_credits_text.setFontPointSize(11) + self.image_credits_text.setText(image_credits_text) + + def attributions(self): + """List of attributions for icons etc.""" + attributes_list = list() + attributes_list.append(self.tr( + 'Edit by Hugo Garduño from The Noun Project')) + attributes_list.append(self.tr( + 'Add designed by Michael Zenaty from the Noun Project')) + attributes_list.append(self.tr( + 'Remove designed by Dalpat Prajapati from the Noun Project')) + return attributes_list diff --git a/safe_qgis/ui/about_dialog_base.ui b/safe_qgis/ui/about_dialog_base.ui index 41a58730d8..f35489584a 100644 --- a/safe_qgis/ui/about_dialog_base.ui +++ b/safe_qgis/ui/about_dialog_base.ui @@ -17,7 +17,7 @@ - 0 + 5 @@ -33,10 +33,10 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;">InaSAFE is free software that produces realistic natural hazard impact scenarios for better planning, preparedness and response activities. It provides a simple but rigorous way to combine data from scientists, local governments and communities to provide insights into the likely impacts of future disaster events.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:11pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;">InaSAFE was conceived and initially developed by the Indonesia's National Disaster Management Agency (BNPB) and the Australian Government, through the Australia-Indonesia Facility for Disaster Reduction and the World Bank - Global Facility for Disaster Reduction and Recovery (World Bank-GFDRR).</span></p></body></html> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">InaSAFE is free software that produces realistic natural hazard impact scenarios for better planning, preparedness and response activities. It provides a simple but rigorous way to combine data from scientists, local governments and communities to provide insights into the likely impacts of future disaster events.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">InaSAFE was conceived and initially developed by the Indonesia's National Disaster Management Agency (BNPB) and the Australian Government, through the Australia-Indonesia Facility for Disaster Reduction and the World Bank - Global Facility for Disaster Reduction and Recovery (World Bank-GFDRR).</p></body></html> @@ -56,13 +56,13 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;">These are the minimum steps you need to follow in order to use InaSAFE:</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:11pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;">1. Add at least one hazard layer (e.g. earthquake MMI) to QGIS.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;">2. Add at least one exposure layer (e.g. structures) to QGIS.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;">3. Make sure you have defined keywords for your hazard and exposure layers. You can do this using the keywords icon in the InaSAFE toolbar.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;">4. Click on the Run button in the InaSAFE panel.</span></p></body></html> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These are the minimum steps you need to follow in order to use InaSAFE:</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">1. Add at least one hazard layer (e.g. earthquake MMI) to QGIS.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">2. Add at least one exposure layer (e.g. structures) to QGIS.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">3. Make sure you have defined keywords for your hazard and exposure layers. You can do this using the keywords icon in the InaSAFE toolbar.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">4. Click on the Run button in the InaSAFE panel.</p></body></html> @@ -87,8 +87,8 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +</style></head><body style=" font-family:'Cantarell'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';"><br /></p></body></html> @@ -108,8 +108,8 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:9pt;"><br /></p></body></html> @@ -126,12 +126,12 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.aifdr.org"><span style=" font-family:'Cantarell'; font-size:11pt; text-decoration: underline; color:#0000ff;">Australia-Indonesia Facility for Disaster Reduction</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://www.gfdrr.org/"><span style=" font-family:'Cantarell'; font-size:11pt; text-decoration: underline; color:#0000ff;">World Bank - Global Facility for Disaster Reductions and Recovery</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://hot.openstreetmap.org/"><span style=" font-family:'Cantarell'; font-size:11pt; text-decoration: underline; color:#0000ff;">Humanitarian OpenStreetMap Team</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://linfiniti.com"><span style=" font-family:'Cantarell'; font-size:11pt; text-decoration: underline; color:#0000ff;">Linfiniti Consulting CC.</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://essc.org.ph/"><span style=" font-family:'Cantarell'; font-size:11pt; text-decoration: underline; color:#0000ff;">Environmental Science for Social Change (Philippines)</span></a></p></body></html> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.aifdr.org"><span style=" text-decoration: underline; color:#0000ff;">Australia-Indonesia Facility for Disaster Reduction</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://www.gfdrr.org/"><span style=" text-decoration: underline; color:#0000ff;">World Bank - Global Facility for Disaster Reductions and Recovery</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://hot.openstreetmap.org/"><span style=" text-decoration: underline; color:#0000ff;">Humanitarian OpenStreetMap Team</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://linfiniti.com"><span style=" text-decoration: underline; color:#0000ff;">Linfiniti Consulting CC.</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://essc.org.ph/"><span style=" text-decoration: underline; color:#0000ff;">Environmental Science for Social Change (Philippines)</span></a></p></body></html> true @@ -140,6 +140,32 @@ p, li { white-space: pre-wrap; } + + + Image Credits + + + + + + + 9 + + + + true + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Cantarell'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';"><br /></p></body></html> + + + + + diff --git a/safe_qgis/ui/needs_manager_dialog_base.ui b/safe_qgis/ui/needs_manager_dialog_base.ui index bf6fd9a099..14e83cced7 100644 --- a/safe_qgis/ui/needs_manager_dialog_base.ui +++ b/safe_qgis/ui/needs_manager_dialog_base.ui @@ -181,7 +181,11 @@ false - + + + + + + :/plugins/inasafe/add_icon.svg:/plugins/inasafe/add_icon.svg false @@ -221,7 +225,11 @@ Remove selected resource - - + + + + + :/plugins/inasafe/remove_icon.svg:/plugins/inasafe/remove_icon.svg @@ -249,7 +257,11 @@ Edit selected resource - E + + + + + :/plugins/inasafe/edit_icon.svg:/plugins/inasafe/edit_icon.svg @@ -386,7 +398,9 @@ - + + + closeButton diff --git a/safe_qgis/ui/resources_rc.py b/safe_qgis/ui/resources_rc.py index 2b5ee2a9ac..aa3d9601bf 100644 --- a/safe_qgis/ui/resources_rc.py +++ b/safe_qgis/ui/resources_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Fri Nov 14 16:08:06 2014 +# Created: Mon Nov 17 12:19:57 2014 # by: The Resource Compiler for PyQt (Qt v4.8.6) # # WARNING! All changes made in this file will be lost! @@ -303,6 +303,130 @@ \x3d\x22\x66\x69\x6c\x6c\x3a\x63\x75\x72\x72\x65\x6e\x74\x43\x6f\ \x6c\x6f\x72\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\ \x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\ +\x00\x00\x07\x9e\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x20\x73\x74\x61\x6e\x64\x61\x6c\x6f\x6e\x65\x3d\x22\ +\x6e\x6f\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x0a\x20\x20\x20\x78\x6d\ +\x6c\x6e\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\ +\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\ +\x6e\x74\x73\x2f\x31\x2e\x31\x2f\x22\x0a\x20\x20\x20\x78\x6d\x6c\ +\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x63\x72\ +\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\x6e\x73\x2e\x6f\x72\ +\x67\x2f\x6e\x73\x23\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\ +\x72\x64\x66\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\ +\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\ +\x32\x2d\x72\x64\x66\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\ +\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ +\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\x78\ +\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ +\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\ +\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x6f\x64\x69\x70\ +\x6f\x64\x69\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x73\x6f\x64\x69\ +\x70\x6f\x64\x69\x2e\x73\x6f\x75\x72\x63\x65\x66\x6f\x72\x67\x65\ +\x2e\x6e\x65\x74\x2f\x44\x54\x44\x2f\x73\x6f\x64\x69\x70\x6f\x64\ +\x69\x2d\x30\x2e\x64\x74\x64\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\ +\x73\x3a\x69\x6e\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\ +\x3a\x2f\x2f\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\ +\x6f\x72\x67\x2f\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\ +\x6e\x6b\x73\x63\x61\x70\x65\x22\x0a\x20\x20\x20\x77\x69\x64\x74\ +\x68\x3d\x22\x31\x30\x30\x22\x0a\x20\x20\x20\x68\x65\x69\x67\x68\ +\x74\x3d\x22\x31\x30\x30\x22\x0a\x20\x20\x20\x69\x64\x3d\x22\x73\ +\x76\x67\x32\x22\x0a\x20\x20\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\ +\x22\x31\x2e\x31\x22\x0a\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\ +\x65\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x34\x38\x2e\ +\x34\x20\x72\x39\x39\x33\x39\x22\x0a\x20\x20\x20\x73\x6f\x64\x69\ +\x70\x6f\x64\x69\x3a\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\x69\x63\ +\x6f\x6e\x5f\x37\x38\x35\x36\x30\x2e\x73\x76\x67\x22\x3e\x0a\x20\ +\x20\x3c\x64\x65\x66\x73\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\ +\x64\x65\x66\x73\x34\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x73\x6f\x64\ +\x69\x70\x6f\x64\x69\x3a\x6e\x61\x6d\x65\x64\x76\x69\x65\x77\x0a\ +\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x62\x61\x73\x65\x22\x0a\x20\ +\x20\x20\x20\x20\x70\x61\x67\x65\x63\x6f\x6c\x6f\x72\x3d\x22\x23\ +\x66\x66\x66\x66\x66\x66\x22\x0a\x20\x20\x20\x20\x20\x62\x6f\x72\ +\x64\x65\x72\x63\x6f\x6c\x6f\x72\x3d\x22\x23\x36\x36\x36\x36\x36\ +\x36\x22\x0a\x20\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x6f\x70\ +\x61\x63\x69\x74\x79\x3d\x22\x31\x2e\x30\x22\x0a\x20\x20\x20\x20\ +\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x70\x61\x67\x65\x6f\x70\ +\x61\x63\x69\x74\x79\x3d\x22\x30\x2e\x30\x22\x0a\x20\x20\x20\x20\ +\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x70\x61\x67\x65\x73\x68\ +\x61\x64\x6f\x77\x3d\x22\x32\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\ +\x6b\x73\x63\x61\x70\x65\x3a\x7a\x6f\x6f\x6d\x3d\x22\x31\x2e\x39\ +\x37\x39\x38\x39\x39\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\ +\x63\x61\x70\x65\x3a\x63\x78\x3d\x22\x36\x38\x2e\x36\x35\x35\x30\ +\x30\x34\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\ +\x65\x3a\x63\x79\x3d\x22\x38\x36\x2e\x33\x34\x30\x39\x30\x39\x22\ +\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x64\ +\x6f\x63\x75\x6d\x65\x6e\x74\x2d\x75\x6e\x69\x74\x73\x3d\x22\x70\ +\x78\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\ +\x3a\x63\x75\x72\x72\x65\x6e\x74\x2d\x6c\x61\x79\x65\x72\x3d\x22\ +\x6c\x61\x79\x65\x72\x31\x22\x0a\x20\x20\x20\x20\x20\x73\x68\x6f\ +\x77\x67\x72\x69\x64\x3d\x22\x66\x61\x6c\x73\x65\x22\x0a\x20\x20\ +\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\ +\x6f\x77\x2d\x77\x69\x64\x74\x68\x3d\x22\x31\x39\x32\x30\x22\x0a\ +\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\ +\x6e\x64\x6f\x77\x2d\x68\x65\x69\x67\x68\x74\x3d\x22\x31\x30\x34\ +\x39\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\ +\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x78\x3d\x22\x31\x39\x32\x30\x22\ +\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\ +\x69\x6e\x64\x6f\x77\x2d\x79\x3d\x22\x30\x22\x0a\x20\x20\x20\x20\ +\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\ +\x2d\x6d\x61\x78\x69\x6d\x69\x7a\x65\x64\x3d\x22\x31\x22\x20\x2f\ +\x3e\x0a\x20\x20\x3c\x6d\x65\x74\x61\x64\x61\x74\x61\x0a\x20\x20\ +\x20\x20\x20\x69\x64\x3d\x22\x6d\x65\x74\x61\x64\x61\x74\x61\x37\ +\x22\x3e\x0a\x20\x20\x20\x20\x3c\x72\x64\x66\x3a\x52\x44\x46\x3e\ +\x0a\x20\x20\x20\x20\x20\x20\x3c\x63\x63\x3a\x57\x6f\x72\x6b\x0a\ +\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x64\x66\x3a\x61\x62\x6f\ +\x75\x74\x3d\x22\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\ +\x64\x63\x3a\x66\x6f\x72\x6d\x61\x74\x3e\x69\x6d\x61\x67\x65\x2f\ +\x73\x76\x67\x2b\x78\x6d\x6c\x3c\x2f\x64\x63\x3a\x66\x6f\x72\x6d\ +\x61\x74\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\ +\x74\x79\x70\x65\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\ +\x72\x64\x66\x3a\x72\x65\x73\x6f\x75\x72\x63\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x70\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\ +\x2f\x64\x63\x6d\x69\x74\x79\x70\x65\x2f\x53\x74\x69\x6c\x6c\x49\ +\x6d\x61\x67\x65\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\ +\x20\x3c\x64\x63\x3a\x74\x69\x74\x6c\x65\x20\x2f\x3e\x0a\x20\x20\ +\x20\x20\x20\x20\x3c\x2f\x63\x63\x3a\x57\x6f\x72\x6b\x3e\x0a\x20\ +\x20\x20\x20\x3c\x2f\x72\x64\x66\x3a\x52\x44\x46\x3e\x0a\x20\x20\ +\x3c\x2f\x6d\x65\x74\x61\x64\x61\x74\x61\x3e\x0a\x20\x20\x3c\x67\ +\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x6c\ +\x61\x62\x65\x6c\x3d\x22\x4c\x61\x79\x65\x72\x20\x31\x22\x0a\x20\ +\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x67\x72\x6f\ +\x75\x70\x6d\x6f\x64\x65\x3d\x22\x6c\x61\x79\x65\x72\x22\x0a\x20\ +\x20\x20\x20\x20\x69\x64\x3d\x22\x6c\x61\x79\x65\x72\x31\x22\x0a\ +\x20\x20\x20\x20\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\ +\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x30\x2c\x2d\x39\x35\x32\ +\x2e\x33\x36\x32\x31\x38\x29\x22\x3e\x0a\x20\x20\x20\x20\x3c\x67\ +\x0a\x20\x20\x20\x20\x20\x20\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\ +\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x2d\x30\x2e\ +\x35\x30\x32\x30\x32\x35\x39\x34\x2c\x39\x35\x34\x2e\x33\x38\x30\ +\x34\x34\x29\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x69\x64\x3d\x22\ +\x67\x33\x30\x35\x30\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x70\ +\x61\x74\x68\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x73\x74\x79\ +\x6c\x65\x3d\x22\x66\x69\x6c\x6c\x2d\x72\x75\x6c\x65\x3a\x65\x76\ +\x65\x6e\x6f\x64\x64\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\ +\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x6f\x6e\x6e\x65\x63\x74\ +\x6f\x72\x2d\x63\x75\x72\x76\x61\x74\x75\x72\x65\x3d\x22\x30\x22\ +\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x63\x6c\x69\x70\x2d\x72\ +\x75\x6c\x65\x3d\x22\x65\x76\x65\x6e\x6f\x64\x64\x22\x0a\x20\x20\ +\x20\x20\x20\x20\x20\x20\x20\x64\x3d\x22\x6d\x20\x31\x30\x30\x2e\ +\x35\x30\x39\x31\x35\x2c\x36\x32\x2e\x39\x31\x30\x38\x34\x37\x20\ +\x63\x20\x2d\x37\x36\x2e\x30\x31\x38\x37\x37\x35\x2c\x30\x2e\x32\ +\x32\x31\x30\x37\x37\x20\x2d\x34\x32\x2e\x36\x36\x39\x33\x33\x32\ +\x2c\x30\x2e\x32\x38\x31\x34\x31\x31\x20\x2d\x39\x38\x2e\x39\x39\ +\x38\x39\x39\x37\x35\x2c\x30\x20\x6c\x20\x30\x2c\x2d\x32\x37\x2e\ +\x38\x34\x32\x20\x63\x20\x38\x39\x2e\x30\x39\x39\x34\x35\x36\x35\ +\x2c\x2d\x30\x2e\x35\x38\x37\x37\x30\x38\x20\x32\x31\x2e\x32\x37\ +\x33\x35\x31\x33\x35\x2c\x30\x20\x39\x38\x2e\x39\x39\x38\x39\x39\ +\x37\x35\x2c\x30\x20\x7a\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\ +\x20\x69\x64\x3d\x22\x70\x61\x74\x68\x33\x30\x35\x32\x22\x0a\x20\ +\x20\x20\x20\x20\x20\x20\x20\x20\x73\x6f\x64\x69\x70\x6f\x64\x69\ +\x3a\x6e\x6f\x64\x65\x74\x79\x70\x65\x73\x3d\x22\x63\x63\x63\x63\ +\x63\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\ +\x20\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\ \x00\x00\x08\xc7\ \x00\ \x00\x1f\xd1\x78\x9c\xdd\x59\x6d\x73\xdb\x36\x12\xfe\x1c\xfd\x0a\ @@ -4177,85 +4301,6 @@ \x64\x3e\x0a\x20\x20\x3c\x62\x6f\x64\x79\x3e\x0a\x20\x20\x20\x20\ \x3c\x64\x69\x76\x20\x63\x6c\x61\x73\x73\x3d\x27\x63\x6f\x6e\x74\ \x61\x69\x6e\x65\x72\x27\x3e\x0a\ -\x00\x00\x04\xcf\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x20\x00\x00\x00\x20\x08\x03\x00\x00\x00\x44\xa4\x8a\xc6\ -\x00\x00\x00\x04\x67\x41\x4d\x41\x00\x00\xb1\x8f\x0b\xfc\x61\x05\ -\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ -\x20\x63\x48\x52\x4d\x00\x00\x7a\x26\x00\x00\x80\x84\x00\x00\xfa\ -\x00\x00\x00\x80\xe8\x00\x00\x75\x30\x00\x00\xea\x60\x00\x00\x3a\ -\x98\x00\x00\x17\x70\x9c\xba\x51\x3c\x00\x00\x01\x56\x50\x4c\x54\ -\x45\x72\xa8\xa8\x80\x80\x7f\x90\x7a\x7a\xb6\x42\x4b\xba\x40\x49\ -\xaf\x48\x4f\xa8\x5e\x61\x44\x64\x89\x8f\x8b\x8b\x83\x95\x93\x9d\ -\x6e\x6f\xe7\x2d\x2f\xe9\x43\x4e\xa6\x5c\x60\x0c\x4c\x9a\xea\x37\ -\x42\xac\x51\x56\x3e\x64\x89\x7f\x8d\x8c\xa9\x7d\x7f\xbf\xc0\xc0\ -\xc7\xcb\xcb\xf1\xab\xab\xbd\xbd\xbd\x94\x94\x94\x8e\x8d\x8d\x9e\ -\x9d\x9d\xff\xf1\xf0\x88\x87\x87\xb5\xb9\xb9\x15\x53\x9f\x0f\x51\ -\xa0\x15\x51\x9d\x0a\x4d\x9d\x03\x49\x9b\x04\x4a\x9c\x03\x49\x9c\ -\x02\x49\x9c\x06\x4b\x9d\x07\x4c\x9c\x05\x4a\x9c\xd0\x3b\x44\xe6\ -\x16\x1c\xe3\x07\x17\xe9\x54\x5b\xec\x75\x7a\xe5\x00\x0a\xf0\x8c\ -\x8f\xe9\x49\x53\xd9\x2c\x38\xc9\x2d\x37\xf0\x95\x98\xeb\x6c\x71\ -\xe5\x17\x25\xe4\x0e\x20\xf3\xb5\xb7\xd6\x0b\x18\xe6\x28\x36\xe5\ -\x26\x17\xe8\x4a\x17\xeb\x69\x14\xaf\x60\x42\xe8\x51\x0d\xed\x7b\ -\x80\xe6\x3d\x1c\xf1\x8d\x1a\xf6\x84\x00\x8e\x6b\x40\x18\x4e\x8e\ -\xed\x7a\x01\xea\x5d\x65\xd1\x1b\x28\xee\x84\x87\xf1\x74\x0d\xee\ -\x82\x01\x00\x46\xa2\xf1\xa5\xa7\xeb\x64\x69\x68\x62\x5b\x01\x48\ -\x9c\xd8\x7d\x0f\x7c\x67\x4e\x4f\x5c\x6c\xea\x5f\x12\xcb\x7a\x1a\ -\x28\x52\x86\xfc\xfb\xfb\xfa\xdc\xdb\xa2\x71\x36\x36\x55\x7d\xf3\ -\xaa\x66\xf7\xd3\xbb\xbc\x77\x23\xf4\xb3\x67\x8f\x6b\x3f\xf8\xca\ -\xc9\xfa\xe5\xd9\xf3\xaf\xb1\xf6\xc5\x86\xe6\xe7\xe7\xf0\x91\x21\ -\x78\x68\x53\xf9\xe6\xcb\xcf\xd3\xd3\xfa\xea\xea\xf9\xd4\xa3\xef\ -\x95\x98\xd4\xd5\xd5\xfd\xee\xf1\xfa\xa6\x3c\xf4\xbe\xc1\xf5\xc5\ -\x9a\xf3\xad\x59\xff\xff\xff\x35\x65\x83\x46\x00\x00\x00\x29\x74\ -\x52\x4e\x53\x00\x45\x83\xf8\xec\xd8\xc9\x31\x85\x70\xac\xfe\xfe\ -\xe9\x4d\xfe\xd5\x11\x2b\xd1\xf6\xfe\xfe\xe7\x8b\x7a\xa8\xfe\x6b\ -\xd8\x3b\x6d\x1e\x64\x85\xea\xd6\xa2\xdc\x88\xce\x2c\xe4\x15\x26\ -\x00\x00\x00\x01\x62\x4b\x47\x44\x71\xaf\x07\x5c\xe2\x00\x00\x00\ -\x09\x70\x48\x59\x73\x00\x00\x2e\x18\x00\x00\x2e\x18\x01\x2a\xaa\ -\x27\x20\x00\x00\x02\x32\x49\x44\x41\x54\x38\xcb\x75\x93\xfd\x5f\ -\xd2\x40\x1c\xc7\x0f\x29\xa4\x32\x8a\x14\x7b\xd0\x18\x81\x4c\xdb\ -\x78\x18\x2d\x98\x03\x2a\x19\x8c\xe6\x1d\x78\x65\x32\x44\xab\xf1\ -\xa0\x88\x40\xe6\xff\xff\x53\xdf\x9b\x6c\x3c\xe5\x67\x7b\xed\x76\ -\xf7\x79\xef\x73\xf7\xbd\x6d\x08\xcd\xc8\xb3\xe2\x7d\xe0\x7d\xe8\ -\x5b\x59\x45\xff\xd3\xaa\xff\xbd\x20\x26\x92\xa9\x74\x4a\xca\xf8\ -\x3c\xcb\xfe\xa3\x0f\x29\xf9\xa3\x98\x4d\xe4\xa4\xac\x22\x4a\xfb\ -\x8f\x17\x7d\xff\x7e\x52\x52\x73\xf9\x42\xf1\xd3\xe7\x82\xa8\x3e\ -\xf9\xb2\xf6\x74\xc1\xcf\x48\x92\x70\x50\xd2\xb4\x72\x45\xd3\xb5\ -\xa2\x50\xcd\xce\x13\x81\xaf\x6b\x46\xea\x50\xd3\xf0\x21\x21\x65\ -\x68\xb4\xbc\x5a\xcb\xcd\xce\xe2\xad\x4b\xa9\x92\x8e\xb1\x76\x44\ -\x68\x05\x83\xb4\x03\xe1\x99\x3a\x5d\xa9\x47\x54\xd5\x22\xf8\xf8\ -\x1b\xa1\x84\x7c\x07\x1f\x63\xa1\x96\xf5\xb9\xc0\x73\x43\xca\xdb\ -\xcf\x1d\x53\x10\x61\xb7\xf8\x47\xae\x9a\x09\x3a\x40\xa6\x2a\x15\ -\x61\x4c\x3f\x21\x36\x70\x0c\x01\xb8\x94\x55\x45\xff\xc4\x7f\x91\ -\x10\x52\x25\x16\xd0\x00\x80\x9d\x27\x2c\xa2\x20\x64\xd7\x9d\x1a\ -\x4d\xb3\xc9\x56\x70\x6a\x07\x80\x5a\x10\xa1\x9f\x99\xe6\x86\x0b\ -\xa4\xcf\x59\x09\x15\x6a\x07\xc0\xe5\x27\xe0\xbf\x64\x39\xe4\x02\ -\x35\x06\xfc\x76\x02\x28\x6d\x40\xc4\x99\x95\x74\x81\xb6\xd1\xd1\ -\x75\x8d\x4e\x02\xd8\x2a\x4e\x31\xee\x6e\x36\x5f\x3a\xdb\xd0\x53\ -\x3a\x17\xf8\x92\xce\x4a\xd3\xfb\x89\xe6\x2b\xa7\xcc\x2b\x59\xe9\ -\xea\x84\xcc\x02\xe5\x92\xd5\x1c\xbc\x76\x80\x37\x5b\x86\x75\xd9\ -\x68\xb5\x5a\x8d\xc9\x01\xba\xde\x1c\x8e\xa6\x5b\x3d\x56\x86\xd7\ -\xda\x9c\xfe\x28\x75\xd3\xef\x02\xe8\x68\x90\xbc\xe9\xe2\xa9\x8d\ -\x2f\x2c\xcb\x1a\xcd\x7e\x79\xa1\x81\x71\xf3\x17\x3b\xd2\x6f\xad\ -\xb4\xd1\xdb\x9e\xfb\x62\x42\xcd\x5a\x6d\xd0\x85\x57\xae\xeb\xf8\ -\xb6\x3d\xee\x18\xb3\x13\x30\x05\x43\x56\x47\x1e\x9a\xed\x7e\xff\ -\xdc\xac\x19\x49\xb3\xb7\xe0\xb3\x52\x7a\x96\x3c\x90\x0c\x63\xa8\ -\xd4\x2d\x73\x23\x88\x96\x15\x5c\xbf\x1a\x99\xe3\xe6\x56\x6f\xf4\ -\x76\x1b\xdd\xa3\xa0\x1f\xb4\xec\x86\x39\x2e\x60\x37\x28\xc2\x2a\ -\x7b\x67\xf7\xd0\xdd\xa0\xad\x68\x6c\x87\x86\x61\x84\x06\xe2\x3b\ -\xd0\xa5\x3c\x89\x22\x14\x81\x86\x73\x00\x3e\x1c\xb3\x01\x9e\xdb\ -\x85\x2e\x09\xc7\xe3\xd0\x23\x61\xde\x05\x28\x8d\xb1\x4c\x9e\xf0\ -\x76\x02\xa5\xe0\x04\xa0\x71\xe6\x88\xee\x21\x36\xc4\xed\x71\x2c\ -\x1b\xdd\x25\x07\x28\xda\xe5\xdd\x84\x18\x83\x23\x3c\x4c\xcf\x12\ -\x6c\x20\x02\xbf\x08\xc3\xff\x01\x5b\x04\x9b\xb8\x39\x5a\xf5\xc5\ -\x00\x00\x00\x25\x74\x45\x58\x74\x64\x61\x74\x65\x3a\x63\x72\x65\ -\x61\x74\x65\x00\x32\x30\x31\x34\x2d\x31\x30\x2d\x31\x36\x54\x32\ -\x33\x3a\x33\x32\x3a\x33\x32\x2b\x30\x32\x3a\x30\x30\xe5\x22\x95\ -\x30\x00\x00\x00\x25\x74\x45\x58\x74\x64\x61\x74\x65\x3a\x6d\x6f\ -\x64\x69\x66\x79\x00\x32\x30\x31\x34\x2d\x31\x30\x2d\x31\x36\x54\ -\x32\x33\x3a\x33\x32\x3a\x33\x32\x2b\x30\x32\x3a\x30\x30\x94\x7f\ -\x2d\x8c\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \x00\x00\x08\x69\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -4393,6 +4438,85 @@ \x63\x75\x72\x72\x65\x6e\x74\x43\x6f\x6c\x6f\x72\x22\x20\x2f\x3e\ \x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\ \x0a\x3c\x2f\x73\x76\x67\x3e\x0a\ +\x00\x00\x04\xcf\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x20\x00\x00\x00\x20\x08\x03\x00\x00\x00\x44\xa4\x8a\xc6\ +\x00\x00\x00\x04\x67\x41\x4d\x41\x00\x00\xb1\x8f\x0b\xfc\x61\x05\ +\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ +\x20\x63\x48\x52\x4d\x00\x00\x7a\x26\x00\x00\x80\x84\x00\x00\xfa\ +\x00\x00\x00\x80\xe8\x00\x00\x75\x30\x00\x00\xea\x60\x00\x00\x3a\ +\x98\x00\x00\x17\x70\x9c\xba\x51\x3c\x00\x00\x01\x56\x50\x4c\x54\ +\x45\x72\xa8\xa8\x80\x80\x7f\x90\x7a\x7a\xb6\x42\x4b\xba\x40\x49\ +\xaf\x48\x4f\xa8\x5e\x61\x44\x64\x89\x8f\x8b\x8b\x83\x95\x93\x9d\ +\x6e\x6f\xe7\x2d\x2f\xe9\x43\x4e\xa6\x5c\x60\x0c\x4c\x9a\xea\x37\ +\x42\xac\x51\x56\x3e\x64\x89\x7f\x8d\x8c\xa9\x7d\x7f\xbf\xc0\xc0\ +\xc7\xcb\xcb\xf1\xab\xab\xbd\xbd\xbd\x94\x94\x94\x8e\x8d\x8d\x9e\ +\x9d\x9d\xff\xf1\xf0\x88\x87\x87\xb5\xb9\xb9\x15\x53\x9f\x0f\x51\ +\xa0\x15\x51\x9d\x0a\x4d\x9d\x03\x49\x9b\x04\x4a\x9c\x03\x49\x9c\ +\x02\x49\x9c\x06\x4b\x9d\x07\x4c\x9c\x05\x4a\x9c\xd0\x3b\x44\xe6\ +\x16\x1c\xe3\x07\x17\xe9\x54\x5b\xec\x75\x7a\xe5\x00\x0a\xf0\x8c\ +\x8f\xe9\x49\x53\xd9\x2c\x38\xc9\x2d\x37\xf0\x95\x98\xeb\x6c\x71\ +\xe5\x17\x25\xe4\x0e\x20\xf3\xb5\xb7\xd6\x0b\x18\xe6\x28\x36\xe5\ +\x26\x17\xe8\x4a\x17\xeb\x69\x14\xaf\x60\x42\xe8\x51\x0d\xed\x7b\ +\x80\xe6\x3d\x1c\xf1\x8d\x1a\xf6\x84\x00\x8e\x6b\x40\x18\x4e\x8e\ +\xed\x7a\x01\xea\x5d\x65\xd1\x1b\x28\xee\x84\x87\xf1\x74\x0d\xee\ +\x82\x01\x00\x46\xa2\xf1\xa5\xa7\xeb\x64\x69\x68\x62\x5b\x01\x48\ +\x9c\xd8\x7d\x0f\x7c\x67\x4e\x4f\x5c\x6c\xea\x5f\x12\xcb\x7a\x1a\ +\x28\x52\x86\xfc\xfb\xfb\xfa\xdc\xdb\xa2\x71\x36\x36\x55\x7d\xf3\ +\xaa\x66\xf7\xd3\xbb\xbc\x77\x23\xf4\xb3\x67\x8f\x6b\x3f\xf8\xca\ +\xc9\xfa\xe5\xd9\xf3\xaf\xb1\xf6\xc5\x86\xe6\xe7\xe7\xf0\x91\x21\ +\x78\x68\x53\xf9\xe6\xcb\xcf\xd3\xd3\xfa\xea\xea\xf9\xd4\xa3\xef\ +\x95\x98\xd4\xd5\xd5\xfd\xee\xf1\xfa\xa6\x3c\xf4\xbe\xc1\xf5\xc5\ +\x9a\xf3\xad\x59\xff\xff\xff\x35\x65\x83\x46\x00\x00\x00\x29\x74\ +\x52\x4e\x53\x00\x45\x83\xf8\xec\xd8\xc9\x31\x85\x70\xac\xfe\xfe\ +\xe9\x4d\xfe\xd5\x11\x2b\xd1\xf6\xfe\xfe\xe7\x8b\x7a\xa8\xfe\x6b\ +\xd8\x3b\x6d\x1e\x64\x85\xea\xd6\xa2\xdc\x88\xce\x2c\xe4\x15\x26\ +\x00\x00\x00\x01\x62\x4b\x47\x44\x71\xaf\x07\x5c\xe2\x00\x00\x00\ +\x09\x70\x48\x59\x73\x00\x00\x2e\x18\x00\x00\x2e\x18\x01\x2a\xaa\ +\x27\x20\x00\x00\x02\x32\x49\x44\x41\x54\x38\xcb\x75\x93\xfd\x5f\ +\xd2\x40\x1c\xc7\x0f\x29\xa4\x32\x8a\x14\x7b\xd0\x18\x81\x4c\xdb\ +\x78\x18\x2d\x98\x03\x2a\x19\x8c\xe6\x1d\x78\x65\x32\x44\xab\xf1\ +\xa0\x88\x40\xe6\xff\xff\x53\xdf\x9b\x6c\x3c\xe5\x67\x7b\xed\x76\ +\xf7\x79\xef\x73\xf7\xbd\x6d\x08\xcd\xc8\xb3\xe2\x7d\xe0\x7d\xe8\ +\x5b\x59\x45\xff\xd3\xaa\xff\xbd\x20\x26\x92\xa9\x74\x4a\xca\xf8\ +\x3c\xcb\xfe\xa3\x0f\x29\xf9\xa3\x98\x4d\xe4\xa4\xac\x22\x4a\xfb\ +\x8f\x17\x7d\xff\x7e\x52\x52\x73\xf9\x42\xf1\xd3\xe7\x82\xa8\x3e\ +\xf9\xb2\xf6\x74\xc1\xcf\x48\x92\x70\x50\xd2\xb4\x72\x45\xd3\xb5\ +\xa2\x50\xcd\xce\x13\x81\xaf\x6b\x46\xea\x50\xd3\xf0\x21\x21\x65\ +\x68\xb4\xbc\x5a\xcb\xcd\xce\xe2\xad\x4b\xa9\x92\x8e\xb1\x76\x44\ +\x68\x05\x83\xb4\x03\xe1\x99\x3a\x5d\xa9\x47\x54\xd5\x22\xf8\xf8\ +\x1b\xa1\x84\x7c\x07\x1f\x63\xa1\x96\xf5\xb9\xc0\x73\x43\xca\xdb\ +\xcf\x1d\x53\x10\x61\xb7\xf8\x47\xae\x9a\x09\x3a\x40\xa6\x2a\x15\ +\x61\x4c\x3f\x21\x36\x70\x0c\x01\xb8\x94\x55\x45\xff\xc4\x7f\x91\ +\x10\x52\x25\x16\xd0\x00\x80\x9d\x27\x2c\xa2\x20\x64\xd7\x9d\x1a\ +\x4d\xb3\xc9\x56\x70\x6a\x07\x80\x5a\x10\xa1\x9f\x99\xe6\x86\x0b\ +\xa4\xcf\x59\x09\x15\x6a\x07\xc0\xe5\x27\xe0\xbf\x64\x39\xe4\x02\ +\x35\x06\xfc\x76\x02\x28\x6d\x40\xc4\x99\x95\x74\x81\xb6\xd1\xd1\ +\x75\x8d\x4e\x02\xd8\x2a\x4e\x31\xee\x6e\x36\x5f\x3a\xdb\xd0\x53\ +\x3a\x17\xf8\x92\xce\x4a\xd3\xfb\x89\xe6\x2b\xa7\xcc\x2b\x59\xe9\ +\xea\x84\xcc\x02\xe5\x92\xd5\x1c\xbc\x76\x80\x37\x5b\x86\x75\xd9\ +\x68\xb5\x5a\x8d\xc9\x01\xba\xde\x1c\x8e\xa6\x5b\x3d\x56\x86\xd7\ +\xda\x9c\xfe\x28\x75\xd3\xef\x02\xe8\x68\x90\xbc\xe9\xe2\xa9\x8d\ +\x2f\x2c\xcb\x1a\xcd\x7e\x79\xa1\x81\x71\xf3\x17\x3b\xd2\x6f\xad\ +\xb4\xd1\xdb\x9e\xfb\x62\x42\xcd\x5a\x6d\xd0\x85\x57\xae\xeb\xf8\ +\xb6\x3d\xee\x18\xb3\x13\x30\x05\x43\x56\x47\x1e\x9a\xed\x7e\xff\ +\xdc\xac\x19\x49\xb3\xb7\xe0\xb3\x52\x7a\x96\x3c\x90\x0c\x63\xa8\ +\xd4\x2d\x73\x23\x88\x96\x15\x5c\xbf\x1a\x99\xe3\xe6\x56\x6f\xf4\ +\x76\x1b\xdd\xa3\xa0\x1f\xb4\xec\x86\x39\x2e\x60\x37\x28\xc2\x2a\ +\x7b\x67\xf7\xd0\xdd\xa0\xad\x68\x6c\x87\x86\x61\x84\x06\xe2\x3b\ +\xd0\xa5\x3c\x89\x22\x14\x81\x86\x73\x00\x3e\x1c\xb3\x01\x9e\xdb\ +\x85\x2e\x09\xc7\xe3\xd0\x23\x61\xde\x05\x28\x8d\xb1\x4c\x9e\xf0\ +\x76\x02\xa5\xe0\x04\xa0\x71\xe6\x88\xee\x21\x36\xc4\xed\x71\x2c\ +\x1b\xdd\x25\x07\x28\xda\xe5\xdd\x84\x18\x83\x23\x3c\x4c\xcf\x12\ +\x6c\x20\x02\xbf\x08\xc3\xff\x01\x5b\x04\x9b\xb8\x39\x5a\xf5\xc5\ +\x00\x00\x00\x25\x74\x45\x58\x74\x64\x61\x74\x65\x3a\x63\x72\x65\ +\x61\x74\x65\x00\x32\x30\x31\x34\x2d\x31\x30\x2d\x31\x36\x54\x32\ +\x33\x3a\x33\x32\x3a\x33\x32\x2b\x30\x32\x3a\x30\x30\xe5\x22\x95\ +\x30\x00\x00\x00\x25\x74\x45\x58\x74\x64\x61\x74\x65\x3a\x6d\x6f\ +\x64\x69\x66\x79\x00\x32\x30\x31\x34\x2d\x31\x30\x2d\x31\x36\x54\ +\x32\x33\x3a\x33\x32\x3a\x33\x32\x2b\x30\x32\x3a\x30\x30\x94\x7f\ +\x2d\x8c\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \x00\x00\x0d\x82\ \x00\ \x00\x76\x0a\x78\x9c\xed\x5d\x6d\x6f\xdb\xb6\x16\xfe\xbe\x5f\x21\ @@ -4847,6 +4971,85 @@ \x01\xfe\x04\xe5\x04\x40\x05\xba\x26\x26\xfb\xbe\xb4\x66\x82\x74\ \xb1\x77\x09\xbe\xa4\x2f\x11\x41\x02\x69\x41\x9e\xeb\x52\x97\x3e\ \xea\xbb\xd9\xcd\x7f\x01\x89\x31\xe1\x09\ +\x00\x00\x03\x08\ +\x3c\ +\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ +\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\ +\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\ +\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\x6b\ +\x22\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\ +\x69\x64\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x3d\x22\ +\x30\x70\x78\x22\x20\x79\x3d\x22\x30\x70\x78\x22\x20\x77\x69\x64\ +\x74\x68\x3d\x22\x31\x30\x30\x70\x78\x22\x20\x68\x65\x69\x67\x68\ +\x74\x3d\x22\x31\x30\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\ +\x78\x3d\x22\x30\x20\x30\x20\x31\x30\x30\x20\x31\x30\x30\x22\x20\ +\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\ +\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x31\x30\x30\x20\x31\ +\x30\x30\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\ +\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\ +\x22\x59\x6f\x75\x72\x5f\x49\x63\x6f\x6e\x22\x3e\x0a\x09\x3c\x67\ +\x3e\x0a\x09\x09\x3c\x67\x3e\x0a\x09\x09\x09\x3c\x70\x61\x74\x68\ +\x20\x66\x69\x6c\x6c\x3d\x22\x23\x30\x30\x30\x30\x30\x30\x22\x20\ +\x64\x3d\x22\x4d\x36\x32\x2e\x34\x32\x33\x2c\x35\x34\x2e\x36\x35\ +\x32\x6c\x32\x32\x2e\x39\x39\x35\x2d\x32\x32\x2e\x39\x38\x34\x63\ +\x30\x2c\x30\x2c\x30\x2e\x39\x37\x39\x2d\x34\x2e\x39\x33\x31\x2d\ +\x35\x2e\x36\x2d\x31\x31\x2e\x34\x39\x37\x63\x2d\x36\x2e\x35\x35\ +\x34\x2d\x36\x2e\x35\x36\x37\x2d\x31\x31\x2e\x34\x37\x39\x2d\x35\ +\x2e\x35\x37\x37\x2d\x31\x31\x2e\x34\x37\x39\x2d\x35\x2e\x35\x37\ +\x37\x20\x20\x20\x20\x20\x4c\x34\x35\x2e\x33\x35\x34\x2c\x33\x37\ +\x2e\x35\x36\x36\x4c\x31\x39\x2e\x30\x39\x32\x2c\x36\x33\x2e\x38\ +\x32\x37\x4c\x31\x34\x2e\x35\x2c\x38\x35\x2e\x35\x30\x32\x6c\x30\ +\x2e\x30\x33\x35\x2d\x30\x2e\x30\x30\x35\x68\x2d\x30\x2e\x30\x31\ +\x36\x6c\x32\x31\x2e\x36\x34\x32\x2d\x34\x2e\x35\x39\x36\x4c\x36\ +\x32\x2e\x34\x32\x33\x2c\x35\x34\x2e\x36\x35\x32\x7a\x20\x4d\x32\ +\x37\x2e\x34\x38\x36\x2c\x37\x39\x2e\x38\x39\x31\x20\x20\x20\x20\ +\x20\x63\x2d\x30\x2e\x37\x32\x31\x2d\x31\x2e\x33\x33\x33\x2d\x31\ +\x2e\x35\x36\x37\x2d\x32\x2e\x36\x36\x39\x2d\x33\x2e\x31\x34\x37\ +\x2d\x34\x2e\x32\x33\x32\x63\x2d\x31\x2e\x35\x36\x36\x2d\x31\x2e\ +\x35\x37\x2d\x32\x2e\x39\x30\x37\x2d\x32\x2e\x34\x33\x31\x2d\x34\ +\x2e\x32\x33\x31\x2d\x33\x2e\x31\x35\x39\x6c\x31\x2e\x35\x38\x38\ +\x2d\x37\x2e\x33\x36\x38\x6c\x32\x2e\x31\x34\x35\x2d\x32\x2e\x31\ +\x34\x35\x20\x20\x20\x20\x20\x63\x30\x2c\x30\x2c\x34\x2e\x30\x31\ +\x39\x2c\x30\x2e\x30\x39\x35\x2c\x38\x2e\x35\x34\x35\x2c\x34\x2e\ +\x36\x32\x32\x63\x34\x2e\x35\x34\x34\x2c\x34\x2e\x35\x34\x31\x2c\ +\x34\x2e\x36\x33\x31\x2c\x38\x2e\x35\x36\x36\x2c\x34\x2e\x36\x33\ +\x31\x2c\x38\x2e\x35\x36\x36\x6c\x2d\x32\x2e\x31\x34\x34\x2c\x32\ +\x2e\x31\x32\x32\x4c\x32\x37\x2e\x34\x38\x36\x2c\x37\x39\x2e\x38\ +\x39\x31\x7a\x20\x4d\x35\x35\x2e\x36\x33\x31\x2c\x36\x37\x2e\x37\ +\x35\x35\x4c\x33\x37\x2e\x38\x37\x34\x2c\x38\x35\x2e\x34\x39\x37\ +\x20\x20\x20\x20\x20\x68\x34\x37\x2e\x35\x39\x35\x56\x36\x37\x2e\ +\x37\x35\x35\x48\x35\x35\x2e\x36\x33\x31\x7a\x22\x2f\x3e\x0a\x09\ +\x09\x3c\x2f\x67\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\ +\x0a\x3c\x2f\x73\x76\x67\x3e\ +\x00\x00\x01\x92\ +\x3c\ +\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ +\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\ +\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\ +\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\x6b\ +\x22\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\ +\x69\x64\x3d\x22\x59\x6f\x75\x72\x5f\x49\x63\x6f\x6e\x22\x20\x78\ +\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\x22\x30\x70\x78\x22\x20\x77\ +\x69\x64\x74\x68\x3d\x22\x31\x30\x30\x70\x78\x22\x20\x68\x65\x69\ +\x67\x68\x74\x3d\x22\x31\x30\x30\x70\x78\x22\x20\x76\x69\x65\x77\ +\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x31\x30\x30\x20\x31\x30\x30\ +\x22\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\ +\x75\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x31\x30\x30\ +\x20\x31\x30\x30\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\ +\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\ +\x09\x3c\x70\x61\x74\x68\x20\x66\x69\x6c\x6c\x2d\x72\x75\x6c\x65\ +\x3d\x22\x65\x76\x65\x6e\x6f\x64\x64\x22\x20\x63\x6c\x69\x70\x2d\ +\x72\x75\x6c\x65\x3d\x22\x65\x76\x65\x6e\x6f\x64\x64\x22\x20\x64\ +\x3d\x22\x4d\x39\x39\x2e\x34\x39\x39\x2c\x36\x33\x2e\x39\x32\x31\ +\x48\x36\x33\x2e\x39\x32\x32\x76\x33\x35\x2e\x35\x37\x38\x48\x33\ +\x36\x2e\x30\x37\x38\x56\x36\x33\x2e\x39\x32\x31\x48\x30\x2e\x35\ +\x56\x33\x36\x2e\x30\x37\x39\x68\x33\x35\x2e\x35\x37\x38\x56\x30\ +\x2e\x35\x68\x32\x37\x2e\x38\x34\x34\x76\x33\x35\x2e\x35\x37\x39\ +\x20\x20\x20\x68\x33\x35\x2e\x35\x37\x37\x56\x36\x33\x2e\x39\x32\ +\x31\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\ +\x3e\ \x00\x00\x03\xc2\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -8822,6 +9025,101 @@ \x0a\ \x20\x20\x20\x20\x3c\x2f\x64\x69\x76\x3e\x0a\x20\x20\x3c\x2f\x62\ \x6f\x64\x79\x3e\x0a\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\x0a\ +\x00\x00\x05\xd0\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x20\x73\x74\x61\x6e\x64\x61\x6c\x6f\x6e\x65\x3d\x22\ +\x6e\x6f\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x43\x72\x65\x61\x74\ +\x65\x64\x20\x77\x69\x74\x68\x20\x49\x6e\x6b\x73\x63\x61\x70\x65\ +\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x69\x6e\x6b\ +\x73\x63\x61\x70\x65\x2e\x6f\x72\x67\x2f\x29\x20\x2d\x2d\x3e\x0a\ +\x0a\x3c\x73\x76\x67\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x64\ +\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\x72\x6c\x2e\x6f\ +\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\x6e\x74\x73\x2f\x31\ +\x2e\x31\x2f\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x63\x63\ +\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x63\x72\x65\x61\x74\x69\x76\ +\x65\x63\x6f\x6d\x6d\x6f\x6e\x73\x2e\x6f\x72\x67\x2f\x6e\x73\x23\ +\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x72\x64\x66\x3d\x22\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ +\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\x32\x2d\x72\x64\x66\ +\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\x22\x0a\x20\x20\x20\ +\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ +\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3d\ +\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\ +\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\ +\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x20\x20\ +\x20\x77\x69\x64\x74\x68\x3d\x22\x32\x35\x36\x22\x0a\x20\x20\x20\ +\x68\x65\x69\x67\x68\x74\x3d\x22\x32\x35\x36\x22\x0a\x20\x20\x20\ +\x69\x64\x3d\x22\x73\x76\x67\x35\x36\x32\x38\x22\x3e\x0a\x20\x20\ +\x3c\x64\x65\x66\x73\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x64\ +\x65\x66\x73\x35\x36\x33\x30\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x6d\ +\x65\x74\x61\x64\x61\x74\x61\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\ +\x22\x6d\x65\x74\x61\x64\x61\x74\x61\x35\x36\x33\x33\x22\x3e\x0a\ +\x20\x20\x20\x20\x3c\x72\x64\x66\x3a\x52\x44\x46\x3e\x0a\x20\x20\ +\x20\x20\x20\x20\x3c\x63\x63\x3a\x57\x6f\x72\x6b\x0a\x20\x20\x20\ +\x20\x20\x20\x20\x20\x20\x72\x64\x66\x3a\x61\x62\x6f\x75\x74\x3d\ +\x22\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\ +\x66\x6f\x72\x6d\x61\x74\x3e\x69\x6d\x61\x67\x65\x2f\x73\x76\x67\ +\x2b\x78\x6d\x6c\x3c\x2f\x64\x63\x3a\x66\x6f\x72\x6d\x61\x74\x3e\ +\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x74\x79\x70\ +\x65\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x64\x66\ +\x3a\x72\x65\x73\x6f\x75\x72\x63\x65\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x70\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x64\x63\ +\x6d\x69\x74\x79\x70\x65\x2f\x53\x74\x69\x6c\x6c\x49\x6d\x61\x67\ +\x65\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\ +\x63\x3a\x74\x69\x74\x6c\x65\x3e\x3c\x2f\x64\x63\x3a\x74\x69\x74\ +\x6c\x65\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\x63\x63\x3a\x57\ +\x6f\x72\x6b\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x72\x64\x66\x3a\x52\ +\x44\x46\x3e\x0a\x20\x20\x3c\x2f\x6d\x65\x74\x61\x64\x61\x74\x61\ +\x3e\x0a\x20\x20\x3c\x67\x0a\x20\x20\x20\x20\x20\x74\x72\x61\x6e\ +\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\ +\x28\x30\x2c\x2d\x37\x39\x36\x2e\x33\x36\x32\x31\x38\x29\x22\x0a\ +\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x6c\x61\x79\x65\x72\x31\x22\ +\x3e\x0a\x20\x20\x20\x20\x3c\x67\x0a\x20\x20\x20\x20\x20\x20\x20\ +\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x6d\x61\x74\x72\x69\ +\x78\x28\x30\x2e\x35\x38\x39\x34\x36\x39\x30\x39\x2c\x30\x2c\x30\ +\x2c\x2d\x30\x2e\x35\x38\x39\x34\x36\x39\x30\x39\x2c\x2d\x32\x32\ +\x2e\x33\x31\x34\x36\x31\x38\x2c\x31\x30\x35\x36\x2e\x34\x30\x33\ +\x33\x29\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x67\ +\x36\x31\x36\x37\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x70\x61\ +\x74\x68\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x64\x3d\x22\x6d\ +\x20\x32\x38\x39\x2c\x33\x30\x35\x20\x71\x20\x31\x32\x2c\x2d\x34\ +\x20\x32\x30\x2e\x35\x2c\x2d\x35\x2e\x35\x20\x38\x2e\x35\x2c\x2d\ +\x31\x2e\x35\x20\x31\x39\x2e\x35\x2c\x2d\x31\x20\x31\x31\x2c\x30\ +\x2e\x35\x20\x31\x37\x2e\x35\x2c\x38\x20\x36\x2e\x35\x2c\x37\x2e\ +\x35\x20\x38\x2e\x35\x2c\x32\x32\x2e\x35\x20\x32\x2c\x31\x30\x20\ +\x31\x30\x2e\x35\x2c\x31\x35\x20\x38\x2e\x35\x2c\x35\x20\x31\x38\ +\x2c\x35\x2e\x35\x20\x39\x2e\x35\x2c\x30\x2e\x35\x20\x32\x30\x2c\ +\x30\x2e\x35\x20\x48\x20\x34\x32\x31\x20\x71\x20\x32\x31\x2c\x33\ +\x20\x31\x33\x2c\x32\x38\x20\x2d\x39\x2c\x32\x37\x20\x2d\x33\x36\ +\x2c\x33\x36\x20\x2d\x35\x2c\x32\x20\x2d\x31\x31\x2c\x32\x20\x2d\ +\x32\x39\x2c\x30\x20\x2d\x34\x36\x2c\x2d\x31\x33\x20\x2d\x31\x37\ +\x2c\x2d\x31\x33\x20\x2d\x33\x31\x2c\x2d\x34\x32\x20\x2d\x35\x2c\ +\x2d\x31\x36\x20\x2d\x31\x34\x2c\x2d\x32\x32\x2e\x35\x20\x2d\x39\ +\x2c\x2d\x36\x2e\x35\x20\x2d\x32\x38\x2c\x30\x2e\x35\x20\x2d\x32\ +\x33\x2c\x37\x20\x2d\x33\x35\x2c\x2d\x37\x2e\x35\x20\x2d\x31\x32\ +\x2c\x2d\x31\x34\x2e\x35\x20\x31\x2c\x2d\x33\x37\x2e\x35\x20\x37\ +\x2c\x2d\x31\x31\x20\x37\x2c\x2d\x32\x34\x2e\x35\x20\x30\x2c\x2d\ +\x31\x33\x2e\x35\x20\x2d\x34\x2c\x2d\x32\x30\x2e\x35\x20\x6c\x20\ +\x2d\x33\x2c\x2d\x38\x20\x68\x20\x34\x34\x20\x71\x20\x30\x2c\x31\ +\x35\x20\x2d\x31\x30\x2c\x33\x32\x20\x2d\x31\x31\x2c\x31\x35\x20\ +\x2d\x34\x2c\x32\x37\x2e\x35\x20\x37\x2c\x31\x32\x2e\x35\x20\x32\ +\x35\x2c\x34\x2e\x35\x20\x7a\x20\x4d\x20\x35\x35\x2c\x33\x32\x20\ +\x71\x20\x39\x39\x2c\x37\x32\x20\x31\x33\x37\x2c\x31\x38\x32\x20\ +\x6c\x20\x35\x2c\x31\x36\x20\x68\x20\x31\x31\x38\x20\x71\x20\x31\ +\x2c\x2d\x34\x20\x33\x2e\x35\x2c\x2d\x31\x32\x2e\x35\x20\x51\x20\ +\x33\x32\x31\x2c\x32\x30\x39\x20\x33\x33\x32\x2c\x31\x38\x34\x2e\ +\x35\x20\x33\x34\x33\x2c\x31\x36\x30\x20\x33\x35\x37\x2c\x31\x33\ +\x37\x20\x33\x37\x31\x2c\x31\x31\x34\x20\x33\x39\x37\x2e\x35\x2c\ +\x38\x34\x2e\x35\x20\x34\x32\x34\x2c\x35\x35\x20\x34\x35\x35\x2c\ +\x33\x32\x20\x48\x20\x35\x35\x20\x7a\x22\x0a\x20\x20\x20\x20\x20\ +\x20\x20\x20\x20\x69\x64\x3d\x22\x70\x61\x74\x68\x36\x31\x36\x39\ +\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x73\x74\x79\x6c\x65\ +\x3d\x22\x66\x69\x6c\x6c\x3a\x63\x75\x72\x72\x65\x6e\x74\x43\x6f\ +\x6c\x6f\x72\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\ +\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\ \x00\x00\x08\xde\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -8966,101 +9264,6 @@ \x69\x66\x79\x00\x32\x30\x31\x34\x2d\x31\x30\x2d\x31\x36\x54\x32\ \x33\x3a\x33\x32\x3a\x33\x32\x2b\x30\x32\x3a\x30\x30\x94\x7f\x2d\ \x8c\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ -\x00\x00\x05\xd0\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x20\x73\x74\x61\x6e\x64\x61\x6c\x6f\x6e\x65\x3d\x22\ -\x6e\x6f\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x43\x72\x65\x61\x74\ -\x65\x64\x20\x77\x69\x74\x68\x20\x49\x6e\x6b\x73\x63\x61\x70\x65\ -\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x69\x6e\x6b\ -\x73\x63\x61\x70\x65\x2e\x6f\x72\x67\x2f\x29\x20\x2d\x2d\x3e\x0a\ -\x0a\x3c\x73\x76\x67\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x64\ -\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\x72\x6c\x2e\x6f\ -\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\x6e\x74\x73\x2f\x31\ -\x2e\x31\x2f\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x63\x63\ -\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x63\x72\x65\x61\x74\x69\x76\ -\x65\x63\x6f\x6d\x6d\x6f\x6e\x73\x2e\x6f\x72\x67\x2f\x6e\x73\x23\ -\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x72\x64\x66\x3d\x22\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ -\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\x32\x2d\x72\x64\x66\ -\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\x22\x0a\x20\x20\x20\ -\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ -\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3d\ -\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\ -\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\ -\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x20\x20\ -\x20\x77\x69\x64\x74\x68\x3d\x22\x32\x35\x36\x22\x0a\x20\x20\x20\ -\x68\x65\x69\x67\x68\x74\x3d\x22\x32\x35\x36\x22\x0a\x20\x20\x20\ -\x69\x64\x3d\x22\x73\x76\x67\x35\x36\x32\x38\x22\x3e\x0a\x20\x20\ -\x3c\x64\x65\x66\x73\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x64\ -\x65\x66\x73\x35\x36\x33\x30\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x6d\ -\x65\x74\x61\x64\x61\x74\x61\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\ -\x22\x6d\x65\x74\x61\x64\x61\x74\x61\x35\x36\x33\x33\x22\x3e\x0a\ -\x20\x20\x20\x20\x3c\x72\x64\x66\x3a\x52\x44\x46\x3e\x0a\x20\x20\ -\x20\x20\x20\x20\x3c\x63\x63\x3a\x57\x6f\x72\x6b\x0a\x20\x20\x20\ -\x20\x20\x20\x20\x20\x20\x72\x64\x66\x3a\x61\x62\x6f\x75\x74\x3d\ -\x22\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\ -\x66\x6f\x72\x6d\x61\x74\x3e\x69\x6d\x61\x67\x65\x2f\x73\x76\x67\ -\x2b\x78\x6d\x6c\x3c\x2f\x64\x63\x3a\x66\x6f\x72\x6d\x61\x74\x3e\ -\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x74\x79\x70\ -\x65\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x64\x66\ -\x3a\x72\x65\x73\x6f\x75\x72\x63\x65\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x70\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x64\x63\ -\x6d\x69\x74\x79\x70\x65\x2f\x53\x74\x69\x6c\x6c\x49\x6d\x61\x67\ -\x65\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\ -\x63\x3a\x74\x69\x74\x6c\x65\x3e\x3c\x2f\x64\x63\x3a\x74\x69\x74\ -\x6c\x65\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\x63\x63\x3a\x57\ -\x6f\x72\x6b\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x72\x64\x66\x3a\x52\ -\x44\x46\x3e\x0a\x20\x20\x3c\x2f\x6d\x65\x74\x61\x64\x61\x74\x61\ -\x3e\x0a\x20\x20\x3c\x67\x0a\x20\x20\x20\x20\x20\x74\x72\x61\x6e\ -\x73\x66\x6f\x72\x6d\x3d\x22\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\ -\x28\x30\x2c\x2d\x37\x39\x36\x2e\x33\x36\x32\x31\x38\x29\x22\x0a\ -\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x6c\x61\x79\x65\x72\x31\x22\ -\x3e\x0a\x20\x20\x20\x20\x3c\x67\x0a\x20\x20\x20\x20\x20\x20\x20\ -\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x22\x6d\x61\x74\x72\x69\ -\x78\x28\x30\x2e\x35\x38\x39\x34\x36\x39\x30\x39\x2c\x30\x2c\x30\ -\x2c\x2d\x30\x2e\x35\x38\x39\x34\x36\x39\x30\x39\x2c\x2d\x32\x32\ -\x2e\x33\x31\x34\x36\x31\x38\x2c\x31\x30\x35\x36\x2e\x34\x30\x33\ -\x33\x29\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x67\ -\x36\x31\x36\x37\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x70\x61\ -\x74\x68\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x64\x3d\x22\x6d\ -\x20\x32\x38\x39\x2c\x33\x30\x35\x20\x71\x20\x31\x32\x2c\x2d\x34\ -\x20\x32\x30\x2e\x35\x2c\x2d\x35\x2e\x35\x20\x38\x2e\x35\x2c\x2d\ -\x31\x2e\x35\x20\x31\x39\x2e\x35\x2c\x2d\x31\x20\x31\x31\x2c\x30\ -\x2e\x35\x20\x31\x37\x2e\x35\x2c\x38\x20\x36\x2e\x35\x2c\x37\x2e\ -\x35\x20\x38\x2e\x35\x2c\x32\x32\x2e\x35\x20\x32\x2c\x31\x30\x20\ -\x31\x30\x2e\x35\x2c\x31\x35\x20\x38\x2e\x35\x2c\x35\x20\x31\x38\ -\x2c\x35\x2e\x35\x20\x39\x2e\x35\x2c\x30\x2e\x35\x20\x32\x30\x2c\ -\x30\x2e\x35\x20\x48\x20\x34\x32\x31\x20\x71\x20\x32\x31\x2c\x33\ -\x20\x31\x33\x2c\x32\x38\x20\x2d\x39\x2c\x32\x37\x20\x2d\x33\x36\ -\x2c\x33\x36\x20\x2d\x35\x2c\x32\x20\x2d\x31\x31\x2c\x32\x20\x2d\ -\x32\x39\x2c\x30\x20\x2d\x34\x36\x2c\x2d\x31\x33\x20\x2d\x31\x37\ -\x2c\x2d\x31\x33\x20\x2d\x33\x31\x2c\x2d\x34\x32\x20\x2d\x35\x2c\ -\x2d\x31\x36\x20\x2d\x31\x34\x2c\x2d\x32\x32\x2e\x35\x20\x2d\x39\ -\x2c\x2d\x36\x2e\x35\x20\x2d\x32\x38\x2c\x30\x2e\x35\x20\x2d\x32\ -\x33\x2c\x37\x20\x2d\x33\x35\x2c\x2d\x37\x2e\x35\x20\x2d\x31\x32\ -\x2c\x2d\x31\x34\x2e\x35\x20\x31\x2c\x2d\x33\x37\x2e\x35\x20\x37\ -\x2c\x2d\x31\x31\x20\x37\x2c\x2d\x32\x34\x2e\x35\x20\x30\x2c\x2d\ -\x31\x33\x2e\x35\x20\x2d\x34\x2c\x2d\x32\x30\x2e\x35\x20\x6c\x20\ -\x2d\x33\x2c\x2d\x38\x20\x68\x20\x34\x34\x20\x71\x20\x30\x2c\x31\ -\x35\x20\x2d\x31\x30\x2c\x33\x32\x20\x2d\x31\x31\x2c\x31\x35\x20\ -\x2d\x34\x2c\x32\x37\x2e\x35\x20\x37\x2c\x31\x32\x2e\x35\x20\x32\ -\x35\x2c\x34\x2e\x35\x20\x7a\x20\x4d\x20\x35\x35\x2c\x33\x32\x20\ -\x71\x20\x39\x39\x2c\x37\x32\x20\x31\x33\x37\x2c\x31\x38\x32\x20\ -\x6c\x20\x35\x2c\x31\x36\x20\x68\x20\x31\x31\x38\x20\x71\x20\x31\ -\x2c\x2d\x34\x20\x33\x2e\x35\x2c\x2d\x31\x32\x2e\x35\x20\x51\x20\ -\x33\x32\x31\x2c\x32\x30\x39\x20\x33\x33\x32\x2c\x31\x38\x34\x2e\ -\x35\x20\x33\x34\x33\x2c\x31\x36\x30\x20\x33\x35\x37\x2c\x31\x33\ -\x37\x20\x33\x37\x31\x2c\x31\x31\x34\x20\x33\x39\x37\x2e\x35\x2c\ -\x38\x34\x2e\x35\x20\x34\x32\x34\x2c\x35\x35\x20\x34\x35\x35\x2c\ -\x33\x32\x20\x48\x20\x35\x35\x20\x7a\x22\x0a\x20\x20\x20\x20\x20\ -\x20\x20\x20\x20\x69\x64\x3d\x22\x70\x61\x74\x68\x36\x31\x36\x39\ -\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x73\x74\x79\x6c\x65\ -\x3d\x22\x66\x69\x6c\x6c\x3a\x63\x75\x72\x72\x65\x6e\x74\x43\x6f\ -\x6c\x6f\x72\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x67\x3e\ -\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\ \x00\x00\x0c\xd0\ \x00\ \x00\x43\x6c\x78\x9c\xed\x1b\x6b\x6f\xdc\xc6\xf1\x7b\x7e\x05\x71\ @@ -22957,6 +23160,10 @@ \x00\x6b\ \x00\x65\x00\x79\x00\x77\x00\x6f\x00\x72\x00\x64\x00\x2d\x00\x63\x00\x61\x00\x74\x00\x65\x00\x67\x00\x6f\x00\x72\x00\x79\x00\x2d\ \x00\x65\x00\x78\x00\x70\x00\x6f\x00\x73\x00\x75\x00\x72\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x0f\ +\x02\xb9\xd2\x27\ +\x00\x72\ +\x00\x65\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x19\ \x03\xf8\x8a\x07\ \x00\x73\ @@ -23024,15 +23231,15 @@ \x0c\x89\x94\x7c\ \x00\x68\ \x00\x65\x00\x61\x00\x64\x00\x65\x00\x72\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\ -\x00\x10\ -\x02\xb9\xa6\x47\ -\x00\x62\ -\x00\x6e\x00\x70\x00\x62\x00\x5f\x00\x6c\x00\x6f\x00\x67\x00\x6f\x00\x5f\x00\x33\x00\x32\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x20\ \x07\x25\x0f\x47\ \x00\x6b\ \x00\x65\x00\x79\x00\x77\x00\x6f\x00\x72\x00\x64\x00\x2d\x00\x63\x00\x61\x00\x74\x00\x65\x00\x67\x00\x6f\x00\x72\x00\x79\x00\x2d\ \x00\x61\x00\x67\x00\x67\x00\x72\x00\x65\x00\x67\x00\x61\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x10\ +\x02\xb9\xa6\x47\ +\x00\x62\ +\x00\x6e\x00\x70\x00\x62\x00\x5f\x00\x6c\x00\x6f\x00\x67\x00\x6f\x00\x5f\x00\x33\x00\x32\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x11\ \x01\x95\x63\xf4\ \x00\x6d\ @@ -23046,6 +23253,14 @@ \x05\xcf\xff\x07\ \x00\x73\ \x00\x68\x00\x6f\x00\x77\x00\x2d\x00\x77\x00\x69\x00\x7a\x00\x61\x00\x72\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x0d\ +\x01\x40\x10\xa7\ +\x00\x65\ +\x00\x64\x00\x69\x00\x74\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x0c\ +\x06\xd4\x11\x27\ +\x00\x61\ +\x00\x64\x00\x64\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x2c\ \x0f\xd4\x90\xe7\ \x00\x41\ @@ -23160,15 +23375,15 @@ \x0c\x8e\x36\x7c\ \x00\x66\ \x00\x6f\x00\x6f\x00\x74\x00\x65\x00\x72\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\ -\x00\x10\ -\x02\x4b\xa6\x47\ -\x00\x62\ -\x00\x6e\x00\x70\x00\x62\x00\x5f\x00\x6c\x00\x6f\x00\x67\x00\x6f\x00\x5f\x00\x36\x00\x34\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x1f\ \x05\x41\xa7\x07\ \x00\x6b\ \x00\x65\x00\x79\x00\x77\x00\x6f\x00\x72\x00\x64\x00\x2d\x00\x73\x00\x75\x00\x62\x00\x63\x00\x61\x00\x74\x00\x65\x00\x67\x00\x6f\ \x00\x72\x00\x79\x00\x2d\x00\x76\x00\x6f\x00\x6c\x00\x63\x00\x61\x00\x6e\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x10\ +\x02\x4b\xa6\x47\ +\x00\x62\ +\x00\x6e\x00\x70\x00\x62\x00\x5f\x00\x6c\x00\x6f\x00\x67\x00\x6f\x00\x5f\x00\x36\x00\x34\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x18\ \x0e\x45\x8e\xd4\ \x00\x69\ @@ -23228,65 +23443,68 @@ qt_resource_struct = "\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\ -\x00\x00\x00\x14\x00\x02\x00\x00\x00\x31\x00\x00\x00\x03\ -\x00\x00\x01\x10\x00\x02\x00\x00\x00\x02\x00\x00\x00\x3b\ -\x00\x00\x04\xbe\x00\x02\x00\x00\x00\x03\x00\x00\x00\x38\ -\x00\x00\x08\x0a\x00\x02\x00\x00\x00\x04\x00\x00\x00\x34\ -\x00\x00\x04\xca\x00\x00\x00\x00\x00\x01\x00\x01\x38\x85\ -\x00\x00\x01\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x23\x3f\ -\x00\x00\x03\xaa\x00\x01\x00\x00\x00\x01\x00\x01\x0f\xa7\ -\x00\x00\x08\x80\x00\x00\x00\x00\x00\x01\x00\x02\x20\xe8\ -\x00\x00\x03\x3e\x00\x00\x00\x00\x00\x01\x00\x01\x02\x67\ +\x00\x00\x00\x14\x00\x02\x00\x00\x00\x34\x00\x00\x00\x03\ +\x00\x00\x01\x34\x00\x02\x00\x00\x00\x02\x00\x00\x00\x3e\ +\x00\x00\x05\x20\x00\x02\x00\x00\x00\x03\x00\x00\x00\x3b\ +\x00\x00\x08\x6c\x00\x02\x00\x00\x00\x04\x00\x00\x00\x37\ +\x00\x00\x04\x40\x00\x00\x00\x00\x00\x01\x00\x01\x33\x41\ +\x00\x00\x05\x2c\x00\x00\x00\x00\x00\x01\x00\x01\x44\xc9\ +\x00\x00\x01\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x2a\xe1\ +\x00\x00\x03\xce\x00\x01\x00\x00\x00\x01\x00\x01\x17\x49\ +\x00\x00\x09\x26\x00\x00\x00\x00\x00\x01\x00\x02\x33\x00\ +\x00\x00\x03\xa8\x00\x00\x00\x00\x00\x01\x00\x01\x12\x76\ +\x00\x00\x00\x98\x00\x00\x00\x00\x00\x01\x00\x00\x12\x0c\ \x00\x00\x00\x58\x00\x00\x00\x00\x00\x01\x00\x00\x09\x78\ -\x00\x00\x05\x52\x00\x01\x00\x00\x00\x01\x00\x01\x53\x9f\ -\x00\x00\x08\x1a\x00\x00\x00\x00\x00\x01\x00\x02\x18\x58\ -\x00\x00\x00\x98\x00\x01\x00\x00\x00\x01\x00\x00\x12\x0c\ -\x00\x00\x06\xa4\x00\x01\x00\x00\x00\x01\x00\x01\xca\x87\ -\x00\x00\x02\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x6a\x45\ -\x00\x00\x05\x22\x00\x01\x00\x00\x00\x01\x00\x01\x4b\x05\ -\x00\x00\x08\xa6\x00\x00\x00\x00\x00\x01\x00\x02\x29\xca\ -\x00\x00\x04\x7a\x00\x00\x00\x00\x00\x01\x00\x01\x2f\x65\ -\x00\x00\x03\xf8\x00\x01\x00\x00\x00\x01\x00\x01\x23\x40\ -\x00\x00\x02\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x50\xc4\ -\x00\x00\x09\x20\x00\x00\x00\x00\x00\x01\x00\x02\x3c\x72\ -\x00\x00\x06\x48\x00\x01\x00\x00\x00\x01\x00\x01\xad\x08\ -\x00\x00\x06\x76\x00\x00\x00\x00\x00\x01\x00\x01\xb6\xde\ -\x00\x00\x03\x64\x00\x00\x00\x00\x00\x01\x00\x01\x07\x3a\ -\x00\x00\x06\x22\x00\x01\x00\x00\x00\x01\x00\x01\xa3\xba\ -\x00\x00\x03\xd2\x00\x00\x00\x00\x00\x01\x00\x01\x1d\x2d\ -\x00\x00\x07\x5c\x00\x00\x00\x00\x00\x01\x00\x01\xe4\x42\ -\x00\x00\x05\xca\x00\x01\x00\x00\x00\x01\x00\x01\x6f\xe9\ -\x00\x00\x01\xba\x00\x00\x00\x00\x00\x01\x00\x00\x38\x08\ -\x00\x00\x07\xb0\x00\x01\x00\x00\x00\x01\x00\x02\x07\x78\ -\x00\x00\x01\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x33\x6b\ -\x00\x00\x00\xd0\x00\x00\x00\x00\x00\x01\x00\x00\x1a\xd7\ -\x00\x00\x05\xb4\x00\x01\x00\x00\x00\x01\x00\x01\x68\x70\ -\x00\x00\x02\xee\x00\x01\x00\x00\x00\x01\x00\x00\xf6\xea\ -\x00\x00\x07\x2c\x00\x01\x00\x00\x00\x01\x00\x01\xdb\xfc\ -\x00\x00\x05\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x79\x73\ -\x00\x00\x05\x80\x00\x01\x00\x00\x00\x01\x00\x01\x5b\xf7\ -\x00\x00\x02\x3a\x00\x01\x00\x00\x00\x01\x00\x00\x48\x2e\ -\x00\x00\x03\x22\x00\x00\x00\x00\x00\x01\x00\x00\xff\x7a\ -\x00\x00\x08\x64\x00\x00\x00\x00\x00\x01\x00\x02\x20\xc5\ -\x00\x00\x07\x7c\x00\x01\x00\x00\x00\x01\x00\x01\xfa\xe4\ -\x00\x00\x01\xfc\x00\x00\x00\x00\x00\x01\x00\x00\x43\x28\ -\x00\x00\x06\xe4\x00\x00\x00\x00\x00\x01\x00\x01\xd4\x04\ -\x00\x00\x01\x4e\x00\x01\x00\x00\x00\x01\x00\x00\x2a\x6a\ +\x00\x00\x05\xb4\x00\x01\x00\x00\x00\x01\x00\x01\x5f\xe3\ +\x00\x00\x08\x7c\x00\x00\x00\x00\x00\x01\x00\x02\x24\x9c\ +\x00\x00\x00\xbc\x00\x01\x00\x00\x00\x01\x00\x00\x19\xae\ +\x00\x00\x07\x06\x00\x01\x00\x00\x00\x01\x00\x01\xd6\xcb\ +\x00\x00\x02\xc2\x00\x00\x00\x00\x00\x01\x00\x00\x71\xe7\ +\x00\x00\x05\x84\x00\x01\x00\x00\x00\x01\x00\x01\x57\x49\ +\x00\x00\x08\xe2\x00\x00\x00\x00\x00\x01\x00\x02\x2d\x2c\ +\x00\x00\x04\xdc\x00\x00\x00\x00\x00\x01\x00\x01\x3b\xa9\ +\x00\x00\x04\x1c\x00\x01\x00\x00\x00\x01\x00\x01\x2a\xe2\ +\x00\x00\x02\x90\x00\x00\x00\x00\x00\x01\x00\x00\x58\x66\ +\x00\x00\x09\x82\x00\x00\x00\x00\x00\x01\x00\x02\x48\xb6\ +\x00\x00\x06\xaa\x00\x01\x00\x00\x00\x01\x00\x01\xb9\x4c\ +\x00\x00\x06\xd8\x00\x00\x00\x00\x00\x01\x00\x01\xc3\x22\ +\x00\x00\x04\x60\x00\x00\x00\x00\x00\x01\x00\x01\x36\x4d\ +\x00\x00\x03\x62\x00\x00\x00\x00\x00\x01\x00\x01\x0a\x09\ +\x00\x00\x06\x84\x00\x01\x00\x00\x00\x01\x00\x01\xaf\xfe\ +\x00\x00\x03\xf6\x00\x00\x00\x00\x00\x01\x00\x01\x24\xcf\ +\x00\x00\x07\xbe\x00\x00\x00\x00\x00\x01\x00\x01\xf0\x86\ +\x00\x00\x06\x2c\x00\x01\x00\x00\x00\x01\x00\x01\x7c\x2d\ +\x00\x00\x01\xde\x00\x00\x00\x00\x00\x01\x00\x00\x3f\xaa\ +\x00\x00\x08\x12\x00\x01\x00\x00\x00\x01\x00\x02\x13\xbc\ +\x00\x00\x01\xa2\x00\x00\x00\x00\x00\x01\x00\x00\x3b\x0d\ +\x00\x00\x00\xf4\x00\x00\x00\x00\x00\x01\x00\x00\x22\x79\ +\x00\x00\x06\x16\x00\x01\x00\x00\x00\x01\x00\x01\x74\xb4\ +\x00\x00\x03\x12\x00\x01\x00\x00\x00\x01\x00\x00\xfe\x8c\ +\x00\x00\x07\x8e\x00\x01\x00\x00\x00\x01\x00\x01\xe8\x40\ +\x00\x00\x06\x60\x00\x00\x00\x00\x00\x01\x00\x01\x85\xb7\ +\x00\x00\x05\xe2\x00\x01\x00\x00\x00\x01\x00\x01\x68\x3b\ +\x00\x00\x02\x5e\x00\x01\x00\x00\x00\x01\x00\x00\x4f\xd0\ +\x00\x00\x03\x46\x00\x00\x00\x00\x00\x01\x00\x01\x07\x1c\ +\x00\x00\x08\xc6\x00\x00\x00\x00\x00\x01\x00\x02\x2d\x09\ +\x00\x00\x07\xde\x00\x01\x00\x00\x00\x01\x00\x02\x07\x28\ +\x00\x00\x02\x20\x00\x00\x00\x00\x00\x01\x00\x00\x4a\xca\ +\x00\x00\x07\x46\x00\x00\x00\x00\x00\x01\x00\x01\xe0\x48\ +\x00\x00\x01\x72\x00\x01\x00\x00\x00\x01\x00\x00\x32\x0c\ \x00\x00\x00\x28\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x08\xea\x00\x01\x00\x00\x00\x01\x00\x02\x2f\x9e\ -\x00\x00\x07\xc8\x00\x00\x00\x00\x00\x01\x00\x02\x11\xe5\ -\x00\x00\x02\xc0\x00\x01\x00\x00\x00\x01\x00\x00\xee\x88\ -\x00\x00\x04\x1c\x00\x00\x00\x00\x00\x01\x00\x01\x2b\x9f\ -\x00\x00\x04\xee\x00\x01\x00\x00\x00\x01\x00\x01\x42\x1a\ -\x00\x00\x09\x6a\x00\x01\x00\x00\x00\x01\x00\x02\x41\xf6\ -\x00\x00\x0a\x3e\x00\x00\x00\x00\x00\x01\x00\x03\x2e\x55\ -\x00\x00\x09\xf8\x00\x00\x00\x00\x00\x01\x00\x02\xdf\x0f\ -\x00\x00\x09\xb0\x00\x00\x00\x00\x00\x01\x00\x02\x84\x0f\ -\x00\x00\x0a\x84\x00\x01\x00\x00\x00\x01\x00\x03\xcf\x6d\ -\x00\x00\x0a\xb0\x00\x01\x00\x00\x00\x01\x00\x03\xd6\x74\ -\x00\x00\x0a\xcc\x00\x01\x00\x00\x00\x01\x00\x03\xd9\x48\ -\x00\x00\x0a\xec\x00\x00\x00\x00\x00\x01\x00\x04\x21\x6b\ -\x00\x00\x0b\x18\x00\x00\x00\x00\x00\x01\x00\x05\x90\x1e\ +\x00\x00\x09\x4c\x00\x01\x00\x00\x00\x01\x00\x02\x3b\xe2\ +\x00\x00\x08\x2a\x00\x00\x00\x00\x00\x01\x00\x02\x1e\x29\ +\x00\x00\x02\xe4\x00\x01\x00\x00\x00\x01\x00\x00\xf6\x2a\ +\x00\x00\x04\x7e\x00\x00\x00\x00\x00\x01\x00\x01\x37\xe3\ +\x00\x00\x05\x50\x00\x01\x00\x00\x00\x01\x00\x01\x4e\x5e\ +\x00\x00\x09\xcc\x00\x01\x00\x00\x00\x01\x00\x02\x4e\x3a\ +\x00\x00\x0a\xa0\x00\x00\x00\x00\x00\x01\x00\x03\x3a\x99\ +\x00\x00\x0a\x5a\x00\x00\x00\x00\x00\x01\x00\x02\xeb\x53\ +\x00\x00\x0a\x12\x00\x00\x00\x00\x00\x01\x00\x02\x90\x53\ +\x00\x00\x0a\xe6\x00\x01\x00\x00\x00\x01\x00\x03\xdb\xb1\ +\x00\x00\x0b\x12\x00\x01\x00\x00\x00\x01\x00\x03\xe2\xb8\ +\x00\x00\x0b\x2e\x00\x01\x00\x00\x00\x01\x00\x03\xe5\x8c\ +\x00\x00\x0b\x4e\x00\x00\x00\x00\x00\x01\x00\x04\x2d\xaf\ +\x00\x00\x0b\x7a\x00\x00\x00\x00\x00\x01\x00\x05\x9c\x62\ " def qInitResources(): From 0a95b9193a0c832281659022b189772221a0c29a Mon Sep 17 00:00:00 2001 From: Tim Sutton Date: Mon, 17 Nov 2014 12:22:28 +0200 Subject: [PATCH 2/3] Updated icons for minimum needs manager --- safe_qgis/ui/about_dialog_base.py | 64 ++++++++++++------- safe_qgis/ui/function_browser_dialog_base.py | 2 +- safe_qgis/ui/needs_manager_dialog_base.py | 18 ++++-- safe_qgis/ui/osm_downloader_dialog_base.py | 2 +- safe_qgis/ui/shakemap_importer_dialog_base.py | 2 +- 5 files changed, 58 insertions(+), 30 deletions(-) diff --git a/safe_qgis/ui/about_dialog_base.py b/safe_qgis/ui/about_dialog_base.py index 9331115099..7bcb326a7e 100644 --- a/safe_qgis/ui/about_dialog_base.py +++ b/safe_qgis/ui/about_dialog_base.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'about_dialog_base.ui' # -# Created: Mon Oct 20 08:47:44 2014 +# Created: Mon Nov 17 12:22:22 2014 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -79,6 +79,18 @@ def setupUi(self, AboutDialogBase): self.supporters_text.setObjectName(_fromUtf8("supporters_text")) self.gridLayout_5.addWidget(self.supporters_text, 0, 0, 1, 1) self.tab_widget.addTab(self.supporters_tab, _fromUtf8("")) + self.image_credits_tab = QtGui.QWidget() + self.image_credits_tab.setObjectName(_fromUtf8("image_credits_tab")) + self.gridLayout_7 = QtGui.QGridLayout(self.image_credits_tab) + self.gridLayout_7.setObjectName(_fromUtf8("gridLayout_7")) + self.image_credits_text = QtGui.QTextEdit(self.image_credits_tab) + font = QtGui.QFont() + font.setPointSize(9) + self.image_credits_text.setFont(font) + self.image_credits_text.setReadOnly(True) + self.image_credits_text.setObjectName(_fromUtf8("image_credits_text")) + self.gridLayout_7.addWidget(self.image_credits_text, 0, 0, 1, 1) + self.tab_widget.addTab(self.image_credits_tab, _fromUtf8("")) self.gridLayout_6.addWidget(self.tab_widget, 0, 0, 1, 3) self.label = QtGui.QLabel(AboutDialogBase) self.label.setMaximumSize(QtCore.QSize(600, 100)) @@ -98,7 +110,7 @@ def setupUi(self, AboutDialogBase): self.gridLayout_6.addWidget(self.buttonBox, 3, 0, 1, 3) self.retranslateUi(AboutDialogBase) - self.tab_widget.setCurrentIndex(0) + self.tab_widget.setCurrentIndex(5) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), AboutDialogBase.accept) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), AboutDialogBase.reject) QtCore.QMetaObject.connectSlotsByName(AboutDialogBase) @@ -108,43 +120,49 @@ def retranslateUi(self, AboutDialogBase): self.about_text.setHtml(_translate("AboutDialogBase", "\n" "\n" -"

InaSAFE is free software that produces realistic natural hazard impact scenarios for better planning, preparedness and response activities. It provides a simple but rigorous way to combine data from scientists, local governments and communities to provide insights into the likely impacts of future disaster events.

\n" -"


\n" -"

InaSAFE was conceived and initially developed by the Indonesia\'s National Disaster Management Agency (BNPB) and the Australian Government, through the Australia-Indonesia Facility for Disaster Reduction and the World Bank - Global Facility for Disaster Reduction and Recovery (World Bank-GFDRR).

", None)) +"\n" +"

InaSAFE is free software that produces realistic natural hazard impact scenarios for better planning, preparedness and response activities. It provides a simple but rigorous way to combine data from scientists, local governments and communities to provide insights into the likely impacts of future disaster events.

\n" +"


\n" +"

InaSAFE was conceived and initially developed by the Indonesia\'s National Disaster Management Agency (BNPB) and the Australian Government, through the Australia-Indonesia Facility for Disaster Reduction and the World Bank - Global Facility for Disaster Reduction and Recovery (World Bank-GFDRR).

", None)) self.tab_widget.setTabText(self.tab_widget.indexOf(self.about_tab), _translate("AboutDialogBase", "About", None)) self.getting_started_text.setHtml(_translate("AboutDialogBase", "\n" "\n" -"

These are the minimum steps you need to follow in order to use InaSAFE:

\n" -"


\n" -"

1. Add at least one hazard layer (e.g. earthquake MMI) to QGIS.

\n" -"

2. Add at least one exposure layer (e.g. structures) to QGIS.

\n" -"

3. Make sure you have defined keywords for your hazard and exposure layers. You can do this using the keywords icon in the InaSAFE toolbar.

\n" -"

4. Click on the Run button in the InaSAFE panel.

", None)) +"\n" +"

These are the minimum steps you need to follow in order to use InaSAFE:

\n" +"


\n" +"

1. Add at least one hazard layer (e.g. earthquake MMI) to QGIS.

\n" +"

2. Add at least one exposure layer (e.g. structures) to QGIS.

\n" +"

3. Make sure you have defined keywords for your hazard and exposure layers. You can do this using the keywords icon in the InaSAFE toolbar.

\n" +"

4. Click on the Run button in the InaSAFE panel.

", None)) self.tab_widget.setTabText(self.tab_widget.indexOf(self.getting_started_tab), _translate("AboutDialogBase", "Getting Started", None)) self.limitations_text.setHtml(_translate("AboutDialogBase", "\n" "\n" -"


", None)) +"\n" +"


", None)) self.tab_widget.setTabText(self.tab_widget.indexOf(self.limitations_tab), _translate("AboutDialogBase", "Limitations", None)) self.disclaimer_text.setHtml(_translate("AboutDialogBase", "\n" "\n" -"


", None)) +"\n" +"


", None)) self.tab_widget.setTabText(self.tab_widget.indexOf(self.disclaimer_tab), _translate("AboutDialogBase", "Disclaimer", None)) self.supporters_text.setHtml(_translate("AboutDialogBase", "\n" "\n" -"

Australia-Indonesia Facility for Disaster Reduction

\n" -"

World Bank - Global Facility for Disaster Reductions and Recovery

\n" -"

Humanitarian OpenStreetMap Team

\n" -"

Linfiniti Consulting CC.

\n" -"

Environmental Science for Social Change (Philippines)

", None)) +"\n" +"

Australia-Indonesia Facility for Disaster Reduction

\n" +"

World Bank - Global Facility for Disaster Reductions and Recovery

\n" +"

Humanitarian OpenStreetMap Team

\n" +"

Linfiniti Consulting CC.

\n" +"

Environmental Science for Social Change (Philippines)

", None)) self.tab_widget.setTabText(self.tab_widget.indexOf(self.supporters_tab), _translate("AboutDialogBase", "Supporters", None)) + self.image_credits_text.setHtml(_translate("AboutDialogBase", "\n" +"\n" +"


", None)) + self.tab_widget.setTabText(self.tab_widget.indexOf(self.image_credits_tab), _translate("AboutDialogBase", "Image Credits", None)) import resources_rc diff --git a/safe_qgis/ui/function_browser_dialog_base.py b/safe_qgis/ui/function_browser_dialog_base.py index cf19a58aa1..e737cacfea 100644 --- a/safe_qgis/ui/function_browser_dialog_base.py +++ b/safe_qgis/ui/function_browser_dialog_base.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'function_browser_dialog_base.ui' # -# Created: Mon Nov 17 10:39:31 2014 +# Created: Mon Nov 17 12:22:22 2014 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! diff --git a/safe_qgis/ui/needs_manager_dialog_base.py b/safe_qgis/ui/needs_manager_dialog_base.py index a579779af9..e1782df276 100644 --- a/safe_qgis/ui/needs_manager_dialog_base.py +++ b/safe_qgis/ui/needs_manager_dialog_base.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'needs_manager_dialog_base.ui' # -# Created: Mon Nov 17 10:32:57 2014 +# Created: Mon Nov 17 12:22:22 2014 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -103,7 +103,10 @@ def setupUi(self, NeedsManagerDialogBase): font.setWeight(50) self.addButton.setFont(font) self.addButton.setAutoFillBackground(False) - self.addButton.setText(_fromUtf8("+")) + self.addButton.setText(_fromUtf8("")) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/plugins/inasafe/add_icon.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.addButton.setIcon(icon) self.addButton.setCheckable(False) self.addButton.setAutoDefault(True) self.addButton.setDefault(False) @@ -117,6 +120,10 @@ def setupUi(self, NeedsManagerDialogBase): font.setBold(False) font.setWeight(50) self.removeButton.setFont(font) + self.removeButton.setText(_fromUtf8("")) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/plugins/inasafe/remove_icon.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.removeButton.setIcon(icon1) self.removeButton.setObjectName(_fromUtf8("removeButton")) self.horizontalLayout_3.addWidget(self.removeButton) self.editButton = QtGui.QPushButton(self.page) @@ -126,6 +133,10 @@ def setupUi(self, NeedsManagerDialogBase): font.setBold(False) font.setWeight(50) self.editButton.setFont(font) + self.editButton.setText(_fromUtf8("")) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/plugins/inasafe/edit_icon.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.editButton.setIcon(icon2) self.editButton.setObjectName(_fromUtf8("editButton")) self.horizontalLayout_3.addWidget(self.editButton) self.gridLayout.addLayout(self.horizontalLayout_3, 0, 0, 1, 1) @@ -214,12 +225,11 @@ def retranslateUi(self, NeedsManagerDialogBase): self.closeButton.setText(_translate("NeedsManagerDialogBase", "Close", None)) self.addButton.setToolTip(_translate("NeedsManagerDialogBase", "Add new resource", None)) self.removeButton.setToolTip(_translate("NeedsManagerDialogBase", "Remove selected resource", None)) - self.removeButton.setText(_translate("NeedsManagerDialogBase", "-", None)) self.editButton.setToolTip(_translate("NeedsManagerDialogBase", "Edit selected resource", None)) - self.editButton.setText(_translate("NeedsManagerDialogBase", "E", None)) self.provenanceLable.setText(_translate("NeedsManagerDialogBase", "Provenance", None)) self.discardButton.setToolTip(_translate("NeedsManagerDialogBase", "Discard and return", None)) self.discardButton.setText(_translate("NeedsManagerDialogBase", "X", None)) self.acceptButton.setToolTip(_translate("NeedsManagerDialogBase", "Accept and return", None)) self.acceptButton.setText(_translate("NeedsManagerDialogBase", "✓", None)) +import resources_rc diff --git a/safe_qgis/ui/osm_downloader_dialog_base.py b/safe_qgis/ui/osm_downloader_dialog_base.py index 3bb0217509..f86dd23ebc 100644 --- a/safe_qgis/ui/osm_downloader_dialog_base.py +++ b/safe_qgis/ui/osm_downloader_dialog_base.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'osm_downloader_dialog_base.ui' # -# Created: Mon Nov 17 10:42:34 2014 +# Created: Mon Nov 17 12:22:22 2014 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! diff --git a/safe_qgis/ui/shakemap_importer_dialog_base.py b/safe_qgis/ui/shakemap_importer_dialog_base.py index 1f69193845..288f5c02a2 100644 --- a/safe_qgis/ui/shakemap_importer_dialog_base.py +++ b/safe_qgis/ui/shakemap_importer_dialog_base.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'shakemap_importer_dialog_base.ui' # -# Created: Mon Nov 17 10:44:09 2014 +# Created: Mon Nov 17 12:22:22 2014 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! From a61716b742f24feaea37b6dca9e3b67b621e7bf4 Mon Sep 17 00:00:00 2001 From: Tim Sutton Date: Mon, 17 Nov 2014 13:06:01 +0200 Subject: [PATCH 3/3] Layout improvements for minimum needs editor --- safe_qgis/ui/needs_manager_dialog_base.py | 163 +++--- safe_qgis/ui/needs_manager_dialog_base.ui | 574 +++++++++++----------- 2 files changed, 360 insertions(+), 377 deletions(-) diff --git a/safe_qgis/ui/needs_manager_dialog_base.py b/safe_qgis/ui/needs_manager_dialog_base.py index e1782df276..15fcdde099 100644 --- a/safe_qgis/ui/needs_manager_dialog_base.py +++ b/safe_qgis/ui/needs_manager_dialog_base.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'needs_manager_dialog_base.ui' # -# Created: Mon Nov 17 12:22:22 2014 +# Created: Mon Nov 17 13:05:44 2014 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -26,10 +26,10 @@ def _translate(context, text, disambig): class Ui_NeedsManagerDialogBase(object): def setupUi(self, NeedsManagerDialogBase): NeedsManagerDialogBase.setObjectName(_fromUtf8("NeedsManagerDialogBase")) - NeedsManagerDialogBase.resize(742, 666) + NeedsManagerDialogBase.resize(750, 666) NeedsManagerDialogBase.setContextMenuPolicy(QtCore.Qt.NoContextMenu) - self.gridLayout_3 = QtGui.QGridLayout(NeedsManagerDialogBase) - self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) + self.gridLayout_2 = QtGui.QGridLayout(NeedsManagerDialogBase) + self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) self.horizontalLayout_2 = QtGui.QHBoxLayout() self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) self.profileLabel = QtGui.QLabel(NeedsManagerDialogBase) @@ -48,48 +48,27 @@ def setupUi(self, NeedsManagerDialogBase): self.profileComboBox.setSizePolicy(sizePolicy) self.profileComboBox.setObjectName(_fromUtf8("profileComboBox")) self.horizontalLayout_2.addWidget(self.profileComboBox) - self.gridLayout_3.addLayout(self.horizontalLayout_2, 0, 0, 1, 1) - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.saveButton = QtGui.QPushButton(NeedsManagerDialogBase) - self.saveButton.setObjectName(_fromUtf8("saveButton")) - self.horizontalLayout.addWidget(self.saveButton) - self.saveAsButton = QtGui.QPushButton(NeedsManagerDialogBase) - self.saveAsButton.setObjectName(_fromUtf8("saveAsButton")) - self.horizontalLayout.addWidget(self.saveAsButton) - self.newButton = QtGui.QPushButton(NeedsManagerDialogBase) - self.newButton.setObjectName(_fromUtf8("newButton")) - self.horizontalLayout.addWidget(self.newButton) - self.importButton = QtGui.QPushButton(NeedsManagerDialogBase) - self.importButton.setObjectName(_fromUtf8("importButton")) - self.horizontalLayout.addWidget(self.importButton) - self.exportButton = QtGui.QPushButton(NeedsManagerDialogBase) - self.exportButton.setObjectName(_fromUtf8("exportButton")) - self.horizontalLayout.addWidget(self.exportButton) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout.addItem(spacerItem) - self.closeButton = QtGui.QPushButton(NeedsManagerDialogBase) - self.closeButton.setObjectName(_fromUtf8("closeButton")) - self.horizontalLayout.addWidget(self.closeButton) - self.gridLayout_3.addLayout(self.horizontalLayout, 2, 0, 1, 1) + self.gridLayout_2.addLayout(self.horizontalLayout_2, 0, 0, 1, 1) self.stackedWidget = QtGui.QStackedWidget(NeedsManagerDialogBase) self.stackedWidget.setEnabled(True) self.stackedWidget.setMouseTracking(False) - self.stackedWidget.setFrameShape(QtGui.QFrame.Panel) - self.stackedWidget.setFrameShadow(QtGui.QFrame.Sunken) + self.stackedWidget.setFrameShape(QtGui.QFrame.NoFrame) + self.stackedWidget.setFrameShadow(QtGui.QFrame.Plain) + self.stackedWidget.setLineWidth(0) self.stackedWidget.setObjectName(_fromUtf8("stackedWidget")) self.page = QtGui.QWidget() self.page.setObjectName(_fromUtf8("page")) - self.gridLayout_2 = QtGui.QGridLayout(self.page) - self.gridLayout_2.setMargin(0) - self.gridLayout_2.setSpacing(0) - self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) - self.gridLayout = QtGui.QGridLayout() - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.horizontalLayout_3 = QtGui.QHBoxLayout() - self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3")) - spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_3.addItem(spacerItem1) + self.gridLayout_3 = QtGui.QGridLayout(self.page) + self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) + self.label = QtGui.QLabel(self.page) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.label.setFont(font) + self.label.setObjectName(_fromUtf8("label")) + self.gridLayout_3.addWidget(self.label, 0, 0, 1, 2) + spacerItem = QtGui.QSpacerItem(418, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.gridLayout_3.addItem(spacerItem, 0, 2, 1, 1) self.addButton = QtGui.QPushButton(self.page) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -112,7 +91,7 @@ def setupUi(self, NeedsManagerDialogBase): self.addButton.setDefault(False) self.addButton.setFlat(False) self.addButton.setObjectName(_fromUtf8("addButton")) - self.horizontalLayout_3.addWidget(self.addButton) + self.gridLayout_3.addWidget(self.addButton, 0, 3, 1, 1) self.removeButton = QtGui.QPushButton(self.page) self.removeButton.setMaximumSize(QtCore.QSize(32, 32)) self.removeButton.setBaseSize(QtCore.QSize(32, 32)) @@ -125,7 +104,7 @@ def setupUi(self, NeedsManagerDialogBase): icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/plugins/inasafe/remove_icon.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.removeButton.setIcon(icon1) self.removeButton.setObjectName(_fromUtf8("removeButton")) - self.horizontalLayout_3.addWidget(self.removeButton) + self.gridLayout_3.addWidget(self.removeButton, 0, 4, 1, 1) self.editButton = QtGui.QPushButton(self.page) self.editButton.setMaximumSize(QtCore.QSize(32, 32)) self.editButton.setBaseSize(QtCore.QSize(32, 32)) @@ -138,46 +117,30 @@ def setupUi(self, NeedsManagerDialogBase): icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/plugins/inasafe/edit_icon.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.editButton.setIcon(icon2) self.editButton.setObjectName(_fromUtf8("editButton")) - self.horizontalLayout_3.addWidget(self.editButton) - self.gridLayout.addLayout(self.horizontalLayout_3, 0, 0, 1, 1) + self.gridLayout_3.addWidget(self.editButton, 0, 5, 1, 1) self.resourceListWidget = QtGui.QListWidget(self.page) self.resourceListWidget.setObjectName(_fromUtf8("resourceListWidget")) - self.gridLayout.addWidget(self.resourceListWidget, 1, 0, 1, 1) - self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1) - self.horizontalLayout_5 = QtGui.QHBoxLayout() - self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5")) + self.gridLayout_3.addWidget(self.resourceListWidget, 1, 0, 1, 6) self.provenanceLable = QtGui.QLabel(self.page) self.provenanceLable.setObjectName(_fromUtf8("provenanceLable")) - self.horizontalLayout_5.addWidget(self.provenanceLable) + self.gridLayout_3.addWidget(self.provenanceLable, 2, 0, 1, 1) self.provenanceLineEdit = QtGui.QLineEdit(self.page) self.provenanceLineEdit.setObjectName(_fromUtf8("provenanceLineEdit")) - self.horizontalLayout_5.addWidget(self.provenanceLineEdit) - self.gridLayout_2.addLayout(self.horizontalLayout_5, 1, 0, 1, 1) + self.gridLayout_3.addWidget(self.provenanceLineEdit, 2, 1, 1, 5) self.stackedWidget.addWidget(self.page) self.page_2 = QtGui.QWidget() self.page_2.setObjectName(_fromUtf8("page_2")) - self.gridLayout_4 = QtGui.QGridLayout(self.page_2) - self.gridLayout_4.setMargin(0) - self.gridLayout_4.setSpacing(0) - self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) - self.verticalLayout = QtGui.QVBoxLayout() - self.verticalLayout.setSpacing(0) - self.verticalLayout.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.resourceWidget = QtGui.QWidget(self.page_2) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.resourceWidget.sizePolicy().hasHeightForWidth()) - self.resourceWidget.setSizePolicy(sizePolicy) - self.resourceWidget.setObjectName(_fromUtf8("resourceWidget")) - self.verticalLayout.addWidget(self.resourceWidget) - self.gridLayout_4.addLayout(self.verticalLayout, 1, 0, 1, 1) - self.horizontalLayout_4 = QtGui.QHBoxLayout() - self.horizontalLayout_4.setSpacing(0) - self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4")) - spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_4.addItem(spacerItem2) + self.gridLayout = QtGui.QGridLayout(self.page_2) + self.gridLayout.setObjectName(_fromUtf8("gridLayout")) + self.label_2 = QtGui.QLabel(self.page_2) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.label_2.setFont(font) + self.label_2.setObjectName(_fromUtf8("label_2")) + self.gridLayout.addWidget(self.label_2, 0, 0, 1, 1) + spacerItem1 = QtGui.QSpacerItem(521, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.gridLayout.addItem(spacerItem1, 0, 1, 1, 1) self.discardButton = QtGui.QPushButton(self.page_2) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(32) @@ -190,7 +153,7 @@ def setupUi(self, NeedsManagerDialogBase): font.setWeight(50) self.discardButton.setFont(font) self.discardButton.setObjectName(_fromUtf8("discardButton")) - self.horizontalLayout_4.addWidget(self.discardButton) + self.gridLayout.addWidget(self.discardButton, 0, 2, 1, 1) self.acceptButton = QtGui.QPushButton(self.page_2) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(32) @@ -203,10 +166,40 @@ def setupUi(self, NeedsManagerDialogBase): font.setWeight(50) self.acceptButton.setFont(font) self.acceptButton.setObjectName(_fromUtf8("acceptButton")) - self.horizontalLayout_4.addWidget(self.acceptButton) - self.gridLayout_4.addLayout(self.horizontalLayout_4, 0, 0, 1, 1) + self.gridLayout.addWidget(self.acceptButton, 0, 3, 1, 1) + self.resourceWidget = QtGui.QWidget(self.page_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.resourceWidget.sizePolicy().hasHeightForWidth()) + self.resourceWidget.setSizePolicy(sizePolicy) + self.resourceWidget.setObjectName(_fromUtf8("resourceWidget")) + self.gridLayout.addWidget(self.resourceWidget, 1, 0, 1, 4) self.stackedWidget.addWidget(self.page_2) - self.gridLayout_3.addWidget(self.stackedWidget, 1, 0, 1, 1) + self.gridLayout_2.addWidget(self.stackedWidget, 1, 0, 1, 1) + self.horizontalLayout = QtGui.QHBoxLayout() + self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) + self.saveButton = QtGui.QPushButton(NeedsManagerDialogBase) + self.saveButton.setObjectName(_fromUtf8("saveButton")) + self.horizontalLayout.addWidget(self.saveButton) + self.saveAsButton = QtGui.QPushButton(NeedsManagerDialogBase) + self.saveAsButton.setObjectName(_fromUtf8("saveAsButton")) + self.horizontalLayout.addWidget(self.saveAsButton) + self.newButton = QtGui.QPushButton(NeedsManagerDialogBase) + self.newButton.setObjectName(_fromUtf8("newButton")) + self.horizontalLayout.addWidget(self.newButton) + self.importButton = QtGui.QPushButton(NeedsManagerDialogBase) + self.importButton.setObjectName(_fromUtf8("importButton")) + self.horizontalLayout.addWidget(self.importButton) + self.exportButton = QtGui.QPushButton(NeedsManagerDialogBase) + self.exportButton.setObjectName(_fromUtf8("exportButton")) + self.horizontalLayout.addWidget(self.exportButton) + spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout.addItem(spacerItem2) + self.closeButton = QtGui.QPushButton(NeedsManagerDialogBase) + self.closeButton.setObjectName(_fromUtf8("closeButton")) + self.horizontalLayout.addWidget(self.closeButton) + self.gridLayout_2.addLayout(self.horizontalLayout, 2, 0, 1, 1) self.retranslateUi(NeedsManagerDialogBase) self.stackedWidget.setCurrentIndex(0) @@ -215,21 +208,23 @@ def setupUi(self, NeedsManagerDialogBase): def retranslateUi(self, NeedsManagerDialogBase): NeedsManagerDialogBase.setWindowTitle(_translate("NeedsManagerDialogBase", "Minimum Needs Manager", None)) - self.profileLabel.setText(_translate("NeedsManagerDialogBase", "Profile:", None)) + self.profileLabel.setText(_translate("NeedsManagerDialogBase", "Profile", None)) self.profileComboBox.setToolTip(_translate("NeedsManagerDialogBase", "Select a profile", None)) - self.saveButton.setText(_translate("NeedsManagerDialogBase", "Save", None)) - self.saveAsButton.setText(_translate("NeedsManagerDialogBase", "Save As ...", None)) - self.newButton.setText(_translate("NeedsManagerDialogBase", "New...", None)) - self.importButton.setText(_translate("NeedsManagerDialogBase", "Import ...", None)) - self.exportButton.setText(_translate("NeedsManagerDialogBase", "Export ...", None)) - self.closeButton.setText(_translate("NeedsManagerDialogBase", "Close", None)) + self.label.setText(_translate("NeedsManagerDialogBase", "Resources for this profile", None)) self.addButton.setToolTip(_translate("NeedsManagerDialogBase", "Add new resource", None)) self.removeButton.setToolTip(_translate("NeedsManagerDialogBase", "Remove selected resource", None)) self.editButton.setToolTip(_translate("NeedsManagerDialogBase", "Edit selected resource", None)) self.provenanceLable.setText(_translate("NeedsManagerDialogBase", "Provenance", None)) + self.label_2.setText(_translate("NeedsManagerDialogBase", "Resource editor", None)) self.discardButton.setToolTip(_translate("NeedsManagerDialogBase", "Discard and return", None)) self.discardButton.setText(_translate("NeedsManagerDialogBase", "X", None)) self.acceptButton.setToolTip(_translate("NeedsManagerDialogBase", "Accept and return", None)) self.acceptButton.setText(_translate("NeedsManagerDialogBase", "✓", None)) + self.saveButton.setText(_translate("NeedsManagerDialogBase", "Save", None)) + self.saveAsButton.setText(_translate("NeedsManagerDialogBase", "Save As ...", None)) + self.newButton.setText(_translate("NeedsManagerDialogBase", "New...", None)) + self.importButton.setText(_translate("NeedsManagerDialogBase", "Import ...", None)) + self.exportButton.setText(_translate("NeedsManagerDialogBase", "Export ...", None)) + self.closeButton.setText(_translate("NeedsManagerDialogBase", "Close", None)) import resources_rc diff --git a/safe_qgis/ui/needs_manager_dialog_base.ui b/safe_qgis/ui/needs_manager_dialog_base.ui index 14e83cced7..176ca52191 100644 --- a/safe_qgis/ui/needs_manager_dialog_base.ui +++ b/safe_qgis/ui/needs_manager_dialog_base.ui @@ -6,7 +6,7 @@ 0 0 - 742 + 750 666 @@ -16,7 +16,7 @@ Minimum Needs Manager - + @@ -28,7 +28,7 @@ - Profile: + Profile @@ -47,6 +47,284 @@ + + + + true + + + false + + + QFrame::NoFrame + + + QFrame::Plain + + + 0 + + + 0 + + + + + + + + 75 + true + + + + Resources for this profile + + + + + + + Qt::Horizontal + + + + 418 + 20 + + + + + + + + + 0 + 0 + + + + + 32 + 32 + + + + + 32 + 32 + + + + + 50 + false + + + + Add new resource + + + false + + + + + + + :/plugins/inasafe/add_icon.svg:/plugins/inasafe/add_icon.svg + + + false + + + true + + + false + + + false + + + + + + + + 32 + 32 + + + + + 32 + 32 + + + + + 50 + false + + + + Remove selected resource + + + + + + + :/plugins/inasafe/remove_icon.svg:/plugins/inasafe/remove_icon.svg + + + + + + + + 32 + 32 + + + + + 32 + 32 + + + + + 50 + false + + + + Edit selected resource + + + + + + + :/plugins/inasafe/edit_icon.svg:/plugins/inasafe/edit_icon.svg + + + + + + + + + + Provenance + + + + + + + + + + + + + + + 75 + true + + + + Resource editor + + + + + + + Qt::Horizontal + + + + 521 + 20 + + + + + + + + + 32 + 32 + + + + + 32 + 32 + + + + + 50 + false + + + + Discard and return + + + X + + + + + + + + 32 + 32 + + + + + 32 + 32 + + + + + 50 + false + + + + Accept and return + + + ✓ + + + + + + + + 0 + 0 + + + + + + + + @@ -106,296 +384,6 @@ - - - - true - - - false - - - QFrame::Panel - - - QFrame::Sunken - - - 0 - - - - - 0 - - - 0 - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 32 - 32 - - - - - 32 - 32 - - - - - 50 - false - - - - Add new resource - - - false - - - - - - - :/plugins/inasafe/add_icon.svg:/plugins/inasafe/add_icon.svg - - - false - - - true - - - false - - - false - - - - - - - - 32 - 32 - - - - - 32 - 32 - - - - - 50 - false - - - - Remove selected resource - - - - - - - :/plugins/inasafe/remove_icon.svg:/plugins/inasafe/remove_icon.svg - - - - - - - - 32 - 32 - - - - - 32 - 32 - - - - - 50 - false - - - - Edit selected resource - - - - - - - :/plugins/inasafe/edit_icon.svg:/plugins/inasafe/edit_icon.svg - - - - - - - - - - - - - - - - Provenance - - - - - - - - - - - - - - 0 - - - 0 - - - - - 0 - - - QLayout::SetDefaultConstraint - - - - - - 0 - 0 - - - - - - - - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 32 - 32 - - - - - 32 - 32 - - - - - 50 - false - - - - Discard and return - - - X - - - - - - - - 32 - 32 - - - - - 32 - 32 - - - - - 50 - false - - - - Accept and return - - - ✓ - - - - - - - - -