/[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 1053 by persson, Sat Mar 3 12:20:01 2007 UTC revision 1096 by schoenebeck, Tue Mar 13 17:14:38 2007 UTC
# Line 43  Line 43 
43  #include <gtkmm/treeview.h>  #include <gtkmm/treeview.h>
44  #include <gtkmm/uimanager.h>  #include <gtkmm/uimanager.h>
45  #include <gtkmm/window.h>  #include <gtkmm/window.h>
46    #include <gtkmm/menuitem.h>
47    
48    #include <sstream>
49    
50  #include "regionchooser.h"  #include "regionchooser.h"
51  #include "dimregionchooser.h"  #include "dimregionchooser.h"
# Line 370  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 468  protected: Line 470  protected:
470      PropDialog propDialog;      PropDialog propDialog;
471      InstrumentProps instrumentProps;      InstrumentProps instrumentProps;
472    
473        void on_instrument_selection_change(int index);
474      void on_sel_change();      void on_sel_change();
475      void region_changed();      void region_changed();
476      void dimreg_changed();      void dimreg_changed();
# Line 484  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 495  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        class SamplesTreeStore : public Gtk::TreeStore {
513        public:
514            static Glib::RefPtr<SamplesTreeStore> create(const SamplesModel& columns) {
515                return Glib::RefPtr<SamplesTreeStore>( new SamplesTreeStore(columns) );
516            }
517        protected:
518            SamplesTreeStore(const SamplesModel& columns) : Gtk::TreeStore(columns) {}
519        };
520    
521        Gtk::ScrolledWindow m_ScrolledWindowSamples;
522        Gtk::TreeView m_TreeViewSamples;
523        Glib::RefPtr<SamplesTreeStore> m_refSamplesTreeModel;
524    
525      Gtk::Notebook m_Notebook;      Gtk::Notebook m_Notebook;
526        Gtk::Notebook m_TreeViewNotebook;
527    
528      Gtk::Table* table[5];      Gtk::Table* table[5];
529    
# Line 504  protected: Line 532  protected:
532      Gtk::Label* lSample;      Gtk::Label* lSample;
533      Gtk::Entry* wSample;      Gtk::Entry* wSample;
534    
535        struct SampleImportItem {
536            gig::Sample*  gig_sample;  // pointer to the gig::Sample to which the sample data should be imported to
537            Glib::ustring sample_path; // file name of the sample to be imported
538        };
539        std::list<SampleImportItem> m_SampleImportQueue;
540    
541      void VCFEnabled_toggled();      void VCFEnabled_toggled();
542      void VCFCutoffController_changed();      void VCFCutoffController_changed();
543      void VCFResonanceController_changed();      void VCFResonanceController_changed();
# Line 527  protected: Line 561  protected:
561      void on_action_file_properties();      void on_action_file_properties();
562      void on_action_help_about();      void on_action_help_about();
563    
564        // sample right-click popup actions
565        void on_sample_treeview_button_release(GdkEventButton* button);
566        void on_action_sample_properties();
567        void on_action_add_group();
568        void on_action_add_sample();
569        void on_action_remove_sample();
570    
571      LoadDialog* load_dialog;      LoadDialog* load_dialog;
572      Loader* loader;      Loader* loader;
573      void load_gig(gig::File* gig, const char* filename);      void load_gig(gig::File* gig, const char* filename);
# Line 534  protected: Line 575  protected:
575      gig::File* file;      gig::File* file;
576    
577      void on_button_release(GdkEventButton* button);      void on_button_release(GdkEventButton* button);
578        void on_sample_treeview_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint, guint);
579        void on_sample_label_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int, int, const Gtk::SelectionData& selection_data, guint, guint time);
580    
581        void __import_queued_samples();
582    
583    Gtk::Menu* popup_menu;    Gtk::Menu* popup_menu;
584  };  };

Legend:
Removed from v.1053  
changed lines
  Added in v.1096

  ViewVC Help
Powered by ViewVC