Mixxx

Merge lp:~mixxxdevelopers/mixxx/cleanup-prefs-1.11 into lp:mixxx/1.11

  1. cleanup-prefs-1.11
  2. Merge into release-1.11.x
Proposed by Sean M. Pappalardo
Status: Needs review
Proposed branch: lp:~mixxxdevelopers/mixxx/cleanup-prefs-1.11
Merge into: lp:mixxx/1.11
Diff against target: 1706 lines (+983/-384) (has conflicts)
4 files modified
mixxx/src/dlgprefcontrols.cpp (+130/-59)
mixxx/src/dlgprefcontrols.h (+10/-6)
mixxx/src/dlgprefcontrolsdlg.ui (+839/-315)
mixxx/src/dlgprefplaylistdlg.ui (+4/-4)
Text conflict in mixxx/src/dlgprefcontrols.cpp
Text conflict in mixxx/src/dlgprefcontrols.h
Text conflict in mixxx/src/dlgprefcontrolsdlg.ui
To merge this branch: bzr merge lp:~mixxxdevelopers/mixxx/cleanup-prefs-1.11
Reviewer Review Type Date Requested Status
Mixxx Development Team Pending
Review via email: mp+199167@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sean M. Pappalardo (pegasus-renegadetech) wrote :

Replaced by https://github.com/mixxxdj/mixxx/pull/527

Reply

Unmerged revisions

3517. By Sean M. Pappalardo

