Skip to content

Commit d07b1ef

Browse files
CodeDeadCodeDead
committed
* Added tooltips
* Design changes * Added special characters
1 parent bdc3b25 commit d07b1ef

File tree

3 files changed

+57
-25
lines changed

3 files changed

+57
-25
lines changed

‎Advanced PassGen/Windows/MainWindow.xaml

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,17 @@
2929
<ColumnDefinition></ColumnDefinition>
3030
</Grid.ColumnDefinitions>
3131
<Label>Length:</Label>
32-
<syncfusion:IntegerTextBox x:Name="TxtLength" Grid.Row="0" Grid.Column="1" MinValue="1"></syncfusion:IntegerTextBox>
32+
<syncfusion:IntegerTextBox x:Name="TxtLength" Grid.Row="0" Grid.Column="1" MinValue="1">
33+
<syncfusion:IntegerTextBox.ToolTip>
34+
<ToolTip Content="The length of the password that needs to be generated."></ToolTip>
35+
</syncfusion:IntegerTextBox.ToolTip>
36+
</syncfusion:IntegerTextBox>
3337
<Label Grid.Row="1" Grid.Column="0">Amount:</Label>
34-
<syncfusion:IntegerTextBox x:Name="TxtAmount" Grid.Row="1" Grid.Column="1" MinValue="1"></syncfusion:IntegerTextBox>
38+
<syncfusion:IntegerTextBox x:Name="TxtAmount" Grid.Row="1" Grid.Column="1" MinValue="1">
39+
<syncfusion:IntegerTextBox.ToolTip>
40+
<ToolTip Content="The amount of passwords that need to be generated."></ToolTip>
41+
</syncfusion:IntegerTextBox.ToolTip>
42+
</syncfusion:IntegerTextBox>
3543
</Grid>
3644
<GroupBox Grid.Row="1" Header="Characters">
3745
<Grid>
@@ -43,10 +51,26 @@
4351
<ColumnDefinition></ColumnDefinition>
4452
<ColumnDefinition></ColumnDefinition>
4553
</Grid.ColumnDefinitions>
46-
<CheckBox x:Name="ChbSmallLetters" Content="Small letters (a-z)" Height="16"></CheckBox>
47-
<CheckBox x:Name="ChbCapitalLetters" Grid.Row="0" Grid.Column="1" Content="Capital letters (A-Z)"></CheckBox>
48-
<CheckBox x:Name="ChbSpecialCharacters" Grid.Row="1" Grid.Column="0" Content="Special characters (@,#!)"></CheckBox>
49-
<CheckBox x:Name="ChbNumbers" Grid.Row="1" Grid.Column="1" Content="Numbers (0-9)"></CheckBox>
54+
<CheckBox Margin="2" x:Name="ChbSmallLetters" Content="Small letters">
55+
<CheckBox.ToolTip>
56+
<ToolTip Content="Example: a, b, c,..."></ToolTip>
57+
</CheckBox.ToolTip>
58+
</CheckBox>
59+
<CheckBox Margin="2" x:Name="ChbCapitalLetters" Grid.Row="0" Grid.Column="1" Content="Capital letters">
60+
<CheckBox.ToolTip>
61+
<ToolTip Content="Example: A, B, C,..."></ToolTip>
62+
</CheckBox.ToolTip>
63+
</CheckBox>
64+
<CheckBox Margin="2" x:Name="ChbSpecialCharacters" Grid.Row="1" Grid.Column="0" Content="Special characters">
65+
<CheckBox.ToolTip>
66+
<ToolTip Content="Example: @, #, !,..."></ToolTip>
67+
</CheckBox.ToolTip>
68+
</CheckBox>
69+
<CheckBox Margin="2" x:Name="ChbNumbers" Grid.Row="1" Grid.Column="1" Content="Numbers">
70+
<CheckBox.ToolTip>
71+
<ToolTip Content="Example: 0, 1, 2,..."></ToolTip>
72+
</CheckBox.ToolTip>
73+
</CheckBox>
5074
</Grid>
5175
</GroupBox>
5276
</Grid>
@@ -86,9 +110,17 @@
86110
<ColumnDefinition></ColumnDefinition>
87111
</Grid.ColumnDefinitions>
88112
<Label>Character set:</Label>
89-
<TextBox x:Name="TxtCharacterSet" Grid.Row="0" Grid.Column="1"></TextBox>
113+
<TextBox x:Name="TxtCharacterSet" Grid.Row="0" Grid.Column="1">
114+
<TextBox.ToolTip>
115+
<ToolTip Content="The character set is a collection of characters that will be used to generate a password."></ToolTip>
116+
</TextBox.ToolTip>
117+
</TextBox>
90118
<Label Grid.Row="1" Grid.Column="0">Random seed:</Label>
91-
<syncfusion:IntegerTextBox x:Name="TxtRandomSeed" Grid.Row="1" Grid.Column="1"></syncfusion:IntegerTextBox>
119+
<syncfusion:IntegerTextBox x:Name="TxtRandomSeed" Grid.Row="1" Grid.Column="1">
120+
<syncfusion:IntegerTextBox.ToolTip>
121+
<ToolTip Content="The seed is used to generate random passwords."></ToolTip>
122+
</syncfusion:IntegerTextBox.ToolTip>
123+
</syncfusion:IntegerTextBox>
92124
</Grid>
93125
</Grid>
94126
</GroupBox>
@@ -142,8 +174,8 @@
142174
<ColumnDefinition></ColumnDefinition>
143175
<ColumnDefinition></ColumnDefinition>
144176
</Grid.ColumnDefinitions>
145-
<Button Content="Generate" Click="BtnGenerate_Click"></Button>
146-
<Button Grid.Column="1" Content=" Export" Click="BtnExport_Click" ></Button>
177+
<Button Margin="5" Content="Generate" Click="BtnGenerate_Click"></Button>
178+
<Button Margin="5" Grid.Column="1" Content=" Export" Click="BtnExport_Click" ></Button>
147179
</Grid>
148180
</Grid>
149181
</syncfusion:TabItemExt>
@@ -166,8 +198,8 @@
166198
<RowDefinition></RowDefinition>
167199
<RowDefinition></RowDefinition>
168200
</Grid.RowDefinitions>
169-
<ProgressBar x:Name="PgbStrength" Grid.Row="0" Maximum="5" Height="20"></ProgressBar>
170-
<Button Grid.Row="1" Content="Advise" Click="BtnAdvise_Click"></Button>
201+
<ProgressBar Margin="5" x:Name="PgbStrength" Grid.Row="0" Maximum="5" Height="20"></ProgressBar>
202+
<Button Margin="5" Grid.Row="1" Content="Advise" Click="BtnAdvise_Click"></Button>
171203
</Grid>
172204
</Grid>
173205
</syncfusion:TabItemExt>

