/[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 3418 by schoenebeck, Sat Feb 10 11:36:16 2018 UTC revision 3471 by persson, Sat Feb 16 19:13:37 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 1516  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 1524  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 1546  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 1636  MainWindow::MainWindow() : Line 1644  MainWindow::MainWindow() :
1644          Gtk::AccelMap::add_entry("<Scripts>/script_16", GDK_KEY_F17, Gdk::SHIFT_MASK);          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);          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);          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 1883  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 1902  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 1926  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    
1973  void saver_progress_callback(gig::progress_t* progress)  void LoaderSaverBase::join() {
1974  {      thread->join();
     Saver* saver = static_cast<Saver*>(progress->custom);  
     saver->progress_callback(progress->factor);  
1975  }  }
1976    
1977  void Saver::progress_callback(float fraction)  
1978    Loader::Loader(const char* filename) :
1979        LoaderSaverBase(filename, 0)
1980  {  {
     {  
         Glib::Threads::Mutex::Lock lock(progressMutex);  
         progress = fraction;  
     }  
     progress_dispatcher.emit();  
1981  }  }
1982    
1983  #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()  
1984  {  {
1985      printf("thread_function self=%p\n",      RIFF::File* riff = new RIFF::File(filename);
1986             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);  
         }  
1987    
1988          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();  
     }  
1989  }  }
1990    
1991  Saver::Saver(gig::File* file, Glib::ustring filename)  
1992      : gig(file), filename(filename), thread(0), progress(0.f)  Saver::Saver(gig::File* file, Glib::ustring filename) :
1993        LoaderSaverBase(filename, file)
1994  {  {
1995  }  }
1996    
1997  void Saver::launch()  void Saver::thread_function_sub(gig::progress_t& progress)
1998  {  {
1999  #ifdef OLD_THREADS      // if no filename was provided, that means "save", if filename was provided means "save as"
2000      thread = Glib::Thread::create(sigc::mem_fun(*this, &Saver::thread_function), true);      if (filename.empty()) {
2001            if (!Settings::singleton()->saveWithTemporaryFile) {
2002                // save directly over the existing .gig file
2003                // (requires less disk space than solution below
2004                // but may be slower)
2005                gig->Save(&progress);
2006            } else {
2007                // save the file as separate temporary file first,
2008                // then move the saved file over the old file
2009                // (may result in performance speedup during save)
2010                gig::String tmpname = filename + ".TMP";
2011                gig->Save(tmpname, &progress);
2012    #if defined(WIN32)
2013                if (!DeleteFile(filename.c_str())) {
2014                    throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file).");
2015                }
2016    #else // POSIX ...
2017                if (unlink(filename.c_str())) {
2018                    throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file): " + gig::String(strerror(errno)));
2019                }
2020    #endif
2021                if (rename(tmpname.c_str(), filename.c_str())) {
2022    #if defined(WIN32)
2023                    throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file).");
2024  #else  #else
2025      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)));
2026  #endif  #endif
2027      printf("launch thread=%p\n", static_cast<void*>(thread));              }
2028  }          }
2029        } else {
2030  float Saver::get_progress()          gig->Save(filename, &progress);
 {  
     float res;  
     {  
         Glib::Threads::Mutex::Lock lock(progressMutex);  
         res = progress;  
2031      }      }
     return res;  
2032  }  }
2033    
 Glib::Dispatcher& Saver::signal_progress()  
 {  
     return progress_dispatcher;  
 }  
   
 Glib::Dispatcher& Saver::signal_finished()  
 {  
     return finished_dispatcher;  
 }  
   
 Glib::Dispatcher& Saver::signal_error()  
 {  
     return error_dispatcher;  
 }  
