From 28e4bca23339a8ffdb38c286bc325412417d58d1 Mon Sep 17 00:00:00 2001
From: kostas <kostas@noemail.net>
Date: Sat, 25 Apr 2015 14:46:36 +0000
Subject: [PATCH] OSX: Localized menus now integrate better in OSX

FossilOrigin-Name: 9314ddc02dd302435a4aea987f16cb847a1076b6
---
 manifest         |  12 +-
 manifest.uuid    |   2 +-
 ui/MainWindow.ui | 908 ++++++++++++++++++++++++-----------------------
 3 files changed, 479 insertions(+), 443 deletions(-)

diff --git a/manifest b/manifest
index 5f21ab3..5c2d081 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updated\sbuild\sinstructions
-D 2015-04-25T14:45:38.483
+C OSX:\sLocalized\smenus\snow\sintegrate\sbetter\sin\sOSX\n
+D 2015-04-25T14:46:36.553
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -211,9 +211,9 @@ F ui/BrowserWidget.ui 5ad98b13773afadb20a1a2c22148aaebe5dbd95d
 F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
 F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
-F ui/MainWindow.ui 7ede8bbb54513e0771fdf5d5a2566d88c81b73ad
+F ui/MainWindow.ui 8677f5c8bca5bf7561d5f64bfdd0cef5157c6ac7
 F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
-P d25b1871b284843ab9abfc0635415ff2373c5ee1
-R 67431acdb13a5999c7d91f53289a7a51
+P 3c5332bad121fe233106059c3217d61bf1741a73
+R c962178a62e461a8147559e1d039b71c
 U kostas
-Z c791c7994e9d93c28cd41be669beaecc
+Z 87a9b929412237c6cd48f6d4393313e9
diff --git a/manifest.uuid b/manifest.uuid
index fbe8ee2..70d4a70 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3c5332bad121fe233106059c3217d61bf1741a73
\ No newline at end of file
+9314ddc02dd302435a4aea987f16cb847a1076b6
\ No newline at end of file
diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui
index 62a5da6..6652298 100644
--- a/ui/MainWindow.ui
+++ b/ui/MainWindow.ui
@@ -4,10 +4,10 @@
  <widget class="QMainWindow" name="MainWindow">
   <property name="geometry">
    <rect>
-	<x>0</x>
-	<y>0</y>
-	<width>865</width>
-	<height>640</height>
+    <x>0</x>
+    <y>0</y>
+    <width>865</width>
+    <height>640</height>
    </rect>
   </property>
   <property name="acceptDrops">
@@ -18,260 +18,287 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../rsrc/resources.qrc">
-	<normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
+    <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
   </property>
   <property name="unifiedTitleAndToolBarOnMac">
    <bool>true</bool>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout">
