Skip to content

Commit

Permalink
Merge pull request #30 from Artanidos/fix_memleaks_scenario_1
Browse files Browse the repository at this point in the history
Fix memleaks scenario 1
  • Loading branch information
Lavigne958 authored Dec 22, 2020
2 parents 71611bf + ae11192 commit a957ed3
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 24 deletions.
7 changes: 7 additions & 0 deletions src/App/widgets/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,17 @@ MainWindow::MainWindow(QWidget *parent) :

MainWindow::~MainWindow()
{
delete exportMenu;
delete m_itemPropertyEditor;
delete m_scene;
delete importMenu;
delete m_timeline;
delete m_elementTree;
delete m_view;
delete showElementsAct;
delete showPropertyPanelAct;
delete showRulerAct;
delete showToolPanelAct;
}

void MainWindow::loadPlugins()
Expand Down
57 changes: 33 additions & 24 deletions src/App/widgets/timeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,30 +61,30 @@ Timeline::Timeline(AnimationScene *scene)
m_time = new QLabel();
m_time->setText("0:00.0");

QAction *playAct = new QAction("Play");
playAct->setIcon(QIcon(":/images/play.png"));
playAct->setToolTip("Start the animation");
connect(playAct, SIGNAL(triggered()), this, SLOT(playAnimation()));

QAction *pauseAct = new QAction("Pause");
pauseAct->setIcon(QIcon(":/images/pause.png"));
pauseAct->setToolTip("Pause the animation");
connect(pauseAct, SIGNAL(triggered()), this, SLOT(pauseAnimation()));

QAction *reverseAct = new QAction("Reverse");
reverseAct->setIcon(QIcon(":/images/reverse.png"));
reverseAct->setToolTip("Reverse the animation");
connect(reverseAct, SIGNAL(triggered()), this, SLOT(revertAnimation()));

QAction *forwardAct = new QAction("Forward");
forwardAct->setIcon(QIcon(":/images/forward.png"));
forwardAct->setToolTip("Forward the animation");
connect(forwardAct, SIGNAL(triggered()), this, SLOT(forwardAnimation()));

revertButton->setDefaultAction(reverseAct);
playButton->setDefaultAction(playAct);
pauseButton->setDefaultAction(pauseAct);
forwardButton->setDefaultAction(forwardAct);
m_playAct = new QAction("Play");
m_playAct->setIcon(QIcon(":/images/play.png"));
m_playAct->setToolTip("Start the animation");
connect(m_playAct, SIGNAL(triggered()), this, SLOT(playAnimation()));

m_pauseAct = new QAction("Pause");
m_pauseAct->setIcon(QIcon(":/images/pause.png"));
m_pauseAct->setToolTip("Pause the animation");
connect(m_pauseAct, SIGNAL(triggered()), this, SLOT(pauseAnimation()));

m_reverseAct = new QAction("Reverse");
m_reverseAct->setIcon(QIcon(":/images/reverse.png"));
m_reverseAct->setToolTip("Reverse the animation");
connect(m_reverseAct, SIGNAL(triggered()), this, SLOT(revertAnimation()));

m_forwardAct = new QAction("Forward");
m_forwardAct->setIcon(QIcon(":/images/forward.png"));
m_forwardAct->setToolTip("Forward the animation");
connect(m_forwardAct, SIGNAL(triggered()), this, SLOT(forwardAnimation()));

revertButton->setDefaultAction(m_reverseAct);
playButton->setDefaultAction(m_playAct);
pauseButton->setDefaultAction(m_pauseAct);
forwardButton->setDefaultAction(m_forwardAct);

hbox->addWidget(revertButton);
hbox->addWidget(playButton);
Expand Down Expand Up @@ -128,6 +128,15 @@ Timeline::Timeline(AnimationScene *scene)
connect(m_scene, SIGNAL(keyframeAdded(AnimationItem*, QString, KeyFrame*)), this, SLOT(keyframeAdded(AnimationItem*, QString, KeyFrame*)));
}

Timeline::~Timeline()
{
delete m_delAct;
delete m_forwardAct;
delete m_pauseAct;
delete m_playAct;
delete m_reverseAct;
}

void Timeline::scrollValueChanged(int value)
{
m_horizontalScrollPos = value;
Expand Down
5 changes: 5 additions & 0 deletions src/App/widgets/timeline.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class Timeline : public QWidget
Q_OBJECT
public:
Timeline(AnimationScene *scene);
~Timeline();

void reset();
inline void setPlayheadPosition(int value) {m_playhead->setValue(value);}
Expand Down Expand Up @@ -93,6 +94,10 @@ public slots:
QTreeWidget *m_tree;
QMenu *m_contextMenu;
QAction *m_delAct;
QAction *m_forwardAct;
QAction *m_pauseAct;
QAction *m_playAct;
QAction *m_reverseAct;
AnimationScene *m_scene;
PlayHead *m_playhead;
QLabel *m_time;
Expand Down

0 comments on commit a957ed3

Please sign in to comment.