Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add hotcue text labels, position, and right click menu to overview waveform #2238

Merged
merged 103 commits into from
Oct 22, 2019
Merged

add hotcue text labels, position, and right click menu to overview waveform #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
dc7c7e3
WOverview: render hotcue text labels
Be-ing Aug 13, 2019
d9d963f
WOverview: elide long cue labels, but show them on mouse hover
Be-ing Aug 13, 2019
bc19ef3
WOverview: let cue labels expand until they reach the next label
Be-ing Aug 13, 2019
2222550
WOverview: sort cues when they are updated, not when drawing
Be-ing Aug 14, 2019
8554b35
use const auto& in for loops
Be-ing Aug 14, 2019
dcbd145
WOverview: move tracking of first hovered mark to mouseMoveEvent
Be-ing Aug 14, 2019
e2c80bc
WOverview: show position of hotcues on mouse hover
Be-ing Aug 15, 2019
65d2790
merge WaveformMarkProperties into WaveformMark class
Be-ing Aug 15, 2019
f9a540f
add right click menu on WOverview to edit hotcue label & color
Be-ing Aug 15, 2019
d2971e5
WOverview: jump to hotcue when clicking its label
Be-ing Aug 15, 2019
6e07761
mention hotcue right click menu in overview & hotcue tooltips
Be-ing Aug 16, 2019
5a4abb8
WOverview: draw playhead marker under cue labels
Be-ing Aug 16, 2019
d2d6fc3
add named constant for undefined cue point positions
Be-ing Aug 16, 2019
acf83fe
WOverview: fix non-hotcue WaveformMarks not rendering
Be-ing Aug 16, 2019
9f4423e
WOverview: hide WaveformMarkRange durations if they overlap cue position
Be-ing Aug 16, 2019
ee9e745
WOverview: don't render invisible WaveformMarks
Be-ing Aug 16, 2019
e4b0411
WOverview: avoid overlapping cue labels & cue position text
Be-ing Aug 16, 2019
90e6112
WOverview: show cue position & label when hovering line, not just label
Be-ing Aug 16, 2019
2c1dd95
WOverview: make WaveformMarks without text labels hoverable
Be-ing Aug 17, 2019
0079d64
WOverview: only show hotcue right click menu for hotcues
Be-ing Aug 17, 2019
7539a2f
WOverview: always show at least the hotcue number if label elided
Be-ing Aug 17, 2019
bb2bc08
WOverview: shift cue labels left if they would exceed width of widget
Be-ing Aug 17, 2019
9a30992
WOverview: shift cue position text left if it would get cut off
Be-ing Aug 17, 2019
35efc63
WOverview: avoid drawing overlapping cue labels
Be-ing Aug 17, 2019
885efe7
WOverview: remove code that is now redundant
Be-ing Aug 17, 2019
0fb3b36
fix typo in comment
Be-ing Aug 17, 2019
462e3bd
WOverview: show time until cue when hovering
Be-ing Aug 17, 2019
31c3814
WOverview: show time position on right click
Be-ing Aug 17, 2019
6403d30
split ColorMenu class from CueMenu
Be-ing Aug 17, 2019
3af842c
ColorMenu: use cue colors specified by skin
Be-ing Aug 17, 2019
4af33c6
WOverview: show cues that are beyond the limits of the track
Be-ing Aug 17, 2019
85b8485
WOverview: prevent showing out-of-bounds times on right click drag
Be-ing Aug 18, 2019
a87655d
factor out redundant code to new WaveformMarkLabel class
Be-ing Aug 21, 2019
b3a55e9
mention right clicking to show time in overview tooltip
Be-ing Aug 21, 2019
4f9a5da
WOverview: draw background for non-hotcue cue marks
Be-ing Aug 21, 2019
2378a88
elaborate in comments
Be-ing Aug 21, 2019
0903d1e
WOverview: calculate label background color only once
Be-ing Aug 22, 2019
c038eed
WOverview: draw translucent backgrounds for WaveformMarkRange label
Be-ing Aug 22, 2019
0cdfbc5
WOverview: show time till end of track when hovering cues
Be-ing Aug 22, 2019
2fcf8fc
WOverview: fix cue position text getting drawn under other cues
Be-ing Aug 22, 2019
e65f56a
WOverview: fix regression with hovered cue labels not getting drawn
Be-ing Aug 22, 2019
05ed063
WOverview: don't draw overlapping labels when hovered label is shifte…
Be-ing Aug 22, 2019
cb5cecf
WOverview: make vertical alignment of labels more consistent
Be-ing Aug 22, 2019
8af156d
ColorMenu: set parent of QActions
Be-ing Aug 22, 2019
a654ebf
WaveformMarkLabel: skip code when it won't do anything
Be-ing Aug 23, 2019
38feaf6
ColorMenu: remove useColorSet call from constructor
Be-ing Aug 23, 2019
27047e2
WOverview: explain magic number
Be-ing Aug 23, 2019
e8d3de8
WOverview: use qreal and remove superfluous explicit casts
Be-ing Aug 23, 2019
7056bc3
double indent for long `if` conditions
Be-ing Aug 23, 2019
5d3159f
remove commented code
Be-ing Aug 23, 2019
641250d
WaveformMarkRender: remove unnecessary check for null text
Be-ing Aug 23, 2019
106e1a6
ColorMenu: refactor to avoid deleting/creating new QActions
Be-ing Aug 23, 2019
2331bf3
Merge remote-tracking branch 'upstream/master' into hotcue_labels
Be-ing Aug 23, 2019
7cd7d49
WOverview: seek on left mouse button press
Be-ing Aug 23, 2019
52f520e
WOverview: show negative times for cue/right click behind playhead
Be-ing Aug 23, 2019
9e53801
WOverview: update at least once per second
Be-ing Aug 23, 2019
b81d737
WOverview: increasing padding width for hovering cue lines
Be-ing Aug 23, 2019
65dab6b
WOverview: only update >= once per second if that is actually required
Be-ing Aug 23, 2019
3717577
WOverview: clamp dragged mouse position when moved left of widget
Be-ing Aug 23, 2019
6afd934
Deere: let hotcue labels show lowercase letters
Be-ing Aug 23, 2019
94604cd
Deere: increase default font size to 12px
Be-ing Aug 23, 2019
e6f012e
WaveformMarkLabel: elide text that is wider than widget
Be-ing Aug 23, 2019
52968ff
WaveformMarkLabel: rename textPoint -> textBottomLeft
Be-ing Aug 23, 2019
f520693
fix indentation
Be-ing Aug 23, 2019
f187737
fix build issues with old Qt versions
Be-ing Aug 26, 2019
529be48
LateNight: don't capitalize cue labels on overview waveform
Be-ing Aug 26, 2019
058f0d4
remove unused code
Be-ing Aug 27, 2019
4439406
WOverview: let skins specify label background, text color, and font size
Be-ing Aug 27, 2019
25a653e
Shade: specify overview label colors and font size
Be-ing Aug 27, 2019
ed45d45
WOverview: only consider labels at same height for eliding width
Be-ing Sep 1, 2019
2e1e11a
WOverview: show MarkRange and cue labels at consistent height
Be-ing Sep 1, 2019
ef72609
WOverview: don't draw MarkRange labels when they should be hidden
Be-ing Sep 2, 2019
cbb7bff
Revert "WaveformMarkRender: remove unnecessary check for null text"
Be-ing Sep 2, 2019
367eb1d
WOverview: don't overlap right-aligned cue labels and cue lines
Be-ing Sep 2, 2019
d3b6b4e
WOverview: avoid overlapping labels with cue lines
Be-ing Sep 2, 2019
ba03e61
WOverview: keep hotcue label showing when right click menu is shown
Be-ing Sep 2, 2019
10e2114
WaveformMark: sort marks without hotcues before those with hotcues
Be-ing Sep 2, 2019
6f85553
add line break to overview waveform tooltip
Be-ing Sep 13, 2019
48f3080
edit overview waveform tooltip
Be-ing Sep 13, 2019
5c5705c
CueMenu: "Cue label" -> "New cue label"
Be-ing Sep 13, 2019
6c3ce9a
WOverview: show CueMenu for hotcue when it is drawn over a non-hotcue
Be-ing Sep 14, 2019
a26999e
Fix building on Xenial
daschuer Sep 18, 2019
7c320fa
Remove border of cue labels and increase font size
daschuer Sep 18, 2019
7c304d1
Shade: set a overview bg color to alter the cue label background with…
daschuer Sep 18, 2019
c32960d
Shade: remove useless <Style> nodes
ronso0 Sep 21, 2019
5a237f4
Deere: regular case for New Label label
ronso0 Sep 21, 2019
90efc3e
LateNight: regular case for hotcue label dialog
ronso0 Sep 21, 2019
bbe393b
Tango: darker bg for hotcue labels
ronso0 Sep 21, 2019
e2407e5
Merge pull request #27 from ronso0/hotcue-label-fixes
Be-ing Sep 26, 2019
02f7874
Merge remote-tracking branch 'upstream/master' into hotcue_labels
Be-ing Oct 1, 2019
1e947ab
Use "Ubuntu" font for WOverview
daschuer Oct 3, 2019
02eb82a
Revert the default font size to 10px, to not trigger a bug that lets …
daschuer Oct 14, 2019
71aca86
Merge pull request #26 from daschuer/hotcue_labels
Be-ing Oct 14, 2019
cd46192
Merge branch 'hotcue_labels' of github.com:Be-ing/mixxx into hotcue_l…
Be-ing Oct 15, 2019
0b65f26
Merge remote-tracking branch 'upstream/master' into hotcue_labels
Be-ing Oct 15, 2019
3a3b66b
WOverview: add option for skins to not show cue times on mouse hover
Be-ing Oct 15, 2019
d47789f
Skins: don't show times for cues on mouse hover in preview decks
Be-ing Oct 15, 2019
8250e1f
Deere: increase height of mini decks so all text fits on overviews
Be-ing Oct 15, 2019
8c18135
LateNight: increase height of mini decks so all text fits on overviews
Be-ing Oct 15, 2019
a254e62
Merge remote-tracking branch 'mixxx/master' into hotcue-confilcts-Lat…
ronso0 Oct 21, 2019
602afd6
expand overview in Shade mini decks
ronso0 Oct 21, 2019
c1ba627
Merge pull request #29 from ronso0/hotcue-confilcts-LateNight-Shade-fix
Be-ing Oct 22, 2019
05d4464
Skins: don't show cue times on mouse hover for samplers
Be-ing Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build/depends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,9 @@ def sources(self, build):
"src/sources/soundsourceproviderregistry.cpp",
"src/sources/soundsourceproxy.cpp",

