=== modified file 'mixxx/src/dlgautodj.ui'
--- mixxx/src/dlgautodj.ui	2011-03-23 22:53:18 +0000
+++ mixxx/src/dlgautodj.ui	2011-04-30 09:52:39 +0000
@@ -53,6 +53,9 @@
        <property name="text">
         <string>Add tracks to the queue below...</string>
        </property>
+       <property name="buddy" >
+        <cstring>m_pTrackTablePlaceholder</cstring>
+       </property>
       </widget>
      </item>
      <item>

=== modified file 'mixxx/src/dlgbpmschemedlg.ui'
--- mixxx/src/dlgbpmschemedlg.ui	2008-01-30 14:55:58 +0000
+++ mixxx/src/dlgbpmschemedlg.ui	2011-04-29 11:20:17 +0000
@@ -50,6 +50,9 @@
    <property name="text" >
     <string>Scheme Name:</string>
    </property>
+   <property name="buddy" >
+    <cstring>txtSchemeName</cstring>
+   </property>
   </widget>
   <widget class="QGroupBox" name="groupBox" >
    <property name="geometry" >
@@ -107,6 +110,9 @@
     <property name="text" >
      <string>Max</string>
     </property>
+    <property name="buddy" >
+     <cstring>spinBpmMax</cstring>
+       </property>
    </widget>
    <widget class="QLabel" name="label_3" >
     <property name="geometry" >
@@ -120,6 +126,9 @@
     <property name="text" >
      <string>Min</string>
     </property>
+    <property name="buddy" >
+     <cstring>spinBpmMin</cstring>
+       </property>
    </widget>
   </widget>
   <widget class="QCheckBox" name="chkAnalyzeEntireSong" >

=== modified file 'mixxx/src/dlgprefcontrolsdlg.ui'
--- mixxx/src/dlgprefcontrolsdlg.ui	2011-04-05 17:44:00 +0000
+++ mixxx/src/dlgprefcontrolsdlg.ui	2011-04-30 15:32:40 +0000
@@ -30,6 +30,9 @@
        <property name="wordWrap">
         <bool>false</bool>
        </property>
+       <property name="buddy" >
+        <cstring>ComboBoxSkinconf</cstring>
+       </property>
       </widget>
      </item>
      <item row="0" column="1" colspan="2">
@@ -59,6 +62,9 @@
        <property name="wordWrap">
         <bool>false</bool>
        </property>
+       <property name="buddy" >
+        <cstring>ComboBoxSchemeconf</cstring>
+       </property>
       </widget>
      </item>
      <item row="1" column="1" colspan="2">
@@ -88,6 +94,9 @@
        <property name="wordWrap">
         <bool>false</bool>
        </property>
+       <property name="buddy" >
+        <cstring>ComboBoxVisuals</cstring>
+       </property>
       </widget>
      </item>
      <item row="2" column="1" colspan="2">
@@ -117,6 +126,9 @@
        <property name="wordWrap">
         <bool>false</bool>
        </property>
+       <property name="buddy" >
+        <cstring>ComboBoxPosition</cstring>
+       </property>
       </widget>
      </item>
      <item row="3" column="1" colspan="2">
@@ -146,6 +158,9 @@
        <property name="wordWrap">
         <bool>false</bool>
        </property>
+       <property name="buddy" >
+        <cstring>ComboBoxTooltips</cstring>
+       </property>
       </widget>
      </item>
      <item row="5" column="1" colspan="2">
@@ -185,6 +200,9 @@
        <property name="wordWrap">
         <bool>false</bool>
        </property>
+       <property name="buddy" >
+        <cstring>ComboBoxRateRange</cstring>
+       </property>
       </widget>
      </item>
      <item row="6" column="1" colspan="2">
@@ -214,6 +232,9 @@
        <property name="wordWrap">
         <bool>false</bool>
        </property>
+       <property name="buddy" >
+        <cstring>ComboBoxRateDir</cstring>
+       </property>
       </widget>
      </item>
      <item row="7" column="1" colspan="2">
@@ -234,6 +255,9 @@
              <property name="text">
                  <string>Track load behaviour</string>
              </property>
