wismna/modernkeepass
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePass.git synced 2025-10-04 08:00:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Hamburger button state is now correct (no more double clicks) but it's a bit hacky

Browse Source 
Changed Help tooltip location in New Database Settings page
Suggest Save As when opening DB when another is opened and there is a save error
This commit is contained in:
Geoffroy BONNEVILLE
2020-05-05 16:59:49 +02:00
parent 5ce0262318
commit 8fb468358e
13 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ModernKeePass/Views/MainPageFrames/AboutPage.xaml
View File

@@ -6,15 +6,14 @@
xmlns:viewModels="using:ModernKeePass.ViewModels"
x:Class="ModernKeePass.Views.AboutPage"
mc:Ignorable="d">
<Page.DataContext>
<viewModels:AboutVm/>
</Page.DataContext>
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="10,0,0,0">
<Run Text="{Binding Name}"/>
<Run Text="version"/>
<Run Text="{Binding Name}" />
<Run Text="version" />
<Run Text="{Binding Version}" />
</TextBlock>
<TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="30,0,0,0">
@@ -23,7 +22,7 @@
<TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="30,0,0,0">
<Run x:Uid="AboutHomepage" />
<Hyperlink NavigateUri="https://wismna.github.io/ModernKeePass/">
<Run Text="https://wismna.github.io/ModernKeePass/"/>
<Run Text="https://wismna.github.io/ModernKeePass/" />
</Hyperlink>
</TextBlock>
<TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="10,0,0,0">

6
ModernKeePass/Views/MainPageFrames/ImportExportPage.xaml
View File

@@ -20,10 +20,10 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<TextBlock Text="Import" Style="{StaticResource SubheaderTextBlockStyle}" />
<HyperlinkButton Grid.Column="0" Grid.Row="1" Content="Select file..." Style="{StaticResource MainColorHyperlinkButton}" Click="ImportFileButton_OnClick" />
<HyperlinkButton Grid.Column="0" Grid.Row="1" Content="Select file..." />
<StackPanel Grid.Column="1" Grid.Row="1" >
<TextBlock Text="Format" Style="{StaticResource BodyTextBlockStyle}" Margin="0,0,0,10" />
<ComboBox Style="{StaticResource MainColorComboBox}">
<ComboBox>
<ComboBoxItem>CSV</ComboBoxItem>
</ComboBox>
</StackPanel>
@@ -32,6 +32,6 @@
<RadioButton GroupName="ImportDestination" Content="New database" />
<RadioButton GroupName="ImportDestination" Content="Currently opened database" />
</StackPanel>
<Button Grid.Column="3" Grid.Row="1" Content="Import" Style="{StaticResource MainColorButton}" />
<Button Grid.Column="3" Grid.Row="1" Content="Import" />
</Grid>
</Page>

22
ModernKeePass/Views/MainPageFrames/ImportExportPage.xaml.cs
View File

@@ -1,8 +1,4 @@
using System;
using Windows.Storage.Pickers;
using Windows.UI.Xaml;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
namespace ModernKeePass.Views
{
@@ -15,21 +11,5 @@ namespace ModernKeePass.Views
{
InitializeComponent();
}
private async void ImportFileButton_OnClick(object sender, RoutedEventArgs e)
{
var picker =
new FileOpenPicker
{
ViewMode = PickerViewMode.List,
SuggestedStartLocation = PickerLocationId.DocumentsLibrary
};
picker.FileTypeFilter.Add(".csv");
// Application now has read/write access to the picked file
var file = await picker.PickSingleFileAsync().AsTask();
if (file == null) return;
}
}
}