Cleaned up Interface pane, grouping pitch items together and changing yes\/no options to radio buttons and check boxes as appropriate.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mixxx/src/dlgprefcontrols.cpp'
2--- mixxx/src/dlgprefcontrols.cpp 2013-01-27 23:04:37 +0000
3+++ mixxx/src/dlgprefcontrols.cpp 2013-12-16 18:09:31 +0000
4@@ -75,32 +75,36 @@
5 ControlObject::getControl(ConfigKey(group, "cue_mode"))));
6 }
7
8- // Position display configuration
9- m_pControlPositionDisplay = new ControlObject(ConfigKey("[Controls]", "ShowDurationRemaining"));
10- connect(m_pControlPositionDisplay, SIGNAL(valueChanged(double)),
11- this, SLOT(slotSetPositionDisplay(double)));
12- ComboBoxPosition->addItem(tr("Position"));
13- ComboBoxPosition->addItem(tr("Remaining"));
14- if (m_pConfig->getValueString(ConfigKey("[Controls]","PositionDisplay")).length() == 0)
15- m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"),ConfigValue(0));
16+
17+ // Track time display configuration
18+ m_pControlTrackTimeDisplay = new ControlObject(ConfigKey("[Controls]", "ShowDurationRemaining"));
19+ connect(m_pControlTrackTimeDisplay, SIGNAL(valueChanged(double)),
20+ this, SLOT(slotSetTrackTimeDisplay(double)));
21+
22+ // If not present in the config, set the default value
23+ if (!m_pConfig->exists(ConfigKey("[Controls]","PositionDisplay")))
24+ m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"),ConfigValue(1));
25+
26 if (m_pConfig->getValueString(ConfigKey("[Controls]","PositionDisplay")).toInt() == 1)
27 {
28- ComboBoxPosition->setCurrentIndex(1);
29- m_pControlPositionDisplay->set(1.0f);
30+ radioButtonRemaining->setChecked(true);
31+ m_pControlTrackTimeDisplay->set(1.0f);
32 }
33 else
34 {
35- ComboBoxPosition->setCurrentIndex(0);
36- m_pControlPositionDisplay->set(0.0f);
37+ radioButtonElapsed->setChecked(true);
38+ m_pControlTrackTimeDisplay->set(0.0f);
39 }
40- connect(ComboBoxPosition, SIGNAL(activated(int)), this, SLOT(slotSetPositionDisplay(int)));
41+ connect(buttonGroupTrackTime, SIGNAL(buttonClicked(QAbstractButton*)),
42+ this, SLOT(slotSetTrackTimeDisplay(QAbstractButton *)));
43+
44
45 // Set default direction as stored in config file
46 if (m_pConfig->getValueString(ConfigKey("[Controls]","RateDir")).length() == 0)
47 m_pConfig->set(ConfigKey("[Controls]","RateDir"),ConfigValue(0));
48
49- slotSetRateDir(m_pConfig->getValueString(ConfigKey("[Controls]","RateDir")).toInt());
50- connect(ComboBoxRateDir, SIGNAL(activated(int)), this, SLOT(slotSetRateDir(int)));
51+ slotSetRateDir(m_pConfig->getValueString(ConfigKey("[Controls]","RateDir")).toInt()==1);
52+ connect(checkBoxInvertPitchSlider, SIGNAL(toggled(bool)), this, SLOT(slotSetRateDir(bool)));
53
54 // Set default range as stored in config file
55 if (m_pConfig->getValueString(ConfigKey("[Controls]","RateRange")).length() == 0)
56@@ -133,17 +137,24 @@
57 spinBoxPermRateLeft->setValue(m_pConfig->getValueString(ConfigKey("[Controls]","RatePermLeft")).toDouble());
58 spinBoxPermRateRight->setValue(m_pConfig->getValueString(ConfigKey("[Controls]","RatePermRight")).toDouble());
59
60- SliderRateRampSensitivity->setEnabled(true);
61- SpinBoxRateRampSensitivity->setEnabled(true);
62-
63+ if (m_pConfig->getValueString(ConfigKey("[Controls]","RateRamp")).toInt() == 1) {
64+ labelRateRampSensitivity->setEnabled(TRUE);
65+ SliderRateRampSensitivity->setEnabled(TRUE);
66+ SpinBoxRateRampSensitivity->setEnabled(TRUE);
67+ }
68+ else {
69+ labelRateRampSensitivity->setEnabled(FALSE);
70+ SliderRateRampSensitivity->setEnabled(FALSE);
71+ SpinBoxRateRampSensitivity->setEnabled(FALSE);
72+ }
73
74 //
75 // Override Playing Track on Track Load
76 //
77- ComboBoxAllowTrackLoadToPlayingDeck->addItem(tr("Don't load tracks into a playing deck"));
78- ComboBoxAllowTrackLoadToPlayingDeck->addItem(tr("Load tracks into a playing deck"));
79- ComboBoxAllowTrackLoadToPlayingDeck->setCurrentIndex(m_pConfig->getValueString(ConfigKey("[Controls]", "AllowTrackLoadToPlayingDeck")).toInt());
80- connect(ComboBoxAllowTrackLoadToPlayingDeck, SIGNAL(activated(int)), this, SLOT(slotSetAllowTrackLoadToPlayingDeck(int)));
81+ checkBoxDontLoadToPlayingDecks->setChecked(
82+ m_pConfig->getValueString(ConfigKey("[Controls]", "AllowTrackLoadToPlayingDeck")).toInt()==0);
83+ connect(checkBoxDontLoadToPlayingDecks, SIGNAL(toggled(bool)),
84+ this, SLOT(slotSetAllowTrackLoadToPlayingDeck(bool)));
85
86 //
87 // Locale setting
88@@ -191,20 +202,21 @@
89 }
90 int cueDefaultValue = cueDefault.toInt();
91
92- // Update combo box
93- ComboBoxCueDefault->addItem(tr("CDJ Mode"));
94- ComboBoxCueDefault->addItem(tr("Simple"));
95- ComboBoxCueDefault->setCurrentIndex(cueDefaultValue);
96+ buttonGroupCueBehavior->setId(radioButtonCueCdj, 0);
97+ buttonGroupCueBehavior->setId(radioButtonCueSimple, 1);
98+ if (cueDefaultValue == 0)
99+ radioButtonCueCdj->setChecked(true);
100+ else if (cueDefaultValue == 1)
101+ radioButtonCueSimple->setChecked(true);
102
103 slotSetCueDefault(cueDefaultValue);
104- connect(ComboBoxCueDefault, SIGNAL(activated(int)), this, SLOT(slotSetCueDefault(int)));
105+ connect(buttonGroupCueBehavior, SIGNAL(buttonClicked(int)), this, SLOT(slotSetCueDefault(int)));
106
107 //Cue recall
108- ComboBoxCueRecall->addItem(tr("On"));
109- ComboBoxCueRecall->addItem(tr("Off"));
110- ComboBoxCueRecall->setCurrentIndex(m_pConfig->getValueString(ConfigKey("[Controls]", "CueRecall")).toInt());
111 //NOTE: for CueRecall, 0 means ON....
112- connect(ComboBoxCueRecall, SIGNAL(activated(int)), this, SLOT(slotSetCueRecall(int)));
113+ connect(checkBoxJumpToCueOnLoad, SIGNAL(toggled(bool)),
114+ this, SLOT(slotSetCueRecall(bool)));
115+ checkBoxJumpToCueOnLoad->setChecked(m_pConfig->getValueString(ConfigKey("[Controls]", "CueRecall")).toInt()==0);
116
117 // Re-queue tracks in Auto DJ
118 ComboBoxAutoDjRequeue->addItem(tr("Off"));
119@@ -253,10 +265,17 @@
120 //
121 // Tooltip configuration
122 //
123+<<<<<<< TREE
124 // Set default value in config file, if not present
125 if (m_pConfig->getValueString(ConfigKey("[Controls]","Tooltips")).length() == 0)
126 m_pConfig->set(ConfigKey("[Controls]","Tooltips"), ConfigValue(1));
127+=======
128+ // Set default value in config file if not present
129+ if (!m_pConfig->exists(ConfigKey("[Controls]","Tooltips")))
130+ m_pConfig->set(ConfigKey("[Controls]","Tooltips"), ConfigValue(0));
131+>>>>>>> MERGE-SOURCE
132
133+<<<<<<< TREE
134 ComboBoxTooltips->addItem(tr("On"));
135 ComboBoxTooltips->addItem(tr("On (only in Library)"));
136 ComboBoxTooltips->addItem(tr("Off"));
137@@ -268,14 +287,35 @@
138 ComboBoxTooltips->setCurrentIndex((configTooltips + 2) % 3);
139
140 connect(ComboBoxTooltips, SIGNAL(currentIndexChanged(int)), this, SLOT(slotSetTooltips(int)));
141+=======
142+ // Initialize checkboxes to match config
143+ //0=ON, 1=ON (only in Library), 2=OFF
144+ switch (m_pConfig->getValueString(ConfigKey("[Controls]","Tooltips")).toInt()) {
145+ case 0:
146+ checkBoxTooltipsEnabled->setChecked(true);
147+ checkBoxTooltipsOnlyLibrary->setChecked(false);
148+ break;
149+ case 1:
150+ checkBoxTooltipsEnabled->setChecked(true);
151+ checkBoxTooltipsOnlyLibrary->setChecked(true);
152+ break;
153+ case 2:
154+ checkBoxTooltipsEnabled->setChecked(false);
155+ break;
156+ }
157+
158+ slotSetTooltips(); // Update disabled status of "only library" checkbox
159+ connect(buttonGroupTooltips, SIGNAL(buttonClicked(QAbstractButton*)),
160+ this, SLOT(slotSetTooltips()));
161+>>>>>>> MERGE-SOURCE
162
163 //
164 // Ramping Temporary Rate Change configuration
165 //
166
167 // Set Ramp Rate On or Off
168- connect(groupBoxRateRamp, SIGNAL(toggled(bool)), this, SLOT(slotSetRateRamp(bool)));
169- groupBoxRateRamp->setChecked((bool)
170+ connect(checkBoxRateRamp, SIGNAL(toggled(bool)), this, SLOT(slotSetRateRamp(bool)));
171+ checkBoxRateRamp->setChecked((bool)
172 m_pConfig->getValueString(ConfigKey("[Controls]","RateRamp")).toInt()
173 );
174
175@@ -334,7 +374,7 @@
176 {
177 ComboBoxRateRange->clear();
178 ComboBoxRateRange->addItem(tr("6%"));
179- ComboBoxRateRange->addItem(tr("8% (Technics SL-1210)"));
180+ ComboBoxRateRange->addItem(tr("8%"));
181 ComboBoxRateRange->addItem(tr("10%"));
182 ComboBoxRateRange->addItem(tr("20%"));
183 ComboBoxRateRange->addItem(tr("30%"));
184@@ -356,14 +396,10 @@
185
186 ComboBoxRateRange->setCurrentIndex((int)idx);
187
188- ComboBoxRateDir->clear();
189- ComboBoxRateDir->addItem(tr("Up increases speed"));
190- ComboBoxRateDir->addItem(tr("Down increases speed (Technics SL-1210)"));
191-
192 if (deck1RateDir == 1)
193- ComboBoxRateDir->setCurrentIndex(0);
194+ checkBoxInvertPitchSlider->setChecked(false);
195 else
196- ComboBoxRateDir->setCurrentIndex(1);
197+ checkBoxInvertPitchSlider->setChecked(true);
198 }
199
200 void DlgPrefControls::slotSetLocale(int pos) {
201@@ -391,10 +427,10 @@
202 }
203 }
204
205-void DlgPrefControls::slotSetRateDir(int index)
206+void DlgPrefControls::slotSetRateDir(bool invert)
207 {
208 float dir = 1.;
209- if (index == 1)
210+ if (invert)
211 dir = -1.;
212
213 // Set rate direction for every group
214@@ -403,18 +439,19 @@
215 }
216 }
217
218-void DlgPrefControls::slotSetAllowTrackLoadToPlayingDeck(int)
219+void DlgPrefControls::slotSetAllowTrackLoadToPlayingDeck(bool b)
220 {
221- m_pConfig->set(ConfigKey("[Controls]","AllowTrackLoadToPlayingDeck"), ConfigValue(ComboBoxAllowTrackLoadToPlayingDeck->currentIndex()));
222+ m_pConfig->set(ConfigKey("[Controls]","AllowTrackLoadToPlayingDeck"),
223+ ConfigValue(b?0:1));
224 }
225
226-void DlgPrefControls::slotSetCueDefault(int)
227+void DlgPrefControls::slotSetCueDefault(int index)
228 {
229- int cueIndex = ComboBoxCueDefault->currentIndex();
230- m_pConfig->set(ConfigKey("[Controls]","CueDefault"), ConfigValue(cueIndex));
231+ m_pConfig->set(ConfigKey("[Controls]","CueDefault"), ConfigValue(index));
232
233 // Set cue behavior for every group
234 foreach (ControlObjectThreadMain* pControl, m_cueControls) {
235+<<<<<<< TREE
236 pControl->slotSet(cueIndex);
237 }
238 }
239@@ -435,6 +472,33 @@
240 m_pConfig->set(ConfigKey("[Controls]","Tooltips"),
241 ConfigValue(configValue));
242 m_mixxx->setToolTips(configValue);
243+=======
244+ pControl->slotSet(index);
245+ }
246+}
247+
248+void DlgPrefControls::slotSetCueRecall(bool b)
249+{
250+ m_pConfig->set(ConfigKey("[Controls]","CueRecall"), ConfigValue(b?0:1));
251+}
252+
253+void DlgPrefControls::slotSetTooltips()
254+{
255+ //0=ON, 1=ON (only in Library), 2=OFF
256+ int valueToSet = 0;
257+ if (!checkBoxTooltipsEnabled->isChecked()) {
258+ checkBoxTooltipsOnlyLibrary->setDisabled(true);
259+ valueToSet = 2;
260+ }
261+ else {
262+ checkBoxTooltipsOnlyLibrary->setDisabled(false);
263+ if (checkBoxTooltipsOnlyLibrary->isChecked()) {
264+ valueToSet = 1;
265+ }
266+ }
267+ m_pConfig->set(ConfigKey("[Controls]","Tooltips"), ConfigValue(valueToSet));
268+ m_mixxx->setToolTips(valueToSet);
269+>>>>>>> MERGE-SOURCE
270 }
271
272 void DlgPrefControls::notifyRebootNecessary() {
273@@ -459,21 +523,27 @@
274 slotUpdateSchemes();
275 }
276
277-void DlgPrefControls::slotSetPositionDisplay(int)
278+void DlgPrefControls::slotSetTrackTimeDisplay(QAbstractButton* b)
279 {
280- int positionDisplay = ComboBoxPosition->currentIndex();
281- m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"), ConfigValue(positionDisplay));
282- m_pControlPositionDisplay->set(positionDisplay);
283+ int timeDisplay = 0;
284+ if (b == radioButtonRemaining) {
285+ timeDisplay = 1;
286+ m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"), ConfigValue(1));
287+ }
288+ else {
289+ m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"), ConfigValue(0));
290+ }
291+ m_pControlTrackTimeDisplay->set(timeDisplay);
292 }
293
294-void DlgPrefControls::slotSetPositionDisplay(double v) {
295+void DlgPrefControls::slotSetTrackTimeDisplay(double v) {
296 if (v > 0) {
297- // remaining
298- ComboBoxPosition->setCurrentIndex(1);
299+ // Remaining
300+ radioButtonRemaining->setChecked(true);
301 m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"), ConfigValue(1));
302 } else {
303- // position
304- ComboBoxPosition->setCurrentIndex(0);
305+ // Elapsed
306+ radioButtonElapsed->setChecked(true);
307 m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"), ConfigValue(0));
308 }
309 }
310@@ -520,20 +590,21 @@
311 void DlgPrefControls::slotSetRateRamp(bool mode)
312 {
313 m_pConfig->set(ConfigKey("[Controls]", "RateRamp"),
314- ConfigValue(groupBoxRateRamp->isChecked()));
315+ ConfigValue(checkBoxRateRamp->isChecked()));
316 RateControl::setRateRamp(mode);
317
318- /*
319 if ( mode )
320 {
321+ labelRateRampSensitivity->setEnabled(TRUE);
322 SliderRateRampSensitivity->setEnabled(TRUE);
323 SpinBoxRateRampSensitivity->setEnabled(TRUE);
324 }
325 else
326 {
327+ labelRateRampSensitivity->setEnabled(FALSE);
328 SliderRateRampSensitivity->setEnabled(FALSE);
329 SpinBoxRateRampSensitivity->setEnabled(FALSE);
330- }*/
331+ }
332 }
333
334 void DlgPrefControls::slotApply()
335
336=== modified file 'mixxx/src/dlgprefcontrols.h'
337--- mixxx/src/dlgprefcontrols.h 2013-01-27 23:04:37 +0000
338+++ mixxx/src/dlgprefcontrols.h 2013-12-16 18:09:31 +0000
339@@ -44,21 +44,25 @@
340 public slots:
341 void slotUpdate();
342 void slotSetRateRange(int pos);
343- void slotSetRateDir(int pos);
344+ void slotSetRateDir(bool);
345 void slotSetRateTempLeft(double);
346 void slotSetRateTempRight(double);
347 void slotSetRatePermLeft(double);
348 void slotSetRatePermRight(double);
349- void slotSetTooltips(int pos);
350+ void slotSetTooltips();
351 void slotSetSkin(int);
352 void slotSetScheme(int);
353 void slotUpdateSchemes();
354- void slotSetPositionDisplay(int);
355- void slotSetPositionDisplay(double);
356- void slotSetAllowTrackLoadToPlayingDeck(int);
357+ void slotSetTrackTimeDisplay(QAbstractButton*);
358+ void slotSetTrackTimeDisplay(double);
359+ void slotSetAllowTrackLoadToPlayingDeck(bool);
360 void slotSetCueDefault(int);
361+<<<<<<< TREE
362 void slotSetCueRecall(int);
363 void slotSetAutoDjRequeue(int);
364+=======
365+ void slotSetCueRecall(bool);
366+>>>>>>> MERGE-SOURCE
367 void slotSetRateRamp(bool);
368 void slotSetRateRampSensitivity(int);
369 void slotSetLocale(int);
370@@ -89,7 +93,7 @@
371 /** Pointer to ConfigObject */
372 ConfigObject<ConfigValue> *m_pConfig;
373 int m_timer;
374- ControlObject* m_pControlPositionDisplay;
375+ ControlObject* m_pControlTrackTimeDisplay;
376 QList<ControlObjectThreadMain*> m_cueControls;
377 QList<ControlObjectThreadMain*> m_rateControls;
378 QList<ControlObjectThreadMain*> m_rateDirControls;
379
380=== modified file 'mixxx/src/dlgprefcontrolsdlg.ui'
381--- mixxx/src/dlgprefcontrolsdlg.ui 2013-04-02 19:35:13 +0000
382+++ mixxx/src/dlgprefcontrolsdlg.ui 2013-12-16 18:09:31 +0000
383@@ -6,18 +6,27 @@
384 <rect>
385 <x>0</x>
386 <y>0</y>
387- <width>519</width>
388- <height>728</height>
389+ <width>478</width>
390+ <height>642</height>
391 </rect>
392 </property>
393+ <property name="sizePolicy">
394+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
395+ <horstretch>0</horstretch>
396+ <verstretch>0</verstretch>
397+ </sizepolicy>
398+ </property>
399 <property name="windowTitle">
400 <string>Form1</string>
401 </property>
402 <layout class="QGridLayout" name="gridLayout_3">
403+ <property name="sizeConstraint">
404+ <enum>QLayout::SetMaximumSize</enum>
405+ </property>
406 <item row="0" column="0">
407- <layout class="QGridLayout">
408+ <layout class="QGridLayout" name="mainOptionsLayout" rowstretch="0,0,0,0,0,0,0,0,0,0">
409 <item row="0" column="0">
410- <widget class="QLabel" name="TextLabel6_2_2">
411+ <widget class="QLabel" name="TextLabelSkin">
412 <property name="enabled">
413 <bool>true</bool>
414 </property>
415@@ -48,8 +57,18 @@
416 </property>
417 </widget>
418 </item>
419+ <item row="1" column="1" colspan="2">
420+ <widget class="QLabel" name="warningLabel">
421+ <property name="text">
422+ <string/>
423+ </property>
424+ <property name="alignment">
425+ <set>Qt::AlignJustify|Qt::AlignVCenter</set>
426+ </property>
427+ </widget>
428+ </item>
429 <item row="2" column="0">
430- <widget class="QLabel" name="TextLabel6_2_2_4">
431+ <widget class="QLabel" name="TextLabelScheme">
432 <property name="enabled">
433 <bool>true</bool>
434 </property>
435@@ -80,8 +99,41 @@
436 </property>
437 </widget>
438 </item>
439- <item row="3" column="0">
440- <widget class="QLabel" name="TextLabel6_2_2_3">
441+ <item row="7" column="0">
442+ <widget class="QLabel" name="TextLabelCueBehavior">
443+ <property name="text">
444+ <string>Cue button behavior</string>
445+ </property>
446+ <property name="buddy">
447+ <cstring>radioButtonCueCdj</cstring>
448+ </property>
449+ </widget>
450+ </item>
451+ <item row="5" column="2">
452+ <widget class="QRadioButton" name="radioButtonRemaining">
453+ <property name="text">
454+ <string>Remaining</string>
455+ </property>
456+ <property name="checked">
457+ <bool>true</bool>
458+ </property>
459+ <attribute name="buttonGroup">
460+ <string>buttonGroupTrackTime</string>
461+ </attribute>
462+ </widget>
463+ </item>
464+ <item row="5" column="1">
465+ <widget class="QRadioButton" name="radioButtonElapsed">
466+ <property name="text">
467+ <string>Elapsed</string>
468+ </property>
469+ <attribute name="buttonGroup">
470+ <string>buttonGroupTrackTime</string>
471+ </attribute>
472+ </widget>
473+ </item>
474+ <item row="5" column="0">
475+ <widget class="QLabel" name="TextLabelTrackTime">
476 <property name="enabled">
477 <bool>true</bool>
478 </property>
479@@ -89,31 +141,47 @@
480 <font/>
481 </property>
482 <property name="text">
483- <string>Position display</string>
484+ <string>Track time display</string>
485 </property>
486 <property name="wordWrap">
487 <bool>false</bool>
488 </property>
489 <property name="buddy">
490- <cstring>ComboBoxPosition</cstring>
491- </property>
492- </widget>
493- </item>
494- <item row="3" column="1" colspan="2">
495- <widget class="QComboBox" name="ComboBoxPosition">
496- <property name="sizePolicy">
497- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
498- <horstretch>0</horstretch>
499- <verstretch>0</verstretch>
500- </sizepolicy>
501- </property>
502- <property name="font">
503- <font/>
504- </property>
505+ <cstring>radioButtonElapsed</cstring>
506+ </property>
507+ </widget>
508+ </item>
509+ <item row="7" column="1">
510+ <widget class="QRadioButton" name="radioButtonCueCdj">
511+ <property name="toolTip">
512+ <string>When playing, CUE stops deck and returns to cue point. When stopped, CUE sets the cue point or starts momentary playback.</string>
513+ </property>
514+ <property name="text">
515+ <string>CDJ</string>
516+ </property>
517+ <property name="checked">
518+ <bool>true</bool>
519+ </property>
520+ <attribute name="buttonGroup">
521+ <string>buttonGroupCueBehavior</string>
522+ </attribute>
523+ </widget>
524+ </item>
525+ <item row="7" column="2">
526+ <widget class="QRadioButton" name="radioButtonCueSimple">
527+ <property name="toolTip">
528+ <string>The CUE button sets and recalls the cue point but does not affect playback.</string>
529+ </property>
530+ <property name="text">
531+ <string>Simple</string>
532+ </property>
533+ <attribute name="buttonGroup">
534+ <string>buttonGroupCueBehavior</string>
535+ </attribute>
536 </widget>
537 </item>
538 <item row="4" column="0">
539- <widget class="QLabel" name="TextLabel6_2_2_3_2">
540+ <widget class="QLabel" name="TextLabelTooltips">
541 <property name="enabled">
542 <bool>true</bool>
543 </property>
544@@ -127,6 +195,7 @@
545 <bool>false</bool>
546 </property>
547 <property name="buddy">
548+<<<<<<< TREE
549 <cstring>ComboBoxTooltips</cstring>
550 </property>
551 </widget>
552@@ -261,6 +330,39 @@
553 <widget class="QComboBox" name="ComboBoxAutoDjRequeue"/>
554 </item>
555 <item row="13" column="0">
556+=======
557+ <cstring>checkBoxTooltipsEnabled</cstring>
558+ </property>
559+ </widget>
560+ </item>
561+ <item row="4" column="1">
562+ <widget class="QCheckBox" name="checkBoxTooltipsEnabled">
563+ <property name="text">
564+ <string>Enabled</string>
565+ </property>
566+ <attribute name="buttonGroup">
567+ <string>buttonGroupTooltips</string>
568+ </attribute>
569+ </widget>
570+ </item>
571+ <item row="4" column="2">
572+ <widget class="QCheckBox" name="checkBoxTooltipsOnlyLibrary">
573+ <property name="toolTip">
574+ <string>Useful to see a whole text field in the Library without having to expand the column</string>
575+ </property>
576+ <property name="text">
577+ <string>Only in Library</string>
578+ </property>
579+ <property name="tristate">
580+ <bool>false</bool>
581+ </property>
582+ <attribute name="buttonGroup">
583+ <string>buttonGroupTooltips</string>
584+ </attribute>
585+ </widget>
586+ </item>
587+ <item row="3" column="0">
588+>>>>>>> MERGE-SOURCE
589 <widget class="QLabel" name="textLabelLocale">
590 <property name="text">
591 <string>Locale</string>
592@@ -270,22 +372,50 @@
593 </property>
594 </widget>
595 </item>
596- <item row="13" column="1" colspan="2">
597+ <item row="3" column="1" colspan="2">
598 <widget class="QComboBox" name="ComboBoxLocale"/>
599 </item>
600- <item row="1" column="1" colspan="2">
601- <widget class="QLabel" name="warningLabel">
602- <property name="text">
603- <string/>
604- </property>
605- <property name="alignment">
606- <set>Qt::AlignJustify|Qt::AlignVCenter</set>
607+ <item row="9" column="1" colspan="2">
608+ <widget class="QCheckBox" name="checkBoxDontLoadToPlayingDecks">
609+ <property name="text">
610+ <string>Don't load tracks into playing decks</string>
611+ </property>
612+ <property name="checked">
613+ <bool>true</bool>
614+ </property>
615+ </widget>
616+ </item>
617+ <item row="8" column="1" colspan="2">
618+ <widget class="QCheckBox" name="checkBoxJumpToCueOnLoad">
619+ <property name="text">
620+ <string>Jump to main cue point on track load</string>
621+ </property>
622+ <property name="checked">
623+ <bool>true</bool>
624+ </property>
625+ </widget>
626+ </item>
627+ <item row="9" column="0">
628+ <widget class="QLabel" name="TextlabelDeckProtection">
629+ <property name="text">
630+ <string>Deck protection</string>
631+ </property>
632+ <property name="buddy">
633+ <cstring>checkBoxDontLoadToPlayingDecks</cstring>
634+ </property>
635+ </widget>
636+ </item>
637+ <item row="6" column="0" colspan="3">
638+ <widget class="Line" name="line">
639+ <property name="orientation">
640+ <enum>Qt::Horizontal</enum>
641 </property>
642 </widget>
643 </item>
644 </layout>
645 </item>
646 <item row="2" column="0">
647+<<<<<<< TREE
648 <layout class="QHBoxLayout" name="horizontalLayout">
649 <item>
650 <layout class="QGridLayout" name="gridLayout_2">
651@@ -591,6 +721,15 @@
652 </item>
653 <item row="1" column="0">
654 <widget class="QGroupBox" name="groupBox_3">
655+=======
656+ <widget class="QGroupBox" name="groupBoxWaveform">
657+ <property name="sizePolicy">
658+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
659+ <horstretch>0</horstretch>
660+ <verstretch>0</verstretch>
661+ </sizepolicy>
662+ </property>
663+>>>>>>> MERGE-SOURCE
664 <property name="title">
665 <string>Waveform Display</string>
666 </property>
667@@ -598,246 +737,609 @@
668 <bool>false</bool>
669 </property>
670 <layout class="QGridLayout" name="gridLayout_7">
671+ <property name="margin">
672+ <number>4</number>
673+ </property>
674 <item row="0" column="0">
675- <widget class="QLabel" name="waveformTypeLabel">
676- <property name="sizePolicy">
677- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
678- <horstretch>0</horstretch>
679- <verstretch>0</verstretch>
680- </sizepolicy>
681- </property>
682- <property name="text">
683- <string>Display type</string>
684- </property>
685- <property name="alignment">
686- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
687- </property>
688- <property name="buddy">
689- <cstring>waveformTypeComboBox</cstring>
690- </property>
691- </widget>
692- </item>
693- <item row="0" column="2" colspan="4">
694- <widget class="QComboBox" name="waveformTypeComboBox"/>
695- </item>
696- <item row="1" column="2" colspan="2">
697- <widget class="QSlider" name="frameRateSlider">
698- <property name="sizePolicy">
699- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
700- <horstretch>0</horstretch>
701- <verstretch>0</verstretch>
702- </sizepolicy>
703- </property>
704- <property name="maximumSize">
705- <size>
706- <width>16777215</width>
707- <height>16777215</height>
708- </size>
709- </property>
710- <property name="minimum">
711- <number>10</number>
712- </property>
713- <property name="maximum">
714- <number>60</number>
715- </property>
716- <property name="value">
717- <number>30</number>
718- </property>
719- <property name="orientation">
720- <enum>Qt::Horizontal</enum>
721- </property>
722- </widget>
723- </item>
724- <item row="1" column="4">
725- <widget class="QSpinBox" name="frameRateSpinBox">
726- <property name="toolTip">
727- <string/>
728- </property>
729- <property name="minimum">
730- <number>10</number>
731- </property>
732- <property name="maximum">
733- <number>60</number>
734- </property>
735- <property name="value">
736- <number>30</number>
737- </property>
738- </widget>
739- </item>
740- <item row="2" column="5">
741- <widget class="QDoubleSpinBox" name="highVisualGain">
742- <property name="toolTip">
743- <string>Visual gain of the high frequencies</string>
744- </property>
745- <property name="decimals">
746- <number>1</number>
747- </property>
748- <property name="minimum">
749- <double>0.500000000000000</double>
750- </property>
751- <property name="maximum">
752- <double>5.000000000000000</double>
753- </property>
754- <property name="singleStep">
755- <double>0.100000000000000</double>
756- </property>
757- </widget>
758- </item>
759- <item row="2" column="4">
760- <widget class="QDoubleSpinBox" name="midVisualGain">
761- <property name="toolTip">
762- <string>Visual gain of the middle frequencies</string>
763- </property>
764- <property name="decimals">
765- <number>1</number>
766- </property>
767- <property name="minimum">
768- <double>0.500000000000000</double>
769- </property>
770- <property name="maximum">
771- <double>5.000000000000000</double>
772- </property>
773- <property name="singleStep">
774- <double>0.100000000000000</double>
775- </property>
776- </widget>
777- </item>
778- <item row="2" column="3">
779- <widget class="QDoubleSpinBox" name="lowVisualGain">
780- <property name="toolTip">
781- <string>Visual gain of the low frequencies</string>
782- </property>
783- <property name="decimals">
784- <number>1</number>
785- </property>
786- <property name="minimum">
787- <double>0.500000000000000</double>
788- </property>
789- <property name="maximum">
790- <double>5.000000000000000</double>
791- </property>
792- <property name="singleStep">
793- <double>0.100000000000000</double>
794- </property>
795- </widget>
796- </item>
797- <item row="2" column="2">
798- <widget class="QDoubleSpinBox" name="allVisualGain">
799- <property name="toolTip">
800- <string>Global visual gain</string>
801- </property>
802- <property name="decimals">
803- <number>1</number>
804- </property>
805- <property name="minimum">
806- <double>0.500000000000000</double>
807- </property>
808- <property name="maximum">
809- <double>5.000000000000000</double>
810- </property>
811- <property name="singleStep">
812- <double>0.100000000000000</double>
813- </property>
814- </widget>
815- </item>
816- <item row="2" column="0">
817- <widget class="QLabel" name="visualGainLabel">
818- <property name="text">
819- <string>Visual gain</string>
820- </property>
821- <property name="alignment">
822- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
823- </property>
824- <property name="buddy">
825- <cstring>allVisualGain</cstring>
826- </property>
827- </widget>
828- </item>
829- <item row="1" column="0">
830- <widget class="QLabel" name="frameRateLabel">
831- <property name="text">
832- <string>Frame rate</string>
833- </property>
834- <property name="alignment">
835- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
836- </property>
837- <property name="buddy">
838- <cstring>frameRateSlider</cstring>
839- </property>
840- </widget>
841- </item>
842- <item row="4" column="2" colspan="2">
843- <widget class="QComboBox" name="defaultZoomComboBox"/>
844- </item>
845- <item row="4" column="0">
846- <widget class="QLabel" name="defaultZoomLabel">
847- <property name="text">
848- <string>Default zoom</string>
849- </property>
850- <property name="alignment">
851- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
852- </property>
853- <property name="buddy">
854- <cstring>defaultZoomComboBox</cstring>
855- </property>
856- </widget>
857- </item>
858- <item row="4" column="4" colspan="2">
859- <widget class="QCheckBox" name="synchronizeZoomCheckBox">
860- <property name="toolTip">
861- <string>Synchronize zoom level across all waveform displays.</string>
862- </property>
863- <property name="text">
864- <string>Synchronize</string>
865- </property>
866- </widget>
867- </item>
868- <item row="5" column="0">
869- <widget class="QLabel" name="openGlStatusLabel">
870- <property name="toolTip">
871- <string/>
872- </property>
873- <property name="text">
874- <string>OpenGl status</string>
875- </property>
876- <property name="alignment">
877- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
878- </property>
879- </widget>
880- </item>
881- <item row="5" column="2" colspan="4">
882- <widget class="QLabel" name="openGlStatusIcon">
883- <property name="toolTip">
884- <string>Displays which OpenGL version is supported by the current platform.</string>
885- </property>
886- <property name="text">
887- <string/>
888- </property>
889- </widget>
890- </item>
891- <item row="1" column="5">
892- <widget class="QLabel" name="frameRateAverage">
893- <property name="toolTip">
894- <string>Displays the actual frame rate.</string>
895- </property>
896- <property name="text">
897- <string/>
898- </property>
899- </widget>
900- </item>
901- <item row="5" column="1">
902- <widget class="QLabel" name="dummySpacerLabel">
903- <property name="text">
904- <string/>
905- </property>
906- </widget>
907- </item>
908- <item row="3" column="2" colspan="4">
909- <widget class="QCheckBox" name="normalizeOverviewCheckBox">
910- <property name="text">
911- <string>Normalize Overview</string>
912- </property>
913- </widget>
914+ <layout class="QGridLayout" name="gridLayoutWaveform">
915+ <property name="sizeConstraint">
916+ <enum>QLayout::SetMaximumSize</enum>
917+ </property>
918+ <property name="leftMargin">
919+ <number>0</number>
920+ </property>
921+ <property name="horizontalSpacing">
922+ <number>-1</number>
923+ </property>
924+ <item row="0" column="0">
925+ <widget class="QLabel" name="waveformTypeLabel">
926+ <property name="sizePolicy">
927+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
928+ <horstretch>0</horstretch>
929+ <verstretch>0</verstretch>
930+ </sizepolicy>
931+ </property>
932+ <property name="text">
933+ <string>Display type</string>
934+ </property>
935+ <property name="alignment">
936+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
937+ </property>
938+ <property name="buddy">
939+ <cstring>waveformTypeComboBox</cstring>
940+ </property>
941+ </widget>
942+ </item>
943+ <item row="0" column="1">
944+ <widget class="QComboBox" name="waveformTypeComboBox"/>
945+ </item>
946+ <item row="1" column="0">
947+ <widget class="QLabel" name="frameRateLabel">
948+ <property name="text">
949+ <string>Frame rate</string>
950+ </property>
951+ <property name="alignment">
952+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
953+ </property>
954+ <property name="buddy">
955+ <cstring>frameRateSlider</cstring>
956+ </property>
957+ </widget>
958+ </item>
959+ <item row="1" column="1">
960+ <widget class="QSlider" name="frameRateSlider">
961+ <property name="sizePolicy">
962+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
963+ <horstretch>0</horstretch>
964+ <verstretch>0</verstretch>
965+ </sizepolicy>
966+ </property>
967+ <property name="maximumSize">
968+ <size>
969+ <width>16777215</width>
970+ <height>16777215</height>
971+ </size>
972+ </property>
973+ <property name="minimum">
974+ <number>10</number>
975+ </property>
976+ <property name="maximum">
977+ <number>60</number>
978+ </property>
979+ <property name="value">
980+ <number>30</number>
981+ </property>
982+ <property name="orientation">
983+ <enum>Qt::Horizontal</enum>
984+ </property>
985+ </widget>
986+ </item>
987+ <item row="1" column="2">
988+ <layout class="QHBoxLayout" name="horizontalLayout_10">
989+ <item>
990+ <widget class="QSpinBox" name="frameRateSpinBox">
991+ <property name="toolTip">
992+ <string/>
993+ </property>
994+ <property name="minimum">
995+ <number>10</number>
996+ </property>
997+ <property name="maximum">
998+ <number>60</number>
999+ </property>
1000+ <property name="value">
1001+ <number>30</number>
1002+ </property>
1003+ </widget>
1004+ </item>
1005+ <item>
1006+ <widget class="QLabel" name="frameRateAverage">
1007+ <property name="toolTip">
1008+ <string>Displays the actual frame rate.</string>
1009+ </property>
1010+ <property name="text">
1011+ <string/>
1012+ </property>
1013+ </widget>
1014+ </item>
1015+ </layout>
1016+ </item>
1017+ <item row="3" column="1">
1018+ <layout class="QHBoxLayout" name="horizontalLayout_4">
1019+ <item>
1020+ <widget class="QDoubleSpinBox" name="allVisualGain">
1021+ <property name="toolTip">
1022+ <string>Global visual gain</string>
1023+ </property>
1024+ <property name="decimals">
1025+ <number>1</number>
1026+ </property>
1027+ <property name="minimum">
1028+ <double>0.500000000000000</double>
1029+ </property>
1030+ <property name="maximum">
1031+ <double>5.000000000000000</double>
1032+ </property>
1033+ <property name="singleStep">
1034+ <double>0.100000000000000</double>
1035+ </property>
1036+ </widget>
1037+ </item>
1038+ <item>
1039+ <widget class="QDoubleSpinBox" name="lowVisualGain">
1040+ <property name="toolTip">
1041+ <string>Visual gain of the low frequencies</string>
1042+ </property>
1043+ <property name="decimals">
1044+ <number>1</number>
1045+ </property>
1046+ <property name="minimum">
1047+ <double>0.500000000000000</double>
1048+ </property>
1049+ <property name="maximum">
1050+ <double>5.000000000000000</double>
1051+ </property>
1052+ <property name="singleStep">
1053+ <double>0.100000000000000</double>
1054+ </property>
1055+ </widget>
1056+ </item>
1057+ </layout>
1058+ </item>
1059+ <item row="3" column="2">
1060+ <layout class="QHBoxLayout" name="horizontalLayout_6">
1061+ <item>
1062+ <widget class="QDoubleSpinBox" name="midVisualGain">
1063+ <property name="toolTip">
1064+ <string>Visual gain of the middle frequencies</string>
1065+ </property>
1066+ <property name="decimals">
1067+ <number>1</number>
1068+ </property>
1069+ <property name="minimum">
1070+ <double>0.500000000000000</double>
1071+ </property>
1072+ <property name="maximum">
1073+ <double>5.000000000000000</double>
1074+ </property>
1075+ <property name="singleStep">
1076+ <double>0.100000000000000</double>
1077+ </property>
1078+ </widget>
1079+ </item>
1080+ <item>
1081+ <widget class="QDoubleSpinBox" name="highVisualGain">
1082+ <property name="toolTip">
1083+ <string>Visual gain of the high frequencies</string>
1084+ </property>
1085+ <property name="decimals">
1086+ <number>1</number>
1087+ </property>
1088+ <property name="minimum">
1089+ <double>0.500000000000000</double>
1090+ </property>
1091+ <property name="maximum">
1092+ <double>5.000000000000000</double>
1093+ </property>
1094+ <property name="singleStep">
1095+ <double>0.100000000000000</double>
1096+ </property>
1097+ </widget>
1098+ </item>
1099+ </layout>
1100+ </item>
1101+ <item row="4" column="1">
1102+ <widget class="QCheckBox" name="normalizeOverviewCheckBox">
1103+ <property name="text">
1104+ <string>Normalize Overview</string>
1105+ </property>
1106+ </widget>
1107+ </item>
1108+ <item row="5" column="0">
1109+ <widget class="QLabel" name="defaultZoomLabel">
1110+ <property name="text">
1111+ <string>Default zoom</string>
1112+ </property>
1113+ <property name="alignment">
1114+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
1115+ </property>
1116+ <property name="buddy">
1117+ <cstring>defaultZoomComboBox</cstring>
1118+ </property>
1119+ </widget>
1120+ </item>
1121+ <item row="5" column="1">
1122+ <widget class="QComboBox" name="defaultZoomComboBox"/>
1123+ </item>
1124+ <item row="5" column="2">
1125+ <widget class="QCheckBox" name="synchronizeZoomCheckBox">
1126+ <property name="toolTip">
1127+ <string>Synchronize zoom level across all waveform displays.</string>
1128+ </property>
1129+ <property name="text">
1130+ <string>Synchronize</string>
1131+ </property>
1132+ </widget>
1133+ </item>
1134+ <item row="6" column="0">
1135+ <widget class="QLabel" name="openGlStatusLabel">
1136+ <property name="toolTip">
1137+ <string/>
1138+ </property>
1139+ <property name="text">
1140+ <string>OpenGL status</string>
1141+ </property>
1142+ <property name="alignment">
1143+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
1144+ </property>
1145+ </widget>
1146+ </item>
1147+ <item row="6" column="1">
1148+ <widget class="QLabel" name="openGlStatusIcon">
1149+ <property name="toolTip">
1150+ <string>Displays which OpenGL version is supported by the current platform.</string>
1151+ </property>
1152+ <property name="text">
1153+ <string/>
1154+ </property>
1155+ </widget>
1156+ </item>
1157+ <item row="3" column="0">
1158+ <widget class="QLabel" name="visualGainLabel">
1159+ <property name="text">
1160+ <string>Visual gain</string>
1161+ </property>
1162+ <property name="alignment">
1163+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
1164+ </property>
1165+ <property name="buddy">
1166+ <cstring>allVisualGain</cstring>
1167+ </property>
1168+ </widget>
1169+ </item>
1170+ <item row="0" column="2">
1171+ <spacer name="horizontalSpacer">
1172+ <property name="orientation">
1173+ <enum>Qt::Horizontal</enum>
1174+ </property>
1175+ <property name="sizeType">
1176+ <enum>QSizePolicy::Minimum</enum>
1177+ </property>
1178+ <property name="sizeHint" stdset="0">
1179+ <size>
1180+ <width>140</width>
1181+ <height>20</height>
1182+ </size>
1183+ </property>
1184+ </spacer>
1185+ </item>
1186+ <item row="4" column="0">
1187+ <spacer name="horizontalSpacer_2">
1188+ <property name="orientation">
1189+ <enum>Qt::Horizontal</enum>
1190+ </property>
1191+ <property name="sizeType">
1192+ <enum>QSizePolicy::Minimum</enum>
1193+ </property>
1194+ <property name="sizeHint" stdset="0">
1195+ <size>
1196+ <width>140</width>
1197+ <height>20</height>
1198+ </size>
1199+ </property>
1200+ </spacer>
1201+ </item>
1202+ </layout>
1203+ </item>
1204+ </layout>
1205+ </widget>
1206+ </item>
1207+ <item row="3" column="0">
1208+ <widget class="QGroupBox" name="groupBoxPitch">
1209+ <property name="title">
1210+ <string>Pitch/Tempo Options</string>
1211+ </property>
1212+ <layout class="QVBoxLayout" name="verticalLayout">
1213+ <property name="margin">
1214+ <number>4</number>
1215+ </property>
1216+ <item>
1217+ <layout class="QGridLayout" name="gridLayoutPitchOptions" columnstretch="0,0,0">
1218+ <property name="sizeConstraint">
1219+ <enum>QLayout::SetDefaultConstraint</enum>
1220+ </property>
1221+ <item row="0" column="2">
1222+ <widget class="QCheckBox" name="checkBoxInvertPitchSlider">
1223+ <property name="toolTip">
1224+ <string>Make the pitch sliders work like those on DJ turntables and CDJs where moving downward increases the speed</string>
1225+ </property>
1226+ <property name="text">
1227+ <string>Invert direction</string>
1228+ </property>
1229+ </widget>
1230+ </item>
1231+ <item row="1" column="0">
1232+ <widget class="QLabel" name="labelChangeButtons">
1233+ <property name="text">
1234+ <string>Pitch change buttons:</string>
1235+ </property>
1236+ </widget>
1237+ </item>
1238+ <item row="4" column="0">
1239+ <widget class="QLabel" name="label_4">
1240+ <property name="text">
1241+ <string>Ramping pitch bend</string>
1242+ </property>
1243+ <property name="buddy">
1244+ <cstring>checkBoxRateRamp</cstring>
1245+ </property>
1246+ </widget>
1247+ </item>
1248+ <item row="4" column="1">
1249+ <widget class="QCheckBox" name="checkBoxRateRamp">
1250+ <property name="toolTip">
1251+ <string>Smoothly adjusts deck speed when temporary change buttons are held down</string>
1252+ </property>
1253+ <property name="text">
1254+ <string>Enable</string>
1255+ </property>
1256+ </widget>
1257+ </item>
1258+ <item row="5" column="1" colspan="2">
1259+ <layout class="QHBoxLayout" name="horizontalLayoutRampingOptions">
1260+ <item>
1261+ <widget class="QLabel" name="labelRateRampSensitivity">
1262+ <property name="text">
1263+ <string>Sensitivity</string>
1264+ </property>
1265+ <property name="buddy">
1266+ <cstring>SliderRateRampSensitivity</cstring>
1267+ </property>
1268+ </widget>
1269+ </item>
1270+ <item>
1271+ <widget class="QSlider" name="SliderRateRampSensitivity">
1272+ <property name="enabled">
1273+ <bool>false</bool>
1274+ </property>
1275+ <property name="sizePolicy">
1276+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
1277+ <horstretch>0</horstretch>
1278+ <verstretch>0</verstretch>
1279+ </sizepolicy>
1280+ </property>
1281+ <property name="minimum">
1282+ <number>100</number>
1283+ </property>
1284+ <property name="maximum">
1285+ <number>2500</number>
1286+ </property>
1287+ <property name="singleStep">
1288+ <number>50</number>
1289+ </property>
1290+ <property name="value">
1291+ <number>250</number>
1292+ </property>
1293+ <property name="orientation">
1294+ <enum>Qt::Horizontal</enum>
1295+ </property>
1296+ </widget>
1297+ </item>
1298+ <item>
1299+ <widget class="QSpinBox" name="SpinBoxRateRampSensitivity">
1300+ <property name="enabled">
1301+ <bool>false</bool>
1302+ </property>
1303+ <property name="toolTip">
1304+ <string>Value in milliseconds</string>
1305+ </property>
1306+ <property name="minimum">
1307+ <number>100</number>
1308+ </property>
1309+ <property name="maximum">
1310+ <number>2500</number>
1311+ </property>
1312+ <property name="singleStep">
1313+ <number>1</number>
1314+ </property>
1315+ <property name="value">
1316+ <number>250</number>
1317+ </property>
1318+ </widget>
1319+ </item>
1320+ </layout>
1321+ </item>
1322+ <item row="0" column="1">
1323+ <widget class="QComboBox" name="ComboBoxRateRange">
1324+ <property name="sizePolicy">
1325+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
1326+ <horstretch>0</horstretch>
1327+ <verstretch>0</verstretch>
1328+ </sizepolicy>
1329+ </property>
1330+ <property name="font">
1331+ <font/>
1332+ </property>
1333+ </widget>
1334+ </item>
1335+ <item row="0" column="0">
1336+ <widget class="QLabel" name="TextLabelSliderRange">
1337+ <property name="enabled">
1338+ <bool>true</bool>
1339+ </property>
1340+ <property name="font">
1341+ <font/>
1342+ </property>
1343+ <property name="text">
1344+ <string>Slider range</string>
1345+ </property>
1346+ <property name="wordWrap">
1347+ <bool>false</bool>
1348+ </property>
1349+ <property name="buddy">
1350+ <cstring>ComboBoxRateRange</cstring>
1351+ </property>
1352+ </widget>
1353+ </item>
1354+ <item row="2" column="0">
1355+ <widget class="QLabel" name="TextLabel6_2_3_2">
1356+ <property name="enabled">
1357+ <bool>true</bool>
1358+ </property>
1359+ <property name="font">
1360+ <font/>
1361+ </property>
1362+ <property name="text">
1363+ <string>Left click</string>
1364+ </property>
1365+ <property name="alignment">
1366+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
1367+ </property>
1368+ <property name="wordWrap">
1369+ <bool>false</bool>
1370+ </property>
1371+ <property name="buddy">
1372+ <cstring>spinBoxPermRateLeft</cstring>
1373+ </property>
1374+ </widget>
1375+ </item>
1376+ <item row="1" column="1">
1377+ <widget class="QLabel" name="labelPermanent">
1378+ <property name="text">
1379+ <string>Permanent</string>
1380+ </property>
1381+ </widget>
1382+ </item>
1383+ <item row="3" column="0">
1384+ <widget class="QLabel" name="TextLabel6_2_3_2_2">
1385+ <property name="enabled">
1386+ <bool>true</bool>
1387+ </property>
1388+ <property name="font">
1389+ <font/>
1390+ </property>
1391+ <property name="text">
1392+ <string>Right click</string>
1393+ </property>
1394+ <property name="alignment">
1395+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
1396+ </property>
1397+ <property name="wordWrap">
1398+ <bool>false</bool>
1399+ </property>
1400+ <property name="buddy">
1401+ <cstring>spinBoxPermRateRight</cstring>
1402+ </property>
1403+ </widget>
1404+ </item>
1405+ <item row="1" column="2">
1406+ <widget class="QLabel" name="labelTemporary">
1407+ <property name="text">
1408+ <string>Temporary</string>
1409+ </property>
1410+ </widget>
1411+ </item>
1412+ <item row="2" column="1">
1413+ <widget class="QDoubleSpinBox" name="spinBoxPermRateLeft">
1414+ <property name="toolTip">
1415+ <string>Permanent rate change when left-clicking</string>
1416+ </property>
1417+ <property name="accelerated">
1418+ <bool>true</bool>
1419+ </property>
1420+ <property name="suffix">
1421+ <string>%</string>
1422+ </property>
1423+ <property name="decimals">
1424+ <number>2</number>
1425+ </property>
1426+ <property name="minimum">
1427+ <double>0.010000000000000</double>
1428+ </property>
1429+ <property name="maximum">
1430+ <double>10.000000000000000</double>
1431+ </property>
1432+ <property name="singleStep">
1433+ <double>0.010000000000000</double>
1434+ </property>
1435+ </widget>
1436+ </item>
1437+ <item row="3" column="1">
1438+ <widget class="QDoubleSpinBox" name="spinBoxPermRateRight">
1439+ <property name="toolTip">
1440+ <string>Permanent rate change when right-clicking</string>
1441+ </property>
1442+ <property name="accelerated">
1443+ <bool>true</bool>
1444+ </property>
1445+ <property name="suffix">
1446+ <string>%</string>
1447+ </property>
1448+ <property name="decimals">
1449+ <number>2</number>
1450+ </property>
1451+ <property name="minimum">
1452+ <double>0.010000000000000</double>
1453+ </property>
1454+ <property name="maximum">
1455+ <double>10.000000000000000</double>
1456+ </property>
1457+ <property name="singleStep">
1458+ <double>0.010000000000000</double>
1459+ </property>
1460+ </widget>
1461+ </item>
1462+ <item row="2" column="2">
1463+ <widget class="QDoubleSpinBox" name="spinBoxTempRateLeft">
1464+ <property name="toolTip">
1465+ <string>Temporary rate change when left-clicking</string>
1466+ </property>
1467+ <property name="accelerated">
1468+ <bool>true</bool>
1469+ </property>
1470+ <property name="suffix">
1471+ <string>%</string>
1472+ </property>
1473+ <property name="decimals">
1474+ <number>2</number>
1475+ </property>
1476+ <property name="minimum">
1477+ <double>0.010000000000000</double>
1478+ </property>
1479+ <property name="maximum">
1480+ <double>10.000000000000000</double>
1481+ </property>
1482+ <property name="singleStep">
1483+ <double>0.010000000000000</double>
1484+ </property>
1485+ </widget>
1486+ </item>
1487+ <item row="3" column="2">
1488+ <widget class="QDoubleSpinBox" name="spinBoxTempRateRight">
1489+ <property name="toolTip">
1490+ <string>Temporary rate change when right-clicking</string>
1491+ </property>
1492+ <property name="accelerated">
1493+ <bool>true</bool>
1494+ </property>
1495+ <property name="suffix">
1496+ <string>%</string>
1497+ </property>
1498+ <property name="decimals">
1499+ <number>2</number>
1500+ </property>
1501+ <property name="minimum">
1502+ <double>0.010000000000000</double>
1503+ </property>
1504+ <property name="maximum">
1505+ <double>10.000000000000000</double>
1506+ </property>
1507+ <property name="singleStep">
1508+ <double>0.010000000000000</double>
1509+ </property>
1510+ </widget>
1511+ </item>
1512+ </layout>
1513 </item>
1514 </layout>
1515 </widget>
1516@@ -848,6 +1350,7 @@
1517 <tabstops>
1518 <tabstop>ComboBoxSkinconf</tabstop>
1519 <tabstop>ComboBoxSchemeconf</tabstop>
1520+<<<<<<< TREE
1521 <tabstop>ComboBoxPosition</tabstop>
1522 <tabstop>ComboBoxTooltips</tabstop>
1523 <tabstop>ComboBoxRateRange</tabstop>
1524@@ -856,7 +1359,17 @@
1525 <tabstop>ComboBoxCueDefault</tabstop>
1526 <tabstop>ComboBoxAllowTrackLoadToPlayingDeck</tabstop>
1527 <tabstop>ComboBoxAutoDjRequeue</tabstop>
1528+=======
1529+>>>>>>> MERGE-SOURCE
1530 <tabstop>ComboBoxLocale</tabstop>
1531+ <tabstop>checkBoxTooltipsEnabled</tabstop>
1532+ <tabstop>checkBoxTooltipsOnlyLibrary</tabstop>
1533+ <tabstop>radioButtonElapsed</tabstop>
1534+ <tabstop>radioButtonRemaining</tabstop>
1535+ <tabstop>radioButtonCueCdj</tabstop>
1536+ <tabstop>radioButtonCueSimple</tabstop>
1537+ <tabstop>checkBoxJumpToCueOnLoad</tabstop>
1538+ <tabstop>checkBoxDontLoadToPlayingDecks</tabstop>
1539 <tabstop>waveformTypeComboBox</tabstop>
1540 <tabstop>frameRateSlider</tabstop>
1541 <tabstop>frameRateSpinBox</tabstop>
1542@@ -867,29 +1380,63 @@
1543 <tabstop>normalizeOverviewCheckBox</tabstop>
1544 <tabstop>defaultZoomComboBox</tabstop>
1545 <tabstop>synchronizeZoomCheckBox</tabstop>
1546+ <tabstop>ComboBoxRateRange</tabstop>
1547+ <tabstop>checkBoxInvertPitchSlider</tabstop>
1548 <tabstop>spinBoxPermRateLeft</tabstop>
1549+ <tabstop>spinBoxTempRateLeft</tabstop>
1550 <tabstop>spinBoxPermRateRight</tabstop>
1551- <tabstop>spinBoxTempRateLeft</tabstop>
1552 <tabstop>spinBoxTempRateRight</tabstop>
1553- <tabstop>groupBoxRateRamp</tabstop>
1554+ <tabstop>checkBoxRateRamp</tabstop>
1555 <tabstop>SliderRateRampSensitivity</tabstop>
1556 <tabstop>SpinBoxRateRampSensitivity</tabstop>
1557 </tabstops>
1558 <resources/>
1559 <connections>
1560 <connection>
1561+ <sender>frameRateSlider</sender>
1562+ <signal>valueChanged(int)</signal>
1563+ <receiver>frameRateSpinBox</receiver>
1564+ <slot>setValue(int)</slot>
1565+ <hints>
1566+ <hint type="sourcelabel">
1567+ <x>569</x>
1568+ <y>327</y>
1569+ </hint>
1570+ <hint type="destinationlabel">
1571+ <x>710</x>
1572+ <y>330</y>
1573+ </hint>
1574+ </hints>
1575+ </connection>
1576+ <connection>
1577+ <sender>frameRateSpinBox</sender>
1578+ <signal>valueChanged(int)</signal>
1579+ <receiver>frameRateSlider</receiver>
1580+ <slot>setValue(int)</slot>
1581+ <hints>
1582+ <hint type="sourcelabel">
1583+ <x>710</x>
1584+ <y>330</y>
1585+ </hint>
1586+ <hint type="destinationlabel">
1587+ <x>569</x>
1588+ <y>327</y>
1589+ </hint>
1590+ </hints>
1591+ </connection>
1592+ <connection>
1593 <sender>SliderRateRampSensitivity</sender>
1594 <signal>valueChanged(int)</signal>
1595 <receiver>SpinBoxRateRampSensitivity</receiver>
1596 <slot>setValue(int)</slot>
1597 <hints>
1598 <hint type="sourcelabel">
1599- <x>418</x>
1600- <y>468</y>
1601+ <x>520</x>
1602+ <y>662</y>
1603 </hint>
1604 <hint type="destinationlabel">
1605- <x>480</x>
1606- <y>466</y>
1607+ <x>838</x>
1608+ <y>665</y>
1609 </hint>
1610 </hints>
1611 </connection>
1612@@ -900,46 +1447,23 @@
1613 <slot>setValue(int)</slot>
1614 <hints>
1615 <hint type="sourcelabel">
1616- <x>480</x>
1617- <y>466</y>
1618- </hint>
1619- <hint type="destinationlabel">
1620- <x>418</x>
1621- <y>468</y>
1622- </hint>
1623- </hints>
1624- </connection>
1625- <connection>
1626- <sender>frameRateSlider</sender>
1627- <signal>valueChanged(int)</signal>
1628- <receiver>frameRateSpinBox</receiver>
1629- <slot>setValue(int)</slot>
1630- <hints>
1631- <hint type="sourcelabel">
1632- <x>355</x>
1633- <y>292</y>
1634- </hint>
1635- <hint type="destinationlabel">
1636- <x>419</x>
1637- <y>293</y>
1638- </hint>
1639- </hints>
1640- </connection>
1641- <connection>
1642- <sender>frameRateSpinBox</sender>
1643- <signal>valueChanged(int)</signal>
1644- <receiver>frameRateSlider</receiver>
1645- <slot>setValue(int)</slot>
1646- <hints>
1647- <hint type="sourcelabel">
1648- <x>432</x>
1649- <y>295</y>
1650- </hint>
1651- <hint type="destinationlabel">
1652- <x>352</x>
1653- <y>298</y>
1654+ <x>838</x>
1655+ <y>665</y>
1656+ </hint>
1657+ <hint type="destinationlabel">
1658+ <x>520</x>
1659+ <y>662</y>
1660 </hint>
1661 </hints>
1662 </connection>
1663 </connections>
1664+ <buttongroups>
1665+ <buttongroup name="buttonGroupTooltips">
1666+ <property name="exclusive">
1667+ <bool>false</bool>
1668+ </property>
1669+ </buttongroup>
1670+ <buttongroup name="buttonGroupCueBehavior"/>
1671+ <buttongroup name="buttonGroupTrackTime"/>
1672+ </buttongroups>
1673 </ui>
1674
1675=== modified file 'mixxx/src/dlgprefplaylistdlg.ui'
1676--- mixxx/src/dlgprefplaylistdlg.ui 2012-12-09 17:41:04 +0000
1677+++ mixxx/src/dlgprefplaylistdlg.ui 2013-12-16 18:09:31 +0000
1678@@ -6,8 +6,8 @@
1679 <rect>
1680 <x>0</x>
1681 <y>0</y>
1682- <width>512</width>
1683- <height>469</height>
1684+ <width>447</width>
1685+ <height>550</height>
1686 </rect>
1687 </property>
1688 <property name="windowTitle">
1689@@ -140,7 +140,7 @@
1690 <item row="0" column="0">
1691 <widget class="QCheckBox" name="checkBoxPromoStats">
1692 <property name="text">
1693- <string>Support Mixxx by counting and sharing bundled songs
1694+ <string>Support Mixxx by counting and sharing bundled song
1695 playback and outbound link statistics</string>
1696 </property>
1697 </widget>
1698@@ -223,7 +223,7 @@
1699 <item row="8" column="0">
1700 <widget class="QLabel" name="label_10">
1701 <property name="text">
1702- <string> You will need to restart Mixxx for this to take effect</string>
1703+ <string> You will need to restart Mixxx for these settings to take effect.</string>
1704 </property>
1705 </widget>
1706 </item>

Subscribers

People subscribed via source and target branches