‎Advanced PassGen/Windows/MainWindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private async void BtnGenerate_Click(object sender, RoutedEventArgs e)
127127
}
128128
if (ChbSpecialCharacters.IsChecked != null && ChbSpecialCharacters.IsChecked.Value)
129129
{
130-
charSet += "=+-<>(){}[]!?.,;:/%^*$€£&µ@#";
130+
charSet += "=+-_<>(){}[]!?.,;:/%^*$€£&µ@#";
131131
}
132132
if (ChbNumbers.IsChecked != null && ChbNumbers.IsChecked.Value)
133133
{

‎Advanced PassGen/Windows/SettingsWindow.xaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<RowDefinition Height="Auto"></RowDefinition>
2121
<RowDefinition Height="Auto"></RowDefinition>
2222
</Grid.RowDefinitions>
23-
<CheckBox x:Name="ChbAutoUpdate" Content="Automatically check for updates"></CheckBox>
24-
<CheckBox Grid.Row="1" x:Name="ChbPasswordStrength" Content="Show password strength"></CheckBox>
23+
<CheckBox Margin="2" x:Name="ChbAutoUpdate" Content="Automatically check for updates"></CheckBox>
24+
<CheckBox Margin="2" Grid.Row="1" x:Name="ChbPasswordStrength" Content="Show password strength"></CheckBox>
2525
<Grid Grid.Row="2">
2626
<Grid.ColumnDefinitions>
2727
<ColumnDefinition></ColumnDefinition>
@@ -44,7 +44,7 @@
4444
<ColumnDefinition Width="Auto"></ColumnDefinition>
4545
</Grid.ColumnDefinitions>
4646
<Label Content="Style:"></Label>
47-
<ComboBox x:Name="ChbStyle" SelectedValuePath="Content" Grid.Row="0" Grid.Column="1" IsReadOnly="True">
47+
<ComboBox Margin="2" x:Name="ChbStyle" SelectedValuePath="Content" Grid.Row="0" Grid.Column="1" IsReadOnly="True">
4848
<ComboBoxItem>Metro</ComboBoxItem>
4949
<ComboBoxItem>Blend</ComboBoxItem>
5050
<ComboBoxItem>VS2010</ComboBoxItem>
@@ -61,9 +61,9 @@
6161
<ComboBoxItem>Transparent</ComboBoxItem>
6262
</ComboBox>
6363
<Label Grid.Row="1" Grid.Column="0" Content="Metro brush:"></Label>
64-
<syncfusion:ColorPicker x:Name="CpMetroBrush" Grid.Row="1" Grid.Column="1" />
64+
<syncfusion:ColorPicker Margin="2" x:Name="CpMetroBrush" Grid.Row="1" Grid.Column="1" />
6565
<Label Grid.Row="2" Grid.Column="0">Border thickness:</Label>
66-
<syncfusion:IntegerTextBox x:Name="TxtBorderThickness" Grid.Row="2" Grid.Column="1" MinValue="1"></syncfusion:IntegerTextBox>
66+
<syncfusion:IntegerTextBox Margin="2" x:Name="TxtBorderThickness" Grid.Row="2" Grid.Column="1" MinValue="1"></syncfusion:IntegerTextBox>
6767
</Grid>
6868
</syncfusion:TabItemExt>
6969
<syncfusion:TabItemExt Header="Advanced" Image="/Advanced PassGen;component/Resources/Images/advanced.png" ImageHeight="16" ImageWidth="16">
@@ -73,8 +73,8 @@
7373
<RowDefinition Height="Auto"></RowDefinition>
7474
<RowDefinition Height="Auto"></RowDefinition>
7575
</Grid.RowDefinitions>
76-
<CheckBox x:Name="ChbExportLength" Content="Export length field"></CheckBox>
77-
<CheckBox x:Name="ChbExportStrength" Grid.Row="1" Content="Export strength field"></CheckBox>
76+
<CheckBox Margin="2" x:Name="ChbExportLength" Content="Export length field"></CheckBox>
77+
<CheckBox Margin="2" x:Name="ChbExportStrength" Grid.Row="1" Content="Export strength field"></CheckBox>
7878
<Grid Grid.Row="2">
7979
<Grid.ColumnDefinitions>
8080
<ColumnDefinition></ColumnDefinition>
@@ -112,9 +112,9 @@
112112
<ColumnDefinition></ColumnDefinition>
113113
<ColumnDefinition></ColumnDefinition>
114114
</Grid.ColumnDefinitions>
115-
<Button Content="Update" Click="BtnUpdate_Click"></Button>
116-
<Button Grid.Column="1" Content="Website" Click="BtnWebsite_Click"></Button>
117-
<Button Grid.Column="2" Content="License" Click="BtnLicense_Click"></Button>
115+
<Button Margin="3" Content="Update" Click="BtnUpdate_Click"></Button>
116+
<Button Margin="3" Grid.Column="1" Content="Website" Click="BtnWebsite_Click"></Button>
117+
<Button Margin="3" Grid.Column="2" Content="License" Click="BtnLicense_Click"></Button>
118118
</Grid>
119119
</Grid>
120120
</syncfusion:TabItemExt>
@@ -124,8 +124,8 @@
124124
<ColumnDefinition></ColumnDefinition>
125125
<ColumnDefinition></ColumnDefinition>
126126
</Grid.ColumnDefinitions>
127-
<Button Content="Reset all settings" Click="BtnReset_Click"></Button>
128-
<Button Grid.Column="1" Click="BtnSave_Click">Save</Button>
127+
<Button Margin="5" Content="Reset all settings" Click="BtnReset_Click" MinHeight="25"></Button>
128+
<Button Margin="5" Grid.Column="1" Click="BtnSave_Click" MinHeight="25">Save</Button>
129129
</Grid>
130130
</Grid>
131131
</syncfusion:ChromelessWindow>

0 commit comments

Comments
 (0)