--- qsampler/trunk/src/qsamplerChannelForm.ui	2007/11/26 18:24:38	1528
+++ qsampler/trunk/src/qsamplerChannelForm.ui	2010/07/10 09:47:33	2107
@@ -2,7 +2,7 @@
  <author>rncbc aka Rui Nuno Capela</author>
  <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
-   Copyright (C) 2005-2007, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2005-2010, rncbc aka Rui Nuno Capela. All rights reserved.
    Copyright (C) 2007, Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@
    <string>Qsampler: Channel</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../icons/qsampler.qrc" >:/icons/qsamplerChannel.png</iconset>
+   <iconset resource="qsampler.qrc" >:/images/qsamplerChannel.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
@@ -94,7 +94,7 @@
         <string/>
        </property>
        <property name="icon" >
-        <iconset resource="../icons/qsampler.qrc" >:/icons/fileOpen.png</iconset>
+        <iconset resource="qsampler.qrc" >:/images/fileOpen.png</iconset>
        </property>
       </widget>
      </item>
@@ -275,7 +275,7 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="../icons/qsampler.qrc" >:/icons/midi1.png</iconset>
+           <iconset resource="qsampler.qrc" >:/images/midi1.png</iconset>
           </property>
          </widget>
         </item>
@@ -620,7 +620,7 @@
              <string/>
             </property>
             <property name="icon" >
-             <iconset resource="../icons/qsampler.qrc" >:/icons/audio1.png</iconset>
+             <iconset resource="qsampler.qrc" >:/images/audio1.png</iconset>
             </property>
            </widget>
           </item>
@@ -726,50 +726,14 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+    <widget class="QDialogButtonBox" name="DialogButtonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="spacing" >
-      <number>4</number>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>8</width>
-         <height>8</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="OkPushButton" >
-       <property name="text" >
-        <string>OK</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="../icons/qsampler.qrc" >:/icons/formAccept.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="CancelPushButton" >
-       <property name="text" >
-        <string>Cancel</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="../icons/qsampler.qrc" >:/icons/formReject.png</iconset>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -779,10 +743,9 @@
   <tabstop>InstrumentFileComboBox</tabstop>
   <tabstop>InstrumentFileToolButton</tabstop>
   <tabstop>InstrumentNrComboBox</tabstop>
-  <tabstop>OkPushButton</tabstop>
-  <tabstop>CancelPushButton</tabstop>
+  <tabstop>DialogButtonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../icons/qsampler.qrc" />
+  <include location="qsampler.qrc" />
  </resources>
 </ui>