Skip to content

Commit 5c1aa9c

Browse files
RenatGaliewRenatGaliew
committed
Добавлена другая кнопка начала. добавлена проверка на существуемость директории
1 parent 950b995 commit 5c1aa9c

File tree

10 files changed

+92
-69
lines changed

10 files changed

+92
-69
lines changed

‎WpfApplication1/Dictionary.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class Dictionary
1515
/// Переменная обозначающая паузу
1616
/// </summary>
1717
public bool pause = false;
18-
1918
/// <summary>
2019
/// Список слов
2120
/// </summary>

‎WpfApplication1/MainWindow.xaml‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,43 @@
88
Title="Словарь" Height="435.525" Width="583" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Closed="Window_Closed">
99
<Grid HorizontalAlignment="Left" Height="393" Margin="10,10,0,0" VerticalAlignment="Top" Width="563">
1010
<Grid.ColumnDefinitions>
11-
<ColumnDefinition Width="6*"/>
12-
<ColumnDefinition Width="499*"/>
11+
<ColumnDefinition Width="7*"/>
12+
<ColumnDefinition Width="465*"/>
13+
<ColumnDefinition Width="91*"/>
1314
</Grid.ColumnDefinitions>
14-
<TextBox x:Name="tbDirectoryName" HorizontalAlignment="Left" Height="20" Margin="85,14,0,0" TextWrapping="Wrap" Text="tbDirectoryName" VerticalAlignment="Top" Width="376" Background="LightGray" Grid.Column="1"/>
15-
<Button x:Name="btnViewDirectory" Content="Обзор..." Grid.Column="1" HorizontalAlignment="Left" Margin="466,13,0,0" VerticalAlignment="Top" Width="75" Click="btnViewDirectory_Click" Height="20"/>
15+
<TextBox x:Name="tbDirectoryName" HorizontalAlignment="Left" Height="20" Margin="43,14,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="418" Background="LightGray" Grid.Column="1" IsReadOnlyCaretVisible="True" Text="null"/>
16+
<Button x:Name="btnViewDirectory" Content="Обзор..." Grid.Column="2" HorizontalAlignment="Left" Margin="1,13,0,0" VerticalAlignment="Top" Width="75" Click="btnViewDirectory_Click" Height="20"/>
1617
<GroupBox x:Name="groupBox" Header="Имена текстовых файлов" HorizontalAlignment="Left" Margin="2,66,0,0" VerticalAlignment="Top" Height="135" Width="276" Grid.ColumnSpan="2">
1718
<ListBox x:Name="lboxNameFiles" Height="98" Margin="0,10,-2,0" Width="266" HorizontalAlignment="Left" VerticalAlignment="Top" VerticalContentAlignment="Top" SelectionChanged="lboxNameFiles_SelectionChanged"/>
1819
</GroupBox>
19-
<Button x:Name="btnStart" Content="Запустить сканирование" Grid.Column="1" HorizontalAlignment="Left" Margin="398,41,0,0" VerticalAlignment="Top" Width="143" Height="20" RenderTransformOrigin="0.497,0.381" Click="btnStart_Click"/>
20+
<Button x:Name="btnStart" Content="►" Grid.Column="2" HorizontalAlignment="Left" Margin="1,44,0,0" VerticalAlignment="Top" Width="75" Height="22" RenderTransformOrigin="0.5,0.5" Click="btnStart_Click" FontFamily="Times New Roman" HorizontalContentAlignment="Center" FontSize="18" VerticalContentAlignment="Stretch" Foreground="Black">
21+
<Button.RenderTransform>
22+
<TransformGroup>
23+
<ScaleTransform ScaleY="1" ScaleX="1"/>
24+
<SkewTransform AngleY="0" AngleX="0"/>
25+
<RotateTransform Angle="0"/>
26+
<TranslateTransform/>
27+
</TransformGroup>
28+
</Button.RenderTransform>
29+
<Button.Background>
30+
<LinearGradientBrush EndPoint="0.5,1" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
31+
<GradientStop Color="#FF172AEE"/>
32+
<GradientStop Color="#FF2EFB36" Offset="1"/>
33+
</LinearGradientBrush>
34+
</Button.Background>
35+
</Button>
2036
<GroupBox x:Name="groupBox1" Header="Словарь" HorizontalAlignment="Left" Margin="5,206,0,0" VerticalAlignment="Top" Height="183" Width="190" Grid.ColumnSpan="2">
2137
<ListBox x:Name="lboxWords" HorizontalAlignment="Left" Height="146" Margin="0,10,-2,0" VerticalAlignment="Top" Width="180" SelectionChanged="SelectionIndexChanged"/>
2238
</GroupBox>
2339
<Label x:Name="label" Content="Количество:" Grid.Column="1" HorizontalAlignment="Left" Margin="194,234,0,0" VerticalAlignment="Top"/>
24-
<TextBox x:Name="tbCount" Grid.Column="1" HorizontalAlignment="Left" Height="23" Margin="276,236,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="265" IsReadOnlyCaretVisible="True"/>
40+
<TextBox x:Name="tbCount" Grid.Column="1" HorizontalAlignment="Left" Height="23" Margin="276,236,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="265" IsReadOnlyCaretVisible="True" Grid.ColumnSpan="2"/>
2541
<Label x:Name="label_Copy" Content="Количество слов в словаре:" Grid.Column="1" HorizontalAlignment="Left" Margin="194,265,0,0" VerticalAlignment="Top" Height="29"/>
26-
<TextBox x:Name="tbCount_Copy" Grid.Column="1" HorizontalAlignment="Left" Height="23" Margin="357,267,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="184" IsReadOnlyCaretVisible="True"/>
42+
<TextBox x:Name="tbCount_Copy" Grid.Column="1" HorizontalAlignment="Left" Height="23" Margin="357,267,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="184" IsReadOnlyCaretVisible="True" Grid.ColumnSpan="2"/>
2743
<Label x:Name="lblkol" Content="Слово:" Grid.Column="1" HorizontalAlignment="Left" Margin="193,206,0,0" VerticalAlignment="Top" Height="29"/>
28-
<TextBox x:Name="tbWord" Grid.Column="1" HorizontalAlignment="Left" Height="23" Margin="276,208,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="265" IsReadOnlyCaretVisible="True"/>
29-
<GroupBox x:Name="groupBox2" Grid.Column="1" Header="Содержимое файла" HorizontalAlignment="Left" Margin="276,66,0,0" VerticalAlignment="Top" Height="135" Width="265">
30-
<TextBox x:Name="tbContain" HorizontalAlignment="Left" Height="99" Margin="0,10,-2,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="255" Cursor="IBeam" IsReadOnlyCaretVisible="True"/>
44+
<TextBox x:Name="tbWord" Grid.Column="1" HorizontalAlignment="Left" Height="23" Margin="276,208,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="265" IsReadOnlyCaretVisible="True" Grid.ColumnSpan="2"/>
45+
<GroupBox x:Name="groupBox2" Grid.Column="1" Header="Содержимое файла" HorizontalAlignment="Left" Margin="276,66,0,0" VerticalAlignment="Top" Height="135" Width="265" Grid.ColumnSpan="2">
46+
<TextBox x:Name="tbContain" HorizontalAlignment="Left" Height="99" Margin="0,10,-2,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="255" Cursor="IBeam" IsReadOnlyCaretVisible="True" HorizontalScrollBarVisibility="Visible"/>
3147
</GroupBox>
32-
<Label x:Name="label1" Content="Путь к папке:" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0" VerticalAlignment="Top" Width="130"/>
48+
<Label x:Name="label1" Content="Путь:" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0" VerticalAlignment="Top" Width="38"/>
3349
</Grid>
3450
</Window>

