Merge branch 'rc2-dev'

Gnekiah · Nov 3, 2017 · 0deaf9c · 0deaf9c
2 parents da88122 + 9e61de2
commit 0deaf9c
Show file tree

Hide file tree

Showing 4 changed files with 663 additions and 127 deletions.
diff --git a/TODO b/TODO
@@ -1,16 +1,24 @@
-设置字体颜色
-设置字体大小
+√   设置字体颜色
+√   设置字体大小
+√   设置字体
+√   字体加粗、斜体、下划线
+增大/减小行间距
 
 设置外边框宽度
-设置外边框颜色
-设置外边框透明度
+调节内边框大小  # resize的时候，要重新计算CalcRectArea()
+    √   设置外边框颜色
+    √   设置外边框透明度
+    √   设置内边框颜色
+    √   设置内边框透明度
 
-设置内边框颜色
-设置内边框透明度
+√   隐藏任务栏图标
+√   显示托盘小图标
+√   托盘小图标退出
+√   托盘小图标启用控制栏
 
-调节内边框大小
+√   可移动窗体
+√   设置按钮
+√   应用栏启用嵌入背景
 
-应用嵌入背景
-
-隐藏任务栏图标
-显示托盘小图标
+加载配置和文档
+保存配置和文档
diff --git a/whitodo-csharp/MainWindow.xaml b/whitodo-csharp/MainWindow.xaml
@@ -5,94 +5,44 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:whitodo_csharp"
         mc:Ignorable="d"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        Title="WhiToDo" Height="457.833" Icon="whitodo.ico" Visibility="Visible" Background="{x:Null}" Foreground="{x:Null}" Width="600" MouseDown="Window_MouseDown" MouseMove="Window_MouseMove" AllowDrop="True" BorderThickness="0" WindowStyle="None">
-    <Grid Margin="0" Width="600">
-=======
-        Title="WhiToDo" Height="457.833" Icon="whitodo.ico" Visibility="Visible" Background="{x:Null}" Foreground="{x:Null}" AllowsTransparency="True" WindowStyle="None" Width="600" MouseDown="Window_MouseDown" MouseMove="Window_MouseMove">
-    <Grid Margin="0" Width="600" MinWidth="600">
->>>>>>> dev-resiable
-=======
-        Title="WhiToDo" Height="457.833" Icon="whitodo.ico" Visibility="Visible" Background="{x:Null}" Foreground="{x:Null}" AllowsTransparency="True" WindowStyle="None" Width="600" MouseDown="Window_MouseDown" MouseMove="Window_MouseMove">
-    <Grid Margin="0" Width="600" MinWidth="600">
->>>>>>> dev-resiable
+        Title="WhiToDo" Height="458" Icon="whitodo.ico" Visibility="Visible" Background="{x:Null}" Foreground="{x:Null}" AllowsTransparency="True" WindowStyle="None" Width="600" MouseDown="Window_MouseDown" MouseMove="Window_MouseMove" ResizeMode="CanResizeWithGrip" MinWidth="600" MinHeight="458" SizeChanged="Window_SizeChanged">
+    <Grid x:Name="WindowGrid" Margin="0" Width="600" MinWidth="600" Height="458" MinHeight="458">
         <Grid.RowDefinitions>
             <RowDefinition/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <Border x:Name="ControlPanelColor" BorderThickness="0" Height="99" Background="White" Opacity="0.1" VerticalAlignment="Top" HorizontalAlignment="Left" Width="600"/>
+        <Border x:Name="ControlPanelBackground" BorderThickness="0" Height="83" Margin="10,10,10,0" VerticalAlignment="Top" Background="White" Opacity="0.15" Width="580" MinWidth="580" MinHeight="83" MaxWidth="580" MaxHeight="83" ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
 
