diff options
author | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-04-16 13:33:53 +0200 |
---|---|---|
committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-04-16 13:33:53 +0200 |
commit | 4eb252df04ab237c8638d45bcbf028859dc6a110 (patch) | |
tree | 8bffddf62b4271336a6e0121fef8133327654000 /plugingui/dgwindow.h | |
parent | ef68248bf70a027595803b08433a7a2c74e20fd0 (diff) | |
parent | 35e804b984c28131fe13d229c5a0867762c6e8cf (diff) |
Merge branch 'settings'
Diffstat (limited to 'plugingui/dgwindow.h')
-rw-r--r-- | plugingui/dgwindow.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/plugingui/dgwindow.h b/plugingui/dgwindow.h index 605e87a..72e4679 100644 --- a/plugingui/dgwindow.h +++ b/plugingui/dgwindow.h @@ -26,8 +26,9 @@ */ #pragma once -#include "window.h" +#include <settings.h> +#include "window.h" #include "label.h" #include "lineedit.h" #include "checkbox.h" @@ -37,8 +38,6 @@ #include "filebrowser.h" #include "layout.h" -class MessageHandler; - namespace GUI { class Config; @@ -47,7 +46,7 @@ class File; class DGWindow : public Window { public: - DGWindow(void* native_window, MessageHandler& messageHandler, Config& config); + DGWindow(void* native_window, Config& config, Settings& settings); Header* header; @@ -65,6 +64,9 @@ public: Knob* falloffKnob; FileBrowser* fileBrowser; + void setDrumKitLoadStatus(LoadStatus load_status); + void setMidiMapLoadStatus(LoadStatus load_status); + protected: // From Widget: void repaintEvent(RepaintEvent* repaintEvent) override; @@ -78,13 +80,14 @@ private: void selectKitFile(const std::string& filename); void selectMapFile(const std::string& filename); - MessageHandler& messageHandler; Config& config; VBoxLayout layout{this}; Image back{":bg.png"}; Image logo{":logo.png"}; + + Settings& settings; }; } // GUI:: |