--- gigedit/trunk/src/gigedit/mainwindow.h 2012/03/04 09:01:40 2325 +++ gigedit/trunk/src/gigedit/mainwindow.h 2015/01/04 19:46:54 2691 @@ -1,5 +1,5 @@ /* -*- c++ -*- - * Copyright (C) 2006 - 2008 Andreas Persson + * Copyright (C) 2006 - 2015 Andreas Persson * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -26,8 +26,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -40,30 +42,21 @@ #include "regionchooser.h" #include "dimregionchooser.h" #include "dimregionedit.h" +#include "midirules.h" #ifndef OLD_THREADS #include #endif class MainWindow; -class Table : public Gtk::Table -{ -public: - Table(int x, int y); - void add(BoolEntry& boolentry); - void add(BoolEntryPlus6& boolentry); - void add(LabelWidget& labelwidget); -private: - int rowno; -}; - -class PropDialog : public Gtk::Window { +class PropDialog : public Gtk::Window, + public PropEditor { public: PropDialog(); void set_info(DLS::Info* info); - sigc::signal& signal_info_changed(); + void set_file(gig::File* file); protected: - sigc::signal info_changed; + ChoiceEntry eFileFormat; StringEntry eName; StringEntry eCreationDate; StringEntryMultiLine eComments; @@ -84,72 +77,29 @@ Gtk::HButtonBox buttonBox; Gtk::Button quitButton; Table table; - int update_model; - DLS::Info* info; - template - void set_member(T value, T DLS::Info::* member) { - if (update_model == 0) { - info->*member = value; - info_changed(); - } - } + gig::File* m_file; - template - void connect(C& widget, T DLS::Info::* member) { - widget.signal_value_changed().connect( - sigc::compose( - sigc::bind(sigc::mem_fun(*this, &PropDialog::set_member), member), - sigc::mem_fun(widget, &C::get_value))); - } + void onFileFormatChanged(); }; -class InstrumentProps : public Gtk::Window { +class InstrumentProps : public Gtk::Window, + public PropEditor { public: InstrumentProps(); void set_instrument(gig::Instrument* instrument); - sigc::signal& signal_instrument_changed(); -protected: - gig::Instrument* instrument; - int update_model; - - template - void set_value(T value, sigc::slot setter) { - if (update_model == 0) { - setter(this, value); - instrument_changed(); - } - } - - template - void connect(C& widget, T gig::Instrument::* member) { - widget.signal_value_changed().connect( - sigc::compose( - sigc::bind(sigc::mem_fun(*this, &InstrumentProps::set_value), - sigc::bind(sigc::mem_fun(&InstrumentProps::set_member), member)), - sigc::mem_fun(widget, &C::get_value))); - } - - template - void connect(C& widget, void (InstrumentProps::*setter)(T)) { - widget.signal_value_changed().connect( - sigc::compose( - sigc::bind(sigc::mem_fun(*this, &InstrumentProps::set_value), - sigc::mem_fun(setter)), - sigc::mem_fun(widget, &C::get_value))); + gig::Instrument* get_instrument() { return m; } + void update_name(); + sigc::signal& signal_name_changed() { + return sig_name_changed; } - - template - void set_member(T value, T gig::Instrument::* member) { - instrument->*member = value; - } - +protected: + void set_Name(const gig::String& name); void set_IsDrum(bool value); void set_MIDIBank(uint16_t value); void set_MIDIProgram(uint32_t value); - void set_DimensionKeyRange_low(uint8_t value); - void set_DimensionKeyRange_high(uint8_t value); + sigc::signal sig_name_changed; Gtk::VBox vbox; Gtk::HButtonBox buttonBox; Gtk::Button quitButton; @@ -166,12 +116,11 @@ BoolEntry ePianoReleaseMode; NoteEntry eDimensionKeyRangeLow; NoteEntry eDimensionKeyRangeHigh; - sigc::signal instrument_changed; }; -class LoadDialog : public Gtk::Dialog { +class ProgressDialog : public Gtk::Dialog { public: - LoadDialog(const Glib::ustring& title, Gtk::Window& parent); + ProgressDialog(const Glib::ustring& title, Gtk::Window& parent); void set_fraction(float fraction) { progressBar.set_fraction(fraction); } protected: Gtk::ProgressBar progressBar; @@ -182,10 +131,12 @@ Loader(const char* filename); void launch(); Glib::Dispatcher& signal_progress(); - Glib::Dispatcher& signal_finished(); + Glib::Dispatcher& signal_finished(); ///< Finished successfully, without error. + Glib::Dispatcher& signal_error(); void progress_callback(float fraction); float get_progress(); - const char* filename; + const Glib::ustring filename; + Glib::ustring error_message; gig::File* gig; private: @@ -193,6 +144,30 @@ void thread_function(); Glib::Dispatcher finished_dispatcher; Glib::Dispatcher progress_dispatcher; + Glib::Dispatcher error_dispatcher; + Glib::Threads::Mutex progressMutex; + float progress; +}; + +class Saver : public sigc::trackable { +public: + Saver(gig::File* file, Glib::ustring filename = ""); ///< one argument means "save", two arguments means "save as" + void launch(); + Glib::Dispatcher& signal_progress(); + Glib::Dispatcher& signal_finished(); ///< Finished successfully, without error. + Glib::Dispatcher& signal_error(); + void progress_callback(float fraction); + float get_progress(); + gig::File* gig; + const Glib::ustring filename; + Glib::ustring error_message; + +private: + Glib::Threads::Thread* thread; + void thread_function(); + Glib::Dispatcher finished_dispatcher; + Glib::Dispatcher progress_dispatcher; + Glib::Dispatcher error_dispatcher; Glib::Threads::Mutex progressMutex; float progress; }; @@ -221,6 +196,8 @@ sigc::signal& signal_keyboard_key_hit(); sigc::signal& signal_keyboard_key_released(); + sigc::signal& signal_switch_sampler_instrument(); + protected: Glib::RefPtr actionGroup; Glib::RefPtr uiManager; @@ -234,6 +211,7 @@ PropDialog propDialog; InstrumentProps instrumentProps; + MidiRules midiRules; sigc::signal file_structure_to_be_changed_signal; sigc::signal file_structure_changed_signal; @@ -249,12 +227,20 @@ sigc::signal note_on_signal; sigc::signal note_off_signal; - void on_instrument_selection_change(int index); + sigc::signal switch_sampler_instrument_signal; + + void on_instrument_selection_change(Gtk::RadioMenuItem* item); void on_sel_change(); void region_changed(); void dimreg_changed(); + void select_sample(gig::Sample* sample); void on_loader_progress(); void on_loader_finished(); + void on_loader_error(); + void on_saver_progress(); + void on_saver_error(); + void on_saver_finished(); + void dimreg_all_dimregs_toggled(); gig::Instrument* get_instrument(); void add_region_to_dimregs(gig::Region* region, bool stereo, bool all_dimregs); @@ -279,17 +265,25 @@ Gtk::TreeView m_TreeView; Glib::RefPtr m_refTreeModel; + Gtk::Menu* instrument_menu; + + std::map sample_ref_count; + class SamplesModel : public Gtk::TreeModel::ColumnRecord { public: SamplesModel() { add(m_col_name); add(m_col_sample); add(m_col_group); + add(m_col_refcount); + add(m_color); } Gtk::TreeModelColumn m_col_name; Gtk::TreeModelColumn m_col_sample; Gtk::TreeModelColumn m_col_group; + Gtk::TreeModelColumn m_col_refcount; + Gtk::TreeModelColumn m_color; } m_SamplesModel; class SamplesTreeStore : public Gtk::TreeStore { @@ -305,6 +299,32 @@ Gtk::TreeView m_TreeViewSamples; Glib::RefPtr m_refSamplesTreeModel; + class ScriptsModel : public Gtk::TreeModel::ColumnRecord { + public: + ScriptsModel() { + add(m_col_name); + add(m_col_script); + add(m_col_group); + } + + Gtk::TreeModelColumn m_col_name; + Gtk::TreeModelColumn m_col_script; + Gtk::TreeModelColumn m_col_group; + } m_ScriptsModel; + + class ScriptsTreeStore : public Gtk::TreeStore { + public: + static Glib::RefPtr create(const ScriptsModel& columns) { + return Glib::RefPtr( new ScriptsTreeStore(columns) ); + } + protected: + ScriptsTreeStore(const ScriptsModel& columns) : Gtk::TreeStore(columns) {} + }; + + Gtk::ScrolledWindow m_ScrolledWindowScripts; + Gtk::TreeView m_TreeViewScripts; + Glib::RefPtr m_refScriptsTreeModel; + Gtk::VBox dimreg_vbox; Gtk::HBox dimreg_hbox; Gtk::Label dimreg_label; @@ -313,7 +333,6 @@ Gtk::CheckButton dimreg_stereo; DimRegionEdit dimreg_edit; - Gtk::Notebook m_Notebook; Gtk::Notebook m_TreeViewNotebook; struct SampleImportItem { @@ -333,7 +352,12 @@ void on_action_file_properties(); void on_action_quit(); void show_instr_props(); + bool instr_props_set_instrument(); + void show_midi_rules(); + void show_script_slots(); void on_action_view_status_bar(); + void on_action_warn_user_on_extensions(); + void on_action_sync_sampler_instrument_selection(); void on_action_help_about(); // sample right-click popup actions @@ -343,13 +367,32 @@ void on_action_add_sample(); void on_action_replace_all_samples_in_all_groups(); void on_action_remove_sample(); + + // script right-click popup actions + void on_script_treeview_button_release(GdkEventButton* button); + void on_action_add_script_group(); + void on_action_add_script(); + void on_action_edit_script(); + void on_action_remove_script(); void on_action_add_instrument(); + void on_action_duplicate_instrument(); void on_action_remove_instrument(); - LoadDialog* load_dialog; + void show_samples_tab(); + void show_intruments_tab(); + void show_scripts_tab(); + + void add_instrument(gig::Instrument* instrument); + Gtk::RadioMenuItem* add_instrument_to_menu(const Glib::ustring& name, + int position = -1); + void remove_instrument_from_menu(int index); + + ProgressDialog* progress_dialog; Loader* loader; + Saver* saver; void load_gig(gig::File* gig, const char* filename, bool isSharedInstrument = false); + void updateSampleRefCountMap(gig::File* gig); gig::File* file; bool file_is_shared; @@ -366,6 +409,9 @@ bool check_if_savable(); void on_button_release(GdkEventButton* button); + void on_scripts_treeview_drag_begin(const Glib::RefPtr& context); + void on_scripts_treeview_drag_data_get(const Glib::RefPtr&, + Gtk::SelectionData& selection_data, guint, guint); void on_sample_treeview_drag_begin(const Glib::RefPtr& context); void on_sample_treeview_drag_data_get(const Glib::RefPtr&, Gtk::SelectionData& selection_data, guint, guint); @@ -374,13 +420,28 @@ const Gtk::SelectionData& selection_data, guint, guint time); + void script_name_changed(const Gtk::TreeModel::Path& path, + const Gtk::TreeModel::iterator& iter); + void script_double_clicked(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column); void sample_name_changed(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter); void instrument_name_changed(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter); + void instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it); + sigc::connection instrument_name_connection; + + void on_action_combine_instruments(); + void on_action_view_references(); + void on_action_merge_files(); + void mergeFiles(const std::vector& filenames); + + void on_sample_ref_changed(gig::Sample* oldSample, gig::Sample* newSample); + void on_sample_ref_count_incremented(gig::Sample* sample, int offset); + void on_samples_to_be_removed(std::list samples); void __import_queued_samples(); void __clear(); + void __refreshEntireGUI(); bool close_confirmation_dialog(); bool leaving_shared_mode_dialog(); @@ -390,6 +451,10 @@ bool on_delete_event(GdkEventAny* event); bool first_call_to_drag_data_get; + + bool is_copy_samples_unity_note_enabled() const; + bool is_copy_samples_fine_tune_enabled() const; + bool is_copy_samples_loop_enabled() const; }; #endif