"src/widget/colormenu.cpp",
"src/widget/controlwidgetconnection.cpp",
"src/widget/cuemenu.cpp",
"src/widget/wbasewidget.cpp",
"src/widget/wwidget.cpp",
"src/widget/wwidgetgroup.cpp",
Expand Down Expand Up @@ -1107,7 +1109,6 @@ def sources(self, build):

"src/waveform/renderers/waveformrenderersignalbase.cpp",
"src/waveform/renderers/waveformmark.cpp",
"src/waveform/renderers/waveformmarkproperties.cpp",
"src/waveform/renderers/waveformmarkset.cpp",
"src/waveform/renderers/waveformmarkrange.cpp",
"src/waveform/renderers/glwaveformrenderersimplesignal.cpp",
Expand All @@ -1116,6 +1117,7 @@ def sources(self, build):
"src/waveform/renderers/glslwaveformrenderersignal.cpp",
"src/waveform/renderers/glvsynctestrenderer.cpp",

"src/waveform/waveformmarklabel.cpp",
"src/waveform/widgets/waveformwidgetabstract.cpp",
"src/waveform/widgets/emptywaveformwidget.cpp",
"src/waveform/widgets/softwarewaveformwidget.cpp",
Expand Down
20 changes: 10 additions & 10 deletions res/skins/Deere/deck_small.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<WidgetGroup>
<Layout>horizontal</Layout>
<Size>40f,40f</Size>
<Size>40f,46f</Size>
<Children>
<SingletonContainer>
<ObjectName>DeckCoverArt<Variable name="i"/></ObjectName>
Expand All @@ -33,7 +33,7 @@
<WidgetGroup>
<ObjectName>OverviewGutterSmall</ObjectName>
<Layout>horizontal</Layout>
<Size>200me,40f</Size>
<Size>200me,46f</Size>
<Children>
<SingletonContainer>
<ObjectName>DeckOverview<Variable name="i"/></ObjectName>
Expand All @@ -44,25 +44,25 @@
<WidgetGroup>
<ObjectName>DeckTextRowSmall</ObjectName>
<Layout>vertical</Layout>
<Size>200min,40f</Size>
<Size>200min,46f</Size>
<Children>

