Ver código fonte

Изменили название окна

lizka.flex@outlook.com 2 anos atrás
pai
commit
34c6ee794d

+ 20 - 0
Muzzle.sln

@@ -10,17 +10,37 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Debug|x64.Build.0 = Debug|Any CPU
+		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Debug|x86.Build.0 = Debug|Any CPU
 		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Release|x64.ActiveCfg = Release|Any CPU
+		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Release|x64.Build.0 = Release|Any CPU
+		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Release|x86.ActiveCfg = Release|Any CPU
+		{1C1DDB2D-3B35-4FD3-A9ED-A4FF6F51571B}.Release|x86.Build.0 = Release|Any CPU
 		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Debug|x64.Build.0 = Debug|Any CPU
+		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Debug|x86.Build.0 = Debug|Any CPU
 		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Release|x64.ActiveCfg = Release|Any CPU
+		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Release|x64.Build.0 = Release|Any CPU
+		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Release|x86.ActiveCfg = Release|Any CPU
+		{33C3F830-3566-4674-AF94-AA4F7B02852E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 21 - 18
Muzzle/Update.xaml → Muzzle/Add.xaml

@@ -1,45 +1,48 @@
-<Window x:Class="Muzzle.Update"
+<Window x:Class="Muzzle.Add"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Muzzle"
         mc:Ignorable="d"
-        Title="Добавление продукции" Height="450" Width="800">
+        Title="Add" Height="450" Width="800">
     <Grid>
-        <StackPanel Orientation="Vertical">
+        <StackPanel Orientation = "Vertical" >
             <StackPanel Orientation="Horizontal">
-                <Label Content="Артикул"></Label>
+                <Label Content = "Артикул" ></Label>
                 <TextBox Width="100" Height="15"></TextBox>
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
+            <StackPanel Orientation = "Horizontal" >
                 <Label Content="Наименование"></Label>
-                <TextBox Width="100" Height="15"></TextBox>
+                <TextBox Width = "100" Height="15"></TextBox>
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
+            <StackPanel Orientation = "Horizontal" >
                 <Label Content="Тип продукта"></Label>
-                <ComboBox Width="150" Height="15"></ComboBox>
+                <ComboBox Width = "150" Height="15"></ComboBox>
             </StackPanel>
-            <StackPanel Orientation="Horizontal"> 
+            <StackPanel Orientation = "Horizontal" >
                 <Label Content="Изображение"></Label>
                 <Button x:Name="btnImage" Content="Загрузить изображение" Width="150" Height="20"></Button>
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
+            <StackPanel Orientation = "Horizontal" >
                 <Label Content="Количество человек для производства"></Label>
-                <TextBox Width="100" Height="15"></TextBox>
+                <TextBox Width = "100" Height="15"></TextBox>
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
+            <StackPanel Orientation = "Horizontal" >
                 <Label Content="Номер производственого цеха"></Label>
-                <TextBox Width="100" Height="15"></TextBox>
+                <TextBox Width = "100" Height="15"></TextBox>
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
+            <StackPanel Orientation = "Horizontal" >
                 <Label Content="Минимальная стоимость для агента"></Label>
-                <TextBox Width="100" Height="15"></TextBox>
+                <TextBox Width = "100" Height="15"></TextBox>
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
+            <StackPanel Orientation = "Horizontal" >
                 <Label Content="Описание"></Label>
-                <TextBox Width="300" Height="100"></TextBox>
+                <TextBox Width = "300" Height="100"></TextBox>
+            </StackPanel>
+            <StackPanel>
+                <Button x:Name="btnNaz" Content="Назад" Width="100" Height="20" HorizontalAlignment="Left" Margin="10" Click="btnNaz_Click"></Button>
             </StackPanel>
         </StackPanel>
     </Grid>
-</Window>
+</Window>

+ 12 - 3
Muzzle/Update.xaml.cs → Muzzle/Add.xaml.cs

@@ -15,13 +15,22 @@ using System.Windows.Shapes;
 namespace Muzzle
 {
     /// <summary>
-    /// Логика взаимодействия для Update.xaml
+    /// Логика взаимодействия для Add.xaml
     /// </summary>
-    public partial class Update : Window
+    public partial class Add : Window
     {
-        public Update()
+        public static class Products
+        {
+            public static Frame frm;
+        }
+        public Add()
         {
             InitializeComponent();
         }
+
+        private void btnNaz_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
     }
 }

+ 7 - 7
Muzzle/Muzzle.csproj

@@ -67,6 +67,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Add.xaml.cs">
+      <DependentUpon>Add.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Agent.cs">
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>
@@ -115,9 +118,10 @@
     <Compile Include="sysdiagrams.cs">
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>
-    <Compile Include="Update.xaml.cs">
-      <DependentUpon>Update.xaml</DependentUpon>
-    </Compile>
+    <Page Include="Add.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\Main.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -147,10 +151,6 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Update.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">

+ 3 - 3
Muzzle/Pages/Main.xaml

@@ -53,11 +53,11 @@
                 <ComboBoxItem Content="Минимальная стоимость (по убыванию)"/>
             </ComboBox>
             <ComboBox x:Name="You" Width="190" Height="20" Margin="10,0,0,0" SelectionChanged="ComboBox_SelectionChanged"/>
-            <Button x:Name="btnDobby" Content="Добавить продукцию" Width="130" Height="20" Margin="10,0,0,0" Click="btnDobby_Click"></Button>
+            
         </StackPanel>
         <ListBox x:Name="listBoxNamordnik" Grid.Row="1" ItemTemplate="{StaticResource NamordnikInfo}"/>
-        <StackPanel Grid.Row="2">
-            <Button x:Name="btnNaz" Content="Назад" Width="100" Height="20" HorizontalAlignment="Left" Margin="10" Click="btnNaz_Click"></Button>
+        <StackPanel Grid.Row="2" Margin="0,10,0,0">
+            <Button x:Name="btnDobby" Content="Добавить продукцию" Width="130" Height="20" Margin="0" Click="btnDobby_Click"></Button>
         </StackPanel>
     </Grid>
 </Page>

+ 3 - 6
Muzzle/Pages/Main.xaml.cs

@@ -133,15 +133,12 @@ namespace Muzzle
             }
         }
 
-        private void btnNaz_Click(object sender, RoutedEventArgs e)
-        {
-            //Products.frm.GoBack();
-        }
+
 
         private void btnDobby_Click(object sender, RoutedEventArgs e)
         {
-            Update update = new Update();
-            update.ShowDialog();
+            Add add = new Add();
+            add.ShowDialog();
 
         }
     }       

+ 5 - 1
WSUniversalLib/Calculation.cs

@@ -10,7 +10,11 @@ namespace WSUniversalLib
     {
         public void GetQuantityForProduct(int productType, int materialType, int count, float width, float length)
         {
-            return;   
+            return;
         }
+
+         
+
+
     }
 }