‎WpfApplication1/MainWindow.xaml.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ private void InitialPath()
6969
{
7070
tbDirectoryName.Text = Directory.GetCurrentDirectory();
7171
Path = Directory.GetCurrentDirectory();
72-
7372
}
7473

7574
/// <summary>
@@ -135,9 +134,12 @@ private void btnViewDirectory_Click(object sender, RoutedEventArgs e)
135134

136135
private void btnStart_Click(object sender, RoutedEventArgs e)
137136
{
138-
MyDict = new Dictionary(Path, FilesNames, MyMutex);
139-
MyDict.Start();
140-
//InitialWords(MyDict);
137+
if (Directory.Exists(Path))
138+
{
139+
InitialFiles();
140+
MyDict = new Dictionary(Path, FilesNames, MyMutex);
141+
MyDict.Start();
142+
}
141143
}
142144

143145
private void button_Click(object sender, RoutedEventArgs e)

‎WpfApplication1/bin/Debug/WpfApplication1.vshost.exe.manifest‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎WpfApplication1/obj/Debug/MainWindow.baml‎

640 Bytes
Binary file not shown.

‎WpfApplication1/obj/Debug/MainWindow.g.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#pragma checksum "..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "330E319A5C010E2E294FFA722B426261"
1+
#pragma checksum "..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "549CBF6826C308F9CFE10DDEABA3147D"
22
//------------------------------------------------------------------------------
33
// <auto-generated>
44
// Этот код создан программой.
@@ -41,127 +41,127 @@ namespace WpfApplication1 {
4141
public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
4242

4343

44-
#line 14 "..\..\MainWindow.xaml"
44+
#line 15 "..\..\MainWindow.xaml"
4545
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
4646
internal System.Windows.Controls.TextBox tbDirectoryName;
4747

4848
#line default
4949
#line hidden
5050

5151

52-
#line 15 "..\..\MainWindow.xaml"
52+
#line 16 "..\..\MainWindow.xaml"
5353
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
5454
internal System.Windows.Controls.Button btnViewDirectory;
5555

5656
#line default
5757
#line hidden
5858

5959

60-
#line 16 "..\..\MainWindow.xaml"
60+
#line 17 "..\..\MainWindow.xaml"
6161
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
6262
internal System.Windows.Controls.GroupBox groupBox;
6363

6464
#line default
6565
#line hidden
6666

6767

68-
#line 17 "..\..\MainWindow.xaml"
68+
#line 18 "..\..\MainWindow.xaml"
6969
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
7070
internal System.Windows.Controls.ListBox lboxNameFiles;
7171

7272
#line default
7373
#line hidden
7474

7575

76-
#line 19 "..\..\MainWindow.xaml"
76+
#line 20 "..\..\MainWindow.xaml"
7777
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
7878
internal System.Windows.Controls.Button btnStart;
7979

8080
#line default
8181
#line hidden
8282

8383

84-
#line 20 "..\..\MainWindow.xaml"
84+
#line 36 "..\..\MainWindow.xaml"
8585
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
8686
internal System.Windows.Controls.GroupBox groupBox1;
8787

8888
#line default
8989
#line hidden
9090

9191

92-
#line 21 "..\..\MainWindow.xaml"
92+
#line 37 "..\..\MainWindow.xaml"
9393
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
9494
internal System.Windows.Controls.ListBox lboxWords;
9595

9696
#line default
9797
#line hidden
9898

9999

100-
#line 23 "..\..\MainWindow.xaml"
100+
#line 39 "..\..\MainWindow.xaml"
101101
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
102102
internal System.Windows.Controls.Label label;
103103

104104
#line default
105105
#line hidden
106106

107107

108-
#line 24 "..\..\MainWindow.xaml"
108+
#line 40 "..\..\MainWindow.xaml"
109109
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
110110
internal System.Windows.Controls.TextBox tbCount;
111111

112112
#line default
113113
#line hidden
114114

115115

116-
#line 25 "..\..\MainWindow.xaml"
116+
#line 41 "..\..\MainWindow.xaml"
117117
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
118118
internal System.Windows.Controls.Label label_Copy;
119119

120120
#line default
121121
#line hidden
122122

123123

124-
#line 26 "..\..\MainWindow.xaml"
124+
#line 42 "..\..\MainWindow.xaml"
125125
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
126126
internal System.Windows.Controls.TextBox tbCount_Copy;
127127

128128
#line default
129129
#line hidden
130130

131131

132-
#line 27 "..\..\MainWindow.xaml"
132+
#line 43 "..\..\MainWindow.xaml"
133133
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
134134
internal System.Windows.Controls.Label lblkol;
135135

136136
#line default
137137
#line hidden
138138

139139

140-
#line 28 "..\..\MainWindow.xaml"
140+
#line 44 "..\..\MainWindow.xaml"
141141
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
142142
internal System.Windows.Controls.TextBox tbWord;
143143

144144
#line default
145145
#line hidden
146146

147147

148-
#line 29 "..\..\MainWindow.xaml"
148+
#line 45 "..\..\MainWindow.xaml"
149149
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
150150
internal System.Windows.Controls.GroupBox groupBox2;
151151

152152
#line default
153153
#line hidden
154154

155155

156-
#line 30 "..\..\MainWindow.xaml"
156+
#line 46 "..\..\MainWindow.xaml"
157157
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
158158
internal System.Windows.Controls.TextBox tbContain;
159159

160160
#line default
161161
#line hidden
162162

163163

164-
#line 32 "..\..\MainWindow.xaml"
164+
#line 48 "..\..\MainWindow.xaml"
165165
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
166166
internal System.Windows.Controls.Label label1;
167167

@@ -212,7 +212,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
212212
case 3:
213213
this.btnViewDirectory = ((System.Windows.Controls.Button)(target));
214214

215-
#line 15 "..\..\MainWindow.xaml"
215+
#line 16 "..\..\MainWindow.xaml"
216216
this.btnViewDirectory.Click += new System.Windows.RoutedEventHandler(this.btnViewDirectory_Click);
217217

218218
#line default
@@ -224,7 +224,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
224224
case 5:
225225
this.lboxNameFiles = ((System.Windows.Controls.ListBox)(target));
226226

227-
#line 17 "..\..\MainWindow.xaml"
227+
#line 18 "..\..\MainWindow.xaml"
228228
this.lboxNameFiles.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.lboxNameFiles_SelectionChanged);
229229

230230
#line default
@@ -233,7 +233,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
233233
case 6:
234234
this.btnStart = ((System.Windows.Controls.Button)(target));
235235

236-
#line 19 "..\..\MainWindow.xaml"
236+
#line 20 "..\..\MainWindow.xaml"
237237
this.btnStart.Click += new System.Windows.RoutedEventHandler(this.btnStart_Click);
238238

239239
#line default
@@ -245,7 +245,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
245245
case 8:
246246
this.lboxWords = ((System.Windows.Controls.ListBox)(target));
247247

248-
#line 21 "..\..\MainWindow.xaml"
248+
#line 37 "..\..\MainWindow.xaml"
249249
this.lboxWords.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionIndexChanged);
250250

251251
#line default

0 commit comments

Comments
 (0)