/[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 2507 by persson, Sun Jan 12 19:37:55 2014 UTC revision 2553 by schoenebeck, Wed May 14 19:57:56 2014 UTC
# Line 281  protected: Line 281  protected:
281      bool instr_props_set_instrument();      bool instr_props_set_instrument();
282      void show_midi_rules();      void show_midi_rules();
283      void on_action_view_status_bar();      void on_action_view_status_bar();
284        void on_action_warn_user_on_extensions();
285      void on_action_help_about();      void on_action_help_about();
286    
287      // sample right-click popup actions      // sample right-click popup actions
# Line 334  protected: Line 335  protected:
335      void instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it);      void instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it);
336      sigc::connection instrument_name_connection;      sigc::connection instrument_name_connection;
337    
338        void on_action_combine_instruments();
339        void on_action_merge_files();
340        void mergeFiles(const std::vector<std::string>& filenames);
341    
342      void __import_queued_samples();      void __import_queued_samples();
343      void __clear();      void __clear();
344        void __refreshEntireGUI();
345    
346      bool close_confirmation_dialog();      bool close_confirmation_dialog();
347      bool leaving_shared_mode_dialog();      bool leaving_shared_mode_dialog();
Legend:
Removed from v.2507  
changed lines
  Added in v.2553
  ViewVC Help
Powered by ViewVC