+       <property name="buddy" >
+        <cstring>ComboBoxAllowTrackLoadToPlayingDeck</cstring>
+       </property>
          </widget>
      </item>
      <item row="11" column="1" colspan="2">
@@ -244,6 +268,9 @@
        <property name="text">
         <string>Cue behaviour</string>
        </property>
+       <property name="buddy" >
+        <cstring>ComboBoxCueDefault</cstring>
+       </property>
       </widget>
      </item>
      <item row="10" column="1" colspan="2">
@@ -254,6 +281,9 @@
        <property name="text">
         <string>Auto Recall Cue</string>
        </property>
+       <property name="buddy" >
+        <cstring>ComboBoxCueRecall</cstring>
+       </property>
       </widget>
      </item>
      <item row="9" column="1" colspan="2">
@@ -291,6 +321,9 @@
             <property name="wordWrap">
              <bool>false</bool>
             </property>
+            <property name="buddy" >
+             <cstring>spinBoxPermRateLeft</cstring>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -310,6 +343,9 @@
             <property name="wordWrap">
              <bool>false</bool>
             </property>
+            <property name="buddy" >
+             <cstring>spinBoxPermRateRight</cstring>
+            </property>
            </widget>
           </item>
           <item row="0" column="1">
@@ -388,6 +424,9 @@
             <property name="wordWrap">
              <bool>false</bool>
             </property>
+            <property name="buddy" >
+             <cstring>spinBoxTempRateLeft</cstring>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -407,6 +446,9 @@
             <property name="wordWrap">
              <bool>false</bool>
             </property>
+            <property name="buddy" >
+             <cstring>spinBoxTempRateRight</cstring>
+            </property>
            </widget>
           </item>
           <item row="0" column="1">
@@ -486,6 +528,9 @@
         <property name="text">
          <string>Pitchbend sensitivity</string>
         </property>
+        <property name="buddy" >
+         <cstring>SliderRateRampSensitivity</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="1">

=== modified file 'mixxx/src/dlgprefeqdlg.ui'
--- mixxx/src/dlgprefeqdlg.ui	2010-11-29 21:23:11 +0000
+++ mixxx/src/dlgprefeqdlg.ui	2011-04-30 16:15:31 +0000
@@ -51,6 +51,9 @@
         <property name="wordWrap" >
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>SliderHiEQ</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="0" colspan="5" >
@@ -173,6 +176,9 @@
         <property name="wordWrap" >
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>SliderLoEQ</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="0" colspan="2" >

=== modified file 'mixxx/src/dlgprefmidibindingsdlg.ui'
--- mixxx/src/dlgprefmidibindingsdlg.ui	2011-01-31 23:49:56 +0000
+++ mixxx/src/dlgprefmidibindingsdlg.ui	2011-04-30 16:56:16 +0000
@@ -37,6 +37,9 @@
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
+        <property name="buddy" >
+         <cstring>comboBoxPreset</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="2">
@@ -83,6 +86,9 @@
         <property name="text">
          <string>Output:</string>
         </property>
+        <property name="buddy" >
+         <cstring>comboBoxOutputDevice</cstring>
+        </property>
        </widget>
       </item>
      </layout>

=== modified file 'mixxx/src/dlgprefnovinyldlg.ui'
--- mixxx/src/dlgprefnovinyldlg.ui	2011-02-24 21:21:09 +0000
+++ mixxx/src/dlgprefnovinyldlg.ui	2011-04-30 18:48:29 +0000
@@ -57,6 +57,9 @@
           <property name="wordWrap">
            <bool>false</bool>
           </property>
+          <property name="buddy" >
+           <cstring>VinylGainDevice</cstring>
+          </property>
          </widget>
         </item>
         <item>
@@ -165,6 +168,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>ComboBoxVinylType1</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="2">
@@ -219,6 +225,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>ComboBoxVinylType2</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="2">
@@ -273,6 +282,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>LeadinTime</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="2">

=== modified file 'mixxx/src/dlgprefplaylistdlg.ui'
--- mixxx/src/dlgprefplaylistdlg.ui	2011-03-12 13:10:25 +0000
+++ mixxx/src/dlgprefplaylistdlg.ui	2011-04-30 19:12:12 +0000
@@ -40,6 +40,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>LineEditSongfiles</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="1">
@@ -228,6 +231,9 @@
       <property name="wordWrap">
        <bool>false</bool>
       </property>
