Merge pull request mixxxdj#13632 from ronso0/track-info-move-reload-b…

…utton Track Info dialogs: move metatdata buttons below color picker
mxmilkiib · Sep 6, 2024 · 8790b5f · 8790b5f
2 parents cf82b35 + f8d420d
commit 8790b5f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 47 deletions.
diff --git a/src/library/dlgtrackinfo.ui b/src/library/dlgtrackinfo.ui
@@ -389,38 +389,7 @@
               </property>
              </widget>
             </item>
-            <item row="8" column="1" colspan="3">
-             <layout class="QHBoxLayout" name="horizontalLayout_3">
-              <item>
-               <widget class="QPushButton" name="btnImportMetadataFromMusicBrainz">
-                <property name="text">
-                 <string>Import Metadata from MusicBrainz</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="btnImportMetadataFromFile">
-                <property name="text">
-                 <string>Re-Import Metadata from file</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_4">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>10</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </item>
-            <item row="9" column="0">
+            <item row="8" column="0">
              <widget class="QLabel" name="lblTrackColor">
               <property name="text">
                <string>Color</string>
@@ -430,7 +399,7 @@
               </property>
              </widget>
             </item>
-            <item row="9" column="1" colspan="3">
+            <item row="8" column="1" colspan="3">
              <widget class="QPushButton" name="btnColorPicker">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -440,7 +409,7 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
+            <item row="9" column="0">
              <spacer name="horizontalSpacer_5">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
@@ -453,6 +422,24 @@
               </property>
              </spacer>
             </item>
+            <item row="10" column="0" colspan="4">
+             <layout class="QHBoxLayout" name="meatdata_buttons_layout">
+              <item>
+               <widget class="QPushButton" name="btnImportMetadataFromMusicBrainz">
+                <property name="text">
+                 <string>Import Metadata from MusicBrainz</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="btnImportMetadataFromFile">
+                <property name="text">
+                 <string>Re-Import Metadata from file</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
            </layout>
           </item>
          </layout>
@@ -1032,9 +1019,9 @@ Often results in higher quality beatgrids, but will not do well on tracks that h
   <tabstop>txtYear</tabstop>
   <tabstop>txtKey</tabstop>
   <tabstop>txtTrackNumber</tabstop>
+  <tabstop>btnColorPicker</tabstop>
   <tabstop>btnImportMetadataFromMusicBrainz</tabstop>
   <tabstop>btnImportMetadataFromFile</tabstop>
-  <tabstop>btnColorPicker</tabstop>
   <tabstop>btnOpenFileBrowser</tabstop>
   <tabstop>spinBpm</tabstop>
   <tabstop>bpmConst</tabstop>

diff --git a/src/library/dlgtrackinfomulti.ui b/src/library/dlgtrackinfomulti.ui
@@ -408,15 +408,7 @@
        </widget>
       </item>
 
-      <item row="9" column="1" colspan="3">
-       <widget class="QPushButton" name="btnImportMetadataFromFile">
-        <property name="text">
-         <string>Re-Import Metadata from files</string>
-        </property>
-       </widget>
-      </item>
-
-      <item row="10" column="0">
+      <item row="9" column="0">
        <widget class="QLabel" name="lblTrackColor">
         <property name="text">
          <string>Color</string>
@@ -426,7 +418,7 @@
         </property>
        </widget>
       </item>
-      <item row="10" column="1" colspan="3">
+      <item row="9" column="1" colspan="3">
        <widget class="QPushButton" name="btnColorPicker">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -437,7 +429,7 @@
        </widget>
       </item>
 
-      <item row="0" column="0">
+      <item row="10" column="0">
        <spacer name="spacerColorPicker">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -450,6 +442,14 @@
         </property>
        </spacer>
       </item>
+
+      <item row="11" column="0" colspan="4">
+       <widget class="QPushButton" name="btnImportMetadataFromFile">
+        <property name="text">
+         <string>Re-Import Metadata from files</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -747,8 +747,8 @@
   <tabstop>txtYear</tabstop>
   <tabstop>txtKey</tabstop>
   <tabstop>txtTrackNumber</tabstop>
-  <tabstop>btnImportMetadataFromFile</tabstop>
   <tabstop>btnColorPicker</tabstop>
+  <tabstop>btnImportMetadataFromFile</tabstop>
   <tabstop>btnCancel</tabstop>
   <tabstop>btnApply</tabstop>
   <tabstop>btnOK</tabstop>