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

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

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

revision 2893 by schoenebeck, Fri Apr 29 14:19:53 2016 UTC revision 2994 by schoenebeck, Sat Sep 24 23:34:37 2016 UTC
# Line 51  Line 51 
51    
52  class MainWindow;  class MainWindow;
53    
54  class PropDialog : public Gtk::Window,  class PropDialog : public ManagedWindow,
55                     public PropEditor<DLS::Info> {                     public PropEditor<DLS::Info> {
56  public:  public:
57      PropDialog();      PropDialog();
58      void set_info(DLS::Info* info);      void set_info(DLS::Info* info);
59      void set_file(gig::File* file);      void set_file(gig::File* file);
60    
61        // implementation for abstract methods of interface class "ManagedWindow"
62        virtual Settings::Property<int>* windowSettingX() { return &Settings::singleton()->filePropsWindowX; }
63        virtual Settings::Property<int>* windowSettingY() { return &Settings::singleton()->filePropsWindowY; }
64        virtual Settings::Property<int>* windowSettingWidth() { return &Settings::singleton()->filePropsWindowW; }
65        virtual Settings::Property<int>* windowSettingHeight() { return &Settings::singleton()->filePropsWindowH; }
66    
67  protected:  protected:
68      ChoiceEntry<int> eFileFormat;      ChoiceEntry<int> eFileFormat;
69      StringEntry eName;      StringEntry eName;
# Line 85  protected: Line 92  protected:
92      void onFileFormatChanged();      void onFileFormatChanged();
93  };  };
94    
95  class InstrumentProps : public Gtk::Window,  class InstrumentProps : public ManagedWindow,
96                          public PropEditor<gig::Instrument> {                          public PropEditor<gig::Instrument> {
97  public:  public:
98      InstrumentProps();      InstrumentProps();
# Line 95  public: Line 102  public:
102      sigc::signal<void>& signal_name_changed() {      sigc::signal<void>& signal_name_changed() {
103          return sig_name_changed;          return sig_name_changed;
104      }      }
105    
106        // implementation for abstract methods of interface class "ManagedWindow"
107        virtual Settings::Property<int>* windowSettingX() { return &Settings::singleton()->instrPropsWindowX; }
108        virtual Settings::Property<int>* windowSettingY() { return &Settings::singleton()->instrPropsWindowY; }
109        virtual Settings::Property<int>* windowSettingWidth() { return &Settings::singleton()->instrPropsWindowW; }
110        virtual Settings::Property<int>* windowSettingHeight() { return &Settings::singleton()->instrPropsWindowH; }
111    
112  protected:  protected:
113      void set_Name(const gig::String& name);      void set_Name(const gig::String& name);
114      void set_IsDrum(bool value);      void set_IsDrum(bool value);
# Line 199  public: Line 213  public:
213      sigc::signal<void, int/*key*/, int/*velocity*/>& signal_keyboard_key_released();      sigc::signal<void, int/*key*/, int/*velocity*/>& signal_keyboard_key_released();
214    
215      sigc::signal<void, gig::Instrument*>& signal_switch_sampler_instrument();      sigc::signal<void, gig::Instrument*>& signal_switch_sampler_instrument();
216        
217        sigc::signal<void, gig::Script*> signal_script_to_be_changed;
218        sigc::signal<void, gig::Script*> signal_script_changed;
219    
220      // implementation for abstract methods of interface class "ManagedWindow"      // implementation for abstract methods of interface class "ManagedWindow"
221      virtual Settings::Property<int>* windowSettingX() { return &Settings::singleton()->mainWindowX; }      virtual Settings::Property<int>* windowSettingX() { return &Settings::singleton()->mainWindowX; }
222      virtual Settings::Property<int>* windowSettingY() { return &Settings::singleton()->mainWindowY; }      virtual Settings::Property<int>* windowSettingY() { return &Settings::singleton()->mainWindowY; }
# Line 259  protected: Line 276  protected:
276      class ModelColumns : public Gtk::TreeModel::ColumnRecord {      class ModelColumns : public Gtk::TreeModel::ColumnRecord {
277      public:      public:
278          ModelColumns() {          ModelColumns() {
279              add(m_col_nr);
280            add(m_col_name);            add(m_col_name);
281            add(m_col_instr);            add(m_col_instr);
282          }          }
283    
284            Gtk::TreeModelColumn<int> m_col_nr;
285          Gtk::TreeModelColumn<Glib::ustring> m_col_name;          Gtk::TreeModelColumn<Glib::ustring> m_col_name;
286          Gtk::TreeModelColumn<gig::Instrument*> m_col_instr;          Gtk::TreeModelColumn<gig::Instrument*> m_col_instr;
287      } m_Columns;      } m_Columns;
# Line 366  protected: Line 385  protected:
385      void show_midi_rules();      void show_midi_rules();
386      void show_script_slots();      void show_script_slots();
387      void on_action_view_status_bar();      void on_action_view_status_bar();
388        void on_auto_restore_win_dim();
389        void on_save_with_temporary_file();
390      void on_action_refresh_all();      void on_action_refresh_all();
391      void on_action_warn_user_on_extensions();      void on_action_warn_user_on_extensions();
392      void on_action_sync_sampler_instrument_selection();      void on_action_sync_sampler_instrument_selection();
Legend:
Removed from v.2893  
changed lines
  Added in v.2994
  ViewVC Help
Powered by ViewVC