Skip to content

Commit 9297624

Browse files
RubenKuilderRubenKuilder
committed
2 parents f636b9a + 9ec8f19 commit 9297624

File tree

9 files changed

+77
-69
lines changed

9 files changed

+77
-69
lines changed

‎Assets/Icons/Fullscreen.png‎

3.77 KB
Loading

‎Assets/Icons/Reload.png‎

1.78 KB
Loading

‎Assets/Icons/pause.png‎

-252 Bytes
Loading

‎Assets/Icons/play_arrow.png‎

-285 Bytes
Loading

‎Assets/Icons/stop.png‎

-157 Bytes
Loading

‎Assets/Icons/volume-up.png‎

668 Bytes
Loading

‎OneDrive-Cloud-Player.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<None Remove="Assets\Icons\play_arrow.png" />
2424
<None Remove="Assets\Icons\Reload.png" />
2525
<None Remove="Assets\Icons\stop.png" />
26+
<None Remove="Assets\Icons\volume-up.png" />
2627
</ItemGroup>
2728
<ItemGroup>
2829
<PackageReference Include="LibVLCSharp" Version="3.4.5" />
@@ -54,6 +55,7 @@
5455
<Resource Include="Assets\Icons\play_arrow.png" />
5556
<Resource Include="Assets\Icons\Reload.png" />
5657
<Resource Include="Assets\Icons\stop.png" />
58+
<Resource Include="Assets\Icons\volume-up.png" />
5759
</ItemGroup>
5860
<ItemGroup>
5961
<Compile Update="API\Graph\InteractiveComponents\Internal\EmbeddedWebUI.xaml.cs">

‎VLC/VideoPlayerWindow.xaml‎

Lines changed: 74 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -12,96 +12,102 @@
1212
BorderThickness="1"
1313
ResizeMode="CanResizeWithGrip"
1414
Background="Black"
15-
Title="SAS Player" Width="1280" Height="720" >
15+
Title="OneDrive Cloud Player" Width="1280" Height="720" >
1616

1717
<Window.Resources>
1818

1919
</Window.Resources>
2020

2121
<Grid>
22-
2322
<wpf:VideoView x:Name="videoView" Panel.ZIndex="-1" Margin="1,1,1,1" Visibility="Visible">
24-
23+
2524
<Grid x:Name="VideoGrid" MouseMove="VideoControls_MouseMove" Background="#01FFFFFF">
26-
27-
<mah:ProgressRing IsActive="{Binding Path=ShowLoadingCircle}" Height="90" Width="90"></mah:ProgressRing>
2825

29-
<!--<Border BorderBrush="Red" BorderThickness="1">-->
26+
<mah:ProgressRing IsActive="{Binding Path=ShowLoadingCircle}" Height="90" Width="90"></mah:ProgressRing>
27+
28+
<!--<Border BorderBrush="Red" BorderThickness="1">-->
3029