2034    
2035  ProgressDialog::ProgressDialog(const Glib::ustring& title, Gtk::Window& parent)  ProgressDialog::ProgressDialog(const Glib::ustring& title, Gtk::Window& parent)
2036      : Gtk::Dialog(title, parent, true)      : Gtk::Dialog(title, parent, true)
# Line 2310  void MainWindow::on_loader_progress() Line 2262  void MainWindow::on_loader_progress()
2262    
2263  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
2264  {  {
2265        loader->join();
2266      printf("Loader finished!\n");      printf("Loader finished!\n");
2267      printf("on_loader_finished self=%p\n",      printf("on_loader_finished self=%p\n",
2268             static_cast<void*>(Glib::Threads::Thread::self()));             static_cast<void*>(Glib::Threads::Thread::self()));
# Line 2319  void MainWindow::on_loader_finished() Line 2272  void MainWindow::on_loader_finished()
2272    
2273  void MainWindow::on_loader_error()  void MainWindow::on_loader_error()
2274  {  {
2275        loader->join();
2276      Glib::ustring txt = _("Could not load file: ") + loader->error_message;      Glib::ustring txt = _("Could not load file: ") + loader->error_message;
2277      Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);      Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
2278      msg.run();      msg.run();
# Line 2389  void MainWindow::on_saver_progress() Line 2343  void MainWindow::on_saver_progress()
2343    
2344  void MainWindow::on_saver_error()  void MainWindow::on_saver_error()
2345  {  {
2346        saver->join();
2347      file_structure_changed_signal.emit(this->file);      file_structure_changed_signal.emit(this->file);
2348      Glib::ustring txt = _("Could not save file: ") + saver->error_message;      Glib::ustring txt = _("Could not save file: ") + saver->error_message;
2349      Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);      Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
# Line 2397  void MainWindow::on_saver_error() Line 2352  void MainWindow::on_saver_error()
2352    
2353  void MainWindow::on_saver_finished()  void MainWindow::on_saver_finished()
2354  {  {
2355        saver->join();
2356      this->file = saver->gig;      this->file = saver->gig;
2357      this->filename = saver->filename;      this->filename = saver->filename;
2358      current_gig_dir = Glib::path_get_dirname(filename);      current_gig_dir = Glib::path_get_dirname(filename);
# Line 2668  void MainWindow::on_action_help_about() Line 2624  void MainWindow::on_action_help_about()
2624      dialog.set_name("Gigedit");      dialog.set_name("Gigedit");
2625  #endif  #endif
2626      dialog.set_version(VERSION);      dialog.set_version(VERSION);
2627      dialog.set_copyright("Copyright (C) 2006-2017 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2019 Andreas Persson");
2628      const std::string sComment =      const std::string sComment =
2629          _("Built " __DATE__ "\nUsing ") +          _("Built " __DATE__ "\nUsing ") +
2630          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +
# Line 2722  PropDialog::PropDialog() Line 2678  PropDialog::PropDialog()
2678      set_title(_("File Properties"));      set_title(_("File Properties"));
2679      eName.set_width_chars(50);      eName.set_width_chars(50);
2680    
2681        connect(eFileFormat, &PropDialog::set_FileFormat);
2682      connect(eName, &DLS::Info::Name);      connect(eName, &DLS::Info::Name);
2683      connect(eCreationDate, &DLS::Info::CreationDate);      connect(eCreationDate, &DLS::Info::CreationDate);
2684      connect(eComments, &DLS::Info::Comments);      connect(eComments, &DLS::Info::Comments);
# Line 2764  PropDialog::PropDialog() Line 2721  PropDialog::PropDialog()
2721  #endif  #endif
2722    
2723      add(vbox);      add(vbox);
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      table.set_margin(5);      table.set_margin(5);
2726  #else  #else
2727      table.set_border_width(5);      table.set_border_width(5);
# Line 2772  PropDialog::PropDialog() Line 2729  PropDialog::PropDialog()
2729      vbox.add(table);      vbox.add(table);
2730      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
2731      buttonBox.set_layout(Gtk::BUTTONBOX_END);      buttonBox.set_layout(Gtk::BUTTONBOX_END);
2732  #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)
2733      buttonBox.set_margin(5);      buttonBox.set_margin(5);
2734  #else  #else
2735      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
# Line 2783  PropDialog::PropDialog() Line 2740  PropDialog::PropDialog()
2740      quitButton.grab_focus();      quitButton.grab_focus();
2741      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
2742          sigc::mem_fun(*this, &PropDialog::hide));          sigc::mem_fun(*this, &PropDialog::hide));
     eFileFormat.signal_value_changed().connect(  
         sigc::mem_fun(*this, &PropDialog::onFileFormatChanged));  
2743    
2744      quitButton.show();      quitButton.show();
2745      vbox.show();      vbox.show();
# Line 2796  PropDialog::PropDialog() Line 2751  PropDialog::PropDialog()
2751  void PropDialog::set_file(gig::File* file)  void PropDialog::set_file(gig::File* file)
2752  {  {
2753      m_file = file;      m_file = file;
2754        update(file->pInfo);
2755    
2756      // update file format version combo box      // update file format version combo box
2757      const std::string sGiga = "Gigasampler/GigaStudio v";      const std::string sGiga = "Gigasampler/GigaStudio v";
# Line 2803  void PropDialog::set_file(gig::File* fil Line 2759  void PropDialog::set_file(gig::File* fil
2759      std::vector<std::string> txts;      std::vector<std::string> txts;
2760      std::vector<int> values;      std::vector<int> values;
2761      txts.push_back(sGiga + "2"); values.push_back(2);      txts.push_back(sGiga + "2"); values.push_back(2);
2762      txts.push_back(sGiga + "3/v4"); values.push_back(3);      txts.push_back(sGiga + "3"); values.push_back(3);
2763      if (major != 2 && major != 3) {      txts.push_back(sGiga + "4"); values.push_back(4);
2764        if (major < 2 || major > 4) {
2765          txts.push_back(sGiga + ToString(major)); values.push_back(major);          txts.push_back(sGiga + ToString(major)); values.push_back(major);
2766      }      }
2767      std::vector<const char*> texts;      std::vector<const char*> texts;
2768      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());
2769      texts.push_back(NULL); values.push_back(0);      texts.push_back(NULL); values.push_back(0);
2770    
2771        update_model++;
2772      eFileFormat.set_choices(&texts[0], &values[0]);      eFileFormat.set_choices(&texts[0], &values[0]);
2773      eFileFormat.set_value(major);      eFileFormat.set_value(major);
2774        update_model--;
2775  }  }
2776    
2777  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)  
2778  {  {
2779      update(info);      m_file->pVersion->major = value;
2780  }  }
2781    
2782    
# Line 2923  InstrumentProps::InstrumentProps() : Line 2878  InstrumentProps::InstrumentProps() :
2878      table.add(eDimensionKeyRangeHigh);      table.add(eDimensionKeyRangeHigh);
2879    
2880      add(vbox);      add(vbox);
2881  #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)
2882      table.set_margin(5);      table.set_margin(5);
2883  #else  #else
2884      table.set_border_width(5);      table.set_border_width(5);
# Line 2932  InstrumentProps::InstrumentProps() : Line 2887  InstrumentProps::InstrumentProps() :
2887      table.show();      table.show();
2888      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
2889      buttonBox.set_layout(Gtk::BUTTONBOX_END);      buttonBox.set_layout(Gtk::BUTTONBOX_END);
2890  #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)
2891      buttonBox.set_margin(5);      buttonBox.set_margin(5);
2892  #else  #else
2893      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
# Line 2996  void MainWindow::updateSampleRefCountMap Line 2951  void MainWindow::updateSampleRefCountMap
2951    
2952  bool MainWindow::onQueryTreeViewTooltip(int x, int y, bool keyboardTip, const Glib::RefPtr<Gtk::Tooltip>& tooltip) {  bool MainWindow::onQueryTreeViewTooltip(int x, int y, bool keyboardTip, const Glib::RefPtr<Gtk::Tooltip>& tooltip) {
2953      Gtk::TreeModel::iterator iter;      Gtk::TreeModel::iterator iter;
2954      m_TreeView.get_tooltip_context_iter(x, y, keyboardTip, iter);      if (!m_TreeView.get_tooltip_context_iter(x, y, keyboardTip, iter)) {
2955            return false;
2956        }
2957      Gtk::TreeModel::Path path(iter);      Gtk::TreeModel::Path path(iter);
2958      Gtk::TreeModel::Row row = *iter;      Gtk::TreeModel::Row row = *iter;
2959      Gtk::TreeViewColumn* pointedColumn = NULL;      Gtk::TreeViewColumn* pointedColumn = NULL;
# Line 3028  bool MainWindow::onQueryTreeViewTooltip( Line 2985  bool MainWindow::onQueryTreeViewTooltip(
2985  static Glib::ustring scriptTooltipFor(gig::Instrument* instrument, int index) {  static Glib::ustring scriptTooltipFor(gig::Instrument* instrument, int index) {
2986      Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));      Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
2987      const int iScriptSlots = instrument->ScriptSlotCount();      const int iScriptSlots = instrument->ScriptSlotCount();
2988      Glib::ustring tooltip = "<u>(" + ToString(index) + ") „"  + name + "”</u>\n\n";      Glib::ustring tooltip = "<u>(" + ToString(index) + ") “"  + name + "”</u>\n\n";
2989      if (!iScriptSlots)      if (!iScriptSlots)
2990          tooltip += "<span foreground='red'><i>No script assigned</i></span>";          tooltip += "<span foreground='red'><i>No script assigned</i></span>";
2991      else {      else {
2992          for (int i = 0; i < iScriptSlots; ++i) {          for (int i = 0; i < iScriptSlots; ++i) {
2993              tooltip += "• " + ToString(i+1) + ". Script:  „<span foreground='#46DEFF'><b>" +              tooltip += "• " + ToString(i+1) + ". Script: “<span foreground='#46DEFF'><b>" +
2994                         instrument->GetScriptOfSlot(i)->Name + "</b></span>”";                         instrument->GetScriptOfSlot(i)->Name + "</b></span>”";
2995              if (i + 1 < iScriptSlots) tooltip += "\n\n";              if (i + 1 < iScriptSlots) tooltip += "\n\n";
2996          }          }
# Line 3055  void MainWindow::load_gig(gig::File* gig Line 3012  void MainWindow::load_gig(gig::File* gig
3012      file_is_changed = false;      file_is_changed = false;
3013    
3014      propDialog.set_file(gig);      propDialog.set_file(gig);
     propDialog.set_info(gig->pInfo);  
3015    
3016      instrument_name_connection.block();      instrument_name_connection.block();
3017      int index = 0;      int index = 0;
# Line 3263  void MainWindow::assignScript(gig::Scrip Line 3219  void MainWindow::assignScript(gig::Scrip
3219      onScriptSlotsModified(pInstrument);      onScriptSlotsModified(pInstrument);
3220  }  }
3221    
3222    void MainWindow::dropAllScriptSlots() {
3223        gig::Instrument* pInstrument = get_instrument();
3224        if (!pInstrument) {
3225            printf("!instrument\n");
3226            return;
3227        }
3228    
3229        const int iScriptSlots = pInstrument->ScriptSlotCount();
3230        for (int i = iScriptSlots - 1; i >= 0; --i)
3231            pInstrument->RemoveScriptSlot(i);
3232    
3233        onScriptSlotsModified(pInstrument);
3234    }
3235    
3236  void MainWindow::on_action_refresh_all() {  void MainWindow::on_action_refresh_all() {
3237      __refreshEntireGUI();      __refreshEntireGUI();
3238  }  }
# Line 3437  void MainWindow::select_instrument(gig:: Line 3407  void MainWindow::select_instrument(gig::
3407              show_intruments_tab();              show_intruments_tab();
3408              m_TreeView.get_selection()->unselect_all();              m_TreeView.get_selection()->unselect_all();
3409                            
3410  #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)
3411              auto iterSel = model->children()[i].get_iter();              auto iterSel = model->children()[i].get_iter();
3412              m_TreeView.get_selection()->select(iterSel);              m_TreeView.get_selection()->select(iterSel);
3413  #else  #else
# Line 3467  bool MainWindow::select_dimension_region Line 3437  bool MainWindow::select_dimension_region
3437              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
3438              show_intruments_tab();              show_intruments_tab();
3439              m_TreeView.get_selection()->unselect_all();              m_TreeView.get_selection()->unselect_all();
3440  #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)
3441              auto iterSel = model->children()[i].get_iter();              auto iterSel = model->children()[i].get_iter();
3442              m_TreeView.get_selection()->select(iterSel);              m_TreeView.get_selection()->select(iterSel);
3443  #else  #else
# Line 3503  void MainWindow::select_sample(gig::Samp Line 3473  void MainWindow::select_sample(gig::Samp
3473              if (rowSample[m_SamplesModel.m_col_sample] == sample) {              if (rowSample[m_SamplesModel.m_col_sample] == sample) {
3474                  show_samples_tab();                  show_samples_tab();
3475                  m_TreeViewSamples.get_selection()->unselect_all();                  m_TreeViewSamples.get_selection()->unselect_all();
3476  #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)
3477                  auto iterSel = rowGroup.children()[s].get_iter();                  auto iterSel = rowGroup.children()[s].get_iter();
3478                  m_TreeViewSamples.get_selection()->select(iterSel);                  m_TreeViewSamples.get_selection()->select(iterSel);
3479  #else  #else
# Line 3703  void MainWindow::updateScriptListOfMenu( Line 3673  void MainWindow::updateScriptListOfMenu(
3673          assign_scripts_menu->append(*item);          assign_scripts_menu->append(*item);
3674      }      }
3675    
3676        // add separator line to menu
3677        assign_scripts_menu->append(*new Gtk::SeparatorMenuItem);
3678    
3679        {
3680            Gtk::MenuItem* item = new Gtk::MenuItem(_("Unassign All Scripts"));
3681            item->signal_activate().connect(
3682                sigc::mem_fun(*this, &MainWindow::dropAllScriptSlots)
3683            );
3684            assign_scripts_menu->append(*item);
3685            item->set_accel_path("<Scripts>/DropAllScriptSlots");
3686        }
3687    
3688  #if HAS_GTKMM_SHOW_ALL_CHILDREN  #if HAS_GTKMM_SHOW_ALL_CHILDREN
3689      assign_scripts_menu->show_all_children();      assign_scripts_menu->show_all_children();
3690  #endif  #endif
# Line 4766  bool MainWindow::instrument_row_visible( Line 4748  bool MainWindow::instrument_row_visible(
4748      trim(pattern);      trim(pattern);
4749      if (pattern.empty()) return true;      if (pattern.empty()) return true;
4750    
4751  #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)
4752      //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.
4753      Gtk::TreeModel::Row row = **(Gtk::TreeModel::iterator*)(&iter);      Gtk::TreeModel::Row row = **(Gtk::TreeModel::iterator*)(&iter);
4754  #else  #else
Legend:
Removed from v.3418  
changed lines
  Added in v.3471
  ViewVC Help
Powered by ViewVC