← Back to branch summary

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

« back to all changes in this revision

Viewing changes to muse/widgets/midisync.ui

  • 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/widgets/midisync.ui
300
300
            <property name="name">
301
301
              <cstring>unnamed</cstring>
302
302
            </property>
303
 
            <widget class="QCheckBox" row="0" column="0">
 
303
            <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
304
304
              <property name="name">
305
305
                <cstring>useJackTransportCheckbox</cstring>
306
306
              </property>
321
321
 including stop, start and position.</string>
322
322
              </property>
323
323
            </widget>
324
 
            <widget class="QCheckBox" row="1" column="0">
 
324
            <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
 
325
              <property name="name">
 
326
                <cstring>jackTransportMasterCheckbox</cstring>
 
327
              </property>
 
328
              <property name="enabled">
 
329
                <bool>true</bool>
 
330
              </property>
 
331
              <property name="text">
 
332
                <string>Jack transport Timebase Master</string>
 
333
              </property>
 
334
              <property name="checked">
 
335
                <bool>true</bool>
 
336
              </property>
 
337
              <property name="toolTip" stdset="0">
 
338
                <string>Make MusE the Jack transport Timebase Master</string>
 
339
              </property>
 
340
              <property name="whatsThis" stdset="0">
 
341
                <string>Make MusE the Jack transport Timebase Master.
 
342
Allows Jack to show time as 
 
343
 MusE Bars, Beats, and Ticks. 
 
344
MusE will try to become master, but other 
 
345
 Jack clients can also take over later.
 
346
You can always click here again for Master.</string>
 
347
              </property>
 
348
            </widget>
 
349
            <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
325
350
              <property name="name">
326
351
                <cstring>extSyncCheckbox</cstring>
327
352
              </property>
345
370
 be in effect (RMC, RMMC, RMTC).</string>
346
371
              </property>
347
372
            </widget>
348
 
            <widget class="QListView" row="2" column="0">
 
373
            <widget class="QLayoutWidget" row="3" column="0">
 
374
              <property name="name">
 
375
                <cstring>syncDelayLayout</cstring>
 
376
              </property>
 
377
              <hbox>
 
378
                <widget class="QSpinBox">
 
379
                  <property name="name">
 
380
                    <cstring>syncDelaySpinBox</cstring>
 
381
                  </property>
 
382
                  <property name="suffix">
 
383
                    <string>ms</string>
 
384
                  </property>
 
385
                  <property name="maxValue">
 
386
                    <number>60000</number>
 
387
                  </property>
 
388
                  <property name="minValue">
 
389
                    <number>0</number>
 
390
                  </property>
 
391
                  <property name="lineStep">
 
392
                    <number>1</number>
 
393
                  </property>
 
394
                  <property name="value">
 
395
                    <number>1</number>
 
396
                  </property>
 
397
                  <property name="toolTip" stdset="0">
 
398
                    <string>Send start to first clock delay</string>
 
399
                  </property>
 
400
                  <property name="whatsThis" stdset="0">
 
401
                    <string>Allows 'slow sync' devices time
 
402
 to synchronize to MusE. This value is the
 
403
 delay from sending start to sending
 
404
 the first clock.</string>
 
405
                  </property>
 
406
                </widget>
 
407
                <widget class="QLabel">
 
408
                  <property name="name">
 
409
                    <cstring>syncDelayLabel</cstring>
 
410
                  </property>
 
411
                  <property name="text">
 
412
                    <string>Send sync delay</string>
 
413
                  </property>
 
414
                  <property name="alignment">
 
415
                    <set>AlignVCenter|AlignLeft</set>
 
416
                  </property>
 
417
                </widget>
 
418
              </hbox>
 
419
            </widget>
 
420
            <widget class="QListView" row="4" column="0">
349
421
              <property name="name">
350
422
                <cstring>devicesListView</cstring>
351
423
              </property>