Merge pull request mixxxdj#12548 from ronso0/trackprop-multi-track

add multi-track property editor / batch tag editor
djantti · May 26, 2024 · 61bd026 · 61bd026
2 parents fc35392 + 4350b46
commit 61bd026
Show file tree

Hide file tree

Showing 14 changed files with 1,964 additions and 35 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -933,6 +933,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/dlgtagfetcher.ui
   src/library/dlgtrackinfo.cpp
   src/library/dlgtrackinfo.ui
+  src/library/dlgtrackinfomulti.cpp
+  src/library/dlgtrackinfomulti.ui
   src/library/dlgtrackmetadataexport.cpp
   src/library/export/coverartcopyworker.cpp
   src/library/export/dlgtrackexport.ui

diff --git a/src/controllers/midi/midimessage.h b/src/controllers/midi/midimessage.h
@@ -11,6 +11,7 @@
 #include <variant>
 
 #include "preferences/usersettings.h"
+#include "util/always_false_v.h"
 #include "util/compatibility/qhash.h"
 
 // The second value of each OpCode will be the channel number the message
@@ -179,9 +180,6 @@ struct MidiKey {
     };
 };
 
-template<class>
-inline constexpr bool always_false_v = false;
-
 struct MidiInputMapping {
     MidiInputMapping() {
     }

diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
@@ -294,13 +294,11 @@ void DlgTrackInfo::slotApply() {
 }
 
 void DlgTrackInfo::slotOk() {
-    slotApply();
-    clear();
+    saveTrack();
     accept();
 }
 
 void DlgTrackInfo::slotCancel() {
-    clear();
     reject();
 }
 

diff --git a/src/library/dlgtrackinfo.ui b/src/library/dlgtrackinfo.ui
@@ -253,6 +253,9 @@
               <property name="text">
                <string>Year</string>
               </property>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              </property>
              </widget>
             </item>
             <item row="4" column="3">
@@ -296,6 +299,9 @@
               <property name="text">
                <string>Key</string>
               </property>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              </property>
              </widget>
             </item>
             <item row="5" column="3">
@@ -320,7 +326,7 @@
                <string>Grouping</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -345,6 +351,9 @@
               <property name="text">
                <string>Track #</string>
               </property>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              </property>
              </widget>
             </item>
             <item row="6" column="3">
@@ -369,7 +378,7 @@
                <string>Comments</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -417,7 +426,7 @@
                <string>Color</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>