+        <property name="buddy" >
+         <cstring>LineEditiPodMountPoint</cstring>
+        </property>
      </widget>
     </item>
     <item row="0" column="1">

=== modified file 'mixxx/src/dlgprefrecorddlg.ui'
--- mixxx/src/dlgprefrecorddlg.ui	2011-03-29 14:57:58 +0000
+++ mixxx/src/dlgprefrecorddlg.ui	2011-04-30 19:29:56 +0000
@@ -42,6 +42,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>SliderQuality</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="0" rowspan="2" colspan="3">
@@ -121,6 +124,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>LineEditTitle</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="1">
@@ -140,6 +146,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>LineEditAuthor</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="1">
@@ -159,6 +168,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>LineEditAlbum</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="1">
@@ -213,6 +225,9 @@
         <property name="text">
          <string>Split recordings at</string>
         </property>
+        <property name="buddy" >
+         <cstring>comboBoxSplitting</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">

=== modified file 'mixxx/src/dlgprefreplaygaindlg.ui'
--- mixxx/src/dlgprefreplaygaindlg.ui	2010-11-29 21:23:11 +0000
+++ mixxx/src/dlgprefreplaygaindlg.ui	2011-04-30 19:36:17 +0000
@@ -123,6 +123,9 @@
             <property name="text" >
              <string>Initial Boost</string>
             </property>
+            <property name="buddy" >
+             <cstring>SliderBoost</cstring>
+            </property>
            </widget>
           </item>
           <item>

=== modified file 'mixxx/src/dlgprefshoutcastdlg.ui'
--- mixxx/src/dlgprefshoutcastdlg.ui	2011-03-27 10:27:59 +0000
+++ mixxx/src/dlgprefshoutcastdlg.ui	2011-04-29 12:14:40 +0000
@@ -35,6 +35,9 @@
         <property name="text">
          <string>Type</string>
         </property>
+        <property name="buddy" >
+         <cstring>comboBoxServerType</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="1">
@@ -67,6 +70,9 @@
         <property name="text">
          <string>Mount</string>
         </property>
+        <property name="buddy" >
+         <cstring>mountpoint</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="3" colspan="3">
@@ -81,6 +87,9 @@
         <property name="text">
          <string>Host</string>
         </property>
+        <property name="buddy" >
+         <cstring>host</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="1" colspan="3">
@@ -95,6 +104,9 @@
         <property name="text">
          <string>Port</string>
         </property>
+        <property name="buddy" >
+         <cstring>port</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="5">
@@ -115,6 +127,9 @@
         <property name="text">
          <string>Login</string>
         </property>
+        <property name="buddy" >
+         <cstring>login</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="1" colspan="2">
@@ -129,6 +144,9 @@
         <property name="text">
          <string>Password</string>
         </property>
+        <property name="buddy" >
+         <cstring>password</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="4" colspan="2">
@@ -167,6 +185,9 @@
         <property name="text">
          <string>Stream name</string>
         </property>
+        <property name="buddy" >
+         <cstring>stream_name</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="1">
@@ -193,6 +214,9 @@
         <property name="text">
          <string>Website</string>
         </property>
+        <property name="buddy" >
+         <cstring>stream_website</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="1">
@@ -219,6 +243,9 @@
         <property name="text">
          <string>Description</string>
         </property>
+        <property name="buddy" >
+         <cstring>stream_desc</cstring>
+        </property>
        </widget>
       </item>
       <item row="3" column="1" rowspan="2">
@@ -274,6 +301,9 @@
         <property name="text">
          <string>Genre</string>
         </property>
+        <property name="buddy" >
+         <cstring>stream_genre</cstring>
+        </property>
        </widget>
       </item>
       <item row="5" column="1">
@@ -324,6 +354,9 @@
           <property name="text">
            <string>Bitrate</string>
           </property>
+        <property name="buddy" >
+         <cstring>comboBoxEncodingBitrate</cstring>
+        </property>
          </widget>
         </item>
         <item>
@@ -400,6 +433,9 @@
           <property name="text">
            <string>Format</string>
           </property>
