/[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 2445 by persson, Sun Apr 28 06:07:22 2013 UTC revision 2548 by schoenebeck, Tue May 13 12:17:43 2014 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2013 Andreas Persson   * Copyright (C) 2006-2014 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 42  Line 42 
42  #include <sndfile.h>  #include <sndfile.h>
43    
44  #include "mainwindow.h"  #include "mainwindow.h"
45    #include "Settings.h"
46    #include "CombineInstrumentsDialog.h"
47  #include "../../gfx/status_attached.xpm"  #include "../../gfx/status_attached.xpm"
48  #include "../../gfx/status_detached.xpm"  #include "../../gfx/status_detached.xpm"
49    
# Line 89  MainWindow::MainWindow() : Line 90  MainWindow::MainWindow() :
90      dimreg_vbox.pack_start(dimreg_hbox, Gtk::PACK_SHRINK);      dimreg_vbox.pack_start(dimreg_hbox, Gtk::PACK_SHRINK);
91      m_HPaned.add2(dimreg_vbox);      m_HPaned.add2(dimreg_vbox);
92    
93        dimreg_label.set_tooltip_text(_("To automatically apply your changes above globally to the entire instrument, check all 3 check boxes on the right."));
94        dimreg_all_regions.set_tooltip_text(_("If checked: all changes you perform above will automatically be applied to all regions of this instrument as well."));
95        dimreg_all_dimregs.set_tooltip_text(_("If checked: all changes you perform above will automatically be applied as well to all dimension splits of the region selected below."));
96        dimreg_stereo.set_tooltip_text(_("If checked: all changes you perform above will automatically be applied to both audio channel splits (only if a \"stereo\" dimension is defined below)."));
97    
98      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, _("Samples"));      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, _("Samples"));
99      m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments"));      m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments"));
# Line 123  MainWindow::MainWindow() : Line 128  MainWindow::MainWindow() :
128                                           Gtk::Stock::PROPERTIES),                                           Gtk::Stock::PROPERTIES),
129                       sigc::mem_fun(                       sigc::mem_fun(
130                           *this, &MainWindow::show_instr_props));                           *this, &MainWindow::show_instr_props));
131        actionGroup->add(Gtk::Action::create("MidiRules",
132                                             _("_Midi Rules")),
133                         sigc::mem_fun(
134                             *this, &MainWindow::show_midi_rules));
135      actionGroup->add(Gtk::Action::create("Quit", Gtk::Stock::QUIT),      actionGroup->add(Gtk::Action::create("Quit", Gtk::Stock::QUIT),
136                       sigc::mem_fun(                       sigc::mem_fun(
137                           *this, &MainWindow::on_action_quit));                           *this, &MainWindow::on_action_quit));
138      actionGroup->add(Gtk::Action::create("MenuInstrument", _("_Instrument")));      actionGroup->add(Gtk::Action::create("MenuInstrument", _("_Instrument")));
139    
140      actionGroup->add(Gtk::Action::create("MenuView", _("_View")));  
141        actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));
142    
143      Glib::RefPtr<Gtk::ToggleAction> toggle_action =      Glib::RefPtr<Gtk::ToggleAction> toggle_action =
144            Gtk::ToggleAction::create("CopySampleUnity", _("Copy Sample's _Unity Note"));
145        toggle_action->set_active(true);
146        actionGroup->add(toggle_action);
147    
148        toggle_action =
149            Gtk::ToggleAction::create("CopySampleTune", _("Copy Sample's _Fine Tune"));
150        toggle_action->set_active(true);
151        actionGroup->add(toggle_action);
152    
153        toggle_action =
154            Gtk::ToggleAction::create("CopySampleLoop", _("Copy Sample's _Loop Points"));
155        toggle_action->set_active(true);
156        actionGroup->add(toggle_action);
157    
158    
159        actionGroup->add(Gtk::Action::create("MenuView", _("_View")));
160        toggle_action =
161          Gtk::ToggleAction::create("Statusbar", _("_Statusbar"));          Gtk::ToggleAction::create("Statusbar", _("_Statusbar"));
162      toggle_action->set_active(true);      toggle_action->set_active(true);
163      actionGroup->add(toggle_action,      actionGroup->add(toggle_action,
# Line 155  MainWindow::MainWindow() : Line 183  MainWindow::MainWindow() :
183          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
184      );      );
185    
186    
187        actionGroup->add(Gtk::Action::create("MenuSettings", _("_Settings")));
188        
189        toggle_action =
190            Gtk::ToggleAction::create("WarnUserOnExtensions", _("Show warning on format _extensions"));
191        toggle_action->set_active(Settings::singleton()->warnUserOnExtensions);
192        actionGroup->add(
193            toggle_action,
194            sigc::mem_fun(*this, &MainWindow::on_action_warn_user_on_extensions)
195        );
196    
197    
198        actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));
199    
200        actionGroup->add(
201            Gtk::Action::create("CombineInstruments", _("_Combine Instruments...")),
202            sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
203        );
204    
205    
206      // sample right-click popup actions      // sample right-click popup actions
207      actionGroup->add(      actionGroup->add(
208          Gtk::Action::create("SampleProperties", Gtk::Stock::PROPERTIES),          Gtk::Action::create("SampleProperties", Gtk::Stock::PROPERTIES),
# Line 196  MainWindow::MainWindow() : Line 244  MainWindow::MainWindow() :
244          "      <separator/>"          "      <separator/>"
245          "      <menuitem action='Quit'/>"          "      <menuitem action='Quit'/>"
246          "    </menu>"          "    </menu>"
247            "    <menu action='MenuEdit'>"
248            "      <menuitem action='CopySampleUnity'/>"
249            "      <menuitem action='CopySampleTune'/>"
250            "      <menuitem action='CopySampleLoop'/>"
251            "    </menu>"
252          "    <menu action='MenuInstrument'>"          "    <menu action='MenuInstrument'>"
253          "    </menu>"          "    </menu>"
254          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
255          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
256          "    </menu>"          "    </menu>"
257            "    <menu action='MenuTools'>"
258            "      <menuitem action='CombineInstruments'/>"
259            "    </menu>"
260            "    <menu action='MenuSettings'>"
261            "      <menuitem action='WarnUserOnExtensions'/>"
262            "    </menu>"
263          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
264          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
265          "    </menu>"          "    </menu>"
266          "  </menubar>"          "  </menubar>"
267          "  <popup name='PopupMenu'>"          "  <popup name='PopupMenu'>"
268          "    <menuitem action='InstrProperties'/>"          "    <menuitem action='InstrProperties'/>"
269            "    <menuitem action='MidiRules'/>"
270          "    <menuitem action='AddInstrument'/>"          "    <menuitem action='AddInstrument'/>"
271          "    <menuitem action='DupInstrument'/>"          "    <menuitem action='DupInstrument'/>"
272          "    <separator/>"          "    <separator/>"
# Line 224  MainWindow::MainWindow() : Line 284  MainWindow::MainWindow() :
284      uiManager->add_ui_from_string(ui_info);      uiManager->add_ui_from_string(ui_info);
285    
286      popup_menu = dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/PopupMenu"));      popup_menu = dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/PopupMenu"));
287        
288        // Set tooltips for menu items (for some reason, setting a tooltip on the
289        // respective Gtk::Action objects above will simply be ignored, no matter
290        // if using Gtk::Action::set_tooltip() or passing the tooltip string on
291        // Gtk::Action::create()).
292        {
293            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
294                uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));
295            item->set_tooltip_text(_("Used when dragging a sample to a region's sample reference field. You may disable this for example if you want to replace an existing sample in a region with a new sample, but don't want that the region's current unity note setting will be altered by this action."));
296        }
297        {
298            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
299                uiManager->get_widget("/MenuBar/MenuEdit/CopySampleTune"));
300            item->set_tooltip_text(_("Used when dragging a sample to a region's sample reference field. You may disable this for example if you want to replace an existing sample in a region with a new sample, but don't want that the region's current sample playback tuning will be altered by this action."));
301        }
302        {
303            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
304                uiManager->get_widget("/MenuBar/MenuEdit/CopySampleLoop"));
305            item->set_tooltip_text(_("Used when dragging a sample to a region's sample reference field. You may disable this for example if you want to replace an existing sample in a region with a new sample, but don't want that the region's current loop informations to be altered by this action."));
306        }
307        {
308            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
309                uiManager->get_widget("/MenuBar/MenuSettings/WarnUserOnExtensions"));
310            item->set_tooltip_text(_("If checked, a warning will be shown whenever you try to use a feature which is based on a LinuxSampler extension ontop of the original gig format, which would not work with the Gigasampler/GigaStudio application."));
311        }
312    
313      instrument_menu = static_cast<Gtk::MenuItem*>(      instrument_menu = static_cast<Gtk::MenuItem*>(
314          uiManager->get_widget("/MenuBar/MenuInstrument"))->get_submenu();          uiManager->get_widget("/MenuBar/MenuInstrument"))->get_submenu();
# Line 252  MainWindow::MainWindow() : Line 337  MainWindow::MainWindow() :
337      // Create the Tree model:      // Create the Tree model:
338      m_refTreeModel = Gtk::ListStore::create(m_Columns);      m_refTreeModel = Gtk::ListStore::create(m_Columns);
339      m_TreeView.set_model(m_refTreeModel);      m_TreeView.set_model(m_refTreeModel);
340        m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules."));
341      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
342          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
343      );      );
# Line 263  MainWindow::MainWindow() : Line 349  MainWindow::MainWindow() :
349      // create samples treeview (including its data model)      // create samples treeview (including its data model)
350      m_refSamplesTreeModel = SamplesTreeStore::create(m_SamplesModel);      m_refSamplesTreeModel = SamplesTreeStore::create(m_SamplesModel);
351      m_TreeViewSamples.set_model(m_refSamplesTreeModel);      m_TreeViewSamples.set_model(m_refSamplesTreeModel);
352        m_TreeViewSamples.set_tooltip_text(_("To actually use a sample, drag it from this list view to \"Sample\" -> \"Sample:\" on the region's settings pane on the right.\n\nRight click here for more actions on samples."));
353      // m_TreeViewSamples.set_reorderable();      // m_TreeViewSamples.set_reorderable();
354      m_TreeViewSamples.append_column_editable("Samples", m_SamplesModel.m_col_name);      m_TreeViewSamples.append_column_editable("Samples", m_SamplesModel.m_col_name);
355      m_TreeViewSamples.set_headers_visible(false);      m_TreeViewSamples.set_headers_visible(false);
# Line 297  MainWindow::MainWindow() : Line 384  MainWindow::MainWindow() :
384          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
385      propDialog.signal_changed().connect(      propDialog.signal_changed().connect(
386          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
387        midiRules.signal_changed().connect(
388            sigc::mem_fun(*this, &MainWindow::file_changed));
389    
390      dimreg_edit.signal_dimreg_to_be_changed().connect(      dimreg_edit.signal_dimreg_to_be_changed().connect(
391          dimreg_to_be_changed_signal.make_slot());          dimreg_to_be_changed_signal.make_slot());
# Line 545  void MainWindow::on_action_file_new() Line 634  void MainWindow::on_action_file_new()
634      gig::File* pFile = new gig::File;      gig::File* pFile = new gig::File;
635      // already add one new instrument by default      // already add one new instrument by default
636      gig::Instrument* pInstrument = pFile->AddInstrument();      gig::Instrument* pInstrument = pFile->AddInstrument();
637      pInstrument->pInfo->Name = _("Unnamed Instrument");      pInstrument->pInfo->Name = gig_from_utf8(_("Unnamed Instrument"));
638      // update GUI with that new gig::File      // update GUI with that new gig::File
639      load_gig(pFile, 0 /*no file name yet*/);      load_gig(pFile, 0 /*no file name yet*/);
640  }  }
# Line 897  void MainWindow::on_action_file_properti Line 986  void MainWindow::on_action_file_properti
986      propDialog.deiconify();      propDialog.deiconify();
987  }  }
988    
989    void MainWindow::on_action_warn_user_on_extensions() {
990        Settings::singleton()->warnUserOnExtensions =
991            !Settings::singleton()->warnUserOnExtensions;
992    }
993    
994  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
995  {  {
996      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
# Line 906  void MainWindow::on_action_help_about() Line 1000  void MainWindow::on_action_help_about()
1000      dialog.set_name("Gigedit");      dialog.set_name("Gigedit");
1001  #endif  #endif
1002      dialog.set_version(VERSION);      dialog.set_version(VERSION);
1003      dialog.set_copyright("Copyright (C) 2006-2013 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2014 Andreas Persson");
1004      dialog.set_comments(_(      const std::string sComment =
1005          "Released under the GNU General Public License.\n"          _("Built " __DATE__ "\nUsing ") +
1006          "\n"          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +
1007          "Please notice that this is still a very young instrument editor. "          _(
1008          "So better backup your Gigasampler files before editing them with "              "Gigedit is released under the GNU General Public License.\n"
1009          "this application.\n"              "\n"
1010          "\n"              "Please notice that this is still a very young instrument editor. "
1011          "Please report bugs to: http://bugs.linuxsampler.org")              "So better backup your Gigasampler files before editing them with "
1012      );              "this application.\n"
1013                "\n"
1014                "Please report bugs to: http://bugs.linuxsampler.org"
1015            );
1016        dialog.set_comments(sComment.c_str());
1017      dialog.set_website("http://www.linuxsampler.org");      dialog.set_website("http://www.linuxsampler.org");
1018      dialog.set_website_label("http://www.linuxsampler.org");      dialog.set_website_label("http://www.linuxsampler.org");
1019      dialog.run();      dialog.run();
# Line 1143  void MainWindow::load_gig(gig::File* gig Line 1241  void MainWindow::load_gig(gig::File* gig
1241      instrument_name_connection.block();      instrument_name_connection.block();
1242      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;
1243           instrument = gig->GetNextInstrument()) {           instrument = gig->GetNextInstrument()) {
1244          Glib::ustring name(instrument->pInfo->Name);          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
1245    
1246          Gtk::TreeModel::iterator iter = m_refTreeModel->append();          Gtk::TreeModel::iterator iter = m_refTreeModel->append();
1247          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
# Line 1159  void MainWindow::load_gig(gig::File* gig Line 1257  void MainWindow::load_gig(gig::File* gig
1257          if (group->Name != "") {          if (group->Name != "") {
1258              Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();              Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();
1259              Gtk::TreeModel::Row rowGroup = *iterGroup;              Gtk::TreeModel::Row rowGroup = *iterGroup;
1260              rowGroup[m_SamplesModel.m_col_name]   = group->Name.c_str();              rowGroup[m_SamplesModel.m_col_name]   = gig_to_utf8(group->Name);
1261              rowGroup[m_SamplesModel.m_col_group]  = group;              rowGroup[m_SamplesModel.m_col_group]  = group;
1262              rowGroup[m_SamplesModel.m_col_sample] = NULL;              rowGroup[m_SamplesModel.m_col_sample] = NULL;
1263              for (gig::Sample* sample = group->GetFirstSample();              for (gig::Sample* sample = group->GetFirstSample();
# Line 1167  void MainWindow::load_gig(gig::File* gig Line 1265  void MainWindow::load_gig(gig::File* gig
1265                  Gtk::TreeModel::iterator iterSample =                  Gtk::TreeModel::iterator iterSample =
1266                      m_refSamplesTreeModel->append(rowGroup.children());                      m_refSamplesTreeModel->append(rowGroup.children());
1267                  Gtk::TreeModel::Row rowSample = *iterSample;                  Gtk::TreeModel::Row rowSample = *iterSample;
1268                  rowSample[m_SamplesModel.m_col_name]   = sample->pInfo->Name.c_str();                  rowSample[m_SamplesModel.m_col_name] =
1269                        gig_to_utf8(sample->pInfo->Name);
1270                  rowSample[m_SamplesModel.m_col_sample] = sample;                  rowSample[m_SamplesModel.m_col_sample] = sample;
1271                  rowSample[m_SamplesModel.m_col_group]  = NULL;                  rowSample[m_SamplesModel.m_col_group]  = NULL;
1272              }              }
# Line 1180  void MainWindow::load_gig(gig::File* gig Line 1279  void MainWindow::load_gig(gig::File* gig
1279      m_TreeView.get_selection()->select(Gtk::TreePath("0"));      m_TreeView.get_selection()->select(Gtk::TreePath("0"));
1280    
1281      instr_props_set_instrument();      instr_props_set_instrument();
1282        gig::Instrument* instrument = get_instrument();
1283        if (instrument) {
1284            midiRules.set_instrument(instrument);
1285        }
1286  }  }
1287    
1288  bool MainWindow::instr_props_set_instrument()  bool MainWindow::instr_props_set_instrument()
# Line 1221  void MainWindow::instr_name_changed_by_i Line 1324  void MainWindow::instr_name_changed_by_i
1324      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_Columns.m_col_name];
1325    
1326      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_Columns.m_col_instr];
1327      if (instrument->pInfo->Name != name) {      Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));
1328          row[m_Columns.m_col_name] = instrument->pInfo->Name;      if (gigname != name) {
1329            row[m_Columns.m_col_name] = gigname;
1330        }
1331    }
1332    
1333    void MainWindow::show_midi_rules()
1334    {
1335        if (gig::Instrument* instrument = get_instrument())
1336        {
1337            midiRules.set_instrument(instrument);
1338            midiRules.show();
1339            midiRules.deiconify();
1340      }      }
1341  }  }
1342    
# Line 1237  void MainWindow::on_action_view_status_b Line 1351  void MainWindow::on_action_view_status_b
1351      else                    m_StatusBar.hide();      else                    m_StatusBar.hide();
1352  }  }
1353    
1354    bool MainWindow::is_copy_samples_unity_note_enabled() const {
1355        Gtk::CheckMenuItem* item =
1356            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));
1357        if (!item) {
1358            std::cerr << "/MenuBar/MenuEdit/CopySampleUnity == NULL\n";
1359            return true;
1360        }
1361        return item->get_active();
1362    }
1363    
1364    bool MainWindow::is_copy_samples_fine_tune_enabled() const {
1365        Gtk::CheckMenuItem* item =
1366            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleTune"));
1367        if (!item) {
1368            std::cerr << "/MenuBar/MenuEdit/CopySampleTune == NULL\n";
1369            return true;
1370        }
1371        return item->get_active();
1372    }
1373    
1374    bool MainWindow::is_copy_samples_loop_enabled() const {
1375        Gtk::CheckMenuItem* item =
1376            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleLoop"));
1377        if (!item) {
1378            std::cerr << "/MenuBar/MenuEdit/CopySampleLoop == NULL\n";
1379            return true;
1380        }
1381        return item->get_active();
1382    }
1383    
1384  void MainWindow::on_button_release(GdkEventButton* button)  void MainWindow::on_button_release(GdkEventButton* button)
1385  {  {
1386      if (button->type == GDK_2BUTTON_PRESS) {      if (button->type == GDK_2BUTTON_PRESS) {
1387          show_instr_props();          show_instr_props();
1388      } else if (button->type == GDK_BUTTON_PRESS && button->button == 3) {      } else if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
1389            // gig v2 files have no midi rules
1390            static_cast<Gtk::MenuItem*>(
1391                uiManager->get_widget("/PopupMenu/MidiRules"))->set_sensitive(
1392                    !(file->pVersion && file->pVersion->major == 2));
1393          popup_menu->popup(button->button, button->time);          popup_menu->popup(button->button, button->time);
1394      }      }
1395  }  }
# Line 1322  void MainWindow::remove_instrument_from_ Line 1470  void MainWindow::remove_instrument_from_
1470  }  }
1471    
1472  void MainWindow::add_instrument(gig::Instrument* instrument) {  void MainWindow::add_instrument(gig::Instrument* instrument) {
1473      const char* name = instrument->pInfo->Name.c_str();      const Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
1474    
1475      // update instrument tree view      // update instrument tree view
1476      instrument_name_connection.block();      instrument_name_connection.block();
# Line 1344  void MainWindow::on_action_add_instrumen Line 1492  void MainWindow::on_action_add_instrumen
1492      if (!file) return;      if (!file) return;
1493      gig::Instrument* instrument = file->AddInstrument();      gig::Instrument* instrument = file->AddInstrument();
1494      __instrument_indexer++;      __instrument_indexer++;
1495      instrument->pInfo->Name =      instrument->pInfo->Name = gig_from_utf8(_("Unnamed Instrument ") +
1496          _("Unnamed Instrument ") + ToString(__instrument_indexer);                                              ToString(__instrument_indexer));
1497    
1498      add_instrument(instrument);      add_instrument(instrument);
1499  }  }
# Line 1365  void MainWindow::on_action_duplicate_ins Line 1513  void MainWindow::on_action_duplicate_ins
1513      // duplicate the orginal instrument      // duplicate the orginal instrument
1514      gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);      gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
1515      instrNew->pInfo->Name =      instrNew->pInfo->Name =
1516          instrOrig->pInfo->Name + " (" + _("Copy") + ")";          instrOrig->pInfo->Name +
1517            gig_from_utf8(Glib::ustring(" (") + _("Copy") + ")");
1518    
1519      add_instrument(instrNew);      add_instrument(instrNew);
1520  }  }
# Line 1413  void MainWindow::on_action_remove_instru Line 1562  void MainWindow::on_action_remove_instru
1562              }              }
1563  #endif  #endif
1564              instr_props_set_instrument();              instr_props_set_instrument();
1565                instr = get_instrument();
1566                if (instr) {
1567                    midiRules.set_instrument(instr);
1568                } else {
1569                    midiRules.hide();
1570                }
1571          } catch (RIFF::Exception e) {          } catch (RIFF::Exception e) {
1572              Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
1573              msg.run();              msg.run();
# Line 1432  void MainWindow::on_action_add_group() { Line 1587  void MainWindow::on_action_add_group() {
1587      static int __sample_indexer = 0;      static int __sample_indexer = 0;
1588      if (!file) return;      if (!file) return;
1589      gig::Group* group = file->AddGroup();      gig::Group* group = file->AddGroup();
1590      group->Name = _("Unnamed Group");      group->Name = gig_from_utf8(_("Unnamed Group"));
1591      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);
1592      __sample_indexer++;      __sample_indexer++;
1593      // update sample tree view      // update sample tree view
1594      Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();      Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();
1595      Gtk::TreeModel::Row rowGroup = *iterGroup;      Gtk::TreeModel::Row rowGroup = *iterGroup;
1596      rowGroup[m_SamplesModel.m_col_name] = group->Name.c_str();      rowGroup[m_SamplesModel.m_col_name] = gig_to_utf8(group->Name);
1597      rowGroup[m_SamplesModel.m_col_sample] = NULL;      rowGroup[m_SamplesModel.m_col_sample] = NULL;
1598      rowGroup[m_SamplesModel.m_col_group] = group;      rowGroup[m_SamplesModel.m_col_group] = group;
1599      file_changed();      file_changed();
# Line 1547  void MainWindow::on_action_add_sample() Line 1702  void MainWindow::on_action_add_sample()
1702                          break;                          break;
1703                      }                      }
1704                  }                  }
1705                  sample->pInfo->Name = filename;                  sample->pInfo->Name = gig_from_utf8(filename);
1706                  sample->Channels = info.channels;                  sample->Channels = info.channels;
1707                  sample->BitDepth = bitdepth;                  sample->BitDepth = bitdepth;
1708                  sample->FrameSize = bitdepth / 8/*1 byte are 8 bits*/ * info.channels;                  sample->FrameSize = bitdepth / 8/*1 byte are 8 bits*/ * info.channels;
# Line 1561  void MainWindow::on_action_add_sample() Line 1716  void MainWindow::on_action_add_sample()
1716                                 &instrument, sizeof(instrument)) != SF_FALSE)                                 &instrument, sizeof(instrument)) != SF_FALSE)
1717                  {                  {
1718                      sample->MIDIUnityNote = instrument.basenote;                      sample->MIDIUnityNote = instrument.basenote;
1719                        sample->FineTune      = instrument.detune;
1720    
1721                      if (instrument.loop_count && instrument.loops[0].mode != SF_LOOP_NONE) {                      if (instrument.loop_count && instrument.loops[0].mode != SF_LOOP_NONE) {
1722                          sample->Loops = 1;                          sample->Loops = 1;
# Line 1598  void MainWindow::on_action_add_sample() Line 1754  void MainWindow::on_action_add_sample()
1754                  Gtk::TreeModel::iterator iterSample =                  Gtk::TreeModel::iterator iterSample =
1755                      m_refSamplesTreeModel->append(row.children());                      m_refSamplesTreeModel->append(row.children());
1756                  Gtk::TreeModel::Row rowSample = *iterSample;                  Gtk::TreeModel::Row rowSample = *iterSample;
1757                  rowSample[m_SamplesModel.m_col_name]   = filename;                  rowSample[m_SamplesModel.m_col_name] =
1758                        gig_to_utf8(sample->pInfo->Name);
1759                  rowSample[m_SamplesModel.m_col_sample] = sample;                  rowSample[m_SamplesModel.m_col_sample] = sample;
1760                  rowSample[m_SamplesModel.m_col_group]  = NULL;                  rowSample[m_SamplesModel.m_col_group]  = NULL;
1761                  // close sound file                  // close sound file
# Line 1669  void MainWindow::on_action_replace_all_s Line 1826  void MainWindow::on_action_replace_all_s
1826               sample; sample = file->GetNextSample())               sample; sample = file->GetNextSample())
1827          {          {
1828              std::string filename =              std::string filename =
1829                  folder + G_DIR_SEPARATOR_S + sample->pInfo->Name +                  folder + G_DIR_SEPARATOR_S +
1830                  postfixEntryBox.get_text().raw();                  Glib::filename_from_utf8(gig_to_utf8(sample->pInfo->Name) +
1831                                             postfixEntryBox.get_text());
1832              SF_INFO info;              SF_INFO info;
1833              info.format = 0;              info.format = 0;
1834              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);
# Line 1704  void MainWindow::on_action_replace_all_s Line 1862  void MainWindow::on_action_replace_all_s
1862              catch (std::string what)              catch (std::string what)
1863              {              {
1864                  if (!error_files.empty()) error_files += "\n";                  if (!error_files.empty()) error_files += "\n";
1865                      error_files += filename += " (" + what + ")";                  error_files += Glib::filename_to_utf8(filename) +
1866                        " (" + what + ")";
1867              }              }
1868          }          }
1869          // 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
# Line 1729  void MainWindow::on_action_remove_sample Line 1888  void MainWindow::on_action_remove_sample
1888          try {          try {
1889              // remove group or sample from the gig file              // remove group or sample from the gig file
1890              if (group) {              if (group) {
1891                  // temporarily remember the samples that bolong to                  // temporarily remember the samples that belong to
1892                  // that group (we need that to clean the queue)                  // that group (we need that to clean the queue)
1893                  std::list<gig::Sample*> members;                  std::list<gig::Sample*> members;
1894                  for (gig::Sample* pSample = group->GetFirstSample();                  for (gig::Sample* pSample = group->GetFirstSample();
# Line 1855  void MainWindow::on_sample_label_drop_dr Line 2014  void MainWindow::on_sample_label_drop_dr
2014              channels_changed = true;              channels_changed = true;
2015              region_changed();              region_changed();
2016          }          }
2017          dimreg_edit.set_sample(sample);          dimreg_edit.set_sample(
2018                sample,
2019                is_copy_samples_unity_note_enabled(),
2020                is_copy_samples_fine_tune_enabled(),
2021                is_copy_samples_loop_enabled()
2022            );
2023    
2024          if (sample->Channels == 2 && !stereo_dimension) {          if (sample->Channels == 2 && !stereo_dimension) {
2025              // add samplechannel dimension              // add samplechannel dimension
# Line 1898  void MainWindow::sample_name_changed(con Line 2062  void MainWindow::sample_name_changed(con
2062      Glib::ustring name  = row[m_SamplesModel.m_col_name];      Glib::ustring name  = row[m_SamplesModel.m_col_name];
2063      gig::Group* group   = row[m_SamplesModel.m_col_group];      gig::Group* group   = row[m_SamplesModel.m_col_group];
2064      gig::Sample* sample = row[m_SamplesModel.m_col_sample];      gig::Sample* sample = row[m_SamplesModel.m_col_sample];
2065        gig::String gigname(gig_from_utf8(name));
2066      if (group) {      if (group) {
2067          if (group->Name != name) {          if (group->Name != gigname) {
2068              group->Name = name;              group->Name = gigname;
2069              printf("group name changed\n");              printf("group name changed\n");
2070              file_changed();              file_changed();
2071          }          }
2072      } else if (sample) {      } else if (sample) {
2073          if (sample->pInfo->Name != name.raw()) {          if (sample->pInfo->Name != gigname) {
2074              sample->pInfo->Name = name.raw();              sample->pInfo->Name = gigname;
2075              printf("sample name changed\n");              printf("sample name changed\n");
2076              file_changed();              file_changed();
2077          }          }
# Line 1934  void MainWindow::instrument_name_changed Line 2099  void MainWindow::instrument_name_changed
2099    
2100      // change name in gig      // change name in gig
2101      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_Columns.m_col_instr];
2102      if (instrument && instrument->pInfo->Name != name.raw()) {      gig::String gigname(gig_from_utf8(name));
2103          instrument->pInfo->Name = name.raw();      if (instrument && instrument->pInfo->Name != gigname) {
2104            instrument->pInfo->Name = gigname;
2105    
2106          // change name in the instrument properties window          // change name in the instrument properties window
2107          if (instrumentProps.get_instrument() == instrument) {          if (instrumentProps.get_instrument() == instrument) {
# Line 1946  void MainWindow::instrument_name_changed Line 2112  void MainWindow::instrument_name_changed
2112      }      }
2113  }  }
2114    
2115    void MainWindow::on_action_combine_instruments() {
2116        CombineInstrumentsDialog* d = new CombineInstrumentsDialog(*this, file);
2117        d->show_all();
2118        d->resize(500, 400);
2119        d->run();
2120        if (d->fileWasChanged()) {
2121            // update GUI with new instrument just created
2122            add_instrument(d->newCombinedInstrument());
2123        }
2124        delete d;
2125    }
2126    
2127  void MainWindow::set_file_is_shared(bool b) {  void MainWindow::set_file_is_shared(bool b) {
2128      this->file_is_shared = b;      this->file_is_shared = b;
2129    
Legend:
Removed from v.2445  
changed lines
  Added in v.2548
  ViewVC Help
Powered by ViewVC