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

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

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

revision 1959 by persson, Fri Jul 31 10:15:27 2009 UTC revision 2466 by schoenebeck, Thu Sep 5 03:02:48 2013 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2009 Andreas Persson   * Copyright (C) 2006-2013 Andreas Persson
3   *   *
4   * This program is free software; you can redistribute it and/or   * This program is free software; you can redistribute it and/or
5   * modify it under the terms of the GNU General Public License as   * modify it under the terms of the GNU General Public License as
# Line 20  Line 20 
20  #include <iostream>  #include <iostream>
21  #include <cstring>  #include <cstring>
22    
23    #include <glibmm/convert.h>
24    #include <glibmm/dispatcher.h>
25    #include <glibmm/miscutils.h>
26    #include <glibmm/stringutils.h>
27    #include <gtkmm/aboutdialog.h>
28  #include <gtkmm/filechooserdialog.h>  #include <gtkmm/filechooserdialog.h>
29  #include <gtkmm/messagedialog.h>  #include <gtkmm/messagedialog.h>
30  #include <gtkmm/stock.h>  #include <gtkmm/stock.h>
31  #include <gtkmm/targetentry.h>  #include <gtkmm/targetentry.h>
32  #include <gtkmm/main.h>  #include <gtkmm/main.h>
33  #include <gtkmm/toggleaction.h>  #include <gtkmm/toggleaction.h>
34    #if GTKMM_MAJOR_VERSION < 3
35  #include "wrapLabel.hh"  #include "wrapLabel.hh"
   
 #include "global.h"  
   
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
 #define ABOUT_DIALOG  
 #include <gtkmm/aboutdialog.h>  
36  #endif  #endif
37    
38  #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION < 6) || GLIBMM_MAJOR_VERSION < 2  #include "global.h"
39  namespace Glib {  #include "compat.h"
 Glib::ustring filename_display_basename(const std::string& filename)  
 {  
     gchar* gstr = g_path_get_basename(filename.c_str());  
     Glib::ustring str(gstr);  
     g_free(gstr);  
     return Glib::filename_to_utf8(str);  
 }  
 }  
 #endif  
40    
41  #include <stdio.h>  #include <stdio.h>
42  #include <sndfile.h>  #include <sndfile.h>
# Line 55  Glib::ustring filename_display_basename( Line 46  Glib::ustring filename_display_basename(
46  #include "../../gfx/status_attached.xpm"  #include "../../gfx/status_attached.xpm"
47  #include "../../gfx/status_detached.xpm"  #include "../../gfx/status_detached.xpm"
48    
 template<class T> inline std::string ToString(T o) {  
     std::stringstream ss;  
     ss << o;  
     return ss.str();  
 }  
   
 Table::Table(int x, int y) : Gtk::Table(x, y), rowno(0) {  }  
   
 void Table::add(BoolEntry& boolentry)  
 {  
     attach(boolentry.widget, 0, 2, rowno, rowno + 1,  
            Gtk::FILL, Gtk::SHRINK);  
     rowno++;  
 }  
   
 void Table::add(BoolEntryPlus6& boolentry)  
 {  
     attach(boolentry.widget, 0, 2, rowno, rowno + 1,  
            Gtk::FILL, Gtk::SHRINK);  
     rowno++;  
 }  
   
 void Table::add(LabelWidget& prop)  
 {  
     attach(prop.label, 1, 2, rowno, rowno + 1,  
            Gtk::FILL, Gtk::SHRINK);  
     attach(prop.widget, 2, 3, rowno, rowno + 1,  
            Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);  
     rowno++;  
 }  
49    
50  MainWindow::MainWindow() :  MainWindow::MainWindow() :
51      dimreg_label(_("Changes apply to:")),      dimreg_label(_("Changes apply to:")),
# Line 99  MainWindow::MainWindow() : Line 60  MainWindow::MainWindow() :
60      add(m_VBox);      add(m_VBox);
61    
62      // Handle selection      // Handle selection
63      Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();      m_TreeView.get_selection()->signal_changed().connect(
     tree_sel_ref->signal_changed().connect(  
64          sigc::mem_fun(*this, &MainWindow::on_sel_change));          sigc::mem_fun(*this, &MainWindow::on_sel_change));
65    
66      // m_TreeView.set_reorderable();      // m_TreeView.set_reorderable();
# Line 168  MainWindow::MainWindow() : Line 128  MainWindow::MainWindow() :
128                           *this, &MainWindow::on_action_quit));                           *this, &MainWindow::on_action_quit));
129      actionGroup->add(Gtk::Action::create("MenuInstrument", _("_Instrument")));      actionGroup->add(Gtk::Action::create("MenuInstrument", _("_Instrument")));
130    
131      actionGroup->add(Gtk::Action::create("MenuView", _("_View")));  
132        actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));
133    
134      Glib::RefPtr<Gtk::ToggleAction> toggle_action =      Glib::RefPtr<Gtk::ToggleAction> toggle_action =
135            Gtk::ToggleAction::create("CopySampleUnity", _("Copy Sample's _Unity Note"), "ffaga");
136        toggle_action->set_active(true);
137        //FIXME: doesn't work, why?
138        toggle_action->set_tooltip(_("Used when dragging a sample to a region's sample reference field."));
139        actionGroup->add(toggle_action);
140    
141        toggle_action =
142            Gtk::ToggleAction::create("CopySampleTune", _("Copy Sample's _Fine Tune"));
143        toggle_action->set_active(true);
144        //FIXME: doesn't work, why?
145        toggle_action->set_tooltip(_("Used when dragging a sample to a region's sample reference field."));
146        actionGroup->add(toggle_action);
147    
148        toggle_action =
149            Gtk::ToggleAction::create("CopySampleLoop", _("Copy Sample's _Loop Points"));
150        toggle_action->set_active(true);
151        //FIXME: doesn't work, why?
152        toggle_action->set_tooltip(_("Used when dragging a sample to a region's sample reference field."));
153        actionGroup->add(toggle_action);
154    
155    
156        actionGroup->add(Gtk::Action::create("MenuView", _("_View")));
157        toggle_action =
158          Gtk::ToggleAction::create("Statusbar", _("_Statusbar"));          Gtk::ToggleAction::create("Statusbar", _("_Statusbar"));
159      toggle_action->set_active(true);      toggle_action->set_active(true);
160      actionGroup->add(toggle_action,      actionGroup->add(toggle_action,
# Line 179  MainWindow::MainWindow() : Line 164  MainWindow::MainWindow() :
164      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);
165      actionGroup->add(Gtk::Action::create("MenuHelp",      actionGroup->add(Gtk::Action::create("MenuHelp",
166                                           action->property_label()));                                           action->property_label()));
 #ifdef ABOUT_DIALOG  
167      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),
168                       sigc::mem_fun(                       sigc::mem_fun(
169                           *this, &MainWindow::on_action_help_about));                           *this, &MainWindow::on_action_help_about));
 #endif  
170      actionGroup->add(      actionGroup->add(
171          Gtk::Action::create("AddInstrument", _("Add _Instrument")),          Gtk::Action::create("AddInstrument", _("Add _Instrument")),
172          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)
173      );      );
174      actionGroup->add(      actionGroup->add(
175            Gtk::Action::create("DupInstrument", _("_Duplicate Instrument")),
176            sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
177        );
178        actionGroup->add(
179          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),
180          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
181      );      );
# Line 234  MainWindow::MainWindow() : Line 221  MainWindow::MainWindow() :
221          "      <separator/>"          "      <separator/>"
222          "      <menuitem action='Quit'/>"          "      <menuitem action='Quit'/>"
223          "    </menu>"          "    </menu>"
224            "    <menu action='MenuEdit'>"
225            "      <menuitem action='CopySampleUnity'/>"
226            "      <menuitem action='CopySampleTune'/>"
227            "      <menuitem action='CopySampleLoop'/>"
228            "    </menu>"
229          "    <menu action='MenuInstrument'>"          "    <menu action='MenuInstrument'>"
230          "    </menu>"          "    </menu>"
231          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
232          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
233          "    </menu>"          "    </menu>"
 #ifdef ABOUT_DIALOG  
