# 
# 
# add_file "guitone/res/icons/guitone.png"
#  content [a4af1628d40d9c0abb2360b60a9143cfdf004803]
# 
# patch "guitone/res/forms/main_window.ui"
#  from [f270fec74606db1d3c15648b106e7f1815f9440d]
#    to [817bf033d8c216fcbf571f26ab0bbcb5238e7ed7]
# 
# patch "guitone/res/guitone.qrc"
#  from [aa792b0a9bacff4929d60c97e1d035f600b51d04]
#    to [f01e16e0a00027eae53b6698fe99d88ba33ad19a]
# 
# patch "guitone/src/main.cpp"
#  from [0d20d31b30c4df01c796afc5e58693d5d2eee849]
#    to [6237f93a53dd52e14b256ddbee193aa454cd3748]
# 
#   set "guitone/res/icons/guitone.png"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
# guitone/res/icons/guitone.png is binary
============================================================
--- guitone/res/forms/main_window.ui	f270fec74606db1d3c15648b106e7f1815f9440d
+++ guitone/res/forms/main_window.ui	817bf033d8c216fcbf571f26ab0bbcb5238e7ed7
@@ -77,9 +77,9 @@ p, li { white-space: pre-wrap; }
              <property name="text" >
               <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">guitone is in &lt;span style=" font-weight:600;">database mode&lt;/span>. This means that only parts of the functionality are available. &lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can switch back to the &lt;span style=" font-weight:600;">workspace mode&lt;/span> at any time by loading a workspace.&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;">&lt;span style=" font-size:10pt;">guitone is in &lt;/span>&lt;span style=" font-size:10pt; font-weight:600;">database mode&lt;/span>&lt;span style=" font-size:10pt;">. This means that only parts of the functionality are available. &lt;/span>&lt;/p>
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:10pt;">You can switch back to the &lt;span style=" font-weight:600;">workspace mode&lt;/span> at any time by loading a workspace.&lt;/p>&lt;/body>&lt;/html></string>
              </property>
              <property name="textFormat" >
               <enum>Qt::RichText</enum>
@@ -92,8 +92,14 @@ p, li { white-space: pre-wrap; }
            <item>
             <widget class="QLabel" name="loadedDatabase" >
              <property name="text" >
-              <string>Loaded database: %1</string>
+              <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:10pt;">Loaded database: %1&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
              </property>
+             <property name="textFormat" >
+              <enum>Qt::AutoText</enum>
+             </property>
              <property name="alignment" >
               <set>Qt::AlignHCenter|Qt::AlignTop</set>
              </property>
@@ -114,7 +120,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>926</width>
-     <height>22</height>
+     <height>28</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuView" >
@@ -143,13 +149,6 @@ p, li { white-space: pre-wrap; }
     <addaction name="actionExpand_tree" />
     <addaction name="menuShow" />
    </widget>
-   <widget class="QMenu" name="menuHelp" >
-    <property name="title" >
-     <string>Help</string>
-    </property>
-    <addaction name="actionAbout_Qt" />
-    <addaction name="actionAbout_guitone" />
-   </widget>
    <widget class="QMenu" name="menuFile" >
     <property name="title" >
      <string>File</string>
@@ -189,6 +188,13 @@ p, li { white-space: pre-wrap; }
     <addaction name="actionKey_management" />
     <addaction name="actionChangeset_browser" />
    </widget>
+   <widget class="QMenu" name="menuHelp" >
+    <property name="title" >
+     <string>Help</string>
+    </property>
+    <addaction name="actionAbout_Qt" />
+    <addaction name="actionAbout_guitone" />
+   </widget>
    <addaction name="menuFile" />
    <addaction name="menuView" />
    <addaction name="menuWorkspace" />
@@ -387,11 +393,6 @@ p, li { white-space: pre-wrap; }
  </widget>
  <customwidgets>
   <customwidget>
-   <class>AttributesView</class>
-   <extends>QTreeView</extends>
-   <header>../AttributesView.h</header>
-  </customwidget>
-  <customwidget>
    <class>InventoryView</class>
    <extends>QTreeView</extends>
    <header>../InventoryView.h</header>
@@ -401,8 +402,15 @@ p, li { white-space: pre-wrap; }
    <extends>QSplitter</extends>
    <header>../Splitter.h</header>
   </customwidget>
+  <customwidget>
+   <class>AttributesView</class>
+   <extends>QTreeView</extends>
+   <header>../AttributesView.h</header>
+  </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../guitone.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>actionQuit</sender>
============================================================
--- guitone/res/guitone.qrc	aa792b0a9bacff4929d60c97e1d035f600b51d04
+++ guitone/res/guitone.qrc	f01e16e0a00027eae53b6698fe99d88ba33ad19a
@@ -1,9 +1,9 @@
 <RCC>
     <qresource prefix="/" >
-        <file>guitone-icon.svg</file>
         <file>guitone-logo.svg</file>
+        <file>i18n/guitone_de.qm</file>
+        <file>icons/guitone.png</file>
         <file>icons/tree.png</file>
-        <file>i18n/guitone_de.qm</file>
         <file>overlays/added.png</file>
         <file>overlays/added_missing.png</file>
         <file>overlays/cdup.png</file>
============================================================
--- guitone/src/main.cpp	0d20d31b30c4df01c796afc5e58693d5d2eee849
+++ guitone/src/main.cpp	6237f93a53dd52e14b256ddbee193aa454cd3748
@@ -49,8 +49,9 @@ int main(int argc, char** argv)
     
     mainWnd->show();
     
-	app.setWindowIcon(QIcon(":guitone-icon.svg"));
+	app.setWindowIcon(QIcon(":icons/guitone.png"));
     app.connect(&app, SIGNAL(lastWindowClosed()), mainWnd, SLOT(quit()));
+
     return app.exec();
 }