部分程序启动报错修复', '重置图标功能程序崩溃修复','添加自定义字体颜色功能','添加URL项目功能'

This commit is contained in:
liufei
2021-08-04 10:12:32 +08:00
parent 53481bf907
commit 2d67d32b29
29 changed files with 603 additions and 339 deletions

View File

@@ -20,13 +20,28 @@ namespace GeekDesk.ViewModel
private BitmapImage bitmapImage; //位图
private byte[] imageByteArr; //图片 byte数组
private string content; //显示信息
private int imageWidth = (int)MainWindowEnum.IMAGE_WIDTH; //图片宽度
private int imageHeight = (int)MainWindowEnum.IMAGE_HEIGHT; //图片高度
private int imageWidth = (int)CommonEnum.IMAGE_WIDTH; //图片宽度
private int imageHeight = (int)CommonEnum.IMAGE_HEIGHT; //图片高度
private bool adminStartUp = false; //始终管理员方式启动 默认否
private byte[] defaultImage; //默认图标
private IconType iconType = IconType.OTHER;
public IconType IconType
{
get
{
if (iconType == 0) return IconType.OTHER;
return iconType;
}
set
{
iconType = value;
OnPropertyChanged("IconType");
}
}
public byte[] DefaultImage
{
get
@@ -142,7 +157,7 @@ namespace GeekDesk.ViewModel
get
{
// 为了兼容旧版 暂时使用默认
return (int)MainWindowEnum.IMAGE_WIDTH;
return (int)CommonEnum.IMAGE_WIDTH;
}
set
{
@@ -156,7 +171,7 @@ namespace GeekDesk.ViewModel
get
{
// 为了兼容旧版 暂时使用默认
return (int)MainWindowEnum.IMAGE_HEIGHT;
return (int)CommonEnum.IMAGE_HEIGHT;
}
set
{