-	<property name="margin">
-	 <number>4</number>
-	</property>
-	<item>
-	 <widget class="QSplitter" name="splitter_2">
-	  <property name="sizePolicy">
-	   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-		<horstretch>0</horstretch>
-		<verstretch>0</verstretch>
-	   </sizepolicy>
-	  </property>
-	  <property name="orientation">
-	   <enum>Qt::Vertical</enum>
-	  </property>
-	  <widget class="QSplitter" name="splitter">
-	   <property name="sizePolicy">
-		<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-		 <horstretch>0</horstretch>
-		 <verstretch>75</verstretch>
-		</sizepolicy>
-	   </property>
-	   <property name="orientation">
-		<enum>Qt::Horizontal</enum>
-	   </property>
-	   <widget class="QTreeView" name="treeView">
-		<property name="sizePolicy">
-		 <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-		  <horstretch>20</horstretch>
-		  <verstretch>0</verstretch>
-		 </sizepolicy>
-		</property>
-		<property name="contextMenuPolicy">
-		 <enum>Qt::ActionsContextMenu</enum>
-		</property>
-		<property name="editTriggers">
-		 <set>QAbstractItemView::NoEditTriggers</set>
-		</property>
-		<property name="selectionMode">
-		 <enum>QAbstractItemView::ExtendedSelection</enum>
-		</property>
-		<property name="selectionBehavior">
-		 <enum>QAbstractItemView::SelectItems</enum>
-		</property>
-		<property name="sortingEnabled">
-		 <bool>true</bool>
-		</property>
-		<attribute name="headerVisible">
-		 <bool>true</bool>
-		</attribute>
-		<attribute name="headerShowSortIndicator" stdset="0">
-		 <bool>false</bool>
-		</attribute>
-	   </widget>
-	   <widget class="FileTableView" name="tableView">
-		<property name="sizePolicy">
-		 <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-		  <horstretch>80</horstretch>
-		  <verstretch>0</verstretch>
-		 </sizepolicy>
-		</property>
-		<property name="contextMenuPolicy">
-		 <enum>Qt::CustomContextMenu</enum>
-		</property>
-		<property name="editTriggers">
-		 <set>QAbstractItemView::NoEditTriggers</set>
-		</property>
-		<property name="alternatingRowColors">
-		 <bool>true</bool>
-		</property>
-		<property name="selectionBehavior">
-		 <enum>QAbstractItemView::SelectRows</enum>
-		</property>
-		<property name="verticalScrollMode">
-		 <enum>QAbstractItemView::ScrollPerPixel</enum>
-		</property>
-		<property name="horizontalScrollMode">
-		 <enum>QAbstractItemView::ScrollPerPixel</enum>
-		</property>
-		<property name="showGrid">
-		 <bool>false</bool>
-		</property>
-		<property name="sortingEnabled">
-		 <bool>true</bool>
-		</property>
-		<property name="wordWrap">
-		 <bool>false</bool>
-		</property>
-		<attribute name="horizontalHeaderHighlightSections">
-		 <bool>false</bool>
-		</attribute>
-		<attribute name="horizontalHeaderMinimumSectionSize">
-		 <number>20</number>
-		</attribute>
-		<attribute name="horizontalHeaderShowSortIndicator" stdset="0">
-		 <bool>true</bool>
-		</attribute>
-		<attribute name="horizontalHeaderStretchLastSection">
-		 <bool>true</bool>
-		</attribute>
-		<attribute name="verticalHeaderVisible">
-		 <bool>false</bool>
-		</attribute>
-		<attribute name="verticalHeaderDefaultSectionSize">
-		 <number>30</number>
-		</attribute>
-	   </widget>
-	   <widget class="QTableView" name="tableViewStash">
-		<property name="sizePolicy">
-		 <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-		  <horstretch>20</horstretch>
-		  <verstretch>0</verstretch>
-		 </sizepolicy>
-		</property>
-		<property name="contextMenuPolicy">
-		 <enum>Qt::ActionsContextMenu</enum>
-		</property>
-		<property name="editTriggers">
-		 <set>QAbstractItemView::NoEditTriggers</set>
-		</property>
-		<property name="alternatingRowColors">
-		 <bool>true</bool>
-		</property>
-		<property name="selectionBehavior">
-		 <enum>QAbstractItemView::SelectRows</enum>
-		</property>
-		<property name="showGrid">
-		 <bool>false</bool>
-		</property>
-		<property name="sortingEnabled">
-		 <bool>true</bool>
-		</property>
-		<property name="wordWrap">
-		 <bool>false</bool>
-		</property>
-		<attribute name="horizontalHeaderHighlightSections">
-		 <bool>false</bool>
-		</attribute>
-		<attribute name="horizontalHeaderStretchLastSection">
-		 <bool>true</bool>
-		</attribute>
-		<attribute name="verticalHeaderVisible">
-		 <bool>false</bool>
-		</attribute>
-	   </widget>
-	  </widget>
-	  <widget class="QTabWidget" name="tabWidget">
-	   <property name="sizePolicy">
-		<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-		 <horstretch>0</horstretch>
-		 <verstretch>8</verstretch>
-		</sizepolicy>
-	   </property>
-	   <property name="tabPosition">
-		<enum>QTabWidget::South</enum>
-	   </property>
-	   <property name="currentIndex">
-		<number>1</number>
-	   </property>
-	   <widget class="QWidget" name="tabLog">
-		<attribute name="title">
-		 <string>Log</string>
-		</attribute>
-		<layout class="QVBoxLayout" name="verticalLayout_2">
-		 <property name="margin">
-		  <number>0</number>
-		 </property>
-		 <item>
-		  <widget class="QTextBrowser" name="textBrowser">
-		   <property name="sizePolicy">
-			<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-			 <horstretch>0</horstretch>
-			 <verstretch>0</verstretch>
-			</sizepolicy>
-		   </property>
-		   <property name="contextMenuPolicy">
-			<enum>Qt::CustomContextMenu</enum>
-		   </property>
-		   <property name="frameShape">
-			<enum>QFrame::NoFrame</enum>
-		   </property>
-		  </widget>
-		 </item>
-		</layout>
-	   </widget>
-	   <widget class="QWidget" name="tabBrowser">
-		<attribute name="title">
-		 <string>Browser</string>
-		</attribute>
-		<layout class="QVBoxLayout" name="verticalLayout_3">
-		 <property name="spacing">
-		  <number>0</number>
-		 </property>
-		 <property name="margin">
-		  <number>0</number>
-		 </property>
-		 <item>
-		  <widget class="BrowserWidget" name="webView" native="true"/>
-		 </item>
-		</layout>
-	   </widget>
-	  </widget>
-	 </widget>
-	</item>
+    <property name="leftMargin">
+     <number>4</number>
+    </property>
+    <property name="topMargin">
+     <number>4</number>
+    </property>
+    <property name="rightMargin">
+     <number>4</number>
+    </property>
+    <property name="bottomMargin">
+     <number>4</number>
+    </property>
+    <item>
+     <widget class="QSplitter" name="splitter_2">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <widget class="QSplitter" name="splitter">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>75</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <widget class="QTreeView" name="treeView">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+          <horstretch>20</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="contextMenuPolicy">
+         <enum>Qt::ActionsContextMenu</enum>
+        </property>
+        <property name="editTriggers">
+         <set>QAbstractItemView::NoEditTriggers</set>
+        </property>
+        <property name="selectionMode">
+         <enum>QAbstractItemView::ExtendedSelection</enum>
+        </property>
+        <property name="selectionBehavior">
+         <enum>QAbstractItemView::SelectItems</enum>
+        </property>
+        <property name="sortingEnabled">
+         <bool>true</bool>
+        </property>
+        <attribute name="headerVisible">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="headerShowSortIndicator" stdset="0">
+         <bool>false</bool>
+        </attribute>
+       </widget>
+       <widget class="FileTableView" name="tableView">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+          <horstretch>80</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="contextMenuPolicy">
+         <enum>Qt::CustomContextMenu</enum>
+        </property>
+        <property name="editTriggers">
+         <set>QAbstractItemView::NoEditTriggers</set>
+        </property>
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
+        <property name="selectionBehavior">
+         <enum>QAbstractItemView::SelectRows</enum>
+        </property>
+        <property name="verticalScrollMode">
+         <enum>QAbstractItemView::ScrollPerPixel</enum>
+        </property>
+        <property name="horizontalScrollMode">
+         <enum>QAbstractItemView::ScrollPerPixel</enum>
+        </property>
+        <property name="showGrid">
+         <bool>false</bool>
+        </property>
+        <property name="sortingEnabled">
+         <bool>true</bool>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+        <attribute name="horizontalHeaderHighlightSections">
+         <bool>false</bool>
+        </attribute>
+        <attribute name="horizontalHeaderMinimumSectionSize">
+         <number>20</number>
+        </attribute>
+        <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="horizontalHeaderStretchLastSection">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="verticalHeaderVisible">
+         <bool>false</bool>
+        </attribute>
+        <attribute name="verticalHeaderDefaultSectionSize">
+         <number>30</number>
+        </attribute>
+       </widget>
+       <widget class="QTableView" name="tableViewStash">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+          <horstretch>20</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="contextMenuPolicy">
+         <enum>Qt::ActionsContextMenu</enum>
+        </property>
+        <property name="editTriggers">
+         <set>QAbstractItemView::NoEditTriggers</set>
+        </property>
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
+        <property name="selectionBehavior">
+         <enum>QAbstractItemView::SelectRows</enum>
+        </property>
+        <property name="showGrid">
+         <bool>false</bool>
+        </property>
+        <property name="sortingEnabled">
+         <bool>true</bool>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+        <attribute name="horizontalHeaderHighlightSections">
+         <bool>false</bool>
+        </attribute>
+        <attribute name="horizontalHeaderStretchLastSection">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="verticalHeaderVisible">
+         <bool>false</bool>
+        </attribute>
+       </widget>
+      </widget>
+      <widget class="QTabWidget" name="tabWidget">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>8</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="tabPosition">
+        <enum>QTabWidget::South</enum>
+       </property>
+       <property name="currentIndex">
+        <number>1</number>
+       </property>
+       <widget class="QWidget" name="tabLog">
+        <attribute name="title">
+         <string>Log</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QTextBrowser" name="textBrowser">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="contextMenuPolicy">
+            <enum>Qt::CustomContextMenu</enum>
+           </property>
+           <property name="frameShape">
+            <enum>QFrame::NoFrame</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabBrowser">
+        <attribute name="title">
+         <string>Browser</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="BrowserWidget" name="webView" native="true"/>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
-	<rect>
-	 <x>0</x>
-	 <y>0</y>
-	 <width>865</width>
-	 <height>23</height>
-	</rect>
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>865</width>
+     <height>22</height>
+    </rect>
    </property>
    <widget class="QMenu" name="menuFile">
