--- qsampler/trunk/src/qsamplerMainForm.ui	2007/11/01 13:01:27	1463
+++ qsampler/trunk/src/qsamplerMainForm.ui	2014/12/24 14:23:06	2681
@@ -2,7 +2,8 @@
  <author>rncbc aka Rui Nuno Capela</author>
  <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
-   Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2014, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2007, 2008 Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -32,7 +33,52 @@
   <property name="windowTitle" >
    <string>MainWindow</string>
   </property>
+  <property name="windowIcon" >
+   <iconset resource="qsampler.qrc" >:/images/qsampler.png</iconset>
+  </property>
   <widget class="QWidget" name="centralwidget" />
+  <widget class="QToolBar" name="fileToolbar" >
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <number>4</number>
+   </attribute>
+   <addaction name="fileNewAction"/>
+   <addaction name="fileOpenAction"/>
+   <addaction name="fileSaveAction"/>
+   <addaction name="separator" />
+   <addaction name="fileResetAction"/>
+   <addaction name="fileRestartAction"/>
+   <addaction name="separator" />
+   <addaction name="viewInstrumentsAction"/>
+   <addaction name="viewDevicesAction"/>
+  </widget>
+  <widget class="QToolBar" name="editToolbar" >
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <number>4</number>
+   </attribute>
+   <addaction name="editAddChannelAction"/>
+   <addaction name="editRemoveChannelAction"/>
+   <addaction name="separator" />
+   <addaction name="editSetupChannelAction"/>
+   <addaction name="editEditChannelAction"/>
+   <addaction name="separator" />
+   <addaction name="editResetChannelAction"/>
+   <addaction name="editResetAllChannelsAction"/>
+  </widget>
+  <widget class="QToolBar" name="channelsToolbar" >
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <attribute name="toolBarArea" >
+    <number>4</number>
+   </attribute>
+   <addaction name="channelsArrangeAction"/>
+  </widget>
   <widget class="QMenuBar" name="MenuBar" >
    <property name="geometry" >
     <rect>
@@ -59,6 +105,11 @@
     <property name="title" >
      <string>&amp;View</string>
     </property>
+    <widget class="QMenu" name="viewMidiDeviceStatusMenu" >
+     <property name="title" >
+      <string>MIDI Device Status</string>
+     </property>
+    </widget>
     <addaction name="viewMenubarAction" />
     <addaction name="viewToolbarAction" />
     <addaction name="viewStatusbarAction" />
@@ -67,6 +118,8 @@
     <addaction name="viewInstrumentsAction" />
     <addaction name="viewDevicesAction" />
     <addaction name="separator" />
+    <addaction name="viewMidiDeviceStatusMenu" />
+    <addaction name="separator" />
     <addaction name="viewOptionsAction" />
    </widget>
    <widget class="QMenu" name="channelsMenu" >
@@ -87,8 +140,16 @@
     <property name="title" >
      <string>&amp;File</string>
     </property>
+    <widget class="QMenu" name="fileOpenRecentMenu" >
+     <property name="title" >
+      <string>Open &amp;Recent</string>
+     </property>
+    </widget>
     <addaction name="fileNewAction" />
+    <addaction name="separator" />
     <addaction name="fileOpenAction" />
+    <addaction name="fileOpenRecentMenu" />
+    <addaction name="separator" />
     <addaction name="fileSaveAction" />
     <addaction name="fileSaveAsAction" />
     <addaction name="separator" />
@@ -107,7 +168,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>
@@ -127,7 +188,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>
@@ -147,7 +208,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>
@@ -181,7 +242,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>
@@ -201,7 +262,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>
@@ -235,7 +296,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>
@@ -255,7 +316,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>
@@ -275,7 +336,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>
@@ -295,7 +356,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>
@@ -315,7 +376,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>
@@ -335,7 +396,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>
@@ -438,7 +499,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>
@@ -461,7 +522,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>
@@ -501,7 +562,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>
@@ -569,7 +630,6 @@
   </action>
  </widget>
  <resources>
-  <include location="../icons/qsampler.qrc" />
+  <include location="qsampler.qrc" />
  </resources>
- <connections/>
 </ui>