Skip to content

A Swiss Army knife for developers.

Added support of UUID version 1 in GUID Generator tool (#90)

Etienne Baudoux9e057d3f60b8
diff --git a/README.md b/README.md
index 24bc0c6ad..2a9cef84d 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ DevToys helps in everyday tasks like formatting JSON, comparing text, testing Re
Many tools are available.
- Base 64 Encoder/Decoder
- Hash Generator (MD5, SHA1, SHA256, SHA512)
-- Guid Generator
+- UUID Generator
- JWT Decoder
- Json Formatter
- RegExp Tester
@@ -76,7 +76,7 @@ For example, `start devtoys:?tool=jsonyaml` will open DevToys and start on the `
Here is the list of tool name you can use:
- `base64` - Base64 Encoder/Decoder
- `hash` - Hash Generator
-- `guid` - Guid Generator
+- `uuid` - UUID Generator
- `jsonformat` Json Formatter
- `jsonyaml` - Json <> Yaml
- `jwt` - JWT Decoder
diff --git a/src/dev/impl/DevToys/LanguageManager.cs b/src/dev/impl/DevToys/LanguageManager.cs
index 74caca0ca..dd86460cb 100644
--- a/src/dev/impl/DevToys/LanguageManager.cs
+++ b/src/dev/impl/DevToys/LanguageManager.cs
@@ -392,6 +392,26 @@ namespace DevToys
/// Gets the resource Uppercase.
/// </summary>
public string Uppercase => _resources.GetString("Uppercase");
+
+ /// <summary>
+ /// Gets the resource UuidVersionFour.
+ /// </summary>
+ public string UuidVersionFour => _resources.GetString("UuidVersionFour");
+
+ /// <summary>
+ /// Gets the resource UuidVersionOne.
+ /// </summary>
+ public string UuidVersionOne => _resources.GetString("UuidVersionOne");
+
+ /// <summary>
+ /// Gets the resource VersionDescription.
+ /// </summary>
+ public string VersionDescription => _resources.GetString("VersionDescription");
+
+ /// <summary>
+ /// Gets the resource VersionTitle.
+ /// </summary>
+ public string VersionTitle => _resources.GetString("VersionTitle");
}
public class HashGeneratorStrings : ObservableObject
diff --git a/src/dev/impl/DevToys/Strings/cs-CZ/GuidGenerator.resw b/src/dev/impl/DevToys/Strings/cs-CZ/GuidGenerator.resw
index dc68bebf7..97340739d 100644
--- a/src/dev/impl/DevToys/Strings/cs-CZ/GuidGenerator.resw
+++ b/src/dev/impl/DevToys/Strings/cs-CZ/GuidGenerator.resw
@@ -118,22 +118,22 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AccessibleName" xml:space="preserve">
- <value>Guid Generator tool</value>
+ <value>UUID Generator tool</value>
</data>
<data name="Configuration" xml:space="preserve">
<value>Konfigurace</value>
</data>
<data name="DisplayName" xml:space="preserve">
- <value>Guid Generátor</value>
+ <value>UUID Generátor</value>
</data>
<data name="Generate" xml:space="preserve">
<value>Generovat</value>
</data>
<data name="GenerateButton" xml:space="preserve">
- <value>Generovat GUID(y)</value>
+ <value>Generovat UUID(y)</value>
</data>
<data name="Guids" xml:space="preserve">
- <value>GUID(y)</value>
+ <value>UUID(y)</value>
</data>
<data name="Hyphens" xml:space="preserve">
<value>Spojovníky</value>
@@ -142,9 +142,21 @@
<value>x</value>
</data>
<data name="NumberOfGuidsToGenerate_AutomationProperties_Name" xml:space="preserve">
- <value>Number of GUID to generate</value>
+ <value>Number of UUID to generate</value>
</data>
<data name="Uppercase" xml:space="preserve">
<value>Velká písmena</value>
</data>
+ <data name="UuidVersionFour" xml:space="preserve">
+ <value>4 (GUID)</value>
+ </data>
+ <data name="UuidVersionOne" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="VersionDescription" xml:space="preserve">
+ <value>Choose the version of UUID to generate</value>
+ </data>
+ <data name="VersionTitle" xml:space="preserve">
+ <value>UUID version</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevToys/Strings/en-US/GuidGenerator.resw b/src/dev/impl/DevToys/Strings/en-US/GuidGenerator.resw
index 8d213cb6d..a8dd32756 100644
--- a/src/dev/impl/DevToys/Strings/en-US/GuidGenerator.resw
+++ b/src/dev/impl/DevToys/Strings/en-US/GuidGenerator.resw
@@ -118,22 +118,22 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AccessibleName" xml:space="preserve">
- <value>Guid Generator tool</value>
+ <value>UUID Generator tool</value>
</data>
<data name="Configuration" xml:space="preserve">
<value>Configuration</value>
</data>
<data name="DisplayName" xml:space="preserve">
- <value>Guid Generator</value>
+ <value>UUID Generator</value>
</data>
<data name="Generate" xml:space="preserve">
<value>Generate</value>
</data>
<data name="GenerateButton" xml:space="preserve">
- <value>Generate GUID(s)</value>
+ <value>Generate UUID(s)</value>
</data>
<data name="Guids" xml:space="preserve">
- <value>GUID(s)</value>
+ <value>UUID(s)</value>
</data>
<data name="Hyphens" xml:space="preserve">
<value>Hyphens</value>
@@ -142,9 +142,21 @@
<value>x</value>
</data>
<data name="NumberOfGuidsToGenerate_AutomationProperties_Name" xml:space="preserve">
- <value>Number of GUID to generate</value>
+ <value>Number of UUID to generate</value>
</data>
<data name="Uppercase" xml:space="preserve">
<value>Uppercase</value>
</data>
+ <data name="UuidVersionFour" xml:space="preserve">
+ <value>4 (GUID)</value>
+ </data>
+ <data name="UuidVersionOne" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="VersionDescription" xml:space="preserve">
+ <value>Choose the version of UUID to generate</value>
+ </data>
+ <data name="VersionTitle" xml:space="preserve">
+ <value>UUID version</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevToys/Strings/fr-FR/GuidGenerator.resw b/src/dev/impl/DevToys/Strings/fr-FR/GuidGenerator.resw
index 668881614..a1c6ddafe 100644
--- a/src/dev/impl/DevToys/Strings/fr-FR/GuidGenerator.resw
+++ b/src/dev/impl/DevToys/Strings/fr-FR/GuidGenerator.resw
@@ -118,22 +118,22 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AccessibleName" xml:space="preserve">
- <value>Générateur de Guid</value>
+ <value>Générateur de UUID</value>
</data>
<data name="Configuration" xml:space="preserve">
<value>Configuration</value>
</data>
<data name="DisplayName" xml:space="preserve">
- <value>Générateur de Guid</value>
+ <value>Générateur de UUID</value>
</data>
<data name="Generate" xml:space="preserve">
<value>Générer</value>
</data>
<data name="GenerateButton" xml:space="preserve">
- <value>Générer le(s) GUID(s)</value>
+ <value>Générer le(s) UUID(s)</value>
</data>
<data name="Guids" xml:space="preserve">
- <value>GUID(s)</value>
+ <value>UUID(s)</value>
</data>
<data name="Hyphens" xml:space="preserve">
<value>Tirets</value>
@@ -142,9 +142,21 @@
<value>x</value>
</data>
<data name="NumberOfGuidsToGenerate_AutomationProperties_Name" xml:space="preserve">
- <value>Nombre de GUID à générer</value>
+ <value>Nombre de UUID à générer</value>
</data>
<data name="Uppercase" xml:space="preserve">
<value>Majuscule</value>
</data>
+ <data name="UuidVersionFour" xml:space="preserve">
+ <value>4 (GUID)</value>
+ </data>
+ <data name="UuidVersionOne" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="VersionDescription" xml:space="preserve">
+ <value>Sélectionner la version du UUID à générer</value>
+ </data>
+ <data name="VersionTitle" xml:space="preserve">
+ <value>Version du UUID</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevToys/Strings/pl-PL/GuidGenerator.resw b/src/dev/impl/DevToys/Strings/pl-PL/GuidGenerator.resw
index 6a5b37a5d..c4a07ea34 100644
--- a/src/dev/impl/DevToys/Strings/pl-PL/GuidGenerator.resw
+++ b/src/dev/impl/DevToys/Strings/pl-PL/GuidGenerator.resw
@@ -118,22 +118,22 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AccessibleName" xml:space="preserve">
- <value>Guid Generator tool</value>
+ <value>UUID Generator tool</value>
</data>
<data name="Configuration" xml:space="preserve">
<value>Konfiguracja</value>
</data>
<data name="DisplayName" xml:space="preserve">
- <value>Generator GUID</value>
+ <value>Generator UUID</value>
</data>
<data name="Generate" xml:space="preserve">
<value>Generuj</value>
</data>
<data name="GenerateButton" xml:space="preserve">
- <value>Generuj GUID(y)</value>
+ <value>Generuj UUID(y)</value>
</data>
<data name="Guids" xml:space="preserve">
- <value>GUID(y)</value>
+ <value>UUID(y)</value>
</data>
<data name="Hyphens" xml:space="preserve">
<value>Myślniki</value>
@@ -142,9 +142,21 @@
<value>×</value>
</data>
<data name="NumberOfGuidsToGenerate_AutomationProperties_Name" xml:space="preserve">
- <value>Number of GUID to generate</value>
+ <value>Number of UUID to generate</value>
</data>
<data name="Uppercase" xml:space="preserve">
<value>Wielka litera</value>
</data>
+ <data name="UuidVersionFour" xml:space="preserve">
+ <value>4 (GUID)</value>
+ </data>
+ <data name="UuidVersionOne" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="VersionDescription" xml:space="preserve">
+ <value>Choose the version of UUID to generate</value>
+ </data>
+ <data name="VersionTitle" xml:space="preserve">
+ <value>UUID version</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevToys/Strings/ru-RU/GuidGenerator.resw b/src/dev/impl/DevToys/Strings/ru-RU/GuidGenerator.resw
index 8d213cb6d..7ad39468b 100644
--- a/src/dev/impl/DevToys/Strings/ru-RU/GuidGenerator.resw
+++ b/src/dev/impl/DevToys/Strings/ru-RU/GuidGenerator.resw
@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AccessibleName" xml:space="preserve">
- <value>Guid Generator tool</value>
+ <value>UUID Generator tool</value>
</data>
<data name="Configuration" xml:space="preserve">
<value>Configuration</value>
@@ -130,10 +130,10 @@
<value>Generate</value>
</data>
<data name="GenerateButton" xml:space="preserve">
- <value>Generate GUID(s)</value>
+ <value>Generate UUID(s)</value>
</data>
<data name="Guids" xml:space="preserve">
- <value>GUID(s)</value>
+ <value>UUID(s)</value>
</data>
<data name="Hyphens" xml:space="preserve">
<value>Hyphens</value>
@@ -142,9 +142,21 @@
<value>x</value>
</data>
<data name="NumberOfGuidsToGenerate_AutomationProperties_Name" xml:space="preserve">
- <value>Number of GUID to generate</value>
+ <value>Number of UUID to generate</value>
</data>
<data name="Uppercase" xml:space="preserve">
<value>Uppercase</value>
</data>
+ <data name="UuidVersionFour" xml:space="preserve">
+ <value>4 (GUID)</value>
+ </data>
+ <data name="UuidVersionOne" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="VersionDescription" xml:space="preserve">
+ <value>Choose the version of UUID to generate</value>
+ </data>
+ <data name="VersionTitle" xml:space="preserve">
+ <value>UUID version</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevToys/Strings/zh-CN/GuidGenerator.resw b/src/dev/impl/DevToys/Strings/zh-CN/GuidGenerator.resw
index d19ffbd6b..91721032d 100644
--- a/src/dev/impl/DevToys/Strings/zh-CN/GuidGenerator.resw
+++ b/src/dev/impl/DevToys/Strings/zh-CN/GuidGenerator.resw
@@ -118,22 +118,22 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AccessibleName" xml:space="preserve">
- <value>Guid Generator tool</value>
+ <value>UUID Generator tool</value>
</data>
<data name="Configuration" xml:space="preserve">
<value>配置</value>
</data>
<data name="DisplayName" xml:space="preserve">
- <value>Guid 生成器</value>
+ <value>UUID 生成器</value>
</data>
<data name="Generate" xml:space="preserve">
<value>生成</value>
</data>
<data name="GenerateButton" xml:space="preserve">
- <value>生成 GUID(s)</value>
+ <value>生成 UUID(s)</value>
</data>
<data name="Guids" xml:space="preserve">
- <value>GUID(s)</value>
+ <value>UUID(s)</value>
</data>
<data name="Hyphens" xml:space="preserve">
<value>连字符</value>
@@ -142,9 +142,21 @@
<value>x</value>
</data>
<data name="NumberOfGuidsToGenerate_AutomationProperties_Name" xml:space="preserve">
- <value>Number of GUID to generate</value>
+ <value>Number of UUID to generate</value>
</data>
<data name="Uppercase" xml:space="preserve">
<value>大写字母</value>
</data>
+ <data name="UuidVersionFour" xml:space="preserve">
+ <value>4 (GUID)</value>
+ </data>
+ <data name="UuidVersionOne" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="VersionDescription" xml:space="preserve">
+ <value>Choose the version of UUID to generate</value>
+ </data>
+ <data name="VersionTitle" xml:space="preserve">
+ <value>UUID version</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/GuidGenerator/GuidGeneratorToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/GuidGenerator/GuidGeneratorToolProvider.cs
index d30d8a895..bec4999e9 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/GuidGenerator/GuidGeneratorToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/GuidGenerator/GuidGeneratorToolProvider.cs
@@ -7,8 +7,8 @@ using DevToys.Api.Tools;
namespace DevToys.ViewModels.Tools.GuidGenerator
{
[Export(typeof(IToolProvider))]
- [Name("Guid Generator")]
- [ProtocolName("guid")]
+ [Name("UUID Generator")]
+ [ProtocolName("uuid")]
[Order(3)]
[CompactOverlaySize(width: 400, height: 500)]
internal sealed class GuidGeneratorToolProvider : ToolProviderBase, IToolProvider
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/GuidGenerator/GuidGeneratorToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/GuidGenerator/GuidGeneratorToolViewModel.cs
index c60fce7e7..b352323d2 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/GuidGenerator/GuidGeneratorToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/GuidGenerator/GuidGeneratorToolViewModel.cs
@@ -17,7 +17,7 @@ namespace DevToys.ViewModels.Tools.GuidGenerator
public sealed class GuidGeneratorToolViewModel : ObservableRecipient, IToolViewModel
{
/// <summary>
- /// Whether the generated GUID should be uppercase or lowercase.
+ /// Whether the generated UUID should be uppercase or lowercase.
/// </summary>
private static readonly SettingDefinition<bool> Uppercase
= new(
@@ -26,7 +26,7 @@ namespace DevToys.ViewModels.Tools.GuidGenerator
defaultValue: false);
/// <summary>
- /// Whether the generated GUID should have hyphens or not.
+ /// Whether the generated UUID should have hyphens or not.
/// </summary>
private static readonly SettingDefinition<bool> Hyphens
= new(
@@ -34,6 +34,15 @@ namespace DevToys.ViewModels.Tools.GuidGenerator
isRoaming: true,
defaultValue: true);
+ /// <summary>
+ /// The UUID Version to generate.
+ /// </summary>
+ private static readonly SettingDefinition<string> Version
+ = new(
+ name: $"{nameof(GuidGeneratorToolViewModel)}.{nameof(Version)}",
+ isRoaming: true,
+ defaultValue: DefaultVersion);
+
/// <summary>
/// How many GUIDs should be generated at once.
/// </summary>
@@ -43,6 +52,22 @@ namespace DevToys.ViewModels.Tools.GuidGenerator
isRoaming: true,
defaultValue: 1);
+ private static readonly Random Random = new Random();
+
+ private static readonly DateTimeOffset GregorianCalendarStart = new(1582, 10, 15, 0, 0, 0, TimeSpan.Zero);
+ private const int VariantByte = 8;
+ private const int VariantByteMask = 0x3f;
+ private const int VariantByteShift = 0x80;
+ private const int VersionByte = 7;
+ private const int VersionByteMask = 0x0f;
+ private const int VersionByteShift = 4;
+ private const int ByteArraySize = 16;
+ private const byte TimestampByte = 0;
+ private const byte NodeByte = 10;
+ private const byte GuidClockSequenceByte = 8;
+ private const string DefaultVersion = "Four";
+ internal const string VersionOne = "One";
+
private readonly IMarketingService _marketingService;
private readonly ISettingsProvider _settingsProvider;
@@ -79,6 +104,19 @@ namespace DevToys.ViewModels.Tools.GuidGenerator
}
}
+ internal string UuidVersion
+ {
+ get => _settingsProvider.GetSetting(Version);
+ set
+ {
+ if (_settingsProvider.GetSetting(Version) != value)
+ {
+ _settingsProvider.SetSetting(Version, value);
+ OnPropertyChanged();
+ }
+ }
+ }
+
internal int NumberOfGuidsToGenerate
{
get => _settingsProvider.GetSetting(GuidsToGenerate);
@@ -128,7 +166,16 @@ namespace DevToys.ViewModels.Tools.GuidGenerator
var newGuids = new StringBuilder();
for (int i = 0; i < NumberOfGuidsToGenerate; i++)
{
- string? guid = Guid.NewGuid().ToString(guidStringFormat);
+ string? guid;
+ if (string.Equals(VersionOne, UuidVersion, StringComparison.Ordinal))
+ {
+ guid = GenerateTimeBasedGuid().ToString(guidStringFormat);
+ }
+ else
+ {
+ guid = Guid.NewGuid().ToString(guidStringFormat);
+ }
+
if (IsUppercase)
{
guid = guid.ToUpperInvariant();
@@ -148,5 +195,70 @@ namespace DevToys.ViewModels.Tools.GuidGenerator
}
#endregion
+
+ private Guid GenerateTimeBasedGuid()
+ {
+ DateTime dateTime = DateTime.UtcNow;
+ long ticks = dateTime.Ticks - GregorianCalendarStart.Ticks;
+
+ byte[] guid = new byte[ByteArraySize];
+ byte[] timestamp = BitConverter.GetBytes(ticks);
+
+ // copy node
+ byte[]? nodes = GenerateNodeBytes();
+ Array.Copy(nodes, 0, guid, NodeByte, Math.Min(6, nodes.Length));
+
+ // copy clock sequence
+ byte[]? clockSequence = GenerateClockSequenceBytes(dateTime);
+ Array.Copy(clockSequence, 0, guid, GuidClockSequenceByte, Math.Min(2, clockSequence.Length));
+
+ // copy timestamp
+ Array.Copy(timestamp, 0, guid, TimestampByte, Math.Min(8, timestamp.Length));
+
+ // set the variant
+ guid[VariantByte] &= (byte)VariantByteMask;
+ guid[VariantByte] |= (byte)VariantByteShift;
+
+ // set the version
+ guid[VersionByte] &= (byte)VersionByteMask;
+ guid[VersionByte] |= (byte)((byte)GuidVersion.TimeBased << VersionByteShift);
+
+ return new Guid(guid);
+ }
+
+ public byte[] GenerateNodeBytes()
+ {
+ byte[]? node = new byte[6];
+
+ Random.NextBytes(node);
+ return node;
+ }
+
+ public byte[] GenerateClockSequenceBytes(DateTime dt)
+ {
+ DateTime utc = dt.ToUniversalTime();
+
+ byte[]? bytes = BitConverter.GetBytes(utc.Ticks);
+
+ if (bytes.Length == 0)
+ {
+ return new byte[] { 0x0, 0x0 };
+ }
+
+ if (bytes.Length == 1)
+ {
+ return new byte[] { 0x0, bytes[0] };
+ }
+
+ return new byte[] { bytes[0], bytes[1] };
+ }
+
+ private enum GuidVersion
+ {
+ TimeBased = 0x01,
+ Reserved = 0x02,
+ NameBased = 0x03,
+ Random = 0x04
+ }
}
}
diff --git a/src/dev/impl/DevToys/Views/Tools/GuidGenerator/GuidGeneratorToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/GuidGenerator/GuidGeneratorToolPage.xaml
index 78de78dda..b032b8de1 100644
--- a/src/dev/impl/DevToys/Views/Tools/GuidGenerator/GuidGeneratorToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/GuidGenerator/GuidGeneratorToolPage.xaml
@@ -5,11 +5,26 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:DevToys.UI.Controls"
+ xmlns:ex="using:DevToys.UI.Extensions"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d"
NavigationCacheMode="Required">
<Grid Margin="0,0,0,16" RowSpacing="12">
+ <VisualStateManager.VisualStateGroups>
+ <VisualStateGroup>
+ <VisualState>
+ <VisualState.StateTriggers>
+ <ex:IsCompactOverlayModeTrigger TargetElement="{x:Bind}" />
+ </VisualState.StateTriggers>
+ <VisualState.Setters>
+ <Setter Target="HyphensSetting.Visibility" Value="Collapsed" />
+ <Setter Target="UppercaseSetting.Visibility" Value="Collapsed" />
+ </VisualState.Setters>
+ </VisualState>
+ </VisualStateGroup>
+ </VisualStateManager.VisualStateGroups>
+
<Grid.ChildrenTransitions>
<TransitionCollection>
<EntranceThemeTransition IsStaggeringEnabled="True" FromVerticalOffset="50"/>
@@ -26,6 +41,7 @@
<TextBlock Style="{StaticResource SubTitleTextBlock}" Text="{x:Bind ViewModel.Strings.Configuration}" />
<controls:ExpandableSettingControl
+ x:Name="HyphensSetting"
TabIndex="0"
Title="{x:Bind ViewModel.Strings.Hyphens}">
<controls:ExpandableSettingControl.Icon>
@@ -37,7 +53,8 @@
</controls:ExpandableSettingControl>
<controls:ExpandableSettingControl
- TabIndex="1"
+ x:Name="UppercaseSetting"
+ TabIndex="0"
Title="{x:Bind ViewModel.Strings.Uppercase}">
<controls:ExpandableSettingControl.Icon>
<FontIcon Glyph="&#xF7B2;" />
@@ -46,6 +63,21 @@
Style="{StaticResource RightAlignedToggleSwitchStyle}"
IsOn="{x:Bind ViewModel.IsUppercase, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
</controls:ExpandableSettingControl>
+
+ <controls:ExpandableSettingControl
+ TabIndex="0"
+ Title="{x:Bind ViewModel.Strings.VersionTitle}"
+ Description="{x:Bind ViewModel.Strings.VersionDescription}">
+ <controls:ExpandableSettingControl.Icon>
+ <FontIcon Glyph="&#xF587;" />
+ </controls:ExpandableSettingControl.Icon>
+ <ComboBox
+ SelectedValuePath="Tag"
+ SelectedValue="{x:Bind ViewModel.UuidVersion, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+ <ComboBoxItem Tag="One" Content="{x:Bind ViewModel.Strings.UuidVersionOne}" />
+ <ComboBoxItem Tag="Four" Content="{x:Bind ViewModel.Strings.UuidVersionFour}"/>
+ </ComboBox>
+ </controls:ExpandableSettingControl>
</StackPanel>
<StackPanel Grid.Row="1" Spacing="4" >
@@ -53,13 +85,13 @@
<StackPanel Spacing="8" Orientation="Horizontal">
<Button
- TabIndex="3"
+ TabIndex="2"
Style="{StaticResource AccentButtonStyle}"
Content="{x:Bind ViewModel.Strings.GenerateButton}"
Command="{x:Bind ViewModel.GenerateCommand}"/>
<TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Bind ViewModel.Strings.MultiplySymbol}"/>
<muxc:NumberBox
- TabIndex="2"
+ TabIndex="1"
MinWidth="100"
Value="{x:Bind ViewModel.NumberOfGuidsToGenerate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SpinButtonPlacementMode="Compact"
@@ -73,7 +105,7 @@
<controls:CustomTextBox
x:Name="OutputTextBox"
Grid.Row="2"
- TabIndex="4"
+ TabIndex="3"
Header="{x:Bind ViewModel.Strings.Guids}"
MinHeight="150"
AcceptsReturn="True"