diff options
author | Florian Jung <flo@windfisch.org> | 2012-02-14 17:26:03 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2012-02-14 17:26:03 +0000 |
commit | 3ffd0dacdd7447c6c377f95c1fa7fc45a2612d98 (patch) | |
tree | c8fa5ba7569d3001f3304f16f2f4a5c2546db8df /muse2/muse/arranger/arranger.h | |
parent | bca65ae96031f8d6828cb0038ee768ae11c7cff8 (diff) |
- added support for custom controller columns in the tracklist
they are stored in and read from the global config file.
- tracklist header is now saved into global config, not in songfile.
TODO: - allow the user to customize the custom columns
- make recreating the Header work (graphical glitches currently)
Diffstat (limited to 'muse2/muse/arranger/arranger.h')
-rw-r--r-- | muse2/muse/arranger/arranger.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/muse2/muse/arranger/arranger.h b/muse2/muse/arranger/arranger.h index 35a3fe36..a49829c8 100644 --- a/muse2/muse/arranger/arranger.h +++ b/muse2/muse/arranger/arranger.h @@ -24,6 +24,7 @@ #define __ARRANGER_H__ #include <vector> +#include <QString> #include "midieditor.h" #include "pcanvas.h" @@ -87,6 +88,8 @@ class WidgetStack : public QWidget { class Arranger : public QWidget { Q_OBJECT + static QString header_state; + int _quant, _raster; PartCanvas* canvas; ScrollScale* hscroll; @@ -103,6 +106,7 @@ class Arranger : public QWidget { MidiTrackInfo* midiTrackInfo; AudioStrip* waveTrackInfo; QWidget* noTrackInfo; + QWidget* tracklist; TLLayout* tgrid; MusECore::Track* selected; @@ -167,10 +171,24 @@ class Arranger : public QWidget { void updateTrackInfo(int flags); void configChanged(); void controllerChanged(MusECore::Track *t); + void updateTListHeader(); public: enum { CMD_CUT_PART, CMD_COPY_PART, CMD_COPY_PART_IN_RANGE, CMD_PASTE_PART, CMD_PASTE_CLONE_PART, CMD_PASTE_DIALOG, CMD_PASTE_CLONE_DIALOG, CMD_INSERT_EMPTYMEAS }; + + struct custom_col_t + { + int ctrl; + QString name; + + custom_col_t(int c, QString n) + { + ctrl=c; + name=n; + } + }; + static std::vector<custom_col_t> custom_columns; Arranger(ArrangerView* parent, const char* name = 0); @@ -180,6 +198,11 @@ class Arranger : public QWidget { void writeStatus(int level, MusECore::Xml&); void readStatus(MusECore::Xml&); + void writeConfiguration(int level, MusECore::Xml&); + static void readConfiguration(MusECore::Xml&); + static void writeCustomColumns(int level, MusECore::Xml&); + static void readCustomColumns(MusECore::Xml&); + static custom_col_t readOneCustomColumn(MusECore::Xml&); MusECore::Track* curTrack() const { return selected; } void cmd(int); |