v2.0.2

torum · Jan 7, 2023 · 03fa78f · 03fa78f
1 parent ac2b327
commit 03fa78f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 24 deletions.
diff --git a/BitWallpaper/App.xaml.cs b/BitWallpaper/App.xaml.cs
@@ -142,10 +142,10 @@ private void ShowBalloon(ShowBalloonEventArgs arg)
             var appNotification = new AppNotificationBuilder()
     .AddText(arg.Title)
     .AddText(arg.Text)
-        .AddButton(new AppNotificationButton("OK")
-            .AddArgument("action", "dissmiss"))
     .SetTimeStamp(new DateTime(2017, 04, 15, 19, 45, 00, DateTimeKind.Utc)).BuildNotification();
-
+
+        //.AddButton(new AppNotificationButton("OK")
+            //.AddArgument("action", "dissmiss"))
             //.SetTimeStamp(new DateTime(2017, 04, 15, 19, 45, 00, DateTimeKind.Utc));
 
             //.SetScenario(AppNotificationScenario.Alarm)
@@ -207,7 +207,7 @@ private void TaskScheduler_UnobservedTaskException(object sender, UnobservedTask
             AppendErrorLog("TaskScheduler_UnobservedTaskException", exception.Message);
             SaveErrorLog();
 
-            e.SetObserved();
+            //e.SetObserved();
         }
 
         private void CurrentDomain_UnhandledException(object sender, System.UnhandledExceptionEventArgs e)

diff --git a/BitWallpaper/Strings/en-US/Resources.resw b/BitWallpaper/Strings/en-US/Resources.resw
@@ -234,4 +234,7 @@
   <data name="AppName" xml:space="preserve">
     <value>BitWallpaper</value>
   </data>
+  <data name="Shell_Home" xml:space="preserve">
+    <value>Home</value>
+  </data>
 </root>
diff --git a/BitWallpaper/Strings/ja-JP/Resources.resw b/BitWallpaper/Strings/ja-JP/Resources.resw
@@ -234,4 +234,7 @@
   <data name="AppName" xml:space="preserve">
     <value>BitWallpaper</value>
   </data>
+  <data name="Shell_Home" xml:space="preserve">
+    <value>Home</value>
+  </data>
 </root>
diff --git a/BitWallpaper/ViewModels/MainViewModel.cs b/BitWallpaper/ViewModels/MainViewModel.cs
@@ -20,7 +20,7 @@ public partial class MainViewModel : ViewModelBase
 {
     #region == Application general ==
 
-    public string VersionText { get => "v2.0.1.2"; }
+    public string VersionText { get => "v2.0.2.0"; }
 
     #endregion
 
@@ -449,17 +449,6 @@ public MainViewModel()
         _dispatcherTimerTickAllPairs.Interval = new TimeSpan(0, 0, 2);
         _dispatcherTimerTickAllPairs.Start();
 
-
-
-        //ShowBalloonEventArgs ag = new ShowBalloonEventArgs
-        //{
-        //    Title = PairBtcJpy.PairString + " 高値アラーム",
-        //    Text = PairBtcJpy.AlarmPlus.ToString("#,0") + " に達しました。"
-        //};
-        // バルーン表示
-        //ShowBalloon?.Invoke(this, ag);
-
-
     }
 
     public void SetSelectedPairFromCode(PairCodes pairCode)
@@ -706,12 +695,12 @@ private async void GetTickers()
                         if (hoge.Ltp >= hoge.AlarmPlus)
                         {
                             hoge.HighLowInfoTextColorFlag = true;
-                            hoge.HighLowInfoText = hoge.PairString + " ⇑⇑⇑　高値アラーム ";
+                            hoge.HighLowInfoText = hoge.PairString + "Alarm";
 
                             ShowBalloonEventArgs ag = new ShowBalloonEventArgs
                             {
-                                Title = hoge.PairString + " 高値アラーム",
-                                Text = hoge.AlarmPlusString + " に達しました。"
+                                Title = hoge.PairString + " High Price Alarm",
+                                Text = hoge.AlarmPlusString
                             };
 
                             // クリア
@@ -727,12 +716,12 @@ private async void GetTickers()
                         if (hoge.Ltp <= hoge.AlarmMinus)
                         {
                             hoge.HighLowInfoTextColorFlag = false;
-                            hoge.HighLowInfoText = hoge.PairString + " ⇓⇓⇓　安値アラーム ";
+                            hoge.HighLowInfoText = hoge.PairString + "Alarm";
 
                             ShowBalloonEventArgs ag = new ShowBalloonEventArgs
                             {
-                                Title = hoge.PairString + " 安値アラーム",
-                                Text = hoge.AlarmMinusString + " に達しました。"
+                                Title = hoge.PairString + " Low Price Alarm",
+                                Text = hoge.AlarmMinusString
                             };
 
                             // クリア

diff --git a/BitWallpaper/Views/MainShell.xaml b/BitWallpaper/Views/MainShell.xaml
@@ -25,13 +25,13 @@
                    HorizontalAlignment="Left"
                    Width="16"
                    Height="16"
-                   Margin="6,0,0,0"/>
+                   Margin="9,0,0,0"/>
 
             <TextBlock x:Name="AppTitleBarText" x:Uid="AppDisplayName"
                        VerticalAlignment="Center"
                        TextWrapping="NoWrap"
                        Style="{StaticResource CaptionTextBlockStyle}"
-                       Margin="28,0,0,0"/>
+                       Margin="34,0,0,0"/>
 
             <!--
               Height="{Binding ElementName=NavigationViewControl, Path=CompactPaneLength}"