-	<property name="title">
-	 <string>&amp;File</string>
-	</property>
-	<addaction name="actionNewRepository"/>
-	<addaction name="actionCloneRepository"/>
-	<addaction name="separator"/>
-	<addaction name="actionOpenRepository"/>
-	<addaction name="actionCloseRepository"/>
-	<addaction name="separator"/>
-	<addaction name="actionSettings"/>
-	<addaction name="separator"/>
-	<addaction name="separator"/>
-	<addaction name="actionQuit"/>
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="actionNewRepository"/>
+    <addaction name="actionCloneRepository"/>
+    <addaction name="separator"/>
+    <addaction name="actionOpenRepository"/>
+    <addaction name="actionCloseRepository"/>
+    <addaction name="separator"/>
+    <addaction name="actionSettings"/>
+    <addaction name="separator"/>
+    <addaction name="separator"/>
+    <addaction name="actionQuit"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
-	<property name="title">
-	 <string>&amp;Help</string>
-	</property>
-	<addaction name="actionAbout"/>
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="actionAbout"/>
    </widget>
    <widget class="QMenu" name="menuView">
-	<property name="title">
-	 <string>&amp;View</string>
-	</property>
-	<addaction name="actionViewModified"/>
-	<addaction name="actionViewUnchanged"/>
-	<addaction name="actionViewUnknown"/>
-	<addaction name="actionViewIgnored"/>
-	<addaction name="separator"/>
-	<addaction name="actionViewStash"/>
-	<addaction name="separator"/>
-	<addaction name="actionViewAsList"/>
+    <property name="title">
+     <string>&amp;View</string>
+    </property>
+    <addaction name="actionViewModified"/>
+    <addaction name="actionViewUnchanged"/>
+    <addaction name="actionViewUnknown"/>
+    <addaction name="actionViewIgnored"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewStash"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewAsList"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuView"/>
@@ -279,28 +306,28 @@
   </widget>
   <widget class="QToolBar" name="mainToolBar">
    <property name="windowTitle">
