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

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

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

revision 3298 by schoenebeck, Mon Jan 2 22:13:01 2017 UTC revision 3299 by schoenebeck, Sun Jul 9 12:44:59 2017 UTC
# Line 26  Line 26 
26  #include "wrapLabel.hh"  #include "wrapLabel.hh"
27  #include "ManagedWindow.h"  #include "ManagedWindow.h"
28    
29    #include <set>
30    
31  /**  /**
32   * @brief Modal dialog which allows to merge instruments.   * @brief Modal dialog which allows to merge instruments.
33   *   *
# Line 41  public: Line 43  public:
43      CombineInstrumentsDialog(Gtk::Window& parent, gig::File* gig);      CombineInstrumentsDialog(Gtk::Window& parent, gig::File* gig);
44      bool fileWasChanged() const;      bool fileWasChanged() const;
45      gig::Instrument* newCombinedInstrument() const;      gig::Instrument* newCombinedInstrument() const;
46        void setSelectedInstruments(const std::set<int>& instrumentIndeces);
47    
48      // implementation for abstract methods of interface class "ManagedDialog"      // implementation for abstract methods of interface class "ManagedDialog"
49      virtual Settings::Property<int>* windowSettingX() { return &Settings::singleton()->combineInstrumentsWindowX; }      virtual Settings::Property<int>* windowSettingX() { return &Settings::singleton()->combineInstrumentsWindowX; }
# Line 81  protected: Line 84  protected:
84      class ListModel : public Gtk::TreeModel::ColumnRecord {      class ListModel : public Gtk::TreeModel::ColumnRecord {
85      public:      public:
86          ListModel() {          ListModel() {
87                add(m_col_index);
88              add(m_col_name);              add(m_col_name);
89              add(m_col_instr);              add(m_col_instr);
90          }          }
91    
92            Gtk::TreeModelColumn<int> m_col_index;
93          Gtk::TreeModelColumn<Glib::ustring>    m_col_name;          Gtk::TreeModelColumn<Glib::ustring>    m_col_name;
94          Gtk::TreeModelColumn<gig::Instrument*> m_col_instr;          Gtk::TreeModelColumn<gig::Instrument*> m_col_instr;
95      } m_columns;      } m_columns;
Legend:
Removed from v.3298  
changed lines
  Added in v.3299
  ViewVC Help
Powered by ViewVC