Skip to content
This repository was archived by the owner on Jan 8, 2022. It is now read-only.

Commit b579e32

Browse files
committed
Towards completion
1 parent 7618799 commit b579e32

File tree

8 files changed

+16
-46
lines changed

8 files changed

+16
-46
lines changed

Source/Deployer.Raspberry.Gui/Views/MainWindow.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<Setter.Value>
2020

2121
<MultiBinding Converter="{x:Static Converters:BackgroundToForegroundConverter.Instance}">
22+
<!-- ReSharper disable once Xaml.BindingWithContextNotResolved -->
2223
<Binding Mode="OneWay"
2324
Path="Background"
2425
RelativeSource="{RelativeSource TemplatedParent}" />
@@ -50,10 +51,6 @@
5051
<RowDefinition Height="Auto" />
5152
<RowDefinition Height="Auto" />
5253
</Grid.RowDefinitions>
53-
<TextBlock Margin="0,10,0,0" TextAlignment="Center">
54-
<Bold>NOTICE: </Bold> All the following operations require the Phone to be in
55-
<Bold>Mass Storage Mode</Bold>
56-
</TextBlock>
5754

5855
<TabControl Margin="20,0,20,20" Grid.Row="1"
5956
IsEnabled="{Binding IsBusy, Converter={StaticResource BoolNegationConverter}}">

Source/Deployer.Raspberry.Gui/Views/MarkdownViewerWindow.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
77
xmlns:xaml="clr-namespace:Markdown.Xaml;assembly=Markdown.Xaml"
8-
mc:Ignorable="d"
8+
xmlns:viewModels="clr-namespace:Deployer.Raspberry.Gui.ViewModels"
9+
mc:Ignorable="d"
910
Title="{Binding Title}" Width="900" MaxHeight="700" SizeToContent="Height" WindowStartupLocation="CenterOwner"
1011
d:DataContext="{d:DesignInstance viewModels:MessageViewModel}">
1112
<mah:MetroWindow.Resources>

Source/Deployer.Raspberry.Gui/Views/Parts/LogPart.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:viewModels="clr-namespace:Deployer.Raspberry.Gui.ViewModels"
67
mc:Ignorable="d"
78
d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance viewModels:MainViewModel}">
89
<Grid>

Source/Deployer.Raspberry.Gui/Views/Parts/StatusPart.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
7+
xmlns:viewModels="clr-namespace:Deployer.Raspberry.Gui.ViewModels"
78
mc:Ignorable="d"
89
d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance viewModels:MainViewModel}">
910
<StatusBar>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using System.Threading.Tasks;
2+
using Deployer.FileSystem;
3+
4+
namespace Deployer.Raspberry
5+
{
6+
public interface IDiskLayoutBuilder
7+
{
8+
Task CreateLayout(Disk disk);
9+
}
10+
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
DisplayMarkdown "Core\license.md"
2-
FlashGpt
32
DeployWindows
43
InjectDrivers "Bla"

Source/Deployer.Raspberry/Tasks/InstallDevMenu.cs

Lines changed: 0 additions & 39 deletions
This file was deleted.

Source/Deployer.Raspberry/WindowsDeployer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class WindowsDeployer : IWindowsDeployer
2424
private const string BootPartitionLabel = "BOOT";
2525
private const string WindowsPartitonLabel = "WindowsARM";
2626

27-
public WindowsDeployer(IWindowsOptionsProvider optionsProvider, IPhone phone, IWindowsImageService imageService, IBootCreator bootCreator, IEnumerable<ISpaceAllocator> spaceAllocators, IObserver<double> progressObserver)
27+
public WindowsDeployer(IWindowsOptionsProvider optionsProvider, IDiskLayoutBuilder diskLayoutBuilder, IPhone phone, IWindowsImageService imageService, IBootCreator bootCreator, IEnumerable<ISpaceAllocator> spaceAllocators, IObserver<double> progressObserver)
2828
{
2929
this.optionsProvider = optionsProvider;
3030
this.phone = phone;

0 commit comments

Comments
 (0)