31-
<Grid x:Name="VideoControls" MaxHeight="200" Background="Transparent" VerticalAlignment="Bottom" MouseEnter="VideoControls_MouseEnter" MouseLeave="VideoControls_MouseLeave">
32-
<Border BorderBrush="Red" BorderThickness="1">
33-
<Grid x:Name="LowerHeightControls">
30+
<Grid Background="#1E2931" x:Name="VideoControls" MaxHeight="200" VerticalAlignment="Bottom" MouseEnter="VideoControls_MouseEnter" MouseLeave="VideoControls_MouseLeave">
31+
<Border>
32+
<Grid x:Name="LowerHeightControls">
33+
<Grid.ColumnDefinitions>
34+
<ColumnDefinition Width="Auto"/>
35+
<ColumnDefinition Width="*" />
36+
<ColumnDefinition Width="Auto" />
37+
</Grid.ColumnDefinitions>
38+
<Grid.RowDefinitions>
39+
<RowDefinition Height="Auto"/>
40+
<RowDefinition Height="Auto"/>
41+
<RowDefinition Height="Auto"/>
42+
<RowDefinition Height="Auto"/>
43+
</Grid.RowDefinitions>
44+
45+
<!--Left bottom controls-->
46+
<Border Grid.Column="0" Grid.Row="3">
47+
<Grid Grid.Column="0" Grid.Row="3" Margin="0,0,0,0" >
3448
<Grid.ColumnDefinitions>
3549
<ColumnDefinition Width="Auto"/>
36-
<ColumnDefinition Width="*" />
37-
<ColumnDefinition Width="Auto" />
50+
<ColumnDefinition Width="Auto"/>
3851
<ColumnDefinition Width="Auto"/>
3952
</Grid.ColumnDefinitions>
40-
<Grid.RowDefinitions>
41-
<RowDefinition Height="Auto"/>
42-
<RowDefinition Height="Auto"/>
43-
<RowDefinition Height="30"/>
44-
<RowDefinition Height="30"/>
45-
</Grid.RowDefinitions>
46-
47-
<!--Left bottom controls-->
48-
<Border BorderBrush="Red" BorderThickness="1" Grid.Column="0" Grid.Row="3">
49-
<Grid Grid.Column="0" Grid.Row="3" Margin="0,0,0,0" >
50-
<Grid.ColumnDefinitions>
51-
<ColumnDefinition Width="Auto"/>
52-
<ColumnDefinition Width="Auto"/>
53-
<ColumnDefinition Width="Auto"/>
54-
</Grid.ColumnDefinitions>
55-
<!--Play/Pause Button-->
56-
<Button Grid.Column="0" Style="{StaticResource MahApps.Styles.Button.Flat}" Click="PauseContinueButton_Click" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,0" Width="50" Height="50" Background="Transparent">
57-
<Image Source="{Binding PausePlayButtonImageSource}" />
58-
</Button>
59-
<!--Stop Button-->
60-
<Button Grid.Column="1" Click="StopButton_Click" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0" Width="50" Height="50" Background="Transparent">
61-
<Image Source="/Assets/Icons/stop.png"></Image>
62-
</Button>
63-
<!--Reload Button-->
64-
<Button Grid.Column="2" x:Name="ReloadButton" Click="ReloadVideoButton_Click" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,0,0" Width="50" Height="50" Background="Transparent">
65-
<Image Source="/Assets/Icons/Reload.png"></Image>
66-
</Button>
67-
</Grid>
68-
</Border>
53+
<!--Play/Pause Button-->
54+
<Button Background="#1E2931" Grid.Column="0" Style="{StaticResource MahApps.Styles.Button.Flat}" Click="PauseContinueButton_Click" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,0" Width="50" Height="50">
55+
<Image Source="{Binding PausePlayButtonImageSource}" />
56+
</Button>
57+
<!--Stop Button-->
58+
<Button Background="#1E2931" Grid.Column="1" Click="StopButton_Click" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0" Width="50" Height="50">
59+
<Image Source="/Assets/Icons/stop.png"></Image>
60+
</Button>
61+
<!--Reload Button-->
62+
<Button Background="#1E2931" Grid.Column="2" x:Name="ReloadButton" Click="ReloadVideoButton_Click" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,0,0" Width="50" Height="50">
63+
<Image Source="/Assets/Icons/Reload.png"></Image>
64+
</Button>
65+
</Grid>
66+
</Border>
6967

70-
<!--Middle bottom controls-->
71-
<Border BorderBrush="Red" BorderThickness="1" Grid.Row="3" Grid.Column="1">
72-
<Grid Grid.Column="1" Grid.Row="3">
73-
<Grid.ColumnDefinitions>
74-
<ColumnDefinition Width="100*" />
68+
<!--Middle bottom controls-->
69+
<Border Grid.Row="3" Grid.Column="1">
70+
<Grid Grid.Column="1" Grid.Row="3">
71+
<Grid.ColumnDefinitions>
72+
<ColumnDefinition Width="100*" />
7573

76-
</Grid.ColumnDefinitions>
74+
</Grid.ColumnDefinitions>
7775

