/[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 2423 by persson, Sun Feb 24 15:19:39 2013 UTC revision 2445 by persson, Sun Apr 28 06:07:22 2013 UTC
# Line 30  Line 30 
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>
 #include <gtkmm/radiomenuitem.h>  
33  #include <gtkmm/toggleaction.h>  #include <gtkmm/toggleaction.h>
34  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
35  #include "wrapLabel.hh"  #include "wrapLabel.hh"
# Line 47  Line 46 
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();  
 }  
   
49    
50  MainWindow::MainWindow() :  MainWindow::MainWindow() :
51      dimreg_label(_("Changes apply to:")),      dimreg_label(_("Changes apply to:")),
# Line 67  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 224  MainWindow::MainWindow() : Line 216  MainWindow::MainWindow() :
216          "    <menuitem action='SampleProperties'/>"          "    <menuitem action='SampleProperties'/>"
217          "    <menuitem action='AddGroup'/>"          "    <menuitem action='AddGroup'/>"
218          "    <menuitem action='AddSample'/>"          "    <menuitem action='AddSample'/>"
219          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"
220          "    <separator/>"          "    <separator/>"
221          "    <menuitem action='RemoveSample'/>"          "    <menuitem action='RemoveSample'/>"
222          "  </popup>"          "  </popup>"
# Line 233  MainWindow::MainWindow() : Line 225  MainWindow::MainWindow() :
225    
226      popup_menu = dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/PopupMenu"));      popup_menu = dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/PopupMenu"));
227    
228        instrument_menu = static_cast<Gtk::MenuItem*>(
229            uiManager->get_widget("/MenuBar/MenuInstrument"))->get_submenu();
230    
231      Gtk::Widget* menuBar = uiManager->get_widget("/MenuBar");      Gtk::Widget* menuBar = uiManager->get_widget("/MenuBar");
232      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);
233      m_VBox.pack_start(m_HPaned);      m_VBox.pack_start(m_HPaned);
# Line 257  MainWindow::MainWindow() : Line 252  MainWindow::MainWindow() :
252      // Create the Tree model:      // Create the Tree model:
253      m_refTreeModel = Gtk::ListStore::create(m_Columns);      m_refTreeModel = Gtk::ListStore::create(m_Columns);
254      m_TreeView.set_model(m_refTreeModel);      m_TreeView.set_model(m_refTreeModel);
255      m_refTreeModel->signal_row_changed().connect(      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
256          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
257      );      );
258    
# Line 375  void MainWindow::region_changed() Line 370  void MainWindow::region_changed()
370  gig::Instrument* MainWindow::get_instrument()  gig::Instrument* MainWindow::get_instrument()
371  {  {
372      gig::Instrument* instrument = 0;      gig::Instrument* instrument = 0;
373      Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();      Gtk::TreeModel::const_iterator it =
374            m_TreeView.get_selection()->get_selected();
     Gtk::TreeModel::iterator it = tree_sel_ref->get_selected();  
375      if (it) {      if (it) {
376          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
377          instrument = row[m_Columns.m_col_instr];          instrument = row[m_Columns.m_col_instr];
# Line 436  void MainWindow::dimreg_changed() Line 430  void MainWindow::dimreg_changed()
430    
431  void MainWindow::on_sel_change()  void MainWindow::on_sel_change()
432  {  {
433        // select item in instrument menu
434        Gtk::TreeModel::iterator it = m_TreeView.get_selection()->get_selected();
435        if (it) {
436            Gtk::TreePath path(it);
437            int index = path[0];
438            const std::vector<Gtk::Widget*> children =
439                instrument_menu->get_children();
440            static_cast<Gtk::RadioMenuItem*>(children[index])->set_active();
441        }
442    
443      m_RegionChooser.set_instrument(get_instrument());      m_RegionChooser.set_instrument(get_instrument());
444  }  }
445    
# Line 514  LoadDialog::LoadDialog(const Glib::ustri Line 518  LoadDialog::LoadDialog(const Glib::ustri
518  // Clear all GUI elements / controls. This method is typically called  // Clear all GUI elements / controls. This method is typically called
519  // 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.
520  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();  
     Gtk::Menu* menu = instrument_menu->get_submenu();  
     while (menu->get_children().size()) {  
         Gtk::Widget* child = *menu->get_children().begin();  
         menu->remove(*child);  
         delete child;  
     }  
521      // forget all samples that ought to be imported      // forget all samples that ought to be imported
522      m_SampleImportQueue.clear();      m_SampleImportQueue.clear();
523      // clear the samples and instruments tree views      // clear the samples and instruments tree views
524      m_refTreeModel->clear();      m_refTreeModel->clear();
525      m_refSamplesTreeModel->clear();      m_refSamplesTreeModel->clear();
526        // remove all entries from "Instrument" menu
527        while (!instrument_menu->get_children().empty()) {
528            remove_instrument_from_menu(0);
529        }
530      // free libgig's gig::File instance      // free libgig's gig::File instance
531      if (file && !file_is_shared) delete file;      if (file && !file_is_shared) delete file;
532      file = NULL;      file = NULL;
# Line 880  void MainWindow::__import_queued_samples Line 878  void MainWindow::__import_queued_samples
878              m_SampleImportQueue.erase(cur);              m_SampleImportQueue.erase(cur);
879          } catch (std::string what) {          } catch (std::string what) {
880              // remember the files that made trouble (and their cause)              // remember the files that made trouble (and their cause)
881              if (error_files.size()) error_files += "\n";              if (!error_files.empty()) error_files += "\n";
882              error_files += (*iter).sample_path += " (" + what + ")";              error_files += (*iter).sample_path += " (" + what + ")";
883              ++iter;              ++iter;
884          }          }
885      }      }
886      // show error message box when some sample(s) could not be imported      // show error message box when some sample(s) could not be imported
887      if (error_files.size()) {      if (!error_files.empty()) {
888          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;
889          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
890          msg.run();          msg.run();
# Line 1005  void PropDialog::set_info(DLS::Info* inf Line 1003  void PropDialog::set_info(DLS::Info* inf
1003  }  }
1004    
1005    
1006    void InstrumentProps::set_Name(const gig::String& name)
1007    {
1008        m->pInfo->Name = name;
1009    }
1010    
1011    void InstrumentProps::update_name()
1012    {
1013        update_model++;
1014        eName.set_value(m->pInfo->Name);
1015        update_model--;
1016    }
1017    
1018  void InstrumentProps::set_IsDrum(bool value)  void InstrumentProps::set_IsDrum(bool value)
1019  {  {
1020      m->IsDrum = value;      m->IsDrum = value;
# Line 1047  InstrumentProps::InstrumentProps() : Line 1057  InstrumentProps::InstrumentProps() :
1057            "\"keyswitching\" dimension")            "\"keyswitching\" dimension")
1058      );      );
1059    
1060        connect(eName, &InstrumentProps::set_Name);
1061      connect(eIsDrum, &InstrumentProps::set_IsDrum);      connect(eIsDrum, &InstrumentProps::set_IsDrum);
1062      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);
1063      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);
# Line 1059  InstrumentProps::InstrumentProps() : Line 1070  InstrumentProps::InstrumentProps() :
1070      connect(eDimensionKeyRangeLow, eDimensionKeyRangeHigh,      connect(eDimensionKeyRangeLow, eDimensionKeyRangeHigh,
1071              &gig::Instrument::DimensionKeyRange);              &gig::Instrument::DimensionKeyRange);
1072    
1073        eName.signal_value_changed().connect(sig_name_changed.make_slot());
1074    
1075      table.set_col_spacings(5);      table.set_col_spacings(5);
1076    
1077      table.add(eName);      table.add(eName);
# Line 1099  void InstrumentProps::set_instrument(gig Line 1112  void InstrumentProps::set_instrument(gig
1112      update(instrument);      update(instrument);
1113    
1114      update_model++;      update_model++;
1115        eName.set_value(instrument->pInfo->Name);
1116      eIsDrum.set_value(instrument->IsDrum);      eIsDrum.set_value(instrument->IsDrum);
1117      eMIDIBank.set_value(instrument->MIDIBank);      eMIDIBank.set_value(instrument->MIDIBank);
1118      eMIDIProgram.set_value(instrument->MIDIProgram);      eMIDIProgram.set_value(instrument->MIDIProgram);
# Line 1126  void MainWindow::load_gig(gig::File* gig Line 1140  void MainWindow::load_gig(gig::File* gig
1140    
1141      propDialog.set_info(gig->pInfo);      propDialog.set_info(gig->pInfo);
1142    
1143      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;  
1144      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;
1145           instrument = gig->GetNextInstrument()) {           instrument = gig->GetNextInstrument()) {
1146            Glib::ustring name(instrument->pInfo->Name);
1147    
1148          Gtk::TreeModel::iterator iter = m_refTreeModel->append();          Gtk::TreeModel::iterator iter = m_refTreeModel->append();
1149          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
1150          row[m_Columns.m_col_name] = instrument->pInfo->Name.c_str();          row[m_Columns.m_col_name] = name;
1151          row[m_Columns.m_col_instr] = instrument;          row[m_Columns.m_col_instr] = instrument;
1152          // create a menu item for this instrument  
1153          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++;  
1154      }      }
1155      instrument_menu->show();      instrument_name_connection.unblock();
1156      instrument_menu->get_submenu()->show_all_children();      uiManager->get_widget("/MenuBar/MenuInstrument")->show();
1157    
1158      for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) {      for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) {
1159          if (group->Name != "") {          if (group->Name != "") {
# Line 1174  void MainWindow::load_gig(gig::File* gig Line 1177  void MainWindow::load_gig(gig::File* gig
1177      file = gig;      file = gig;
1178    
1179      // select the first instrument      // select the first instrument
1180      Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();      m_TreeView.get_selection()->select(Gtk::TreePath("0"));
1181      tree_sel_ref->select(Gtk::TreePath("0"));  
1182        instr_props_set_instrument();
1183    }
1184    
1185    bool MainWindow::instr_props_set_instrument()
1186    {
1187        instrumentProps.signal_name_changed().clear();
1188    
1189        Gtk::TreeModel::const_iterator it =
1190            m_TreeView.get_selection()->get_selected();
1191        if (it) {
1192            Gtk::TreeModel::Row row = *it;
1193            gig::Instrument* instrument = row[m_Columns.m_col_instr];
1194    
     gig::Instrument* instrument = get_instrument();  
     if (instrument) {  
1195          instrumentProps.set_instrument(instrument);          instrumentProps.set_instrument(instrument);
1196    
1197            // make sure instrument tree is updated when user changes the
1198            // instrument name in instrument properties window
1199            instrumentProps.signal_name_changed().connect(
1200                sigc::bind(
1201                    sigc::mem_fun(*this,
1202                                  &MainWindow::instr_name_changed_by_instr_props),
1203                    it));
1204        } else {
1205            instrumentProps.hide();
1206      }      }
1207        return it;
1208  }  }
1209    
1210  void MainWindow::show_instr_props()  void MainWindow::show_instr_props()
1211  {  {
1212      gig::Instrument* instrument = get_instrument();      if (instr_props_set_instrument()) {
     if (instrument)  
     {  
         instrumentProps.set_instrument(instrument);  
1213          instrumentProps.show();          instrumentProps.show();
1214          instrumentProps.deiconify();          instrumentProps.deiconify();
1215      }      }
1216  }  }
1217    
1218    void MainWindow::instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it)
1219    {
1220        Gtk::TreeModel::Row row = *it;
1221        Glib::ustring name = row[m_Columns.m_col_name];
1222    
1223        gig::Instrument* instrument = row[m_Columns.m_col_instr];
1224        if (instrument->pInfo->Name != name) {
1225            row[m_Columns.m_col_name] = instrument->pInfo->Name;
1226        }
1227    }
1228    
1229  void MainWindow::on_action_view_status_bar() {  void MainWindow::on_action_view_status_bar() {
1230      Gtk::CheckMenuItem* item =      Gtk::CheckMenuItem* item =
1231          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));
# Line 1214  void MainWindow::on_button_release(GdkEv Line 1246  void MainWindow::on_button_release(GdkEv
1246      }      }
1247  }  }
1248    
1249  void MainWindow::on_instrument_selection_change(int index) {  void MainWindow::on_instrument_selection_change(Gtk::RadioMenuItem* item) {
1250      m_RegionChooser.set_instrument(file->GetInstrument(index));      if (item->get_active()) {
1251            const std::vector<Gtk::Widget*> children =
1252                instrument_menu->get_children();
1253            std::vector<Gtk::Widget*>::const_iterator it =
1254                find(children.begin(), children.end(), item);
1255            if (it != children.end()) {
1256                int index = it - children.begin();
1257                m_TreeView.get_selection()->select(Gtk::TreePath(ToString(index)));
1258    
1259                m_RegionChooser.set_instrument(file->GetInstrument(index));
1260            }
1261        }
1262  }  }
1263    
1264  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {
# Line 1245  void MainWindow::on_sample_treeview_butt Line 1288  void MainWindow::on_sample_treeview_butt
1288      }      }
1289  }  }
1290    
1291    
1292    Gtk::RadioMenuItem* MainWindow::add_instrument_to_menu(
1293        const Glib::ustring& name, int position) {
1294    
1295        Gtk::RadioMenuItem::Group instrument_group;
1296        const std::vector<Gtk::Widget*> children = instrument_menu->get_children();
1297        if (!children.empty()) {
1298            instrument_group =
1299                static_cast<Gtk::RadioMenuItem*>(children[0])->get_group();
1300        }
1301        Gtk::RadioMenuItem* item =
1302            new Gtk::RadioMenuItem(instrument_group, name);
1303        if (position < 0) {
1304            instrument_menu->append(*item);
1305        } else {
1306            instrument_menu->insert(*item, position);
1307        }
1308        item->show();
1309        item->signal_activate().connect(
1310            sigc::bind(
1311                sigc::mem_fun(*this, &MainWindow::on_instrument_selection_change),
1312                item));
1313        return item;
1314    }
1315    
1316    void MainWindow::remove_instrument_from_menu(int index) {
1317        const std::vector<Gtk::Widget*> children =
1318            instrument_menu->get_children();
1319        Gtk::Widget* child = children[index];
1320        instrument_menu->remove(*child);
1321        delete child;
1322    }
1323    
1324    void MainWindow::add_instrument(gig::Instrument* instrument) {
1325        const char* name = instrument->pInfo->Name.c_str();
1326    
1327        // update instrument tree view
1328        instrument_name_connection.block();
1329        Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
1330        Gtk::TreeModel::Row rowInstr = *iterInstr;
1331        rowInstr[m_Columns.m_col_name] = name;
1332        rowInstr[m_Columns.m_col_instr] = instrument;
1333        instrument_name_connection.unblock();
1334    
1335        add_instrument_to_menu(name);
1336    
1337        m_TreeView.get_selection()->select(iterInstr);
1338    
1339        file_changed();
1340    }
1341    
1342  void MainWindow::on_action_add_instrument() {  void MainWindow::on_action_add_instrument() {
1343      static int __instrument_indexer = 0;      static int __instrument_indexer = 0;
1344      if (!file) return;      if (!file) return;
# Line 1252  void MainWindow::on_action_add_instrumen Line 1346  void MainWindow::on_action_add_instrumen
1346      __instrument_indexer++;      __instrument_indexer++;
1347      instrument->pInfo->Name =      instrument->pInfo->Name =
1348          _("Unnamed Instrument ") + ToString(__instrument_indexer);          _("Unnamed Instrument ") + ToString(__instrument_indexer);
1349      // update instrument tree view  
1350      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      add_instrument(instrument);
     Gtk::TreeModel::Row rowInstr = *iterInstr;  
     rowInstr[m_Columns.m_col_name] = instrument->pInfo->Name.c_str();  
     rowInstr[m_Columns.m_col_instr] = instrument;  
     file_changed();  
1351  }  }
1352    
1353  void MainWindow::on_action_duplicate_instrument() {  void MainWindow::on_action_duplicate_instrument() {
1354      if (!file) return;      if (!file) return;
1355        
1356      // retrieve the currently selected instrument      // retrieve the currently selected instrument
1357      // (being the original instrument to be duplicated)      // (being the original instrument to be duplicated)
1358      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
# Line 1271  void MainWindow::on_action_duplicate_ins Line 1361  void MainWindow::on_action_duplicate_ins
1361      Gtk::TreeModel::Row row = *itSelection;      Gtk::TreeModel::Row row = *itSelection;
1362      gig::Instrument* instrOrig = row[m_Columns.m_col_instr];      gig::Instrument* instrOrig = row[m_Columns.m_col_instr];
1363      if (!instrOrig) return;      if (!instrOrig) return;
1364        
1365      // duplicate the orginal instrument      // duplicate the orginal instrument
1366      gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);      gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
1367      instrNew->pInfo->Name =      instrNew->pInfo->Name =
1368          instrOrig->pInfo->Name + " (" + _("Copy") + ")";          instrOrig->pInfo->Name + " (" + _("Copy") + ")";
1369            
1370      // update instrument tree view      add_instrument(instrNew);
     Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();  
     Gtk::TreeModel::Row rowInstr = *iterInstr;  
     rowInstr[m_Columns.m_col_name] = instrNew->pInfo->Name.c_str();  
     rowInstr[m_Columns.m_col_instr] = instrNew;  
     file_changed();  
1371  }  }
1372    
1373  void MainWindow::on_action_remove_instrument() {  void MainWindow::on_action_remove_instrument() {
# Line 1304  void MainWindow::on_action_remove_instru Line 1389  void MainWindow::on_action_remove_instru
1389          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
1390          gig::Instrument* instr = row[m_Columns.m_col_instr];          gig::Instrument* instr = row[m_Columns.m_col_instr];
1391          try {          try {
1392                Gtk::TreePath path(it);
1393                int index = path[0];
1394    
1395              // remove instrument from the gig file              // remove instrument from the gig file
1396              if (instr) file->DeleteInstrument(instr);              if (instr) file->DeleteInstrument(instr);
             // remove respective row from instruments tree view  
             m_refTreeModel->erase(it);  
1397              file_changed();              file_changed();
1398    
1399              instr = get_instrument();              remove_instrument_from_menu(index);
1400              if (instr) {  
1401                  instrumentProps.set_instrument(instr);              // remove row from instruments tree view
1402              } else {              m_refTreeModel->erase(it);
1403                  instrumentProps.hide();  
1404    #if GTKMM_MAJOR_VERSION < 3
1405                // select another instrument (in gtk3 this is done
1406                // automatically)
1407                if (!m_refTreeModel->children().empty()) {
1408                    if (index == m_refTreeModel->children().size()) {
1409                        index--;
1410                    }
1411                    m_TreeView.get_selection()->select(
1412                        Gtk::TreePath(ToString(index)));
1413              }              }
1414    #endif
1415                instr_props_set_instrument();
1416          } catch (RIFF::Exception e) {          } catch (RIFF::Exception e) {
1417              Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
1418              msg.run();              msg.run();
# Line 1508  void MainWindow::on_action_add_sample() Line 1605  void MainWindow::on_action_add_sample()
1605                  sf_close(hFile);                  sf_close(hFile);
1606                  file_changed();                  file_changed();
1607              } 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)
1608                  if (error_files.size()) error_files += "\n";                  if (!error_files.empty()) error_files += "\n";
1609                  error_files += *iter += " (" + what + ")";                  error_files += *iter += " (" + what + ")";
1610              }              }
1611          }          }
1612          // 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
1613          if (error_files.size()) {          if (!error_files.empty()) {
1614              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;
1615              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
1616              msg.run();              msg.run();
# Line 1526  void MainWindow::on_action_replace_all_s Line 1623  void MainWindow::on_action_replace_all_s
1623      if (!file) return;      if (!file) return;
1624      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
1625                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
1626      const char* str =      const char* str =
1627          _("This is a very specific function. It tries to replace all samples "          _("This is a very specific function. It tries to replace all samples "
1628            "in the current gig file by samples located in the chosen "            "in the current gig file by samples located in the chosen "
1629            "directory.\n\n"            "directory.\n\n"
# Line 1606  void MainWindow::on_action_replace_all_s Line 1703  void MainWindow::on_action_replace_all_s
1703              }              }
1704              catch (std::string what)              catch (std::string what)
1705              {              {
1706                  if (error_files.size()) error_files += "\n";                  if (!error_files.empty()) error_files += "\n";
1707                      error_files += filename += " (" + what + ")";                      error_files += filename += " (" + what + ")";
1708              }              }
1709          }          }
1710          // 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
1711          if (error_files.size()) {          if (!error_files.empty()) {
1712              Glib::ustring txt =              Glib::ustring txt =
1713                  _("Could not replace the following sample(s):\n") + error_files;                  _("Could not replace the following sample(s):\n") + error_files;
1714              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
# Line 1821  void MainWindow::instrument_name_changed Line 1918  void MainWindow::instrument_name_changed
1918      if (!iter) return;      if (!iter) return;
1919      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
1920      Glib::ustring name = row[m_Columns.m_col_name];      Glib::ustring name = row[m_Columns.m_col_name];
1921    
1922        // change name in instrument menu
1923        int index = path[0];
1924        const std::vector<Gtk::Widget*> children = instrument_menu->get_children();
1925        if (index < children.size()) {
1926    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 16) || GTKMM_MAJOR_VERSION > 2
1927            static_cast<Gtk::RadioMenuItem*>(children[index])->set_label(name);
1928    #else
1929            remove_instrument_from_menu(index);
1930            Gtk::RadioMenuItem* item = add_instrument_to_menu(name, index);
1931            item->set_active();
1932    #endif
1933        }
1934    
1935        // change name in gig
1936      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_Columns.m_col_instr];
1937      if (instrument && instrument->pInfo->Name != name.raw()) {      if (instrument && instrument->pInfo->Name != name.raw()) {
1938          instrument->pInfo->Name = name.raw();          instrument->pInfo->Name = name.raw();
1939    
1940            // change name in the instrument properties window
1941            if (instrumentProps.get_instrument() == instrument) {
1942                instrumentProps.update_name();
1943            }
1944    
1945          file_changed();          file_changed();
1946      }      }
1947  }  }
Legend:
Removed from v.2423  
changed lines
  Added in v.2445
  ViewVC Help
Powered by ViewVC