Skip to content

Commit 70634e4

Browse files
author
EVEJay
committed
Removed OverlayShowAllCharacterNames from Preferences and all code. Was deprecated by dropdown to configure which chars to show on the overlay.
1 parent a52cdb8 commit 70634e4

File tree

3 files changed

+4
-32
lines changed

3 files changed

+4
-32
lines changed

SMT/MapConfig.cs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ public class MapConfig : INotifyPropertyChanged
107107
private bool m_overlayShowRoute = true;
108108
private bool m_overlayShowJumpBridges = true;
109109
private bool m_overlayShowSystemNames = false;
110-
private bool m_overlayShowAllCharacterNames = false;
111110
private bool m_overlayIndividualCharacterWindows = false;
112111
private string m_overlayAdditionalCharacterNamesDisplay = "All";
113112

@@ -1173,22 +1172,6 @@ public bool OverlayShowSystemNames
11731172
}
11741173
}
11751174

1176-
[Category("Overlay")]
1177-
[DisplayName("Overlay Show All Character Names")]
1178-
public bool OverlayShowAllCharacterNames
1179-
{
1180-
get
1181-
{
1182-
return m_overlayShowAllCharacterNames;
1183-
}
1184-
set
1185-
{
1186-
m_overlayShowAllCharacterNames = value;
1187-
1188-
OnPropertyChanged("OverlayShowAllCharacterNames");
1189-
}
1190-
}
1191-
11921175
[Category("Overlay")]
11931176
[DisplayName("Overlay Intel Fresh Time")]
11941177
public float IntelFreshTime
@@ -1368,7 +1351,6 @@ public void SetDefaults()
13681351
OverlayShowRoute = true;
13691352
OverlayShowJumpBridges = true;
13701353
OverlayShowSystemNames = false;
1371-
OverlayShowAllCharacterNames = false;
13721354
OverlayAdditionalCharacterNamesDisplay = "All";
13731355

13741356
IntelFreshTime = 30;

SMT/Overlay.xaml.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ public partial class Overlay : Window
292292
private bool showCharLocation = true;
293293
private bool showJumpBridges = true;
294294
private bool showSystemNames = false;
295-
private bool showAllCharacterNames = false;
296295
private bool individualCharacterWindows = false;
297296
private string additionalCharacterNamesDisplay = "All";
298297

@@ -409,7 +408,6 @@ public Overlay(MainWindow mw)
409408
overlayDepth = mainWindow.MapConf.OverlayRange + 1;
410409
showJumpBridges = mainWindow.MapConf.OverlayShowJumpBridges;
411410
showSystemNames = mainWindow.MapConf.OverlayShowSystemNames;
412-
showAllCharacterNames = mainWindow.MapConf.OverlayShowAllCharacterNames;
413411
individualCharacterWindows = mainWindow.MapConf.OverlayIndividualCharacterWindows;
414412
additionalCharacterNamesDisplay = mainWindow.MapConf.OverlayAdditionalCharacterNamesDisplay;
415413

@@ -1915,13 +1913,6 @@ private void OverlayConf_PropertyChanged(object sender, PropertyChangedEventArgs
19151913
RefreshCurrentView();
19161914
}
19171915

1918-
if(e.PropertyName == "OverlayShowAllCharacterNames")
1919-
{
1920-
showAllCharacterNames = mainWindow.MapConf.OverlayShowAllCharacterNames;
1921-
ClearView();
1922-
RefreshCurrentView();
1923-
}
1924-
19251916
if(e.PropertyName == "OverlayIndividualCharacterWindows")
19261917
{
19271918
individualCharacterWindows = mainWindow.MapConf.OverlayIndividualCharacterWindows;

SMT/Preferences.xaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -399,16 +399,15 @@
399399

400400
<StackPanel Orientation="Vertical" Margin="0,0">
401401
<Label Content="Overlay Information" />
402-
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowCharName}" Content="Show name of the active character" />
403-
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowCharLocation}" Content="Show location of the active character" />
404-
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowJumpBridges}" Content="Show JumpBridges" />
405-
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowSystemNames}" Content="Show Individual System Names" />
402+
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowCharName}" Content="Show name of the active character in title" />
403+
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowCharLocation}" Content="Show location of the active character in title" />
404+
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowJumpBridges}" Content="Show JumpBridges on overlay" />
405+
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowSystemNames}" Content="Show Individual System Names on overlay" />
406406
<Label Content="Hunter Mode Information" />
407407
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowNPCKills}" Content="Show NPC kills" />
408408
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowNPCKillDelta}" Content="Show NPC kill delta" />
409409
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowRoute}" Content="Show the current route" />
410410
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayHunterModeShowFullRegion}" Content="Show the full region in hunter mode" />
411-
<CheckBox Margin="0,3" IsChecked="{Binding Path=OverlayShowAllCharacterNames}" Content="Show the names of all characters on the map" />
412411
</StackPanel>
413412
</StackPanel>
414413
</GroupBox>

0 commit comments

Comments
 (0)