Skip to content

Commit 114147e

Browse files
committed
1.2.0.235
1 parent 16a4a63 commit 114147e

101 files changed

Lines changed: 2590 additions & 566 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
0 Bytes
Binary file not shown.

.vs/OlibPasswordManager/v16/.suo

-1 KB
Binary file not shown.

App.xaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
</ResourceDictionary.MergedDictionaries>
1313
<FontFamily x:Key="Montserrat">./Properties/Fonts/Montserrat-Regular.ttf#Montserrat</FontFamily>
1414

15+
<Style TargetType="{x:Type Label}">
16+
<Setter Property="FontFamily" Value="{StaticResource Montserrat}"/>
17+
</Style>
18+
1519
<Style TargetType="{x:Type PasswordBox}">
1620
<Setter Property="PasswordChar" Value="" />
1721
<Setter Property="BorderThickness" Value="1" />

CHANGELOG.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [1.2.0.235] - 2020-02-05
10+
### Added
11+
- Dark theme added.
12+
- Added taskbar icon.
13+
- Added the ability to encrypt passports.
14+
- Added autosave storage in three minutes.
15+
- Added a theme selection to the settings window.
16+
- Added the ability to lock and unlock storage.
17+
- Added a small window when you click on the icon in the taskbar, allowing you to view passwords and nothing more.
18+
19+
### Changed
20+
- Changed the appearance of the settings window.
21+
- The appearance of the program is slightly changed.
22+
- The storage encryption logic has been slightly changed.
23+
- The localization is slightly changed.
24+
- Now you will not be able to add a login until you create or unlock a storage.
25+
- The background color of the windows is changed.
26+
27+
### Fixed
28+
- Fixed a bug when selecting an item from the list, instead of a login, data for a bank card was displayed.
29+
930
## [1.1.0.145] - 2020-01-18
1031
### Added
1132
- Additional hotkeys added.
@@ -24,5 +45,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2445
- Fixed termination of the program when there are no connected storages yet.
2546

2647
## [1.0.0.90] - 2020-01-10
27-
### Added
2848
- First release.

MainWindow.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<RowDefinition/>
192192
<RowDefinition Height="50"/>
193193
</Grid.RowDefinitions>
194-
<Label Grid.Row="0" Content="{DynamicResource ListOfItems}" VerticalContentAlignment="Center" FontSize="16" FontFamily="{StaticResource Montserrat}" Foreground="White"/>
194+
<Label Grid.Row="0" Content="{DynamicResource ListOfItems}" VerticalContentAlignment="Center" FontSize="16" FontFamily="{StaticResource Montserrat}" Foreground="{DynamicResource ForegroundWindow}"/>
195195
<ListBox x:Name="PasswordListNotifyIcon" FontFamily="{StaticResource Montserrat}" SelectionChanged="PasswordListNotifyIcon_OnSelectionChanged" Background="{DynamicResource BackgroundWindow}" BorderBrush="{DynamicResource PageBordersColor}" Grid.Row="1" VirtualizingPanel.ScrollUnit="Pixel" ItemTemplate="{StaticResource PasswordF}"/>
196196
<Border x:Name="BorderInformation" Visibility="Collapsed" Grid.Row="0" Grid.RowSpan="3" Background="#FF5A0F26">
197197
<Grid>
@@ -229,7 +229,7 @@
229229
</Border>
230230
<Border Style="{DynamicResource PageBorder}" x:Name="bPassportPlaceOfIssue">
231231
<StackPanel>
232-
<Label Content="Место выдачи" Foreground="{DynamicResource ForegroundWindow}"/>
232+
<Label Content="{DynamicResource PlaceOfIssue}" Foreground="{DynamicResource ForegroundWindow}"/>
233233
<TextBox x:Name="txtPassportPlaceOfIssue" Margin="5"/>
234234
</StackPanel>
235235
</Border>
@@ -327,7 +327,7 @@
327327

328328
<ListBox x:Name="PasswordList" Background="{DynamicResource BackgroundWindow}" BorderBrush="{DynamicResource PageBordersColor}" BorderThickness="0,0,1,0" Grid.Row="2" VirtualizingPanel.ScrollUnit="Pixel" ItemTemplate="{StaticResource PasswordF}" Grid.Column="1" SelectionChanged="PasswordList_SelectionChanged"/>
329329
<Border Grid.Column="1" Grid.Row="3" Background="{DynamicResource GlobalBorderColor}" BorderBrush="{DynamicResource PageBordersColor}" BorderThickness="0,1,1,0" >
330-
<Button Content="{DynamicResource Add}" Margin="10" Click="CreatePassword"/>
330+
<Button x:Name="AddButton" IsEnabled="False" Content="{DynamicResource Add}" Margin="10" Click="CreatePassword"/>
331331
</Border>
332332
<Border Grid.Column="1" Grid.Row="1" Background="#931d60" BorderBrush="{DynamicResource PageBordersColor}" BorderThickness="0,0,1,1">
333333
<DockPanel Margin="10">

MainWindow.xaml.cs

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,19 @@ private void CreatePassword(object sender, RoutedEventArgs e)
9595