+        <property name="buddy" >
+         <cstring>comboBoxEncodingFormat</cstring>
+        </property>
          </widget>
         </item>
         <item>
@@ -431,6 +467,9 @@
           <property name="text">
            <string>Channels</string>
           </property>
+        <property name="buddy" >
+         <cstring>comboBoxEncodingChannels</cstring>
+        </property>
          </widget>
         </item>
         <item>
@@ -482,6 +521,9 @@
           <property name="text">
            <string>Artist</string>
           </property>
+        <property name="buddy" >
+         <cstring>custom_artist</cstring>
+        </property>
          </widget>
         </item>
         <item row="0" column="1">
@@ -496,6 +538,9 @@
           <property name="text">
            <string>Title</string>
           </property>
+        <property name="buddy" >
+         <cstring>custom_title</cstring>
+        </property>
          </widget>
         </item>
         <item row="1" column="1">

=== modified file 'mixxx/src/dlgprefsounddlg.ui'
--- mixxx/src/dlgprefsounddlg.ui	2010-12-29 01:52:27 +0000
+++ mixxx/src/dlgprefsounddlg.ui	2011-04-30 19:47:07 +0000
@@ -20,6 +20,9 @@
          <property name="text">
           <string>Sound API</string>
          </property>
+         <property name="buddy" >
+          <cstring>apiComboBox</cstring>
+         </property>
         </widget>
        </item>
        <item>
@@ -34,6 +37,9 @@
          <property name="text">
           <string>Sample Rate</string>
          </property>
+         <property name="buddy" >
+          <cstring>sampleRateComboBox</cstring>
+         </property>
         </widget>
        </item>
        <item>
@@ -48,6 +54,9 @@
          <property name="text">
           <string>Latency</string>
          </property>
+         <property name="buddy" >
+          <cstring>latencyComboBox</cstring>
+         </property>
         </widget>
        </item>
        <item>

