Skip to content

Commit ed30b6d

Browse files
vertigravertigra
authored
Merge pull request #14 from vertigra/devel
New release 0.0.1.1 => 0.0.1.2
2 parents 9bf5aa6 + 7af0760 commit ed30b6d

18 files changed

Lines changed: 560 additions & 327 deletions

ExtendedDialogBox/DialogBox.xaml renamed to ExtendedDialogBox/DialogBoxWindow.xaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Window x:Name="dialogBox"
1+
<Window x:Name="dialogBoxWindow"
22
x:Class="ExtendedDialogBox.DialogBoxWindow"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -14,7 +14,7 @@
1414
TextOptions.TextFormattingMode="Display"
1515
TextOptions.TextRenderingMode="ClearType"
1616
UseLayoutRounding="True"
17-
Icon="{Binding WindowTitleIcon, ElementName=dialogBox}"
17+
Icon="{Binding WindowTitleIcon, ElementName=dialogBoxWindow}"
1818
MinHeight="155" MinWidth="154" Height="Auto" Width="Auto">
1919
<Grid>
2020
<Grid.RowDefinitions>
@@ -30,11 +30,11 @@
3030
HorizontalAlignment="Left"
3131
DockPanel.Dock="Left"
3232
Margin="30,0,0,0"
33-
Visibility="{Binding ImageVisiblity, ElementName=dialogBox}"
34-
Source="{Binding MessageIcon, ElementName=dialogBox}"/>
33+
Visibility="{Binding ImageVisiblity, ElementName=dialogBoxWindow}"
34+
Source="{Binding MessageIcon, ElementName=dialogBoxWindow}"/>
3535

3636
<TextBlock Name="TextBlockMessage"
37-
Text="{Binding Message, ElementName=dialogBox}"
37+
Text="{Binding Message, ElementName=dialogBoxWindow}"
3838
TextWrapping="Wrap"
3939
MaxWidth="500"
4040
Width="Auto"
@@ -48,7 +48,7 @@
4848
Background="White"
4949
MinHeight="0"
5050
Name="PasswordGrid"
51-
Visibility="{Binding PasswordBoxesGridVisiblity, ElementName=dialogBox}">
51+
Visibility="{Binding PasswordBoxesGridVisiblity, ElementName=dialogBoxWindow}">
5252
<Grid.RowDefinitions>
5353
<RowDefinition Height="*" />
5454
<RowDefinition Height="*" />
@@ -60,7 +60,7 @@
6060

6161
<Label Grid.Column="0"
6262
Grid.Row="0"
63-
Content="{Binding PasswordLabel, ElementName=dialogBox}" Margin="10 0 10 10"
63+
Content="{Binding PasswordLabel, ElementName=dialogBoxWindow}" Margin="10 0 10 10"
6464
VerticalAlignment="Center"/>
6565

6666
<PasswordBox Grid.Row="0"
@@ -75,8 +75,8 @@
7575

7676
<Label Grid.Column="0"
7777
Grid.Row="1"
78-
Content="{Binding PasswordConfirmationLabel, ElementName=dialogBox}" Margin="10 0 10 10"
79-
Visibility="{Binding PasswordConfirmationInputBoxVisiblitiy, ElementName=dialogBox}"
78+
Content="{Binding PasswordConfirmationLabel, ElementName=dialogBoxWindow}" Margin="10 0 10 10"
79+
Visibility="{Binding PasswordConfirmationInputBoxVisiblitiy, ElementName=dialogBoxWindow}"
8080
VerticalAlignment="Center"/>
8181

8282
<PasswordBox Grid.Row="1"
@@ -87,7 +87,7 @@
8787
Width="Auto"
8888
VerticalAlignment="Center"
8989
Margin="10 0 10 10"
90-
Visibility="{Binding PasswordConfirmationInputBoxVisiblitiy, ElementName=dialogBox}"
90+
Visibility="{Binding PasswordConfirmationInputBoxVisiblitiy, ElementName=dialogBoxWindow}"
9191
TextBlock.TextAlignment="Right"/>
9292

9393
</Grid>
@@ -104,14 +104,14 @@
104104
HorizontalAlignment="Right"
105105
DockPanel.Dock="Right"
106106
IsCancel="True"
107-
Command="{ Binding ButtonCommand, ElementName=dialogBox }"
107+
Command="{ Binding ButtonCommand, ElementName=dialogBoxWindow }"
108108
CommandParameter="Cancel"
109-
Visibility="{ Binding CancelButtonVisiblity, ElementName=dialogBox }" >
109+
Visibility="{ Binding CancelButtonVisiblity, ElementName=dialogBoxWindow }" >
110110

