From 2c0fc6f4087442079051c2df1fff7d8fa2ac7b19 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Mon, 17 Apr 2017 15:05:24 +0200 Subject: Connect drumkit and midimap files as well as loading/status bare updates. --- plugingui/drumkitframecontent.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'plugingui/drumkitframecontent.h') diff --git a/plugingui/drumkitframecontent.h b/plugingui/drumkitframecontent.h index 7f442c5..143284c 100644 --- a/plugingui/drumkitframecontent.h +++ b/plugingui/drumkitframecontent.h @@ -26,6 +26,8 @@ */ #pragma once +#include + #include "button.h" #include "label.h" #include "lineedit.h" @@ -65,7 +67,9 @@ class DrumkitframeContent : public Widget { public: - DrumkitframeContent(Widget* parent); + DrumkitframeContent(Widget* parent, + Settings& settings, + SettingsNotifier& settings_notifier); // From Widget virtual void resize(std::size_t width, std::size_t height) override; @@ -77,16 +81,22 @@ private: void selectKitFile(const std::string& filename); void selectMapFile(const std::string& filename); + void setDrumKitLoadStatus(LoadStatus load_status); + void setMidiMapLoadStatus(LoadStatus load_status); + VBoxLayout layout{this}; Label drumkitCaption{this}; Label midimapCaption{this}; - BrowseFile drumkitFile{this}; - BrowseFile midimapFile{this}; - ProgressBar drumkitFileProgress{this}; - ProgressBar midimapFileProgress{this}; + BrowseFile drumkit_file{this}; + BrowseFile midimap_file{this}; + ProgressBar drumkit_file_progress{this}; + ProgressBar midimap_file_progress{this}; FileBrowser file_browser{this}; + + Settings& settings; + SettingsNotifier& settings_notifier; }; } // GUI:: -- cgit v1.2.3