-	<string>Main Toolbar</string>
+    <string>Main Toolbar</string>
    </property>
    <property name="movable">
-	<bool>false</bool>
+    <bool>false</bool>
    </property>
    <property name="iconSize">
-	<size>
-	 <width>32</width>
-	 <height>32</height>
-	</size>
+    <size>
+     <width>32</width>
+     <height>32</height>
+    </size>
    </property>
    <property name="toolButtonStyle">
-	<enum>Qt::ToolButtonIconOnly</enum>
+    <enum>Qt::ToolButtonIconOnly</enum>
    </property>
    <property name="floatable">
-	<bool>false</bool>
+    <bool>false</bool>
    </property>
    <attribute name="toolBarArea">
-	<enum>TopToolBarArea</enum>
+    <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
-	<bool>false</bool>
+    <bool>false</bool>
    </attribute>
    <addaction name="actionRefresh"/>
    <addaction name="separator"/>
@@ -329,568 +356,577 @@
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionRefresh">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Button Refresh-01.png</normaloff>:/icons/icons/Button Refresh-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Button Refresh-01.png</normaloff>:/icons/icons/Button Refresh-01.png</iconset>
    </property>
    <property name="text">
-	<string>Refresh</string>
+    <string>Refresh</string>
    </property>
    <property name="toolTip">
-	<string>Refresh the views</string>
+    <string>Refresh the views</string>
    </property>
    <property name="statusTip">
-	<string>Refresh the views</string>
+    <string>Refresh the views</string>
    </property>
    <property name="shortcut">
-	<string>F5</string>
+    <string>F5</string>
    </property>
   </action>
   <action name="actionCommit">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Save-01.png</normaloff>:/icons/icons/Save-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Save-01.png</normaloff>:/icons/icons/Save-01.png</iconset>
    </property>
    <property name="text">
-	<string>Commit</string>
+    <string>Commit</string>
    </property>
    <property name="toolTip">
-	<string>Commit modifications</string>
+    <string>Commit modifications</string>
    </property>
    <property name="statusTip">
-	<string>Commit modifications</string>
+    <string>Commit modifications</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+M</string>
+    <string>Ctrl+M</string>
    </property>
   </action>
   <action name="actionDiff">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Document Copy-01.png</normaloff>:/icons/icons/Document Copy-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Document Copy-01.png</normaloff>:/icons/icons/Document Copy-01.png</iconset>
    </property>
    <property name="text">
