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

Updated release notes

Browse Source 
Finally a working zoomed out view for the Semantic Zoom
This commit is contained in:
BONNEVILLE Geoffroy
2018-06-06 12:13:25 +02:00
parent 9566c9a719
commit 1334b266b9
4 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ModernKeePass/Views/GroupDetailPage.xaml
View File

@@ -199,7 +199,7 @@
<TextBlock x:Uid="GroupCreateEntry" VerticalAlignment="Center" Margin="10,0,0,0" />
</StackPanel>
</HyperlinkButton>
<SemanticZoom Grid.Column="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" Margin="20,60,0,0">
<SemanticZoom Grid.Column="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" Margin="20,60,0,0" ScrollViewer.HorizontalScrollBarVisibility="Visible">
<SemanticZoom.ZoomedInView>
<!-- Horizontal scrolling grid -->
<GridView
@@ -315,36 +315,30 @@
</GridView>
</SemanticZoom.ZoomedInView>
<SemanticZoom.ZoomedOutView>
<ListView
Height="Auto" Width="Auto"
<GridView
ItemsSource="{Binding Source={StaticResource EntriesZoomedOutViewSource}}"
SelectionChanged="groups_SelectionChanged"
SelectionMode="None"
IsSynchronizedWithCurrentItem="False">
<ListView.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel Orientation="Horizontal" />
</ItemsPanelTemplate>
</ListView.ItemsPanel>
<ListView.ItemTemplate>
<GridView.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
<TextBlock Width="100" Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
</StackPanel>
</DataTemplate>
</ListView.ItemTemplate>
<ListView.GroupStyle>
</GridView.ItemTemplate>
<GridView.GroupStyle>
<GroupStyle HidesIfEmpty="True">
<GroupStyle.HeaderTemplate>
<DataTemplate>
<Grid Background="LightGray" Margin="0,0,10,0" HorizontalAlignment="Left">
<TextBlock Text="{Binding Key}" Width="40" Foreground="Black" Margin="30" Style="{StaticResource HeaderTextBlockStyle}"/>
<Grid Background="LightGray" HorizontalAlignment="Left">
<TextBlock Text="{Binding Key}" Width="40" Margin="30" Foreground="Black" Style="{StaticResource HeaderTextBlockStyle}" TextAlignment="Center" />
</Grid>
</DataTemplate>
</GroupStyle.HeaderTemplate>
</GroupStyle>
</ListView.GroupStyle>
</ListView>
</GridView.GroupStyle>
</GridView>
</SemanticZoom.ZoomedOutView>
</SemanticZoom>
</Grid>

6
ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
View File

@@ -1,4 +1,2 @@
Application now correctly resumes from suspend
Code enhancements
Return of the Donate page, with Paypal
KeePassLib version bump to 2.38
Design improvements
KeePassLib version bump to 2.39.1

6
ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
View File

@@ -1,4 +1,2 @@
L'application recupere correctement d'une suspension
Ameliorations de code
Retour de la page de donation, avec Paypal
Version de la KeePassLib montee a 2.38
Ameliorations de design
Version de la KeePassLib passe a 2.39.1

18
ModernKeePassLib/Utility/UrlUtil.cs
View File

@@ -327,10 +327,10 @@ namespace ModernKeePassLib.Utility
return strTargetFile;
}
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!KeePassLibSD && !KeePassUAP && !ModernKeePassLib)
if(NativeLib.IsUnix())
#endif
{
#endif
bool bBaseUnc = IsUncPath(strBaseFile);
bool bTargetUnc = IsUncPath(strTargetFile);
if((!bBaseUnc && bTargetUnc) || (bBaseUnc && !bTargetUnc))
@@ -358,9 +358,9 @@ namespace ModernKeePassLib.Utility
}
return sbRel.ToString();
#if (!KeePassLibSD && !KeePassUAP && !ModernKeePassLib)
}
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
try // Windows
{
const int nMaxPath = NativeMethods.MAX_PATH * 2;
@@ -453,16 +453,10 @@ namespace ModernKeePassLib.Utility
string str;
try
{
#if KeePassRT
var dirT = Windows.Storage.StorageFolder.GetFolderFromPathAsync(
strPath).AwaitEx();
str = dirT.Path;
#elif ModernKeePassLib
#if ModernKeePassLib
var dirT = StorageFolder.GetFolderFromPathAsync(
strPath).GetResults();
str = dirT.Path;
/*var dirT = FileSystem.Current.GetFolderFromPathAsync(strPath).Result;
str = dirT.Path;*/
#else
str = Path.GetFullPath(strPath);
#endif
@@ -640,8 +634,8 @@ namespace ModernKeePassLib.Utility
string strDir;
if(NativeLib.IsUnix())
strDir = NativeMethods.GetUserRuntimeDir();
#if ModernKeePassLib
else strDir = ApplicationData.Current.TemporaryFolder.Path;
#if KeePassUAP || ModernKeePassLib
else strDir = Windows.Storage.ApplicationData.Current.TemporaryFolder.Path;
#else
else strDir = Path.GetTempPath();