<WidgetGroup><!-- Title/*** / PlayPos -->
<Layout>horizontal</Layout>
<Size>200min,21f</Size>
<Size>200min,24f</Size>
<Children>

<WidgetGroup>
<ObjectName>TitleGutterSmall</ObjectName>
<Layout>horizontal</Layout>
<Size>100me,20f</Size>
<Size>100me,23f</Size>
<Children>
<!-- We allow to hide track/artist info (aka AM-Mode) in the skin settings,
display just a label with asterixes instead. -->
<TrackProperty>
<TooltipId>track_title</TooltipId>
<ObjectName>TitleTextSmall</ObjectName>
<Size>100me,20f</Size>
<Size>100me,23f</Size>
<Property>title</Property>
<Group><Variable name="group"/></Group>
<Alignment>left</Alignment>
Expand Down Expand Up @@ -93,7 +93,7 @@
<NumberPos>
<TooltipId>track_time</TooltipId>
<ObjectName>PlayPositionTextSmall</ObjectName>
<Size>55min,20f</Size>
<Size>55min,23f</Size>
<Alignment>center</Alignment>
<Channel><Variable name="i"/></Channel>
<Connection>
Expand All @@ -106,7 +106,7 @@
<WidgetGroup><!-- Artist / Key / BPM -->
<ObjectName>ArtistKeyBpmGutterSmall</ObjectName>
<Layout>horizontal</Layout>
<Size>200min,19f</Size>
<Size>200min,22f</Size>
<Children>
<!-- We allow to hide track/artist info (aka AM-Mode) in the skin settings,
display just a label with asterixes instead. -->
Expand Down Expand Up @@ -141,7 +141,7 @@
<TooltipId>visual_key</TooltipId>
<ObjectName>BpmKeyTextSmall</ObjectName>
<Alignment>center</Alignment>
<Size>30min,19f</Size>
<Size>30min,22f</Size>
<Alignment>center</Alignment>
<Elide>right</Elide>
<Connection>
Expand All @@ -152,7 +152,7 @@
<NumberBpm>
<TooltipId>visual_bpm</TooltipId>
<ObjectName>BpmKeyTextSmall</ObjectName>
<Size>55min,19f</Size>
<Size>55min,22f</Size>
<Alignment>right</Alignment>
<NumberOfDigits>2</NumberOfDigits>
<Group><Variable name="group"/></Group>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Deere/decks_small.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Children>
<WidgetGroup>
<Layout>horizontal</Layout>
<Size>0me,45f</Size>
<Size>0me,51f</Size>
<Children>
<Template src="skin:deck_small.xml">
<SetVariable name="i">1</SetVariable>
Expand All @@ -20,7 +20,7 @@

<WidgetGroup>
<Layout>horizontal</Layout>
<Size>0me,45f</Size>
<Size>0me,51f</Size>
<Children>
<Template src="skin:deck_small.xml">
<SetVariable name="i">3</SetVariable>
Expand Down
1 change: 1 addition & 0 deletions res/skins/Deere/preview_deck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<SignalRGBLowColor></SignalRGBLowColor>
<SignalColor>#FF8000</SignalColor>
<PlayPosColor>#00FF00</PlayPosColor>
<ShowCueTimes>false</ShowCueTimes>
<DefaultMark>
<Align>bottom</Align>
<Color>#FFFFFF</Color>
Expand Down
1 change: 1 addition & 0 deletions res/skins/Deere/sampler_controls_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<SignalRGBLowColor></SignalRGBLowColor>
<SignalColor>#FF8000</SignalColor>
<PlayPosColor>#00FF00</PlayPosColor>
<ShowCueTimes>false</ShowCueTimes>
<DefaultMark>
<Align>bottom</Align>
<Color>#006596</Color>
Expand Down
9 changes: 8 additions & 1 deletion res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,10 +750,17 @@ QAbstractScrollArea::corner {

WWidget, QLabel {
font-family: "Open Sans";
font-size: 8px;
font-size: 12px;
text-transform: uppercase;
}

/* This affects the labels for cue points. */
WOverview,
/* This is for the label in the edit dialog */
WOverview QLabel {
text-transform: none;
}