234          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
235          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
236          "    </menu>"          "    </menu>"
 #endif  
237          "  </menubar>"          "  </menubar>"
238          "  <popup name='PopupMenu'>"          "  <popup name='PopupMenu'>"
239          "    <menuitem action='InstrProperties'/>"          "    <menuitem action='InstrProperties'/>"
240          "    <menuitem action='AddInstrument'/>"          "    <menuitem action='AddInstrument'/>"
241            "    <menuitem action='DupInstrument'/>"
242          "    <separator/>"          "    <separator/>"
243          "    <menuitem action='RemoveInstrument'/>"          "    <menuitem action='RemoveInstrument'/>"
244          "  </popup>"          "  </popup>"
# Line 255  MainWindow::MainWindow() : Line 246  MainWindow::MainWindow() :
246          "    <menuitem action='SampleProperties'/>"          "    <menuitem action='SampleProperties'/>"
247          "    <menuitem action='AddGroup'/>"          "    <menuitem action='AddGroup'/>"
248          "    <menuitem action='AddSample'/>"          "    <menuitem action='AddSample'/>"
249          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"
250          "    <separator/>"          "    <separator/>"
251          "    <menuitem action='RemoveSample'/>"          "    <menuitem action='RemoveSample'/>"
252          "  </popup>"          "  </popup>"
# Line 264  MainWindow::MainWindow() : Line 255  MainWindow::MainWindow() :
255    
256      popup_menu = dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/PopupMenu"));      popup_menu = dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/PopupMenu"));
257    
258        instrument_menu = static_cast<Gtk::MenuItem*>(
259            uiManager->get_widget("/MenuBar/MenuInstrument"))->get_submenu();
260    
261      Gtk::Widget* menuBar = uiManager->get_widget("/MenuBar");      Gtk::Widget* menuBar = uiManager->get_widget("/MenuBar");
262      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);
263      m_VBox.pack_start(m_HPaned);      m_VBox.pack_start(m_HPaned);
# Line 272  MainWindow::MainWindow() : Line 266  MainWindow::MainWindow() :
266      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);
267      m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);
268    
269        set_file_is_shared(false);
270    
271      // Status Bar:      // Status Bar:
272      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);
273      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);
# Line 286  MainWindow::MainWindow() : Line 282  MainWindow::MainWindow() :
282      // Create the Tree model:      // Create the Tree model:
283      m_refTreeModel = Gtk::ListStore::create(m_Columns);      m_refTreeModel = Gtk::ListStore::create(m_Columns);
284      m_TreeView.set_model(m_refTreeModel);      m_TreeView.set_model(m_refTreeModel);
285      m_refTreeModel->signal_row_changed().connect(      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
286          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
287      );      );
288    
# Line 308  MainWindow::MainWindow() : Line 304  MainWindow::MainWindow() :
304      );      );
305    
306      // establish drag&drop between samples tree view and dimension region 'Sample' text entry      // establish drag&drop between samples tree view and dimension region 'Sample' text entry
307      std::list<Gtk::TargetEntry> drag_target_gig_sample;      std::vector<Gtk::TargetEntry> drag_target_gig_sample;
308      drag_target_gig_sample.push_back( Gtk::TargetEntry("gig::Sample") );      drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample"));
309      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);
310      m_TreeViewSamples.signal_drag_begin().connect(      m_TreeViewSamples.signal_drag_begin().connect(
311          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)
# Line 327  MainWindow::MainWindow() : Line 323  MainWindow::MainWindow() :
323          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
324      m_DimRegionChooser.signal_region_changed().connect(      m_DimRegionChooser.signal_region_changed().connect(
325          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
326      instrumentProps.signal_instrument_changed().connect(      instrumentProps.signal_changed().connect(
327          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
328      propDialog.signal_info_changed().connect(      propDialog.signal_changed().connect(
329          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
330    
331      dimreg_edit.signal_dimreg_to_be_changed().connect(      dimreg_edit.signal_dimreg_to_be_changed().connect(
# Line 374  MainWindow::MainWindow() : Line 370  MainWindow::MainWindow() :
370    
371      file = 0;      file = 0;
372      file_is_changed = false;      file_is_changed = false;
     set_file_is_shared(false);  
373    
374      show_all_children();      show_all_children();
375    
# Line 405  void MainWindow::region_changed() Line 400  void MainWindow::region_changed()
400  gig::Instrument* MainWindow::get_instrument()  gig::Instrument* MainWindow::get_instrument()
401  {  {
402      gig::Instrument* instrument = 0;      gig::Instrument* instrument = 0;
403      Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();      Gtk::TreeModel::const_iterator it =
404            m_TreeView.get_selection()->get_selected();
     Gtk::TreeModel::iterator it = tree_sel_ref->get_selected();  
405      if (it) {      if (it) {
406          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
407          instrument = row[m_Columns.m_col_instr];          instrument = row[m_Columns.m_col_instr];
# Line 466  void MainWindow::dimreg_changed() Line 460  void MainWindow::dimreg_changed()
460    
461  void MainWindow::on_sel_change()  void MainWindow::on_sel_change()
462  {  {
463        // select item in instrument menu
464        Gtk::TreeModel::iterator it = m_TreeView.get_selection()->get_selected();
465        if (it) {
466            Gtk::TreePath path(it);
467            int index = path[0];
468            const std::vector<Gtk::Widget*> children =
469                instrument_menu->get_children();
470            static_cast<Gtk::RadioMenuItem*>(children[index])->set_active();
471        }
472    
473      m_RegionChooser.set_instrument(get_instrument());      m_RegionChooser.set_instrument(get_instrument());
474  }  }
475    
# Line 478  void loader_progress_callback(gig::progr Line 482  void loader_progress_callback(gig::progr
482  void Loader::progress_callback(float fraction)  void Loader::progress_callback(float fraction)
483  {  {
484      {      {
485          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
486          progress = fraction;          progress = fraction;
487      }      }
488      progress_dispatcher();      progress_dispatcher();
# Line 486  void Loader::progress_callback(float fra Line 490  void Loader::progress_callback(float fra
490    
491  void Loader::thread_function()  void Loader::thread_function()
492  {  {
493      printf("thread_function self=%x\n", Glib::Thread::self());      printf("thread_function self=%x\n", Glib::Threads::Thread::self());
494      printf("Start %s\n", filename);      printf("Start %s\n", filename);
495      RIFF::File* riff = new RIFF::File(filename);      RIFF::File* riff = new RIFF::File(filename);
496      gig = new gig::File(riff);      gig = new gig::File(riff);
# Line 500  void Loader::thread_function() Line 504  void Loader::thread_function()
504  }  }
505    
506  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
507      : thread(0), filename(filename)      : filename(filename), thread(0)
508  {  {
509  }  }
510    
511  void Loader::launch()  void Loader::launch()
512  {  {
513    #ifdef OLD_THREADS
514      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);
515    #else
516        thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
517    #endif
518      printf("launch thread=%x\n", thread);      printf("launch thread=%x\n", thread);
519  }  }
520    
# Line 514  float Loader::get_progress() Line 522  float Loader::get_progress()
522  {  {
523      float res;      float res;
524      {      {
525          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
526          res = progress;          res = progress;
527      }      }
528      return res;      return res;
# Line 540  LoadDialog::LoadDialog(const Glib::ustri Line 548  LoadDialog::LoadDialog(const Glib::ustri
548  // Clear all GUI elements / controls. This method is typically called  // Clear all GUI elements / controls. This method is typically called
549  // before a new .gig file is to be created or to be loaded.  // before a new .gig file is to be created or to be loaded.
550  void MainWindow::__clear() {  void MainWindow::__clear() {
     // remove all entries from "Instrument" menu  
     Gtk::MenuItem* instrument_menu =  
         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));  
     instrument_menu->hide();  
     for (int i = 0; i < instrument_menu->get_submenu()->items().size(); i++) {  
         delete &instrument_menu->get_submenu()->items()[i];  
     }  
     instrument_menu->get_submenu()->items().clear();  
551      // forget all samples that ought to be imported      // forget all samples that ought to be imported
552      m_SampleImportQueue.clear();      m_SampleImportQueue.clear();
553      // clear the samples and instruments tree views      // clear the samples and instruments tree views
554      m_refTreeModel->clear();      m_refTreeModel->clear();
555      m_refSamplesTreeModel->clear();      m_refSamplesTreeModel->clear();
556        // remove all entries from "Instrument" menu
557        while (!instrument_menu->get_children().empty()) {
558            remove_instrument_from_menu(0);
559        }
560      // free libgig's gig::File instance      // free libgig's gig::File instance
561      if (file && !file_is_shared) delete file;      if (file && !file_is_shared) delete file;
562      file = NULL;      file = NULL;
# Line 571  void MainWindow::on_action_file_new() Line 575  void MainWindow::on_action_file_new()
575      gig::File* pFile = new gig::File;      gig::File* pFile = new gig::File;
576      // already add one new instrument by default      // already add one new instrument by default
577      gig::Instrument* pInstrument = pFile->AddInstrument();      gig::Instrument* pInstrument = pFile->AddInstrument();
578      pInstrument->pInfo->Name = _("Unnamed Instrument");      pInstrument->pInfo->Name = gig_from_utf8(_("Unnamed Instrument"));
579      // update GUI with that new gig::File      // update GUI with that new gig::File
580      load_gig(pFile, 0 /*no file name yet*/);      load_gig(pFile, 0 /*no file name yet*/);
581  }  }
# Line 582  bool MainWindow::close_confirmation_dial Line 586  bool MainWindow::close_confirmation_dial
586                                   Glib::filename_display_basename(filename).c_str());                                   Glib::filename_display_basename(filename).c_str());
587      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
588      g_free(msg);      g_free(msg);
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
589      dialog.set_secondary_text(_("If you close without saving, your changes will be lost."));      dialog.set_secondary_text(_("If you close without saving, your changes will be lost."));
 #endif  
590      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);
591      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
592      dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES);      dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES);
# Line 598  bool MainWindow::close_confirmation_dial Line 600  bool MainWindow::close_confirmation_dial
600  bool MainWindow::leaving_shared_mode_dialog() {  bool MainWindow::leaving_shared_mode_dialog() {
601      Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");      Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");
602      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
603      dialog.set_secondary_text(      dialog.set_secondary_text(
604          _("If you proceed to work on another instrument file, it won't be "          _("If you proceed to work on another instrument file, it won't be "
605            "used by the sampler until you tell the sampler explicitly to "            "used by the sampler until you tell the sampler explicitly to "
606            "load it.")            "load it."));
    );  
 #endif  
607      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
608      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
609      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
# Line 623  void MainWindow::on_action_file_open() Line 622  void MainWindow::on_action_file_open()
622      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
623      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
624      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
625    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
626      Gtk::FileFilter filter;      Gtk::FileFilter filter;
627      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
628    #else
629        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
630        filter->add_pattern("*.gig");
631    #endif
632      dialog.set_filter(filter);      dialog.set_filter(filter);
633      if (current_gig_dir != "") {      if (current_gig_dir != "") {
634          dialog.set_current_folder(current_gig_dir);          dialog.set_current_folder(current_gig_dir);
# Line 632  void MainWindow::on_action_file_open() Line 636  void MainWindow::on_action_file_open()
636      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
637          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
638          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
639          printf("on_action_file_open self=%x\n", Glib::Thread::self());          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());
640          load_file(filename.c_str());          load_file(filename.c_str());
641          current_gig_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
642      }      }
# Line 674  void MainWindow::on_loader_progress() Line 678  void MainWindow::on_loader_progress()
678  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
679  {  {
680      printf("Loader finished!\n");      printf("Loader finished!\n");
681      printf("on_loader_finished self=%x\n", Glib::Thread::self());      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());
682      load_gig(loader->gig, loader->filename);      load_gig(loader->gig, loader->filename);
683      load_dialog->hide();      load_dialog->hide();
684  }  }
# Line 746  bool MainWindow::file_save_as() Line 750  bool MainWindow::file_save_as()
750      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
751      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);
752      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
   
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 8) || GTKMM_MAJOR_VERSION > 2  
753      dialog.set_do_overwrite_confirmation();      dialog.set_do_overwrite_confirmation();
754      // TODO: an overwrite dialog for gtkmm < 2.8  
755  #endif  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
756      Gtk::FileFilter filter;      Gtk::FileFilter filter;
757      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
758    #else
759        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
760        filter->add_pattern("*.gig");
761    #endif
762      dialog.set_filter(filter);      dialog.set_filter(filter);
763    
764      // set initial dir and filename of the Save As dialog      // set initial dir and filename of the Save As dialog
# Line 775  bool MainWindow::file_save_as() Line 781  bool MainWindow::file_save_as()
781      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
782      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
783      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
784    #if GTKMM_MAJOR_VERSION < 3
785      view::WrapLabel description;      view::WrapLabel description;
786    #else
787        Gtk::Label description;
788        description.set_line_wrap();
789    #endif
790      description.set_markup(      description.set_markup(
791          _("\n<b>CAUTION:</b> You <b>MUST</b> use the "          _("\n<b>CAUTION:</b> You <b>MUST</b> use the "
792            "<span style=\"italic\">\"Save\"</span> dialog instead of "            "<span style=\"italic\">\"Save\"</span> dialog instead of "
# Line 827  void MainWindow::__import_queued_samples Line 838  void MainWindow::__import_queued_samples
838          SF_INFO info;          SF_INFO info;
839          info.format = 0;          info.format = 0;
840          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);
841            sf_command(hFile, SFC_SET_SCALE_FLOAT_INT_READ, 0, SF_TRUE);
842          try {          try {
843              if (!hFile) throw std::string(_("could not open file"));              if (!hFile) throw std::string(_("could not open file"));
844              // determine sample's bit depth              // determine sample's bit depth
# Line 896  void MainWindow::__import_queued_samples Line 908  void MainWindow::__import_queued_samples
908              m_SampleImportQueue.erase(cur);              m_SampleImportQueue.erase(cur);
909          } catch (std::string what) {          } catch (std::string what) {
910              // remember the files that made trouble (and their cause)              // remember the files that made trouble (and their cause)
911              if (error_files.size()) error_files += "\n";              if (!error_files.empty()) error_files += "\n";
912              error_files += (*iter).sample_path += " (" + what + ")";              error_files += (*iter).sample_path += " (" + what + ")";
913              ++iter;              ++iter;
914          }          }
915      }      }
916      // show error message box when some sample(s) could not be imported      // show error message box when some sample(s) could not be imported
917      if (error_files.size()) {      if (!error_files.empty()) {
918          Glib::ustring txt = _("Could not import the following sample(s):\n") + error_files;          Glib::ustring txt = _("Could not import the following sample(s):\n") + error_files;
919          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
920          msg.run();          msg.run();
# Line 917  void MainWindow::on_action_file_properti Line 929  void MainWindow::on_action_file_properti
929    
930  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
931  {  {
 #ifdef ABOUT_DIALOG  
932      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
933  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2
934      dialog.set_program_name("Gigedit");      dialog.set_program_name("Gigedit");
# Line 925  void MainWindow::on_action_help_about() Line 936  void MainWindow::on_action_help_about()
936      dialog.set_name("Gigedit");      dialog.set_name("Gigedit");
937  #endif  #endif
938      dialog.set_version(VERSION);      dialog.set_version(VERSION);
939      dialog.set_copyright("Copyright (C) 2006-2009 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2013 Andreas Persson");
940      dialog.set_comments(_(      dialog.set_comments(_(
941          "Released under the GNU General Public License.\n"          "Released under the GNU General Public License.\n"
942          "\n"          "\n"
# Line 938  void MainWindow::on_action_help_about() Line 949  void MainWindow::on_action_help_about()
949      dialog.set_website("http://www.linuxsampler.org");      dialog.set_website("http://www.linuxsampler.org");
950      dialog.set_website_label("http://www.linuxsampler.org");      dialog.set_website_label("http://www.linuxsampler.org");
951      dialog.run();      dialog.run();
 #endif  
952  }  }
953    
954  PropDialog::PropDialog()  PropDialog::PropDialog()
955      : table(2,1),      : eName(_("Name")),
       eName(_("Name")),  
956        eCreationDate(_("Creation date")),        eCreationDate(_("Creation date")),
957        eComments(_("Comments")),        eComments(_("Comments")),
958        eProduct(_("Product")),        eProduct(_("Product")),
# Line 960  PropDialog::PropDialog() Line 969  PropDialog::PropDialog()
969        eCommissioned(_("Commissioned")),        eCommissioned(_("Commissioned")),
970        eSubject(_("Subject")),        eSubject(_("Subject")),
971        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
972        update_model(0)        table(2, 1)
973  {  {
974      set_title(_("File Properties"));      set_title(_("File Properties"));
975      eName.set_width_chars(50);      eName.set_width_chars(50);
# Line 1008  PropDialog::PropDialog() Line 1017  PropDialog::PropDialog()
1017      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
1018      buttonBox.show();      buttonBox.show();
1019      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1020      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1021      quitButton.grab_focus();      quitButton.grab_focus();
1022      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
1023          sigc::mem_fun(*this, &PropDialog::hide));          sigc::mem_fun(*this, &PropDialog::hide));
# Line 1020  PropDialog::PropDialog() Line 1029  PropDialog::PropDialog()
1029    
1030  void PropDialog::set_info(DLS::Info* info)  void PropDialog::set_info(DLS::Info* info)
1031  {  {
1032      this->info = info;      update(info);
     update_model++;  
     eName.set_value(info->Name);  
     eCreationDate.set_value(info->CreationDate);  
     eComments.set_value(info->Comments);  
     eProduct.set_value(info->Product);  
     eCopyright.set_value(info->Copyright);  
     eArtists.set_value(info->Artists);  
     eGenre.set_value(info->Genre);  
     eKeywords.set_value(info->Keywords);  
     eEngineer.set_value(info->Engineer);  
     eTechnician.set_value(info->Technician);  
     eSoftware.set_value(info->Software);  
     eMedium.set_value(info->Medium);  
     eSource.set_value(info->Source);  
     eSourceForm.set_value(info->SourceForm);  
     eCommissioned.set_value(info->Commissioned);  
     eSubject.set_value(info->Subject);  
     update_model--;  
1033  }  }
1034    
 sigc::signal<void>& PropDialog::signal_info_changed()  
 {  
     return info_changed;  
 }  
1035    
1036  void InstrumentProps::set_IsDrum(bool value)  void InstrumentProps::set_Name(const gig::String& name)
1037  {  {
1038      instrument->IsDrum = value;      m->pInfo->Name = name;
1039  }  }
1040    
1041  void InstrumentProps::set_MIDIBank(uint16_t value)  void InstrumentProps::update_name()
1042  {  {
1043      instrument->MIDIBank = value;      update_model++;
1044        eName.set_value(m->pInfo->Name);
1045        update_model--;
1046  }  }
1047    
1048  void InstrumentProps::set_MIDIProgram(uint32_t value)  void InstrumentProps::set_IsDrum(bool value)
1049  {  {
1050      instrument->MIDIProgram = value;      m->IsDrum = value;
1051  }  }
1052    
1053  void InstrumentProps::set_DimensionKeyRange_low(uint8_t value)  void InstrumentProps::set_MIDIBank(uint16_t value)
1054  {  {
1055      instrument->DimensionKeyRange.low = value;      m->MIDIBank = value;
     if (value > instrument->DimensionKeyRange.high) {  
         eDimensionKeyRangeHigh.set_value(value);  
     }  
1056  }  }
1057    
1058  void InstrumentProps::set_DimensionKeyRange_high(uint8_t value)  void InstrumentProps::set_MIDIProgram(uint32_t value)
1059  {  {
1060      instrument->DimensionKeyRange.high = value;      m->MIDIProgram = value;
     if (value < instrument->DimensionKeyRange.low) {  
         eDimensionKeyRangeLow.set_value(value);  
     }  
1061  }  }
1062    
1063  InstrumentProps::InstrumentProps()  InstrumentProps::InstrumentProps() :
1064      : table(2,1),      quitButton(Gtk::Stock::CLOSE),
1065        quitButton(Gtk::Stock::CLOSE),      table(2,1),
1066        eName(_("Name")),      eName(_("Name")),
1067        eIsDrum(_("Is drum")),      eIsDrum(_("Is drum")),
1068        eMIDIBank(_("MIDI bank"), 0, 16383),      eMIDIBank(_("MIDI bank"), 0, 16383),
1069        eMIDIProgram(_("MIDI program")),      eMIDIProgram(_("MIDI program")),
1070        eAttenuation(_("Attenuation"), 0, 96, 0, 1),      eAttenuation(_("Attenuation"), 0, 96, 0, 1),
1071        eGainPlus6(_("Gain +6dB"), eAttenuation, -6),      eGainPlus6(_("Gain +6dB"), eAttenuation, -6),
1072        eEffectSend(_("Effect send"), 0, 65535),      eEffectSend(_("Effect send"), 0, 65535),
1073        eFineTune(_("Fine tune"), -8400, 8400),      eFineTune(_("Fine tune"), -8400, 8400),
1074        ePitchbendRange(_("Pitchbend range"), 0, 12),      ePitchbendRange(_("Pitchbend range"), 0, 12),
1075        ePianoReleaseMode(_("Piano release mode")),      ePianoReleaseMode(_("Piano release mode")),
1076        eDimensionKeyRangeLow(_("Keyswitching range low")),      eDimensionKeyRangeLow(_("Keyswitching range low")),
1077        eDimensionKeyRangeHigh(_("Keyswitching range high")),      eDimensionKeyRangeHigh(_("Keyswitching range high"))
       update_model(0)  
1078  {  {
1079      set_title(_("Instrument Properties"));      set_title(_("Instrument Properties"));
1080    
# Line 1105  InstrumentProps::InstrumentProps() Line 1087  InstrumentProps::InstrumentProps()
1087            "\"keyswitching\" dimension")            "\"keyswitching\" dimension")
1088      );      );
1089    
1090        connect(eName, &InstrumentProps::set_Name);
1091      connect(eIsDrum, &InstrumentProps::set_IsDrum);      connect(eIsDrum, &InstrumentProps::set_IsDrum);
1092      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);
1093      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);
# Line 1114  InstrumentProps::InstrumentProps() Line 1097  InstrumentProps::InstrumentProps()
1097      connect(eFineTune, &gig::Instrument::FineTune);      connect(eFineTune, &gig::Instrument::FineTune);
1098      connect(ePitchbendRange, &gig::Instrument::PitchbendRange);      connect(ePitchbendRange, &gig::Instrument::PitchbendRange);
1099      connect(ePianoReleaseMode, &gig::Instrument::PianoReleaseMode);      connect(ePianoReleaseMode, &gig::Instrument::PianoReleaseMode);
1100      connect(eDimensionKeyRangeLow,      connect(eDimensionKeyRangeLow, eDimensionKeyRangeHigh,
1101              &InstrumentProps::set_DimensionKeyRange_low);              &gig::Instrument::DimensionKeyRange);
1102      connect(eDimensionKeyRangeHigh,  
1103              &InstrumentProps::set_DimensionKeyRange_high);      eName.signal_value_changed().connect(sig_name_changed.make_slot());
1104    
1105      table.set_col_spacings(5);      table.set_col_spacings(5);
1106    
# Line 1143  InstrumentProps::InstrumentProps() Line 1126  InstrumentProps::InstrumentProps()
1126      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
1127      buttonBox.show();      buttonBox.show();
1128      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1129      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1130      quitButton.grab_focus();      quitButton.grab_focus();
1131    
1132      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
# Line 1156  InstrumentProps::InstrumentProps() Line 1139  InstrumentProps::InstrumentProps()
1139    
1140  void InstrumentProps::set_instrument(gig::Instrument* instrument)  void InstrumentProps::set_instrument(gig::Instrument* instrument)
1141  {  {
1142      this->instrument = instrument;      update(instrument);
1143    
1144      update_model++;      update_model++;
1145      eName.set_value(instrument->pInfo->Name);      eName.set_value(instrument->pInfo->Name);
1146      eIsDrum.set_value(instrument->IsDrum);      eIsDrum.set_value(instrument->IsDrum);
1147      eMIDIBank.set_value(instrument->MIDIBank);      eMIDIBank.set_value(instrument->MIDIBank);
1148      eMIDIProgram.set_value(instrument->MIDIProgram);      eMIDIProgram.set_value(instrument->MIDIProgram);
     eAttenuation.set_value(instrument->Attenuation);  
     eGainPlus6.set_value(instrument->Attenuation);  
     eEffectSend.set_value(instrument->EffectSend);  
     eFineTune.set_value(instrument->FineTune);  
     ePitchbendRange.set_value(instrument->PitchbendRange);  
     ePianoReleaseMode.set_value(instrument->PianoReleaseMode);  
     eDimensionKeyRangeLow.set_value(instrument->DimensionKeyRange.low);  
     eDimensionKeyRangeHigh.set_value(instrument->DimensionKeyRange.high);  
1149      update_model--;      update_model--;
1150  }  }
1151    
 sigc::signal<void>& InstrumentProps::signal_instrument_changed()  
 {  
     return instrument_changed;  
 }  
1152    
1153  void MainWindow::file_changed()  void MainWindow::file_changed()
1154  {  {
# Line 1199  void MainWindow::load_gig(gig::File* gig Line 1170  void MainWindow::load_gig(gig::File* gig
1170    
1171      propDialog.set_info(gig->pInfo);      propDialog.set_info(gig->pInfo);
1172    
1173      Gtk::MenuItem* instrument_menu =      instrument_name_connection.block();
         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));  
   
     int instrument_index = 0;  
     Gtk::RadioMenuItem::Group instrument_group;  
1174      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;
1175           instrument = gig->GetNextInstrument()) {           instrument = gig->GetNextInstrument()) {
1176            Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
1177    
1178          Gtk::TreeModel::iterator iter = m_refTreeModel->append();          Gtk::TreeModel::iterator iter = m_refTreeModel->append();
1179          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
1180          row[m_Columns.m_col_name] = instrument->pInfo->Name.c_str();          row[m_Columns.m_col_name] = name;
1181          row[m_Columns.m_col_instr] = instrument;          row[m_Columns.m_col_instr] = instrument;
1182          // create a menu item for this instrument  
1183          Gtk::RadioMenuItem* item =          add_instrument_to_menu(name);
             new Gtk::RadioMenuItem(instrument_group, instrument->pInfo->Name.c_str());  
         instrument_menu->get_submenu()->append(*item);  
         item->signal_activate().connect(  
             sigc::bind(  
                 sigc::mem_fun(*this, &MainWindow::on_instrument_selection_change),  
                 instrument_index  
             )  
         );  
         instrument_index++;  
1184      }      }
1185      instrument_menu->show();      instrument_name_connection.unblock();
1186      instrument_menu->get_submenu()->show_all_children();      uiManager->get_widget("/MenuBar/MenuInstrument")->show();
1187    
1188      for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) {      for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) {
1189          if (group->Name != "") {          if (group->Name != "") {
1190              Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();              Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();
1191              Gtk::TreeModel::Row rowGroup = *iterGroup;              Gtk::TreeModel::Row rowGroup = *iterGroup;
1192              rowGroup[m_SamplesModel.m_col_name]   = group->Name.c_str();              rowGroup[m_SamplesModel.m_col_name]   = gig_to_utf8(group->Name);
1193              rowGroup[m_SamplesModel.m_col_group]  = group;              rowGroup[m_SamplesModel.m_col_group]  = group;
1194              rowGroup[m_SamplesModel.m_col_sample] = NULL;              rowGroup[m_SamplesModel.m_col_sample] = NULL;
1195              for (gig::Sample* sample = group->GetFirstSample();              for (gig::Sample* sample = group->GetFirstSample();
# Line 1237  void MainWindow::load_gig(gig::File* gig Line 1197  void MainWindow::load_gig(gig::File* gig
1197                  Gtk::TreeModel::iterator iterSample =                  Gtk::TreeModel::iterator iterSample =
1198                      m_refSamplesTreeModel->append(rowGroup.children());                      m_refSamplesTreeModel->append(rowGroup.children());
1199                  Gtk::TreeModel::Row rowSample = *iterSample;                  Gtk::TreeModel::Row rowSample = *iterSample;
1200                  rowSample[m_SamplesModel.m_col_name]   = sample->pInfo->Name.c_str();                  rowSample[m_SamplesModel.m_col_name] =
1201                        gig_to_utf8(sample->pInfo->Name);
1202                  rowSample[m_SamplesModel.m_col_sample] = sample;                  rowSample[m_SamplesModel.m_col_sample] = sample;
1203                  rowSample[m_SamplesModel.m_col_group]  = NULL;                  rowSample[m_SamplesModel.m_col_group]  = NULL;
1204              }              }
# Line 1247  void MainWindow::load_gig(gig::File* gig Line 1208  void MainWindow::load_gig(gig::File* gig
1208      file = gig;      file = gig;
1209    
1210      // select the first instrument      // select the first instrument
1211      Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();      m_TreeView.get_selection()->select(Gtk::TreePath("0"));
1212      tree_sel_ref->select(Gtk::TreePath("0"));  
1213        instr_props_set_instrument();
1214  }  }
1215    
1216  void MainWindow::show_instr_props()  bool MainWindow::instr_props_set_instrument()
1217  {  {
1218      gig::Instrument* instrument = get_instrument();      instrumentProps.signal_name_changed().clear();
1219      if (instrument)  
1220      {      Gtk::TreeModel::const_iterator it =
1221            m_TreeView.get_selection()->get_selected();
1222        if (it) {
1223            Gtk::TreeModel::Row row = *it;
1224            gig::Instrument* instrument = row[m_Columns.m_col_instr];
1225    
1226          instrumentProps.set_instrument(instrument);          instrumentProps.set_instrument(instrument);
1227    
1228            // make sure instrument tree is updated when user changes the
1229            // instrument name in instrument properties window
1230            instrumentProps.signal_name_changed().connect(
1231                sigc::bind(
1232                    sigc::mem_fun(*this,
1233                                  &MainWindow::instr_name_changed_by_instr_props),
1234                    it));
1235        } else {
1236            instrumentProps.hide();
1237        }
1238        return it;
1239    }
1240    
1241    void MainWindow::show_instr_props()
1242    {
1243        if (instr_props_set_instrument()) {
1244          instrumentProps.show();          instrumentProps.show();
1245          instrumentProps.deiconify();          instrumentProps.deiconify();
1246      }      }
1247  }  }
1248    
1249    void MainWindow::instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it)
1250    {
1251        Gtk::TreeModel::Row row = *it;
1252        Glib::ustring name = row[m_Columns.m_col_name];
1253    
1254        gig::Instrument* instrument = row[m_Columns.m_col_instr];
1255        Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));
1256        if (gigname != name) {
1257            row[m_Columns.m_col_name] = gigname;
1258        }
1259    }
1260    
1261  void MainWindow::on_action_view_status_bar() {  void MainWindow::on_action_view_status_bar() {
1262      Gtk::CheckMenuItem* item =      Gtk::CheckMenuItem* item =
1263          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));
# Line 1273  void MainWindow::on_action_view_status_b Line 1269  void MainWindow::on_action_view_status_b
1269      else                    m_StatusBar.hide();      else                    m_StatusBar.hide();
1270  }  }
1271    
1272    bool MainWindow::is_copy_samples_unity_note_enabled() const {
1273        Gtk::CheckMenuItem* item =
1274            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));
1275        if (!item) {
1276            std::cerr << "/MenuBar/MenuEdit/CopySampleUnity == NULL\n";
1277            return true;
1278        }
1279        return item->get_active();
1280    }
1281    
1282    bool MainWindow::is_copy_samples_fine_tune_enabled() const {
1283        Gtk::CheckMenuItem* item =
1284            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleTune"));
1285        if (!item) {
1286            std::cerr << "/MenuBar/MenuEdit/CopySampleTune == NULL\n";
1287            return true;
1288        }
1289        return item->get_active();
1290    }
1291    
1292    bool MainWindow::is_copy_samples_loop_enabled() const {
1293        Gtk::CheckMenuItem* item =
1294            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleLoop"));
1295        if (!item) {
1296            std::cerr << "/MenuBar/MenuEdit/CopySampleLoop == NULL\n";
1297            return true;
1298        }
1299        return item->get_active();
1300    }
1301    
1302  void MainWindow::on_button_release(GdkEventButton* button)  void MainWindow::on_button_release(GdkEventButton* button)
1303  {  {
1304      if (button->type == GDK_2BUTTON_PRESS) {      if (button->type == GDK_2BUTTON_PRESS) {
# Line 1282  void MainWindow::on_button_release(GdkEv Line 1308  void MainWindow::on_button_release(GdkEv
1308      }      }
1309  }  }
1310    
1311  void MainWindow::on_instrument_selection_change(int index) {  void MainWindow::on_instrument_selection_change(Gtk::RadioMenuItem* item) {
1312      m_RegionChooser.set_instrument(file->GetInstrument(index));      if (item->get_active()) {
1313            const std::vector<Gtk::Widget*> children =
1314                instrument_menu->get_children();
1315            std::vector<Gtk::Widget*>::const_iterator it =
1316                find(children.begin(), children.end(), item);
1317            if (it != children.end()) {
1318                int index = it - children.begin();
1319                m_TreeView.get_selection()->select(Gtk::TreePath(ToString(index)));
1320    
1321                m_RegionChooser.set_instrument(file->GetInstrument(index));
1322            }
1323        }
1324  }  }
1325    
1326  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {
# Line 1313  void MainWindow::on_sample_treeview_butt Line 1350  void MainWindow::on_sample_treeview_butt
1350      }      }
1351  }  }
1352    
1353  void MainWindow::on_action_add_instrument() {  
1354      static int __instrument_indexer = 0;  Gtk::RadioMenuItem* MainWindow::add_instrument_to_menu(
1355      if (!file) return;      const Glib::ustring& name, int position) {
1356      gig::Instrument* instrument = file->AddInstrument();  
1357      __instrument_indexer++;      Gtk::RadioMenuItem::Group instrument_group;
1358      instrument->pInfo->Name =      const std::vector<Gtk::Widget*> children = instrument_menu->get_children();
1359          _("Unnamed Instrument ") + ToString(__instrument_indexer);      if (!children.empty()) {
1360            instrument_group =
1361                static_cast<Gtk::RadioMenuItem*>(children[0])->get_group();
1362        }
1363        Gtk::RadioMenuItem* item =
1364            new Gtk::RadioMenuItem(instrument_group, name);
1365        if (position < 0) {
1366            instrument_menu->append(*item);
1367        } else {
1368            instrument_menu->insert(*item, position);
1369        }
1370        item->show();
1371        item->signal_activate().connect(
1372            sigc::bind(
1373                sigc::mem_fun(*this, &MainWindow::on_instrument_selection_change),
1374                item));
1375        return item;
1376    }
1377    
1378    void MainWindow::remove_instrument_from_menu(int index) {
1379        const std::vector<Gtk::Widget*> children =
1380            instrument_menu->get_children();
1381        Gtk::Widget* child = children[index];
1382        instrument_menu->remove(*child);
1383        delete child;
1384    }
1385    
1386    void MainWindow::add_instrument(gig::Instrument* instrument) {
1387        const Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
1388    
1389      // update instrument tree view      // update instrument tree view
1390        instrument_name_connection.block();
1391      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
1392      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
1393      rowInstr[m_Columns.m_col_name] = instrument->pInfo->Name.c_str();      rowInstr[m_Columns.m_col_name] = name;
1394      rowInstr[m_Columns.m_col_instr] = instrument;      rowInstr[m_Columns.m_col_instr] = instrument;
1395        instrument_name_connection.unblock();
1396    
1397        add_instrument_to_menu(name);
1398    
1399        m_TreeView.get_selection()->select(iterInstr);
1400    
1401      file_changed();      file_changed();
1402  }  }
1403    
1404    void MainWindow::on_action_add_instrument() {
1405        static int __instrument_indexer = 0;
1406        if (!file) return;
1407        gig::Instrument* instrument = file->AddInstrument();
1408        __instrument_indexer++;
1409        instrument->pInfo->Name = gig_from_utf8(_("Unnamed Instrument ") +
1410                                                ToString(__instrument_indexer));
1411    
1412        add_instrument(instrument);
1413    }
1414    
1415    void MainWindow::on_action_duplicate_instrument() {
1416        if (!file) return;
1417    
1418        // retrieve the currently selected instrument
1419        // (being the original instrument to be duplicated)
1420        Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
1421        Gtk::TreeModel::iterator itSelection = sel->get_selected();
1422        if (!itSelection) return;
1423        Gtk::TreeModel::Row row = *itSelection;
1424        gig::Instrument* instrOrig = row[m_Columns.m_col_instr];
1425        if (!instrOrig) return;
1426    
1427        // duplicate the orginal instrument
1428        gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
1429        instrNew->pInfo->Name =
1430            instrOrig->pInfo->Name +
1431            gig_from_utf8(Glib::ustring(" (") + _("Copy") + ")");
1432    
1433        add_instrument(instrNew);
1434    }
1435    
1436  void MainWindow::on_action_remove_instrument() {  void MainWindow::on_action_remove_instrument() {
1437      if (!file) return;      if (!file) return;
1438      if (file_is_shared) {      if (file_is_shared) {
# Line 1347  void MainWindow::on_action_remove_instru Line 1452  void MainWindow::on_action_remove_instru
1452          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
1453          gig::Instrument* instr = row[m_Columns.m_col_instr];          gig::Instrument* instr = row[m_Columns.m_col_instr];
1454          try {          try {
1455                Gtk::TreePath path(it);
1456                int index = path[0];
1457    
1458              // remove instrument from the gig file              // remove instrument from the gig file
1459              if (instr) file->DeleteInstrument(instr);              if (instr) file->DeleteInstrument(instr);
             // remove respective row from instruments tree view  
             m_refTreeModel->erase(it);  
1460              file_changed();              file_changed();
1461    
1462                remove_instrument_from_menu(index);
1463    
1464                // remove row from instruments tree view
1465                m_refTreeModel->erase(it);
1466    
1467    #if GTKMM_MAJOR_VERSION < 3
1468                // select another instrument (in gtk3 this is done
1469                // automatically)
1470                if (!m_refTreeModel->children().empty()) {
1471                    if (index == m_refTreeModel->children().size()) {
1472                        index--;
1473                    }
1474                    m_TreeView.get_selection()->select(
1475                        Gtk::TreePath(ToString(index)));
1476                }
1477    #endif
1478                instr_props_set_instrument();
1479          } catch (RIFF::Exception e) {          } catch (RIFF::Exception e) {
1480              Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
1481              msg.run();              msg.run();
# Line 1371  void MainWindow::on_action_add_group() { Line 1495  void MainWindow::on_action_add_group() {
1495      static int __sample_indexer = 0;      static int __sample_indexer = 0;
1496      if (!file) return;      if (!file) return;
1497      gig::Group* group = file->AddGroup();      gig::Group* group = file->AddGroup();
1498      group->Name = _("Unnamed Group");      group->Name = gig_from_utf8(_("Unnamed Group"));
1499      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);
1500      __sample_indexer++;      __sample_indexer++;
1501      // update sample tree view      // update sample tree view
1502      Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();      Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();
1503      Gtk::TreeModel::Row rowGroup = *iterGroup;      Gtk::TreeModel::Row rowGroup = *iterGroup;
1504      rowGroup[m_SamplesModel.m_col_name] = group->Name.c_str();      rowGroup[m_SamplesModel.m_col_name] = gig_to_utf8(group->Name);
1505      rowGroup[m_SamplesModel.m_col_sample] = NULL;      rowGroup[m_SamplesModel.m_col_sample] = NULL;
1506      rowGroup[m_SamplesModel.m_col_group] = group;      rowGroup[m_SamplesModel.m_col_group] = group;
1507      file_changed();      file_changed();
# Line 1405  void MainWindow::on_action_add_sample() Line 1529  void MainWindow::on_action_add_sample()
1529      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1530      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
1531      dialog.set_select_multiple(true);      dialog.set_select_multiple(true);
1532      Gtk::FileFilter soundfilter; // matches all file types supported by libsndfile  
1533        // matches all file types supported by libsndfile
1534    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1535        Gtk::FileFilter soundfilter;
1536    #else
1537        Glib::RefPtr<Gtk::FileFilter> soundfilter = Gtk::FileFilter::create();
1538    #endif
1539      const char* const supportedFileTypes[] = {      const char* const supportedFileTypes[] = {
1540          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",
1541          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",
# Line 1413  void MainWindow::on_action_add_sample() Line 1543  void MainWindow::on_action_add_sample()
1543          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",
1544          "*.caf", "*.CAF", NULL          "*.caf", "*.CAF", NULL
1545      };      };
1546        const char* soundfiles = _("Sound Files");
1547        const char* allfiles = _("All Files");
1548    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1549      for (int i = 0; supportedFileTypes[i]; i++)      for (int i = 0; supportedFileTypes[i]; i++)
1550          soundfilter.add_pattern(supportedFileTypes[i]);          soundfilter.add_pattern(supportedFileTypes[i]);
1551      soundfilter.set_name(_("Sound Files"));      soundfilter.set_name(soundfiles);
1552      Gtk::FileFilter allpassfilter; // matches every file  
1553        // matches every file
1554        Gtk::FileFilter allpassfilter;
1555      allpassfilter.add_pattern("*.*");      allpassfilter.add_pattern("*.*");
1556      allpassfilter.set_name(_("All Files"));      allpassfilter.set_name(allfiles);
1557    #else
1558        for (int i = 0; supportedFileTypes[i]; i++)
1559            soundfilter->add_pattern(supportedFileTypes[i]);
1560        soundfilter->set_name(soundfiles);
1561    
1562        // matches every file
1563        Glib::RefPtr<Gtk::FileFilter> allpassfilter = Gtk::FileFilter::create();
1564        allpassfilter->add_pattern("*.*");
1565        allpassfilter->set_name(allfiles);
1566    #endif
1567      dialog.add_filter(soundfilter);      dialog.add_filter(soundfilter);
1568      dialog.add_filter(allpassfilter);      dialog.add_filter(allpassfilter);
1569      if (current_sample_dir != "") {      if (current_sample_dir != "") {
# Line 1427  void MainWindow::on_action_add_sample() Line 1572  void MainWindow::on_action_add_sample()
1572      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1573          current_sample_dir = dialog.get_current_folder();          current_sample_dir = dialog.get_current_folder();
1574          Glib::ustring error_files;          Glib::ustring error_files;
1575          Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
1576          for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();          for (std::vector<std::string>::iterator iter = filenames.begin();
1577               iter != filenames.end(); ++iter) {               iter != filenames.end(); ++iter) {
1578              printf("Adding sample %s\n",(*iter).c_str());              printf("Adding sample %s\n",(*iter).c_str());
1579              // use libsndfile to retrieve file informations              // use libsndfile to retrieve file informations
# Line 1465  void MainWindow::on_action_add_sample() Line 1610  void MainWindow::on_action_add_sample()
1610                          break;                          break;
1611                      }                      }
1612                  }                  }
1613                  sample->pInfo->Name = filename;                  sample->pInfo->Name = gig_from_utf8(filename);
1614                  sample->Channels = info.channels;                  sample->Channels = info.channels;
1615                  sample->BitDepth = bitdepth;                  sample->BitDepth = bitdepth;
1616                  sample->FrameSize = bitdepth / 8/*1 byte are 8 bits*/ * info.channels;                  sample->FrameSize = bitdepth / 8/*1 byte are 8 bits*/ * info.channels;
# Line 1479  void MainWindow::on_action_add_sample() Line 1624  void MainWindow::on_action_add_sample()
1624                                 &instrument, sizeof(instrument)) != SF_FALSE)                                 &instrument, sizeof(instrument)) != SF_FALSE)
1625                  {                  {
1626                      sample->MIDIUnityNote = instrument.basenote;                      sample->MIDIUnityNote = instrument.basenote;
1627                        sample->FineTune      = instrument.detune;
1628    
 #if HAVE_SF_INSTRUMENT_LOOPS  
1629                      if (instrument.loop_count && instrument.loops[0].mode != SF_LOOP_NONE) {                      if (instrument.loop_count && instrument.loops[0].mode != SF_LOOP_NONE) {
1630                          sample->Loops = 1;                          sample->Loops = 1;
1631    
# Line 1500  void MainWindow::on_action_add_sample() Line 1645  void MainWindow::on_action_add_sample()
1645                          sample->LoopPlayCount = instrument.loops[0].count;                          sample->LoopPlayCount = instrument.loops[0].count;
1646                          sample->LoopSize = sample->LoopEnd - sample->LoopStart + 1;                          sample->LoopSize = sample->LoopEnd - sample->LoopStart + 1;
1647                      }                      }
 #endif  
1648                  }                  }
1649    
1650                  // schedule resizing the sample (which will be done                  // schedule resizing the sample (which will be done
# Line 1518  void MainWindow::on_action_add_sample() Line 1662  void MainWindow::on_action_add_sample()
1662                  Gtk::TreeModel::iterator iterSample =                  Gtk::TreeModel::iterator iterSample =
1663                      m_refSamplesTreeModel->append(row.children());                      m_refSamplesTreeModel->append(row.children());
1664                  Gtk::TreeModel::Row rowSample = *iterSample;                  Gtk::TreeModel::Row rowSample = *iterSample;
1665                  rowSample[m_SamplesModel.m_col_name]   = filename;                  rowSample[m_SamplesModel.m_col_name] =
1666                        gig_to_utf8(sample->pInfo->Name);
1667                  rowSample[m_SamplesModel.m_col_sample] = sample;                  rowSample[m_SamplesModel.m_col_sample] = sample;
1668                  rowSample[m_SamplesModel.m_col_group]  = NULL;                  rowSample[m_SamplesModel.m_col_group]  = NULL;
1669                  // close sound file                  // close sound file
1670                  sf_close(hFile);                  sf_close(hFile);
1671                  file_changed();                  file_changed();
1672              } catch (std::string what) { // remember the files that made trouble (and their cause)              } catch (std::string what) { // remember the files that made trouble (and their cause)
1673                  if (error_files.size()) error_files += "\n";                  if (!error_files.empty()) error_files += "\n";
1674                  error_files += *iter += " (" + what + ")";                  error_files += *iter += " (" + what + ")";
1675              }              }
1676          }          }
1677          // show error message box when some file(s) could not be opened / added          // show error message box when some file(s) could not be opened / added
1678          if (error_files.size()) {          if (!error_files.empty()) {
1679              Glib::ustring txt = _("Could not add the following sample(s):\n") + error_files;              Glib::ustring txt = _("Could not add the following sample(s):\n") + error_files;
1680              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
1681              msg.run();              msg.run();
# Line 1543  void MainWindow::on_action_replace_all_s Line 1688  void MainWindow::on_action_replace_all_s
1688      if (!file) return;      if (!file) return;
1689      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
1690                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
1691      view::WrapLabel description(      const char* str =
1692          _("This is a very specific function. It tries to replace all samples "          _("This is a very specific function. It tries to replace all samples "
1693            "in the current gig file by samples located in the chosen "            "in the current gig file by samples located in the chosen "
1694            "directory.\n\n"            "directory.\n\n"
# Line 1557  void MainWindow::on_action_replace_all_s Line 1702  void MainWindow::on_action_replace_all_s
1702            "the sample in the gig file accordingly. If you don't need an "            "the sample in the gig file accordingly. If you don't need an "
1703            "extension, blank the field below. Any gig sample where no "            "extension, blank the field below. Any gig sample where no "
1704            "appropriate sample file could be found will be reported and left "            "appropriate sample file could be found will be reported and left "
1705            "untouched.\n")            "untouched.\n");
1706      );  #if GTKMM_MAJOR_VERSION < 3
1707        view::WrapLabel description(str);
1708    #else
1709        Gtk::Label description(str);
1710        description.set_line_wrap();
1711    #endif
1712      Gtk::HBox entryArea;      Gtk::HBox entryArea;
1713      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_RIGHT);      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);
1714      Gtk::Entry postfixEntryBox;      Gtk::Entry postfixEntryBox;
1715      postfixEntryBox.set_text(".wav");      postfixEntryBox.set_text(".wav");
1716      entryArea.pack_start(entryLabel);      entryArea.pack_start(entryLabel);
# Line 1579  void MainWindow::on_action_replace_all_s Line 1729  void MainWindow::on_action_replace_all_s
1729      {      {
1730          current_sample_dir = dialog.get_current_folder();          current_sample_dir = dialog.get_current_folder();
1731          Glib::ustring error_files;          Glib::ustring error_files;
1732          Glib::ustring folder = dialog.get_filename();          std::string folder = dialog.get_filename();
1733          for (gig::Sample* sample = file->GetFirstSample();          for (gig::Sample* sample = file->GetFirstSample();
1734               sample; sample = file->GetNextSample())               sample; sample = file->GetNextSample())
1735          {          {
1736              std::string filename =              std::string filename =
1737                  folder + G_DIR_SEPARATOR_S + sample->pInfo->Name +                  folder + G_DIR_SEPARATOR_S +
1738                  postfixEntryBox.get_text().raw();                  Glib::filename_from_utf8(gig_to_utf8(sample->pInfo->Name) +
1739                                             postfixEntryBox.get_text());
1740              SF_INFO info;              SF_INFO info;
1741              info.format = 0;              info.format = 0;
1742              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);
# Line 1618  void MainWindow::on_action_replace_all_s Line 1769  void MainWindow::on_action_replace_all_s
1769              }              }
1770              catch (std::string what)              catch (std::string what)
1771              {              {
1772                  if (error_files.size()) error_files += "\n";                  if (!error_files.empty()) error_files += "\n";
1773                      error_files += filename += " (" + what + ")";                  error_files += Glib::filename_to_utf8(filename) +
1774                        " (" + what + ")";
1775              }              }
1776          }          }
1777          // show error message box when some file(s) could not be opened / added          // show error message box when some file(s) could not be opened / added
1778          if (error_files.size()) {          if (!error_files.empty()) {
1779              Glib::ustring txt =              Glib::ustring txt =
1780                  _("Could not replace the following sample(s):\n") + error_files;                  _("Could not replace the following sample(s):\n") + error_files;
1781              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
# Line 1644  void MainWindow::on_action_remove_sample Line 1796  void MainWindow::on_action_remove_sample
1796          try {          try {
1797              // remove group or sample from the gig file              // remove group or sample from the gig file
1798              if (group) {              if (group) {
1799                  // temporarily remember the samples that bolong to                  // temporarily remember the samples that belong to
1800                  // that group (we need that to clean the queue)                  // that group (we need that to clean the queue)
1801                  std::list<gig::Sample*> members;                  std::list<gig::Sample*> members;
1802                  for (gig::Sample* pSample = group->GetFirstSample();                  for (gig::Sample* pSample = group->GetFirstSample();
# Line 1770  void MainWindow::on_sample_label_drop_dr Line 1922  void MainWindow::on_sample_label_drop_dr
1922              channels_changed = true;              channels_changed = true;
1923              region_changed();              region_changed();
1924          }          }
1925          dimreg_edit.set_sample(sample);          dimreg_edit.set_sample(
1926                sample,
1927                is_copy_samples_unity_note_enabled(),
1928                is_copy_samples_fine_tune_enabled(),
1929                is_copy_samples_loop_enabled()
1930            );
1931    
1932          if (sample->Channels == 2 && !stereo_dimension) {          if (sample->Channels == 2 && !stereo_dimension) {
1933              // add samplechannel dimension              // add samplechannel dimension
# Line 1813  void MainWindow::sample_name_changed(con Line 1970  void MainWindow::sample_name_changed(con
1970      Glib::ustring name  = row[m_SamplesModel.m_col_name];      Glib::ustring name  = row[m_SamplesModel.m_col_name];
1971      gig::Group* group   = row[m_SamplesModel.m_col_group];      gig::Group* group   = row[m_SamplesModel.m_col_group];
1972      gig::Sample* sample = row[m_SamplesModel.m_col_sample];      gig::Sample* sample = row[m_SamplesModel.m_col_sample];
1973        gig::String gigname(gig_from_utf8(name));
1974      if (group) {      if (group) {
1975          if (group->Name != name) {          if (group->Name != gigname) {
1976              group->Name = name;              group->Name = gigname;
1977              printf("group name changed\n");              printf("group name changed\n");
1978              file_changed();              file_changed();
1979          }          }
1980      } else if (sample) {      } else if (sample) {
1981          if (sample->pInfo->Name != name.raw()) {          if (sample->pInfo->Name != gigname) {
1982              sample->pInfo->Name = name.raw();              sample->pInfo->Name = gigname;
1983              printf("sample name changed\n");              printf("sample name changed\n");
1984              file_changed();              file_changed();
1985          }          }
# Line 1833  void MainWindow::instrument_name_changed Line 1991  void MainWindow::instrument_name_changed
1991      if (!iter) return;      if (!iter) return;
1992      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
1993      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_Columns.m_col_name];
1994    
1995        // change name in instrument menu
1996        int index = path[0];
1997        const std::vector<Gtk::Widget*> children = instrument_menu->get_children();
1998        if (index < children.size()) {
1999    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 16) || GTKMM_MAJOR_VERSION > 2
2000            static_cast<Gtk::RadioMenuItem*>(children[index])->set_label(name);
2001    #else
2002            remove_instrument_from_menu(index);
2003            Gtk::RadioMenuItem* item = add_instrument_to_menu(name, index);
2004            item->set_active();
2005    #endif
2006        }
2007    
2008        // change name in gig
2009      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_Columns.m_col_instr];
2010      if (instrument && instrument->pInfo->Name != name.raw()) {      gig::String gigname(gig_from_utf8(name));
2011          instrument->pInfo->Name = name.raw();      if (instrument && instrument->pInfo->Name != gigname) {
2012            instrument->pInfo->Name = gigname;
2013    
2014            // change name in the instrument properties window
2015            if (instrumentProps.get_instrument() == instrument) {
2016                instrumentProps.update_name();
2017            }
2018    
2019          file_changed();          file_changed();
2020      }      }
2021  }  }
Legend:
Removed from v.1959  
changed lines
  Added in v.2466
  ViewVC Help
Powered by ViewVC