diff options
author | Tim E. Real <termtech@rogers.com> | 2010-12-14 01:11:01 +0000 |
---|---|---|
committer | Tim E. Real <termtech@rogers.com> | 2010-12-14 01:11:01 +0000 |
commit | 522ca271bfb851789aa437a5b88f980cb96916b2 (patch) | |
tree | b418f5dff1bdac80694f660ad81389e3f0853881 /muse2/muse/marker | |
parent | 466a93203ef2cccbf91316e28661aaa29f8a506e (diff) |
Please see ChangeLog.
Diffstat (limited to 'muse2/muse/marker')
-rw-r--r-- | muse2/muse/marker/markerview.cpp | 6 | ||||
-rw-r--r-- | muse2/muse/marker/markerview.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/muse2/muse/marker/markerview.cpp b/muse2/muse/marker/markerview.cpp index ab976911..dd4a5a69 100644 --- a/muse2/muse/marker/markerview.cpp +++ b/muse2/muse/marker/markerview.cpp @@ -164,8 +164,8 @@ MarkerView::MarkerView(QWidget* parent) QMenu* fileMenu = new QMenu(tr("&File")); menuBar()->addMenu(fileMenu); */ - QMenu* editMenu = new QMenu(tr("&Edit")); - menuBar()->addMenu(editMenu); + QMenu* editMenu = menuBar()->addMenu(tr("&Edit")); + editMenu->addAction(markerAdd); editMenu->addAction(markerDelete); @@ -274,7 +274,7 @@ MarkerView::MarkerView(QWidget* parent) MarkerView::~MarkerView() { - //printf("MarkerView::~MarkerView() before undoRedo->removeFrom(tools)\n"); + //printf("MarkerView::~MarkerView() before undoRedo->removeFrom(tools)\n"); // undoRedo->removeFrom(tools); // p4.0.6 Removed } diff --git a/muse2/muse/marker/markerview.h b/muse2/muse/marker/markerview.h index ff140a13..a271873c 100644 --- a/muse2/muse/marker/markerview.h +++ b/muse2/muse/marker/markerview.h @@ -57,7 +57,7 @@ class MarkerView : public TopWin { Awl::PosEdit* editTick; QToolButton* lock; QToolBar* tools; - + Q_OBJECT virtual void closeEvent(QCloseEvent*); @@ -73,7 +73,7 @@ class MarkerView : public TopWin { void clicked(QTreeWidgetItem*); void updateList(); void songChanged(int); - + signals: void deleted(unsigned long); void closed(); |