78-
<!--SeekBar-->
79-
<Slider Grid.Column="1" x:Name="SeekBar" Maximum="{Binding Path=TimeLineMaxLength}" Style="{StaticResource MahApps.Styles.Slider.Flat}" IsMoveToPointEnabled="True" VerticalAlignment="Center" Thumb.DragStarted="Slider_DragStarted" Thumb.DragCompleted="Slider_DragCompleted" Value="{Binding Path=TimeLineValue}" HorizontalAlignment="Stretch" Height="Auto"></Slider>
80-
</Grid>
81-
</Border>
76+
<!--SeekBar-->
77+
<Slider Grid.Column="1" x:Name="SeekBar" Maximum="{Binding Path=TimeLineMaxLength}" Style="{StaticResource MahApps.Styles.Slider.Flat}" IsMoveToPointEnabled="True" VerticalAlignment="Center" Thumb.DragStarted="Slider_DragStarted" Thumb.DragCompleted="Slider_DragCompleted" Value="{Binding Path=TimeLineValue}" HorizontalAlignment="Stretch" Height="Auto"></Slider>
78+
</Grid>
79+
</Border>
8280

83-
<!--Volume Slider-->
84-
<Border BorderBrush="Red" BorderThickness="1" Grid.Row="1" Grid.RowSpan="3" Grid.Column="2">
85-
<Slider Visibility="Visible" VerticalAlignment="Bottom" Grid.Column="2" Grid.Row="1" Grid.RowSpan="3" Orientation="Vertical" Value="{Binding Path=VolumeValue}" Style="{StaticResource MahApps.Styles.Slider.Flat}" Width="15" Height="90" Maximum="100" Margin="30,0,0,0"></Slider>
86-
</Border>
81+
<!--Volume Slider-->
82+
<Grid Grid.Column="2" Grid.Row="3">
83+
<Grid.ColumnDefinitions>
84+
<ColumnDefinition Width="50"/>
85+
<ColumnDefinition Width="75"/>
86+
<ColumnDefinition Width="50"/>
87+
</Grid.ColumnDefinitions>
88+
<!--<Border Grid.Row="1" Grid.RowSpan="3" Grid.Column="2" >-->
89+
<Slider Visibility="Visible" VerticalAlignment="Center" Grid.Column="1" Value="{Binding Path=VolumeValue}" Style="{StaticResource MahApps.Styles.Slider.Flat}" Width="50" Maximum="100"></Slider>
90+
<!--</Border>-->
8791

88-
<!--Right bottom controls-->
89-
<Border BorderBrush="Red" BorderThickness="1" Grid.Row="3" Grid.Column="3">
90-
<Grid Grid.Column="3" Margin="0,0,0,0" Grid.Row="3">
91-
<Grid.ColumnDefinitions>
92-
<ColumnDefinition Width="Auto" />
93-
</Grid.ColumnDefinitions>
94-
<Button x:Name="ChangeFullscreenModeButton" Click="ChangeFullscreenModeButton_Click" Width="50" Height="50">
95-
<Image Source="/Assets/Icons/Fullscreen.png" ></Image>
96-
</Button>
97-
</Grid>
98-
</Border>
92+
<!--Right bottom controls-->
93+
<!--<Border Grid.Row="3" Grid.Column="3">-->
94+
<Grid Grid.Column="2" Margin="0,0,0,0">
95+
<Grid.ColumnDefinitions>
96+
<ColumnDefinition Width="Auto" />
97+
</Grid.ColumnDefinitions>
98+
<Button Background="#1E2931" x:Name="ChangeFullscreenModeButton" Click="ChangeFullscreenModeButton_Click" Width="50" Height="50">
99+
<Image Source="/Assets/Icons/Fullscreen.png" ></Image>
100+
</Button>
99101
</Grid>
100-
</Border>
102+
<Grid Grid.Column="0" Margin="5,0,0,0">
103+
<Image Width="50" Height="50" Source="/Assets/Icons/volume-up.png"></Image>
104+
</Grid>
105+
</Grid>
106+
101107
</Grid>
102-
<!--</Border>-->
108+
</Border>
103109
</Grid>
104-
110+
</Grid>
105111
</wpf:VideoView>
106112

107113
</Grid>

‎VLC/VideoPlayerWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace OneDrive_Cloud_Player.VLC
1818
{
1919
partial class VideoPlayerWindow : MetroWindow, INotifyPropertyChanged
2020
{
21-
private int volumeValue = 20;
21+
private int volumeValue = 50;
2222

2323
public int VolumeValue
2424
{

0 commit comments

Comments
 (0)