=== modified file 'mixxx/src/dlgtrackinfo.cpp'
--- mixxx/src/dlgtrackinfo.cpp 2011-12-28 20:30:15 +0000
+++ mixxx/src/dlgtrackinfo.cpp 2012-03-17 10:18:34 +0000
@@ -97,8 +97,9 @@
}
void DlgTrackInfo::populateFields(TrackPointer pTrack) {
+ setWindowTitle(pTrack->getTitle());
+
// Editable fields
- lblSong->setText(pTrack->getTitle());
txtTrackName->setText(pTrack->getTitle());
txtArtist->setText(pTrack->getArtist());
txtAlbum->setText(pTrack->getAlbum());
@@ -112,8 +113,10 @@
// Non-editable fields
txtDuration->setText(pTrack->getDurationStr());
txtFilepath->setText(pTrack->getFilename());
- txtFilepath->setCursorPosition(0);
+ txtLocation->setText(pTrack->getLocation());
txtType->setText(pTrack->getType());
+ txtBitrate->setText(QString(pTrack->getBitrateStr()) + (" ") + tr("kbps"));
+ txtBpm->setText(pTrack->getBpmStr());
}
void DlgTrackInfo::loadTrack(TrackPointer pTrack) {
@@ -248,8 +251,6 @@
}
void DlgTrackInfo::clear() {
- txtTrackName->setText("");
- lblSong->setText("Track:");
txtTrackName->setText("");
txtArtist->setText("");
@@ -264,6 +265,9 @@
txtDuration->setText("");
txtFilepath->setText("");
txtType->setText("");
+ txtLocation->setText("");
+ txtBitrate->setText("");
+ txtBpm->setText("");
m_cueMap.clear();
cueTable->clearContents();
=== modified file 'mixxx/src/dlgtrackinfo.ui'
--- mixxx/src/dlgtrackinfo.ui 2011-12-28 22:06:35 +0000
+++ mixxx/src/dlgtrackinfo.ui 2012-03-17 09:55:24 +0000
@@ -6,10 +6,16 @@
0
0
- 448
- 615
+ 462
+ 600
+
+
+ 0
+ 0
+
+
Track Editor
@@ -18,286 +24,444 @@
-
-
-
-
- 75
- true
- true
-
-
-
- Song:
-
-
-
- -
-
+
0
400
-
- QFrame::NoFrame
-
-
- QFrame::Plain
-
0
-
-
-
- 0
- 0
- 430
- 410
-
-
-
- Track Information (Click to Expand)
+
+
+ Summary
-
-
+
+
+ 18
+
+
-
+
+
+
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Duration:
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+ Qt::AutoText
+
+
+ true
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ BPM:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ File Type:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Bit Rate:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+
+
+
+ Qt::AutoText
+
+
+ true
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+ true
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ File Name:
+
+
+
+ -
+
+
-
-
+
Title:
-
- txtTrackName
-
- -
-
-
-
-
+
Artist:
-
- txtArtist
-
-
-
-
+
Album:
-
- txtAlbum
-
-
+ -
+
+
-
-
+
- Date:
-
-
- txtYear
-
-
-
- -
-
+ Genre:
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
-
-
+
- Track #:
+ Composer:
-
-
-
- Genre:
-
-
- txtGenre
-
-
-
- -
-
-
-
+
+
+ Year:
+
+
+
+ -
+
+
+ -
+
+
+ Track #:
+
+
+
+ -
+
+
+ -
+
+
+ Comments:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
-
-
-
- Composer:
-
-
- txtComposer
-
-
-
- -
-
-
-
- -
-
-
- Filename:
-
-
- txtFilepath
+
+
+ Key:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Location:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ Qt::AutoText
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+ true
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
-
-
-
- true
-
-
- true
-
-
-
- -
-
-
- Duration:
-
-
-
- -
-
-
- 3:00
-
-
-
- -
-
-
- File Type:
-
-
-
- -
-
-
- 77
-
-
-
- -
-
-
- Comments:
-
-
- txtComment
-
-
-
- -
-
- true
-
+
+
+ 0
+ 0
+
+
- -
-
+
-
+
+
+ Qt::Horizontal
+
+
-
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::MinimumExpanding
+
+
+
+ 40
+ 20
+
+
+
+
-
+
+
+ 0
+ 0
+
+
Reload track metadata from file.
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::MinimumExpanding
+
+
+
+ 40
+ 20
+
+
+
+
-
-
-
- 0
- 0
- 430
- 410
-
-
-
- Track BPM
+
+
+ BPM
-
-
-
-
-
-
-
-
-
-
- Track BPM:
-
-
- spinBpm
-
-
-
- -
-
-
- 8
-
-
- 500.000000000000000
-
-
- 1.000000000000000
-
-
-
-
-
- -
-
-
-
-
-
- x2
-
-
-
- -
-
-
- /2
-
-
-
-
+
+ -
+
+
+ Halve BPM
+
+
+
+ -
+
+
+ Double BPM
+
+
+
+ -
+
+
+ Track BPM:
+
+
+
+ -
+
+
+ 8
+
+
+ 500.000000000000000
+
+
+ 1.000000000000000
+
+
+ 0.000000000000000
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
@@ -340,20 +504,9 @@
-
-
- true
-
-
-
- 0
- 0
- 430
- 410
-
-
-
- Track Cuepoints
+
+
+ Cuepoints
-
@@ -407,7 +560,24 @@
-
- << &Prev
+ &Previous
+
+
+
+ -
+
+
+ &Next
+
+
+
+ -
+
+
+ &Cancel
+
+
+ false
@@ -421,23 +591,6 @@
- -
-
-
- &Cancel
-
-
- Alt+O
-
-
-
- -
-
-
- &Next >>
-
-
-
=== modified file 'mixxx/src/mixxx.cpp'
--- mixxx/src/mixxx.cpp 2012-03-14 05:30:27 +0000
+++ mixxx/src/mixxx.cpp 2012-03-15 15:25:37 +0000
@@ -713,7 +713,7 @@
m_pPlaylistsNew->setShortcutContext(Qt::ApplicationShortcut);
m_pCratesNew = new QAction(tr("Add new &crate"), this);
- m_pCratesNew->setShortcut(tr("Ctrl+C"));
+ m_pCratesNew->setShortcut(tr("Ctrl+Shift+N"));
m_pCratesNew->setShortcutContext(Qt::ApplicationShortcut);
m_pPlaylistsImport = new QAction(tr("&Import playlist"), this);