diff --git a/res/qml/AuxiliaryUnit.qml b/res/qml/AuxiliaryUnit.qml index a593549046d..79fa80f388f 100644 --- a/res/qml/AuxiliaryUnit.qml +++ b/res/qml/AuxiliaryUnit.qml @@ -38,7 +38,6 @@ Row { key: "pregain" color: Theme.gainKnobColor } - } Column { @@ -57,7 +56,6 @@ Row { activeColor: Theme.pflActiveButtonColor toggleable: true } - } Skin.EmbeddedBackground { @@ -93,7 +91,6 @@ Row { anchors.centerIn: parent text: "FX1" } - } Skin.InfoBarButton { @@ -109,9 +106,6 @@ Row { anchors.centerIn: parent text: "FX2" } - } - } - } diff --git a/res/qml/Button.qml b/res/qml/Button.qml index 0ef84880cc2..c01dd33c48d 100644 --- a/res/qml/Button.qml +++ b/res/qml/Button.qml @@ -72,7 +72,6 @@ AbstractButton { target: labelGlow visible: false } - } ] @@ -90,7 +89,6 @@ AbstractButton { right: 10 bottom: 10 } - } contentItem: Item { @@ -119,7 +117,5 @@ AbstractButton { font.pixelSize: Theme.buttonFontPixelSize color: root.normalColor } - } - } diff --git a/res/qml/ComboBox.qml b/res/qml/ComboBox.qml index 26693574e88..adf44947213 100644 --- a/res/qml/ComboBox.qml +++ b/res/qml/ComboBox.qml @@ -31,7 +31,6 @@ ComboBox { border.color: Theme.deckLineColor color: "transparent" } - } contentItem: Text { @@ -57,12 +56,9 @@ ComboBox { ScrollIndicator.vertical: ScrollIndicator { } - } background: Skin.EmbeddedBackground { } - } - } diff --git a/res/qml/ControlButton.qml b/res/qml/ControlButton.qml index 80b82eb3903..6759dc5add0 100644 --- a/res/qml/ControlButton.qml +++ b/res/qml/ControlButton.qml @@ -22,7 +22,6 @@ Skin.Button { onReleased: { if (!toggleable) control.value = 0; - } Mixxx.ControlProxy { @@ -31,5 +30,4 @@ Skin.Button { group: root.group key: root.key } - } diff --git a/res/qml/ControlKnob.qml b/res/qml/ControlKnob.qml index 8ded162cadd..c95ba23c4d0 100644 --- a/res/qml/ControlKnob.qml +++ b/res/qml/ControlKnob.qml @@ -18,5 +18,4 @@ Skin.Knob { TapHandler { onDoubleTapped: control.reset() } - } diff --git a/res/qml/ControlMiniKnob.qml b/res/qml/ControlMiniKnob.qml index cf2e74d8d64..80d3259458b 100644 --- a/res/qml/ControlMiniKnob.qml +++ b/res/qml/ControlMiniKnob.qml @@ -18,5 +18,4 @@ Skin.MiniKnob { TapHandler { onDoubleTapped: control.reset() } - } diff --git a/res/qml/ControlSlider.qml b/res/qml/ControlSlider.qml index 8c394c6273e..0afd7021c0d 100644 --- a/res/qml/ControlSlider.qml +++ b/res/qml/ControlSlider.qml @@ -16,5 +16,4 @@ Skin.Slider { TapHandler { onDoubleTapped: control.reset() } - } diff --git a/res/qml/CrossfaderRow.qml b/res/qml/CrossfaderRow.qml index c5498ee4bc3..d19abd48a46 100644 --- a/res/qml/CrossfaderRow.qml +++ b/res/qml/CrossfaderRow.qml @@ -42,7 +42,6 @@ Item { Skin.MicrophoneDuckingPanel { } - } Skin.SectionBackground { @@ -68,7 +67,6 @@ Item { fg: Theme.imgCrossfaderHandle bg: Theme.imgCrossfaderBackground } - } Row { @@ -100,7 +98,5 @@ Item { layoutDirection: Qt.RightToLeft unitNumber: 4 } - } - } diff --git a/res/qml/Deck.qml b/res/qml/Deck.qml index e8e1403e6d6..46ff28bd465 100644 --- a/res/qml/Deck.qml +++ b/res/qml/Deck.qml @@ -68,7 +68,6 @@ Item { FadeBehavior on visible { fadeTarget: rateSlider } - } Rectangle { @@ -128,7 +127,6 @@ Item { anchors.centerIn: parent text: "FX 1" } - } Rectangle { @@ -155,7 +153,6 @@ Item { anchors.centerIn: parent text: "FX 2" } - } Rectangle { @@ -214,7 +211,6 @@ Item { group: root.group key: "track_samples" } - } Item { @@ -250,7 +246,6 @@ Item { anchors.centerIn: parent source: "images/icon_quantize.svg" } - } Item { @@ -286,15 +281,12 @@ Item { anchors.centerIn: parent source: "images/icon_passthrough.svg" } - } - } FadeBehavior on visible { fadeTarget: overview } - } Item { @@ -351,9 +343,7 @@ Item { width: playButton.height height: playButton.height } - } - } Skin.SyncButton { @@ -367,12 +357,10 @@ Item { FadeBehavior on visible { fadeTarget: buttonBar } - } Mixxx.PlayerDropArea { anchors.fill: parent group: root.group } - } diff --git a/res/qml/DeckInfoBar.qml b/res/qml/DeckInfoBar.qml index 1d0e2eed7fe..8dc7326dc1e 100644 --- a/res/qml/DeckInfoBar.qml +++ b/res/qml/DeckInfoBar.qml @@ -88,11 +88,8 @@ Rectangle { height: parent.height / 2 color: Theme.deckTextColor } - } - } - } Skin.EmbeddedText { @@ -181,7 +178,6 @@ Rectangle { group: root.group key: "bpm" } - } Skin.EmbeddedText { @@ -202,7 +198,6 @@ Rectangle { group: root.group key: "rate_ratio" } - } gradient: Gradient { @@ -223,7 +218,5 @@ Rectangle { position: 1 color: Theme.deckBackgroundColor } - } - } diff --git a/res/qml/DeckRow.qml b/res/qml/DeckRow.qml index 459a2b37919..2c8d317fb68 100644 --- a/res/qml/DeckRow.qml +++ b/res/qml/DeckRow.qml @@ -63,7 +63,6 @@ Item { target: rightDeck anchors.left: mixer.right } - } ] @@ -88,7 +87,6 @@ Item { FadeBehavior on visible { fadeTarget: mixer } - } Deck { @@ -116,9 +114,6 @@ Item { property: "implicitHeight" duration: 150 } - } - } - } diff --git a/res/qml/DeveloperToolsWindow.qml b/res/qml/DeveloperToolsWindow.qml index 75cc03eaa51..cbf895ba851 100644 --- a/res/qml/DeveloperToolsWindow.qml +++ b/res/qml/DeveloperToolsWindow.qml @@ -55,7 +55,6 @@ Window { right: 20 bottom: 10 } - } Text { @@ -94,9 +93,7 @@ Window { TapHandler { onTapped: controlModel.toggleSortColumn(headerDlgt.column) } - } - } TableView { @@ -150,9 +147,7 @@ Window { elide: Text.ElideRight color: Theme.deckTextColor } - } - } DelegateChoice { @@ -177,9 +172,7 @@ Window { elide: Text.ElideRight color: Theme.deckTextColor } - } - } DelegateChoice { @@ -216,11 +209,8 @@ Window { validator: DoubleValidator { } - } - } - } DelegateChoice { @@ -257,17 +247,10 @@ Window { validator: DoubleValidator { } - } - } - } - } - } - } - } diff --git a/res/qml/EffectRow.qml b/res/qml/EffectRow.qml index 4c224ec2614..fe1c540f416 100644 --- a/res/qml/EffectRow.qml +++ b/res/qml/EffectRow.qml @@ -23,7 +23,6 @@ Item { width: root.width / 2 unitNumber: 2 } - } Skin.SectionBackground { @@ -39,5 +38,4 @@ Item { anchors.left: parent.horizontalCenter anchors.right: parent.right } - } diff --git a/res/qml/EffectSlot.qml b/res/qml/EffectSlot.qml index 08d0fa91f7f..acfd5b89312 100644 --- a/res/qml/EffectSlot.qml +++ b/res/qml/EffectSlot.qml @@ -52,7 +52,6 @@ Item { const effectId = model.get(index).effectId; if (root.slot.effectId != effectId) root.slot.effectId = effectId; - } Component.onCompleted: root.slot.onEffectIdChanged() @@ -71,7 +70,6 @@ Item { target: root.slot } - } Skin.ControlMiniKnob { @@ -87,7 +85,6 @@ Item { key: "meta" color: Theme.effectColor } - } ListView { @@ -148,7 +145,6 @@ Item { group: root.group key: parameter.controlKey + "_loaded" } - } Skin.ControlButton { @@ -172,9 +168,7 @@ Item { group: root.group key: parameter.controlKey + "_loaded" } - } - } populate: Transition { @@ -191,13 +185,10 @@ Item { to: 1 duration: 200 } - } Skin.FadeBehavior on opacity { fadeTarget: parametersView } - } - } diff --git a/res/qml/EffectUnit.qml b/res/qml/EffectUnit.qml index fd0f07b1f38..5e293a08486 100644 --- a/res/qml/EffectUnit.qml +++ b/res/qml/EffectUnit.qml @@ -104,7 +104,6 @@ Item { target: dryWetKnob visible: true } - } transitions: Transition { @@ -112,9 +111,7 @@ Item { targets: [effect1, effect2, effect3] duration: 150 } - } - } Rectangle { @@ -148,7 +145,6 @@ Item { text: "▼" checkable: true } - } Skin.ControlKnob { @@ -165,7 +161,6 @@ Item { Skin.FadeBehavior on visible { fadeTarget: superKnob } - } Skin.ControlKnob { @@ -182,7 +177,6 @@ Item { Skin.FadeBehavior on visible { fadeTarget: dryWetKnob } - } add: Transition { @@ -199,11 +193,7 @@ Item { to: 1 duration: 150 } - } - } - } - } diff --git a/res/qml/EqColumn.qml b/res/qml/EqColumn.qml index ee58208c42b..acf1f3ab1c2 100644 --- a/res/qml/EqColumn.qml +++ b/res/qml/EqColumn.qml @@ -46,5 +46,4 @@ Column { key: "orientation" color: Theme.crossfaderOrientationColor } - } diff --git a/res/qml/EqKnob.qml b/res/qml/EqKnob.qml index fb1155c66df..3c139c076fd 100644 --- a/res/qml/EqKnob.qml +++ b/res/qml/EqKnob.qml @@ -47,7 +47,5 @@ Rectangle { TapHandler { onTapped: statusControl.value = !statusControl.value } - } - } diff --git a/res/qml/FadeBehavior.qml b/res/qml/FadeBehavior.qml index 4978b8525c4..2918ef4ec2d 100644 --- a/res/qml/FadeBehavior.qml +++ b/res/qml/FadeBehavior.qml @@ -30,7 +30,5 @@ Behavior { easing.type: Easing.OutQuad duration: 150 } - } - } diff --git a/res/qml/Hotcue.qml b/res/qml/Hotcue.qml index 27ff0a5a537..28590303098 100644 --- a/res/qml/Hotcue.qml +++ b/res/qml/Hotcue.qml @@ -48,5 +48,4 @@ Item { group: root.group key: "hotcue_" + root.hotcueNumber + "_clear" } - } diff --git a/res/qml/HotcueButton.qml b/res/qml/HotcueButton.qml index f77eff42520..be75924fd29 100644 --- a/res/qml/HotcueButton.qml +++ b/res/qml/HotcueButton.qml @@ -20,7 +20,6 @@ Skin.Button { onIsSetChanged: { if (!isSet) popup.close(); - } } @@ -43,5 +42,4 @@ Skin.Button { } } } - } diff --git a/res/qml/HotcuePopup.qml b/res/qml/HotcuePopup.qml index 37f2770c78b..76121305c72 100644 --- a/res/qml/HotcuePopup.qml +++ b/res/qml/HotcuePopup.qml @@ -39,11 +39,8 @@ Popup { root.close(); } } - } - } - } Skin.Button { @@ -65,7 +62,6 @@ Popup { to: 1 duration: 100 } - } exit: Transition { @@ -75,7 +71,6 @@ Popup { to: 0 duration: 100 } - } background: BorderImage { @@ -92,7 +87,5 @@ Popup { right: 20 bottom: 10 } - } - } diff --git a/res/qml/InfoBarButton.qml b/res/qml/InfoBarButton.qml index 2d60f2d24b3..2b7bbd53337 100644 --- a/res/qml/InfoBarButton.qml +++ b/res/qml/InfoBarButton.qml @@ -49,7 +49,6 @@ AbstractButton { target: colorOverlay color: root.normalColor } - } ] @@ -73,5 +72,4 @@ AbstractButton { source: foreground color: root.normalColor } - } diff --git a/res/qml/Knob.qml b/res/qml/Knob.qml index e4663063949..14c08204eb8 100644 --- a/res/qml/Knob.qml +++ b/res/qml/Knob.qml @@ -52,7 +52,5 @@ MixxxControls.Knob { y: height color: root.color } - } - } diff --git a/res/qml/Library.qml b/res/qml/Library.qml index f616267c490..3f94320aac2 100644 --- a/res/qml/Library.qml +++ b/res/qml/Library.qml @@ -21,9 +21,9 @@ Item { } onFocusWidgetChanged: { switch (focusWidget) { - case FocusedWidgetControl.WidgetKind.LibraryView: - listView.forceActiveFocus(); - break; + case FocusedWidgetControl.WidgetKind.LibraryView: + listView.forceActiveFocus(); + break; } } } @@ -71,10 +71,10 @@ Item { model: Mixxx.Library.model Keys.onPressed: (event) => { switch (event.key) { - case Qt.Key_Enter: - case Qt.Key_Return: - listView.loadSelectedTrackIntoNextAvailableDeck(false); - break; + case Qt.Key_Enter: + case Qt.Key_Return: + listView.loadSelectedTrackIntoNextAvailableDeck(false); + break; } } @@ -98,9 +98,7 @@ Item { ColorAnimation { duration: listView.highlightMoveDuration } - } - } Image { @@ -125,12 +123,11 @@ Item { listView.forceActiveFocus(); listView.currentIndex = itemDlgt.index; parent.grabToImage((result) => { - dragItem.Drag.imageSource = result.url; + dragItem.Drag.imageSource = result.url; }); } onDoubleClicked: listView.loadSelectedTrackIntoNextAvailableDeck(false) } - } highlight: Rectangle { @@ -138,9 +135,6 @@ Item { border.width: 1 color: "transparent" } - } - } - } diff --git a/res/qml/LibraryControl.qml b/res/qml/LibraryControl.qml index 0e43faab20d..6ae38d70f5c 100644 --- a/res/qml/LibraryControl.qml +++ b/res/qml/LibraryControl.qml @@ -22,7 +22,6 @@ Item { onValueChanged: (value) => { if (value != 0 && root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView) root.loadSelectedTrackIntoNextAvailableDeck(false); - } } @@ -32,7 +31,6 @@ Item { onValueChanged: (value) => { if (value != 0 && root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView) root.loadSelectedTrackIntoNextAvailableDeck(false); - } } @@ -75,7 +73,6 @@ Item { onValueChanged: (value) => { if (value != 0 && root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView) root.moveVertical(value); - } } @@ -85,7 +82,6 @@ Item { onValueChanged: (value) => { if (value != 0 && root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView) root.moveVertical(-1); - } } @@ -95,7 +91,6 @@ Item { onValueChanged: (value) => { if (value != 0 && root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView) root.moveVertical(1); - } } @@ -118,7 +113,6 @@ Item { root.loadSelectedTrack(this.group, play); } } - } Mixxx.ControlProxy { @@ -140,7 +134,6 @@ Item { root.loadSelectedTrack(this.group, play); } } - } Mixxx.ControlProxy { @@ -162,7 +155,5 @@ Item { root.loadSelectedTrack(this.group, play); } } - } - } diff --git a/res/qml/LibraryControlLoadSelectedTrackHandler.qml b/res/qml/LibraryControlLoadSelectedTrackHandler.qml index 7a44ca91bc2..222b3b0b92f 100644 --- a/res/qml/LibraryControlLoadSelectedTrackHandler.qml +++ b/res/qml/LibraryControlLoadSelectedTrackHandler.qml @@ -34,5 +34,4 @@ Item { root.loadTrackRequested(true); } } - } diff --git a/res/qml/MicrophoneDuckingPanel.qml b/res/qml/MicrophoneDuckingPanel.qml index 9affd064cc1..f73b78bf6fb 100644 --- a/res/qml/MicrophoneDuckingPanel.qml +++ b/res/qml/MicrophoneDuckingPanel.qml @@ -37,12 +37,12 @@ Column { property string duckingModeName: { switch (this.value) { - case MicrophoneDuckingPanel.DuckingMode.Auto: - return "Auto"; - case MicrophoneDuckingPanel.DuckingMode.Manual: - return "Manual"; - default: - return "Off"; + case MicrophoneDuckingPanel.DuckingMode.Auto: + return "Auto"; + case MicrophoneDuckingPanel.DuckingMode.Manual: + return "Manual"; + default: + return "Off"; } } property bool duckingEnabled: { @@ -56,7 +56,5 @@ Column { group: "[Master]" key: "talkoverDucking" } - } - } diff --git a/res/qml/MicrophoneUnit.qml b/res/qml/MicrophoneUnit.qml index 2ec8b194f45..02e0efc8c86 100644 --- a/res/qml/MicrophoneUnit.qml +++ b/res/qml/MicrophoneUnit.qml @@ -38,7 +38,6 @@ Row { key: "pregain" color: Theme.gainKnobColor } - } Column { @@ -57,7 +56,6 @@ Row { activeColor: Theme.pflActiveButtonColor toggleable: true } - } Skin.EmbeddedBackground { @@ -81,7 +79,6 @@ Row { anchors.centerIn: parent text: "TALK" } - } Skin.InfoBarButton { @@ -99,7 +96,6 @@ Row { anchors.centerIn: parent text: "FX1" } - } Skin.InfoBarButton { @@ -115,9 +111,6 @@ Row { anchors.centerIn: parent text: "FX2" } - } - } - } diff --git a/res/qml/Mixer.qml b/res/qml/Mixer.qml index 534e595c8ab..05e362920a8 100644 --- a/res/qml/Mixer.qml +++ b/res/qml/Mixer.qml @@ -43,7 +43,5 @@ Item { height: parent.height group: root.rightDeckGroup } - } - } diff --git a/res/qml/MixerColumn.qml b/res/qml/MixerColumn.qml index 4a096b34e5a..4565cd77c18 100644 --- a/res/qml/MixerColumn.qml +++ b/res/qml/MixerColumn.qml @@ -27,7 +27,6 @@ Item { key: "pregain" color: Theme.gainKnobColor } - } Item { @@ -65,7 +64,6 @@ Item { barColor: Theme.volumeSliderBarColor bg: Theme.imgVolumeSliderBackground } - } Skin.ControlButton { @@ -80,5 +78,4 @@ Item { activeColor: Theme.pflActiveButtonColor toggleable: true } - } diff --git a/res/qml/Mixxx/Controls/Knob.qml b/res/qml/Mixxx/Controls/Knob.qml index e56a195fcf0..cdb9cb6783b 100644 --- a/res/qml/Mixxx/Controls/Knob.qml +++ b/res/qml/Mixxx/Controls/Knob.qml @@ -24,12 +24,12 @@ Item { property real arcRadius: width / 2 readonly property real arcStartValue: { switch (arcStart) { - case Knob.ArcStart.Minimum: - return min; - case Knob.ArcStart.Maximum: - return max; - default: - return valueCenter; + case Knob.ArcStart.Minimum: + return min; + case Knob.ArcStart.Maximum: + return max; + default: + return valueCenter; } } property real arcOffsetX: 0 @@ -79,9 +79,7 @@ Item { centerX: root.width / 2 + root.arcOffsetX centerY: root.width / 2 + root.arcOffsetY } - } - } DragHandler { @@ -144,5 +142,4 @@ Item { property: "value" value: wheelHandler.value } - } diff --git a/res/qml/Mixxx/Controls/Slider.qml b/res/qml/Mixxx/Controls/Slider.qml index d160a4da8f4..103b10b6538 100644 --- a/res/qml/Mixxx/Controls/Slider.qml +++ b/res/qml/Mixxx/Controls/Slider.qml @@ -35,9 +35,6 @@ Slider { x: root.horizontal ? (barShape.width * root.value) : barPath.startX y: root.vertical ? (barShape.height * (1 - root.value)) : barPath.startY } - } - } - } diff --git a/res/qml/Mixxx/Controls/Spinny.qml b/res/qml/Mixxx/Controls/Spinny.qml index b9de64b792a..9e25b556f88 100644 --- a/res/qml/Mixxx/Controls/Spinny.qml +++ b/res/qml/Mixxx/Controls/Spinny.qml @@ -68,7 +68,6 @@ Item { target: indicatorContainer opacity: 0 } - } transitions: Transition { @@ -82,9 +81,6 @@ Item { property: "opacity" duration: 150 } - } - } - } diff --git a/res/qml/Mixxx/Controls/WaveformOverview.qml b/res/qml/Mixxx/Controls/WaveformOverview.qml index 4202027207f..1c217986451 100644 --- a/res/qml/Mixxx/Controls/WaveformOverview.qml +++ b/res/qml/Mixxx/Controls/WaveformOverview.qml @@ -42,7 +42,6 @@ Mixxx.WaveformOverview { group: root.group // qmllint disable unqualified hotcueNumber: this.index + 1 } - } MixxxControls.WaveformOverviewMarker { @@ -52,7 +51,6 @@ Mixxx.WaveformOverview { group: root.group key: "playposition" } - } MouseArea { @@ -65,8 +63,6 @@ Mixxx.WaveformOverview { onPositionChanged: (mouse) => { if (this.containsPress) playPositionControl.value = mouse.x / this.width; - } } - } diff --git a/res/qml/Mixxx/Controls/WaveformOverviewHotcueMarker.qml b/res/qml/Mixxx/Controls/WaveformOverviewHotcueMarker.qml index 16e9bad9e2a..bbecdc014b9 100644 --- a/res/qml/Mixxx/Controls/WaveformOverviewHotcueMarker.qml +++ b/res/qml/Mixxx/Controls/WaveformOverviewHotcueMarker.qml @@ -36,9 +36,7 @@ Item { x: 0 y: root.height } - } - } Mixxx.ControlProxy { @@ -76,5 +74,4 @@ Item { key: "hotcue_" + root.hotcueNumber + "_color" onValueChanged: this.updateColor() } - } diff --git a/res/qml/Mixxx/Controls/WaveformOverviewMarker.qml b/res/qml/Mixxx/Controls/WaveformOverviewMarker.qml index 6f38ee6cfa9..1df70fac35b 100644 --- a/res/qml/Mixxx/Controls/WaveformOverviewMarker.qml +++ b/res/qml/Mixxx/Controls/WaveformOverviewMarker.qml @@ -33,9 +33,7 @@ Item { x: 0 y: root.height } - } - } Mixxx.ControlProxy { @@ -48,5 +46,4 @@ Item { marker.x = Math.round(root.width * value * Screen.devicePixelRatio) / Screen.devicePixelRatio; } } - } diff --git a/res/qml/OrientationToggleButton.qml b/res/qml/OrientationToggleButton.qml index a14b547c4c2..280cd3baf44 100644 --- a/res/qml/OrientationToggleButton.qml +++ b/res/qml/OrientationToggleButton.qml @@ -34,7 +34,6 @@ Item { const val = valueAt(visualPosition); if (val != control.value) control.value = val; - } background: Rectangle { @@ -61,11 +60,8 @@ Item { NumberAnimation { duration: 150 } - } - } - } Mixxx.ControlProxy { @@ -74,5 +70,4 @@ Item { group: root.group key: root.key } - } diff --git a/res/qml/Sampler.qml b/res/qml/Sampler.qml index 55fcd4a5d77..7e38d471c38 100644 --- a/res/qml/Sampler.qml +++ b/res/qml/Sampler.qml @@ -120,7 +120,6 @@ Rectangle { group: root.group key: "playposition" } - } MouseArea { @@ -133,10 +132,8 @@ Rectangle { onPositionChanged: (mouse) => { if (containsPress) playPositionControl.value = mouse.x / width; - } } - } Skin.VuMeter { @@ -189,5 +186,4 @@ Rectangle { anchors.fill: parent group: root.group } - } diff --git a/res/qml/SamplerRow.qml b/res/qml/SamplerRow.qml index a8ae495ed63..46f754fe4ec 100644 --- a/res/qml/SamplerRow.qml +++ b/res/qml/SamplerRow.qml @@ -14,7 +14,5 @@ RowLayout { Layout.fillWidth: true group: "[Sampler" + (index + 1) + "]" } - } - } diff --git a/res/qml/SectionBackground.qml b/res/qml/SectionBackground.qml index ba87d98c60b..4267cb9ea29 100644 --- a/res/qml/SectionBackground.qml +++ b/res/qml/SectionBackground.qml @@ -12,5 +12,4 @@ BorderImage { right: 10 bottom: 10 } - } diff --git a/res/qml/Slider.qml b/res/qml/Slider.qml index 5b707faf9d6..fa518cddde6 100644 --- a/res/qml/Slider.qml +++ b/res/qml/Slider.qml @@ -40,7 +40,6 @@ MixxxControls.Slider { verticalOffset: 5 color: "#80000000" } - } background: Image { @@ -49,5 +48,4 @@ MixxxControls.Slider { anchors.fill: parent anchors.margins: root.barMargin } - } diff --git a/res/qml/SyncButton.qml b/res/qml/SyncButton.qml index 5108dfd7622..bf428b4ede5 100644 --- a/res/qml/SyncButton.qml +++ b/res/qml/SyncButton.qml @@ -25,21 +25,21 @@ Skin.Button { activeColor: { switch (mode) { - case SyncButton.SyncMode.ImplicitLeader: - return Theme.yellow; - case SyncButton.SyncMode.ExplicitLeader: - return Theme.red; - default: - return Theme.deckActiveColor; + case SyncButton.SyncMode.ImplicitLeader: + return Theme.yellow; + case SyncButton.SyncMode.ExplicitLeader: + return Theme.red; + default: + return Theme.deckActiveColor; } } text: { switch (mode) { - case SyncButton.SyncMode.ImplicitLeader: - case SyncButton.SyncMode.ExplicitLeader: - return "Leader"; - default: - return "Sync"; + case SyncButton.SyncMode.ImplicitLeader: + case SyncButton.SyncMode.ExplicitLeader: + return "Leader"; + default: + return "Sync"; } } highlight: enabledControl.value @@ -66,5 +66,4 @@ Skin.Button { group: root.group key: "sync_master" } - } diff --git a/res/qml/TextField.qml b/res/qml/TextField.qml index 7b12dec761e..00d7f6cbd35 100644 --- a/res/qml/TextField.qml +++ b/res/qml/TextField.qml @@ -10,5 +10,4 @@ TextField { color: Theme.embeddedBackgroundColor radius: 5 } - } diff --git a/res/qml/VuMeter.qml b/res/qml/VuMeter.qml index 1b3ed546a43..49df4ec8f16 100644 --- a/res/qml/VuMeter.qml +++ b/res/qml/VuMeter.qml @@ -34,7 +34,6 @@ Rectangle { height: control.parameter * (parent.height - 2 * anchors.margins) radius: width / 2 } - } Rectangle { @@ -69,9 +68,7 @@ Rectangle { position: 1 color: Theme.green } - } - } OpacityMask { @@ -79,5 +76,4 @@ Rectangle { source: meterGradient maskSource: meterMask } - } diff --git a/res/qml/WaveformOverview.qml b/res/qml/WaveformOverview.qml index 3d7adbf9055..6ab3e6b5f66 100644 --- a/res/qml/WaveformOverview.qml +++ b/res/qml/WaveformOverview.qml @@ -40,7 +40,6 @@ Item { opacity: 1 visible: true } - } ] transitions: [ @@ -65,14 +64,12 @@ Item { property: "opacity" duration: 150 } - } PropertyAction { target: passthroughContainer property: "visible" } - } }, @@ -97,16 +94,13 @@ Item { property: "opacity" duration: 150 } - } PropertyAction { target: waveformContainer property: "visible" } - } - } ] @@ -132,7 +126,6 @@ Item { colorLow: Theme.green group: root.group } - } Rectangle { @@ -145,7 +138,5 @@ Item { anchors.centerIn: parent text: "Passthrough Enabled" } - } - } diff --git a/res/qml/main.qml b/res/qml/main.qml index c5e3c3c2cc0..73804bfd66b 100644 --- a/res/qml/main.qml +++ b/res/qml/main.qml @@ -94,11 +94,8 @@ ApplicationWindow { width: 640 height: 480 } - } - } - } Skin.DeckRow { @@ -120,7 +117,6 @@ ApplicationWindow { Skin.FadeBehavior on visible { fadeTarget: crossfader } - } Skin.DeckRow { @@ -135,7 +131,6 @@ ApplicationWindow { Skin.FadeBehavior on visible { fadeTarget: decks34 } - } Skin.SamplerRow { @@ -147,7 +142,6 @@ ApplicationWindow { Skin.FadeBehavior on visible { fadeTarget: samplers } - } Skin.EffectRow { @@ -159,7 +153,6 @@ ApplicationWindow { Skin.FadeBehavior on visible { fadeTarget: effects } - } Skin.Library { @@ -172,9 +165,6 @@ ApplicationWindow { properties: "x,y" duration: 150 } - } - } - }