[WIP] Library Layout Redesign Single pane#1115
[WIP] Library Layout Redesign Single pane#1115jmigual wants to merge 594 commits intomixxxdj:masterfrom jmigual:feature/newSingleLibrary
Conversation
Also improved the query when selecting a header item
Conflicts: build/depends.py src/library/coverart.h
|
Great work, thank you!! |
|
This crashes as soon as I try to select a track in the Library table. gdb backtrace: |
| m_numSamplers.connectValueChanged(SLOT(slotNumSamplersChanged(double))); | ||
| m_numPreviewDecks.connectValueChanged(SLOT(slotNumPreviewDecksChanged(double))); | ||
|
|
||
| // Controls to navigate vertically within currently focussed widget (up/down buttons) |
There was a problem hiding this comment.
@jmigual
It looks like your merge strategy was just "delete everything"...? All of my changes to this file have been deleted.
There was a problem hiding this comment.
I look again and check what happened but your changes didn't give me any conflicts
|
I only looked at how the merge conflicts were handled on my latest commit to librarycontrol.cpp, but looking at that I don't feel that the git history of this branch is salvageable. @daschuer: unless you're willing to re-fork the branch from #991 and carefully handle the merge conflicts one by one, I vote that we just pick the files / code we need from this branch and copy them into master one by one... |
|
Your commit didn't give me any conflicts so I don't understand why your changes are deleted. |
|
Can you try this: git checkout -b newSingleLibrary2 7dfd25f
git checkout master
git pull upstream master
git checkout newSingleLibrary2
git merge master
# handle merge conflicts
git cherry-pick eacfdea4c1f023b0e6d470a44ec335e0f2db70ef
git cherry-pick 5b145767e9a101d4397e18270c9ee5a4d6c11483
git cherry-pick 9e47eb66fa8e9ba33f4d605bca058256ff24022e
git cherry-pick 7dfd25f3d7d0367dcf95bc3ee3267ddccb5df3c1
git cherry-pick d11bf1e2be1b233f8fc1a437f2cad7868ac58658
git cherry-pick 90496437338f9df388fe5c7bdb3ae07947d2a4bf
git push origin newSingleLibrary2 |
|
I use SmartGit for merging. It has a nice 3 pane view. Maybe it helps out of this issue here as well. |
|
Yeah I've been going through tonight with meld which is the same I guess... There are heavy changes on both sides to the treeitem and treeitemmodel however, and it's not clear how to handle them. |
|
Yes I used Visual Studio that does the same. In TreeItem I've decided to keep most of their changes since they were a nice addition. @timrae I'll try this solution this Friday tonight. |
|
@jmigual I'm currently stuck with the TreeItem... Current master branch has dataPath() function so we need to implement that: src/library/features/browse/foldertreemodel.cpp: In member function ‘virtual bool FolderTreeModel::hasChildren(const QModelIndex&) const’:
src/library/features/browse/foldertreemodel.cpp:48:14: error: ‘class TreeItem’ has no member named ‘dataPath’
if(item->dataPath().toString() == QUICK_LINK_NODE) |
No, actually the current master has no more This new |
|
OK, I will give it a try now. It is probably a good idea to merge PR by PR and crawl up the master branch. This way we have small review-able merge commits. |
|
I'm already done fixing the compilation issues in @timrae's branch if you wait 30 mins I'll be finished |
|
OK, than I will be patient ;-) Thank you very much! |
|
I've added the changes in timrae#1 PR. |
|
Grate, the latest changes are looking good. Thank you both. I will now start trying to move your both code into some clean merge commits, without changing the end result. |
|
I pushed another commit to my branch fixing the linking errors... Now mixxx starts up, though it crashes if you try to load a track from the library |
|
|
|
The clean branch is in my personal repro. The rebase onto it with the latest commits is still missing. |
|
Ok, the cleaned branch is ready: https://github.com/daschuer/mixxx/tree/jmigual-library-redesign |
|
I don't think 811cda9 should be there...? I don't feel it's ready, and as it was discussed, not having it doesn't add any regressions, right? |
|
Also, I think it's better if you make a new PR as @jmigual said he's busy with exams, and he won't want to be checking our merge requests into his fork |
|
@jmigual one more bug I noticed, is that in the playlists feature now, it shows the IDs instead of the name when you select that feature. |
|
OK, I will do a new PR. |
|
Lets move to #1117 |
4 participants
Hi this is a continuation of #991 with the changes made