← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/muse/oneiric

« back to all changes in this revision

Viewing changes to muse/arranger/arranger.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Fabrice Coutadeur
  • Date: 2010-11-17 21:43:38 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20101117214338-1hvfl7oo2dsqnvrb
Tags: 1.1-0ubuntu1
https://launchpad.net/bugs/668631
* New upstream release (LP: #668631)
* Switch to dpkg-source 3.0 (quilt) format
* Switch to dh7 short form
* debian/rules:
  - added --enable-dssi and --enable-osc to conf flags for dssi support
  - added -ljackserver to LDFLAGS to fix a FTBFS because of --as-needed
* debian/control:
  - added build build dependency on liblo-dev and dssi-dev for dssi support
  - bump Standards-version to 3.9.1. No changes required.
* debian/muse.desktop, debian/muse.xpm: dropped as desktop file and icon is
  now shipped upstream.
* fix-desktop-categories.patch: fix Categories tag in upstream desktop file
* 10_es_locale_fix.dpatch: refreshed and converted to quilt as
  fix_es_locale.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
muse/arranger/arranger.cpp
67
67
      if (section == -1)
68
68
            return QString::null;
69
69
      switch(section) {
70
 
            case COL_RECORD:   return QHeader::tr("Enable Recording"); break;
71
 
            case COL_MUTE:     return QHeader::tr("Mute Indicator"); break;
72
 
            case COL_SOLO:     return QHeader::tr("Solo Indicator"); break;
73
 
            case COL_CLASS:    return QHeader::tr("Track Type"); break;
74
 
            case COL_NAME:     return QHeader::tr("Track Name"); break;
75
 
            case COL_OCHANNEL: return QHeader::tr("Output Channel Number"); break;
76
 
            case COL_OPORT:    return QHeader::tr("Output Port"); break;
77
 
            case COL_TIMELOCK: return QHeader::tr("Time Lock"); break;
 
70
            case COL_RECORD:   return QHeader::tr("Enable recording. Click to toggle."); break;
 
71
            case COL_MUTE:     return QHeader::tr("Mute indicator. Click to toggle.\nRight-click to toggle track on/off.\nMute is designed for rapid, repeated action.\nOn/Off is not!"); break;
 
72
            case COL_SOLO:     return QHeader::tr("Solo indicator. Click to toggle.\nConnected tracks are also 'phantom' soloed,\n indicated by a dark square."); break;
 
73
            case COL_CLASS:    return QHeader::tr("Track type. Right-click to change\n midi and drum track types."); break;
 
74
            case COL_NAME:     return QHeader::tr("Track name. Double-click to edit.\nRight-click for more options."); break;
 
75
            case COL_OCHANNEL: return QHeader::tr("Midi/drum track: Output channel number.\nAudio track: Channels.\nMid/right-click to change."); break;
 
76
            case COL_OPORT:    return QHeader::tr("Midi/drum track: Output port.\nSynth track: Assigned midi port.\nLeft-click to change.\nRight-click to show GUI."); break;
 
77
            case COL_TIMELOCK: return QHeader::tr("Time lock"); break;
78
78
            default: break;
79
79
            }
80
80
      return QString::null;
123
123
            raster->insertItem(tr(rastval[i]), i);
124
124
      raster->setCurrentItem(1);
125
125
      connect(raster, SIGNAL(activated(int)), SLOT(_setRaster(int)));
 
126
      raster->setFocusPolicy(QWidget::NoFocus);
126
127
 
127
128
      // Song len
128
129
      label = new QLabel(tr("Len"), toolbar, "Len");
147
148
      connect(typeBox, SIGNAL(activated(int)), SLOT(modeChange(int)));
148
149
      QToolTip::add(typeBox, tr("midi song type"));
149
150
      QWhatsThis::add(typeBox, tr("midi song type"));
 
151
      typeBox->setFocusPolicy(QWidget::NoFocus);
150
152
 
151
153
      label = new QLabel(tr("Pitch"), toolbar, "Pitch");
152
154
      label->setAlignment(AlignRight|AlignVCenter);
235
237
      header->addLabel(tr("Port"), 60);
236
238
      header->addLabel(tr("Ch"), 30);
237
239
      header->addLabel(tr("T"), fm1.width('T')+fw);
 
240
      //header->addLabel(tr("Automation"),30);
238
241
      header->setResizeEnabled(false, COL_RECORD);
239
242
      header->setResizeEnabled(false, COL_MUTE);
240
243
      header->setResizeEnabled(false, COL_SOLO);
241
244
      header->setResizeEnabled(false, COL_CLASS);
242
245
      header->setResizeEnabled(false, COL_OCHANNEL);
243
246
      header->setResizeEnabled(false, COL_TIMELOCK);
 
247
      //header->setResizeEnabled(true, COL_AUTOMATION);
 
248
      header->setResizeEnabled(true, COL_NAME);
 
249
      header->setResizeEnabled(true, COL_OPORT);
244
250
 
245
251
      header->setTracking(true);
246
252
 
284
290
      hscroll = new ScrollScale(-1000, -10, xscale, song->len(), Horizontal, editor, -offset);
285
291
      ib->setFixedHeight(hscroll->sizeHint().height());
286
292
 
287
 
      vscroll = new QScrollBar(1, 20*20, 1, 5, 0, Vertical, editor);
 
293
      // Changed p3.3.43 Too small steps for me...
 
294
      //vscroll = new QScrollBar(1, 20*20, 1, 5, 0, Vertical, editor);
 
295
      vscroll = new QScrollBar(1, 20*20, 5, 25, 0, Vertical, editor);
 
296
      
288
297
      list->setScroll(vscroll);
289
298
 
290
299
      QValueList<int> vallist;
305
314
      connect(canvas, SIGNAL(setUsedTool(int)), this, SIGNAL(setUsedTool(int)));
306
315
      connect(canvas, SIGNAL(trackChanged(Track*)), list, SLOT(selectTrack(Track*)));
307
316
      connect(list, SIGNAL(keyPressExt(QKeyEvent*)), canvas, SLOT(redirKeypress(QKeyEvent*)));
 
317
      connect(canvas, SIGNAL(selectTrackAbove()), list, SLOT(selectTrackAbove()));
 
318
      connect(canvas, SIGNAL(selectTrackBelow()), list, SLOT(selectTrackBelow()));
308
319
 
309
320
      connect(this, SIGNAL(redirectWheelEvent(QWheelEvent*)), canvas, SLOT(redirectedWheelEvent(QWheelEvent*)));
310
321
      connect(list, SIGNAL(redirectWheelEvent(QWheelEvent*)), canvas, SLOT(redirectedWheelEvent(QWheelEvent*)));
340
351
      connect(canvas, SIGNAL(toolChanged(int)), SIGNAL(toolChanged(int)));
341
352
//      connect(song, SIGNAL(posChanged(int, unsigned, bool)), SLOT(seek()));
342
353
 
343
 
      connect(time, SIGNAL(addMarker(int)), SIGNAL(addMarker(int)));
 
354
      // Removed p3.3.43 
 
355
      // Song::addMarker() already emits a 'markerChanged'.
 
356
      //connect(time, SIGNAL(addMarker(int)), SIGNAL(addMarker(int)));
344
357
      
345
358
      configChanged();  // set configuration values
346
359
      showTrackInfo(showTrackinfoFlag);
649
662
            case CMD_PASTE_CLONE_PART_TO_TRACK:
650
663
                  ncmd = PartCanvas::CMD_PASTE_CLONE_PART_TO_TRACK;
651
664
                  break;
 
665
            case CMD_INSERT_PART:
 
666
                  ncmd = PartCanvas::CMD_INSERT_PART;
 
667
                  break;
 
668
            case CMD_INSERT_EMPTYMEAS:
 
669
                  ncmd = PartCanvas::CMD_INSERT_EMPTYMEAS;
 
670
                  break;
652
671
            default:
653
672
                  return;
654
673
            }
938
957
      {
939
958
      emit redirectWheelEvent(ev);
940
959
      }
 
960
 
 
961
void Arranger::controllerChanged(Track *t)
 
962
{
 
963
      canvas->controllerChanged(t);
 
964
}