diff --git a/MainWindow.xaml b/MainWindow.xaml index da13e4e..5c308df 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -68,8 +68,8 @@ - - + + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 6fc35e6..d180f19 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -78,11 +78,17 @@ namespace SunlightCentralizedControlManagement_SCCM_ { } + private void ListViewItem_Whole(object sender, MouseButtonEventArgs e) + { + Picture.Content = new View.Whole(); + } private void Buttonhelp_Click(object sender, RoutedEventArgs e) { WindowsView.Help help_page = new WindowsView.Help(); help_page.Show(); } + + } } diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index a3c3c2c..07d3f6d 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -222,15 +222,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } - /// - /// 查找类似 Bottom 的本地化字符串。 - /// - public static string Bottom1 { - get { - return ResourceManager.GetString("Bottom1", resourceCulture); - } - } - /// /// 查找类似 CallDistribution 的本地化字符串。 /// @@ -600,15 +591,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } - /// - /// 查找类似 Dyelot 的本地化字符串。 - /// - public static string Dyelot1 { - get { - return ResourceManager.GetString("Dyelot1", resourceCulture); - } - } - /// /// 查找类似 edit 的本地化字符串。 /// @@ -1158,6 +1140,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 message 的本地化字符串。 + /// + public static string message { + get { + return ResourceManager.GetString("message", resourceCulture); + } + } + /// /// 查找类似 Mid-waterlevel 的本地化字符串。 /// @@ -1329,6 +1320,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 orders 的本地化字符串。 + /// + public static string orders { + get { + return ResourceManager.GetString("orders", resourceCulture); + } + } + /// /// 查找类似 OutTheCloth 的本地化字符串。 /// @@ -1554,6 +1554,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 process 的本地化字符串。 + /// + public static string process { + get { + return ResourceManager.GetString("process", resourceCulture); + } + } + /// /// 查找类似 The process does not exist 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index e70f019..90fb965 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -840,15 +840,9 @@ Dyelot - - Dyelot - Bottom - - Bottom - MINIMIZED @@ -864,4 +858,10 @@ Whole + + Process + + + Message + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index f3ef7bc..bb7fdeb 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -840,15 +840,9 @@ Dyelot - - Dyelot - Bottom - - Bottom - Minimize @@ -864,4 +858,13 @@ Whole + + process + + + message + + + orders + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 4d17e73..1c5d0ff 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -840,15 +840,9 @@ 领料单 - - 领料单 - 底 - - 底 - 最小化 @@ -864,4 +858,13 @@ 全局 + + 工艺 + + + 信息 + + + 工单 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index be36650..cd3c72f 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -840,15 +840,9 @@ 領料單 - - 領料單 - 底 - - 底 - 最小化 @@ -864,4 +858,10 @@ 幫助 + + 工藝 + + + 訊息 + \ No newline at end of file diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj index caef07f..23c0d82 100644 --- a/SunlightCentralizedControlManagement_SCCM_.csproj +++ b/SunlightCentralizedControlManagement_SCCM_.csproj @@ -96,6 +96,9 @@ + + info.xaml + Whole.xaml @@ -120,6 +123,10 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/View/Whole.xaml b/View/Whole.xaml index 7b405f9..ac84d16 100644 --- a/View/Whole.xaml +++ b/View/Whole.xaml @@ -4,9 +4,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View" - mc:Ignorable="d" + mc:Ignorable="d" Loaded="UserControl_Loaded" d:DesignHeight="450" d:DesignWidth="800"> - + + + + + diff --git a/View/Whole.xaml.cs b/View/Whole.xaml.cs index 2c8d5f9..ef086c9 100644 --- a/View/Whole.xaml.cs +++ b/View/Whole.xaml.cs @@ -24,5 +24,44 @@ namespace SunlightCentralizedControlManagement_SCCM_.View { InitializeComponent(); } + + private void UserControl_Loaded(object sender, RoutedEventArgs e) + { + TextBox textBox = new TextBox(); + textBox.Text = "12431414"; + // textBox.HorizontalAlignment = HorizontalAlignment.Left; + // textBox.VerticalAlignment = VerticalAlignment.Top; + textBox.Background =new SolidColorBrush( Color.FromRgb(100,100,100)); + textBox.Width = 100; + textBox.Height = 200; + textBox.Margin = new Thickness( 5,5,0,0); + WholeView.Children.Add(textBox); + + TextBox textBox1 = new TextBox(); + textBox1.Text = "12431414"; + textBox1.Margin = new Thickness(5,5,0,0); + // textBox1.HorizontalAlignment = HorizontalAlignment.Left; + // textBox1.VerticalAlignment = VerticalAlignment.Top; + textBox1.Background = new SolidColorBrush(Color.FromRgb(100, 100, 100)); + textBox1.Width = 100; + textBox1.Height = 100; + WholeView.Children.Add(textBox1); + + + + + + View.info[] inf = new View.info[60]; + for (int i=1; i<50; i++) + { + inf[i] = new View.info(); + inf[i].Margin = new Thickness(5, 5, 0, 5); + inf[i].Width = 300; + inf[i].Height = 400; + inf[i].name.Text = i.ToString(); + inf[i].temp.Text = "123c"; + WholeView.Children.Add(inf[i]); + } + } } } diff --git a/View/info.xaml b/View/info.xaml new file mode 100644 index 0000000..1ff3705 --- /dev/null +++ b/View/info.xaml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + diff --git a/View/info.xaml.cs b/View/info.xaml.cs new file mode 100644 index 0000000..3e4afdd --- /dev/null +++ b/View/info.xaml.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace SunlightCentralizedControlManagement_SCCM_.View +{ + /// + /// info.xaml 的交互逻辑 + /// + public partial class info : UserControl + { + public info() + { + InitializeComponent(); + + } + } +}