From 9e5cfd2f1c0b0b470ba1bcacf1f591ab91eb889c Mon Sep 17 00:00:00 2001 From: DB p Date: Sun, 13 Nov 2022 03:27:41 +0900 Subject: [PATCH 01/46] Add messageBoxEx prototype --- Flow.Launcher/MessageBoxEx.xaml | 105 ++++++++++++++++++++++++++++ Flow.Launcher/MessageBoxEx.xaml.cs | 62 ++++++++++++++++ Flow.Launcher/SettingWindow.xaml | 10 ++- Flow.Launcher/SettingWindow.xaml.cs | 4 ++ 4 files changed, 178 insertions(+), 3 deletions(-) create mode 100644 Flow.Launcher/MessageBoxEx.xaml create mode 100644 Flow.Launcher/MessageBoxEx.xaml.cs diff --git a/Flow.Launcher/MessageBoxEx.xaml b/Flow.Launcher/MessageBoxEx.xaml new file mode 100644 index 000000000..9528b764d --- /dev/null +++ b/Flow.Launcher/MessageBoxEx.xaml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Flow.Launcher/MessageBoxEx.xaml.cs b/Flow.Launcher/MessageBoxEx.xaml.cs new file mode 100644 index 000000000..dccf8131b --- /dev/null +++ b/Flow.Launcher/MessageBoxEx.xaml.cs @@ -0,0 +1,62 @@ +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.Forms; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; +using Flow.Launcher.Core.Resource; +using YamlDotNet.Core.Tokens; + +namespace Flow.Launcher +{ + /// + /// MessageBoxEx.xaml에 대한 상호 작용 논리 + /// + public partial class MessageBoxEx : Window + { + static MessageBoxEx msgBox; + static string Button_id; + public MessageBoxEx() + { + InitializeComponent(); + } + + + public static string Show(string txtMessage, string txtTitle) + { + msgBox = new MessageBoxEx(); + msgBox.TitleTextBlock.Text = txtTitle; + msgBox.DescTextBlock.Text = txtMessage; + //msgBox.label1.Text = txtMessage; + //msgBox.Text = txtTitle; + msgBox.ShowDialog(); + return Button_id; + } + + private void BtnCancel_OnClick(object sender, RoutedEventArgs e) + { + DialogResult = false; + Close(); + } + + private void BtnAdd_OnClick(object sender, RoutedEventArgs e) + { + + Close(); + } + + private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e) + { + DialogResult = false; + Close(); + } + } +} diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 950694db5..c246db1af 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -48,10 +48,9 @@ - + - + @@ -2906,7 +2905,12 @@ Margin="0,0,12,0" Click="ClearLogFolder" Content="{Binding CheckLogFolder, UpdateSourceTrigger=PropertyChanged}" /> + - + Margin="5,0,5,0" + Click="Button_Click" + Content="{DynamicResource cancel}" /> +