/[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 2771 by schoenebeck, Tue Jan 20 18:48:15 2015 UTC revision 2772 by schoenebeck, Thu Jun 11 20:29:22 2015 UTC
# Line 186  MainWindow::MainWindow() : Line 186  MainWindow::MainWindow() :
186      actionGroup->add(toggle_action,      actionGroup->add(toggle_action,
187                       sigc::mem_fun(                       sigc::mem_fun(
188                           *this, &MainWindow::on_action_view_status_bar));                           *this, &MainWindow::on_action_view_status_bar));
189        actionGroup->add(
190            Gtk::Action::create("RefreshAll", _("_Refresh All")),
191            sigc::mem_fun(*this, &MainWindow::on_action_refresh_all)
192        );                
193    
194      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);
195      actionGroup->add(Gtk::Action::create("MenuHelp",      actionGroup->add(Gtk::Action::create("MenuHelp",
# Line 257  MainWindow::MainWindow() : Line 261  MainWindow::MainWindow() :
261          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
262      );      );
263      actionGroup->add(      actionGroup->add(
264            Gtk::Action::create("RemoveUnusedSamples", _("Remove _Unused Samples")),
265            sigc::mem_fun(*this, &MainWindow::on_action_remove_unused_samples)
266        );
267        actionGroup->add(
268          Gtk::Action::create("ShowSampleRefs", _("Show References...")),          Gtk::Action::create("ShowSampleRefs", _("Show References...")),
269          sigc::mem_fun(*this, &MainWindow::on_action_view_references)          sigc::mem_fun(*this, &MainWindow::on_action_view_references)
270      );      );
# Line 321  MainWindow::MainWindow() : Line 329  MainWindow::MainWindow() :
329          "      <menuitem action='ReplaceAllSamplesInAllGroups' />"          "      <menuitem action='ReplaceAllSamplesInAllGroups' />"
330          "      <separator/>"          "      <separator/>"
331          "      <menuitem action='RemoveSample'/>"          "      <menuitem action='RemoveSample'/>"
332            "      <menuitem action='RemoveUnusedSamples'/>"
333          "    </menu>"          "    </menu>"
334          "    <menu action='MenuInstrument'>"          "    <menu action='MenuInstrument'>"
335          "      <menu action='AllInstruments'>"          "      <menu action='AllInstruments'>"
# Line 343  MainWindow::MainWindow() : Line 352  MainWindow::MainWindow() :
352          "    </menu>"          "    </menu>"
353          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
354          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
355            "      <separator/>"
356            "      <menuitem action='RefreshAll'/>"
357          "    </menu>"          "    </menu>"
358          "    <menu action='MenuTools'>"          "    <menu action='MenuTools'>"
359          "      <menuitem action='CombineInstruments'/>"          "      <menuitem action='CombineInstruments'/>"
# Line 374  MainWindow::MainWindow() : Line 385  MainWindow::MainWindow() :
385          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"          "    <menuitem action='ReplaceAllSamplesInAllGroups' />"
386          "    <separator/>"          "    <separator/>"
387          "    <menuitem action='RemoveSample'/>"          "    <menuitem action='RemoveSample'/>"
388            "    <menuitem action='RemoveUnusedSamples'/>"
389          "  </popup>"          "  </popup>"
390          "  <popup name='ScriptPopupMenu'>"          "  <popup name='ScriptPopupMenu'>"
391          "    <menuitem action='AddScriptGroup'/>"          "    <menuitem action='AddScriptGroup'/>"
# Line 418  MainWindow::MainWindow() : Line 430  MainWindow::MainWindow() :
430      }      }
431      {      {
432          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
433                uiManager->get_widget("/MenuBar/MenuSample/RemoveUnusedSamples"));
434            item->set_tooltip_text(_("Removes all samples that are not referenced by any instrument (i.e. red ones)."));
435            // copy tooltip to popup menu
436            Gtk::MenuItem* item2 = dynamic_cast<Gtk::MenuItem*>(
437                uiManager->get_widget("/SamplePopupMenu/RemoveUnusedSamples"));
438            item2->set_tooltip_text(item->get_tooltip_text());
439        }
440        {
441            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
442                uiManager->get_widget("/MenuBar/MenuView/RefreshAll"));
443            item->set_tooltip_text(_("Reloads the currently open gig file and updates the entire graphical user interface."));
444        }
445        {
446            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
447              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));
448          item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file."));          item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file."));
449      }      }
# Line 1689  void MainWindow::load_gig(gig::File* gig Line 1715  void MainWindow::load_gig(gig::File* gig
1715      file = 0;      file = 0;
1716      set_file_is_shared(isSharedInstrument);      set_file_is_shared(isSharedInstrument);
1717    
1718      this->filename = filename ? filename : _("Unsaved Gig File");      this->filename =
1719            (filename && strlen(filename) > 0) ?
1720                filename : (!gig->GetFileName().empty()) ?
1721                    gig->GetFileName() : _("Unsaved Gig File");
1722      set_title(Glib::filename_display_basename(this->filename));      set_title(Glib::filename_display_basename(this->filename));
1723      file_has_name = filename;      file_has_name = filename;
1724      file_is_changed = false;      file_is_changed = false;
# Line 1843  void MainWindow::show_script_slots() { Line 1872  void MainWindow::show_script_slots() {
1872      window->show();      window->show();
1873  }  }
1874    
1875    void MainWindow::on_action_refresh_all() {
1876        __refreshEntireGUI();
1877    }
1878    
1879  void MainWindow::on_action_view_status_bar() {  void MainWindow::on_action_view_status_bar() {
1880      Gtk::CheckMenuItem* item =      Gtk::CheckMenuItem* item =
1881          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));
# Line 2714  void MainWindow::on_action_remove_sample Line 2747  void MainWindow::on_action_remove_sample
2747      }      }
2748  }  }
2749    
2750    void MainWindow::on_action_remove_unused_samples() {
2751        if (!file) return;
2752    
2753        // collect all samples that are not referenced by any instrument
2754        std::list<gig::Sample*> lsamples;
2755        for (int iSample = 0; file->GetSample(iSample); ++iSample) {
2756            gig::Sample* sample = file->GetSample(iSample);
2757            bool isUsed = false;
2758            for (gig::Instrument* instrument = file->GetFirstInstrument(); instrument;
2759                                  instrument = file->GetNextInstrument())
2760            {
2761                for (gig::Region* rgn = instrument->GetFirstRegion(); rgn;
2762                                  rgn = instrument->GetNextRegion())
2763                {
2764                    for (int i = 0; i < 256; ++i) {
2765                        if (!rgn->pDimensionRegions[i]) continue;
2766                        if (rgn->pDimensionRegions[i]->pSample != sample) continue;
2767                        isUsed = true;
2768                        goto endOfRefSearch;
2769                    }
2770                }
2771            }
2772            endOfRefSearch:
2773            if (!isUsed) lsamples.push_back(sample);
2774        }
2775    
2776        if (lsamples.empty()) return;
2777    
2778        // notify everybody that we're going to remove these samples
2779        samples_to_be_removed_signal.emit(lsamples);
2780    
2781        // remove collected samples
2782        try {
2783            for (std::list<gig::Sample*>::iterator itSample = lsamples.begin();
2784                 itSample != lsamples.end(); ++itSample)
2785            {
2786                gig::Sample* sample = *itSample;
2787                // remove sample from the .gig file
2788                file->DeleteSample(sample);
2789                // if sample was just previously added, remove it fro the import queue
2790                for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
2791                     iter != m_SampleImportQueue.end(); ++iter)
2792                {
2793                    if ((*iter).gig_sample == sample) {
2794                        printf("Removing previously added sample '%s'\n",
2795                               (*iter).sample_path.c_str());
2796                        m_SampleImportQueue.erase(iter);
2797                        break;
2798                    }
2799                }
2800            }
2801        } catch (RIFF::Exception e) {
2802            // show error message
2803            Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
2804            msg.run();
2805        }
2806    
2807        // notify everybody that we're done with removal
2808        samples_removed_signal.emit();
2809    
2810        dimreg_changed();
2811        file_changed();
2812        __refreshEntireGUI();
2813    }
2814    
2815  // see comment on on_sample_treeview_drag_begin()  // see comment on on_sample_treeview_drag_begin()
2816  void MainWindow::on_scripts_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)  void MainWindow::on_scripts_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
2817  {  {
# Line 3186  void MainWindow::on_action_merge_files() Line 3284  void MainWindow::on_action_merge_files()
3284          }          }
3285    
3286          // update GUI          // update GUI
3287          __refreshEntireGUI();                  __refreshEntireGUI();
3288      }      }
3289  }  }
3290    

Legend:
Removed from v.2771  
changed lines
  Added in v.2772

  ViewVC Help
Powered by ViewVC