-	<string>Diff</string>
+    <string>Diff</string>
    </property>
    <property name="toolTip">
-	<string>Display the differences between the current and last committed version</string>
+    <string>Display the differences between the current and last committed version</string>
    </property>
    <property name="statusTip">
-	<string>Display the differences between the current and last committed version</string>
+    <string>Display the differences between the current and last committed version</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+D</string>
+    <string>Ctrl+D</string>
    </property>
   </action>
   <action name="actionAdd">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/File New-01.png</normaloff>:/icons/icons/File New-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/File New-01.png</normaloff>:/icons/icons/File New-01.png</iconset>
    </property>
    <property name="text">
-	<string>Add</string>
+    <string>Add</string>
    </property>
    <property name="toolTip">
-	<string>Add files to the repository</string>
+    <string>Add files to the repository</string>
    </property>
    <property name="statusTip">
-	<string>Add files to the repository</string>
+    <string>Add files to the repository</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl++</string>
+    <string>Ctrl++</string>
    </property>
   </action>
   <action name="actionDelete">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/File Delete-01.png</normaloff>:/icons/icons/File Delete-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/File Delete-01.png</normaloff>:/icons/icons/File Delete-01.png</iconset>
    </property>
    <property name="text">
-	<string>Delete</string>
+    <string>Delete</string>
    </property>
    <property name="toolTip">
-	<string>Delete files from the repository</string>
+    <string>Delete files from the repository</string>
    </property>
    <property name="statusTip">
-	<string>Delete files from the repository</string>
+    <string>Delete files from the repository</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+-</string>
+    <string>Ctrl+-</string>
    </property>
   </action>
   <action name="actionNewRepository">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Document Blank-01.png</normaloff>:/icons/icons/Document Blank-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Document Blank-01.png</normaloff>:/icons/icons/Document Blank-01.png</iconset>
    </property>
    <property name="text">
-	<string>&amp;New...</string>
+    <string>&amp;New...</string>
    </property>
    <property name="toolTip">
-	<string>Make a new Fossil repository</string>
+    <string>Make a new Fossil repository</string>
    </property>
    <property name="statusTip">
-	<string>Make a new Fossil repository</string>
+    <string>Make a new Fossil repository</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+N</string>
+    <string>Ctrl+N</string>
    </property>
   </action>
   <action name="actionOpenRepository">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/My Documents-01.png</normaloff>:/icons/icons/My Documents-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/My Documents-01.png</normaloff>:/icons/icons/My Documents-01.png</iconset>
    </property>
    <property name="text">
-	<string>&amp;Open...</string>
+    <string>&amp;Open...</string>
    </property>
    <property name="toolTip">
-	<string>Open a Fossil repository or workspace folder</string>
+    <string>Open a Fossil repository or workspace folder</string>
    </property>
    <property name="statusTip">
-	<string>Open a Fossil repository or workspace folder</string>
+    <string>Open a Fossil repository or workspace folder</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+O</string>
+    <string>Ctrl+O</string>
    </property>
    <property name="iconVisibleInMenu">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
   </action>
   <action name="actionCloseRepository">
    <property name="text">
-	<string>&amp;Close</string>
+    <string>&amp;Close</string>
    </property>
    <property name="toolTip">
-	<string>Close the current workspace</string>
+    <string>Close the current workspace</string>
    </property>
    <property name="statusTip">
-	<string>Close the current workspace</string>
+    <string>Close the current workspace</string>
    </property>
   </action>
   <action name="actionCloneRepository">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/My Websites-01.png</normaloff>:/icons/icons/My Websites-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/My Websites-01.png</normaloff>:/icons/icons/My Websites-01.png</iconset>
    </property>
    <property name="text">
-	<string>Clone...</string>
+    <string>Clone...</string>
    </property>
    <property name="statusTip">
-	<string>Clone a remote repository</string>
+    <string>Clone a remote repository</string>
    </property>
   </action>
   <action name="actionPush">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Button Upload-01.png</normaloff>:/icons/icons/Button Upload-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Button Upload-01.png</normaloff>:/icons/icons/Button Upload-01.png</iconset>
    </property>
    <property name="text">
-	<string>Push</string>
+    <string>Push</string>
    </property>
    <property name="toolTip">
-	<string>Push changes to the remote repository</string>
+    <string>Push changes to the remote repository</string>
    </property>
    <property name="statusTip">
