hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix BB Editor project load

Browse Source 
Closes #1621
This commit is contained in:
Lukas W
2015-01-21 13:33:25 +01:00
parent c13d111bc2
commit d6ff1a7086
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/BBEditor.h
View File

@@ -57,9 +57,6 @@ public slots:
void play();
void stop();
protected:
virtual void closeEvent( QCloseEvent * _ce );
private:
BBTrackContainerView* m_trackContainerView;
ComboBox * m_bbComboBox;
@@ -80,13 +77,16 @@ public:
void removeBBView(int bb);
void saveSettings(QDomDocument& doc, QDomElement& element);
void loadSettings(const QDomElement& element);
public slots:
void addSteps();
void removeSteps();
void addAutomationTrack();
protected slots:
virtual void dropEvent(QDropEvent * de );
void dropEvent(QDropEvent * de );
void updatePosition();
private:

30
src/gui/editors/BBEditor.cpp
View File

@@ -156,8 +156,6 @@ void BBEditor::stop()
BBTrackContainerView::BBTrackContainerView(BBTrackContainer* tc) :
TrackContainerView(tc),
m_bbtc(tc)
@@ -168,8 +166,6 @@ BBTrackContainerView::BBTrackContainerView(BBTrackContainer* tc) :
void BBTrackContainerView::addSteps()
{
TrackContainer::TrackList tl = model()->tracks();
@@ -224,6 +220,18 @@ void BBTrackContainerView::removeBBView(int bb)
void BBTrackContainerView::saveSettings(QDomDocument& doc, QDomElement& element)
{
MainWindow::saveWidgetState(parentWidget(), element);
}
void BBTrackContainerView::loadSettings(const QDomElement& element)
{
MainWindow::restoreWidgetState(parentWidget(), element);
}
void BBTrackContainerView::dropEvent(QDropEvent* de)
{
@@ -254,17 +262,3 @@ void BBTrackContainerView::updatePosition()
//realignTracks();
emit positionChanged( m_currentPosition );
}
void BBEditor::closeEvent( QCloseEvent * _ce )
{
if( parentWidget() )
{
parentWidget()->hide();
}
else
{
hide();
}
_ce->ignore();
}