111111
<Label
112112
Name="LabelCancel"
113113
Padding="0" Margin="10,0"
114-
Content="{Binding CancelButtonLabel, ElementName=dialogBox}"/>
114+
Content="{Binding CancelButtonLabel, ElementName=dialogBoxWindow }"/>
115115
</Button>
116116
<!-- End Cancel Button -->
117117

@@ -123,14 +123,14 @@
123123
Margin="5,0"
124124
HorizontalAlignment="Right"
125125
DockPanel.Dock="Right"
126-
Command="{ Binding ButtonCommand, ElementName=dialogBox }"
126+
Command="{ Binding ButtonCommand, ElementName=dialogBoxWindow }"
127127
CommandParameter="No"
128-
Visibility="{ Binding NoButtonVisiblity, ElementName=dialogBox }" >
128+
Visibility="{ Binding NoButtonVisiblity, ElementName=dialogBoxWindow }" >
129129

130130
<Label Name="LabelNo"
131131
Padding="0"
132132
Margin="10,0"
133-
Content="{Binding NoButtonLabel, ElementName=dialogBox}" />
133+
Content="{Binding NoButtonLabel, ElementName=dialogBoxWindow }" />
134134
</Button>
135135
<!-- End No Button -->
136136

@@ -142,14 +142,14 @@
142142
Margin="35,0,5,0"
143143
HorizontalAlignment="Right"
144144
DockPanel.Dock="Right"
145-
Command="{ Binding ButtonCommand, ElementName=dialogBox }"
145+
Command="{ Binding ButtonCommand, ElementName=dialogBoxWindow }"
146146
CommandParameter="Yes"
147-
Visibility="{ Binding YesButtonVisiblity, ElementName=dialogBox }" >
147+
Visibility="{ Binding YesButtonVisiblity, ElementName=dialogBoxWindow }" >
148148

149149
<Label Name="LabelYes"
150150
Padding="0"
151151
Margin="10,0"
152-
Content="{Binding YesButtonLabel, ElementName=dialogBox}" />
152+
Content="{Binding YesButtonLabel, ElementName=dialogBoxWindow }" />
153153
</Button>
154154
<!-- End Yes Button -->
155155

@@ -160,14 +160,14 @@
160160
Margin="35,0,5,0"
161161
HorizontalAlignment="Right"
162162
Height="26"
163-
Command="{ Binding ButtonCommand, ElementName=dialogBox }"
163+
Command="{ Binding ButtonCommand, ElementName=dialogBoxWindow }"
164164
CommandParameter="Ok"
165-
Visibility="{ Binding OkButtonVisiblity, ElementName=dialogBox }" >
165+
Visibility="{ Binding OkButtonVisiblity, ElementName=dialogBoxWindow }" >
166166

167167
<Label Name="LabelOk"
168168
Padding="0"
169169
Margin="10,0"
170-
Content="{Binding OkButtonLabel, ElementName=dialogBox}" />
170+
Content="{Binding OkButtonLabel, ElementName=dialogBoxWindow }" />
171171
</Button>
172172
<!-- End OK Button -->
173173

ExtendedDialogBox/DialogBox.xaml.cs renamed to ExtendedDialogBox/DialogBoxWindow.xaml.cs

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88

99
namespace ExtendedDialogBox
1010
{
11-
public sealed class DialogBox : DialogBoxWindow
11+
12+
partial class DialogBoxWindow
1213
{
13-
internal DialogBox(MessageBoxImage image)
14+
internal DialogBoxWindow(MessageBoxImage image)
1415
{
1516
InitializeComponent();
1617

@@ -41,7 +42,7 @@ private void InitControls()
4142

4243
//default contetnt for password box label
4344
PasswordLabel = "Password";
44-
PasswordConfirmationLabel = "Confirm";
45+
PasswordConfirmationLabel = "Password Confirm";
4546
}
4647

4748
#region Button Visiblity
@@ -56,7 +57,7 @@ internal Visibility CancelButtonVisiblity
5657

5758
private static readonly DependencyProperty CancelButtonVisiblityProperty =
5859
DependencyProperty.Register(nameof(CancelButtonVisiblity), typeof(Visibility),
59-
typeof(DialogBox), null);
60+
typeof(DialogBoxWindow), null);
6061

6162
#endregion
6263

@@ -70,7 +71,7 @@ internal Visibility NoButtonVisiblity
7071

7172
private static readonly DependencyProperty NoButtonVisiblityProperty =
7273
DependencyProperty.Register(nameof(NoButtonVisiblity), typeof(Visibility),
73-
typeof(DialogBox), null);
74+
typeof(DialogBoxWindow), null);
7475

