/[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 3409 by schoenebeck, Tue Jan 23 16:30:56 2018 UTC revision 3470 by persson, Thu Feb 14 19:10:49 2019 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2017 Andreas Persson   * Copyright (C) 2006-2019 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 1356  MainWindow::MainWindow() : Line 1356  MainWindow::MainWindow() :
1356      m_TreeView.set_model(m_refTreeModelFilter);      m_TreeView.set_model(m_refTreeModelFilter);
1357    
1358      m_TreeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);      m_TreeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
1359      m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules. Drag & drop to change the order of instruments."));      m_TreeView.set_has_tooltip(true);
1360        m_TreeView.signal_query_tooltip().connect(
1361            sigc::mem_fun(*this, &MainWindow::onQueryTreeViewTooltip)
1362        );
1363      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
1364          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
1365      );      );
# Line 1513  MainWindow::MainWindow() : Line 1516  MainWindow::MainWindow() :
1516          sigc::hide(          sigc::hide(
1517              sigc::bind(              sigc::bind(
1518                  file_structure_to_be_changed_signal.make_slot(),                  file_structure_to_be_changed_signal.make_slot(),
1519    #if SIGCXX_MAJOR_VERSION > 2 || (SIGCXX_MAJOR_VERSION == 2 && SIGCXX_MINOR_VERSION >= 8)
1520                    std::ref(this->file)
1521    #else
1522                  sigc::ref(this->file)                  sigc::ref(this->file)
1523    #endif
1524              )              )
1525          )          )
1526      );      );
# Line 1521  MainWindow::MainWindow() : Line 1528  MainWindow::MainWindow() :
1528          sigc::hide(          sigc::hide(
1529              sigc::bind(              sigc::bind(
1530                  file_structure_changed_signal.make_slot(),                  file_structure_changed_signal.make_slot(),
1531    #if SIGCXX_MAJOR_VERSION > 2 || (SIGCXX_MAJOR_VERSION == 2 && SIGCXX_MINOR_VERSION >= 8)
1532                    std::ref(this->file)
1533    #else
1534                  sigc::ref(this->file)                  sigc::ref(this->file)
1535    #endif
1536              )              )
1537          )          )
1538      );      );
# Line 1543  MainWindow::MainWindow() : Line 1554  MainWindow::MainWindow() :
1554          sigc::mem_fun(*this, &MainWindow::update_dimregs));          sigc::mem_fun(*this, &MainWindow::update_dimregs));
1555    
1556      m_searchText.signal_changed().connect(      m_searchText.signal_changed().connect(
1557          sigc::mem_fun(m_refTreeModelFilter.operator->(), &Gtk::TreeModelFilter::refilter)          sigc::mem_fun(*m_refTreeModelFilter.operator->(), &Gtk::TreeModelFilter::refilter)
1558      );      );
1559    
1560      file = 0;      file = 0;
# Line 1597  MainWindow::MainWindow() : Line 1608  MainWindow::MainWindow() :
1608          Gtk::AccelMap::add_entry("<Macros>/macro_9", GDK_KEY_F10, noModifier);          Gtk::AccelMap::add_entry("<Macros>/macro_9", GDK_KEY_F10, noModifier);
1609          Gtk::AccelMap::add_entry("<Macros>/macro_10", GDK_KEY_F11, noModifier);          Gtk::AccelMap::add_entry("<Macros>/macro_10", GDK_KEY_F11, noModifier);
1610          Gtk::AccelMap::add_entry("<Macros>/macro_11", GDK_KEY_F12, noModifier);          Gtk::AccelMap::add_entry("<Macros>/macro_11", GDK_KEY_F12, noModifier);
1611            Gtk::AccelMap::add_entry("<Macros>/macro_12", GDK_KEY_F13, noModifier);
1612            Gtk::AccelMap::add_entry("<Macros>/macro_13", GDK_KEY_F14, noModifier);
1613            Gtk::AccelMap::add_entry("<Macros>/macro_14", GDK_KEY_F15, noModifier);
1614            Gtk::AccelMap::add_entry("<Macros>/macro_15", GDK_KEY_F16, noModifier);
1615            Gtk::AccelMap::add_entry("<Macros>/macro_16", GDK_KEY_F17, noModifier);
1616            Gtk::AccelMap::add_entry("<Macros>/macro_17", GDK_KEY_F18, noModifier);
1617            Gtk::AccelMap::add_entry("<Macros>/macro_18", GDK_KEY_F19, noModifier);
1618          Gtk::AccelMap::add_entry("<Macros>/SetupMacros", 'm', primaryModifierKey);          Gtk::AccelMap::add_entry("<Macros>/SetupMacros", 'm', primaryModifierKey);
1619    
1620          Glib::RefPtr<Gtk::AccelGroup> accelGroup = this->get_accel_group();          Glib::RefPtr<Gtk::AccelGroup> accelGroup = this->get_accel_group();
# Line 1619  MainWindow::MainWindow() : Line 1637  MainWindow::MainWindow() :
1637          Gtk::AccelMap::add_entry("<Scripts>/script_9", GDK_KEY_F10, Gdk::SHIFT_MASK);          Gtk::AccelMap::add_entry("<Scripts>/script_9", GDK_KEY_F10, Gdk::SHIFT_MASK);
1638          Gtk::AccelMap::add_entry("<Scripts>/script_10", GDK_KEY_F11, Gdk::SHIFT_MASK);          Gtk::AccelMap::add_entry("<Scripts>/script_10", GDK_KEY_F11, Gdk::SHIFT_MASK);
1639          Gtk::AccelMap::add_entry("<Scripts>/script_11", GDK_KEY_F12, Gdk::SHIFT_MASK);          Gtk::AccelMap::add_entry("<Scripts>/script_11", GDK_KEY_F12, Gdk::SHIFT_MASK);
1640            Gtk::AccelMap::add_entry("<Scripts>/script_12", GDK_KEY_F13, Gdk::SHIFT_MASK);
1641            Gtk::AccelMap::add_entry("<Scripts>/script_13", GDK_KEY_F14, Gdk::SHIFT_MASK);
1642            Gtk::AccelMap::add_entry("<Scripts>/script_14", GDK_KEY_F15, Gdk::SHIFT_MASK);
1643            Gtk::AccelMap::add_entry("<Scripts>/script_15", GDK_KEY_F16, Gdk::SHIFT_MASK);
1644            Gtk::AccelMap::add_entry("<Scripts>/script_16", GDK_KEY_F17, Gdk::SHIFT_MASK);
1645            Gtk::AccelMap::add_entry("<Scripts>/script_17", GDK_KEY_F18, Gdk::SHIFT_MASK);
1646            Gtk::AccelMap::add_entry("<Scripts>/script_18", GDK_KEY_F19, Gdk::SHIFT_MASK);
1647            Gtk::AccelMap::add_entry("<Scripts>/DropAllScriptSlots", GDK_KEY_BackSpace, Gdk::SHIFT_MASK);
1648    
1649          Glib::RefPtr<Gtk::AccelGroup> accelGroup = this->get_accel_group();          Glib::RefPtr<Gtk::AccelGroup> accelGroup = this->get_accel_group();
1650          assign_scripts_menu->set_accel_group(accelGroup);          assign_scripts_menu->set_accel_group(accelGroup);
# Line 1866  void MainWindow::on_sel_change() Line 1892  void MainWindow::on_sel_change()
1892      }      }
1893  }  }
1894    
1895    
1896    LoaderSaverBase::LoaderSaverBase(const Glib::ustring filename, gig::File* gig) :
1897        filename(filename), gig(gig), thread(0), progress(0.f)
1898    {
1899    }
1900    
1901  void loader_progress_callback(gig::progress_t* progress)  void loader_progress_callback(gig::progress_t* progress)
1902  {  {
1903      Loader* loader = static_cast<Loader*>(progress->custom);      LoaderSaverBase* loader = static_cast<LoaderSaverBase*>(progress->custom);
1904      loader->progress_callback(progress->factor);      loader->progress_callback(progress->factor);
1905  }  }
1906    
1907  void Loader::progress_callback(float fraction)  void LoaderSaverBase::progress_callback(float fraction)
1908  {  {
1909      {      {
1910          Glib::Threads::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
# Line 1885  void Loader::progress_callback(float fra Line 1917  void Loader::progress_callback(float fra
1917  // make sure stack is 16-byte aligned for SSE instructions  // make sure stack is 16-byte aligned for SSE instructions
1918  __attribute__((force_align_arg_pointer))  __attribute__((force_align_arg_pointer))
1919  #endif  #endif
1920  void Loader::thread_function()  void LoaderSaverBase::thread_function()
1921  {  {
1922      printf("thread_function self=%p\n",      printf("thread_function self=%p\n",
1923             static_cast<void*>(Glib::Threads::Thread::self()));             static_cast<void*>(Glib::Threads::Thread::self()));
1924      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
1925      try {      try {
         RIFF::File* riff = new RIFF::File(filename);  
         gig = new gig::File(riff);  
1926          gig::progress_t progress;          gig::progress_t progress;
1927          progress.callback = loader_progress_callback;          progress.callback = loader_progress_callback;
1928          progress.custom = this;          progress.custom = this;
1929    
1930          gig->GetInstrument(0, &progress);          thread_function_sub(progress);
1931          printf("End\n");          printf("End\n");
1932          finished_dispatcher();          finished_dispatcher();
1933      } catch (RIFF::Exception e) {      } catch (RIFF::Exception e) {
# Line 1909  void Loader::thread_function() Line 1939  void Loader::thread_function()
1939      }      }
1940  }  }
1941    
1942  Loader::Loader(const char* filename)  void LoaderSaverBase::launch()
     : filename(filename), gig(0), thread(0), progress(0.f)  
 {  
 }  
   
 void Loader::launch()  
1943  {  {
1944  #ifdef OLD_THREADS  #ifdef OLD_THREADS
1945      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);      thread = Glib::Thread::create(sigc::mem_fun(*this, &LoaderSaverBase::thread_function), true);
1946  #else  #else
1947      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &LoaderSaverBase::thread_function));
1948  #endif  #endif
1949      printf("launch thread=%p\n", static_cast<void*>(thread));      printf("launch thread=%p\n", static_cast<void*>(thread));
1950  }  }
1951    
1952  float Loader::get_progress()  float LoaderSaverBase::get_progress()
1953  {  {
1954      float res;      Glib::Threads::Mutex::Lock lock(progressMutex);
1955      {      return progress;
         Glib::Threads::Mutex::Lock lock(progressMutex);  
         res = progress;  
     }  
     return res;  
1956  }  }
1957    
1958  Glib::Dispatcher& Loader::signal_progress()  Glib::Dispatcher& LoaderSaverBase::signal_progress()
1959  {  {
1960      return progress_dispatcher;      return progress_dispatcher;
1961  }  }
1962    
1963  Glib::Dispatcher& Loader::signal_finished()  Glib::Dispatcher& LoaderSaverBase::signal_finished()
1964  {  {
1965      return finished_dispatcher;      return finished_dispatcher;
1966  }  }
1967    
1968  Glib::Dispatcher& Loader::signal_error()  Glib::Dispatcher& LoaderSaverBase::signal_error()
1969  {  {
1970      return error_dispatcher;      return error_dispatcher;
1971  }  }
1972    
 void saver_progress_callback(gig::progress_t* progress)  
 {  
     Saver* saver = static_cast<Saver*>(progress->custom);  
     saver->progress_callback(progress->factor);  
 }  
1973    
1974  void Saver::progress_callback(float fraction)  Loader::Loader(const char* filename) :
1975        LoaderSaverBase(filename, 0)
1976  {  {
     {  
         Glib::Threads::Mutex::Lock lock(progressMutex);  
         progress = fraction;  
     }  
     progress_dispatcher.emit();  
1977  }  }
1978    
1979  #if defined(WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))  void Loader::thread_function_sub(gig::progress_t& progress)
 // make sure stack is 16-byte aligned for SSE instructions  
 __attribute__((force_align_arg_pointer))  
 #endif  
 void Saver::thread_function()  
1980  {  {
1981      printf("thread_function self=%p\n",      RIFF::File* riff = new RIFF::File(filename);
1982             static_cast<void*>(Glib::Threads::Thread::self()));      gig = new gig::File(riff);
     printf("Start %s\n", filename.c_str());  
     try {  
         gig::progress_t progress;  
         progress.callback = saver_progress_callback;  
         progress.custom = this;  
   
         // if no filename was provided, that means "save", if filename was provided means "save as"  
         if (filename.empty()) {  
             if (!Settings::singleton()->saveWithTemporaryFile) {  
                 // save directly over the existing .gig file  
                 // (requires less disk space than solution below  
                 // but may be slower)  
                 gig->Save(&progress);  
             } else {  
                 // save the file as separate temporary file first,  
                 // then move the saved file over the old file  
                 // (may result in performance speedup during save)  
                 gig::String tmpname = filename + ".TMP";  
                 gig->Save(tmpname, &progress);  
                 #if defined(WIN32)  
                 if (!DeleteFile(filename.c_str())) {  
                     throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file).");  
                 }  
                 #else // POSIX ...  
                 if (unlink(filename.c_str())) {  
                     throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file): " + gig::String(strerror(errno)));  
                 }  
                 #endif  
                 if (rename(tmpname.c_str(), filename.c_str())) {  
                     #if defined(WIN32)  
                     throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file).");  
                     #else  
                     throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file): " + gig::String(strerror(errno)));  
                     #endif  
                 }  
             }  
         } else {  
             gig->Save(filename, &progress);  
         }  
