diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/linux/org.mixxx.Mixxx.metainfo.xml | 31 | ||||
-rw-r--r-- | res/skins/Shade/mixer_panel.xml | 2 | ||||
-rw-r--r-- | res/skins/Shade/preview_deck.xml | 26 | ||||
-rw-r--r-- | res/skins/Shade/sampler.xml | 20 |
4 files changed, 52 insertions, 27 deletions
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index c13c9c5ca4..4e6970117f 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -96,11 +96,11 @@ Do not edit it manually. --> <releases> - <release version="2.5.0" type="development" date="2023-06-04" timestamp="1685900714"> + <release version="2.5.0" type="development" date="2023-06-17" timestamp="1687005677"> <description> </description> </release> - <release version="2.4.0" type="development" date="2023-06-04" timestamp="1685900714"> + <release version="2.4.0" type="development" date="2023-06-17" timestamp="1687005677"> <description> <p> Cover Art @@ -1211,8 +1211,7 @@ #10416 #11460 #11556 - #11460 - #11460 + #11450 #10416 </li> </ul> @@ -1926,11 +1925,31 @@ </ul> </description> </release> - <release version="2.3.6" type="development" date="2023-06-04" timestamp="1685900714"> + <release version="2.3.6" type="development" date="2023-06-17" timestamp="1687005677"> <description> <ul> <li> - TODO + Numark DJ2GO2 Touch: Add missing loop_out mapping for the right deck + #11595 + </li> + <li> + No longer stop a track with an active loop at the very end. + #11558 + #11557 + </li> + <li> + Shade: Fixed VU-Meter and other minor issues + #11598 + </li> + <li> + Fixed possible crash when closing Mixxx while browsing the file system + #11593 + #11589 + </li> + <li> + Fixed resyncing when moving an active loop + #11152 + #11381 </li> </ul> </description> diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml index 8539789f7a..61f1b4ad50 100644 --- a/res/skins/Shade/mixer_panel.xml +++ b/res/skins/Shade/mixer_panel.xml @@ -528,7 +528,7 @@ <Layout>horizontal</Layout> <Children> <VuMeter> - <TooltipId>master_VuMeterL</TooltipId> + <TooltipId>audio_latency_usage</TooltipId> <PathVu>skin:/audio_latency/audio_latency_usage.png</PathVu> <PathBack>skin:/audio_latency/audio_latency_overload_back.png</PathBack> <PeakHoldSize>5</PeakHoldSize> diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml index b75061e2a7..fa076011c0 100644 --- a/res/skins/Shade/preview_deck.xml +++ b/res/skins/Shade/preview_deck.xml @@ -201,27 +201,29 @@ <ObjectName>SamplerVUMeter</ObjectName> <BackPath>style/style_bg_deck_pane.png</BackPath> <Size>9f,54f</Size> - <Style> - QWidget { margin: 0px; padding: 2px; } - </Style> <Children> - <StatusLight> - <TooltipId>sampler_PeakIndicator</TooltipId> - <PathStatusLight>skin:/style/volume_clipping_previewdeck_over.png</PathStatusLight> - <PathBack>skin:/style/volume_clipping_previewdeck.png</PathBack> + <WidgetGroup> <Pos>2,2</Pos> <Size>5f,8f</Size> - <Connection> - <ConfigKey>[PreviewDeck1],PeakIndicator</ConfigKey> - </Connection> - </StatusLight> + <Layout>horizontal</Layout> + <Children> + <StatusLight> + <TooltipId>preview_PeakIndicator</TooltipId> + <PathStatusLight>skin:/style/volume_clipping_previewdeck_over.png</PathStatusLight> + <PathBack>skin:/style/volume_clipping_previewdeck.png</PathBack> + <Connection> + <ConfigKey>[PreviewDeck1],PeakIndicator</ConfigKey> + </Connection> + </StatusLight> + </Children> + </WidgetGroup> <WidgetGroup> <Pos>2,11</Pos> <Size>5f,41f</Size> <Layout>horizontal</Layout> <Children> <VuMeter> - <TooltipId>sampler_VuMeter</TooltipId> + <TooltipId>preview_VuMeter</TooltipId> <PathVu>skin:/style/volume_display_previewdeck_over.png</PathVu> <PathBack>skin:/style/volume_display_previewdeck.png</PathBack> <Horizontal>false</Horizontal> diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml index baaedda0c9..25afe539c0 100644 --- a/res/skins/Shade/sampler.xml +++ b/res/skins/Shade/sampler.xml @@ -375,15 +375,19 @@ <Size>8f,92f</Size> <BackPath>style/style_bg_sampler_right.png</BackPath> <Children> - <StatusLight> - <TooltipId>sampler_PeakIndicator</TooltipId> - <PathStatusLight>skin:/style/volume_clipping_sampler_over.png</PathStatusLight> - <PathBack>skin:/style/volume_clipping_sampler.png</PathBack> + <WidgetGroup> <Pos>3,7</Pos> - <Connection> - <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey> - </Connection> - </StatusLight> + <Children> + <StatusLight> + <TooltipId>sampler_PeakIndicator</TooltipId> + <PathStatusLight>skin:/style/volume_clipping_sampler_over.png</PathStatusLight> + <PathBack>skin:/style/volume_clipping_sampler.png</PathBack> + <Connection> + <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey> + </Connection> + </StatusLight> + </Children> + </WidgetGroup> <WidgetGroup> <Pos>3,24</Pos> <Layout>horizontal</Layout> |