mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-04 02:06:36 +02:00
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Implements comprehensive hotkey conflict detection and resolution system for PowerToys, providing real-time conflict checking and centralized management interface. ## PR Checklist - [ ] **Closes:** #xxx - [x] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [x] **Localization:** All end-user-facing strings can be localized - [x] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [x] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: [Shortcut conflict detction dev spec](https://github.com/MicrosoftDocs/windows-dev-docs/pull/5519) ## TODO Lists - [x] Add real-time hotkey validation functionality to the hotkey dialog - [x] Immediately detect conflicts and update shortcut conflict status after applying new shortcuts - [x] Return conflict list from runner hotkey conflict detector for conflict checking. - [x] Implement the Tooltip for every shortcut control - [x] Add dialog UI for showing all the shortcut conflicts - [x] Support changing shortcut directly inside the shortcut conflict window/dialog, no need to nav to the settings page. - [x] Redesign the `ShortcutConflictDialogContentControl` to align with the spec - [x] Add navigating and changing hotkey auctionability to the `ShortcutConflictDialogContentControl` - [x] Add telemetry. Impemented in [another PR](https://github.com/shuaiyuanxx/PowerToys/pull/47) ## Shortcut Conflict Support Modules  <details> <summary>Demo videos</summary> https://github.com/user-attachments/assets/476d992c-c6ca-4bcd-a3f2-b26cc612d1b9 https://github.com/user-attachments/assets/1c1a2537-de54-4db2-bdbf-6f1908ff1ce7 https://github.com/user-attachments/assets/9c992254-fc2b-402c-beec-20fceef25e6b https://github.com/user-attachments/assets/d66abc1c-b8bf-45f8-a552-ec989dab310f </details> <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed Manually validation performed. --------- Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com> Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com> Co-authored-by: Niels Laute <niels.laute@live.nl>
515 lines
20 KiB
C#
515 lines
20 KiB
C#
// Copyright (c) Microsoft Corporation
|
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
|
// See the LICENSE file in the project root for more information.
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.ComponentModel;
|
|
using System.Drawing;
|
|
using System.Drawing.Imaging;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Reflection;
|
|
using System.Runtime.CompilerServices;
|
|
using global::PowerToys.GPOWrapper;
|
|
using Microsoft.PowerToys.Settings.UI.Library;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
|
|
using Microsoft.UI.Xaml.Media;
|
|
using Microsoft.UI.Xaml.Media.Imaging;
|
|
using MouseJump.Common.Helpers;
|
|
using MouseJump.Common.Imaging;
|
|
using MouseJump.Common.Models.Drawing;
|
|
using MouseJump.Common.Models.Settings;
|
|
using MouseJump.Common.Models.Styles;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|
{
|
|
public partial class MouseUtilsViewModel : PageViewModelBase
|
|
{
|
|
private GpoRuleConfigured _jumpEnabledGpoRuleConfiguration;
|
|
private bool _jumpEnabledStateIsGPOConfigured;
|
|
private bool _isMouseJumpEnabled;
|
|
|
|
internal MouseJumpSettings MouseJumpSettingsConfig { get; set; }
|
|
|
|
private void InitializeMouseJumpSettings(ISettingsRepository<MouseJumpSettings> mouseJumpSettingsRepository)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(mouseJumpSettingsRepository);
|
|
this.MouseJumpSettingsConfig = mouseJumpSettingsRepository.SettingsConfig;
|
|
|
|
this.MouseJumpSettingsConfig.Properties.ThumbnailSize.PropertyChanged += this.MouseJumpThumbnailSizePropertyChanged;
|
|
}
|
|
|
|
private void InitializeMouseJumpEnabledValues()
|
|
{
|
|
_jumpEnabledGpoRuleConfiguration = GPOWrapper.GetConfiguredMouseJumpEnabledValue();
|
|
if (_jumpEnabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _jumpEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
|
|
{
|
|
// Get the enabled state from GPO.
|
|
_jumpEnabledStateIsGPOConfigured = true;
|
|
_isMouseJumpEnabled = _jumpEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
|
|
}
|
|
else
|
|
{
|
|
_isMouseJumpEnabled = GeneralSettingsConfig.Enabled.MouseJump;
|
|
}
|
|
}
|
|
|
|
public bool IsMouseJumpEnabled
|
|
{
|
|
get => _isMouseJumpEnabled;
|
|
set
|
|
{
|
|
if (_jumpEnabledStateIsGPOConfigured)
|
|
{
|
|
// If it's GPO configured, shouldn't be able to change this state.
|
|
return;
|
|
}
|
|
|
|
if (_isMouseJumpEnabled != value)
|
|
{
|
|
_isMouseJumpEnabled = value;
|
|
|
|
GeneralSettingsConfig.Enabled.MouseJump = value;
|
|
OnPropertyChanged(nameof(_isMouseJumpEnabled));
|
|
|
|
OutGoingGeneralSettings outgoing = new OutGoingGeneralSettings(GeneralSettingsConfig);
|
|
SendConfigMSG(outgoing.ToString());
|
|
|
|
NotifyMouseJumpPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
public bool IsJumpEnabledGpoConfigured
|
|
{
|
|
get => _jumpEnabledStateIsGPOConfigured;
|
|
}
|
|
|
|
public HotkeySettings MouseJumpActivationShortcut
|
|
{
|
|
get
|
|
{
|
|
return MouseJumpSettingsConfig.Properties.ActivationShortcut;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (MouseJumpSettingsConfig.Properties.ActivationShortcut != value)
|
|
{
|
|
MouseJumpSettingsConfig.Properties.ActivationShortcut = value ?? MouseJumpSettingsConfig.Properties.DefaultActivationShortcut;
|
|
NotifyMouseJumpPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
public MouseJumpThumbnailSize MouseJumpThumbnailSize
|
|
{
|
|
get
|
|
{
|
|
return MouseJumpSettingsConfig.Properties.ThumbnailSize;
|
|
}
|
|
|
|
set
|
|
{
|
|
if ((MouseJumpSettingsConfig.Properties.ThumbnailSize.Width != value?.Width)
|
|
&& (MouseJumpSettingsConfig.Properties.ThumbnailSize.Height != value?.Height))
|
|
{
|
|
MouseJumpSettingsConfig.Properties.ThumbnailSize = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
private static Bitmap LoadImageResource(string filename)
|
|
{
|
|
var assembly = Assembly.GetExecutingAssembly();
|
|
var assemblyName = new AssemblyName(assembly.FullName ?? throw new InvalidOperationException());
|
|
var resourceName = $"Microsoft.{assemblyName.Name}.{filename.Replace("/", ".")}";
|
|
var resourceNames = assembly.GetManifestResourceNames();
|
|
if (!resourceNames.Contains(resourceName))
|
|
{
|
|
throw new InvalidOperationException($"Embedded resource '{resourceName}' does not exist.");
|
|
}
|
|
|
|
var stream = assembly.GetManifestResourceStream(resourceName)
|
|
?? throw new InvalidOperationException();
|
|
var image = (Bitmap)Image.FromStream(stream);
|
|
return image;
|
|
}
|
|
|
|
private static Lazy<Bitmap> MouseJumpDesktopImage => new(
|
|
() => MouseUtilsViewModel.LoadImageResource("UI/Images/MouseJump-Desktop.png")
|
|
);
|
|
|
|
public ImageSource MouseJumpPreviewImage
|
|
{
|
|
get
|
|
{
|
|
// keep these in sync with the layout of "Images\MouseJump-Desktop.png"
|
|
var screens = new List<RectangleInfo>()
|
|
{
|
|
/*
|
|
these magic numbers are the pixel dimensions of the individual screens on the
|
|
fake desktop image - "Images\MouseJump-Desktop.png" - used to generate the
|
|
preview image in the Settings UI properties page for Mouse Jump. if you update
|
|
the fake desktop image be sure to update these values as well.
|
|
*/
|
|
new(635, 172, 272, 168),
|
|
new(0, 0, 635, 339),
|
|
};
|
|
var desktopSize = LayoutHelper.GetCombinedScreenBounds(screens).Size;
|
|
/*
|
|
magic number 283 is the content height left in the settings card after removing the top and bottom chrome:
|
|
|
|
300px settings card height - 1px top border - 7px top margin - 8px bottom margin - 1px bottom border = 283px image height
|
|
|
|
this ensures we get a preview image scaled at 100% so borders, etc., are shown at exact pixel sizes in the preview
|
|
*/
|
|
var canvasSize = new SizeInfo(desktopSize.Width, 283).Clamp(desktopSize);
|
|
|
|
var previewType = Enum.TryParse<PreviewType>(this.MouseJumpPreviewType, true, out var previewTypeResult)
|
|
? previewTypeResult
|
|
: PreviewType.Bezelled;
|
|
var previewStyle = previewType switch
|
|
{
|
|
PreviewType.Compact => StyleHelper.CompactPreviewStyle.WithCanvasSize(desktopSize),
|
|
PreviewType.Bezelled => StyleHelper.BezelledPreviewStyle.WithCanvasSize(desktopSize),
|
|
PreviewType.Custom => new PreviewStyle(
|
|
canvasSize: canvasSize,
|
|
canvasStyle: new(
|
|
marginStyle: new(0),
|
|
borderStyle: new(
|
|
color: ConfigHelper.DeserializeFromConfigColorString(
|
|
this.MouseJumpBorderColor),
|
|
all: this.MouseJumpBorderThickness,
|
|
depth: this.MouseJumpBorder3dDepth
|
|
),
|
|
paddingStyle: new(
|
|
all: this.MouseJumpBorderPadding
|
|
),
|
|
backgroundStyle: new(
|
|
color1: ConfigHelper.DeserializeFromConfigColorString(
|
|
this.MouseJumpBackgroundColor1),
|
|
color2: ConfigHelper.DeserializeFromConfigColorString(
|
|
this.MouseJumpBackgroundColor2)
|
|
)
|
|
),
|
|
screenStyle: new(
|
|
marginStyle: new(
|
|
all: this.MouseJumpScreenMargin
|
|
),
|
|
borderStyle: new(
|
|
color: ConfigHelper.DeserializeFromConfigColorString(
|
|
this.MouseJumpBezelColor),
|
|
all: this.MouseJumpBezelThickness,
|
|
depth: this.MouseJumpBezel3dDepth
|
|
),
|
|
paddingStyle: new(0),
|
|
backgroundStyle: new(
|
|
color1: ConfigHelper.DeserializeFromConfigColorString(
|
|
this.MouseJumpScreenColor1),
|
|
color2: ConfigHelper.DeserializeFromConfigColorString(
|
|
this.MouseJumpScreenColor2)
|
|
)
|
|
)),
|
|
_ => throw new InvalidOperationException(
|
|
$"Unhandled {nameof(MouseJumpPreviewType)} '{previewType}'"),
|
|
};
|
|
|
|
var previewLayout = LayoutHelper.GetPreviewLayout(
|
|
previewStyle: previewStyle,
|
|
screens: screens,
|
|
activatedLocation: new(0, 0));
|
|
|
|
var desktopImage = MouseUtilsViewModel.MouseJumpDesktopImage.Value;
|
|
var imageCopyService = new StaticImageRegionCopyService(desktopImage);
|
|
using var previewImage = DrawingHelper.RenderPreview(
|
|
previewLayout,
|
|
imageCopyService);
|
|
|
|
// save the image to a memory stream
|
|
using var stream = new MemoryStream();
|
|
previewImage.Save(stream, ImageFormat.Png);
|
|
stream.Position = 0;
|
|
|
|
// load the memory stream into a bitmap image
|
|
var bitmap = new BitmapImage();
|
|
var rnd = stream.AsRandomAccessStream();
|
|
bitmap.DecodePixelWidth = previewImage.Width;
|
|
bitmap.DecodePixelHeight = previewImage.Height;
|
|
bitmap.SetSource(rnd);
|
|
return bitmap;
|
|
}
|
|
}
|
|
|
|
public string MouseJumpPreviewType
|
|
{
|
|
get
|
|
{
|
|
return MouseJumpSettingsConfig.Properties.PreviewType;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (value != MouseJumpSettingsConfig.Properties.PreviewType)
|
|
{
|
|
MouseJumpSettingsConfig.Properties.PreviewType = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public string MouseJumpBackgroundColor1
|
|
{
|
|
get
|
|
{
|
|
var value = MouseJumpSettingsConfig.Properties.BackgroundColor1;
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
return value;
|
|
}
|
|
|
|
set
|
|
{
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
if (!value.Equals(MouseJumpSettingsConfig.Properties.BackgroundColor1, StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
MouseJumpSettingsConfig.Properties.BackgroundColor1 = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public string MouseJumpBackgroundColor2
|
|
{
|
|
get
|
|
{
|
|
var value = MouseJumpSettingsConfig.Properties.BackgroundColor2;
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
return value;
|
|
}
|
|
|
|
set
|
|
{
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
if (!value.Equals(MouseJumpSettingsConfig.Properties.BackgroundColor2, StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
MouseJumpSettingsConfig.Properties.BackgroundColor2 = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public int MouseJumpBorderThickness
|
|
{
|
|
get
|
|
{
|
|
return MouseJumpSettingsConfig.Properties.BorderThickness;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (value != MouseJumpSettingsConfig.Properties.BorderThickness)
|
|
{
|
|
MouseJumpSettingsConfig.Properties.BorderThickness = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public string MouseJumpBorderColor
|
|
{
|
|
get
|
|
{
|
|
var value = MouseJumpSettingsConfig.Properties.BorderColor;
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
return value;
|
|
}
|
|
|
|
set
|
|
{
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
if (!value.Equals(MouseJumpSettingsConfig.Properties.BorderColor, StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
MouseJumpSettingsConfig.Properties.BorderColor = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public int MouseJumpBorder3dDepth
|
|
{
|
|
get
|
|
{
|
|
return MouseJumpSettingsConfig.Properties.Border3dDepth;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (value != MouseJumpSettingsConfig.Properties.Border3dDepth)
|
|
{
|
|
MouseJumpSettingsConfig.Properties.Border3dDepth = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public int MouseJumpBorderPadding
|
|
{
|
|
get
|
|
{
|
|
return MouseJumpSettingsConfig.Properties.BorderPadding;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (value != MouseJumpSettingsConfig.Properties.BorderPadding)
|
|
{
|
|
MouseJumpSettingsConfig.Properties.BorderPadding = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public int MouseJumpBezelThickness
|
|
{
|
|
get
|
|
{
|
|
return MouseJumpSettingsConfig.Properties.BezelThickness;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (value != MouseJumpSettingsConfig.Properties.BezelThickness)
|
|
{
|
|
MouseJumpSettingsConfig.Properties.BezelThickness = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public string MouseJumpBezelColor
|
|
{
|
|
get
|
|
{
|
|
var value = MouseJumpSettingsConfig.Properties.BezelColor;
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
return value;
|
|
}
|
|
|
|
set
|
|
{
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
if (!value.Equals(MouseJumpSettingsConfig.Properties.BezelColor, StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
MouseJumpSettingsConfig.Properties.BezelColor = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public int MouseJumpBezel3dDepth
|
|
{
|
|
get
|
|
{
|
|
return MouseJumpSettingsConfig.Properties.Bezel3dDepth;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (value != MouseJumpSettingsConfig.Properties.Bezel3dDepth)
|
|
{
|
|
MouseJumpSettingsConfig.Properties.Bezel3dDepth = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public int MouseJumpScreenMargin
|
|
{
|
|
get
|
|
{
|
|
return MouseJumpSettingsConfig.Properties.ScreenMargin;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (value != MouseJumpSettingsConfig.Properties.ScreenMargin)
|
|
{
|
|
MouseJumpSettingsConfig.Properties.ScreenMargin = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public string MouseJumpScreenColor1
|
|
{
|
|
get
|
|
{
|
|
var value = MouseJumpSettingsConfig.Properties.ScreenColor1;
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
return value;
|
|
}
|
|
|
|
set
|
|
{
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
if (!value.Equals(MouseJumpSettingsConfig.Properties.ScreenColor1, StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
MouseJumpSettingsConfig.Properties.ScreenColor1 = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public string MouseJumpScreenColor2
|
|
{
|
|
get
|
|
{
|
|
var value = MouseJumpSettingsConfig.Properties.ScreenColor2;
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
return value;
|
|
}
|
|
|
|
set
|
|
{
|
|
value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
|
|
if (!value.Equals(MouseJumpSettingsConfig.Properties.ScreenColor2, StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
MouseJumpSettingsConfig.Properties.ScreenColor2 = value;
|
|
NotifyMouseJumpPropertyChanged();
|
|
NotifyMouseJumpPropertyChanged(nameof(this.MouseJumpPreviewImage));
|
|
}
|
|
}
|
|
}
|
|
|
|
public void MouseJumpThumbnailSizePropertyChanged(object sender, PropertyChangedEventArgs e)
|
|
{
|
|
NotifyMouseJumpPropertyChanged(nameof(MouseJumpThumbnailSize));
|
|
}
|
|
|
|
public void NotifyMouseJumpPropertyChanged([CallerMemberName] string propertyName = null)
|
|
{
|
|
OnPropertyChanged(propertyName);
|
|
|
|
SndMouseJumpSettings outsettings = new SndMouseJumpSettings(MouseJumpSettingsConfig);
|
|
SndModuleSettings<SndMouseJumpSettings> ipcMessage = new SndModuleSettings<SndMouseJumpSettings>(outsettings);
|
|
SendConfigMSG(ipcMessage.ToJsonString());
|
|
SettingsUtils.SaveSettings(MouseJumpSettingsConfig.ToJsonString(), MouseJumpSettings.ModuleName);
|
|
}
|
|
}
|
|
}
|