/[svn]/gigedit/trunk/src/gigedit/dimregionedit.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/dimregionedit.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2690 by schoenebeck, Sun Jan 4 18:36:42 2015 UTC revision 2691 by schoenebeck, Sun Jan 4 19:46:54 2015 UTC
# Line 241  DimRegionEdit::DimRegionEdit() : Line 241  DimRegionEdit::DimRegionEdit() :
241      eSampleLoopType(_("Loop type")),      eSampleLoopType(_("Loop type")),
242      eSampleLoopInfinite(_("Infinite loop")),      eSampleLoopInfinite(_("Infinite loop")),
243      eSampleLoopPlayCount(_("Playback count"), 1),      eSampleLoopPlayCount(_("Playback count"), 1),
244        buttonSelectSample(Glib::ustring("<- ") + _("Select Sample")),
245      update_model(0)      update_model(0)
246  {  {
247      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);
# Line 350  DimRegionEdit::DimRegionEdit() : Line 351  DimRegionEdit::DimRegionEdit() :
351      connect(eSampleLoopLength, &DimRegionEdit::set_LoopLength);      connect(eSampleLoopLength, &DimRegionEdit::set_LoopLength);
352      connect(eSampleLoopInfinite, &DimRegionEdit::set_LoopInfinite);      connect(eSampleLoopInfinite, &DimRegionEdit::set_LoopInfinite);
353      connect(eSampleLoopPlayCount, &DimRegionEdit::set_LoopPlayCount);      connect(eSampleLoopPlayCount, &DimRegionEdit::set_LoopPlayCount);
354        buttonSelectSample.signal_clicked().connect(
355            sigc::mem_fun(*this, &DimRegionEdit::onButtonSelectSamplePressed)
356        );
357    
358      for (int i = 0 ; i < 7 ; i++) {      for (int i = 0 ; i < 7 ; i++) {
359          table[i] = new Gtk::Table(3, 1);          table[i] = new Gtk::Table(3, 1);
# Line 360  DimRegionEdit::DimRegionEdit() : Line 364  DimRegionEdit::DimRegionEdit() :
364      eUnityNote.set_tip(      eUnityNote.set_tip(
365          _("Note this sample is associated with (a.k.a. 'root note')")          _("Note this sample is associated with (a.k.a. 'root note')")
366      );      );
367        buttonSelectSample.set_tooltip_text(
368            _("Selects the sample of this dimension region on the left hand side's sample tree view.")
369        );
370      eSampleStartOffset.set_tip(_("Sample position at which playback should be started"));      eSampleStartOffset.set_tip(_("Sample position at which playback should be started"));
371      ePan.set_tip(_("Stereo balance (left/right)"));      ePan.set_tip(_("Stereo balance (left/right)"));
372      eChannelOffset.set_tip(      eChannelOffset.set_tip(
# Line 453  DimRegionEdit::DimRegionEdit() : Line 460  DimRegionEdit::DimRegionEdit() :
460      addProp(eUnityNote);      addProp(eUnityNote);
461      addProp(eSampleFormatInfo);      addProp(eSampleFormatInfo);
462      addProp(eSampleID);      addProp(eSampleID);
463        addRightHandSide(buttonSelectSample);
464      addHeader(_("Optional Settings"));      addHeader(_("Optional Settings"));
465      addProp(eSampleStartOffset);      addProp(eSampleStartOffset);
466      addProp(eChannelOffset);      addProp(eChannelOffset);
# Line 884  void DimRegionEdit::addProp(LabelWidget& Line 892  void DimRegionEdit::addProp(LabelWidget&
892      rowno++;      rowno++;
893  }  }
894    
895    void DimRegionEdit::addRightHandSide(Gtk::Widget& widget)
896    {
897        table[pageno]->attach(widget, 2, 3, rowno, rowno + 1,
898                              Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
899        rowno++;
900    }
901    
902  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)
903  {  {
# Line 1007  void DimRegionEdit::set_dim_region(gig:: Line 1021  void DimRegionEdit::set_dim_region(gig::
1021          }          }
1022          eSampleID.text.set_text(s);          eSampleID.text.set_text(s);
1023      }      }
1024        buttonSelectSample.set_sensitive(d && d->pSample);
1025      eFineTune.set_value(d->FineTune);      eFineTune.set_value(d->FineTune);
1026      eGain.set_value(d->Gain);      eGain.set_value(d->Gain);
1027      eGainPlus6.set_value(d->Gain);      eGainPlus6.set_value(d->Gain);
# Line 1453  void DimRegionEdit::set_LoopPlayCount(gi Line 1468  void DimRegionEdit::set_LoopPlayCount(gi
1468  {  {
1469      if (d->pSample) d->pSample->LoopPlayCount = value;      if (d->pSample) d->pSample->LoopPlayCount = value;
1470  }  }
1471    
1472    void DimRegionEdit::onButtonSelectSamplePressed() {
1473        if (!dimregion) return;
1474        if (!dimregion->pSample) return;
1475        select_sample_signal.emit(dimregion->pSample);
1476    }
1477    
1478    sigc::signal<void, gig::Sample*>& DimRegionEdit::signal_select_sample() {
1479        return select_sample_signal;
1480    }

Legend:
Removed from v.2690  
changed lines
  Added in v.2691

  ViewVC Help
Powered by ViewVC