Skip to content

Commit f132a89

Browse files
XangelMusicXangelMusic
committed
boost(settings): Troubleshooting; refactor(trayIcon): Updated Tray Menu
1 parent 75c4ea0 commit f132a89

38 files changed

+1255
-729
lines changed

‎SoundSwitch/Framework/ApplicationPath.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static class ApplicationPath
3232
public static string Default { get; } = Path.Combine(AppData, Application.ProductName);
3333

3434
/// <summary>
35-
/// Path wher ethe application store the logs
35+
/// Path where the application store the logs
3636
/// </summary>
3737
public static string Logs { get; } = Path.Combine(Default, "Logs");
3838

‎SoundSwitch/Framework/Banner/Position/PositionBottomCenter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace SoundSwitch.Framework.Banner.Position
2121
internal class PositionBottomCenter : APosition, IPosition
2222
{
2323
public BannerPositionEnum TypeEnum => BannerPositionEnum.BottomCenter;
24-
public string Label => SettingsStrings.positionOptionBottomCenter;
24+
public string Label => SettingsStrings.position_option_bottomCenter;
2525

2626
public Point GetScreenPosition(Screen screen, int height, int width, int offset)
2727
{

‎SoundSwitch/Framework/Banner/Position/PositionBottomLeft.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace SoundSwitch.Framework.Banner.Position
2121
internal class PositionBottomLeft : APosition, IPosition
2222
{
2323
public BannerPositionEnum TypeEnum => BannerPositionEnum.BottomLeft;
24-
public string Label => SettingsStrings.positionOptionBottomLeft;
24+
public string Label => SettingsStrings.position_option_bottomLeft;
2525

2626
public Point GetScreenPosition(Screen screen, int height, int width, int offset)
2727
{

‎SoundSwitch/Framework/Banner/Position/PositionBottomRight.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace SoundSwitch.Framework.Banner.Position
2121
internal class PositionBottomRight : APosition, IPosition
2222
{
2323
public BannerPositionEnum TypeEnum => BannerPositionEnum.BottomRight;
24-
public string Label => SettingsStrings.positionOptionBottomRight;
24+
public string Label => SettingsStrings.position_option_bottomRight;
2525

2626
public Point GetScreenPosition(Screen screen, int height, int width, int offset)
2727
{

‎SoundSwitch/Framework/Banner/Position/PositionTopCenter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace SoundSwitch.Framework.Banner.Position
2121
internal class PositionTopCenter : APosition, IPosition
2222
{
2323
public BannerPositionEnum TypeEnum => BannerPositionEnum.TopCenter;
24-
public string Label => SettingsStrings.positionOptionTopCenter;
24+
public string Label => SettingsStrings.position_option_topCenter;
2525

2626
public Point GetScreenPosition(Screen screen, int height, int width, int offset)
2727
{

‎SoundSwitch/Framework/Banner/Position/PositionTopLeft.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace SoundSwitch.Framework.Banner.Position
2121
internal class PositionTopLeft : APosition, IPosition
2222
{
2323
public BannerPositionEnum TypeEnum => BannerPositionEnum.TopLeft;
24-
public string Label => SettingsStrings.positionOptionTopLeft;
24+
public string Label => SettingsStrings.position_option_topLeft;
2525
public Point GetScreenPosition(Screen screen, int height, int width, int offset)
2626
{
2727
return new Point(

‎SoundSwitch/Framework/Banner/Position/PositionTopRight.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace SoundSwitch.Framework.Banner.Position
2121
internal class PositionTopRight : APosition, IPosition
2222
{
2323
public BannerPositionEnum TypeEnum => BannerPositionEnum.TopRight;
24-
public string Label => SettingsStrings.positionOptionTopRight;
24+
public string Label => SettingsStrings.position_option_topRight;
2525

2626
public Point GetScreenPosition(Screen screen, int height, int width, int offset)
2727
{

‎SoundSwitch/Framework/DeviceCyclerManager/DeviceCycler/DeviceCyclerAll.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace SoundSwitch.Framework.DeviceCyclerManager.DeviceCycler
2323
public class DeviceCyclerAll : ADeviceCycler
2424
{
2525
public override DeviceCyclerTypeEnum TypeEnum => DeviceCyclerTypeEnum.All;
26-
public override string Label => SettingsStrings.cycleThroughOptionAllAudioDevices;
26+
public override string Label => SettingsStrings.cycleThrough_option_allAudioDevices;
2727

2828

2929
protected override IEnumerable<DeviceFullInfo> GetDevices(DataFlow type)

‎SoundSwitch/Framework/DeviceCyclerManager/DeviceCycler/DeviceCyclerAvailable.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace SoundSwitch.Framework.DeviceCyclerManager.DeviceCycler
2424
public class DeviceCyclerAvailable : ADeviceCycler
2525
{
2626
public override DeviceCyclerTypeEnum TypeEnum => DeviceCyclerTypeEnum.Available;
27-
public override string Label => SettingsStrings.cycleThroughOptionOnlySelectedAudioDevices;
27+
public override string Label => SettingsStrings.cycleThrough_option_onlySelectedAudioDevices;
2828

2929
protected override IEnumerable<DeviceFullInfo> GetDevices(DataFlow type)
3030
{

‎SoundSwitch/Framework/Logger/Configuration/LoggerConfigurator.cs

+23-23
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@ public static void ConfigureLogger()
1616
const string sentryTemplate = "{Message}\n{Properties}";
1717
const string outputTemplate = "[{Timestamp:HH:mm:ss.fff} {Level:u3}]]{Properties} {Message}(at {Caller}){NewLine}{Exception}";
1818
Log.Logger = new LoggerConfiguration()
19-
#if RELEASE
20-
.MinimumLevel.Debug()
21-
#else
22-
.MinimumLevel.Verbose()
23-
#endif
24-
.Enrich.WithExceptionDetails()
25-
.Enrich.WithCaller()
26-
#if DEBUG
27-
.WriteTo.Console(LogEventLevel.Verbose, outputTemplate, theme: Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme.Code)
28-
#endif
29-
.WriteTo.File(Path.Combine(ApplicationPath.Logs, "soundswitch.log"),
30-
rollingInterval: RollingInterval.Day, retainedFileCountLimit: 3,
31-
flushToDiskInterval: TimeSpan.FromMinutes(5),
32-
outputTemplate: outputTemplate)
33-
.WriteTo.Sentry(o =>
34-
{
35-
o.InitializeSdk = false;
36-
o.MinimumBreadcrumbLevel = LogEventLevel.Debug;
37-
o.MinimumEventLevel = LogEventLevel.Error;
38-
o.TextFormatter = new MessageTemplateTextFormatter(sentryTemplate);
39-
})
40-
.CreateLogger();
41-
var listener = new global::SerilogTraceListener.SerilogTraceListener();
19+
#if RELEASE
20+
.MinimumLevel.Debug()
21+
#else
22+
.MinimumLevel.Verbose()
23+
#endif
24+
.Enrich.WithExceptionDetails()
25+
.Enrich.WithCaller()
26+
#if DEBUG
27+
.WriteTo.Console(LogEventLevel.Verbose, outputTemplate, theme: Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme.Code)
28+
#endif
29+
.WriteTo.File(Path.Combine(ApplicationPath.Logs, "soundswitch.log"),
30+
rollingInterval: RollingInterval.Day, retainedFileCountLimit: 3,
31+
flushToDiskInterval: TimeSpan.FromMinutes(5),
32+
outputTemplate: outputTemplate)
33+
.WriteTo.Sentry(o =>
34+
{
35+
o.InitializeSdk = false;
36+
o.MinimumBreadcrumbLevel = LogEventLevel.Debug;
37+
o.MinimumEventLevel = LogEventLevel.Error;
38+
o.TextFormatter = new MessageTemplateTextFormatter(sentryTemplate);
39+
})
40+
.CreateLogger();
41+
var listener = new SerilogTraceListener.SerilogTraceListener();
4242
Trace.Listeners.Add(listener);
4343
}
4444
}

‎SoundSwitch/Framework/NotificationManager/Notification/NotificationBanner.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace SoundSwitch.Framework.NotificationManager.Notification
3030
internal class NotificationBanner : INotification
3131
{
3232
public NotificationTypeEnum TypeEnum => NotificationTypeEnum.BannerNotification;
33-
public string Label => SettingsStrings.notificationOptionBanner;
33+
public string Label => SettingsStrings.notification_option_banner;
3434

3535
public INotificationConfiguration Configuration { get; set; }
3636
private readonly BannerManager _bannerManager = new();
@@ -54,8 +54,8 @@ public void NotifyDefaultChanged(DeviceFullInfo audioDevice)
5454

5555
toastData.Title = audioDevice.Type switch
5656
{
57-
DataFlow.Render => SettingsStrings.tooltipOnHoverOptionPlaybackDevice,
58-
DataFlow.Capture => SettingsStrings.tooltipOnHoverOptionRecordingDevice,
57+
DataFlow.Render => SettingsStrings.tooltipOnHover_option_playbackDevice,
58+
DataFlow.Capture => SettingsStrings.tooltipOnHover_option_recordingDevice,
5959
_ => throw new ArgumentOutOfRangeException(nameof(audioDevice.Type), audioDevice.Type, null)
6060
};
6161

‎SoundSwitch/Framework/NotificationManager/Notification/NotificationSound.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ internal class NotificationSound : INotification
3232
{
3333
private CancellationTokenSource _cancellationTokenSource;
3434
public NotificationTypeEnum TypeEnum => NotificationTypeEnum.SoundNotification;
35-
public string Label => SettingsStrings.notificationOptionSound;
35+
public string Label => SettingsStrings.notification_option_sound;
3636
public INotificationConfiguration Configuration { get; set; }
3737

3838
public void NotifyDefaultChanged(DeviceFullInfo audioDevice)

‎SoundSwitch/Framework/NotificationManager/Notification/NotificationWindows.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace SoundSwitch.Framework.NotificationManager.Notification
2727
internal class NotificationWindows : INotification
2828
{
2929
public NotificationTypeEnum TypeEnum => NotificationTypeEnum.DefaultWindowsNotification;
30-
public string Label => SettingsStrings.notificationOptionWindowsDefault;
30+
public string Label => SettingsStrings.notification_option_windowsDefault;
3131

3232
public INotificationConfiguration Configuration { get; set; }
3333

‎SoundSwitch/Framework/NotificationManager/NotificationManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ private void SetNotification(NotificationTypeEnum notificationTypeEnum)
8484
}
8585
catch (CachedSoundFileNotExistsException)
8686
{
87-
MessageBox.Show(string.Format(SettingsStrings.audioFileNotFound, SettingsStrings.notificationOptionSound),
88-
SettingsStrings.audioFileNotFoundCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
87+
MessageBox.Show(string.Format(SettingsStrings.audioFileNotFound, SettingsStrings.notification_option_sound),
88+
SettingsStrings.audioFileNotFound_caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
8989
}
9090
}
9191

‎SoundSwitch/Framework/Profile/ProfileManager.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ private void SwitchAudio(Profile profile, uint processId)
366366
var deviceToUse = CheckDeviceAvailable(device.DeviceInfo);
367367
if (deviceToUse == null)
368368
{
369-
_showError.Invoke(string.Format(SettingsStrings.profile_error_device_not_found, device.DeviceInfo.NameClean), $"{SettingsStrings.profile_error_title}: {profile.Name}");
369+
_showError.Invoke(string.Format(SettingsStrings.profile_error_deviceNotFound, device.DeviceInfo.NameClean), $"{SettingsStrings.profile_error_title}: {profile.Name}");
370370
continue;
371371
}
372372

@@ -392,7 +392,7 @@ public void SwitchAudio(Profile profile)
392392
var deviceToUse = CheckDeviceAvailable(device.DeviceInfo);
393393
if (deviceToUse == null)
394394
{
395-
_showError.Invoke(string.Format(SettingsStrings.profile_error_device_not_found, device.DeviceInfo.NameClean), $"{SettingsStrings.profile_error_title}: {profile.Name}");
395+
_showError.Invoke(string.Format(SettingsStrings.profile_error_deviceNotFound, device.DeviceInfo.NameClean), $"{SettingsStrings.profile_error_title}: {profile.Name}");
396396
continue;
397397
}
398398

@@ -467,7 +467,7 @@ private Result<string, VoidSuccess> ValidateProfile(Profile profile, bool init =
467467
{
468468
if (string.IsNullOrEmpty(profile.Name))
469469
{
470-
return SettingsStrings.profile_error_no_name;
470+
return SettingsStrings.profile_error_noName;
471471
}
472472

473473
if (profile.Triggers.Count == 0)
@@ -563,7 +563,7 @@ private Result<string, VoidSuccess> ValidateAddProfile(ProfileSetting profile)
563563
{
564564
if (string.IsNullOrEmpty(profile.ProfileName))
565565
{
566-
return SettingsStrings.profile_error_no_name;
566+
return SettingsStrings.profile_error_noName;
567567
}
568568

569569
if (string.IsNullOrEmpty(profile.ApplicationPath) && profile.HotKey == null)

‎SoundSwitch/Framework/Profile/Trigger/TriggerFactory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public override string ToString()
7979
public class HotKeyTrigger : BaseTrigger
8080
{
8181
public override TriggerFactory.Enum TypeEnum => TriggerFactory.Enum.HotKey;
82-
public override string Label => SettingsStrings.hotkeys;
82+
public override string Label => SettingsStrings.hotkey;
8383
public override string Description { get; } = SettingsStrings.profile_trigger_hotkey_desc;
8484
public override int MaxOccurence => 1;
8585
}

‎SoundSwitch/Framework/TrayIcon/TooltipInfoManager/TootipInfo/TooltipInfoBoth.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class TooltipInfoBoth : ITooltipInfo
2222
private readonly TooltipInfoPlayback _tooltipInfoPlayback = new();
2323

2424
public TooltipInfoTypeEnum TypeEnum => TooltipInfoTypeEnum.Both;
25-
public string Label => SettingsStrings.tooltipOnHoverOptionBothDevices;
25+
public string Label => SettingsStrings.tooltipOnHover_option_bothDevices;
2626

2727
/// <summary>
2828
/// The text to display for this ToolTip

‎SoundSwitch/Framework/TrayIcon/TooltipInfoManager/TootipInfo/TooltipInfoPlayback.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class TooltipInfoPlayback : ITooltipInfo
2525
{
2626
private DeviceFullInfo _defaultDevice;
2727
public TooltipInfoTypeEnum TypeEnum => TooltipInfoTypeEnum.Playback;
28-
public string Label => SettingsStrings.tooltipOnHoverOptionPlaybackDevice;
28+
public string Label => SettingsStrings.tooltipOnHover_option_playbackDevice;
2929

3030
public TooltipInfoPlayback()
3131
{

‎SoundSwitch/Framework/TrayIcon/TooltipInfoManager/TootipInfo/TooltipInfoRecording.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class TooltipInfoRecording : ITooltipInfo
2525
{
2626
private DeviceFullInfo _defaultDevice;
2727
public TooltipInfoTypeEnum TypeEnum => TooltipInfoTypeEnum.Recording;
28-
public string Label => SettingsStrings.tooltipOnHoverOptionRecordingDevice;
28+
public string Label => SettingsStrings.tooltipOnHover_option_recordingDevice;
2929

3030
public TooltipInfoRecording()
3131
{

0 commit comments

Comments
 (0)