-        <Border x:Name="TextPanel" BorderThickness="0" Background="White" Opacity="0.1" Margin="0,104,0,0"/>
-        <Border BorderThickness="0" Margin="18,126,24,18" Background="White" Opacity="0.25" Padding="0"/>
-        <RichTextBox Margin="40,143,40,40" Background="{x:Null}" BorderBrush="{x:Null}" CaretBrush="#FFDA6262" Foreground="White" SelectionBrush="#FF00FFD1" FontSize="18" BorderThickness="0">
-=======
-=======
->>>>>>> dev-resiable
-        <Border BorderThickness="0" Height="83" Margin="10,10,10,0" VerticalAlignment="Top" Background="White" Opacity="0.15" Width="580" MinWidth="580" MinHeight="83" MaxWidth="580" MaxHeight="83" ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
-
-        <Border BorderThickness="0" Background="White" Opacity="0.1" Margin="0,104,0,0"/>
-        <Border BorderThickness="0" Margin="18,126,24,18" Background="White" Opacity="0.25" Padding="0"/>
-        <RichTextBox HorizontalAlignment="Left" Height="274" Margin="40,148,0,0" VerticalAlignment="Top" Width="518" Background="{x:Null}" BorderBrush="{x:Null}" CaretBrush="#FF17FF00" Foreground="White" SelectionBrush="#FF4DB0FF" FontSize="18">
-<<<<<<< HEAD
->>>>>>> dev-resiable
-=======
->>>>>>> dev-resiable
+        <Border x:Name="TextPanelOuterBackground" BorderThickness="0" Background="White" Opacity="0.1" Margin="0,104,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="600" Height="354"/>
+        <Border x:Name="TextPanelInnerBackground" BorderThickness="0" Margin="18,122,0,0" Background="White" Opacity="0.25" Padding="0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="564" Height="318"/>
+        <RichTextBox x:Name="WhitodoText" Height="278" Margin="38,142,0,0" Width="524" Background="{x:Null}" BorderBrush="{x:Null}" CaretBrush="#FF17FF00" Foreground="White" SelectionBrush="#FFEBA8FF" FontSize="18" SelectionChanged="WhitodoText_SelectionChanged" Block.LineHeight="6" BorderThickness="0" HorizontalAlignment="Left" VerticalAlignment="Top">
             <FlowDocument>
                 <Paragraph>
                     <Run Text="RichTextBox"/>
                 </Paragraph>
             </FlowDocument>
         </RichTextBox>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <Border x:Name="ControlPanel" BorderThickness="0" Height="81" VerticalAlignment="Top" Margin="10,10,10,0" ScrollViewer.VerticalScrollBarVisibility="Disabled">
