:fire:增加自定义背景保存
This commit is contained in:
@@ -463,6 +463,10 @@ namespace GeekDesk.Control.UserControls.PannelCard
|
||||
{
|
||||
int index = MenuListBox.ItemContainerGenerator.IndexFromContainer(lbi);
|
||||
MenuListBox.SelectedIndex = index;
|
||||
if (appData.AppConfig.IconBatch_NoWrite)
|
||||
{
|
||||
appData.AppConfig.IconBatch_NoWrite = false;
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -487,6 +491,12 @@ namespace GeekDesk.Control.UserControls.PannelCard
|
||||
MenuInfo mi = lbi.DataContext as MenuInfo;
|
||||
int index = MenuListBox.Items.IndexOf(mi);
|
||||
MenuListBox.SelectedIndex = index;
|
||||
|
||||
if (appData.AppConfig.IconBatch_NoWrite)
|
||||
{
|
||||
appData.AppConfig.IconBatch_NoWrite = false;
|
||||
MainWindow.mainWindow.RightCard.IconListBox.SelectionMode = SelectionMode.Extended;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -112,6 +112,9 @@
|
||||
<cvt:GetWidthByWWConvert x:Key="GetWidthByWWConvert"/>
|
||||
<temp:SearchIconList x:Key="SearchIconList"/>
|
||||
<cvt:Boolean2VisibilityConverter x:Key="MyBoolean2VisibilityConverter"/>
|
||||
<cvt:ValueConvert x:Key="ValueConvert"/>
|
||||
<cst:RunTimeStatus x:Key="RunTimeStatus"/>
|
||||
<cst:DictConst x:Key="DictConst"/>
|
||||
</UserControl.Resources>
|
||||
<!--右侧栏-->
|
||||
<Grid>
|
||||
@@ -150,6 +153,7 @@
|
||||
<MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
|
||||
<MenuItem x:Name="CardLockCM" Header="锁定主面板" Click="LockAppPanel"/>
|
||||
<MenuItem x:Name="showTitle" Header="隐藏/显示标题" Click="ShowTitle_Click"/>
|
||||
<MenuItem Header="{Binding AppConfig.IconBatch_NoWrite, Mode=OneWay, Converter={StaticResource ValueConvert}, ConverterParameter={x:Static cst:DictConst.batchMenuHeaderDict}}" Click="BatchHandle" Tag="{Binding}"/>
|
||||
</ContextMenu>
|
||||
</hc:Card.ContextMenu>
|
||||
<hc:DialogContainer>
|
||||
@@ -171,6 +175,7 @@
|
||||
ItemsSource="{Binding AppConfig.SelectedMenuIcons, Mode=OneWay}"
|
||||
BorderThickness="0"
|
||||
Padding="0,10,0,0"
|
||||
SelectionChanged="IconListBox_SelectionChanged"
|
||||
ScrollViewer.CanContentScroll ="True"
|
||||
VirtualizingPanel.VirtualizationMode="Recycling"
|
||||
VirtualizingPanel.IsVirtualizing="True"
|
||||
@@ -225,7 +230,12 @@
|
||||
<MenuItem Header="添加系统项目" Click="AddSystemIcon"/>
|
||||
<MenuItem Header="资源管理器菜单" Click="SystemContextMenu" Tag="{Binding}"/>
|
||||
<MenuItem Header="属性" Click="PropertyConfig" Tag="{Binding}"/>
|
||||
<MenuItem Header="从列表移除" Click="RemoveIcon" Tag="{Binding}"/>
|
||||
<MenuItem Header="从列表移除"
|
||||
Click="RemoveIcon"
|
||||
Tag="{Binding}"/>
|
||||
<!--MenuItem Header="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.IconBatch_NoWrite, Mode=OneWay, Converter={StaticResource ValueConvert}, ConverterParameter={x:Static cst:DictConst.batchMenuHeaderDict}}"
|
||||
Click="BatchHandle"
|
||||
Tag="{Binding}"/>-->
|
||||
</ContextMenu>
|
||||
</ListBox.Resources>
|
||||
|
||||
@@ -249,7 +259,7 @@
|
||||
MouseLeftButtonDown="Icon_MouseLeftButtonDown"
|
||||
MouseLeftButtonUp="Icon_MouseLeftButtonUp"
|
||||
>
|
||||
<CheckBox Margin="0,0,0,-20" HorizontalAlignment="Right"/>
|
||||
<!--<CheckBox IsChecked="{Binding IsChecked_NoWrite}" Visibility="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.IconBatch_NoWrite, Mode=OneWay, Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,0,-20" HorizontalAlignment="Right"/>-->
|
||||
<!--<StackPanel Background="#00FFFFFF"
|
||||
MouseEnter="CursorPanel_MouseEnter"
|
||||
MouseLeave="CursorPanel_MouseLeave"
|
||||
|
||||
@@ -7,10 +7,12 @@ using GeekDesk.Util;
|
||||
using GeekDesk.ViewModel;
|
||||
using GeekDesk.ViewModel.Temp;
|
||||
using HandyControl.Controls;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
using System.Windows;
|
||||
@@ -105,6 +107,11 @@ namespace GeekDesk.Control.UserControls.PannelCard
|
||||
|
||||
private void Icon_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
if (appData.AppConfig.IconBatch_NoWrite)
|
||||
{
|
||||
|
||||
return;
|
||||
}
|
||||
if (appData.AppConfig.DoubleOpen)
|
||||
{
|
||||
IconClick(sender, e);
|
||||
@@ -113,6 +120,18 @@ namespace GeekDesk.Control.UserControls.PannelCard
|
||||
|
||||
private void Icon_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
//Console.WriteLine("选中:" + IconListBox.SelectedItems.Count);
|
||||
if (appData.AppConfig.IconBatch_NoWrite)
|
||||
{
|
||||
//查找checkbox更改选中状态
|
||||
Panel p = sender as Panel;
|
||||
var ens = p.Children.OfType<CheckBox>();
|
||||
foreach (CheckBox cb in ens)
|
||||
{
|
||||
cb.IsChecked = !cb.IsChecked;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (!appData.AppConfig.DoubleOpen)
|
||||
{
|
||||
IconClick(sender, e);
|
||||
@@ -352,9 +371,14 @@ namespace GeekDesk.Control.UserControls.PannelCard
|
||||
Panel sp = sender as Panel;
|
||||
|
||||
DependencyObject dos = sp.Parent;
|
||||
Image img = null;
|
||||
|
||||
Image img = sp.Children[1] as Image;
|
||||
foreach (var imgBak in sp.Children.OfType<Image>())
|
||||
{
|
||||
img = (Image)imgBak;
|
||||
|
||||
}
|
||||
if (img == null) return;
|
||||
double afterHeight = img.Height;
|
||||
double afterWidth = img.Width;
|
||||
|
||||
@@ -692,5 +716,30 @@ namespace GeekDesk.Control.UserControls.PannelCard
|
||||
{
|
||||
appData.AppConfig.ShowIconTitle = !appData.AppConfig.ShowIconTitle;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 批量操作
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
private void BatchHandle(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!appData.AppConfig.IconBatch_NoWrite)
|
||||
{
|
||||
//开启批量操作时把所有的状态更改为未选中
|
||||
foreach(var ic in IconListBox.Items)
|
||||
{
|
||||
IconInfo info = ic as IconInfo;
|
||||
info.IsChecked_NoWrite = false;
|
||||
}
|
||||
}
|
||||
appData.AppConfig.IconBatch_NoWrite = !appData.AppConfig.IconBatch_NoWrite;
|
||||
IconListBox.SelectionMode = SelectionMode.Multiple;
|
||||
}
|
||||
|
||||
private void IconListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
//Console.WriteLine(sender.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user