=== removed directory 'mixxx/res/images/autodj'
=== removed file 'mixxx/res/images/autodj/bottom.svg'
--- mixxx/res/images/autodj/bottom.svg 2011-07-01 22:42:36 +0000
+++ mixxx/res/images/autodj/bottom.svg 1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-
-
-
=== removed file 'mixxx/res/images/autodj/media-playlist-shuffle.svg'
--- mixxx/res/images/autodj/media-playlist-shuffle.svg 2011-07-01 22:42:36 +0000
+++ mixxx/res/images/autodj/media-playlist-shuffle.svg 1970-01-01 00:00:00 +0000
@@ -1,214 +0,0 @@
-
-
-
-
=== removed file 'mixxx/res/images/autodj/stock_mail-send-receive.svg'
--- mixxx/res/images/autodj/stock_mail-send-receive.svg 2011-07-01 22:42:36 +0000
+++ mixxx/res/images/autodj/stock_mail-send-receive.svg 1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-
-
-
-
=== modified file 'mixxx/res/mixxx.qrc'
--- mixxx/res/mixxx.qrc 2012-03-12 05:23:47 +0000
+++ mixxx/res/mixxx.qrc 2012-03-12 18:58:47 +0000
@@ -1,8 +1,5 @@
- images/autodj/media-playlist-shuffle.svg
- images/autodj/stock_mail-send-receive.svg
- images/autodj/bottom.svg
html/crates.html
html/playlists.html
html/setlogs.html
=== modified file 'mixxx/src/dlgautodj.ui'
--- mixxx/src/dlgautodj.ui 2011-10-06 12:26:25 +0000
+++ mixxx/src/dlgautodj.ui 2012-03-13 16:47:41 +0000
@@ -6,7 +6,7 @@
0
0
- 500
+ 560
399
@@ -14,19 +14,7 @@
Manage
- #pushButtonShuffle{
- border-image: url(:/images/autodj/media-playlist-shuffle.svg);
-}
-
-#pushButtonSkipNext{
- border-image: url(:/images/autodj/bottom.svg);
-}
-
-#pushButtonFadeNow{
- border-image: url(:/images/autodj/stock_mail-send-receive.svg);
-}
-
-
+
@@ -43,19 +31,22 @@
QLayout::SetMinimumSize
+
+ 12
+
+
+ 12
+
+
+ 0
+
-
-
-
- 24
- 24
-
-
- Shuffle Playlist
+ Shuffle the content of the Auto DJ playlist.
-
+ Shuffle
false
@@ -64,17 +55,11 @@
-
-
-
- 24
- 24
-
-
- Skip Next Track
+ Skip the next track in the Auto DJ playlist.
-
+ Skip Track
false
@@ -82,9 +67,12 @@
-
-
+
+
+ Trigger the transition to the next track.
+
- Transition [sec]
+ Fade Now
@@ -102,6 +90,9 @@
16777215
+
+ Determines the duration of the transition.
+
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -111,18 +102,12 @@
-
-
-
-
- 24
- 24
-
-
+
- Fade Now
+ Seconds
-
+ sec.
@@ -142,7 +127,7 @@
-
- Enable Auto DJ
+ Turn Auto DJ on or off.
Enable Auto DJ
@@ -152,22 +137,6 @@
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 12
- 20
-
-
-
-
-