Redesign Import, still some todos and regression bugs

3 files changed, 754 insertions, 1 deletions

diff --git a/Resources/graphics/ic_action_qr_code.png b/Resources/graphics/ic_action_qr_code.png
new file mode 100644
index 000000000..3c311c7df
--- /dev/null
+++ b/Resources/graphics/ic_action_qr_code.png
diff --git a/Resources/graphics/ic_action_qr_code.svg b/Resources/graphics/ic_action_qr_code.svg
new file mode 100644
index 000000000..da7d0f97c
--- /dev/null
+++ b/Resources/graphics/ic_action_qr_code.svg
@@ -0,0 +1,753 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="48px"
+   height="48px"
+   viewBox="0 0 48 48"
+   enable-background="new 0 0 48 48"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="ic_menu_qr_code.svg"><metadata
+   id="metadata231"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs229">
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1918"
+   inkscape:window-height="1179"
+   id="namedview227"
+   showgrid="false"
+   inkscape:zoom="8.4558186"
+   inkscape:cx="-17.080652"
+   inkscape:cy="14.446251"
+   inkscape:window-x="0"
+   inkscape:window-y="19"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect25"
+   height="5.0662165"
+   width="1.6889851"
+   y="9.6451044"
+   x="9.6451044" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect39"
+   height="5.0662165"
+   width="1.6889851"
+   y="9.6451044"
+   x="11.334089" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect55"
+   height="5.0662165"
+   width="1.6882463"
+   y="9.6451044"
+   x="13.023813" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect33"
+   height="5.0662165"
+   width="1.6889851"
+   y="33.287201"
+   x="9.6451044" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect49"
+   height="5.0662165"
+   width="1.6889851"
+   y="33.287201"
+   x="11.334089" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect61"
+   height="5.0662165"
+   width="1.6882463"
+   y="33.287201"
+   x="13.023813" /><rect
+   y="6.2678733"
+   x="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect5"
+   height="11.821418"
+   width="1.6882463" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect13"
+   height="1.6882463"
+   width="1.6889851"
+   x="7.9561195" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect15"
+   height="1.6889851"
+   width="1.6889851"
+   y="16.400307"
+   x="7.9561195" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect23"
+   height="1.6882463"
+   width="1.6889851"
+   x="9.6451044" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect27"
+   height="1.6889851"
+   width="1.6889851"
+   y="16.400307"
+   x="9.6451044" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect37"
+   height="1.6882463"
+   width="1.6889851"
+   x="11.334089" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect41"
+   height="1.6889851"
+   width="1.6889851"
+   y="16.400307"
+   x="11.334089" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect53"
+   height="1.6882463"
+   width="1.6882463"
+   x="13.023813" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect57"
+   height="1.6889851"
+   width="1.6882463"
+   y="16.400307"
+   x="13.023813" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect65"
+   height="1.6882463"
+   width="1.6882463"
+   x="14.712059" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect67"
+   height="1.6889851"
+   width="1.6882463"
+   y="16.400307"
+   x="14.712059" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect75"
+   height="11.821418"
+   width="1.6889851"
+   x="16.400307" /><rect
+   x="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect11"
+   height="11.821418"
+   width="1.6882463"
+   y="29.910709" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect19"
+   height="1.6882463"
+   width="1.6889851"
+   y="29.910709"
+   x="7.9561195" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect21"
+   height="1.6889851"
+   width="1.6889851"
+   y="40.04314"
+   x="7.9561195" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect31"
+   height="1.6882463"
+   width="1.6889851"
+   y="29.910709"
+   x="9.6451044" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect35"
+   height="1.6889851"
+   width="1.6889851"
+   y="40.04314"
+   x="9.6451044" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect47"
+   height="1.6882463"
+   width="1.6889851"
+   y="29.910709"
+   x="11.334089" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect51"
+   height="1.6889851"
+   width="1.6889851"
+   y="40.04314"
+   x="11.334089" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect59"
+   height="1.6882463"
+   width="1.6882463"
+   y="29.910709"
+   x="13.023813" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect63"
+   height="1.6889851"
+   width="1.6882463"
+   y="40.04314"
+   x="13.023813" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect71"
+   height="1.6882463"
+   width="1.6882463"
+   y="29.910709"
+   x="14.712059" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect73"
+   height="1.6889851"
+   width="1.6882463"
+   y="40.04314"
+   x="14.712059" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect83"
+   height="11.821418"
+   width="1.6889851"
+   y="29.910709"
+   x="16.400307" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect163"
+   height="5.0662165"
+   width="1.6897238"
+   y="9.6451044"
+   x="33.287201" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect177"
+   height="5.0662165"
+   width="1.6882463"
+   y="9.6451044"
+   x="34.976925" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect191"
+   height="5.0662165"
+   width="1.6897238"
+   y="9.6451044"
+   x="36.665913" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect141"
+   height="11.821418"
+   width="1.6882463"
+   x="29.910709" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect151"
+   height="1.6882463"
+   width="1.6882463"
+   x="31.598955" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect153"
+   height="1.6889851"
+   width="1.6882463"
+   y="16.400307"
+   x="31.598955" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect161"
+   height="1.6882463"
+   width="1.6897238"
+   x="33.287201" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect165"
+   height="1.6889851"
+   width="1.6897238"
+   y="16.400307"
+   x="33.287201" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect175"
+   height="1.6882463"
+   width="1.6882463"
+   x="34.976925" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect179"
+   height="1.6889851"
+   width="1.6882463"
+   y="16.400307"
+   x="34.976925" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect189"
+   height="1.6882463"
+   width="1.6897238"
+   x="36.665913" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect193"
+   height="1.6889851"
+   width="1.6897238"
+   y="16.400307"
+   x="36.665913" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect203"
+   height="1.6882463"
+   width="1.6875074"
+   x="38.355633" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect205"
+   height="1.6889851"
+   width="1.6875074"
+   y="16.400307"
+   x="38.355633" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect217"
+   height="11.821418"
+   width="1.6889851"
+   x="40.04314" /><rect
+   x="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect7"
+   height="3.3779702"
+   width="1.6882463"
+   y="19.777536" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect17"
+   height="1.6897238"
+   width="1.6889851"
+   y="26.53274"
+   x="7.9561195" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect29"
+   height="5.0654774"
+   width="1.6889851"
+   y="21.466522"
+   x="9.6451044" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect43"
+   height="1.6889851"
+   width="1.6889851"
+   y="21.466522"
+   x="11.334089" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect45"
+   height="3.3779702"
+   width="1.6889851"
+   y="24.844492"
+   x="11.334089" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect69"
+   height="1.6889851"
+   width="1.6882463"
+   y="23.155508"
+   x="14.712059" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect77"
+   height="1.6889851"
+   width="1.6889851"
+   y="19.777536"
+   x="16.400307" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect79"
+   height="1.6889851"
+   width="1.6889851"
+   y="23.155508"
+   x="16.400307" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect81"
+   height="1.6897238"
+   width="1.6889851"
+   y="26.53274"
+   x="16.400307" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect85"
+   height="3.3779702"
+   width="1.6889851"
+   y="21.466522"
+   x="18.089291" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect87"
+   height="5.0662165"
+   width="1.6889851"
+   y="7.9561195"
+   x="19.778276" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect89"
+   height="13.510403"
+   width="1.6889851"
+   y="16.400307"
+   x="19.778276" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect91"
+   height="1.6889851"
+   width="1.6889851"
+   y="40.04314"
+   x="19.778276" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect93"
+   height="1.6882463"
+   width="1.6882463"
+   x="21.467262" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect95"
+   height="1.6889851"
+   width="1.6882463"
+   y="13.023074"
+   x="21.467262" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect97"
+   height="5.0662165"
+   width="1.6882463"
+   y="24.844492"
+   x="21.467262" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect99"
+   height="1.6882463"
+   width="1.6882463"
+   y="31.598955"
+   x="21.467262" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect101"
+   height="6.7552013"
+   width="1.6882463"
+   y="34.976925"
+   x="21.467262" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect103"
+   height="1.6882463"
+   width="1.6889851"
+   y="11.334089"
+   x="23.155508" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect107"
+   height="5.0662165"
+   width="1.6889851"
+   y="19.777536"
+   x="23.155508" /><rect
+   y="6.2678733"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect113"
+   height="1.6882463"
+   width="1.6882463"
+   x="24.844492" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect117"
+   height="1.6882463"
+   width="1.6882463"
+   y="18.089291"
+   x="24.844492" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect119"
+   height="1.6889851"
+   width="1.6882463"
+   y="23.155508"
+   x="24.844492" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect121"
+   height="1.6882463"
+   width="1.6882463"
+   y="28.222464"
+   x="24.844492" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect123"
+   height="1.6882463"
+   width="1.6882463"
+   y="31.598955"
+   x="24.844492" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect125"
+   height="1.6889851"
+   width="1.6882463"
+   y="40.04314"
+   x="24.844492" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect127"
+   height="3.3779702"
+   width="1.6889851"
+   y="7.9561195"
+   x="26.53274" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect129"
+   height="10.133172"
+   width="1.6889851"
+   y="13.023074"
+   x="26.53274" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect131"
+   height="8.4434481"
+   width="1.6889851"
+   y="28.222464"
+   x="26.53274" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect135"
+   height="3.3779702"
+   width="1.6889851"
+   y="26.53274"
+   x="28.221725" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect137"
+   height="1.6882463"
+   width="1.6889851"
+   y="31.598955"
+   x="28.221725" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect139"
+   height="1.6889851"
+   width="1.6889851"
+   y="40.04314"
+   x="28.221725" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect145"
+   height="1.6889851"
+   width="1.6882463"
+   y="23.155508"
+   x="29.910709" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect149"
+   height="1.6897238"
+   width="1.6882463"
+   y="36.665913"
+   x="29.910709" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect155"
+   height="5.0654774"
+   width="1.6882463"
+   y="21.466522"
+   x="31.598955" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect157"
+   height="3.3779702"
+   width="1.6882463"
+   y="31.598955"
+   x="31.598955" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect169"
+   height="1.6897238"
+   width="1.6897238"
+   y="26.53274"
+   x="33.287201" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect171"
+   height="3.3764925"
+   width="1.6897238"
+   y="29.910709"
+   x="33.287201" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect173"
+   height="6.7552013"
+   width="1.6897238"
+   y="34.976925"
+   x="33.287201" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect181"
+   height="1.6889851"
+   width="1.6882463"
+   y="19.777536"
+   x="34.976925" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect183"
+   height="3.3764925"
+   width="1.6882463"
+   y="23.155508"
+   x="34.976925" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect185"
+   height="1.6882463"
+   width="1.6882463"
+   y="31.598955"
+   x="34.976925" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect187"
+   height="1.6875074"
+   width="1.6882463"
+   y="38.355633"
+   x="34.976925" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect195"
+   height="6.7552013"
+   width="1.6897238"
+   y="19.777536"
+   x="36.665913" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect197"
+   height="1.6882463"
+   width="1.6897238"
+   y="28.222464"
+   x="36.665913" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect199"
+   height="1.6882463"
+   width="1.6897238"
+   y="31.598955"
+   x="36.665913" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect201"
+   height="5.0647388"
+   width="1.6897238"
+   y="34.976925"
+   x="36.665913" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect207"
+   height="1.6889851"
+   width="1.6875074"
+   y="19.777536"
+   x="38.355633" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect209"
+   height="5.0662165"
+   width="1.6875074"
+   y="23.155508"
+   x="38.355633" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect211"
+   height="1.6882463"
+   width="1.6875074"
+   y="29.910709"
+   x="38.355633" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect215"
+   height="1.6889851"
+   width="1.6875074"
+   y="40.04314"
+   x="38.355633" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect219"
+   height="1.6882463"
+   width="1.6889851"
+   y="24.844492"
+   x="40.04314" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect223"
+   height="3.3779702"
+   width="1.6889851"
+   y="31.598955"
+   x="40.04314" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect225"
+   height="1.6897238"
+   width="1.6889851"
+   y="36.665913"
+   x="40.04314" />
+</svg>
\ No newline at end of file
diff --git a/Resources/graphics/update-icon.sh b/Resources/graphics/update-icon.sh
index 3df587a21..05b80e6b3 100755
--- a/Resources/graphics/update-icon.sh
+++ b/Resources/graphics/update-icon.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-APP_DIR=../../OpenPGP-Keychain/src/main
+APP_DIR=../../OpenKeychain/src/main
 LDPI_DIR=$APP_DIR/res/drawable-ldpi
 MDPI_DIR=$APP_DIR/res/drawable-mdpi
 HDPI_DIR=$APP_DIR/res/drawable-hdpi