Skip to content

Commit

Permalink
Merge pull request #2238 from Be-ing/hotcue_labels
Browse files Browse the repository at this point in the history 
add hotcue text labels, position, and right click menu to overview waveform
  • Loading branch information
@daschuer
daschuer authored Oct 22, 2019
2 parents d45b4c9 + 05d4464 commit 362cb42
Show file tree
Hide file tree
Showing 60 changed files with 1,812 additions and 1,442 deletions.
4 changes: 3 additions & 1 deletion build/depends.py
View file
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit 362cb42

Please sign in to comment.