/* Start spacing for Deck overview row (small waveform, option grid) */
#OptionGrid, #ButtonGrid {
background-color: #333333;
Expand Down
26 changes: 14 additions & 12 deletions res/skins/LateNight/deck_small.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Children>

<WidgetGroup>
<Size>40f,40f</Size>
<Size>42f,42f</Size>
<Layout>horizontal</Layout>
<!-- hack/trick: remove the css border (top & left) from SpinnyContainer
so we can use the Spinny singleton from regular decks :) -->
Expand All @@ -24,11 +24,13 @@
</Children>
</WidgetGroup>

<WidgetGroup><Size>2f,0min</Size></WidgetGroup>

<WidgetGroup>
<ObjectName>OverviewBox</ObjectName>
<SizePolicy>me,min</SizePolicy>
<MinimumSize>200,40</MinimumSize>
<MaximumSize>250,40</MaximumSize>
<MinimumSize>200,46</MinimumSize>
<MaximumSize>250,46</MaximumSize>
<Layout>horizontal</Layout>
<Children>
<SingletonContainer>
Expand All @@ -39,17 +41,17 @@

<WidgetGroup><!-- DeckSmall_TitlePlayPosKeyBPM -->
<Layout>vertical</Layout>
<Size>200min,41f</Size>
<Size>200min,46f</Size>
<Children>

