/[svn]/gigedit/trunk/src/mainwindow.h
ViewVC logotype

Diff of /gigedit/trunk/src/mainwindow.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1069 by schoenebeck, Sun Mar 4 22:00:46 2007 UTC revision 1092 by persson, Sun Mar 11 15:21:58 2007 UTC
# Line 45  Line 45 
45  #include <gtkmm/window.h>  #include <gtkmm/window.h>
46  #include <gtkmm/menuitem.h>  #include <gtkmm/menuitem.h>
47    
48    #include <sstream>
49    
50  #include "regionchooser.h"  #include "regionchooser.h"
51  #include "dimregionchooser.h"  #include "dimregionchooser.h"
52    
# Line 371  protected: Line 373  protected:
373      int pageno;      int pageno;
374      int firstRowInBlock;      int firstRowInBlock;
375    
     NumEntryTemp<uint8_t> eVelocityUpperLimit;  
376      NumEntryPermille eEG1PreAttack;      NumEntryPermille eEG1PreAttack;
377      NumEntryTemp<double> eEG1Attack;      NumEntryTemp<double> eEG1Attack;
378      NumEntryTemp<double> eEG1Decay1;      NumEntryTemp<double> eEG1Decay1;
# Line 486  protected: Line 487  protected:
487    
488          Gtk::TreeModelColumn<Glib::ustring> m_col_name;          Gtk::TreeModelColumn<Glib::ustring> m_col_name;
489          Gtk::TreeModelColumn<gig::Instrument*> m_col_instr;          Gtk::TreeModelColumn<gig::Instrument*> m_col_instr;
490      };      } m_Columns;
   
     ModelColumns m_Columns;  
491    
492      Gtk::VBox m_VBox;      Gtk::VBox m_VBox;
493      Gtk::HPaned m_HPaned;      Gtk::HPaned m_HPaned;
# Line 497  protected: Line 496  protected:
496      Gtk::TreeView m_TreeView;      Gtk::TreeView m_TreeView;
497      Glib::RefPtr<Gtk::ListStore> m_refTreeModel;      Glib::RefPtr<Gtk::ListStore> m_refTreeModel;
498    
499        class SamplesModel : public Gtk::TreeModel::ColumnRecord {
500        public:
501            SamplesModel() {
502                add(m_col_name);
503                add(m_col_sample);
504                add(m_col_group);
505            }
506    
507            Gtk::TreeModelColumn<Glib::ustring> m_col_name;
508            Gtk::TreeModelColumn<gig::Sample*> m_col_sample;
509            Gtk::TreeModelColumn<gig::Group*> m_col_group;
510        } m_SamplesModel;
511    
512        Gtk::ScrolledWindow m_ScrolledWindowSamples;
513        Gtk::TreeView m_TreeViewSamples;
514        Glib::RefPtr<Gtk::TreeStore> m_refSamplesTreeModel;
515    
516      Gtk::Notebook m_Notebook;      Gtk::Notebook m_Notebook;
517        Gtk::Notebook m_TreeViewNotebook;
518    
519      Gtk::Table* table[5];      Gtk::Table* table[5];
520    
# Line 506  protected: Line 523  protected:
523      Gtk::Label* lSample;      Gtk::Label* lSample;
524      Gtk::Entry* wSample;      Gtk::Entry* wSample;
525    
526        struct SampleImportItem {
527            gig::Sample*  gig_sample;  // pointer to the gig::Sample to which the sample data should be imported to
528            Glib::ustring sample_path; // file name of the sample to be imported
529        };
530        std::list<SampleImportItem> m_SampleImportQueue;
531    
532      void VCFEnabled_toggled();      void VCFEnabled_toggled();
533      void VCFCutoffController_changed();      void VCFCutoffController_changed();
534      void VCFResonanceController_changed();      void VCFResonanceController_changed();
# Line 529  protected: Line 552  protected:
552      void on_action_file_properties();      void on_action_file_properties();
553      void on_action_help_about();      void on_action_help_about();
554    
555        // sample right-click popup actions
556        void on_sample_treeview_button_release(GdkEventButton* button);
557        void on_action_sample_properties();
558        void on_action_add_group();
559        void on_action_add_sample();
560        void on_action_remove_sample();
561    
562      LoadDialog* load_dialog;      LoadDialog* load_dialog;
563      Loader* loader;      Loader* loader;
564      void load_gig(gig::File* gig, const char* filename);      void load_gig(gig::File* gig, const char* filename);
# Line 537  protected: Line 567  protected:
567    
568      void on_button_release(GdkEventButton* button);      void on_button_release(GdkEventButton* button);
569    
570        void __import_queued_samples();
571    
572    Gtk::Menu* popup_menu;    Gtk::Menu* popup_menu;
573  };  };
574    
Legend:
Removed from v.1069  
changed lines
  Added in v.1092
  ViewVC Help
Powered by ViewVC