Skip to content

Commit

Permalink
updated overlay size
Browse files Browse the repository at this point in the history 
updated defaults for deltas
moved overlay config
  • Loading branch information
@BitBaboonSteve
BitBaboonSteve committed Feb 1, 2023
1 parent d6db511 commit a46d133
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 39 deletions.
2 changes: 1 addition & 1 deletion SMT/MapConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class MapConfig : INotifyPropertyChanged
private bool m_ShowJoveObservatories;
private bool m_ShowNegativeRattingDelta;

private bool m_ShowRattingDataAsDelta;
private bool m_ShowRattingDataAsDelta = true;

private bool m_ShowRegionStandings;
private bool m_ShowSimpleSecurityView;
Expand Down
10 changes: 5 additions & 5 deletions SMT/Overlay.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
</Window.Background>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="30px"/>
<ColumnDefinition Width="20px"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="30px"/>
<ColumnDefinition Width="20px"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition Height="20"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Column="1" Grid.Row="0" Background="Transparent" Name="overlay_CharNameTextblock" HorizontalAlignment="Center" TextAlignment="Center" FontSize="12" Opacity="0.5" Margin="1" Foreground="White"/>
<TextBlock Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Background="Transparent" Name="overlay_CharNameTextblock" HorizontalAlignment="Center" TextAlignment="Center" FontSize="16" Opacity="0.5" Margin="1" Foreground="White"/>
<Button Grid.Column="0" Grid.Row="0" PreviewMouseDown="Overlay_Window_Move" Opacity="0.5" ToolTip="Drag to move the overlay window." BorderThickness="0">
<Image Source="/Images/overlay_move.png" Stretch="Fill"/>
</Button>
<Button Grid.Column="2" Grid.Row="0" PreviewMouseDown="Overlay_Window_Close" Width="30" HorizontalAlignment="Right" Background="Transparent" Opacity="0.5" ToolTip="Click to close the overlay window." BorderThickness="0">
<Button Grid.Column="2" Grid.Row="0" PreviewMouseDown="Overlay_Window_Close" Width="20" HorizontalAlignment="Right" Background="Transparent" Opacity="0.5" ToolTip="Click to close the overlay window." BorderThickness="0">
<Image Source="/Images/overlay_close.png" Stretch="Fill"/>
</Button>
<StackPanel Grid.Row="1" Grid.ColumnSpan="3" x:Name="overlay_CanvasContainer" >
Expand Down
67 changes: 34 additions & 33 deletions SMT/Preferences.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,38 +224,6 @@
</StackPanel>
</Grid>
</TabItem>
<TabItem Header="Colours">
<Grid Height="362">
<ScrollViewer>
<StackPanel>
<xctk:PropertyGrid x:Name="ColoursPropertyGrid" AutoGenerateProperties="True" ShowSearchBox="False" ShowSortOptions="False">
<xctk:PropertyGrid.CategoryGroupHeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding}" Foreground="Black" />
</DataTemplate>
</xctk:PropertyGrid.CategoryGroupHeaderTemplate>
</xctk:PropertyGrid>
<Button x:Name="ResetColourData" Click="ResetColourData_Click" Content="Reset Colours" Margin="0,2" />
</StackPanel>
</ScrollViewer>
</Grid>
</TabItem>
<TabItem Header="Debug">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="50*" />
<ColumnDefinition Width="50*" />
</Grid.ColumnDefinitions>

<StackPanel Grid.Column="0">
<GroupBox Header="General" Margin="4" Height="355">
<StackPanel>
<CheckBox IsChecked="{Binding Path=Debug_EnableMapEdit}" Margin="0,2">Enable Universe Map Edits</CheckBox>
</StackPanel>
</GroupBox>
</StackPanel>
</Grid>
</TabItem>
<TabItem Header="Overlay">
<Grid>
<Grid.ColumnDefinitions>
Expand All @@ -267,7 +235,7 @@
<GroupBox Header="General" Margin="4" Height="355">
<StackPanel>


<StackPanel Orientation="Vertical" Margin="0,2">
<Label Content="Overlay Jump Range" />
<Slider x:Name="overlay_RangeSlider" Value="{Binding Path=OverlayRange}" Minimum="1" Maximum="10" TickFrequency="1" TickPlacement="BottomRight" IsMoveToPointEnabled="True" />
Expand All @@ -292,6 +260,39 @@
</StackPanel>
</Grid>
</TabItem>

<TabItem Header="Colours">
<Grid Height="362">
<ScrollViewer>
<StackPanel>
<xctk:PropertyGrid x:Name="ColoursPropertyGrid" AutoGenerateProperties="True" ShowSearchBox="False" ShowSortOptions="False">
<xctk:PropertyGrid.CategoryGroupHeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding}" Foreground="Black" />
</DataTemplate>
</xctk:PropertyGrid.CategoryGroupHeaderTemplate>
</xctk:PropertyGrid>
<Button x:Name="ResetColourData" Click="ResetColourData_Click" Content="Reset Colours" Margin="0,2" />
</StackPanel>
</ScrollViewer>
</Grid>
</TabItem>
<TabItem Header="Debug">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="50*" />
<ColumnDefinition Width="50*" />
</Grid.ColumnDefinitions>

<StackPanel Grid.Column="0">
<GroupBox Header="General" Margin="4" Height="355">
<StackPanel>
<CheckBox IsChecked="{Binding Path=Debug_EnableMapEdit}" Margin="0,2">Enable Universe Map Edits</CheckBox>
</StackPanel>
</GroupBox>
</StackPanel>
</Grid>
</TabItem>
</TabControl>
<StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom" Height="20" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,2">
<Button Content="Default" Margin="3,0" Width="55" Click="Prefs_Default_Click" />
Expand Down

0 comments on commit a46d133

Please sign in to comment.