-            <Grid RenderTransformOrigin="0.5,0.5" Margin="10">
-                <Button Content="" Margin="10,10,518,19" Click="Button_Click" Padding="0" BorderThickness="0" Width="32" Height="32" BorderBrush="{x:Null}" Foreground="{x:Null}" RenderTransformOrigin="1.5,0.688">
-                    <Button.Background>
-                        <ImageBrush ImageSource="whitodo.ico" TileMode="FlipXY"/>
-                    </Button.Background>
-                </Button>
-            </Grid>
-        </Border>
-        <Rectangle Fill="#FFF4F4F5" HorizontalAlignment="Left" Height="29" Margin="564,421,0,0" Stroke="Black" VerticalAlignment="Top" Width="36" Cursor="SizeNWSE" MouseDown="Rectangle_MouseDown" MouseMove="Rectangle_MouseMove"/>
-=======
-        Title="WhiToDo" Height="350" Width="525" Icon="whitodo.ico" WindowStyle="None" Opacity="0.5">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0*"/>
-            <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
->>>>>>> parent of a8e36c3... backup for usable opacity window
-=======
-=======
->>>>>>> dev-resiable
-        <Canvas Height="66" Margin="18,18,18,0" VerticalAlignment="Top" Width="564" MinWidth="564" MaxWidth="564" ScrollViewer.VerticalScrollBarVisibility="Disabled">
-            <Button x:Name="BlueButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="39" Canvas.Top="21" Height="24" Foreground="{x:Null}" Background="#FF0074FF"/>
-            <Button x:Name="RedButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="10" Canvas.Top="21" Height="24" Background="Red" Foreground="{x:Null}"/>
-            <Image x:Name="WhitodoButton" Source="whitodo.ico" Width="24" Height="24" VerticalAlignment="Top" Canvas.Left="526" Canvas.Top="21"/>
-            <Button x:Name="GreenButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="68" Canvas.Top="21" Height="24" Foreground="{x:Null}" Background="#FF2EFF00"/>
-            <Button x:Name="YellowButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="97" Canvas.Top="21" Height="24" Foreground="{x:Null}" Background="Yellow"/>
-            <Button x:Name="WhiteButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="126" Canvas.Top="21" Height="24" Background="White" Foreground="{x:Null}"/>
-            <ComboBox x:Name="FontTypeButton" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120" Canvas.Left="197" Canvas.Top="21" Height="24"/>
-            <ComboBox x:Name="FontSizeButton" HorizontalAlignment="Left" VerticalAlignment="Top" Width="49" Canvas.Left="318" Canvas.Top="21" Height="24"/>
-            <Image x:Name="SettingButton" HorizontalAlignment="Left" Height="24" VerticalAlignment="Top" Width="24" Source="setting.ico" Canvas.Left="487" Canvas.Top="21"/>
-            <Button x:Name="BlackButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="155" Canvas.Top="21" Height="24" Foreground="{x:Null}" Background="Black"/>
-            <Button x:Name="BoldButton" Content="B" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="384" Canvas.Top="21" Height="24" FontWeight="Bold" FontSize="16" FontFamily="Consolas"/>
-            <Button x:Name="ItalicButton" Content="I" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Height="24" Canvas.Left="413" Canvas.Top="21" FontStyle="Italic" FontSize="16" FontFamily="Consolas"/>
-            <Button x:Name="UnderLineButton" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Height="24" Canvas.Left="442" Canvas.Top="21" FontSize="16" FontFamily="Consolas">
+        <Canvas x:Name="ControlPanel" Height="66" Margin="18,18,18,0" VerticalAlignment="Top" Width="564" MinWidth="564" MaxWidth="564" ScrollViewer.VerticalScrollBarVisibility="Disabled">
+            <Button x:Name="BlueButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="32" Canvas.Top="21" Height="24" Foreground="{x:Null}" Background="#FF0074FF" Click="BlueButton_Click"/>
+            <Button x:Name="RedButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="5" Canvas.Top="21" Height="24" Background="Red" Foreground="{x:Null}" Click="RedButton_Click"/>
+            <Image x:Name="WhitodoButton" Source="whitodo.ico" Width="24" Height="24" VerticalAlignment="Top" Canvas.Left="535" Canvas.Top="21" MouseEnter="WhitodoButton_MouseEnter" MouseLeave="WhitodoButton_MouseLeave" MouseDown="WhitodoButton_MouseDown"/>
+            <Button x:Name="GreenButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="59" Canvas.Top="21" Height="24" Foreground="{x:Null}" Background="#FF2EFF00" Click="GreenButton_Click"/>
+            <Button x:Name="YellowButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="86" Canvas.Top="21" Height="24" Foreground="{x:Null}" Background="Yellow" Click="YellowButton_Click"/>
+            <Button x:Name="WhiteButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="113" Canvas.Top="21" Height="24" Background="White" Foreground="{x:Null}" Click="WhiteButton_Click"/>
+            <ComboBox x:Name="FontTypeButton" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120" Canvas.Left="175" Canvas.Top="21" Height="24" Loaded="FontTypeButton_Loaded" SelectionChanged="FontTypeButton_SelectionChanged"/>
+            <ComboBox x:Name="FontSizeButton" HorizontalAlignment="Left" VerticalAlignment="Top" Width="49" Canvas.Left="295" Canvas.Top="21" Height="24" Loaded="FontSizeButton_Loaded" SelectionChanged="FontSizeButton_SelectionChanged"/>
+            <Image x:Name="SettingButton" HorizontalAlignment="Left" Height="24" VerticalAlignment="Top" Width="24" Source="setting.ico" Canvas.Left="497" Canvas.Top="21" MouseEnter="SettingButton_MouseEnter" MouseLeave="SettingButton_MouseLeave" MouseDown="SettingButton_MouseDown"/>
+            <Button x:Name="BlackButton" Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="140" Canvas.Top="21" Height="24" Foreground="{x:Null}" Background="Black" Click="BlackButton_Click"/>
+            <Button x:Name="BoldButton" Content="B" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Canvas.Left="403" Canvas.Top="21" Height="24" FontWeight="Bold" FontSize="16" FontFamily="Consolas" Click="BoldButton_Click" Background="White"/>
+            <Button x:Name="ItalicButton" Content="I" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Height="24" Canvas.Left="430" Canvas.Top="21" FontStyle="Italic" FontSize="16" FontFamily="Consolas" Click="ItalicButton_Click" Background="White"/>
+            <Button x:Name="UnderLineButton" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Height="24" Canvas.Left="457" Canvas.Top="21" FontSize="16" FontFamily="Consolas" Click="UnderLineButton_Click" Background="White">
                 <TextBlock TextDecorations="Underline">U</TextBlock>
             </Button>
+            <Button x:Name="BigerButton" Content="▲" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Height="24" Canvas.Left="349" Canvas.Top="21" FontSize="16" Click="BigerButton_Click"/>
+            <Button x:Name="LowerButton" Content="▼" HorizontalAlignment="Left" VerticalAlignment="Top" Width="24" Height="24" Canvas.Left="376" Canvas.Top="21" FontSize="16" Click="LowerButton_Click"/>
         </Canvas>
-<<<<<<< HEAD
->>>>>>> dev-resiable
-=======
->>>>>>> dev-resiable
 
     </Grid>
 </Window>