/[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 1853 by schoenebeck, Sun Mar 1 22:26:36 2009 UTC revision 2332 by persson, Wed Mar 14 05:22:26 2012 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2009 Andreas Persson   * Copyright (C) 2006-2012 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/radiomenuitem.h>
34  #include <gtkmm/toggleaction.h>  #include <gtkmm/toggleaction.h>
35  #include "wrapLabel.hh"  #include "wrapLabel.hh"
36    
37  #include "global.h"  #include "global.h"
38    #include "compat.h"
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
 #define ABOUT_DIALOG  
 #include <gtkmm/aboutdialog.h>  
 #endif  
   
 #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION < 6) || GLIBMM_MAJOR_VERSION < 2  
 namespace Glib {  
 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  
39    
40  #include <stdio.h>  #include <stdio.h>
41  #include <sndfile.h>  #include <sndfile.h>
# Line 179  MainWindow::MainWindow() : Line 169  MainWindow::MainWindow() :
169      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);
170      actionGroup->add(Gtk::Action::create("MenuHelp",      actionGroup->add(Gtk::Action::create("MenuHelp",
171                                           action->property_label()));                                           action->property_label()));
 #ifdef ABOUT_DIALOG  
172      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),
173                       sigc::mem_fun(                       sigc::mem_fun(
174                           *this, &MainWindow::on_action_help_about));                           *this, &MainWindow::on_action_help_about));
 #endif  
175      actionGroup->add(      actionGroup->add(
176          Gtk::Action::create("AddInstrument", _("Add _Instrument")),          Gtk::Action::create("AddInstrument", _("Add _Instrument")),
177          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)
# Line 239  MainWindow::MainWindow() : Line 227  MainWindow::MainWindow() :
227          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
228          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
229          "    </menu>"          "    </menu>"
 #ifdef ABOUT_DIALOG  
230          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
231          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
232          "    </menu>"          "    </menu>"
 #endif  
233          "  </menubar>"          "  </menubar>"
234          "  <popup name='PopupMenu'>"          "  <popup name='PopupMenu'>"
235          "    <menuitem action='InstrProperties'/>"          "    <menuitem action='InstrProperties'/>"
# Line 272  MainWindow::MainWindow() : Line 258  MainWindow::MainWindow() :
258      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);
259      m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);
260    
261        set_file_is_shared(false);
262    
263      // Status Bar:      // Status Bar:
264      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);
265      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);
# Line 308  MainWindow::MainWindow() : Line 296  MainWindow::MainWindow() :
296      );      );
297    
298      // 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
299      std::list<Gtk::TargetEntry> drag_target_gig_sample;      std::vector<Gtk::TargetEntry> drag_target_gig_sample;
300      drag_target_gig_sample.push_back( Gtk::TargetEntry("gig::Sample") );      drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample"));
301      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);
302      m_TreeViewSamples.signal_drag_begin().connect(      m_TreeViewSamples.signal_drag_begin().connect(
303          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)
# Line 374  MainWindow::MainWindow() : Line 362  MainWindow::MainWindow() :
362    
363      file = 0;      file = 0;
364      file_is_changed = false;      file_is_changed = false;
     set_file_is_shared(false);  
365    
366      show_all_children();      show_all_children();
367    
# Line 478  void loader_progress_callback(gig::progr Line 465  void loader_progress_callback(gig::progr
465  void Loader::progress_callback(float fraction)  void Loader::progress_callback(float fraction)
466  {  {
467      {      {
468          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
469          progress = fraction;          progress = fraction;
470      }      }
471      progress_dispatcher();      progress_dispatcher();
# Line 486  void Loader::progress_callback(float fra Line 473  void Loader::progress_callback(float fra
473    
474  void Loader::thread_function()  void Loader::thread_function()
475  {  {
476      printf("thread_function self=%x\n", Glib::Thread::self());      printf("thread_function self=%x\n", Glib::Threads::Thread::self());
477      printf("Start %s\n", filename);      printf("Start %s\n", filename);
478      RIFF::File* riff = new RIFF::File(filename);      RIFF::File* riff = new RIFF::File(filename);
479      gig = new gig::File(riff);      gig = new gig::File(riff);
# Line 500  void Loader::thread_function() Line 487  void Loader::thread_function()
487  }  }
488    
489  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
490      : thread(0), filename(filename)      : filename(filename), thread(0)
491  {  {
492  }  }
493    
494  void Loader::launch()  void Loader::launch()
495  {  {
496    #ifdef OLD_THREADS
497      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);
498    #else
499        thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
500    #endif
501      printf("launch thread=%x\n", thread);      printf("launch thread=%x\n", thread);
502  }  }
503    
# Line 514  float Loader::get_progress() Line 505  float Loader::get_progress()
505  {  {
506      float res;      float res;
507      {      {
508          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
509          res = progress;          res = progress;
510      }      }
511      return res;      return res;
# Line 544  void MainWindow::__clear() { Line 535  void MainWindow::__clear() {
535      Gtk::MenuItem* instrument_menu =      Gtk::MenuItem* instrument_menu =
536          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));
537      instrument_menu->hide();      instrument_menu->hide();
538      for (int i = 0; i < instrument_menu->get_submenu()->items().size(); i++) {      Gtk::Menu* menu = instrument_menu->get_submenu();
539          delete &instrument_menu->get_submenu()->items()[i];      while (menu->get_children().size()) {
540            Gtk::Widget* child = *menu->get_children().begin();
541            menu->remove(*child);
542            delete child;
543      }      }
     instrument_menu->get_submenu()->items().clear();  
544      // forget all samples that ought to be imported      // forget all samples that ought to be imported
545      m_SampleImportQueue.clear();      m_SampleImportQueue.clear();
546      // clear the samples and instruments tree views      // clear the samples and instruments tree views
# Line 582  bool MainWindow::close_confirmation_dial Line 575  bool MainWindow::close_confirmation_dial
575                                   Glib::filename_display_basename(filename).c_str());                                   Glib::filename_display_basename(filename).c_str());
576      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
577      g_free(msg);      g_free(msg);
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
578      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  
579      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);
580      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
581      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 589  bool MainWindow::close_confirmation_dial
589  bool MainWindow::leaving_shared_mode_dialog() {  bool MainWindow::leaving_shared_mode_dialog() {
590      Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");      Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");
591      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  
592      dialog.set_secondary_text(      dialog.set_secondary_text(
593          _("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 "
594            "used by the sampler until you tell the sampler explicitly to "            "used by the sampler until you tell the sampler explicitly to "
595            "load it.")            "load it."));
    );  
 #endif  
