forV1.1.1

Jun-Murakami · Jun 7, 2023 · 39c23c6 · 39c23c6
1 parent 4426ffa
commit 39c23c6
Show file tree

Hide file tree

Showing 7 changed files with 1,091 additions and 710 deletions.
diff --git a/Assets/Styles.axaml b/Assets/Styles.axaml
diff --git a/src/Models/Class/CustomDateConverter.cs b/src/Models/Class/CustomDateConverter.cs
@@ -10,11 +10,11 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         {
             if (value is DateTime date)
             {
-                var dateFormatInfo = culture.DateTimeFormat;
-                var separator = dateFormatInfo.DateSeparator;
+                var dateFormatInfo = (DateTimeFormatInfo)culture.DateTimeFormat.Clone();
+                dateFormatInfo.DateSeparator = ".";
 
                 var shortPattern = dateFormatInfo.ShortDatePattern.Replace("yyyy", "yy");
-                return date.ToString(shortPattern, culture);
+                return date.ToString(shortPattern, dateFormatInfo);
             }
             return value;
         }
@@ -26,4 +26,5 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
     }
 
 
+
 }
diff --git a/src/ViewModels/PhrasePresetsViewModel.cs b/src/ViewModels/PhrasePresetsViewModel.cs
@@ -8,6 +8,9 @@ public class PhrasePresetsViewModel : ViewModelBase
         public PhrasePresetsViewModel()
         {
             Phrases = new ObservableCollection<string>(Enumerable.Repeat("", 20));
+
+            CtrlKeyIsDown = false;
+            AltKeyIsDown = false;
         }
 
         private ObservableCollection<string> _phrases;
@@ -16,6 +19,20 @@ public ObservableCollection<string> Phrases
             get => _phrases;
             set => SetProperty(ref _phrases, value);
         }
+
+        private bool _ctrlKeyIsDown;
+        public bool CtrlKeyIsDown
+        {
+            get => _ctrlKeyIsDown;
+            set => SetProperty(ref _ctrlKeyIsDown, value);
+        }
+
+        private bool _altKeyIsDown;
+        public bool AltKeyIsDown
+        {
+            get => _altKeyIsDown;
+            set => SetProperty(ref _altKeyIsDown, value);
+        }
     }
 
 }