Commit 45dcd38c authored by Rabbit's avatar Rabbit
Browse files

修复了在没有标签的情况下创建新标签崩溃的问题 

完善分享界面
parent 766db99a

CountDownList/Class/ListCore.cs

+15 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ namespace CountDownList.Class 
        /// <exception cref="NotImplementedException"></exception>

        private void CountDown_OnShare(object? sender, EventArgs e)

        {

            throw new NotImplementedException();

            new Share((ListLabel)sender, DateTime.Now).ShowDialog();

        }



        /// <summary>
@@ -447,7 +447,20 @@ namespace CountDownList.Class 


        private void Home_OnShare(object? sender, EventArgs e)

        {

            throw new NotImplementedException();

            ListLabel? shareElement;

            try

            {

                if ((ListP)((Home)sender).listView.SelectedItem != null)

                {

                    shareElement = ((ListP)((Home)sender).listView.SelectedItem).Own;

                    Share share = new(shareElement, DateTime.Now);

                    share.ShowDialog();

                }

            }

            catch

            {

            }



        }



        private void Home_OnDelete(object? sender, EventArgs e)

CountDownList/Data/CountDownList.xml

+0 −15
Original line number Diff line number Diff line
@@ -14,20 +14,5 @@ 
			</BackGround>

			<DarkText>True</DarkText>

		</List>



		<List>

			<Title>02</Title>

			<StartTimeT>0</StartTimeT>

			<EndTimeT>0</EndTimeT>

			<IsCount>False</IsCount>

			<TimeFormat>dd\天hh\:mm\:ss</TimeFormat>

			<BackGround>

				<Image>

					Data\InputImage\Sample.png

				</Image>

			</BackGround>

			<DarkText>False</DarkText>

		</List>



	</CountDownList>

</shRabbit>

CountDownList/MainWindow.xaml.cs

+1 −33
Original line number Diff line number Diff line
@@ -26,41 +26,9 @@ namespace CountDownList 
        public MainWindow()

        {

            InitializeComponent();



            NewYearImageTest.ImageSource = new BitmapImage(new Uri(@"Data\Image\1.jpg",UriKind.Relative));

            NewYearImageTest.Stretch = Stretch.UniformToFill;



            TimeImageTest.ImageSource = new BitmapImage(new Uri(@"Data\Image\2.jpg", UriKind.Relative));

            TimeImageTest.Stretch = Stretch.UniformToFill;



            BirthImageTest.ImageSource = new BitmapImage(new Uri(@"Data\Image\3.png", UriKind.Relative));

            BirthImageTest.Stretch = Stretch.UniformToFill;



            zkImageTest.ImageSource = new BitmapImage(new Uri(@"Data\Image\4.jpg", UriKind.Relative));

            zkImageTest.Stretch = Stretch.UniformToFill;





            DoingE.Header = $"进行中（{doingList.Children.Count}）";

            wcE.Header = $"已完成（{wancheng.Children.Count}）";

            countE.Header = $"正计时（{count.Children.Count}）";



            Core = new(doingList, wancheng, count, DoingE, wcE, countE,sv);

            Core.AddCountDownLabel("跨年倒计时！(ListCore生成的)", new(2024, 1, 1), new(2025, 1, 1), "dd\\天hh\\:mm\\:ss", false, NewYearImageTest);



            Core.AddCountDownLabel("跨年倒计时！", new(2024, 1, 1), new(2025, 1, 1), "dd\\天hh\\:mm\\:ss", false, NewYearImageTest);

            Core.AddCountDownLabel("2025春节", new(2024, 2, 10), new(2025, 1, 29), "dd\\天hh\\:mm\\:ss", false, NewYearImageTest);

            Core.AddCountLabel("去年生日", new(2024, 8, 7), "dd\\天hh\\:mm\\:ss", true, BirthImageTest);

            Core.AddCountLabel("中考", new(2024, 6, 24), "dd\\天hh\\:mm\\:ss", true, zkImageTest);

            Core.AddCountDownLabel("明年生日", new(2024, 8, 7), new(2025, 8, 7), "dd\\天hh\\:mm\\:ss", true, BirthImageTest);

        }      



        ImageBrush NewYearImageTest = new();

        ImageBrush TimeImageTest = new();

        ImageBrush BirthImageTest = new();

        ImageBrush zkImageTest = new();



        



        private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)

        {

            DragMove();

CountDownList/UI/WindowFrame/EditWindow.xaml

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ 
                    </TextBlock>



                    <StackPanel Margin="0,32,0,0">

                        <Grid Width="384" Height="216">

                        <Grid Width="384" Height="216" MouseLeftButtonUp="Grid_MouseLeftButtonUp">

                            <Grid.Background>

                                <ImageBrush RenderOptions.EdgeMode="Aliased" RenderOptions.CachingHint="Cache" ImageSource="/UI/Misc/00.bmp" Viewbox="0,0,1,1" Viewport="0,0,16,16" Stretch="None" TileMode="Tile" ViewboxUnits="RelativeToBoundingBox" ViewportUnits="Absolute"/>

                            </Grid.Background>

CountDownList/UI/WindowFrame/EditWindow.xaml.cs

+5 −0
Original line number Diff line number Diff line 
using CountDownList.Class;

using CountDownList.Controls;

using HandyControl.Controls;

using System.Diagnostics;

using System.IO;

using System.Windows;
@@ -277,5 +278,9 @@ namespace CountDownList.UI.Window 
            EditResult = null;

            Close();

        }



        private void Grid_MouseLeftButtonUp(object sender, System.Windows.Input.MouseButtonEventArgs e)

        {

        }

    }

}