Minor margin adjustment of multi home details (help texts)

MediaPortal · Jul 13, 2022 · af8ddf4 · af8ddf4
1 parent d2bc9b8
commit af8ddf4
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 1 deletion.
diff --git a/MediaPortal/Source/UI/Skins/Nereus/Skin/Nereus/screens/CurrentlyPlayingImage.xaml b/MediaPortal/Source/UI/Skins/Nereus/Skin/Nereus/screens/CurrentlyPlayingImage.xaml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include
+    xmlns="www.team-mediaportal.com/2008/mpf/directx"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Source="screens\master_menu.xaml"
+    xmlns:mp_special_controls="clr-namespace:MediaPortal.UI.SkinEngine.SpecialElements.Controls;assembly=SkinEngine"
+    >
+  <Include.Resources>
+
+    <ResourceWrapper x:Key="Header_Text" Resource="[Media.ImageCurrentlyPlayingHeader]"/>
+
+    <!-- Video player model -->
+    <Model x:Key="Model" Id="4E2301B4-3C17-4a1d-8DE5-2CEA169A0256"/>
+
+    <ControlTemplate x:Key="Contents_Template">
+      <mp_special_controls:PlayerControl Margin="20" PlayerContext="CurrentPlayer">
+        <mp_special_controls:PlayerControl.TemplateControl>
+          <Grid DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto"/>
+              <RowDefinition Height="Auto"/>
+              <RowDefinition Height="Auto"/>
+              <RowDefinition Height="Auto"/>
+              <RowDefinition Height="Auto"/>
+              <RowDefinition Height="Auto"/>
+              <RowDefinition Height="Auto"/>
+              <RowDefinition Height="Auto"/>
+              <RowDefinition Height="Auto"/>
+              <RowDefinition Height="Auto"/>
+              <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto"/>
+              <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Label x:Name="TitleLabel" Grid.Row="0" Grid.Column="0"
+                Content="[Media.ImageTitleLabel]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="Title" Grid.Row="0" Grid.Column="1" Scroll="Auto"
+                Content="{Binding MediaItemTitle}" Color="{ThemeResource TextColor}"/>
+
+            <Label x:Name="ImageDimensionsLabel" Grid.Row="1" Grid.Column="0"
+                Content="[Media.ImageDimensions]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="ImageDimensions" Grid.Row="1" Grid.Column="1"
+                Content="{Binding Source={StaticResource Model},Path=PlayerUIContributor.ImageDimensions}"
+                Color="{ThemeResource TextColor}"/>
+
+            <Label x:Name="CameraMakeLabel" Grid.Row="2" Grid.Column="0"
+                Content="[Media.CameraMake]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="CameraMake" Grid.Row="2" Grid.Column="1" Scroll="Auto"
+                Content="{Binding Source={StaticResource Model},Path=PlayerUIContributor.CameraMake}"
+                Color="{ThemeResource TextColor}"/>
+
+            <Label x:Name="CameraModelLabel" Grid.Row="3" Grid.Column="0"
+                Content="[Media.CameraModel]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="CameraModel" Grid.Row="3" Grid.Column="1"
+                Content="{Binding Source={StaticResource Model},Path=PlayerUIContributor.CameraModel}"
+                Color="{ThemeResource TextColor}"/>
+
+            <Label x:Name="ImageISOSpeedLabel" Grid.Row="4" Grid.Column="0"
+                Content="[Media.ImageISOSpeedLabel]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="ImageISOSpeed" Grid.Row="4" Grid.Column="1"
+                Content="{Binding Source={StaticResource Model},Path=PlayerUIContributor.ImageISOSpeed}"
+                Color="{ThemeResource TextColor}"/>
+
+            <Label x:Name="ImageExposureTimeLabel" Grid.Row="5" Grid.Column="0"
+                Content="[Media.ImageExposureTimeLabel]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="ImageExposureTime" Grid.Row="5" Grid.Column="1"
+                Content="{Binding Source={StaticResource Model},Path=PlayerUIContributor.ImageExposureTime}"
+                Color="{ThemeResource TextColor}"/>
+
+            <Label x:Name="ImageFNumberLabel" Grid.Row="6" Grid.Column="0"
+                Content="[Media.ImageFNumberLabel]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="ImageFNumber" Grid.Row="6" Grid.Column="1"
+                Content="{Binding Source={StaticResource Model},Path=PlayerUIContributor.ImageFNumber}"
+                Color="{ThemeResource TextColor}"/>
+
+            <Label x:Name="ImageMeteringModeLabel" Grid.Row="7" Grid.Column="0"
+                Content="[Media.ImageMeteringModeLabel]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="ImageMeteringMode" Grid.Row="7" Grid.Column="1"
+                Content="{Binding Source={StaticResource Model},Path=PlayerUIContributor.ImageMeteringMode}"
+                Color="{ThemeResource TextColor}"/>
+
+            <Label x:Name="CountryLabel" Grid.Row="8" Grid.Column="0"
+                Content="[Media.ImageCountryLabel]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="Country" Grid.Row="8" Grid.Column="1"
+                Content="{Binding Source={StaticResource Model},Path=PlayerUIContributor.Country}"
+                Color="{ThemeResource TextColor}"/>
+
+            <Label x:Name="StateLabel" Grid.Row="9" Grid.Column="0"
+                Content="[Media.ImageStateLabel]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="State" Grid.Row="9" Grid.Column="1"
+                Content="{Binding Source={StaticResource Model},Path=PlayerUIContributor.State}"
+                Color="{ThemeResource TextColor}"/>
+
+            <Label x:Name="CityLabel" Grid.Row="10" Grid.Column="0"
+                Content="[Media.ImageCityLabel]" Color="{ThemeResource TextColor}"/>
+            <Label x:Name="City" Grid.Row="10" Grid.Column="1"
+                Content="{Binding Source={StaticResource Model},Path=PlayerUIContributor.City}"
+                Color="{ThemeResource TextColor}"/>
+          </Grid>
+        </mp_special_controls:PlayerControl.TemplateControl>
+      </mp_special_controls:PlayerControl>
+    </ControlTemplate>
+
+  </Include.Resources>
+</Include>
diff --git a/MediaPortal/Source/UI/Skins/Nereus/Skin/Nereus/screens/MultiDetailsHome.inc b/MediaPortal/Source/UI/Skins/Nereus/Skin/Nereus/screens/MultiDetailsHome.inc
@@ -179,7 +179,7 @@
            IsVisible="{Binding Converter={StaticResource EmptyStringToFalseConverter}, ElementName=HelpLabel, Path=Content}"
            VerticalAlignment="Top" HorizontalAlignment="Left"/>
     <Label x:Name="HelpLabel" DataContext="{Binding Source={StaticResource HomeMenuModel}, Path=SelectedItem}" 
-           Opacity="0.6" Margin="38,5,-5,-10" MaxHeight="93" TextTrimming="WordEllipsis" Wrap="True" 
+           Opacity="0.6" Margin="38,4,-5,-8" MaxHeight="95" TextTrimming="WordEllipsis" Wrap="True" 
            Content="{Binding Path=[Help], NotifyOnTargetUpdated=True}" Color="{ThemeResource TextColor}" FontSize="{ThemeResource SmallerFontSize}"/> 
   </Grid>