7576
#endregion
7677

@@ -84,7 +85,7 @@ internal Visibility YesButtonVisiblity
8485

8586
private static readonly DependencyProperty YesButtonVisiblityProperty =
8687
DependencyProperty.Register(nameof(YesButtonVisiblity), typeof(Visibility),
87-
typeof(DialogBox), null);
88+
typeof(DialogBoxWindow), null);
8889

8990

9091
#endregion
@@ -99,7 +100,7 @@ internal Visibility OkButtonVisiblity
99100

100101
private static readonly DependencyProperty OkButtonVisiblityProperty =
101102
DependencyProperty.Register(nameof(OkButtonVisiblity), typeof(Visibility),
102-
typeof(DialogBox), null);
103+
typeof(DialogBoxWindow), null);
103104

104105
#endregion
105106

@@ -117,7 +118,7 @@ internal string CancelButtonLabel
117118

118119
private static readonly DependencyProperty CancelButtonLabelProperty =
119120
DependencyProperty.Register(nameof(CancelButtonLabel), typeof(string),
120-
typeof(DialogBox), null);
121+
typeof(DialogBoxWindow), null);
121122

122123
#endregion
123124

@@ -131,7 +132,7 @@ internal string NoButtonLabel
131132

132133
private static readonly DependencyProperty NoButtonLabelProperty =
133134
DependencyProperty.Register(nameof(NoButtonLabel), typeof(string),
134-
typeof(DialogBox), null);
135+
typeof(DialogBoxWindow), null);
135136

136137
#endregion
137138

@@ -145,7 +146,7 @@ internal string YesButtonLabel
145146

146147
private static readonly DependencyProperty YesButtonLabelProperty =
147148
DependencyProperty.Register(nameof(YesButtonLabel), typeof(string),
148-
typeof(DialogBox), null);
149+
typeof(DialogBoxWindow), null);
149150

150151
#endregion
151152

@@ -159,7 +160,7 @@ internal string OkButtonLabel
159160

160161
private static readonly DependencyProperty OkButtonLabelProperty =
161162
DependencyProperty.Register(nameof(OkButtonLabel), typeof(string),
162-
typeof(DialogBox), null);
163+
typeof(DialogBoxWindow), null);
163164

164165
#endregion
165166

@@ -177,7 +178,7 @@ internal Visibility PasswordBoxesGridVisiblity
177178

178179
private static readonly DependencyProperty PasswordBoxesGridProperty =
179180
DependencyProperty.Register(nameof(PasswordBoxesGridVisiblity), typeof(Visibility),
180-
typeof(DialogBox), null);
181+
typeof(DialogBoxWindow), null);
181182

182183
#endregion
183184

@@ -192,7 +193,7 @@ internal Visibility PasswordConfirmationInputBoxVisiblitiy
192193

193194
private static readonly DependencyProperty PasswordConfirmationInputBoxProperty =
194195
DependencyProperty.Register(nameof(PasswordConfirmationInputBoxVisiblitiy), typeof(Visibility),
195-
typeof(DialogBox), null);
196+
typeof(DialogBoxWindow), null);
196197

197198
#endregion
198199

@@ -208,7 +209,7 @@ internal string PasswordLabel
208209

209210
private static readonly DependencyProperty PasswordLabelProperty =
210211
DependencyProperty.Register(nameof(PasswordLabel), typeof(string),
211-
typeof(DialogBox), null);
212+
typeof(DialogBoxWindow), null);
212213

213214
#endregion
214215

@@ -222,7 +223,7 @@ internal string PasswordConfirmationLabel
222223

223224
private static readonly DependencyProperty PasswordConfirmationLabelProperty =
224225
DependencyProperty.Register(nameof(PasswordConfirmationLabel), typeof(string),
225-
typeof(DialogBox), null);
226+
typeof(DialogBoxWindow), null);
226227

227228
#endregion
228229

@@ -238,30 +239,30 @@ internal string Message
238239

239240
private static readonly DependencyProperty MessageProperty =
240241
DependencyProperty.Register(nameof(Message), typeof(string),
241-
typeof(DialogBox), null);
242+
typeof(DialogBoxWindow), null);
242243

243244
#endregion
244245

245246
#region DialogBox Image
246247

247248
#region ImageVisiblity
248249

249-
internal Visibility ImageVisiblity
250+
private Visibility ImageVisiblity
250251
{
251252
get { return (Visibility)GetValue(ImageVisiblityProperty); }
252253
set { SetValue(ImageVisiblityProperty, value); }
253254
}
254255