<WidgetGroup>
<Layout>horizontal</Layout>
<Size>200min,20f</Size>
<Size>200min,23f</Size>
<Children>
<TrackProperty>
<TooltipId>track_title</TooltipId>
<ObjectName>TitleTextSmall</ObjectName>
<Size>100me,20f</Size>
<Size>100me,23f</Size>
<Property>title</Property>
<Alignment>left</Alignment>
<Elide>right</Elide>
Expand All @@ -60,7 +62,7 @@
<TooltipId>track_time</TooltipId>
<ObjectName>PlayPositionTextSmall</ObjectName>
<SizePolicy>min,f</SizePolicy>
<MinimumSize>,21</MinimumSize>
<MinimumSize>,23</MinimumSize>
<Alignment>center</Alignment>
<Channel><Variable name="channum"/></Channel>
<Connection>
Expand All @@ -72,12 +74,12 @@

<WidgetGroup><!-- Artist / Key / BPM -->
<Layout>horizontal</Layout>
<Size>200min,20f</Size>
<Size>200min,22f</Size>
<Children>
<TrackProperty>
<TooltipId>track_title</TooltipId>
<ObjectName>ArtistTextSmall</ObjectName>
<Size>96me,20f</Size>
<Size>96me,22f</Size>
<Property>artist</Property>
<Alignment>left</Alignment>
<Elide>right</Elide>
Expand All @@ -88,7 +90,7 @@
<TooltipId>visual_key</TooltipId>
<ObjectName>KeyTextSmall</ObjectName>
<Channel><Variable name="channum"/></Channel>
<Size>44min,20f</Size>
<Size>44min,22f</Size>
<Alignment>center</Alignment>
<Elide>right</Elide>
<Connection>
Expand All @@ -99,7 +101,7 @@
<NumberBpm>
<ObjectName>BpmTextSmall</ObjectName>
<TooltipId>visual_bpm</TooltipId>
<Size>60f,20f</Size>
<Size>60f,22f</Size>
<Alignment>center</Alignment>
<Channel><Variable name="channum" /></Channel>
<NumberOfDigits>2</NumberOfDigits>
Expand All @@ -109,7 +111,7 @@
</NumberBpm>

</Children>
</WidgetGroup><!-- Key / BPM / PlayPos -->
</WidgetGroup><!-- Artist / Key / BPM -->