596      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
597      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
598      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
# Line 623  void MainWindow::on_action_file_open() Line 611  void MainWindow::on_action_file_open()
611      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
612      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
613      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
614    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
615      Gtk::FileFilter filter;      Gtk::FileFilter filter;
616      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
617    #else
618        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
619        filter->add_pattern("*.gig");
620    #endif
621      dialog.set_filter(filter);      dialog.set_filter(filter);
622      if (current_gig_dir != "") {      if (current_gig_dir != "") {
623          dialog.set_current_folder(current_gig_dir);          dialog.set_current_folder(current_gig_dir);
# Line 632  void MainWindow::on_action_file_open() Line 625  void MainWindow::on_action_file_open()
625      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
626          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
627          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
628          printf("on_action_file_open self=%x\n", Glib::Thread::self());          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());
629          load_file(filename.c_str());          load_file(filename.c_str());
630          current_gig_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
631      }      }
# Line 674  void MainWindow::on_loader_progress() Line 667  void MainWindow::on_loader_progress()
667  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
668  {  {
669      printf("Loader finished!\n");      printf("Loader finished!\n");
670      printf("on_loader_finished self=%x\n", Glib::Thread::self());      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());
671      load_gig(loader->gig, loader->filename);      load_gig(loader->gig, loader->filename);
672      load_dialog->hide();      load_dialog->hide();
673  }  }
# Line 746  bool MainWindow::file_save_as() Line 739  bool MainWindow::file_save_as()
739      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
740      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);
741      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  
742      dialog.set_do_overwrite_confirmation();      dialog.set_do_overwrite_confirmation();
743      // TODO: an overwrite dialog for gtkmm < 2.8  
744  #endif  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
745      Gtk::FileFilter filter;      Gtk::FileFilter filter;
746      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
747    #else
748        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
749        filter->add_pattern("*.gig");
750    #endif
751      dialog.set_filter(filter);      dialog.set_filter(filter);
752    
753      // set initial dir and filename of the Save As dialog      // set initial dir and filename of the Save As dialog
# Line 917  void MainWindow::on_action_file_properti Line 912  void MainWindow::on_action_file_properti
912    
913  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
914  {  {
 #ifdef ABOUT_DIALOG  
915      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
916    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2
917        dialog.set_program_name("Gigedit");
918    #else
919        dialog.set_name("Gigedit");
920    #endif
921      dialog.set_version(VERSION);      dialog.set_version(VERSION);
922      dialog.set_copyright("Copyright (C) 2006-2009 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2012 Andreas Persson");
923      dialog.set_comments(_(      dialog.set_comments(_(
924          "Released under the GNU General Public License.\n"          "Released under the GNU General Public License.\n"
925          "\n"          "\n"
# Line 933  void MainWindow::on_action_help_about() Line 932  void MainWindow::on_action_help_about()
932      dialog.set_website("http://www.linuxsampler.org");      dialog.set_website("http://www.linuxsampler.org");
933      dialog.set_website_label("http://www.linuxsampler.org");      dialog.set_website_label("http://www.linuxsampler.org");
934      dialog.run();      dialog.run();
 #endif  
935  }  }
936    
937  PropDialog::PropDialog()  PropDialog::PropDialog()
938      : table(2,1),      : eName(_("Name")),
       eName(_("Name")),  
939        eCreationDate(_("Creation date")),        eCreationDate(_("Creation date")),
940        eComments(_("Comments")),        eComments(_("Comments")),
941        eProduct(_("Product")),        eProduct(_("Product")),
# Line 955  PropDialog::PropDialog() Line 952  PropDialog::PropDialog()
952        eCommissioned(_("Commissioned")),        eCommissioned(_("Commissioned")),
953        eSubject(_("Subject")),        eSubject(_("Subject")),
954        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
955          table(2, 1),
956        update_model(0)        update_model(0)
957  {  {
958      set_title(_("File Properties"));      set_title(_("File Properties"));
# Line 1003  PropDialog::PropDialog() Line 1001  PropDialog::PropDialog()
1001      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
1002      buttonBox.show();      buttonBox.show();
1003      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1004      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1005      quitButton.grab_focus();      quitButton.grab_focus();
1006      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
1007          sigc::mem_fun(*this, &PropDialog::hide));          sigc::mem_fun(*this, &PropDialog::hide));
# Line 1073  void InstrumentProps::set_DimensionKeyRa Line 1071  void InstrumentProps::set_DimensionKeyRa
1071  }  }
1072    
1073  InstrumentProps::InstrumentProps()  InstrumentProps::InstrumentProps()
1074      : table(2,1),      : update_model(0),
1075        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
1076          table(2,1),
1077        eName(_("Name")),        eName(_("Name")),
1078        eIsDrum(_("Is drum")),        eIsDrum(_("Is drum")),
1079        eMIDIBank(_("MIDI bank"), 0, 16383),        eMIDIBank(_("MIDI bank"), 0, 16383),
# Line 1086  InstrumentProps::InstrumentProps() Line 1085  InstrumentProps::InstrumentProps()
1085        ePitchbendRange(_("Pitchbend range"), 0, 12),        ePitchbendRange(_("Pitchbend range"), 0, 12),
1086        ePianoReleaseMode(_("Piano release mode")),        ePianoReleaseMode(_("Piano release mode")),
1087        eDimensionKeyRangeLow(_("Keyswitching range low")),        eDimensionKeyRangeLow(_("Keyswitching range low")),
1088        eDimensionKeyRangeHigh(_("Keyswitching range high")),        eDimensionKeyRangeHigh(_("Keyswitching range high"))
       update_model(0)  
1089  {  {
1090      set_title(_("Instrument Properties"));      set_title(_("Instrument Properties"));
1091    
# Line 1138  InstrumentProps::InstrumentProps() Line 1136  InstrumentProps::InstrumentProps()
1136      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
1137      buttonBox.show();      buttonBox.show();
1138      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1139      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1140      quitButton.grab_focus();      quitButton.grab_focus();
1141    
1142      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
# Line 1400  void MainWindow::on_action_add_sample() Line 1398  void MainWindow::on_action_add_sample()
1398      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1399      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
1400      dialog.set_select_multiple(true);      dialog.set_select_multiple(true);
1401      Gtk::FileFilter soundfilter; // matches all file types supported by libsndfile  
1402        // matches all file types supported by libsndfile
1403    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1404        Gtk::FileFilter soundfilter;
1405    #else
1406        Glib::RefPtr<Gtk::FileFilter> soundfilter = Gtk::FileFilter::create();
1407    #endif
1408      const char* const supportedFileTypes[] = {      const char* const supportedFileTypes[] = {
1409          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",
1410          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",
# Line 1408  void MainWindow::on_action_add_sample() Line 1412  void MainWindow::on_action_add_sample()
1412          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",
1413          "*.caf", "*.CAF", NULL          "*.caf", "*.CAF", NULL
1414      };      };
1415        const char* soundfiles = _("Sound Files");
1416        const char* allfiles = _("All Files");
1417    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1418      for (int i = 0; supportedFileTypes[i]; i++)      for (int i = 0; supportedFileTypes[i]; i++)
1419          soundfilter.add_pattern(supportedFileTypes[i]);          soundfilter.add_pattern(supportedFileTypes[i]);
1420      soundfilter.set_name(_("Sound Files"));      soundfilter.set_name(soundfiles);
1421      Gtk::FileFilter allpassfilter; // matches every file  
1422        // matches every file
1423        Gtk::FileFilter allpassfilter;
1424      allpassfilter.add_pattern("*.*");      allpassfilter.add_pattern("*.*");
1425      allpassfilter.set_name(_("All Files"));      allpassfilter.set_name(allfiles);
1426    #else
1427        for (int i = 0; supportedFileTypes[i]; i++)
1428            soundfilter->add_pattern(supportedFileTypes[i]);
1429        soundfilter->set_name(soundfiles);
1430    
1431        // matches every file
1432        Glib::RefPtr<Gtk::FileFilter> allpassfilter = Gtk::FileFilter::create();
1433        allpassfilter->add_pattern("*.*");
1434        allpassfilter->set_name(allfiles);
1435    #endif
1436      dialog.add_filter(soundfilter);      dialog.add_filter(soundfilter);
1437      dialog.add_filter(allpassfilter);      dialog.add_filter(allpassfilter);
1438      if (current_sample_dir != "") {      if (current_sample_dir != "") {
# Line 1422  void MainWindow::on_action_add_sample() Line 1441  void MainWindow::on_action_add_sample()
1441      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1442          current_sample_dir = dialog.get_current_folder();          current_sample_dir = dialog.get_current_folder();
1443          Glib::ustring error_files;          Glib::ustring error_files;
1444          Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
1445          for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();          for (std::vector<std::string>::iterator iter = filenames.begin();
1446               iter != filenames.end(); ++iter) {               iter != filenames.end(); ++iter) {
1447              printf("Adding sample %s\n",(*iter).c_str());              printf("Adding sample %s\n",(*iter).c_str());
1448              // use libsndfile to retrieve file informations              // use libsndfile to retrieve file informations
# Line 1555  void MainWindow::on_action_replace_all_s Line 1574  void MainWindow::on_action_replace_all_s
1574            "untouched.\n")            "untouched.\n")
1575      );      );
1576      Gtk::HBox entryArea;      Gtk::HBox entryArea;
1577      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_RIGHT);      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);
1578      Gtk::Entry postfixEntryBox;      Gtk::Entry postfixEntryBox;
1579      postfixEntryBox.set_text(".wav");      postfixEntryBox.set_text(".wav");
1580      entryArea.pack_start(entryLabel);      entryArea.pack_start(entryLabel);
# Line 1574  void MainWindow::on_action_replace_all_s Line 1593  void MainWindow::on_action_replace_all_s
1593      {      {
1594          current_sample_dir = dialog.get_current_folder();          current_sample_dir = dialog.get_current_folder();
1595          Glib::ustring error_files;          Glib::ustring error_files;
1596          Glib::ustring folder = dialog.get_filename();          std::string folder = dialog.get_filename();
1597          for (gig::Sample* sample = file->GetFirstSample();          for (gig::Sample* sample = file->GetFirstSample();
1598               sample; sample = file->GetNextSample())               sample; sample = file->GetNextSample())
1599          {          {
Legend:
Removed from v.1853  
changed lines
  Added in v.2332
  ViewVC Help
Powered by ViewVC