=== modified file 'mixxx/src/dlgprefsounditem.ui'
--- mixxx/src/dlgprefsounditem.ui	2010-07-23 23:58:13 +0000
+++ mixxx/src/dlgprefsounditem.ui	2011-04-30 19:48:37 +0000
@@ -14,6 +14,9 @@
      <property name="text">
       <string>Type (#)</string>
      </property>
+     <property name="buddy" >
+      <cstring>deviceComboBox</cstring>
+     </property>
     </widget>
    </item>
    <item>

=== modified file 'mixxx/src/dlgprefvinyldlg.ui'
--- mixxx/src/dlgprefvinyldlg.ui	2011-02-24 03:36:12 +0000
+++ mixxx/src/dlgprefvinyldlg.ui	2011-05-01 05:55:01 +0000
@@ -51,6 +51,9 @@
           <property name="wordWrap">
            <bool>false</bool>
           </property>
+     <property name="buddy" >
+      <cstring>VinylGain</cstring>
+     </property>
          </widget>
         </item>
         <item>
@@ -156,6 +159,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>ComboBoxVinylType1</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="2">
@@ -210,6 +216,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>ComboBoxVinylType2</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="2">
@@ -264,6 +273,9 @@
         <property name="wordWrap">
          <bool>false</bool>
         </property>
+        <property name="buddy" >
+         <cstring>LeadinTime</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="2">

=== modified file 'mixxx/src/dlgtrackinfo.ui'
--- mixxx/src/dlgtrackinfo.ui	2010-11-29 21:23:11 +0000
+++ mixxx/src/dlgtrackinfo.ui	2011-05-01 06:07:18 +0000
@@ -68,6 +68,9 @@
            <property name="text">
             <string>Title:</string>
            </property>
+           <property name="buddy" >
+            <cstring>txtTrackName</cstring>
+           </property>
           </widget>
          </item>
          <item row="0" column="1" colspan="3">
@@ -78,6 +81,9 @@
            <property name="text">
             <string>Artist:</string>
            </property>
+           <property name="buddy" >
+            <cstring>txtArtist</cstring>
+           </property>
           </widget>
          </item>
          <item row="1" column="1" colspan="3">
@@ -88,6 +94,9 @@
            <property name="text">
             <string>Album:</string>
            </property>
+           <property name="buddy" >
+            <cstring>txtAlbum</cstring>
+           </property>
           </widget>
          </item>
          <item row="2" column="1" colspan="3">
@@ -98,6 +107,9 @@
            <property name="text">
             <string>Date:</string>
            </property>
+           <property name="buddy" >
+            <cstring>txtYear</cstring>
+           </property>
           </widget>
          </item>
          <item row="3" column="1" colspan="3">
@@ -115,6 +127,9 @@
            <property name="text">
             <string>Genre:</string>
            </property>
+           <property name="buddy" >
+            <cstring>txtGenre</cstring>
+           </property>
           </widget>
          </item>
          <item row="5" column="1" colspan="3">
@@ -125,6 +140,9 @@
            <property name="text">
             <string>Filename:</string>
            </property>
+           <property name="buddy" >
+            <cstring>txtFilepath</cstring>
+           </property>
           </widget>
          </item>
          <item row="6" column="1" colspan="3">
@@ -170,6 +188,9 @@
            <property name="text">
             <string>Comments:</string>
            </property>
+           <property name="buddy" >
+            <cstring>txtComment</cstring>
+           </property>
           </widget>
          </item>
          <item row="9" column="1" colspan="3">
@@ -217,6 +238,9 @@
                <property name="text">
                 <string>Track BPM: </string>
                </property>
+               <property name="buddy" >
+                <cstring>spinBpm</cstring>
+               </property>
               </widget>
              </item>
              <item>

=== modified file 'mixxx/src/unused/dlgbpmtapdlg.ui'
--- mixxx/src/unused/dlgbpmtapdlg.ui	2010-11-29 21:23:11 +0000
+++ mixxx/src/unused/dlgbpmtapdlg.ui	2011-05-01 07:29:40 +0000
@@ -140,6 +140,9 @@
       <property name="text" >
        <string>BPM Scheme:</string>
       </property>
+      <property name="buddy" >
+       <cstring>cboSchemes</cstring>
+      </property>
      </widget>
      <widget class="QComboBox" name="cboSchemes" >
       <property name="geometry" >
@@ -166,6 +169,9 @@
       <property name="wordWrap" >
        <bool>false</bool>
       </property>
+      <property name="buddy" >
+       <cstring>spinBoxBPMRangeEnd</cstring>
+      </property>
      </widget>
      <widget class="QSpinBox" name="spinBoxBPMRangeStart" >
       <property name="geometry" >
@@ -214,6 +220,9 @@
       <property name="wordWrap" >
        <bool>false</bool>
       </property>
+      <property name="buddy" >
+       <cstring>spinBoxBPMRangeStart</cstring>
+      </property>
      </widget>
      <widget class="QProgressBar" name="progressBPMDetect" >
       <property name="geometry" >
@@ -310,6 +319,9 @@
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
+      <property name="buddy" >
+       <cstring>txtBPM</cstring>
+      </property>
     </widget>
     <widget class="QPushButton" name="btnTap" >
      <property name="geometry" >
@@ -358,6 +370,9 @@
      <property name="text" >
       <string>Title:</string>
      </property>
+     <property name="buddy" >
+      <cstring>txtTrackName</cstring>
+     </property>
     </widget>
     <widget class="QLineEdit" name="txtTrackName" >
      <property name="geometry" >
@@ -381,6 +396,9 @@
      <property name="text" >
       <string>Artist:</string>
      </property>
+     <property name="buddy" >
+      <cstring>txtArtist</cstring>
+     </property>
     </widget>
     <widget class="QLineEdit" name="txtArtist" >
      <property name="geometry" >
@@ -404,6 +422,9 @@
      <property name="text" >
       <string>Comments:</string>
      </property>
+     <property name="buddy" >
+      <cstring>txtComment</cstring>
+     </property>
     </widget>
     <widget class="QTextEdit" name="txtComment" >
      <property name="geometry" >
@@ -427,6 +448,9 @@
      <property name="text" >
       <string>Filename:</string>
      </property>
+     <property name="buddy" >
+      <cstring>txtFilepath</cstring>
+     </property>
     </widget>
     <widget class="QLabel" name="txtDuration" >
      <property name="geometry" >