diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-04-15 16:17:01 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-04-15 16:17:01 +0200 |
| commit | 553b93dc32abe13564e3c92b08cc4a24adac5091 (patch) | |
| tree | 6d4c69851545ed5a5ee00efaf4c338afb3207c8c | |
| parent | 3aed203a76beaab192e5bc10d453fd3df28102dc (diff) | |
| parent | e0351b94bccc1d3f0abf66803d7dc14c76794ab3 (diff) | |
Merge branch 'master' of http://git.drumgizmo.org/drumgizmo
| -rw-r--r-- | dgedit/Makefile.am | 6 | ||||
| -rw-r--r-- | dgedit/volumefader.cc | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/dgedit/Makefile.am b/dgedit/Makefile.am index 58073db..85253a4 100644 --- a/dgedit/Makefile.am +++ b/dgedit/Makefile.am @@ -25,7 +25,8 @@ dgedit_SOURCES = \ mipmap.cc \ player.cc \ samplesorter.cc \ - selection.cc + selection.cc \ + volumefader.cc EXTRA_DIST = \ audioextractor.h \ @@ -41,6 +42,7 @@ EXTRA_DIST = \ player.h \ samplesorter.h \ selection.h \ + volumefader.h \ dgedit.qrc dgedit_MOC = $(shell ../tools/MocList cc ) @@ -67,4 +69,4 @@ qrc_%.cc: %.qrc %.res: %.rc rc $< -endif
\ No newline at end of file +endif diff --git a/dgedit/volumefader.cc b/dgedit/volumefader.cc index 231feba..9a153a6 100644 --- a/dgedit/volumefader.cc +++ b/dgedit/volumefader.cc @@ -26,9 +26,14 @@ */ #include "volumefader.h" +#include <QSlider> +#include <QVBoxLayout> + VolumeFader::VolumeFader() { - + QVBoxLayout* lo = new QVBoxLayout(); + lo->addWidget(new QSlider()); + setLayout(lo); } VolumeFader::~VolumeFader() |