-	<string>Push changes to the remote repository</string>
+    <string>Push changes to the remote repository</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+P</string>
+    <string>Ctrl+P</string>
    </property>
   </action>
   <action name="actionPull">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Button Download-01.png</normaloff>:/icons/icons/Button Download-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Button Download-01.png</normaloff>:/icons/icons/Button Download-01.png</iconset>
    </property>
    <property name="text">
-	<string>Pull</string>
+    <string>Pull</string>
    </property>
    <property name="toolTip">
-	<string>Pull changes from the remote repository</string>
+    <string>Pull changes from the remote repository</string>
    </property>
    <property name="statusTip">
-	<string>Pull changes from the remote repository</string>
+    <string>Pull changes from the remote repository</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+L</string>
+    <string>Ctrl+L</string>
    </property>
   </action>
   <action name="actionRename">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/File Open-01.png</normaloff>:/icons/icons/File Open-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/File Open-01.png</normaloff>:/icons/icons/File Open-01.png</iconset>
    </property>
    <property name="text">
-	<string>Rename</string>
+    <string>Rename</string>
    </property>
    <property name="toolTip">
-	<string>Rename the selected file</string>
+    <string>Rename the selected file</string>
    </property>
    <property name="statusTip">
-	<string>Rename the selected file</string>
+    <string>Rename the selected file</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+R</string>
+    <string>Ctrl+R</string>
    </property>
   </action>
   <action name="actionQuit">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Button Turn Off-01.png</normaloff>:/icons/icons/Button Turn Off-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Button Turn Off-01.png</normaloff>:/icons/icons/Button Turn Off-01.png</iconset>
    </property>
    <property name="text">
-	<string>&amp;Quit</string>
+    <string>&amp;Quit</string>
    </property>
    <property name="statusTip">
-	<string>Quit</string>
+    <string>Quit</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+Q</string>
+    <string>Ctrl+Q</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::QuitRole</enum>
    </property>
    <property name="iconVisibleInMenu">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
   </action>
   <action name="actionHistory">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/File History-01.png</normaloff>:/icons/icons/File History-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/File History-01.png</normaloff>:/icons/icons/File History-01.png</iconset>
    </property>
    <property name="text">
-	<string>History</string>
+    <string>History</string>
    </property>
    <property name="toolTip">
-	<string>Display the version history of a file via the Fossil UI</string>
+    <string>Display the version history of a file via the Fossil UI</string>
    </property>
    <property name="statusTip">
-	<string>Display the version history of a file via the Fossil UI</string>
+    <string>Display the version history of a file via the Fossil UI</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+H</string>
+    <string>Ctrl+H</string>
    </property>
   </action>
   <action name="actionFossilUI">
    <property name="checkable">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Network MAC-01.png</normaloff>:/icons/icons/Network MAC-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Network MAC-01.png</normaloff>:/icons/icons/Network MAC-01.png</iconset>
    </property>
    <property name="text">
-	<string>Fossil UI</string>
+    <string>Fossil UI</string>
    </property>
    <property name="toolTip">
-	<string>Starts the Fossil UI in the Web Browser</string>
+    <string>Starts the Fossil UI in the Web Browser</string>
    </property>
    <property name="statusTip">
-	<string>Starts the Fossil UI in the Web Browser</string>
+    <string>Starts the Fossil UI in the Web Browser</string>
    </property>
   </action>
   <action name="actionRevert">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Document-Revert-icon.png</normaloff>:/icons/icons/Document-Revert-icon.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Document-Revert-icon.png</normaloff>:/icons/icons/Document-Revert-icon.png</iconset>
    </property>
    <property name="text">
-	<string>Revert</string>
+    <string>Revert</string>
    </property>
    <property name="toolTip">
-	<string>Revert files to the last commited version</string>
+    <string>Revert files to the last commited version</string>
    </property>
    <property name="statusTip">
-	<string>Revert files to the last commited version</string>
+    <string>Revert files to the last commited version</string>
    </property>
   </action>
   <action name="actionClearLog">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Text Edit.png</normaloff>:/icons/icons/Text Edit.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Text Edit.png</normaloff>:/icons/icons/Text Edit.png</iconset>
    </property>
    <property name="text">
-	<string>Clear Log</string>
+    <string>Clear Log</string>
    </property>
    <property name="toolTip">
-	<string>Clears the log</string>
+    <string>Clears the log</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+K</string>
+    <string>Ctrl+K</string>
    </property>
   </action>
   <action name="actionTimeline">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Clock-01.png</normaloff>:/icons/icons/Clock-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Clock-01.png</normaloff>:/icons/icons/Clock-01.png</iconset>
    </property>
    <property name="text">