1983    
1984          printf("End\n");      gig->GetInstrument(0, &progress);
         finished_dispatcher.emit();  
     } catch (RIFF::Exception e) {  
         error_message = e.Message;  
         error_dispatcher.emit();  
     } catch (...) {  
         error_message = _("Unknown exception occurred");  
         error_dispatcher.emit();  
     }  
1985  }  }
1986    
1987  Saver::Saver(gig::File* file, Glib::ustring filename)  
1988      : gig(file), filename(filename), thread(0), progress(0.f)  Saver::Saver(gig::File* file, Glib::ustring filename) :
1989        LoaderSaverBase(filename, file)
1990  {  {
1991  }  }
1992    
1993  void Saver::launch()  void Saver::thread_function_sub(gig::progress_t& progress)
1994  {  {
1995  #ifdef OLD_THREADS      // if no filename was provided, that means "save", if filename was provided means "save as"
1996      thread = Glib::Thread::create(sigc::mem_fun(*this, &Saver::thread_function), true);      if (filename.empty()) {
1997            if (!Settings::singleton()->saveWithTemporaryFile) {
1998                // save directly over the existing .gig file
1999                // (requires less disk space than solution below
2000                // but may be slower)
2001                gig->Save(&progress);
2002            } else {
2003                // save the file as separate temporary file first,
2004                // then move the saved file over the old file
2005                // (may result in performance speedup during save)
2006                gig::String tmpname = filename + ".TMP";
2007                gig->Save(tmpname, &progress);
2008    #if defined(WIN32)
2009                if (!DeleteFile(filename.c_str())) {
2010                    throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file).");
2011                }
2012    #else // POSIX ...
2013                if (unlink(filename.c_str())) {
2014                    throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file): " + gig::String(strerror(errno)));
2015                }
2016    #endif
2017                if (rename(tmpname.c_str(), filename.c_str())) {
2018    #if defined(WIN32)
2019                    throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file).");
2020  #else  #else
2021      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));                  throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file): " + gig::String(strerror(errno)));
2022  #endif  #endif
2023      printf("launch thread=%p\n", static_cast<void*>(thread));              }
2024  }          }
2025        } else {
2026  float Saver::get_progress()          gig->Save(filename, &progress);
 {  
     float res;  
     {  
         Glib::Threads::Mutex::Lock lock(progressMutex);  
         res = progress;  
2027      }      }
     return res;  
 }  
   
 Glib::Dispatcher& Saver::signal_progress()  
 {  
     return progress_dispatcher;  
2028  }  }
2029    
 Glib::Dispatcher& Saver::signal_finished()  
 {  
     return finished_dispatcher;  
 }  
   
 Glib::Dispatcher& Saver::signal_error()  
 {  
     return error_dispatcher;  
 }  