</Children>
</WidgetGroup><!-- DeckSmall_TitlePlayPosKeyBPM -->
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/preview_deck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@
<SizePolicy>me,me</SizePolicy>
<Group><Variable name="group"/></Group>
<BgColor>#0f0f0f</BgColor>
<BgColor>#FFFFFF</BgColor>
<SignalColor>#FF8000</SignalColor>
<SignalHighColor>#F0EBD1</SignalHighColor>
<SignalMidColor>#EECE33</SignalMidColor>
<SignalLowColor>#E4C739</SignalLowColor>
<PlayPosColor>#00FF00</PlayPosColor>
<PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
<ShowCueTimes>false</ShowCueTimes>
<DefaultMark>
<Align>bottom|right</Align>
<Color>#FF0000</Color>
Expand Down
1 change: 1 addition & 0 deletions res/skins/LateNight/sampler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<SignalLowColor></SignalLowColor>
<PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
<SignalColor>#EECE33</SignalColor>
<ShowCueTimes>false</ShowCueTimes>
<MarkerColor>#00FF00</MarkerColor>
<DefaultMark>
<Align>bottom|right</Align>
Expand Down
32 changes: 31 additions & 1 deletion res/skins/LateNight/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,28 @@ QSpinBox {
font-weight: bold;
}

#KeyText,
#PlayPositionText,
#PlayPositionTextSmall,
#DurationText,
#BpmText,
#BpmTextSmall,
#RateText,
WBeatSpinBox,
QSpinBox,
/* Hotcue labels in the overview */
WOverview,
/* Edit label and pushbuttons in the hotcue label edit dialog */
WOverview QLabel,
WOverview QPushButton {
font-family: "Open Sans";
text-transform: none;
}
WOverview QLabel,
WOverview QPushButton {
font-weight: normal;
}

QToolTip {
font-family: Ubuntu;
text-transform: none;
Expand Down Expand Up @@ -95,6 +117,10 @@ WSearchLineEdit,
#Deck3, #Deck4 {
padding: 2px 3px 3px 2px;
}
#DeckSmall1, #DeckSmall2,
#DeckSmall3, #DeckSmall4 {
padding: 0px 0px 0px 2px;
}
#DeckSmall1, #DeckSmall2 {
margin-top: 5px;
}
Expand Down Expand Up @@ -1355,6 +1381,10 @@ WBeatSpinBox,
qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
}

#TitleGutter WLabel {
font-size: 16px/19px;
text-align: left;
}


/********************** Effects **********************/
Expand Down Expand Up @@ -1926,7 +1956,7 @@ WSearchLineEdit {
}

/* Extra declaration for QRadioButton otherwise it shows up with wrong colors in Linux with Gnome */
QLabel, QRadioButton {
WLibrary QLabel, WLibrary QRadioButton {
background: transparent;
}

Expand Down
6 changes: 0 additions & 6 deletions res/skins/Shade/auxiliary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<WidgetGroup>
<Size>108f,54f</Size>
<BackPath>style/style_bg_auxiliary_<Variable name="auxnum"/>.png</BackPath>
<Style>QGroupBox { border: 0px solid yellow; } QWidget { margin: 0; padding: 0; }</Style>
<!--<Layout>horizontal</Layout>-->
<Children>
<!--
Expand All @@ -12,7 +11,6 @@
-->
<StatusLight>
<TooltipId>channel_PeakIndicator</TooltipId>
<Style></Style>
<PathStatusLight>skin:/style/volume_clipping_microphone_over.png</PathStatusLight>
<PathBack>skin:/style/volume_clipping_microphone.png</PathBack>
<Pos>99,6</Pos>
Expand All @@ -28,7 +26,6 @@
-->
<VuMeter>
<TooltipId>channel_VuMeter</TooltipId>
<Style></Style>
<PathVu>skin:/style/volume_display_microphone_over.png</PathVu>
<PathBack>skin:/style/volume_display_microphone.png</PathBack>
<Pos>99,14</Pos>
Expand All @@ -43,7 +40,6 @@

<Knob>
<TooltipId>pregain</TooltipId>
<Style></Style>
<NumberStates>64</NumberStates>
<Path>knobs/knob_rotary_s%1.png</Path>
<Pos>66,22</Pos>
Expand All @@ -54,7 +50,6 @@

<PushButton>
<TooltipId>orientation</TooltipId>
<Style></Style>
<NumberStates>3</NumberStates>
<State>
<Number>0</Number>
Expand All @@ -81,7 +76,6 @@

<PushButton>
<TooltipId></TooltipId>
<Style></Style>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
Expand Down
Loading