-	<string>Timeline</string>
+    <string>Timeline</string>
    </property>
    <property name="toolTip">
-	<string>Display the change history of the Fossil repository</string>
+    <string>Display the change history of the Fossil repository</string>
    </property>
    <property name="statusTip">
-	<string>Display the change history of the Fossil repository</string>
+    <string>Display the change history of the Fossil repository</string>
    </property>
   </action>
   <action name="actionOpenFile">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Document-01.png</normaloff>:/icons/icons/Document-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Document-01.png</normaloff>:/icons/icons/Document-01.png</iconset>
    </property>
    <property name="text">
-	<string>Open File</string>
+    <string>Open File</string>
    </property>
    <property name="toolTip">
-	<string>Open the selected file</string>
+    <string>Open the selected file</string>
    </property>
    <property name="statusTip">
-	<string>Open the selected file</string>
+    <string>Open the selected file</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+Return</string>
+    <string>Ctrl+Return</string>
    </property>
   </action>
   <action name="actionOpenContaining">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
    </property>
    <property name="text">
-	<string>Open Containing</string>
+    <string>Open Containing</string>
    </property>
    <property name="toolTip">
-	<string>Open the folder containing the selected file</string>
+    <string>Open the folder containing the selected file</string>
    </property>
    <property name="statusTip">
-	<string>Open the folder containing the selected file</string>
+    <string>Open the folder containing the selected file</string>
    </property>
    <property name="shortcut">
-	<string>Alt+Return</string>
+    <string>Alt+Return</string>
    </property>
   </action>
   <action name="actionUndo">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Button Reload-01.png</normaloff>:/icons/icons/Button Reload-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Button Reload-01.png</normaloff>:/icons/icons/Button Reload-01.png</iconset>
    </property>
    <property name="text">
-	<string>Undo</string>
+    <string>Undo</string>
    </property>
    <property name="toolTip">
-	<string>Undo the last Fossil action</string>
+    <string>Undo the last Fossil action</string>
    </property>
    <property name="statusTip">
-	<string>Undo the last Fossil action</string>
+    <string>Undo the last Fossil action</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+Z</string>
+    <string>Ctrl+Z</string>
    </property>
   </action>
   <action name="actionAbout">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
    </property>
    <property name="text">
-	<string>&amp;About...</string>
+    <string>&amp;About...</string>
    </property>
    <property name="statusTip">
-	<string>About Fuel</string>
+    <string>About Fuel</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::AboutRole</enum>
    </property>
   </action>
   <action name="actionUpdate">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Button Play-01.png</normaloff>:/icons/icons/Button Play-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Button Play-01.png</normaloff>:/icons/icons/Button Play-01.png</iconset>
    </property>
    <property name="text">
-	<string>Update</string>
+    <string>Update</string>
    </property>
    <property name="toolTip">
-	<string>Update the workspace to the latest version</string>
+    <string>Update the workspace to the latest version</string>
    </property>
    <property name="statusTip">
-	<string>Update the workspace to the latest version</string>
+    <string>Update the workspace to the latest version</string>
    </property>
    <property name="shortcut">
-	<string>Ctrl+U</string>
+    <string>Ctrl+U</string>
    </property>
   </action>
   <action name="actionSettings">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Gear-01.png</normaloff>:/icons/icons/Gear-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Gear-01.png</normaloff>:/icons/icons/Gear-01.png</iconset>
    </property>
    <property name="text">
-	<string>&amp;Preferences...</string>
+    <string>&amp;Preferences...</string>
    </property>
    <property name="toolTip">
-	<string>Fuel Preferences</string>
+    <string>Fuel Preferences</string>
    </property>
    <property name="statusTip">
-	<string>Fuel Preferences</string>
+    <string>Fuel Preferences</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::PreferencesRole</enum>
    </property>
   </action>
   <action name="actionViewModified">
    <property name="checkable">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
    <property name="checked">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
    <property name="text">
-	<string>&amp;Modified</string>
+    <string>&amp;Modified</string>
    </property>
    <property name="statusTip">
-	<string>Show modifed files</string>
+    <string>Show modifed files</string>
    </property>
   </action>
   <action name="actionViewUnchanged">
    <property name="checkable">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
    <property name="checked">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
    <property name="text">
-	<string>&amp;Unchanged</string>
+    <string>&amp;Unchanged</string>
    </property>
    <property name="statusTip">