2030    
2031  ProgressDialog::ProgressDialog(const Glib::ustring& title, Gtk::Window& parent)  ProgressDialog::ProgressDialog(const Glib::ustring& title, Gtk::Window& parent)
2032      : Gtk::Dialog(title, parent, true)      : Gtk::Dialog(title, parent, true)
# Line 2622  void MainWindow::on_show_tooltips_change Line 2587  void MainWindow::on_show_tooltips_change
2587      dimreg_all_regions.set_has_tooltip(b);      dimreg_all_regions.set_has_tooltip(b);
2588      dimreg_all_dimregs.set_has_tooltip(b);      dimreg_all_dimregs.set_has_tooltip(b);
2589      dimreg_stereo.set_has_tooltip(b);      dimreg_stereo.set_has_tooltip(b);
2590      m_TreeView.set_has_tooltip(b);  
2591        // Not doing this here, we let onQueryTreeViewTooltip() handle this per cell
2592        //m_TreeView.set_has_tooltip(b);
2593    
2594      m_TreeViewSamples.set_has_tooltip(b);      m_TreeViewSamples.set_has_tooltip(b);
2595      m_TreeViewScripts.set_has_tooltip(b);      m_TreeViewScripts.set_has_tooltip(b);
2596    
# Line 2648  void MainWindow::on_action_help_about() Line 2616  void MainWindow::on_action_help_about()
2616      dialog.set_name("Gigedit");      dialog.set_name("Gigedit");
2617  #endif  #endif
2618      dialog.set_version(VERSION);      dialog.set_version(VERSION);
2619      dialog.set_copyright("Copyright (C) 2006-2017 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2019 Andreas Persson");
2620      const std::string sComment =      const std::string sComment =
2621          _("Built " __DATE__ "\nUsing ") +          _("Built " __DATE__ "\nUsing ") +
2622          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +
# Line 2702  PropDialog::PropDialog() Line 2670  PropDialog::PropDialog()
2670      set_title(_("File Properties"));      set_title(_("File Properties"));
2671      eName.set_width_chars(50);      eName.set_width_chars(50);
2672    
2673        connect(eFileFormat, &PropDialog::set_FileFormat);
2674      connect(eName, &DLS::Info::Name);      connect(eName, &DLS::Info::Name);
2675      connect(eCreationDate, &DLS::Info::CreationDate);      connect(eCreationDate, &DLS::Info::CreationDate);
2676      connect(eComments, &DLS::Info::Comments);      connect(eComments, &DLS::Info::Comments);
# Line 2744  PropDialog::PropDialog() Line 2713  PropDialog::PropDialog()
2713  #endif  #endif
2714    
2715      add(vbox);      add(vbox);
2716  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
2717      table.set_margin(5);      table.set_margin(5);
2718  #else  #else
2719      table.set_border_width(5);      table.set_border_width(5);
# Line 2752  PropDialog::PropDialog() Line 2721  PropDialog::PropDialog()
2721      vbox.add(table);      vbox.add(table);
2722      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
2723      buttonBox.set_layout(Gtk::BUTTONBOX_END);      buttonBox.set_layout(Gtk::BUTTONBOX_END);
2724  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
2725      buttonBox.set_margin(5);      buttonBox.set_margin(5);
2726  #else  #else
2727      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
# Line 2763  PropDialog::PropDialog() Line 2732  PropDialog::PropDialog()
2732      quitButton.grab_focus();      quitButton.grab_focus();
2733      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
2734          sigc::mem_fun(*this, &PropDialog::hide));          sigc::mem_fun(*this, &PropDialog::hide));
     eFileFormat.signal_value_changed().connect(  
         sigc::mem_fun(*this, &PropDialog::onFileFormatChanged));  
