diff options
66 files changed, 1470 insertions, 669 deletions
@@ -96,7 +96,11 @@ license. [mailing list]: https://lists.sourceforge.net/lists/listinfo/mixxx-devel [irc channel]: http://mixxx.org/irc.php [SCons]: http://www.scons.org/ +<<<<<<< HEAD [launchpad 2.2.0]: https://launchpad.net/mixxx/+milestone/2.2.0 +======= +[launchpad 2.1.1]: https://launchpad.net/mixxx/+milestone/2.1.1 +>>>>>>> upstream/2.1 [wiki roadmap]: http://mixxx.org/wiki/doku.php/development_roadmap [easybugs]: https://bugs.launchpad.net/mixxx/+bugs?field.searchtext=&orderby=-importance&search=Search&field.status%3Alist=NEW&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&assignee_option=any&field.assignee=&field.bug_reporter=&field.bug_commenter=&field.subscriber=&field.structural_subscriber=&field.tag=easy&field.tags_combinator=ANY&field.has_cve.used=&field.omit_dupes.used=&field.omit_dupes=on&field.affects_me.used=&field.has_patch.used=&field.has_branches.used=&field.has_branches=on&field.has_no_branches.used=&field.has_no_branches=on&field.has_blueprints.used=&field.has_blueprints=on&field.has_no_blueprints.used=&field.has_no_blueprints=on [creating skins]: http://mixxx.org/wiki/doku.php/creating_skins diff --git a/build/debian/changelog b/build/debian/changelog index 9be10f6391..ead67bb8b7 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,3 +1,9 @@ +mixxx (2.1.1-0ubuntu1) artful; urgency=medium + + * New upstream release. + + -- RJ Ryan <rryan@mixxx.org> Thu, 17 May 2018 20:42:25 +0200 + mixxx (2.1.0-0ubuntu1) artful; urgency=medium * New upstream release. diff --git a/res/images/mixxx-icon.png b/res/images/mixxx-icon.png Binary files differindex ab6b55a9d4..5cb42785a7 100644 --- a/res/images/mixxx-icon.png +++ b/res/images/mixxx-icon.png diff --git a/res/linux/mixxx.appdata.xml b/res/linux/mixxx.appdata.xml index 85498fc973..d2366c3170 100644 --- a/res/linux/mixxx.appdata.xml +++ b/res/linux/mixxx.appdata.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Author 2014 Tuukka Pasanen <pasanen.tuukka@gmail.com> --> <component> - <id type="desktop">mixxx.desktop</id> + <id>org.mixxx.Mixxx</id> + <launchable type="desktop-id">mixxx.desktop</launchable> <metadata_license>CC-BY-SA-3.0</metadata_license> <project_license>GPL-2.0</project_license> <name>Mixxx DJ Software</name> diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss index 12852f34b9..1a7e5ab702 100644 --- a/res/skins/Deere/style.qss +++ b/res/skins/Deere/style.qss @@ -213,21 +213,52 @@ QTableView::indicator:unchecked { image: url(:/images/library/ic_library_unchecked.png); } +#LibraryBPMSpinBox { + color: #fff; + selection-color: #0f0f0f; + background-color: #0f0f0f; + selection-background-color: #888; + /* This combination of negative top/bottom padding & margin + creates a 1px border around the spinbox' text area. + Increased left/right padding/margin removes the overlap of + text of activated spinbox and left-over text from regular + BPM value display. */ + padding: -1px -8px -1px -4px; + margin: -2px 0px -2px -2px; + /* As soon as any border property is set, the up/down buttons + lose their style & icons + border: 0px; + border-radius: 2px; */ +} + /* button in library "Preview" column */ QPushButton#LibraryPreviewButton { width: 23px; height: 12px; border: none; + border-radius: 2px; + background: transparent; + margin: 0px; + padding: 0px; } QPushButton#LibraryPreviewButton:!checked { image: url(skin:/image/style_library_preview_play.png); +} + +QPushButton#LibraryPreviewButton:!checked:hover { background-color: #1A1A1A; + border: 1px solid #00ABFD; } QPushButton#LibraryPreviewButton:checked { image: url(skin:/image/style_library_preview_pause.png); - background-color: #006596; + background-color: #0f0f0f; + border: 1px solid #006596; +} + +QPushButton#LibraryPreviewButton:checked:hover { + border: 1px solid #00ABFD; } /* library header row */ @@ -271,18 +302,19 @@ QHeaderView::down-arrow { WSearchLineEdit { margin: 0px 0px 0px 1px; padding: 2px; - border: 1px solid #1A1A1A; - background-color: #4B4B4B; + border: 1px solid #4B4B4B; + background-color: #1e1e1e; color: #d2d2d2; } WSearchLineEdit:focus { - margin: 2px 0px 0px 1px; + margin: 0px 0px 0px 1px; padding: 2px; border: 1px solid #FF6600; - background-color: #4B4B4B; + background-color: #1e1e1e; color: #D6D6D6; selection-color: #222222; + selection-background-color: #d2d2d2; } /* library preview deck */ @@ -338,6 +370,15 @@ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/image/style_branch_open.png); } +/* space left of selected child item */ +QTreeView::branch:!has-children:!has-siblings:closed:selected, +QTreeView::branch:closed:!has-children:has-siblings:selected, +QTreeView::branch:open:!has-children:!has-siblings:selected, +QTreeView::branch:open:!has-children:has-siblings:selected { + border-image: none; + background-color: #1F1F1F; +} + /* QSplitter between LibrarySidebar and Library */ #LibrarySplitter::handle { image: url(skin:/image/style_handle_horizontal_unchecked.svg); diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml index 748965813b..bf2c763264 100644 --- a/res/skins/LateNight/library.xml +++ b/res/skins/LateNight/library.xml @@ -1,6 +1,5 @@ <Template> <WidgetGroup> - <ObjectName>Library</ObjectName> <SizePolicy>me,i</SizePolicy> <MinimumSize>1270,-</MinimumSize> <Layout>vertical</Layout> @@ -13,19 +12,19 @@ ********************************************** --> <WidgetGroup> + <ObjectName>Library</ObjectName> <Layout>horizontal</Layout> <SizePolicy>me,me</SizePolicy> <Children> <Splitter> - <ObjectName>LibrarySplitter</ObjectName> + <ObjectName>VerticalSplitter</ObjectName> <SizePolicy>me,me</SizePolicy> <SplitSizes>1,10</SplitSizes> <SplitSizesConfigKey>[LateNight],LibrarySidebarSplitSize</SplitSizesConfigKey> <Collapsible>1,0</Collapsible> <Children> <WidgetGroup> - <ObjectName>LibrarySidebar_X</ObjectName> <Layout>vertical</Layout> <SizePolicy>min,me</SizePolicy> <MinimumSize>100,-1</MinimumSize> @@ -37,7 +36,7 @@ <SearchBox></SearchBox> <Splitter> - <ObjectName>CoverArtSplitter</ObjectName> + <ObjectName>HorizontalSplitter</ObjectName> <Size>me,me</Size> <SplitSizes>1,1</SplitSizes> <SplitSizesConfigKey>[LateNight],CoverArtSplitSize</SplitSizesConfigKey> diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml index 8f7d5df78c..67e1d6239e 100644 --- a/res/skins/LateNight/skin.xml +++ b/res/skins/LateNight/skin.xml @@ -122,7 +122,7 @@ <!-- Decks, Effects ... Library --> <Splitter> - <ObjectName>CoverArtSplitter</ObjectName> + <ObjectName>HorizontalSplitter</ObjectName> <Orientation>vertical</Orientation> <SizePolicy>me,min</SizePolicy> <SplitSizes>1,5</SplitSizes> diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index f84e49f197..0966853840 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -8,7 +8,8 @@ WLabel, QLabel, WPushButton, QPushButton, WEffect, WEffectSelector, -WBeatSpinBox {/**/ +WBeatSpinBox, +QSpinBox { font-family: Ubuntu; text-transform: uppercase; font-weight: bold; @@ -24,6 +25,7 @@ QToolTip {/* #BpmText, #RateText, WBeatSpinBox, +QSpinBox, WOverview { font-family: "Open Sans"; } @@ -110,21 +112,6 @@ WTime { qproperty-layoutAlignment: 'AlignHCenter | AlignTop'; } -#LibrarySingleton { - /* This doesn't work as expected: - it appears LibrarySingleton is displayed twice, so - padding/margin would double. - Placed a plain spacer in library.xml which works reliably - padding-top: 5px;*/ -} - -#Library { - border-left: 0px solid #585858; - background-color: #0e0e0e; - padding-bottom: 2px; - /*border-top: 1px solid #585858;*/ -} - #DeckRow_1_KeyVinylFx { qproperty-layoutAlignment: 'AlignLeft | AlignTop'; border-bottom: 1px solid #585858; @@ -619,58 +606,73 @@ WEffectButtonParameter*/ border: 1px solid #eeeeee; } -WBeatSpinBox { +WBeatSpinBox, +#DlgAutoDJ QSpinBox { /* make it 2px smaller in each dimension, border is added for final size */ width: 55px; height: 22px; border: 1px solid #666; - /* size of spinbox: 54x22px - incl. up/down button: 70x22px */ border-radius: 2px; color: #cfb32c; background-color: #0f0f0f; selection-color: #0f0f0f; selection-background-color: #d2d2d2; font-size: 13px/13px; - padding: 0px; - padding: 1px 2px 1px 1px; - margin: 0px -1px 2px 0px; -} - WBeatSpinBox:hover { + } + WBeatSpinBox { + padding: 1px 2px 1px 1px; + margin: 0px -1px 2px 0px; + } + /* Eliminate overlapping right border for transition time in Auto DJ tab */ + #DlgAutoDJ QSpinBox { + border-right: 0px; + margin: 0px 0px 0px 2px; + padding: 1px 2px 1px 1px; + } + WBeatSpinBox:hover, + #DlgAutoDJ QSpinBox:hover { border-color: #888; } - WBeatSpinBox:focus { + WBeatSpinBox:focus, + #DlgAutoDJ QSpinBox:focus { border-color: #d2d2d2; color: #cfb32c; } - WBeatSpinBox::up-button, WBeatSpinBox::down-button { + WBeatSpinBox::up-button, + WBeatSpinBox::down-button, + #DlgAutoDJ QSpinBox::up-button, + #DlgAutoDJ QSpinBox::down-button { subcontrol-origin: padding; position: relative; /* as with spinbox: border is added to size. define it with same width as hover border, otherwise size jumps */ width: 18px; height: 12px; - margin: 0px 0px 0px 0px; + margin: 0px; padding: 0px; border: 0px; - } + } - WBeatSpinBox::up-button { + WBeatSpinBox::up-button, + #DlgAutoDJ QSpinBox::up-button { subcontrol-position: top right; margin-top: -1px; image: url(skin:/buttons/btn_beatbox_double.svg) no-repeat; } - WBeatSpinBox::up-button:pressed { + WBeatSpinBox::up-button:pressed, + #DlgAutoDJ QSpinBox::up-button:pressed { image: url(skin:/buttons/btn_beatbox_double_pressed.svg) no-repeat; } - WBeatSpinBox::down-button { + WBeatSpinBox::down-button, + #DlgAutoDJ QSpinBox::down-button { subcontrol-position: bottom right; margin-bottom: -1px; image: url(skin:/buttons/btn_beatbox_halve.svg) no-repeat; } - WBeatSpinBox::down-button:pressed { + WBeatSpinBox::down-button:pressed, + #DlgAutoDJ QSpinBox::down-button:pressed { image: url(skin:/buttons/btn_beatbox_halve_pressed.svg) no-repeat; } @@ -1343,13 +1345,30 @@ WEffectSelector { /* Library styling is hard */ +#LibrarySingleton { + /* This doesn't work as expected: + it appears LibrarySingleton is displayed twice, so + padding/margin would double. + Placed a plain spacer in library.xml which works reliably + padding-top: 5px;*/ +} + +#Library { + padding-bottom: 2px; + /* make a smooth transition from toolbar at the bottom to + darker skin background at the top. + Splitter handles should be transparent for this to work. */ + background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #0f0f0f, + stop:1 #1e1e1e); +} + QTableView, QTextBrowser, QTreeView { border: 1px solid #585858; /*font-size: 15px/18px;*/ color: #cfb32c; background-color: #0f0f0f; alternate-background-color: #1a1a1a; - selection-color: #cfb32c; selection-background-color: #725309; } @@ -1358,142 +1377,228 @@ QTableView:focus, QTreeView:focus { border: 1px solid #FF6600; } -/* checkbox in library "Played" column */ -QTableView::indicator { width: 12px; height: 12px;} -QTableView::indicator:checked { background: url(skin:/style/style_checkbox_checked.png);} -QTableView::indicator:unchecked { background: url(skin:/style/style_checkbox_unchecked.png);} +/* selected items in Tree and Tracks table */ +QTreeView::item:selected, QTableView::item:selected { - color: #cfb32c; + color: #fff; background-color: #725309; } -/* BPM lock icon in the library "BPM" column. */ +/* checkbox in library "Played" column */ +QTableView::indicator { + width: 10px; + height: 10px; + margin: 0px; + padding: 0px; + color: #cfb32c; + /* border is added to size defined above */ + border: 1px solid transparent; + } + QTableView::indicator:hover { + color: #cfcfcf; + border: 1px solid #888; + } + QTableView::indicator:checked, + QTableView::indicator:checked:selected { + image: url(skin:/style/library_checkbox_checked.png); + border: 1px solid #ff6600; + } + QTableView::indicator:checked:hover { + border: 1px solid #aaa; + } + QTableView::indicator:unchecked { + image: url(skin:/style/library_checkbox_unchecked.png); + border: 1px solid #444; + } + QTableView::indicator:unchecked:hover { + border: 1px solid #888; + } + QTableView::indicator:selected { + border: 1px solid #888; + } + QTableView::indicator:selected:hover { + border: 1px solid #aaa; + } + +/* Entire BPM cell */ +/* Lock icon at the left */ #LibraryBPMButton::indicator:checked { - image: url(:/images/library/ic_library_checked.png); -} + image: url(skin:/style/library_locked.png); + } #LibraryBPMButton::indicator:unchecked { - image: url(:/images/library/ic_library_unchecked.png); -} -#LibraryBPMButton::item:selected { + image: url(skin:/style/library_unlocked.png); + } +/* BPM value */ +#LibraryBPMButton::item { color: #cfb32c; - background-color: #725309; -} + } + /* BPM value in selected row. Should match 'selection-color' & + 'selection-background-color' of QTableView */ + #LibraryBPMButton::item:selected { + color: #ededed; + background-color: #725309; + } +#LibraryBPMSpinBox { + color: #cfb32c; + background-color: #0f0f0f; + selection-color: #0f0f0f; + selection-background-color: #d2d2d2; + /* This combination of negative top/bottom padding & margin + creates a 1px border around the spinbox' text area. + Increased left/right padding/margin removes the overlap of + text of activated spinbox and left-over text from regular + BPM value display. */ + padding: -1px -8px -1px -4px; + margin: -2px 0px -2px -2px; + /* As soon as any border property is set, the up/down buttons + lose their style & icons + border: 0px; + border-radius: 2px; */ + } /* Button in library "Preview" column */ -QPushButton#LibraryPreviewButton { +#LibraryPreviewButton { width: 23px; height: 12px; background: transparent; - border: 0px; -} -/*QPushButton#LibraryPreviewButton:focus { - background-color: #725309; -}*/ - -QPushButton#LibraryPreviewButton:!checked{ - image: url(skin:/style/style_library_preview_play.png); -} -QPushButton#LibraryPreviewButton:checked{ - image: url(skin:/style/style_library_preview_pause.png); -} + margin: 0px; + padding: 0px; + border-radius: 2px; + } + #LibraryPreviewButton:!checked{ + image: url(skin:/style/library_preview_play.png); + } + #LibraryPreviewButton:!checked:hover { + border: 1px solid #725309; + background: #0f0f0f; + } + #LibraryPreviewButton:checked{ + image: url(:/images/library/ic_library_preview_pause.png); + background-color: #000; + border: 1px solid #725309; + } + #LibraryPreviewButton:checked:hover { + border: 1px solid #888; + } QHeaderView { font-size: 13px/15px; color: #cfb32c; font-weight: bold; - background-color: #0f0f0f; -} -QHeaderView::section { - height: 18px; - border: 1px solid #585858; - border-left: 0px; - padding-left: 1px; + border-bottom: 1px solid #585858; background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #585858, stop:1 #0f0f0f); -} + } + QHeaderView::section { + height: 18px; + border: 1px solid #585858; + border-left: 0px; + padding-left: 1px; + background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #585858, + stop:1 #0f0f0f); + } -/* QScrollbar styling is even harder */ -QScrollBar:horizontal { - border: 1px solid #585858; - min-width: 12px; - height: 15px; - background: #1a1a1a; - border-radius: 3px; - padding: 1px; -} -QScrollBar:vertical { +QHeaderView::up-arrow, +QHeaderView::down-arrow { + background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #585858, stop:1 #0f0f0f); + width: 12px; + padding-left: 3px; + padding-right: 3px; + border-right: 1px solid #585858; + } + QHeaderView::up-arrow { + image: url(skin:/style/library_sort_up.svg); + } + QHeaderView::up-arrow:hover { + image: url(skin:/style/library_sort_down.svg); + } + QHeaderView::down-arrow:hover { + image: url(skin:/style/library_sort_up.svg); + } + + + +/* QScrollBar styling is even harder */ +QScrollBar { border: 1px solid #585858; - min-height: 12px; - width: 15px; background: #1a1a1a; border-radius: 3px; padding: 1px; -} -/* "add-page" and "sub-page" are the gutter of the scrollbar */ -QScrollBar::add-page, QScrollBar::sub-page { - min-width: 15px; - min-height: 15px; - border: 2px; - background-color: #1a1a1a; - border-radius: 3px; -} -QScrollBar::handle:horizontal { - min-width: 25px; - border-radius: 3px; - border: 1px solid #725309; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #725309, - stop:1 #412f05); -} -QScrollBar::handle:vertical { - min-height: 25px; - border-radius: 3px; - border: 1px solid #725309; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #725309, - stop:1 #412f05); -} -/* Turn off buttons */ -QScrollBar::add-line:horizontal, QScrollBar::add-line:vertical { - width: 0px; - height: 0px; - border: 0px solid white; -} -QScrollBar::sub-line:horizontal, QScrollBar::sub-line:vertical { - width: 0px; - height: 0px; - border: 0px solid white; -} + color: #999999; + font-size: 8pt; + } + QScrollBar:horizontal { + min-width: 12px; + height: 15px; + border-top-left-radius: 0px; + border-top-right-radius: 0px; + border-top: 0px; + background-color: #0f0f0f; + } + QScrollBar:vertical { + min-height: 12px; + width: 15px; + border-top-left-radius: 0px; + border-bottom-left-radius: 0px; + border-left: 0px; + color: #b3b3b3; + background-color: #0f0f0f; + } -/* transition time in Auto DJ tab */ -QSpinBox:editable { - background: transparent; - color: #cfb32c; -} -QSpinBox { - min-height: 20px; - max-height: 20px; - min-width: 40px; - max-width: 40px; -} + /* "add-page" and "sub-page" are the gutter of the scrollbar */ + QScrollBar::add-page, QScrollBar::sub-page { + min-width: 15px; + min-height: 15px; + background-color: #0f0f0f; + border-radius: 3px; + } + QScrollBar::handle:horizontal { + min-width: 25px; + border-radius: 3px; + border: 1px solid #725309; + background: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #725309, + stop:1 #412f05); + } + QScrollBar::handle:vertical { + min-height: 25px; + border-radius: 3px; + border: 1px solid #725309; + background: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #725309, + stop:1 #412f05); + } + /* Turn off buttons */ + QScrollBar::add-line, QScrollBar::sub-line { + width: 0px; + height: 0px; + border: 0px; + } + + /* Corner in bet |
