Skip to content

[FZ Editor] Move "Duplicate" and "Delete" buttons to the Edit dialog. #9272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SeraphimaZykova merged 3 commits into from
Jan 25, 2021
Merged

[FZ Editor] Move "Duplicate" and "Delete" buttons to the Edit dialog. #9272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
558b3b0
init custom grid layout
SeraphimaZykova Jan 22, 2021
97ac79d
buttons instead of context menu
SeraphimaZykova Jan 22, 2021
71d009f
hide dialog after click a button
SeraphimaZykova Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 65 additions & 17 deletions src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,7 @@
KeyDown="LayoutItem_KeyDown"
MouseDown="LayoutItem_Click"
Margin="0,0,0,12">
<Grid.ContextMenu>
<ContextMenu>
<MenuItem Header="{x:Static props:Resources.Duplicate}" Click="DuplicateLayout_Click">
<MenuItem.Icon>
<ui:FontIcon Glyph="&#xE8C8;" />
</MenuItem.Icon>
</MenuItem>

<MenuItem Header="{x:Static props:Resources.Delete}" Click="DeleteLayout_Click">
<MenuItem.Icon>
<ui:FontIcon Glyph="&#xE107;" />
</MenuItem.Icon>
</MenuItem>
</ContextMenu>
</Grid.ContextMenu>


<Border x:Name="LayoutItem"
Style="{StaticResource CardStyle}"
Margin="8"
Expand Down Expand Up @@ -418,7 +403,7 @@
HorizontalAlignment="Stretch"
AutomationProperties.Name="{x:Static props:Resources.Edit_zones}"
Height="48"
Margin="0,0,0,32"
Margin="0,0,0,16"
Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}"
Style="{StaticResource AccentButtonStyle}">
<Button.Content>
Expand All @@ -436,6 +421,69 @@
</Button.Effect>
</Button>

<Grid Margin="0,0,0,32"
Height="Auto"
HorizontalAlignment="Stretch">

<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>

<Button Click="DuplicateLayout_Click"
x:Name="duplicateLayoutButton"
HorizontalAlignment="Stretch"
AutomationProperties.Name="{x:Static props:Resources.Duplicate}"
Height="48"
Margin="0,0,4,0"
Grid.Column="0"
Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
<Button.Content>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xE8C8;"
Margin="0,2,8,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock Text="{x:Static props:Resources.Duplicate}" />
</StackPanel>
</Button.Content>
</Button>
<Button Click="DeleteLayout_Click"
x:Name="deleteLayoutButton"
HorizontalAlignment="Stretch"
AutomationProperties.Name="{x:Static props:Resources.Delete}"
Height="48"
Margin="4,0,0,0"
Grid.Column="1"
Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
<Button.Content>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xE107;"
Margin="0,2,8,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock Text="{x:Static props:Resources.Delete}" />
</StackPanel>
</Button.Content>
</Button>

<Button Click="DuplicateLayout_Click"
x:Name="createFromTemplateLayoutButton"
HorizontalAlignment="Stretch"
AutomationProperties.Name="{x:Static props:Resources.Create_Custom_From_Template}"
Height="48"
Margin="0,0,4,0"
Grid.Column="0"
Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeTemplateToVisibilityConverter}}">
<Button.Content>
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xE8C8;"
Margin="0,2,8,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock Text="{x:Static props:Resources.Create_Custom_From_Template}" />
</StackPanel>
</Button.Content>
</Button>
</Grid>

<TextBlock x:Name="nameHeader"
Text="{x:Static props:Resources.Name}"
IsEnabled="{Binding ShowSpacing}"
Expand Down
39 changes: 24 additions & 15 deletions src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ private async void NewLayoutButton_Click(object sender, RoutedEventArgs e)

private void DuplicateLayout_Click(object sender, RoutedEventArgs e)
{
EditLayoutDialog.Hide();

var mainEditor = App.Overlay;
if (!(mainEditor.CurrentDataContext is LayoutModel model))
{
Expand Down Expand Up @@ -200,21 +202,10 @@ private void OnClosing(object sender, EventArgs e)
App.Current.Shutdown();
}

private async void DeleteLayout_Click(object sender, RoutedEventArgs e)
private void DeleteLayout_Click(object sender, RoutedEventArgs e)
{
var dialog = new ModernWpf.Controls.ContentDialog()
{
Title = FancyZonesEditor.Properties.Resources.Are_You_Sure,
Content = FancyZonesEditor.Properties.Resources.Are_You_Sure_Description,
PrimaryButtonText = FancyZonesEditor.Properties.Resources.Delete,
SecondaryButtonText = FancyZonesEditor.Properties.Resources.Cancel,
};
var result = await dialog.ShowAsync();
if (result == ContentDialogResult.Primary)
{
LayoutModel model = ((FrameworkElement)sender).DataContext as LayoutModel;
model.Delete();
}
EditLayoutDialog.Hide();
DeleteLayout((FrameworkElement)sender);
}

private async void EditLayout_Click(object sender, RoutedEventArgs e)
Expand Down Expand Up @@ -269,7 +260,7 @@ private void NewLayoutDialog_PrimaryButtonClick(ModernWpf.Controls.ContentDialog

if (GridLayoutRadioButton.IsChecked == true)
{
GridLayoutModel gridModel = new GridLayoutModel(LayoutNameText.Text, LayoutType.Columns)
GridLayoutModel gridModel = new GridLayoutModel(LayoutNameText.Text, LayoutType.Custom)
{
Rows = 1,
RowPercents = new List<int>(1) { GridLayoutModel.GridMultiplier },
Expand Down Expand Up @@ -343,5 +334,23 @@ private void EditLayoutDialog_PrimaryButtonClick(ContentDialog sender, ContentDi
// reset selected model
Select(_settings.AppliedModel);
}

private async void DeleteLayout(FrameworkElement element)
{
var dialog = new ModernWpf.Controls.ContentDialog()
{
Title = FancyZonesEditor.Properties.Resources.Are_You_Sure,
Content = FancyZonesEditor.Properties.Resources.Are_You_Sure_Description,
PrimaryButtonText = FancyZonesEditor.Properties.Resources.Delete,
SecondaryButtonText = FancyZonesEditor.Properties.Resources.Cancel,
};

var result = await dialog.ShowAsync();
if (result == ContentDialogResult.Primary)
{
LayoutModel model = element.DataContext as LayoutModel;
model.Delete();
}
}
}
}
3 changes: 3 additions & 0 deletions src/modules/fancyzones/editor/FancyZonesEditor/Models/GridLayoutModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@ public override void InitTemplateZones()
case LayoutType.PriorityGrid:
InitPriorityGrid();
break;
case LayoutType.Custom:
InitColumns(); // Custom is initialized with columns
break;
}

FirePropertyChanged();
Expand Down
9 changes: 9 additions & 0 deletions src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,4 +328,7 @@ To merge zones, select the zones and click "merge".</value>
<data name="Template_Layout_Blank" xml:space="preserve">
<value>No layout</value>
</data>
<data name="Create_Custom_From_Template" xml:space="preserve">
<value>Create custom layout</value>
</data>
</root>