mirror of
https://github.com/wismna/ModernKeePass.git
synced 2025-10-03 15:40:18 -04:00
Remove some useless code (again)
Improve some visuals
This commit is contained in:
@@ -191,7 +191,7 @@
|
|||||||
To="1" />
|
To="1" />
|
||||||
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter"
|
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter"
|
||||||
Storyboard.TargetProperty="Foreground">
|
Storyboard.TargetProperty="Foreground">
|
||||||
<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource MainColor}" />
|
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ListViewItemSelectedForegroundThemeBrush}" />
|
||||||
</ObjectAnimationUsingKeyFrames>
|
</ObjectAnimationUsingKeyFrames>
|
||||||
</Storyboard>
|
</Storyboard>
|
||||||
</VisualState>
|
</VisualState>
|
||||||
@@ -358,13 +358,13 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
<Border x:Name="SelectedLeftIndicator"
|
<Border x:Name="SelectedLeftIndicator"
|
||||||
BorderBrush="{StaticResource MainColor}"
|
BorderBrush="{ThemeResource MainColorBrush}"
|
||||||
BorderThickness="5,0,0,0"
|
BorderThickness="5,0,0,0"
|
||||||
Opacity="0"/>
|
Opacity="0"/>
|
||||||
<Rectangle x:Name="SelectedBorder"
|
<Rectangle x:Name="SelectedBorder"
|
||||||
IsHitTestVisible="False"
|
IsHitTestVisible="False"
|
||||||
Opacity="0"
|
Opacity="0"
|
||||||
Stroke="{StaticResource MainColor}"
|
Stroke="{ThemeResource MainColorBrush}"
|
||||||
StrokeThickness="{ThemeResource ListViewItemSelectedBorderThemeThickness}"
|
StrokeThickness="{ThemeResource ListViewItemSelectedBorderThemeThickness}"
|
||||||
Margin="0" />
|
Margin="0" />
|
||||||
<Border x:Name="SelectedCheckMarkOuter"
|
<Border x:Name="SelectedCheckMarkOuter"
|
||||||
@@ -373,7 +373,7 @@
|
|||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Margin="4">
|
Margin="4">
|
||||||
<Grid x:Name="SelectedCheckMark" Opacity="0" Height="40" Width="40">
|
<Grid x:Name="SelectedCheckMark" Opacity="0" Height="40" Width="40">
|
||||||
<Path x:Name="SelectedEarmark" Data="M0,0 L40,0 L40,40 z" Fill="{StaticResource MainColor}" Stretch="Fill"/>
|
<Path x:Name="SelectedEarmark" Data="M0,0 L40,0 L40,40 z" Fill="{ThemeResource MainColorBrush}" Stretch="Fill"/>
|
||||||
<Path Data="F1 M133.1,17.9 L137.2,13.2 L144.6,19.6 L156.4,5.8 L161.2,9.9 L145.6,28.4 z" Fill="{ThemeResource ListViewItemCheckThemeBrush}" Height="13" Stretch="Fill" Width="15" HorizontalAlignment="Right" Margin="0,5.5,5.5,0" VerticalAlignment="Top" FlowDirection="LeftToRight"/>
|
<Path Data="F1 M133.1,17.9 L137.2,13.2 L144.6,19.6 L156.4,5.8 L161.2,9.9 L145.6,28.4 z" Fill="{ThemeResource ListViewItemCheckThemeBrush}" Height="13" Stretch="Fill" Width="15" HorizontalAlignment="Right" Margin="0,5.5,5.5,0" VerticalAlignment="Top" FlowDirection="LeftToRight"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
@@ -474,9 +474,9 @@
|
|||||||
<TextBlock x:Uid="EntryIcon" Style="{StaticResource EntryTextBlockStyle}" />
|
<TextBlock x:Uid="EntryIcon" Style="{StaticResource EntryTextBlockStyle}" />
|
||||||
<userControls:SymbolPickerUserControl SelectedSymbol="{Binding Icon, Mode=TwoWay}" HorizontalAlignment="Left" IsEnabled="{Binding IsCurrentEntry}" />
|
<userControls:SymbolPickerUserControl SelectedSymbol="{Binding Icon, Mode=TwoWay}" HorizontalAlignment="Left" IsEnabled="{Binding IsCurrentEntry}" />
|
||||||
<TextBlock x:Uid="EntryBackgroundColor" Style="{StaticResource EntryTextBlockStyle}" />
|
<TextBlock x:Uid="EntryBackgroundColor" Style="{StaticResource EntryTextBlockStyle}" />
|
||||||
<userControls:ColorPickerUserControl SelectedColor="{Binding BackgroundColor, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" Width="350" />
|
<userControls:ColorPickerUserControl SelectedColor="{Binding BackgroundColor, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" Width="250" />
|
||||||
<TextBlock x:Uid="EntryForegroundColor" Style="{StaticResource EntryTextBlockStyle}" />
|
<TextBlock x:Uid="EntryForegroundColor" Style="{StaticResource EntryTextBlockStyle}" />
|
||||||
<userControls:ColorPickerUserControl SelectedColor="{Binding ForegroundColor, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" Width="350" />
|
<userControls:ColorPickerUserControl SelectedColor="{Binding ForegroundColor, Mode=TwoWay}" IsEnabled="{Binding IsCurrentEntry}" Width="250" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</HubSection>
|
</HubSection>
|
||||||
|
@@ -138,7 +138,7 @@
|
|||||||
ButtonCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
|
ButtonCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
|
||||||
Style="{StaticResource TextBoxWithButtonStyle}"
|
Style="{StaticResource TextBoxWithButtonStyle}"
|
||||||
KeyDown="NewGroupTextBox_OnKeyDown"
|
KeyDown="NewGroupTextBox_OnKeyDown"
|
||||||
ButtonSymbol="">
|
ButtonSymbol="">
|
||||||
<interactivity:Interaction.Behaviors>
|
<interactivity:Interaction.Behaviors>
|
||||||
<core:EventTriggerBehavior EventName="LostFocus">
|
<core:EventTriggerBehavior EventName="LostFocus">
|
||||||
<core:ChangePropertyAction TargetObject="{Binding ElementName=NewGroupButton}" PropertyName="Visibility" Value="Visible" />
|
<core:ChangePropertyAction TargetObject="{Binding ElementName=NewGroupButton}" PropertyName="Visibility" Value="Visible" />
|
||||||
|
@@ -21,12 +21,14 @@ You can get it [here](https://www.microsoft.com/en-us/store/p/modernkeepass/9mwq
|
|||||||
- View, delete and restore from entry history
|
- View, delete and restore from entry history
|
||||||
- Use Semantic Zoom to see your entries in a grouped mode
|
- Use Semantic Zoom to see your entries in a grouped mode
|
||||||
- List recently opened databases
|
- List recently opened databases
|
||||||
- Open database from Windows Explorer
|
- Open a database from Windows Explorer
|
||||||
- Change database encryption
|
- Change database encryption
|
||||||
- Change database compression
|
- Change database compression
|
||||||
- Change database key derivation
|
- Change database key derivation
|
||||||
- Displays and change entry colors and icons
|
- Displays and change entry colors and icons
|
||||||
- Move entries from a group to another
|
- Move entries and groups from a group to another
|
||||||
|
- Entry custom fields (view, add, update, delete)
|
||||||
|
- Entry attachments (view, add, delete)
|
||||||
|
|
||||||
# Build and Test
|
# Build and Test
|
||||||
1. Clone the repository
|
1. Clone the repository
|
||||||
@@ -36,8 +38,6 @@ You can get it [here](https://www.microsoft.com/en-us/store/p/modernkeepass/9mwq
|
|||||||
# Contribute
|
# Contribute
|
||||||
I'm not the best at creating nice assets, so if anyone would like to contribute some nice icons, it would be awesome :)
|
I'm not the best at creating nice assets, so if anyone would like to contribute some nice icons, it would be awesome :)
|
||||||
Otherwise, there are still many things left to implement:
|
Otherwise, there are still many things left to implement:
|
||||||
- Entry custom fields
|
|
||||||
- Entry attachments
|
|
||||||
- Multi entry selection (for delete, or move)
|
- Multi entry selection (for delete, or move)
|
||||||
- Import existing data from CSV, JSON, or XML
|
- Import existing data from CSV, JSON, or XML
|
||||||
- Open database from URL (and maybe some clouds?)
|
- Open database from URL (and maybe some clouds?)
|
||||||
|
@@ -1,24 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Windows.UI.Xaml.Data;
|
|
||||||
|
|
||||||
namespace ModernKeePass.Converters
|
|
||||||
{
|
|
||||||
public class PluralizationConverter : IValueConverter
|
|
||||||
{
|
|
||||||
public object Convert(object value, Type targetType, object parameter, string language)
|
|
||||||
{
|
|
||||||
var pluralizationOptionString = parameter as string;
|
|
||||||
var pluralizationOptions = pluralizationOptionString?.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
|
|
||||||
if (pluralizationOptions == null || pluralizationOptions.Length != 2) return string.Empty;
|
|
||||||
var count = value is int ? (int) value : 0;
|
|
||||||
var text = count == 1 ? pluralizationOptions[0] : pluralizationOptions[1];
|
|
||||||
return $"{count} {text}";
|
|
||||||
}
|
|
||||||
|
|
||||||
// No need to implement this
|
|
||||||
public object ConvertBack(object value, Type targetType, object parameter, string language)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,20 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Windows.UI.Xaml.Data;
|
|
||||||
|
|
||||||
namespace ModernKeePass.Converters
|
|
||||||
{
|
|
||||||
public class TextToWidthConverter : IValueConverter
|
|
||||||
{
|
|
||||||
public object Convert(object value, Type targetType, object parameter, string language)
|
|
||||||
{
|
|
||||||
var fontSize = double.Parse(parameter as string);
|
|
||||||
var text = value as string;
|
|
||||||
return text?.Length * fontSize ?? 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public object ConvertBack(object value, Type targetType, object parameter, string language)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,12 +1,10 @@
|
|||||||
using GalaSoft.MvvmLight;
|
using GalaSoft.MvvmLight;
|
||||||
using ModernKeePass.Domain.Dtos;
|
using ModernKeePass.Domain.Dtos;
|
||||||
using ModernKeePass.Domain.Interfaces;
|
|
||||||
|
|
||||||
namespace ModernKeePass.ViewModels.ListItems
|
namespace ModernKeePass.ViewModels.ListItems
|
||||||
{
|
{
|
||||||
public class RecentItemVm: ObservableObject, ISelectableModel
|
public class RecentItemVm: ObservableObject
|
||||||
{
|
{
|
||||||
private bool _isSelected;
|
|
||||||
private string _name;
|
private string _name;
|
||||||
private string _token;
|
private string _token;
|
||||||
private string _path;
|
private string _path;
|
||||||
@@ -29,12 +27,6 @@ namespace ModernKeePass.ViewModels.ListItems
|
|||||||
set { Set(() => Path, ref _path, value); }
|
set { Set(() => Path, ref _path, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsSelected
|
|
||||||
{
|
|
||||||
get { return _isSelected; }
|
|
||||||
set { Set(() => IsSelected, ref _isSelected, value); }
|
|
||||||
}
|
|
||||||
|
|
||||||
public RecentItemVm(FileInfo file)
|
public RecentItemVm(FileInfo file)
|
||||||
{
|
{
|
||||||
Token = file.Id;
|
Token = file.Id;
|
||||||
|
@@ -27,9 +27,7 @@
|
|||||||
<Compile Include="$(MSBuildThisFileDirectory)Converters\IconToSymbolConverter.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Converters\IconToSymbolConverter.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Converters\InverseBooleanToVisibilityConverter.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Converters\InverseBooleanToVisibilityConverter.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Converters\NullToBooleanConverter.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Converters\NullToBooleanConverter.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Converters\PluralizationConverter.cs" />
|
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Converters\ProgressBarLegalValuesConverter.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Converters\ProgressBarLegalValuesConverter.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Converters\TextToWidthConverter.cs" />
|
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ColorExtensions.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ColorExtensions.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Extensions\DispatcherTaskExtensions.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Extensions\DispatcherTaskExtensions.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Messages\CredentialsMessage.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Messages\CredentialsMessage.cs" />
|
||||||
|
Reference in New Issue
Block a user