summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse2/muse/functions.h14
-rw-r--r--muse2/muse/midiedit/scoreedit.cpp7
-rw-r--r--muse2/muse/widgets/CMakeLists.txt21
-rw-r--r--muse2/muse/widgets/function_dialogs/crescendo.cpp (renamed from muse2/muse/widgets/crescendo.cpp)0
-rw-r--r--muse2/muse/widgets/function_dialogs/crescendo.h (renamed from muse2/muse/widgets/crescendo.h)0
-rw-r--r--muse2/muse/widgets/function_dialogs/crescendobase.ui (renamed from muse2/muse/widgets/crescendobase.ui)0
-rw-r--r--muse2/muse/widgets/function_dialogs/deloverlaps.cpp (renamed from muse2/muse/widgets/deloverlaps.cpp)0
-rw-r--r--muse2/muse/widgets/function_dialogs/deloverlaps.h (renamed from muse2/muse/widgets/deloverlaps.h)0
-rw-r--r--muse2/muse/widgets/function_dialogs/deloverlapsbase.ui (renamed from muse2/muse/widgets/deloverlapsbase.ui)0
-rw-r--r--muse2/muse/widgets/function_dialogs/move.cpp (renamed from muse2/muse/widgets/move.cpp)0
-rw-r--r--muse2/muse/widgets/function_dialogs/move.h (renamed from muse2/muse/widgets/move.h)0
-rw-r--r--muse2/muse/widgets/function_dialogs/movebase.ui (renamed from muse2/muse/widgets/movebase.ui)0
-rw-r--r--muse2/muse/widgets/function_dialogs/remove.cpp (renamed from muse2/muse/widgets/remove.cpp)0
-rw-r--r--muse2/muse/widgets/function_dialogs/remove.h (renamed from muse2/muse/widgets/remove.h)0
-rw-r--r--muse2/muse/widgets/function_dialogs/removebase.ui (renamed from muse2/muse/widgets/removebase.ui)0
-rw-r--r--muse2/muse/widgets/function_dialogs/setlen.cpp (renamed from muse2/muse/widgets/setlen.cpp)0
-rw-r--r--muse2/muse/widgets/function_dialogs/setlen.h (renamed from muse2/muse/widgets/setlen.h)0
-rw-r--r--muse2/muse/widgets/function_dialogs/setlenbase.ui (renamed from muse2/muse/widgets/setlenbase.ui)0
-rw-r--r--muse2/muse/widgets/function_dialogs/transpose.cpp (renamed from muse2/muse/widgets/transpose.cpp)0
-rw-r--r--muse2/muse/widgets/function_dialogs/transpose.h (renamed from muse2/muse/widgets/transpose.h)0
-rw-r--r--muse2/muse/widgets/function_dialogs/transposebase.ui (renamed from muse2/muse/widgets/transposebase.ui)0
-rw-r--r--muse2/muse/widgets/function_dialogs/velocity.cpp (renamed from muse2/muse/widgets/velocity.cpp)0
-rw-r--r--muse2/muse/widgets/function_dialogs/velocity.h (renamed from muse2/muse/widgets/velocity.h)0
-rw-r--r--muse2/muse/widgets/function_dialogs/velocitybase.ui (renamed from muse2/muse/widgets/velocitybase.ui)0
24 files changed, 12 insertions, 30 deletions
diff --git a/muse2/muse/functions.h b/muse2/muse/functions.h
index 9987958b..2b6dc711 100644
--- a/muse2/muse/functions.h
+++ b/muse2/muse/functions.h
@@ -8,15 +8,15 @@
#ifndef __FUNCTIONS_H__
#define __FUNCTIONS_H__
-#include "velocity.h"
+#include "widgets/function_dialogs/velocity.h"
#include "widgets/function_dialogs/quantize.h"
-#include "crescendo.h"
+#include "widgets/function_dialogs/crescendo.h"
#include "widgets/function_dialogs/gatetime.h"
-#include "remove.h"
-#include "transpose.h"
-#include "setlen.h"
-#include "move.h"
-#include "deloverlaps.h"
+#include "widgets/function_dialogs/remove.h"
+#include "widgets/function_dialogs/transpose.h"
+#include "widgets/function_dialogs/setlen.h"
+#include "widgets/function_dialogs/move.h"
+#include "widgets/function_dialogs/deloverlaps.h"
#include <set>
#include "part.h"
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 9a4f6820..df915092 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -4202,13 +4202,12 @@ void staff_t::apply_lasso(QRect rect, set<Event*>& already_processed)
* between, for example, when a cis is tied to a des
*
* CURRENT TODO
- * o draw controllers in part "slivers"
+ * o in step-rec: insert chords
*
* IMPORTANT TODO
* o display blue loop markers in score editor
* o transpose: support in-key-transpose
* o drum-loop-editor (like in sq korg ds xD)
- * o in step-rec: insert chords
*
* o add a select-clef-toolbox for tracks
* o respect the track's clef (has to be implemented first in muse)
@@ -4217,6 +4216,10 @@ void staff_t::apply_lasso(QRect rect, set<Event*>& already_processed)
* o transpose etc. must also transpose key-pressure events
*
* less important stuff
+ * o quantize-templates (everything is forced into a specified
+ * rhythm)
+ * o part-templates (you specify some notes and a control-chord;
+ * the notes are set according to the chord then)
* o add functions like set velo, mod/set velo-off
* o deal with expanding parts
* o use bars instead of flags over groups of 8ths / 16ths etc
diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt
index 2d848ab0..5989df11 100644
--- a/muse2/muse/widgets/CMakeLists.txt
+++ b/muse2/muse/widgets/CMakeLists.txt
@@ -81,13 +81,6 @@ QT4_WRAP_CPP (widget_mocs
# ttoolbar.h
ttoolbutton.h
unusedwavefiles.h
- velocity.h
- crescendo.h
- move.h
- remove.h
- deloverlaps.h
- setlen.h
- transpose.h
verticalmeter.h
view.h
vscale.h
@@ -120,15 +113,7 @@ file (GLOB widgets_ui_files
songinfo.ui
synthconfigbase.ui
transformbase.ui
- transposebase.ui
unusedwavefiles.ui
- velocitybase.ui
- crescendobase.ui
- movebase.ui
- removebase.ui
- deloverlapsbase.ui
- transposebase.ui
- setlenbase.ui
)
QT4_WRAP_UI (widget_ui_headers ${widgets_ui_files})
@@ -195,12 +180,6 @@ file (GLOB widgets_source_files
unusedwavefiles.cpp
utils.cpp
velocity.cpp
- crescendo.cpp
- move.cpp
- remove.cpp
- deloverlaps.cpp
- setlen.cpp
- transpose.cpp
verticalmeter.cpp
view.cpp
vscale.cpp
diff --git a/muse2/muse/widgets/crescendo.cpp b/muse2/muse/widgets/function_dialogs/crescendo.cpp
index ef31c5ef..ef31c5ef 100644
--- a/muse2/muse/widgets/crescendo.cpp
+++ b/muse2/muse/widgets/function_dialogs/crescendo.cpp
diff --git a/muse2/muse/widgets/crescendo.h b/muse2/muse/widgets/function_dialogs/crescendo.h
index eb00e94f..eb00e94f 100644
--- a/muse2/muse/widgets/crescendo.h
+++ b/muse2/muse/widgets/function_dialogs/crescendo.h
diff --git a/muse2/muse/widgets/crescendobase.ui b/muse2/muse/widgets/function_dialogs/crescendobase.ui
index 5f4ec1f4..5f4ec1f4 100644
--- a/muse2/muse/widgets/crescendobase.ui
+++ b/muse2/muse/widgets/function_dialogs/crescendobase.ui
diff --git a/muse2/muse/widgets/deloverlaps.cpp b/muse2/muse/widgets/function_dialogs/deloverlaps.cpp
index 76103d74..76103d74 100644
--- a/muse2/muse/widgets/deloverlaps.cpp
+++ b/muse2/muse/widgets/function_dialogs/deloverlaps.cpp
diff --git a/muse2/muse/widgets/deloverlaps.h b/muse2/muse/widgets/function_dialogs/deloverlaps.h
index 813192a6..813192a6 100644
--- a/muse2/muse/widgets/deloverlaps.h
+++ b/muse2/muse/widgets/function_dialogs/deloverlaps.h
diff --git a/muse2/muse/widgets/deloverlapsbase.ui b/muse2/muse/widgets/function_dialogs/deloverlapsbase.ui
index 7484bf97..7484bf97 100644
--- a/muse2/muse/widgets/deloverlapsbase.ui
+++ b/muse2/muse/widgets/function_dialogs/deloverlapsbase.ui
diff --git a/muse2/muse/widgets/move.cpp b/muse2/muse/widgets/function_dialogs/move.cpp
index 2ce6cb05..2ce6cb05 100644
--- a/muse2/muse/widgets/move.cpp
+++ b/muse2/muse/widgets/function_dialogs/move.cpp
diff --git a/muse2/muse/widgets/move.h b/muse2/muse/widgets/function_dialogs/move.h
index 4c90a922..4c90a922 100644
--- a/muse2/muse/widgets/move.h
+++ b/muse2/muse/widgets/function_dialogs/move.h
diff --git a/muse2/muse/widgets/movebase.ui b/muse2/muse/widgets/function_dialogs/movebase.ui
index a8825dd5..a8825dd5 100644
--- a/muse2/muse/widgets/movebase.ui
+++ b/muse2/muse/widgets/function_dialogs/movebase.ui
diff --git a/muse2/muse/widgets/remove.cpp b/muse2/muse/widgets/function_dialogs/remove.cpp
index 5ad272ab..5ad272ab 100644
--- a/muse2/muse/widgets/remove.cpp
+++ b/muse2/muse/widgets/function_dialogs/remove.cpp
diff --git a/muse2/muse/widgets/remove.h b/muse2/muse/widgets/function_dialogs/remove.h
index 5615ed42..5615ed42 100644
--- a/muse2/muse/widgets/remove.h
+++ b/muse2/muse/widgets/function_dialogs/remove.h
diff --git a/muse2/muse/widgets/removebase.ui b/muse2/muse/widgets/function_dialogs/removebase.ui
index 3381795c..3381795c 100644
--- a/muse2/muse/widgets/removebase.ui
+++ b/muse2/muse/widgets/function_dialogs/removebase.ui
diff --git a/muse2/muse/widgets/setlen.cpp b/muse2/muse/widgets/function_dialogs/setlen.cpp
index 024cdd35..024cdd35 100644
--- a/muse2/muse/widgets/setlen.cpp
+++ b/muse2/muse/widgets/function_dialogs/setlen.cpp
diff --git a/muse2/muse/widgets/setlen.h b/muse2/muse/widgets/function_dialogs/setlen.h
index ad66a38b..ad66a38b 100644
--- a/muse2/muse/widgets/setlen.h
+++ b/muse2/muse/widgets/function_dialogs/setlen.h
diff --git a/muse2/muse/widgets/setlenbase.ui b/muse2/muse/widgets/function_dialogs/setlenbase.ui
index 7d929716..7d929716 100644
--- a/muse2/muse/widgets/setlenbase.ui
+++ b/muse2/muse/widgets/function_dialogs/setlenbase.ui
diff --git a/muse2/muse/widgets/transpose.cpp b/muse2/muse/widgets/function_dialogs/transpose.cpp
index b10c1249..b10c1249 100644
--- a/muse2/muse/widgets/transpose.cpp
+++ b/muse2/muse/widgets/function_dialogs/transpose.cpp
diff --git a/muse2/muse/widgets/transpose.h b/muse2/muse/widgets/function_dialogs/transpose.h
index 97dd443e..97dd443e 100644
--- a/muse2/muse/widgets/transpose.h
+++ b/muse2/muse/widgets/function_dialogs/transpose.h
diff --git a/muse2/muse/widgets/transposebase.ui b/muse2/muse/widgets/function_dialogs/transposebase.ui
index c26f2ef9..c26f2ef9 100644
--- a/muse2/muse/widgets/transposebase.ui
+++ b/muse2/muse/widgets/function_dialogs/transposebase.ui
diff --git a/muse2/muse/widgets/velocity.cpp b/muse2/muse/widgets/function_dialogs/velocity.cpp
index ec625489..ec625489 100644
--- a/muse2/muse/widgets/velocity.cpp
+++ b/muse2/muse/widgets/function_dialogs/velocity.cpp
diff --git a/muse2/muse/widgets/velocity.h b/muse2/muse/widgets/function_dialogs/velocity.h
index cbea4e22..cbea4e22 100644
--- a/muse2/muse/widgets/velocity.h
+++ b/muse2/muse/widgets/function_dialogs/velocity.h
diff --git a/muse2/muse/widgets/velocitybase.ui b/muse2/muse/widgets/function_dialogs/velocitybase.ui
index 40fe625f..40fe625f 100644
--- a/muse2/muse/widgets/velocitybase.ui
+++ b/muse2/muse/widgets/function_dialogs/velocitybase.ui