--- qsampler/trunk/src/qsamplerMainForm.ui	2010/01/06 09:52:32	2036
+++ qsampler/trunk/src/qsamplerMainForm.ui	2020/01/02 16:31:02	3684
@@ -2,8 +2,8 @@
  <author>rncbc aka Rui Nuno Capela</author>
  <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
-   Copyright (C) 2004-2010, rncbc aka Rui Nuno Capela. All rights reserved.
-   Copyright (C) 2007, 2008 Christian Schoenebeck
+   Copyright (C) 2004-2020, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2007-2019 Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -30,11 +30,8 @@
     <height>600</height>
    </rect>
   </property>
-  <property name="windowTitle" >
-   <string>MainWindow</string>
-  </property>
   <property name="windowIcon" >
-   <iconset resource="../icons/qsampler.qrc" >:/icons/qsampler.png</iconset>
+   <iconset resource="qsampler.qrc" >:/images/qsampler.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" />
   <widget class="QToolBar" name="fileToolbar" >
@@ -117,6 +114,7 @@
     <addaction name="viewMessagesAction" />
     <addaction name="viewInstrumentsAction" />
     <addaction name="viewDevicesAction" />
+    <addaction name="separator" />
     <addaction name="viewMidiDeviceStatusMenu" />
     <addaction name="separator" />
     <addaction name="viewOptionsAction" />
@@ -167,7 +165,7 @@
   <widget class="QStatusBar" name="statusbar" />
   <action name="fileNewAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/fileNew.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/fileNew.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;New</string>
@@ -187,7 +185,7 @@
   </action>
   <action name="fileOpenAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/fileOpen.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/fileOpen.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Open...</string>
@@ -207,7 +205,7 @@
   </action>
   <action name="fileSaveAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/fileSave.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/fileSave.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Save</string>
@@ -241,7 +239,7 @@
   </action>
   <action name="fileResetAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/fileReset.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/fileReset.png</iconset>
    </property>
    <property name="text" >
     <string>Rese&amp;t</string>
@@ -261,7 +259,7 @@
   </action>
   <action name="fileRestartAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/fileRestart.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/fileRestart.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Restart</string>
@@ -295,7 +293,7 @@
   </action>
   <action name="editAddChannelAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/editAddChannel.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/editAddChannel.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Add Channel</string>
@@ -315,7 +313,7 @@
   </action>
   <action name="editRemoveChannelAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/editRemoveChannel.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/editRemoveChannel.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Remove Channel</string>
@@ -335,7 +333,7 @@
   </action>
   <action name="editResetChannelAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/editResetChannel.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/editResetChannel.png</iconset>
    </property>
    <property name="text" >
     <string>Re&amp;set Channel</string>
@@ -355,7 +353,7 @@
   </action>
   <action name="editResetAllChannelsAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/editResetAllChannels.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/editResetAllChannels.png</iconset>
    </property>
    <property name="text" >
     <string>R&amp;eset All Channels</string>
@@ -375,7 +373,7 @@
   </action>
   <action name="editSetupChannelAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/editSetupChannel.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/editSetupChannel.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Setup Channel...</string>
@@ -395,7 +393,7 @@
   </action>
   <action name="editEditChannelAction" >
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/editEditChannel.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/editEditChannel.png</iconset>
    </property>
    <property name="text" >
     <string>Ed&amp;it Channel...</string>
@@ -441,7 +439,7 @@
     <string>&amp;Toolbar</string>
    </property>
    <property name="iconText" >
-    <string>viewToolbars</string>
+    <string>Toolbar</string>
    </property>
    <property name="toolTip" >
     <string>Show/hide toolbar</string>
@@ -498,7 +496,7 @@
     <bool>true</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/qsamplerInstrument.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/qsamplerInstrument.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Instruments</string>
@@ -521,7 +519,7 @@
     <bool>true</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/qsamplerDevice.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/qsamplerDevice.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Devices</string>
@@ -561,7 +559,7 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../icons/qsampler.qrc" >:/icons/channelsArrange.png</iconset>
+    <iconset resource="qsampler.qrc" >:/images/channelsArrange.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Arrange</string>
@@ -629,6 +627,6 @@
   </action>
  </widget>
  <resources>
-  <include location="../icons/qsampler.qrc" />
+  <include location="qsampler.qrc" />
  </resources>
 </ui>