255256
private static readonly DependencyProperty ImageVisiblityProperty =
256257
DependencyProperty.Register(nameof(ImageVisiblity), typeof(Visibility),
257-
typeof(DialogBox), null);
258+
typeof(DialogBoxWindow), null);
258259

259260
#endregion
260261

261262
#region MessageImage
262263

263264
private MessageBoxImage messageImage;
264-
internal MessageBoxImage MessageImage
265+
private MessageBoxImage MessageImage
265266
{
266267
get { return messageImage; }
267268
set
@@ -277,7 +278,7 @@ internal MessageBoxImage MessageImage
277278
#region Icon
278279

279280
private Icon dialogBoxIcon;
280-
internal Icon DialogBoxIcon
281+
private Icon DialogBoxIcon
281282
{
282283
get { return dialogBoxIcon; }
283284
set
@@ -304,21 +305,21 @@ private ImageSource MessageIcon
304305

305306
private static readonly DependencyProperty MessageIconProperty =
306307
DependencyProperty.Register(nameof(MessageIcon), typeof(ImageSource),
307-
typeof(DialogBox), null);
308+
typeof(DialogBoxWindow), null);
308309

309310
#endregion
310311

311312
#region TilleIcon
312313

313314
private ImageSource WindowTitleIcon
314315
{
315-
get { return (ImageSource)GetValue (WindowTitleIconProperty); }
316+
get { return (ImageSource) GetValue (WindowTitleIconProperty); }
316317
set { SetValue(WindowTitleIconProperty, value); }
317318
}
318319

319320
private static readonly DependencyProperty WindowTitleIconProperty =
320321
DependencyProperty.Register(nameof(WindowTitleIcon), typeof(ImageSource),
321-
typeof(DialogBox), null);
322+
typeof(DialogBoxWindow), null);
322323

323324
#endregion
324325

@@ -353,7 +354,7 @@ internal RelayCommand ButtonCommand
353354

354355
private static readonly DependencyProperty ButtonCommandProperty =
355356
DependencyProperty.Register(nameof(ButtonCommand), typeof(RelayCommand),
356-
typeof(DialogBox), null);
357+
typeof(DialogBoxWindow), null);
357358

358359
#endregion
359360

‎ExtendedDialogBox/ExtendedDialogBox.csproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
26+
<DocumentationFile>
27+
</DocumentationFile>
2628
</PropertyGroup>
2729
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2830
<DebugType>pdbonly</DebugType>
@@ -42,7 +44,6 @@
4244
<Reference Include="System.Core" />
4345
<Reference Include="System.Xml.Linq" />
4446
<Reference Include="System.Data.DataSetExtensions" />
45-
<Reference Include="System.Net.Http" />
4647
<Reference Include="System.Xaml">
4748
<RequiredTargetFramework>4.0</RequiredTargetFramework>
4849
</Reference>
@@ -51,6 +52,7 @@
5152
<Reference Include="PresentationFramework" />
5253
</ItemGroup>
5354
<ItemGroup>
55+
<Compile Include="PublicDialogBox\BaseDialogBox.cs" />
5456
<Compile Include="PublicDialogBox\DialogBox.cs" />
5557
<Compile Include="PublicDialogBox\ErrorDialogBox.cs" />
5658
<Compile Include="PublicDialogBox\InformationDialogBox.cs" />
@@ -60,13 +62,13 @@
6062
<Compile Include="Utils\Extension.cs" />
6163
<Compile Include="PublicDialogBox\QuestionDialogBox.cs" />
6264
<Compile Include="Utils\IconHeleper.cs" />
63-
<Page Include="DialogBox.xaml">
65+
<Page Include="DialogBoxWindow.xaml">
6466
<Generator>MSBuild:Compile</Generator>
6567
<SubType>Designer</SubType>
6668
</Page>
6769
<Compile Include="Command\RelayCommand.cs" />
68-
<Compile Include="DialogBox.xaml.cs">
69-
<DependentUpon>DialogBox.xaml</DependentUpon>
70+
<Compile Include="DialogBoxWindow.xaml.cs">
71+
<DependentUpon>DialogBoxWindow.xaml</DependentUpon>
7072
<SubType>Code</SubType>
7173
</Compile>
7274
</ItemGroup>

‎ExtendedDialogBox/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// Можно задать все значения или принять номера сборки и редакции по умолчанию
5252
// используя "*", как показано ниже:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("0.0.1.1")]
55-
[assembly: AssemblyFileVersion("0.0.1.1")]
54+
[assembly: AssemblyVersion("0.0.1.2")]
55+
[assembly: AssemblyFileVersion("0.0.1.2")]

0 commit comments

Comments
 (0)