9696
private void Window_Loaded(object sender, RoutedEventArgs e)
9797
{
98-
using var sw = new StreamWriter("Build.txt");
99-
sw.Write("1.2.0.230");
98+
//using var sw = new StreamWriter("Build.txt");
99+
//sw.Write("1.2.0.233");
100100

101101
User.UsersList = new List<User>();
102102

103103
System.Windows.Threading.DispatcherTimer timer = new System.Windows.Threading.DispatcherTimer();
104104

105105
if (Additional.GlobalSettings.AppGlobalString != null)
106+
{
107+
UnlockMenuItem.IsEnabled = true;
108+
UnlockNotifyIcon.IsEnabled = true;
109+
}
110+
else
106111
{
107112
UnlockMenuItem.IsEnabled = false;
108113
UnlockNotifyIcon.IsEnabled = false;
@@ -145,8 +150,8 @@ private void Save(bool b)
145150
catch
146151
{
147152
if (b)
148-
MessageBox.Show((string) Application.Current.Resources["MB1"],
149-
(string) Application.Current.Resources["Error"], MessageBoxButton.OK, MessageBoxImage.Error);
153+
MessageBox.Show((string)FindResource("MB1"),
154+
(string)FindResource("Error"), MessageBoxButton.OK, MessageBoxImage.Error);
150155
}
151156
}
152157

@@ -227,14 +232,14 @@ private async void CheckUpdate(bool b)
227232
var current = float.Parse(Assembly.GetExecutingAssembly().GetName().Version.ToString().Replace(".", ""));
228233
if (!(latest > current) && b)
229234
{
230-
MessageBox.Show((string) Application.Current.Resources["MB8"],
231-
(string) Application.Current.Resources["Message"], MessageBoxButton.OK,
235+
MessageBox.Show((string)FindResource("MB8"),
236+
(string)FindResource("Message"), MessageBoxButton.OK,
232237
MessageBoxImage.Information);
233238
return;
234239
}
235240
if (!(latest > current)) return;
236-
if (MessageBox.Show((string)Application.Current.Resources["MB4"],
237-
(string)Application.Current.Resources["Message"], MessageBoxButton.YesNo,
241+
if (MessageBox.Show((string)FindResource("MB4"),
242+
(string)FindResource("Message"), MessageBoxButton.YesNo,
238243
MessageBoxImage.Information) != MessageBoxResult.Yes) return;
239244
var psi = new ProcessStartInfo
240245
{
@@ -247,8 +252,8 @@ private async void CheckUpdate(bool b)
247252
{
248253
if (b)
249254
{
250-
MessageBox.Show((string) Application.Current.Resources["MB5"],
251-
(string) Application.Current.Resources["Error"], MessageBoxButton.OK,
255+
MessageBox.Show((string)FindResource("MB5"),
256+
(string)FindResource("Error"), MessageBoxButton.OK,
252257
MessageBoxImage.Error);
253258
}
254259
}
@@ -395,6 +400,8 @@ private void LockPasswordBase()
395400

396401
FrameWindow.NavigationService.Navigate(new Uri("/Pages/StartScreen.xaml", UriKind.Relative));
397402

403+
AddButton.IsEnabled = false;
404+
398405
SaveMenuItem.IsEnabled = false;
399406
ChangeMenuItem.IsEnabled = false;
400407
NewLoginMenuItem.IsEnabled = false;

OlibPasswordManager.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<Copyright>Dmitry Zhutkov</Copyright>
1111
<RepositoryUrl>https://github.com/BigBoss500/OlibPasswordManager</RepositoryUrl>
1212
<PackageTags />
13-
<AssemblyVersion>1.2.0.160</AssemblyVersion>
14-
<FileVersion>1.2.0.160</FileVersion>
13+
<AssemblyVersion>1.2.0.235</AssemblyVersion>
14+
<FileVersion>1.2.0.235</FileVersion>
1515
<Company />
1616
<PackageId>Olib Password Manager</PackageId>
1717
<Authors>Dmitry Zhutkov</Authors>

Properties/Themes/Light.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<SolidColorBrush x:Key="ForegroundWindow" Color="Black"/>
55
<SolidColorBrush x:Key="BorderColorWindow" Color="#A5A5A5"/>
66
<SolidColorBrush x:Key="HoverBackground" Color="#FFE0E0E0"/>
7-
<SolidColorBrush x:Key="PageBordersColor" Color="#f9fafc"/>
7+
<SolidColorBrush x:Key="PageBordersColor" Color="#D7D8DA"/>
88
<SolidColorBrush x:Key="ForegroundOpacity" Color="#777777"/>
99
<SolidColorBrush x:Key="GlobalBorderColor" Color="#f9fafc"/>
1010
</ResourceDictionary>

Windows/RequireMasterPassword.xaml.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@ private void Require()
5050
App.MainWindow.LockNotifyIcon.IsEnabled = true;
5151
App.MainWindow.UnlockNotifyIcon.IsEnabled = false;
5252

53+
App.MainWindow.AddButton.IsEnabled = true;
54+
5355
Close();
5456
}
5557
catch
5658
{
57-
MessageBox.Show((string) Application.Current.Resources["MB3"],
58-
(string) Application.Current.Resources["Error"], MessageBoxButton.OK, MessageBoxImage.Error);
59+
MessageBox.Show((string)FindResource("MB3"),
60+
(string)FindResource("Error"), MessageBoxButton.OK, MessageBoxImage.Error);
5961
}
6062
}
6163

Windows/Settings.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
3030
CbTheme.SelectedValuePath = "Key";
3131
CbTheme.DisplayMemberPath = "Value";
3232
KeyValuePair<string, string>[] valuePair = {
33-
new KeyValuePair<string, string>("Light", (string) Application.Current.Resources["Light"]),
34-
new KeyValuePair<string, string>("Dark", (string) Application.Current.Resources["Dark"])
33+
new KeyValuePair<string, string>("Light", (string)FindResource("Light")),
34+
new KeyValuePair<string, string>("Dark", (string)FindResource("Dark"))
3535
};
3636
foreach (KeyValuePair<string, string> i in valuePair) CbTheme.Items.Add(i);
3737
CbTheme.SelectedIndex = Additional.GlobalSettings.ApplyTheme != null

0 commit comments

Comments
 (0)