-	<string>Show unchanged files</string>
+    <string>Show unchanged files</string>
    </property>
   </action>
   <action name="actionViewUnknown">
    <property name="checkable">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
    <property name="checked">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
    <property name="text">
-	<string>Un&amp;known</string>
+    <string>Un&amp;known</string>
    </property>
    <property name="statusTip">
-	<string>Show unknown files</string>
+    <string>Show unknown files</string>
    </property>
   </action>
   <action name="actionViewIgnored">
    <property name="checkable">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
    <property name="text">
-	<string>&amp;Ignored</string>
+    <string>&amp;Ignored</string>
    </property>
    <property name="statusTip">
-	<string>Show ignored files</string>
+    <string>Show ignored files</string>
    </property>
   </action>
   <action name="actionViewAsList">
    <property name="checkable">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
    <property name="text">
-	<string>File &amp;List</string>
+    <string>File &amp;List</string>
    </property>
    <property name="iconText">
-	<string>View files as a list</string>
+    <string>View files as a list</string>
    </property>
    <property name="toolTip">
-	<string>View files as a list</string>
+    <string>View files as a list</string>
    </property>
    <property name="statusTip">
-	<string>View the workspace as a list of files</string>
+    <string>View the workspace as a list of files</string>
    </property>
   </action>
   <action name="actionOpenFolder">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
    </property>
    <property name="text">
-	<string>Open Folder</string>
+    <string>Open Folder</string>
    </property>
    <property name="toolTip">
-	<string>Open the selected folder</string>
+    <string>Open the selected folder</string>
    </property>
    <property name="statusTip">
-	<string>Open the selected folder</string>
+    <string>Open the selected folder</string>
    </property>
   </action>
   <action name="actionRenameFolder">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
    </property>
    <property name="text">
-	<string>Rename Folder</string>
+    <string>Rename Folder</string>
    </property>
    <property name="toolTip">
-	<string>Rename the selected folder</string>
+    <string>Rename the selected folder</string>
    </property>
    <property name="statusTip">
-	<string>Rename the selected folder</string>
+    <string>Rename the selected folder</string>
    </property>
   </action>
   <action name="actionNewStash">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Folder Add-01.png</normaloff>:/icons/icons/Folder Add-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Folder Add-01.png</normaloff>:/icons/icons/Folder Add-01.png</iconset>
    </property>
    <property name="text">
-	<string>Stash changes</string>
+    <string>Stash changes</string>
    </property>
    <property name="statusTip">
-	<string>Stash changes</string>
+    <string>Stash changes</string>
    </property>
   </action>
   <action name="actionApplyStash">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
    </property>
    <property name="text">
-	<string>Apply Stash</string>
+    <string>Apply Stash</string>
    </property>
    <property name="iconText">
-	<string>Apply stashed changes</string>
+    <string>Apply stashed changes</string>
    </property>
    <property name="toolTip">
-	<string>Apply stashed changes</string>
+    <string>Apply stashed changes</string>
    </property>
   </action>
   <action name="actionViewStash">
    <property name="checkable">
-	<bool>true</bool>
+    <bool>true</bool>
    </property>
    <property name="text">
-	<string>&amp;Stashed Changes</string>
+    <string>&amp;Stashed Changes</string>
    </property>
    <property name="iconText">
-	<string>View Stashed Changes</string>
+    <string>View Stashed Changes</string>
    </property>
    <property name="toolTip">
-	<string>View Stashed Changes</string>
+    <string>View Stashed Changes</string>
    </property>
    <property name="statusTip">
-	<string>Show the list of stashed changes</string>
+    <string>Show the list of stashed changes</string>
    </property>
   </action>
   <action name="actionDeleteStash">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Folder Delete-01.png</normaloff>:/icons/icons/Folder Delete-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Folder Delete-01.png</normaloff>:/icons/icons/Folder Delete-01.png</iconset>
    </property>
    <property name="text">
-	<string>Delete Stash</string>
+    <string>Delete Stash</string>
    </property>
   </action>
   <action name="actionDiffStash">
    <property name="icon">
-	<iconset resource="../rsrc/resources.qrc">
-	 <normaloff>:/icons/icons/Folder Explorer-01.png</normaloff>:/icons/icons/Folder Explorer-01.png</iconset>
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Folder Explorer-01.png</normaloff>:/icons/icons/Folder Explorer-01.png</iconset>
    </property>
    <property name="text">
-	<string>Diff Stash</string>
+    <string>Diff Stash</string>
    </property>
   </action>
  </widget>