/

Kusach/LogWindow.xaml

@@ -48,7 +48,8 @@
             VerticalAlignment="Top" 
             Width="150" 
             Click="LogButton_Click" 
-            IsDefault="True" Height="40"/>
+            IsDefault="True"
+            Height="40"/>
         <Button 
             x:Name="RegButton" 
             Content="Регистрация" 

Kusach/MainWindow.xaml

@@ -10,7 +10,8 @@
         Height="450" 
         Width="800"
         MinHeight="450"
-        MinWidth="800">
+        MinWidth="800"
+        WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="25*" />

Kusach/MainWindow.xaml.cs

@@ -37,21 +37,21 @@ namespace Kusach
         #region LeftPanelButtons
         private void RoutesButton_Click(object sender, RoutedEventArgs e)
         {
-            MainFrame.Content = new TestPGPage();
+            MainFrame.Content = new Pages.RoutesListPage();
         }
 
         private void DriversButton_Click(object sender, RoutedEventArgs e)
         {
-
+            MainFrame.Content = new TestPGPage();
         }
         private void VehButton_Click(object sender, RoutedEventArgs e)
         {
-
+            MainFrame.Content = new TestPGPage();
         }
 
         private void UsersButton_Click(object sender, RoutedEventArgs e)
         {
-
+            MainFrame.Content = new TestPGPage();
         }
         #endregion
 

Kusach/Pages/RoutesListPage.xaml

@@ -16,7 +16,12 @@
             <RowDefinition Height="21*"/>
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal">
-            <TextBox 
+            <TextBox
+                Name="SearchBox"
+                PreviewMouseLeftButtonUp="SearchBoxPreviewMouseLeftButtonUp"
+                LostFocus="SearchLostFocus"
+                TextChanged="SearchTextChanged"
+                FontSize="14"
                 TextWrapping="Wrap"
                 Text="Поиск..." 
                 Width="120"/>
@@ -39,7 +44,7 @@
             AutoGenerateColumns="False" 
             VerticalAlignment="Top" 
             HorizontalAlignment="Left" 
-            Width="760">
+            CanUserAddRows="false">
             <DataGrid.ItemContainerStyle>
                 <Style TargetType="DataGridRow">
                     <EventSetter 
@@ -56,6 +61,7 @@
                 <DataGridTextColumn 
                     Binding="{Binding Name}" 
                     Header="Название"
+                    Width="500"
                     IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>

Kusach/Pages/RoutesListPage.xaml.cs

@@ -31,14 +31,25 @@ namespace Kusach.Pages
             trew.Show();
         }
 
-        private void Find_Click(object sender, RoutedEventArgs e)
+        #region Поиск
+        private void SearchBoxPreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
-            //if (SearchBox.Text != "")
-            //    RoutesList.ItemsSource = cnt.db.Routes.Where(item => (item.IdRoute + " " + item.Name).Contains(SearchBox.Text)).ToList();
-            //else
-            //    RoutesList.ItemsSource = cnt.db.Routes.ToList();
+            if (SearchBox.Text == "Поиск...")
+                SearchBox.Text = "";
         }
-
+        private void SearchLostFocus(object sender, RoutedEventArgs e)
+        {
+            if (SearchBox.Text == "")
+                SearchBox.Text = "Поиск...";
+        }
+        private void SearchTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (SearchBox.Text != "" && SearchBox.Text != "Поиск...")
+                RoutesList.ItemsSource = cnt.db.Routes.Where(item => (item.IdRoute + " " + item.Name).Contains(SearchBox.Text)).ToList();
+            else
+                cnt.db.Routes.ToList();
+        }
+        #endregion
         private void AddRouteButton_Click(object sender, RoutedEventArgs e)
         {
             AddRouteWindow arw = new AddRouteWindow();
@@ -52,7 +63,7 @@ namespace Kusach.Pages
 
         private void UpdateRoutesButton_Click(object sender, RoutedEventArgs e)
         {
-
+            RoutesList.ItemsSource = cnt.db.Routes.ToList();
         }
     }
 }

Kusach/TestRouteEditWindow.xaml.cs

@@ -30,6 +30,7 @@ namespace Kusach
         }
         private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
+            if(((PointsList)PointsListDataGrid.SelectedItem) != null)
             MessageBox.Show("cell: " + ((PointsList)PointsListDataGrid.SelectedItem).IdPoint);
         }
 

Kusach/Windows/AddRouteWindow.xaml

@@ -10,13 +10,14 @@
         Width="300"
         ResizeMode="NoResize"
         WindowStyle="None"
-        WindowStartupLocation="CenterScreen">
-    <Grid>
+        WindowStartupLocation="CenterScreen"
+        Loaded="OnLoad">
+    <Grid Background="#FFF7F7F7">
         <StackPanel
             Margin="0,10,0,0"
             HorizontalAlignment="Center"
             VerticalAlignment="Top">
-            <Label 
+            <Label
             Content="Название" 
             HorizontalAlignment="Left" 
             VerticalAlignment="Top" 
@@ -44,6 +45,11 @@
             VerticalAlignment="Top" 
             Height="40" 
             Width="120" 
-            Click="BackButton_Click"/>
+            Click="BackButton_Click"
+            IsDefault="True"/>
+        <Border 
+            BorderBrush="Black" 
+            BorderThickness="2"/>
+
     </Grid>
 </Window>

Kusach/Windows/AddRouteWindow.xaml.cs

@@ -29,6 +29,11 @@ namespace Kusach
             this.Close();
         }
 
+        public void OnLoad(object sender, RoutedEventArgs e)
+        {
+            RouteNameBox.Focus();
+        }
+
         private void AddUserButton_Click(object sender, RoutedEventArgs e)
         {
             if (RouteNameBox.Text == "")
@@ -44,7 +49,6 @@ namespace Kusach
                     };
                     cnt.db.Routes.Add(newRoute);
                     cnt.db.SaveChanges();
-                    MessageBox.Show("Маршрут успешно создан.");
                     this.Close();
                 }
                 catch