Logon window fix

toggle full screen mode removed some diagnostics
Slazanger · Apr 28, 2020 · a0960fb · a0960fb
1 parent 50baffe
commit a0960fb
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/LogonWindow.xaml b/LogonWindow.xaml
@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         Title="Auth.." Height="120" Width="250" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" Closed="Window_Closed">
     <Grid>
-        <StackPanel>
+        <StackPanel Background="#FF232223">
             <Label>logon using the browser that opened...</Label>
         </StackPanel>
     </Grid>

diff --git a/LogonWindow.xaml.cs b/LogonWindow.xaml.cs
@@ -52,7 +52,7 @@ private void StartServer()
                 {
                     // now close the window
                     Close();
-                }), DispatcherPriority.ContextIdle, null);
+                }), DispatcherPriority.Normal, null);
             }
             catch
             {

diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -12,7 +12,6 @@
         xmlns:xcadl="clr-namespace:AvalonDock.Layout;assembly=AvalonDock"
         xmlns:xcadt="clr-namespace:AvalonDock.Themes;assembly=AvalonDock.Themes.Expression"
         mc:Ignorable="d"
-        xmlns:diag="clr-namespace:System.Diagnostics;assembly=WindowsBase"
         Title="SMT" Height="850" Width="1124" Icon="smt_bomb_icon.ico" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip">
 
     <Window.Resources>
@@ -28,7 +27,7 @@
 
         <DataTemplate DataType="{x:Type localEveData:IntelData}">
             <DockPanel >
-                <TextBlock Text="{Binding Path=IntelTime, StringFormat='HH:mm', FallbackValue='TIME', diag:PresentationTraceSources.TraceLevel=High}" Foreground="Yellow" Padding="0,0,5,0"/>
+                <TextBlock Text="{Binding Path=IntelTime, StringFormat='HH:mm', FallbackValue='TIME'}" Foreground="Yellow" Padding="0,0,5,0"/>
                 <TextBlock Text="{Binding Path=IntelString, FallbackValue='Intel Data'}" Foreground="White" TextWrapping="WrapWithOverflow"/>
             </DockPanel>
         </DataTemplate>
@@ -46,6 +45,11 @@
                 <MenuItem Header="Force ESI Update" Click="ForceESIUpdate_MenuItem_Click"/>
             </MenuItem>
 
+            <MenuItem Header="View">
+                <MenuItem x:Name="miFullScreenToggle" Header="FullScreen" IsCheckable="True" IsChecked="False" Click="FullScreenToggle_MenuItem_Click"/>
+            </MenuItem>
+
+
         </Menu>
         <StatusBar x:Name="AppStatusBar" DockPanel.Dock="Bottom" Background="{DynamicResource NormalBrush}">
             <StatusBarItem>
@@ -63,13 +67,13 @@
             </StatusBarItem>
 
             <StatusBarItem>
-                <TextBlock Text="{Binding Path=EVEManager.ServerInfo.ServerVersion, diag:PresentationTraceSources.TraceLevel=High}" Foreground="White"/>
+                <TextBlock Text="{Binding Path=EVEManager.ServerInfo.ServerVersion}" Foreground="White"/>
             </StatusBarItem>
 
             <Separator />
 
             <StatusBarItem>
-                <TextBlock Text="{Binding Path=EVEManager.ServerInfo.NumPlayers, diag:PresentationTraceSources.TraceLevel=High}" Foreground="White"/>
+                <TextBlock Text="{Binding Path=EVEManager.ServerInfo.NumPlayers}" Foreground="White"/>
             </StatusBarItem>
 
             <StatusBarItem >
@@ -130,7 +134,7 @@
                                             <ListView.ItemTemplate>
                                                 <DataTemplate >
                                                     <StackPanel Orientation="Horizontal">
-                                                        <TextBlock Text="{Binding Path=IntelTime, StringFormat='HH:mm', FallbackValue='TIME', diag:PresentationTraceSources.TraceLevel=High}" Foreground="Red" Padding="0,0,5,0" />
+                                                        <TextBlock Text="{Binding Path=IntelTime, StringFormat='HH:mm', FallbackValue='TIME'}" Foreground="Red" Padding="0,0,5,0" />
                                                         <TextBlock Text="{Binding Path=IntelString, FallbackValue='Intel Data'}" Foreground="White" TextWrapping="WrapWithOverflow"/>
                                                     </StackPanel>
                                                 </DataTemplate>
@@ -146,10 +150,10 @@
                             <xcadl:LayoutDocument CanClose="False" CanFloat="True" ContentId="UniverseContentID" Title="Regions">
                                 <Grid x:Name="MainUniverseGrid"  ClipToBounds="True" Grid.Row="1">
                                     <Popup x:Name="RegionCharacterInfo" IsOpen="False" AllowsTransparency="True">
-                                        <StackPanel x:Name="RegionCharacterInfoSP" />
+                                        <StackPanel x:Name="RegionCharacterInfoSP" Background="#FF232223"/>
                                     </Popup>
                                     <Popup x:Name="RegionTheraInfo" IsOpen="False" AllowsTransparency="True">
-                                        <StackPanel x:Name="RegionTheraInfoSP" />
+                                        <StackPanel x:Name="RegionTheraInfoSP" Background="#FF232223"/>
                                     </Popup>
 
                                     <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -277,7 +281,7 @@
                                                         </ToggleButton>
                                                     </StackPanel>
 
-                                                    <Slider  Width="130" Cursor="Arrow" Margin="0" Value="{Binding MapConf.UniverseDataScale}" Minimum="0.1" Maximum="5" TickFrequency="0.1" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="1" Foreground="{x:Null}" BorderBrush="{x:Null}" Background="{x:Null}" Height="19" ToolTip="Overlay/Data Scale" TickPlacement="Both" SmallChange="0.2" IsSnapToTickEnabled="True" />
+                                                    <Slider  Width="130" Cursor="Arrow" Margin="0" Value="{Binding MapConf.UniverseDataScale}" Minimum="0.1" Maximum="5" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="1" Foreground="{x:Null}" BorderBrush="{x:Null}" Background="{x:Null}" Height="19" ToolTip="Overlay/Data Scale" TickPlacement="Both" SmallChange="0.2" IsSnapToTickEnabled="True" TickFrequency="0.2"/>
                                                 </StackPanel>
                                             </Grid>
                                         </Canvas>

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -23,7 +23,7 @@ namespace SMT
     public partial class MainWindow : Window
     {
         public static MainWindow AppWindow;
-        public string SMTVersion = "SMT_079";
+        public string SMTVersion = "SMT_080";
 
         private static NLog.Logger OutputLog = NLog.LogManager.GetCurrentClassLogger();
 
@@ -547,7 +547,7 @@ private void AddRegionsToUniverse()
                     FactionText.VerticalContentAlignment = VerticalAlignment.Bottom;
 
                     Canvas.SetLeft(FactionText, mr.UniverseViewX - 40);
-                    Canvas.SetTop(FactionText, mr.UniverseViewY - 15);
+                    Canvas.SetTop(FactionText, mr.UniverseViewY - 20);
                     Canvas.SetZIndex(FactionText, 23);
                     MainUniverseCanvas.Children.Add(FactionText);
                 }
@@ -1430,6 +1430,22 @@ private void AddWaypointsBtn_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private void FullScreenToggle_MenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            if(miFullScreenToggle.IsChecked)
+            {
+                WindowStyle = WindowStyle.None;
+                WindowState = WindowState.Maximized;
+
+            }
+            else
+            {
+                WindowStyle = WindowStyle.SingleBorderWindow;
+                WindowState = WindowState.Normal;
+
+            }
+        }
+
 
 
         /*