Fixing style of fonts and icons, updating "about"

- Introducing new or replacing some old icons - Synchronizing font formatting in message and about dialog - Updating the about dialog - Updating licenses - Fixing links to website and github repository
RobertKrajewski · Jan 20, 2018 · 83e69d2 · 83e69d2
1 parent 33f3e19
commit 83e69d2
Show file tree

Hide file tree

Showing 29 changed files with 135 additions and 94 deletions.
diff --git a/gui/info.ui b/gui/info.ui
diff --git a/gui/message.ui b/gui/message.ui
@@ -68,7 +68,6 @@
          <widget class="QLabel" name="from_label">
           <property name="font">
            <font>
-            <pointsize>12</pointsize>
             <weight>75</weight>
             <bold>true</bold>
            </font>
@@ -89,7 +88,6 @@
          <widget class="QLabel" name="date_label">
           <property name="font">
            <font>
-            <pointsize>12</pointsize>
             <weight>75</weight>
             <bold>true</bold>
            </font>
@@ -110,7 +108,6 @@
          <widget class="QLabel" name="topic_label">
           <property name="font">
            <font>
-            <pointsize>12</pointsize>
             <weight>75</weight>
             <bold>true</bold>
            </font>
@@ -141,8 +138,8 @@
          <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Musterinhalt&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:12pt;&quot;&gt;Musterinhalt&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="searchPaths">
          <stringlist notr="true"/>

diff --git a/gui/mymainwindow.ui b/gui/mymainwindow.ui
@@ -26,19 +26,19 @@
    <string>Sync-my-L²P</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="icons/icons.qrc">
+   <iconset resource="../icons/icons.qrc">
     <normaloff>:/icons/magnifier.png</normaloff>:/icons/magnifier.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
     <item row="0" column="1">
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
       </property>
       <widget class="Browser" name="browserTab">
        <attribute name="icon">
-        <iconset resource="icons/icons.qrc">
+        <iconset resource="../icons/icons.qrc">
          <normaloff>:/icons/browser.png</normaloff>:/icons/browser.png</iconset>
        </attribute>
        <attribute name="title">
@@ -47,7 +47,7 @@
       </widget>
       <widget class="Options" name="optionsTab">
        <attribute name="icon">
-        <iconset resource="icons/icons.qrc">
+        <iconset resource="../icons/icons.qrc">
          <normaloff>:/icons/settings.png</normaloff>:/icons/settings.png</iconset>
        </attribute>
        <attribute name="title">
@@ -59,14 +59,18 @@
         <bool>true</bool>
        </property>
        <attribute name="icon">
-        <iconset resource="icons/icons.qrc">
+        <iconset resource="../icons/icons.qrc">
          <normaloff>:/icons/logs.png</normaloff>:/icons/logs.png</iconset>
        </attribute>
        <attribute name="title">
         <string>Log</string>
        </attribute>
       </widget>
       <widget class="QWidget" name="tutorialTab">
+       <attribute name="icon">
+        <iconset resource="../icons/icons.qrc">
+         <normaloff>:/icons/tutorial.png</normaloff>:/icons/tutorial.png</iconset>
+       </attribute>
        <attribute name="title">
         <string>Anleitung</string>
        </attribute>
@@ -113,7 +117,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="icons/icons.qrc"/>
+  <include location="../icons/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/gui/options.ui b/gui/options.ui
@@ -63,6 +63,10 @@
           <property name="text">
            <string>Löschen</string>
           </property>
+          <property name="icon">
+           <iconset resource="../icons/icons.qrc">
+            <normaloff>:/icons/logout.png</normaloff>:/icons/logout.png</iconset>
+          </property>
          </widget>
         </item>
         <item>
@@ -71,7 +75,7 @@
            <string>Einloggen</string>
           </property>
           <property name="icon">
-           <iconset resource="icons/icons.qrc">
+           <iconset resource="../icons/icons.qrc">
             <normaloff>:/icons/login.png</normaloff>:/icons/login.png</iconset>
           </property>
           <property name="default">
@@ -106,7 +110,7 @@
          <string>Durchsuchen</string>
         </property>
         <property name="icon">
-         <iconset resource="icons/icons.qrc">
+         <iconset resource="../icons/icons.qrc">
           <normaloff>:/icons/downloadDirectory.png</normaloff>:/icons/downloadDirectory.png</iconset>
         </property>
        </widget>
@@ -307,6 +311,10 @@
      <property name="text">
       <string>Über Sync-my-L2P</string>
      </property>
+     <property name="icon">
+      <iconset resource="../icons/icons.qrc">
+       <normaloff>:/icons/about.png</normaloff>:/icons/about.png</iconset>
+     </property>
     </widget>
    </item>
    <item>
@@ -325,7 +333,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="icons/icons.qrc"/>
+  <include location="../icons/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/icons/about.png b/icons/about.png
diff --git a/icons/archive.png b/icons/archive.png
diff --git a/icons/audio.png b/icons/audio.png
diff --git a/icons/block.png b/icons/block.png
diff --git a/icons/1419140403_678134-sign-check-128.png → icons/check.png b/icons/1419140403_678134-sign-check-128.png → icons/check.png
diff --git a/icons/contact.png b/icons/contact.png
diff --git a/icons/contributors.png b/icons/contributors.png
diff --git a/icons/cupboard.png b/icons/cupboard.png
diff --git a/icons/document.png b/icons/document.png
diff --git a/icons/download.png b/icons/download.png
diff --git a/icons/downloadDirectory.png b/icons/downloadDirectory.png
diff --git a/icons/icons.qrc b/icons/icons.qrc
@@ -22,5 +22,11 @@
         <file>picture.png</file>
         <file>archive.png</file>
         <file>mail.png</file>
+        <file>tutorial.png</file>
+        <file>logout.png</file>
+        <file>about.png</file>
+        <file>contact.png</file>
+        <file>contributors.png</file>
+        <file>license.png</file>
     </qresource>
 </RCC>
diff --git a/icons/license.png b/icons/license.png
diff --git a/icons/login.png b/icons/login.png
diff --git a/icons/logout.png b/icons/logout.png
diff --git a/icons/logs.png b/icons/logs.png
diff --git a/icons/mail.png b/icons/mail.png
diff --git a/icons/otherFile.png b/icons/otherFile.png
diff --git a/icons/picture.png b/icons/picture.png
diff --git a/icons/refresh.png b/icons/refresh.png
diff --git a/icons/sheet.png b/icons/sheet.png
diff --git a/icons/slideshow.png b/icons/slideshow.png
diff --git a/icons/tick.png b/icons/tick.png
diff --git a/icons/tutorial.png b/icons/tutorial.png
diff --git a/icons/video.png b/icons/video.png