Skip to content

Conversation

grejppi
Copy link
Contributor

@grejppi grejppi commented Jun 11, 2017

withdrawn

@PhysSong
Copy link
Member

I'll try to work on it soon. @grejppi Please grant me push access when I request.

@PhysSong
Copy link
Member

@grejppi The work is almost done. I'll create a new PR or push commits into your branch(if you grant it) when finished.

@grejppi
Copy link
Contributor Author

grejppi commented Jul 14, 2017

@PhysSong Great! 😊 Please open a pull request against my fork once you're done :3

@PhysSong
Copy link
Member

Some new features are added now: I can toggle sample track windows with track label buttons, and windows now have proper title and are able to rename on it.
I'll decouple these changes if it is not proper one for your PR.

@PhysSong
Copy link
Member

@grejppi Your branch is out-of-date. Please update it.

@grejppi
Copy link
Contributor Author

grejppi commented Jul 17, 2017

@PhysSong done

@PhysSong
Copy link
Member

Now it looks like this:
sampletrack

@PhysSong
Copy link
Member

@grejppi I opened a PR against your branch. Please test it.

@grejppi
Copy link
Contributor Author

grejppi commented Jul 18, 2017

@PhysSong Sweet! I'll test it soon 😊

@BaraMGB
Copy link
Contributor

BaraMGB commented Jul 23, 2017

That works like a charm. Great work!

@PhysSong
Copy link
Member

@grejppi I forgot MainWindow::saveWidgetState() in SampleTrackWindow::loadSettings(), but I won't add it until #3721 is fixed.
See #3721 (comment).

Copy link
Member

@Umcaruje Umcaruje left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this out briefly and it works really well, the indentation stuff is superficial and I can fix it if you want to work on other stuff



class SampleTrackWindow : public QWidget, public ModelView,
public SerializingObjectHook
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The indentation here looks weird, is it intentional?

@@ -312,6 +313,22 @@ void FxMixer::deleteChannel( int index )
inst->effectChannelModel()->setValue(val-1);
}
}
else if( t->type() == Track::SampleTrack )
{
SampleTrack* strk = dynamic_cast<SampleTrack *>( t );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The spaces in the brackets here are really inconsitent in the block, it's not a violation of the coding conventions, but it just looks weird.

@@ -386,6 +403,19 @@ void FxMixer::moveChannelLeft( int index )
inst->effectChannelModel()->setValue(a);
}
}
else if( trackList[i]->type() == Track::SampleTrack )
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

/*
* FxLineLcdSpinBox.cpp - a specialization of LcdSpnBox for setting FX channels
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either of your names should go in the copyright info here

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just realised this is just moving the already existing code into a new file, so we could maybe just extend the copyright

QPointer<CaptionMenu> contextMenu = new CaptionMenu(model()->displayName(), this);

if (QMenu *fxMenu = m_tv->createFxMenu(
tr("Assign to:"), tr( "New FX Channel" )))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

weird indentation here as well

@PhysSong
Copy link
Member

PhysSong commented Aug 8, 2017

They are in my commits.
FYI, saving and reloading window state can be implemented, but not in here now because of #3721.

@grejppi grejppi closed this Sep 15, 2017
@LMMS LMMS locked and limited conversation to collaborators Sep 15, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants