admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化界面, 下班

Browse Source
This commit is contained in:
liufei
2021-07-13 17:29:33 +08:00
parent edb7efc7fb
commit a122181f90
22 changed files with 132 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Control/Windows/BacklogInfoWindow.xaml
View File

@@ -31,7 +31,10 @@
<Grid Margin="0,0,0,8">
<hc:SimplePanel Margin="20" HorizontalAlignment="Center">
<hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
<TextBlock Text="待办任务*:" Style="{StaticResource LeftTB}"/>
<WrapPanel>
<TextBlock Text="待办任务:" Style="{StaticResource LeftTB}"/>
<TextBlock Text="*" Foreground="Red" />
</WrapPanel>
<TextBox x:Name="Title" Width="290" FontSize="14" />
</hc:UniformSpacingPanel>

8
Control/Windows/BacklogWindow.xaml
View File

@@ -60,8 +60,10 @@
>
<hc:SideMenuItem.Icon>
<Button Background="Transparent"
IsEnabled="False"
Opacity="1"
BorderThickness="0"
hc:IconElement.Geometry="{StaticResource About}"
hc:IconElement.Geometry="{StaticResource List}"
hc:IconElement.Height="18"
hc:IconElement.Width="18"
HorizontalAlignment="Right"
@@ -73,8 +75,10 @@
Selected="MemuClick">
<hc:SideMenuItem.Icon>
<Button Background="Transparent"
IsEnabled="False"
Opacity="1"
BorderThickness="0"
hc:IconElement.Geometry="{StaticResource Pannel}"
hc:IconElement.Geometry="{StaticResource History}"
hc:IconElement.Height="18"
hc:IconElement.Width="18"
HorizontalAlignment="Right"

25
Control/Windows/ConfigWindow.xaml
View File

@@ -61,26 +61,29 @@
>
<hc:SideMenuItem.Icon>
<Button Background="Transparent"
BorderThickness="0"
hc:IconElement.Geometry="M671.374222 357.944889c10.467556 0 20.792889 0.711111 31.032889 1.820444-27.875556-124.017778-166.741333-216.149333-325.233778-216.149333-177.180444 0-322.332444 115.342222-322.332444 261.774222 0 84.536889 48.298667 153.941333 128.995556 207.786667L151.608889 705.735111l112.696889-53.959111c40.305778 7.623111 72.675556 15.445333 112.896 15.445333 10.126222 0 20.138667-0.483556 30.094222-1.223111-6.314667-20.565333-9.955556-42.126222-9.955556-64.483556C397.340444 467.057778 518.286222 357.944889 671.374222 357.944889zM498.062222 274.488889c24.263111 0 40.334222 15.246222 40.334222 38.428444 0 23.068444-16.071111 38.513778-40.334222 38.513778-24.149333 0-48.412444-15.473778-48.412444-38.513778C449.678222 289.735111 473.912889 274.488889 498.062222 274.488889zM272.469333 351.431111c-24.149333 0-48.554667-15.473778-48.554667-38.513778 0-23.153778 24.376889-38.428444 48.554667-38.428444 24.149333 0 40.248889 15.246222 40.248889 38.428444C312.718222 335.957333 296.647111 351.431111 272.469333 351.431111zM965.575111 597.816889c0-123.022222-128.967111-223.345778-273.806222-223.345778-153.372444 0-274.147556 100.295111-274.147556 223.345778 0 123.278222 120.803556 223.374222 274.147556 223.374222 32.085333 0 64.483556-7.736889 96.711111-15.445333l88.405333 46.222222-24.234667-76.913778C917.390222 728.689778 965.575111 667.221333 965.575111 597.816889zM602.908444 559.303111c-16.042667 0-32.256-15.246222-32.256-30.805333 0-15.331556 16.184889-30.776889 32.256-30.776889 24.376889 0 40.362667 15.445333 40.362667 30.776889C643.242667 544.056889 627.285333 559.303111 602.908444 559.303111zM780.202667 559.303111c-15.928889 0-32.028444-15.246222-32.028444-30.805333 0-15.331556 16.071111-30.776889 32.028444-30.776889 24.149333 0 40.362667 15.445333 40.362667 30.776889C820.536889 544.056889 804.352 559.303111 780.202667 559.303111z"
hc:IconElement.Height="18"
hc:IconElement.Width="18"
HorizontalAlignment="Right"
/>
IsEnabled="False"
Opacity="1"
BorderThickness="0"
hc:IconElement.Geometry="{StaticResource About}"
hc:IconElement.Height="18"
hc:IconElement.Width="18"
HorizontalAlignment="Right"
/>
</hc:SideMenuItem.Icon>
</hc:SideMenuItem>
<hc:SideMenuItem Header="显示设置"
Tag="Theme"
Selected="MemuClick">
<hc:SideMenuItem.Icon>
<!--<Button Background="Transparent"
<Button Background="Transparent"
IsEnabled="False"
Opacity="1"
BorderThickness="0"
hc:IconElement.Geometry="{StaticResource Pannel}"
hc:IconElement.Height="18"
hc:IconElement.Width="18"
HorizontalAlignment="Right"
/>-->
<TextBlock Text="&#xe614;" FontFamily="pack://application:,,,/Fonts/#IconFont" FontSize="40"/>
/>
</hc:SideMenuItem.Icon>
</hc:SideMenuItem>
@@ -89,6 +92,8 @@
Selected="MemuClick">
<hc:SideMenuItem.Icon>
<Button Background="Transparent"
IsEnabled="False"
Opacity="1"
BorderThickness="0"
hc:IconElement.Geometry="{StaticResource Motion}"
hc:IconElement.Height="18"
@@ -100,7 +105,7 @@
</hc:SideMenu>
</hc:Card>
<hc:ScrollViewer Grid.Row="0" Grid.Column="1">
<hc:Card x:Name="RightCard" Height="600" MouseDown="DragMove">
<hc:Card x:Name="RightCard" Height="450" MouseDown="DragMove">
</hc:Card>
</hc:ScrollViewer>

1
Control/Windows/IconfontWindow.xaml.cs
View File

@@ -76,6 +76,7 @@ namespace GeekDesk.Control.Windows
{
if (customIcons == null)
{
vm.Iconfonts = null;
LoadingOnlineIcon();
} else
{