← Back to branch summary

~ubuntu-branches/ubuntu/quantal/muse/quantal

« back to all changes in this revision

Viewing changes to muse/midiedit/drumedit.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/midiedit/drumedit.cpp
22
22
#include <qapplication.h>
23
23
#include <qclipboard.h>
24
24
#include <qmessagebox.h>
 
25
#include <qaction.h>
25
26
 
26
27
#include "drumedit.h"
27
28
#include "mtscale.h"
43
44
#include "audio.h"
44
45
#include "gconfig.h"
45
46
 
 
47
/*
46
48
static const char* map_file_pattern[] = {
47
 
      "presets (*.map *.map.gz *.map.bz2)",
48
 
      "All Files (*)",
49
 
      0
50
 
      };
 
49
      "Presets (*.map *.map.gz *.map.bz2)",
 
50
      "All Files (*)",
 
51
      0
 
52
      };
 
53
static const char* map_file_save_pattern[] = {
 
54
      "Presets (*.map)",
 
55
      "gzip compressed presets (*.map.gz)",
 
56
      "bzip2 compressed presets (*.map.bz2)",
 
57
      "All Files (*)",
 
58
      0
 
59
      };
 
60
*/      
 
61
 
51
62
int DrumEdit::_quantInit = 96;
52
63
int DrumEdit::_rasterInit = 96;
53
64
int DrumEdit::_widthInit = 600;
181
192
      menuSelect->insertSeparator();
182
193
      menuSelect->insertItem(tr("Inside Loop"),  DrumCanvas::CMD_SELECT_ILOOP);
183
194
      menuSelect->insertItem(tr("Outside Loop"), DrumCanvas::CMD_SELECT_OLOOP);
 
195
      
 
196
      menuSelect->insertSeparator();
 
197
 
 
198
      menuSelect->insertItem(tr("Previous Part"), DrumCanvas::CMD_SELECT_PREV_PART);
 
199
      menuSelect->insertItem(tr("Next Part"), DrumCanvas::CMD_SELECT_NEXT_PART);
 
200
      
184
201
      menuEdit->insertItem(tr("&Select"), menuSelect);
185
202
 
186
203
      QPopupMenu* menuScriptPlugins = new QPopupMenu(this);
240
257
      QPushButton* ctrl = new QPushButton(tr("ctrl"), mainw, "Ctrl");
241
258
      ctrl->setFont(config.fonts[3]);
242
259
      hscroll           = new ScrollScale(-25, -2, xscale, 20000, Horizontal, mainw);
243
 
      ctrl->setFixedSize(50, hscroll->sizeHint().height());
 
260
      ctrl->setFixedSize(40, hscroll->sizeHint().height());
244
261
      QToolTip::add(ctrl, tr("Add Controller View"));
245
262
 
246
263
      QSizeGrip* corner = new QSizeGrip(mainw);
308
325
      new DWhatsThis(header, header);
309
326
 
310
327
      dlist = new DList(header, split1w1, yscale);
 
328
      // p3.3.44
 
329
      setCurDrumInstrument(dlist->getSelectedInstrument());
 
330
      
311
331
      connect(dlist, SIGNAL(keyPressed(int, bool)), canvas, SLOT(keyPressed(int, bool)));
312
332
      connect(dlist, SIGNAL(keyReleased(int, bool)), canvas, SLOT(keyReleased(int, bool)));
313
333
      connect(dlist, SIGNAL(mapChanged(int, int)), canvas, SLOT(mapChanged(int, int)));
690
710
 
691
711
void DrumEdit::load()
692
712
      {
693
 
      QString fn = getOpenFileName("drummaps", map_file_pattern,
 
713
      //QString fn = getOpenFileName("drummaps", map_file_pattern,
 
714
      QString fn = getOpenFileName("drummaps", drum_map_file_pattern,
694
715
         this, tr("Muse: Load Drum Map"), 0);
695
716
      if (fn.isEmpty())
696
717
            return;
742
763
 
743
764
void DrumEdit::save()
744
765
      {
745
 
      QString fn = getSaveFileName(QString("drummaps"), map_file_pattern,
 
766
      //QString fn = getSaveFileName(QString("drummaps"), map_file_pattern,
 
767
      QString fn = getSaveFileName(QString("drummaps"), drum_map_file_save_pattern,
746
768
        this, tr("MusE: Store Drum Map"));
747
769
      if (fn.isEmpty())
748
770
            return;
841
863
      connect(tools2,   SIGNAL(toolChanged(int)),   ctrlEdit, SLOT(setTool(int)));
842
864
      connect(dlist,    SIGNAL(curDrumInstrumentChanged(int)), SLOT(setCurDrumInstrument(int)));
843
865
 
 
866
      //printf("DrumEdit::addCtrl curDrumInstrument:%d\n", dlist->getSelectedInstrument());
 
867
      
844
868
      setCurDrumInstrument(dlist->getSelectedInstrument());
845
869
 
 
870
      // p3.3.44
 
871
      ctrlEdit->setTool(tools2->curTool());
 
872
      
846
873
      ctrlEdit->setXPos(hscroll->pos());
847
874
      ctrlEdit->setXMag(hscroll->getScaleValue());
848
875
 
1106
1133
      menuSelect->setAccel(shortcuts[SHRT_SELECT_INVERT].key, DrumCanvas::CMD_SELECT_INVERT);
1107
1134
      menuSelect->setAccel(shortcuts[SHRT_SELECT_ILOOP].key,  DrumCanvas::CMD_SELECT_ILOOP);
1108
1135
      menuSelect->setAccel(shortcuts[SHRT_SELECT_OLOOP].key,  DrumCanvas::CMD_SELECT_OLOOP);
 
1136
      
 
1137
      menuSelect->setAccel(shortcuts[SHRT_SELECT_PREV_PART].key, DrumCanvas::CMD_SELECT_PREV_PART);
 
1138
      menuSelect->setAccel(shortcuts[SHRT_SELECT_NEXT_PART].key, DrumCanvas::CMD_SELECT_NEXT_PART);
1109
1139
      }
1110
1140
 
1111
1141
//---------------------------------------------------------