From 3307b6ea3c1a29aab7af8c6c97f2ca40b401db7b Mon Sep 17 00:00:00 2001 From: Yoshi Askharoun Date: Thu, 7 Aug 2025 21:24:06 -0500 Subject: [PATCH] Use RESX files for resources and unify import and resource redirects --- UIX/Microsoft/Iris/Application.cs | 18 +++---- UIX/Microsoft/Iris/Markup/MarkupSystem.cs | 63 ++++++++--------------- UIX/Microsoft/Iris/OS/ClrDllResource.cs | 19 +++++-- UIX/RCDATA.resx | 1 + UIX/UIX.csproj | 7 +++ UIXcontrols/Helpers.cs | 9 +--- UIXcontrols/Resources/RCDATA.resx | 1 + UIXcontrols/UIXcontrols.csproj | 11 ++-- 8 files changed, 61 insertions(+), 68 deletions(-) create mode 100644 UIX/RCDATA.resx create mode 100644 UIXcontrols/Resources/RCDATA.resx diff --git a/UIX/Microsoft/Iris/Application.cs b/UIX/Microsoft/Iris/Application.cs index 79256a5..cebd981 100644 --- a/UIX/Microsoft/Iris/Application.cs +++ b/UIX/Microsoft/Iris/Application.cs @@ -250,25 +250,21 @@ namespace Microsoft.Iris MarkupSystem.UnloadAll(); } - public static void AddMarkupRedirect(string fromPrefix, string toPrefix) + [Obsolete("Only for backward compatibility. Use AddResourceRedirect")] + public static void AddMarkupRedirect(string fromPrefix, string toPrefix) => AddResourceRedirect(fromPrefix, toPrefix, -1); + + public static void AddResourceRedirect(string fromPrefix, string toPrefix, int bank = -1) { UIDispatcher.VerifyOnApplicationThread(); if (fromPrefix == null) throw new ArgumentNullException(nameof(fromPrefix)); if (toPrefix == null) throw new ArgumentNullException(nameof(toPrefix)); - ResourceManager.Instance.AddUriRedirect(fromPrefix, toPrefix); + ResourceManager.Instance.AddUriRedirect(fromPrefix, toPrefix, bank); } - public static void AddImportRedirect(string fromPrefix, string toPrefix) - { - UIDispatcher.VerifyOnApplicationThread(); - if (fromPrefix == null) - throw new ArgumentNullException(nameof(fromPrefix)); - if (toPrefix == null) - throw new ArgumentNullException(nameof(toPrefix)); - MarkupSystem.AddImportRedirect(fromPrefix, toPrefix); - } + [Obsolete("Only for backward compatibility. Use AddResourceRedirect")] + public static void AddImportRedirect(string fromPrefix, string toPrefix) { } public static void RegisterDataProvider(string name, DataProviderQueryFactory factory) { diff --git a/UIX/Microsoft/Iris/Markup/MarkupSystem.cs b/UIX/Microsoft/Iris/Markup/MarkupSystem.cs index 8ccd3ac..5933bed 100644 --- a/UIX/Microsoft/Iris/Markup/MarkupSystem.cs +++ b/UIX/Microsoft/Iris/Markup/MarkupSystem.cs @@ -28,8 +28,6 @@ namespace Microsoft.Iris.Markup public static bool MarkupSystemActive; private static Vector s_factoriesByProtocol; private static Vector s_factoriesByExtension; - private static Vector s_importRedirectsFrom; - private static Vector s_importRedirectsTo; private static uint s_rootIslandId; private static uint s_activeIslands; @@ -102,37 +100,41 @@ namespace Microsoft.Iris.Markup public static LoadResult ResolveLoadResult(string uri, uint islandId) { ErrorManager.EnterContext(uri); - uri = ApplyImportRedirects(uri); - LoadResult loadResult = LoadResultCache.Read(uri); + var loadResult = LoadResultCache.Read(uri); + if (loadResult == null) { - bool flag = false; - bool cacheResult = true; - foreach (MarkupSystem.Factory factory in s_factoriesByProtocol) + var handled = false; + var cacheResult = true; + + foreach (Factory factory in s_factoriesByProtocol) { if (uri.StartsWith(factory.key, StringComparison.Ordinal)) { loadResult = factory.handler(uri); - flag = true; + handled = true; break; } } - if (!flag) + + if (!handled) { - foreach (MarkupSystem.Factory factory in s_factoriesByExtension) + foreach (Factory factory in s_factoriesByExtension) { if (uri.EndsWith(factory.key, StringComparison.Ordinal)) { loadResult = factory.handler(uri); - flag = true; + handled = true; break; } } } - if (!flag) + + if (!handled) loadResult = CreateMarkupLoadResult(uri, ref cacheResult); - if (loadResult == null) - loadResult = new ErrorLoadResult(uri); + + loadResult ??= new ErrorLoadResult(uri); + if (cacheResult && loadResult.Cachable) { LoadResultCache.Write(uri, loadResult); @@ -140,8 +142,10 @@ namespace Microsoft.Iris.Markup LoadResultCache.Write(loadResult.UnderlyingUri, loadResult); } } + loadResult?.AddReference(islandId); ErrorManager.ExitContext(); + return loadResult; } @@ -226,34 +230,11 @@ namespace Microsoft.Iris.Markup return flag; } - public static void AddImportRedirect(string fromPrefix, string toPrefix) - { - if (s_importRedirectsFrom == null) - { - s_importRedirectsFrom = new Vector(); - s_importRedirectsTo = new Vector(); - } - s_importRedirectsFrom.Add(fromPrefix); - s_importRedirectsTo.Add(toPrefix); - } + [Obsolete] + public static void AddImportRedirect(string fromPrefix, string toPrefix) { } - private static string ApplyImportRedirects(string uri) - { - if (s_importRedirectsFrom != null) - { - for (int index = 0; index < s_importRedirectsFrom.Count; ++index) - { - string str = s_importRedirectsFrom[index]; - if (uri.StartsWith(str, StringComparison.Ordinal)) - { - uri = uri.Substring(str.Length); - uri = s_importRedirectsTo[index] + uri; - break; - } - } - } - return uri; - } + [Obsolete] + private static string ApplyImportRedirects(string uri) => uri; public static bool IsDebuggingEnabled(byte level) => !CompileMode && Trace.IsCategoryEnabled(TraceCategory.MarkupDebug, level); diff --git a/UIX/Microsoft/Iris/OS/ClrDllResource.cs b/UIX/Microsoft/Iris/OS/ClrDllResource.cs index 44df13d..59327d5 100644 --- a/UIX/Microsoft/Iris/OS/ClrDllResource.cs +++ b/UIX/Microsoft/Iris/OS/ClrDllResource.cs @@ -31,20 +31,29 @@ namespace Microsoft.Iris.OS string errorDetails = null; if (_buffer == IntPtr.Zero) { + var error = true; try { var rm = new ResourceManagerCore(_specifier, _assembly); - var data = (byte[])rm.GetObject(_identifier); + var data = rm.GetObject(_identifier) as byte[]; - _handle = GCHandle.Alloc(data, GCHandleType.Pinned); - _buffer = _handle.AddrOfPinnedObject(); - _length = (uint)data.LongLength; + if (data is not null) + { + _handle = GCHandle.Alloc(data, GCHandleType.Pinned); + _buffer = _handle.AddrOfPinnedObject(); + _length = (uint)data.LongLength; + + error = false; + } } catch { - errorDetails = $"Resource '{_identifier}' not found in {_assembly}, resource '{_specifier}'"; + error = true; } + + if (error) + errorDetails = $"Resource '{_identifier}' not found in {_assembly}, resource '{_specifier}'"; } NotifyAcquisitionComplete(_buffer, _length, false, errorDetails); } diff --git a/UIX/RCDATA.resx b/UIX/RCDATA.resx new file mode 100644 index 0000000..99d98c7 --- /dev/null +++ b/UIX/RCDATA.resx @@ -0,0 +1 @@ +text/microsoft-resx2.0System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089Resources\ACQUIRINGIMAGE.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089Resources\ERRORIMAGE.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/UIX/UIX.csproj b/UIX/UIX.csproj index 595bdb0..e8f2874 100644 --- a/UIX/UIX.csproj +++ b/UIX/UIX.csproj @@ -29,4 +29,11 @@ + + + + + RCDATA.resources + + \ No newline at end of file diff --git a/UIXcontrols/Helpers.cs b/UIXcontrols/Helpers.cs index 5f5c9b3..ed5a7ac 100644 --- a/UIXcontrols/Helpers.cs +++ b/UIXcontrols/Helpers.cs @@ -5,7 +5,6 @@ // Assembly location: C:\Program Files\Zune\UIXcontrols.dll using Microsoft.Iris; -using Microsoft.Iris.Data; #nullable disable namespace UIXControls @@ -14,12 +13,6 @@ namespace UIXControls { public static bool IsModelItemDisposed(ModelItem item) => item.IsDisposed; - public static void AddUIXControlsClrRedirect() => AddResourceRedirect("res://UIXControls!", "clr-res://UIXControls!"); - - public static void AddResourceRedirect(string fromPrefix, string toPrefix) - { - Application.AddImportRedirect(fromPrefix, toPrefix); - ResourceManager.Instance.AddUriRedirect(fromPrefix, toPrefix); - } + public static void AddUIXControlsClrRedirect() => Application.AddResourceRedirect("res://UIXControls!", "clr-res://UIXControls!"); } } diff --git a/UIXcontrols/Resources/RCDATA.resx b/UIXcontrols/Resources/RCDATA.resx new file mode 100644 index 0000000..e50b38e --- /dev/null +++ b/UIXcontrols/Resources/RCDATA.resx @@ -0,0 +1 @@ +text/microsoft-resx2.0System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\ACTIONBUTTON.DISABLED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\ACTIONBUTTON.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\ACTIONBUTTON.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\ACTIONBUTTON.PRESSED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\ANIMATIONS.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\BIGACTIONBUTTON.DEFAULT.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\BIGACTIONBUTTON.DEFAULT.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\BIGACTIONBUTTON.DISABLED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\BIGACTIONBUTTON.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\BIGACTIONBUTTON.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\BIGACTIONBUTTON.PRESSED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\BUTTON.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CHECKBOX.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CHECKBOXCHECKED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CHECKBOXCHECKEDHOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CHECKBOXDISABLED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CHECKBOXFOCUS.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CHECKBOXNONFOCUS.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CODEPOPUPLAYER.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\COMBOBOX.ARROW.DEFAULT.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\COMBOBOX.ARROW.DISABLED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\COMBOBOX.ARROW.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\COMBOBOX.BACKGROUND.DEFAULT.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\COMBOBOX.BACKGROUND.DISABLED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\COMBOBOX.BACKGROUND.FOCUSED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\COMBOBOX.BACKGROUND.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\COMBOBOX.DROPDOWNBACKGROUND.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\COMBOBOX.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CONTENTLIST.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CONTEXTMENU.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CONTEXTMENUDROPSHADOW.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\CONTROLS.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DARKTOOLTIPDROPSHADOW.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DIALOG.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DIALOGBACKGROUND.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DIALOGDROPSHADOW.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DIVIDER.HORIZONTAL.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DIVIDER.VERTICAL.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DRAGCOPY.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DRAGFALLBACK.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DRAGFEEDBACK.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DRAGFEEDBACKGLOW.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DRAGFEEDBACKLABEL.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DRAGNODROP.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DRAGSELECTRECT.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\DROPCOMMANDS.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\EDITABLECOMBOBOX.BACKGROUND.FOCUSED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\EDITABLECOMBOBOX.BACKGROUND.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\EDITBOX.BACKGROUND.DISABLED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\EDITBOX.BACKGROUND.FOCUSED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\EDITBOX.BACKGROUND.FOCUSED.WINDOWSPHONE.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\EDITBOX.BACKGROUND.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\EDITBOX.BACKGROUND.INVALID.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\EDITBOX.BACKGROUND.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\EDITBOX.CAPSLOCKWARNING.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\EDITBOX.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\ENERGYBAR.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\HYPERLINK.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\IMAGESTYLE.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\IMAGESTYLECONTROLS.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\JUMPINLIST.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\LABEL.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\LISTVIEW.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\NONCLIENTCONTROLS.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\POPUP.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\POPUPLAYER.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\RADIOBUTTON.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\RADIOBUTTONCHECKED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\RADIOBUTTONCHECKEDHOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\RADIOBUTTONDISABLED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\RADIOBUTTONFOCUS.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\RADIOBUTTONNONFOCUS.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLABLE.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ACCENT.HORIZ.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ACCENT.VERT.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.DOWN.CLICK.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.DOWN.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.DOWN.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.LEFT.CLICK.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.LEFT.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.LEFT.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.RIGHT.CLICK.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.RIGHT.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.RIGHT.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.UP.CLICK.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.UP.HOVER.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.ARROW.UP.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.HOVER.SHADOW.HORIZ.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.HOVER.SHADOW.VERT.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.PRESSED.SHADOW.HORIZ.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.PRESSED.SHADOW.VERT.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SCROLLBAR.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SEGOEZ-BOLD.TTC;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SEGOEZ-REGULAR.TTC;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SEGOEZ-SEMIBOLD.TTC;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SELECTIONINDEX.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SLIDER.BACKGROUND.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SLIDER.FILLED.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SLIDER.TINKERBELL.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SLIDER.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SORTARROW.DOWN.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SORTARROW.UP.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SPLITTER.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\SPREADSHEET.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\STRINGS.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\STYLE.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\STYLES.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\TEXTAREA.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\TOOLTIP.UIX;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\TOOLTIPDROPSHADOW.PNG;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089RCDATA\_DATATABLE.UIB;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/UIXcontrols/UIXcontrols.csproj b/UIXcontrols/UIXcontrols.csproj index e17f3c7..7b79e09 100644 --- a/UIXcontrols/UIXcontrols.csproj +++ b/UIXcontrols/UIXcontrols.csproj @@ -7,10 +7,15 @@ UIXControls false - + - - + + + + + RCDATA.resources + + \ No newline at end of file