2735    
2736      quitButton.show();      quitButton.show();
2737      vbox.show();      vbox.show();
# Line 2776  PropDialog::PropDialog() Line 2743  PropDialog::PropDialog()
2743  void PropDialog::set_file(gig::File* file)  void PropDialog::set_file(gig::File* file)
2744  {  {
2745      m_file = file;      m_file = file;
2746        update(file->pInfo);
2747    
2748      // update file format version combo box      // update file format version combo box
2749      const std::string sGiga = "Gigasampler/GigaStudio v";      const std::string sGiga = "Gigasampler/GigaStudio v";
# Line 2783  void PropDialog::set_file(gig::File* fil Line 2751  void PropDialog::set_file(gig::File* fil
2751      std::vector<std::string> txts;      std::vector<std::string> txts;
2752      std::vector<int> values;      std::vector<int> values;
2753      txts.push_back(sGiga + "2"); values.push_back(2);      txts.push_back(sGiga + "2"); values.push_back(2);
2754      txts.push_back(sGiga + "3/v4"); values.push_back(3);      txts.push_back(sGiga + "3"); values.push_back(3);
2755      if (major != 2 && major != 3) {      txts.push_back(sGiga + "4"); values.push_back(4);
2756        if (major < 2 || major > 4) {
2757          txts.push_back(sGiga + ToString(major)); values.push_back(major);          txts.push_back(sGiga + ToString(major)); values.push_back(major);
2758      }      }
2759      std::vector<const char*> texts;      std::vector<const char*> texts;
2760      for (int i = 0; i < txts.size(); ++i) texts.push_back(txts[i].c_str());      for (int i = 0; i < txts.size(); ++i) texts.push_back(txts[i].c_str());
2761      texts.push_back(NULL); values.push_back(0);      texts.push_back(NULL); values.push_back(0);
2762    
2763        update_model++;
2764      eFileFormat.set_choices(&texts[0], &values[0]);      eFileFormat.set_choices(&texts[0], &values[0]);
2765      eFileFormat.set_value(major);      eFileFormat.set_value(major);
2766        update_model--;
2767  }  }
2768    
2769  void PropDialog::onFileFormatChanged() {  void PropDialog::set_FileFormat(int value)
     const int major = eFileFormat.get_value();  
     if (m_file) m_file->pVersion->major = major;  
 }  
   
 void PropDialog::set_info(DLS::Info* info)  
