From 0351429493f5ea55c38b35f93d7ae79856d74914 Mon Sep 17 00:00:00 2001
From: Stefan Suhren <suhren.stefan@fh-swf.de>
Date: Fri, 2 Oct 2015 15:22:59 +0200
Subject: Füge Anwendungslogo ein
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CryptLog.pro         |  11 ++--
 mainwindow.ui        |  10 +++-
 res/CryptLogLogo.svg | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++
 ressources.qrc       |   5 ++
 4 files changed, 159 insertions(+), 6 deletions(-)
 create mode 100644 res/CryptLogLogo.svg
 create mode 100644 ressources.qrc

diff --git a/CryptLog.pro b/CryptLog.pro
index 06a704d..52e5193 100644
--- a/CryptLog.pro
+++ b/CryptLog.pro
@@ -15,19 +15,22 @@ TEMPLATE = app
 SOURCES += main.cpp\
         mainwindow.cpp \
     passworddialog.cpp \
+    publickeyimportdialog.cpp \
     crypt/hybridcrypt.cpp \
-    crypt/cryptexception.cpp \
-    publickeyimportdialog.cpp
+    crypt/cryptexception.cpp
 
 HEADERS  += mainwindow.h \
     passworddialog.h \
+    publickeyimportdialog.h \
     crypt/hybridcrypt.h \
-    crypt/cryptexception.h \
-    publickeyimportdialog.h
+    crypt/cryptexception.h
 
 FORMS    += mainwindow.ui \
     passworddialog.ui \
     publickeyimportdialog.ui
 
+RESOURCES += \
+    ressources.qrc
+
 unix: CONFIG += link_pkgconfig
 unix: PKGCONFIG += openssl
diff --git a/mainwindow.ui b/mainwindow.ui
index 30c22a3..aebb12c 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="ressources.qrc">
+    <normaloff>:/res/CryptLogLogo.svg</normaloff>:/res/CryptLogLogo.svg</iconset>
+  </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
@@ -113,7 +117,7 @@
      <x>0</x>
      <y>0</y>
      <width>590</width>
