Merge remote-tracking branch 'upstream/2.3'

mixxxdj · Aug 6, 2020 · 83c5b6b · 83c5b6b
2 parents 5093d95 + 0409031
commit 83c5b6b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -316,4 +316,4 @@ notifications:
       Authorization:
         secure: 95cbVBcC4rogjE5VNdhuYm8cnjPF8+7SeQXySqcxAqrFZxK+/Kcn3Q2hRb2iZfUEKZ+EdCYwx7EbpZdSiZc5goAuJT+/QXXT/Ls+fzc+eSy4Sz1Ic5t2BjLhmYZLdnBL3uIVceNSb8GzYPQx0+xy7g==
     on_build_status_changed: true
-    body: "type=stream&to=appveyor&subject={{projectName}} Build {{buildVersion}} {{status}}&content=Build {{buildVersion}} {{status}}{{#isPullRequest}} (PR #{{pullRequestId}}) {{/isPullRequest}}{{#failed}} :cross_mark:{{/failed}}{{#passed}} :check_mark:{{/passed}} {{buildUrl}}"
+    body: "type=stream&to=appveyor&subject={{^isPullRequest}}{{branch}}{{/isPullRequest}}{{#isPullRequest}}Pull Request #{{pullRequestId}}{{/isPullRequest}}&content={{#failed}}:cross_mark:{{/failed}}{{#passed}}:check_mark:{{/passed}} {{status}} {{buildUrl}}\n{{commitId}} {{commitAuthor}}\n{{commitMessage}}\n{{commitMessageExtended}}"
diff --git a/src/library/dlgtrackinfo.ui b/src/library/dlgtrackinfo.ui
@@ -399,7 +399,11 @@
             </item>
 
             <item row="7" column="1" colspan="3">
-             <widget class="QPlainTextEdit" name="txtComment"/>
+             <widget class="QPlainTextEdit" name="txtComment">
+              <property name="tabChangesFocus">
+               <bool>true</bool>
+              </property>
+             </widget>
             </item>
 
             <item row="8" column="1" colspan="3">
@@ -977,25 +981,20 @@ Often results in higher quality beatgrids, but will not do well on tracks that h
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>
   <tabstop>tabWidget</tabstop>
-  <tabstop>btnPrev</tabstop>
-  <tabstop>btnNext</tabstop>
-  <tabstop>btnCancel</tabstop>
-  <tabstop>btnApply</tabstop>
-  <tabstop>btnOK</tabstop>
   <tabstop>txtTrackName</tabstop>
   <tabstop>txtArtist</tabstop>
   <tabstop>txtAlbum</tabstop>
   <tabstop>txtAlbumArtist</tabstop>
   <tabstop>txtComposer</tabstop>
   <tabstop>txtGenre</tabstop>
   <tabstop>txtGrouping</tabstop>
+  <tabstop>txtComment</tabstop>
   <tabstop>txtYear</tabstop>
   <tabstop>txtKey</tabstop>
   <tabstop>txtTrackNumber</tabstop>
   <tabstop>btnImportMetadataFromMusicBrainz</tabstop>
   <tabstop>btnImportMetadataFromFile</tabstop>
   <tabstop>btnOpenFileBrowser</tabstop>
-  <tabstop>txtComment</tabstop>
   <tabstop>spinBpm</tabstop>
   <tabstop>bpmConst</tabstop>
   <tabstop>bpmTap</tabstop>
@@ -1006,6 +1005,11 @@ Often results in higher quality beatgrids, but will not do well on tracks that h
   <tabstop>bpmThreeFourth</tabstop>
   <tabstop>bpmThreeHalves</tabstop>
   <tabstop>bpmFourThirds</tabstop>
+  <tabstop>btnPrev</tabstop>
+  <tabstop>btnNext</tabstop>
+  <tabstop>btnCancel</tabstop>
+  <tabstop>btnApply</tabstop>
+  <tabstop>btnOK</tabstop>
  </tabstops>
  <resources/>
  <connections/>