2770  {  {
2771      update(info);      m_file->pVersion->major = value;
2772  }  }
2773    
2774    
# Line 2903  InstrumentProps::InstrumentProps() : Line 2870  InstrumentProps::InstrumentProps() :
2870      table.add(eDimensionKeyRangeHigh);      table.add(eDimensionKeyRangeHigh);
2871    
2872      add(vbox);      add(vbox);
2873  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
2874      table.set_margin(5);      table.set_margin(5);
2875  #else  #else
2876      table.set_border_width(5);      table.set_border_width(5);
# Line 2912  InstrumentProps::InstrumentProps() : Line 2879  InstrumentProps::InstrumentProps() :
2879      table.show();      table.show();
2880      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
2881      buttonBox.set_layout(Gtk::BUTTONBOX_END);      buttonBox.set_layout(Gtk::BUTTONBOX_END);
2882  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
2883      buttonBox.set_margin(5);      buttonBox.set_margin(5);
2884  #else  #else
2885      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
# Line 2974  void MainWindow::updateSampleRefCountMap Line 2941  void MainWindow::updateSampleRefCountMap
2941      }      }
2942  }  }
2943    
2944    bool MainWindow::onQueryTreeViewTooltip(int x, int y, bool keyboardTip, const Glib::RefPtr<Gtk::Tooltip>& tooltip) {
2945        Gtk::TreeModel::iterator iter;
2946        if (!m_TreeView.get_tooltip_context_iter(x, y, keyboardTip, iter)) {
2947            return false;
2948        }
2949        Gtk::TreeModel::Path path(iter);
2950        Gtk::TreeModel::Row row = *iter;
2951        Gtk::TreeViewColumn* pointedColumn = NULL;
2952        // resolve the precise table column the mouse points to
2953        {
2954            Gtk::TreeModel::Path path; // unused
2955            int cellX, cellY; // unused
2956            m_TreeView.get_path_at_pos(x, y, path, pointedColumn, cellX, cellY);
2957        }
2958        Gtk::TreeViewColumn* scriptsColumn = m_TreeView.get_column(2);
2959        if (pointedColumn == scriptsColumn) { // mouse hovers scripts column ...
2960            // show the script(s) assigned to the hovered instrument as tooltip
2961            tooltip->set_markup( row[m_Columns.m_col_tooltip] );
2962            m_TreeView.set_tooltip_cell(tooltip, &path, scriptsColumn, NULL);
2963        } else {
2964            // if beginners' tooltips is disabled then don't show the following one
2965            if (!Settings::singleton()->showTooltips)
2966                return false;
2967            // yeah, a beginners tooltip
2968            tooltip->set_text(_(
2969                "Right click here for actions on instruments & MIDI Rules. "
2970                "Drag & drop to change the order of instruments."
2971            ));
2972            m_TreeView.set_tooltip_cell(tooltip, &path, pointedColumn, NULL);
2973        }
2974        return true;
2975    }
2976    
2977    static Glib::ustring scriptTooltipFor(gig::Instrument* instrument, int index) {
2978        Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
2979        const int iScriptSlots = instrument->ScriptSlotCount();
2980        Glib::ustring tooltip = "<u>(" + ToString(index) + ") “"  + name + "”</u>\n\n";
2981        if (!iScriptSlots)
2982            tooltip += "<span foreground='red'><i>No script assigned</i></span>";
2983        else {
2984            for (int i = 0; i < iScriptSlots; ++i) {
2985                tooltip += "• " + ToString(i+1) + ". Script: “<span foreground='#46DEFF'><b>" +
2986                           instrument->GetScriptOfSlot(i)->Name + "</b></span>”";
2987                if (i + 1 < iScriptSlots) tooltip += "\n\n";
2988            }
2989        }
2990        return tooltip;
2991    }
2992    
2993  void MainWindow::load_gig(gig::File* gig, const char* filename, bool isSharedInstrument)  void MainWindow::load_gig(gig::File* gig, const char* filename, bool isSharedInstrument)
2994  {  {
2995      file = 0;      file = 0;
# Line 2988  void MainWindow::load_gig(gig::File* gig Line 3004  void MainWindow::load_gig(gig::File* gig
3004      file_is_changed = false;      file_is_changed = false;
3005    
3006      propDialog.set_file(gig);      propDialog.set_file(gig);
     propDialog.set_info(gig->pInfo);  
3007    
3008      instrument_name_connection.block();      instrument_name_connection.block();
3009      int index = 0;      int index = 0;
# Line 3003  void MainWindow::load_gig(gig::File* gig Line 3018  void MainWindow::load_gig(gig::File* gig
3018          row[m_Columns.m_col_name] = name;          row[m_Columns.m_col_name] = name;
3019          row[m_Columns.m_col_instr] = instrument;          row[m_Columns.m_col_instr] = instrument;
3020          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
3021            row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);
3022    
3023  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
3024          add_instrument_to_menu(name);          add_instrument_to_menu(name);
# Line 3120  void MainWindow::instr_name_changed_by_i Line 3136  void MainWindow::instr_name_changed_by_i
3136      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_Columns.m_col_instr];
3137      Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));      Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));
3138      if (gigname != name) {      if (gigname != name) {
3139            Gtk::TreeModel::Path path(*it);
3140            const int index = path[0];
3141          row[m_Columns.m_col_name] = gigname;          row[m_Columns.m_col_name] = gigname;
3142            row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);
3143      }      }
3144  }  }
3145    
# Line 3166  void MainWindow::onScriptSlotsModified(g Line 3185  void MainWindow::onScriptSlotsModified(g
3185          Gtk::TreeModel::Row row = model->children()[i];          Gtk::TreeModel::Row row = model->children()[i];
3186          if (row[m_Columns.m_col_instr] != pInstrument) continue;          if (row[m_Columns.m_col_instr] != pInstrument) continue;
3187          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";          row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
3188            row[m_Columns.m_col_tooltip] = scriptTooltipFor(pInstrument, i);
3189          break;          break;
3190      }      }
3191    
# Line 3191  void MainWindow::assignScript(gig::Scrip Line 3211  void MainWindow::assignScript(gig::Scrip
3211      onScriptSlotsModified(pInstrument);      onScriptSlotsModified(pInstrument);
3212  }  }
3213    
3214    void MainWindow::dropAllScriptSlots() {
3215        gig::Instrument* pInstrument = get_instrument();
3216        if (!pInstrument) {
3217            printf("!instrument\n");
3218            return;
3219        }
3220    
3221        const int iScriptSlots = pInstrument->ScriptSlotCount();
3222        for (int i = iScriptSlots - 1; i >= 0; --i)
3223            pInstrument->RemoveScriptSlot(i);
3224    
3225        onScriptSlotsModified(pInstrument);
3226    }
3227    
3228  void MainWindow::on_action_refresh_all() {  void MainWindow::on_action_refresh_all() {
3229      __refreshEntireGUI();      __refreshEntireGUI();
3230  }  }
# Line 3365  void MainWindow::select_instrument(gig:: Line 3399  void MainWindow::select_instrument(gig::
3399              show_intruments_tab();              show_intruments_tab();
3400              m_TreeView.get_selection()->unselect_all();              m_TreeView.get_selection()->unselect_all();
3401                            
3402  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
3403              auto iterSel = model->children()[i].get_iter();              auto iterSel = model->children()[i].get_iter();
3404              m_TreeView.get_selection()->select(iterSel);              m_TreeView.get_selection()->select(iterSel);
3405  #else  #else
# Line 3395  bool MainWindow::select_dimension_region Line 3429  bool MainWindow::select_dimension_region
3429              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
3430              show_intruments_tab();              show_intruments_tab();
3431              m_TreeView.get_selection()->unselect_all();              m_TreeView.get_selection()->unselect_all();
3432  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
3433              auto iterSel = model->children()[i].get_iter();              auto iterSel = model->children()[i].get_iter();
3434              m_TreeView.get_selection()->select(iterSel);              m_TreeView.get_selection()->select(iterSel);
3435  #else  #else
# Line 3431  void MainWindow::select_sample(gig::Samp Line 3465  void MainWindow::select_sample(gig::Samp
3465              if (rowSample[m_SamplesModel.m_col_sample] == sample) {              if (rowSample[m_SamplesModel.m_col_sample] == sample) {
3466                  show_samples_tab();                  show_samples_tab();
3467                  m_TreeViewSamples.get_selection()->unselect_all();                  m_TreeViewSamples.get_selection()->unselect_all();
3468  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
3469                  auto iterSel = rowGroup.children()[s].get_iter();                  auto iterSel = rowGroup.children()[s].get_iter();
3470                  m_TreeViewSamples.get_selection()->select(iterSel);                  m_TreeViewSamples.get_selection()->select(iterSel);
3471  #else  #else
# Line 3631  void MainWindow::updateScriptListOfMenu( Line 3665  void MainWindow::updateScriptListOfMenu(
3665          assign_scripts_menu->append(*item);          assign_scripts_menu->append(*item);
3666      }      }
3667    
3668        // add separator line to menu
3669        assign_scripts_menu->append(*new Gtk::SeparatorMenuItem);
3670    
3671        {
3672            Gtk::MenuItem* item = new Gtk::MenuItem(_("Unassign All Scripts"));
3673            item->signal_activate().connect(
3674                sigc::mem_fun(*this, &MainWindow::dropAllScriptSlots)
3675            );
3676            assign_scripts_menu->append(*item);
3677            item->set_accel_path("<Scripts>/DropAllScriptSlots");
3678        }
3679    
3680  #if HAS_GTKMM_SHOW_ALL_CHILDREN  #if HAS_GTKMM_SHOW_ALL_CHILDREN
3681      assign_scripts_menu->show_all_children();      assign_scripts_menu->show_all_children();
3682  #endif  #endif
# Line 3679  void MainWindow::add_instrument(gig::Ins Line 3725  void MainWindow::add_instrument(gig::Ins
3725      instrument_name_connection.block();      instrument_name_connection.block();
3726      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
3727      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
3728      rowInstr[m_Columns.m_col_nr] = m_refTreeModel->children().size() - 1;      const int index = m_refTreeModel->children().size() - 1;
3729        rowInstr[m_Columns.m_col_nr] = index;
3730      rowInstr[m_Columns.m_col_name] = name;      rowInstr[m_Columns.m_col_name] = name;
3731      rowInstr[m_Columns.m_col_instr] = instrument;      rowInstr[m_Columns.m_col_instr] = instrument;
3732      rowInstr[m_Columns.m_col_scripts] = "";      rowInstr[m_Columns.m_col_scripts] = "";
3733        rowInstr[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);
3734      instrument_name_connection.unblock();      instrument_name_connection.unblock();
3735    
3736  #if !USE_GTKMM_BUILDER  #if !USE_GTKMM_BUILDER
# Line 3769  void MainWindow::on_action_remove_instru Line 3817  void MainWindow::on_action_remove_instru
3817                       it != m_refTreeModel->children().end(); ++it, ++index)                       it != m_refTreeModel->children().end(); ++it, ++index)
3818                  {                  {
3819                      Gtk::TreeModel::Row row = *it;                      Gtk::TreeModel::Row row = *it;
3820                        gig::Instrument* instrument = row[m_Columns.m_col_instr];
3821                      row[m_Columns.m_col_nr] = index;                      row[m_Columns.m_col_nr] = index;
3822                        row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);
3823                  }                  }
3824              }              }
3825    
# Line 4690  bool MainWindow::instrument_row_visible( Line 4740  bool MainWindow::instrument_row_visible(
4740      trim(pattern);      trim(pattern);
4741      if (pattern.empty()) return true;      if (pattern.empty()) return true;
4742    
4743  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
4744      //HACK: on GTKMM4 development branch const_iterator cannot be easily converted to iterator, probably going to be fixed before final GTKMM4 release though.      //HACK: on GTKMM4 development branch const_iterator cannot be easily converted to iterator, probably going to be fixed before final GTKMM4 release though.
4745      Gtk::TreeModel::Row row = **(Gtk::TreeModel::iterator*)(&iter);      Gtk::TreeModel::Row row = **(Gtk::TreeModel::iterator*)(&iter);
4746  #else  #else
Legend:
Removed from v.3409  
changed lines
  Added in v.3470
  ViewVC Help
Powered by ViewVC