-     <height>30</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuDatei">
@@ -161,6 +165,8 @@
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="ressources.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/res/CryptLogLogo.svg b/res/CryptLogLogo.svg
new file mode 100644
index 0000000..fcdaa4c
--- /dev/null
+++ b/res/CryptLogLogo.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="64"
+   height="64"
+   id="svg3495"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 64 64"
+   sodipodi:docname="CryptLogLogo.svg">
+  <defs
+     id="defs3497">
+    <clipPath
+       id="clipPath16">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 0,0 0,45 45,45 45,0 0,0"
+         id="path18" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="-2.3723973"
+     inkscape:cy="40.99754"
+     inkscape:current-layer="icon-114-lock"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="709"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3500">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       clip-path="url(#clipPath16)"
+       id="g14"
+       transform="matrix(1.6800205,0,0,-1.6800205,-6.6990517,69.68238)">
+      <g
+         id="g20">
+        <g
+           id="g22">
+          <g
+             id="g24">
+            <path
+               d="m 9.347,6.027 0,32.946 c 0,0.843 0.684,1.527 1.527,1.527 l 13.349,0 11.43,-11.43 0,-23.043 C 35.653,5.184 34.969,4.5 34.126,4.5 l -23.252,0 c -0.843,0 -1.527,0.684 -1.527,1.527 z"
+               id="path26"
+               style="fill:#2b2b2b;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               inkscape:connector-curvature="0" />
+          </g>
+        </g>
+        <g
+           id="g28">
+          <g
+             id="g30" />
+        </g>
+        <g
+           id="g34">
+          <g
+             id="g36" />
+        </g>
+        <g
+           id="g40">
+          <g
+             id="g42" />
+        </g>
+        <g
+           id="g46">
+          <g
+             id="g48" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="Page-1"
+       style="fill:#0f8aff;fill-rule:evenodd;stroke:none;stroke-width:1;fill-opacity:1"
+       transform="matrix(1.1785714,0,0,1.1666667,11.712106,6.556219)">
+      <g
+         id="icon-114-lock"
+         style="fill:#0f8aff;fill-opacity:1">
+        <path
+           id="lock"
+           d="m 16,21.914647 0,2.594348 C 16,24.780169 16.231934,25 16.5,25 16.776142,25 17,24.772119 17,24.508995 l 0,-2.594348 C 17.582596,21.708729 18,21.153109 18,20.5 18,19.671573 17.328427,19 16.5,19 15.671573,19 15,19.671573 15,20.5 c 0,0.653109 0.417404,1.208729 1,1.414647 l 0,0 z M 9,14.000013 9,10.499235 C 9,6.3567048 12.357864,3 16.5,3 20.633707,3 24,6.3575219 24,10.499235 l 0,3.500778 c 1.659147,0.0047 3,1.350304 3,3.009465 l 0,9.981044 C 27,28.663369 25.65292,30 23.991212,30 L 9.008788,30 C 7.3455902,30 6,28.652611 6,26.990522 l 0,-9.981044 c 0,-1.669897 1.3423335,-3.004763 3,-3.009465 l 0,0 0,0 z M 12,14 12,10.500854 C 12,8.0092478 14.014719,6 16.5,6 18.980224,6 21,8.0151008 21,10.500854 L 21,14 l -9,0 0,0 0,0 z"
+           inkscape:connector-curvature="0"
+           style="fill:#6dff0f;fill-opacity:1" />
+      </g>
+    </g>
+    <path
+       d="m 33.990473,1.6392584 19.202631,19.2026356 -16.63724,0 c -1.416257,0 -2.565391,-1.149134 -2.565391,-2.565391 l 0,-16.6372446 z"
+       id="path32-7"
+       style="fill:#525252;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       inkscape:connector-curvature="0"
+       clip-path="none" />
+    <path
+       d="m 23.862626,54.504523 0,1.113853 -4.562935,0 0,-9.263633 1.296975,0 0,8.14978 3.26596,0 z"
+       id="path38-5"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       d="M 32.665934,47.529078 C 33.58826,48.402688 34.05027,49.560223 34.05027,51 c 0,1.439778 -0.46201,2.597312 -1.384336,3.470922 -0.920651,0.873611 -2.052985,1.312096 -3.395322,1.312096 -1.340656,0 -2.47299,-0.438485 -3.395321,-1.312096 C 24.95296,53.597312 24.492634,52.439778 24.492634,51 c 0,-1.439777 0.460326,-2.597312 1.382657,-3.470922 0.922331,-0.873611 2.054665,-1.312096 3.395321,-1.312096 1.342337,0 2.474671,0.438485 3.395322,1.312096 z m -0.939131,6.079994 c 0.661928,-0.658568 0.992892,-1.537219 0.992892,-2.639312 0,-1.100414 -0.330964,-1.980744 -0.992892,-2.637632 -0.663608,-0.658568 -1.481778,-0.986172 -2.456191,-0.986172 -0.974412,0 -1.792582,0.327604 -2.45451,0.986172 -0.661928,0.656888 -0.992892,1.537218 -0.992892,2.637632 0,1.093693 0.330964,1.970664 0.992892,2.632592 0.661928,0.661928 1.480098,0.992892 2.45451,0.992892 0.974413,0 1.792583,-0.327604 2.456191,-0.986172 z"
+       id="path44-2"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 43.70031,50.675756 0,3.598604 c -1.00129,1.001292 -2.31171,1.503618 -3.93293,1.508658 -1.34234,0 -2.46459,-0.443525 -3.37012,-1.332256 -0.90385,-0.887051 -1.35578,-2.042905 -1.35578,-3.467562 0,-1.416257 0.44857,-2.563711 1.3457,-3.444042 0.89881,-0.880331 2.02106,-1.322176 3.36676,-1.322176 1.49522,0 2.72163,0.515766 3.67756,1.547299 l 0.0655,0.06552 -0.88537,0.81985 C 41.86067,47.771 40.90809,47.332514 39.75392,47.332514 c -0.97441,0 -1.77914,0.329284 -2.41587,0.986172 -0.63505,0.658568 -0.95425,1.545619 -0.95425,2.664513 0,1.110493 0.3276,1.995864 0.98113,2.657792 0.65353,0.663608 1.47506,0.994572 2.46795,0.994572 1.11889,0 1.95554,-0.250323 2.50995,-0.747609 l 0.0924,-0.09912 0,-2.051305 -2.49819,0 0,-1.061773 3.76325,0 z"
+       id="path50-4"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/ressources.qrc b/ressources.qrc
new file mode 100644
index 0000000..6c3658a
--- /dev/null
+++ b/ressources.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>res/CryptLogLogo.svg</file>
+    </qresource>
+</RCC>
-- 
cgit v1.2.3-70-g09d2