/[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 2621 by schoenebeck, Wed Jun 11 16:46:27 2014 UTC revision 2625 by schoenebeck, Wed Jun 11 21:22:24 2014 UTC
# Line 342  protected: Line 342  protected:
342      void on_action_duplicate_instrument();      void on_action_duplicate_instrument();
343      void on_action_remove_instrument();      void on_action_remove_instrument();
344    
345        void show_samples_tab();
346        void show_intruments_tab();
347        void show_scripts_tab();
348    
349      void add_instrument(gig::Instrument* instrument);      void add_instrument(gig::Instrument* instrument);
350      Gtk::RadioMenuItem* add_instrument_to_menu(const Glib::ustring& name,      Gtk::RadioMenuItem* add_instrument_to_menu(const Glib::ustring& name,
351                                                 int position = -1);                                                 int position = -1);
# Line 388  protected: Line 392  protected:
392      sigc::connection instrument_name_connection;      sigc::connection instrument_name_connection;
393    
394      void on_action_combine_instruments();      void on_action_combine_instruments();
395        void on_action_view_references();
396      void on_action_merge_files();      void on_action_merge_files();
397      void mergeFiles(const std::vector<std::string>& filenames);      void mergeFiles(const std::vector<std::string>& filenames);
398    

Legend:
Removed from v.2621  
changed lines
  Added in v.2625

  ViewVC Help
Powered by ViewVC