Skip to content

Commit

Permalink
Now vsix's auto load on solution opening.
Browse files Browse the repository at this point in the history
Now we not remember last work time, so that always on vsix loaded, timer's due time will be Divisor.
  • Loading branch information
Ar6yZuK authored and Ar6yZuK committed Mar 6, 2024
1 parent ff60ff6 commit 552788d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 17 deletions.
17 changes: 2 additions & 15 deletions HabiticaHourUpVSIX/HabiticaHourUpVSIXPackage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ namespace HabiticaHourUpVSIX;
[InstalledProductRegistration(Vsix.Name, Vsix.Description, Vsix.Version)]
[ProvideMenuResource("Menus.ctmenu", 1)]
[Guid(PackageGuids.HabiticaHourUpVSIXString)]
//[ProvideAutoLoad(VSConstants.UICONTEXT.SolutionOpening_string, PackageAutoLoadFlags.BackgroundLoad)]
[ProvideAutoLoad(VSConstants.UICONTEXT.SolutionExistsAndNotBuildingAndNotDebugging_string, PackageAutoLoadFlags.BackgroundLoad)]
[ProvideAutoLoad(VSConstants.UICONTEXT.SolutionOpening_string, PackageAutoLoadFlags.BackgroundLoad)]
[ProvideToolWindow(typeof(SettingsToolWindow.Pane))]
public sealed class HabiticaHourUpVSIXPackage : ToolkitPackage
{
Expand Down Expand Up @@ -73,14 +72,8 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
HabiticaSettingsModel habiticaSettings = HabiticaSettingsReader.Read();
UserSettingsModel vsSettings = UserSettingsReader.Read();

TimeSpan tickAfter = habiticaSettings.LastWorkTime <= TimeSpan.Zero ? vsSettings.Divisor : habiticaSettings.LastWorkTime;

TimeSpan tickAfter = vsSettings.Divisor;
Timer.Change(tickAfter, vsSettings.Divisor);

HabiticaSettingsReader.SetLastTickAfterWithSave(tickAfter);

await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
VS.Events.SolutionEvents.OnAfterCloseSolution += OnClose;
}

internal void PlayBeep()
Expand Down Expand Up @@ -144,12 +137,6 @@ private void UserSettingsReader_OnSaving(UserSettingsModel userSettingsModel)
Timer.Change(Timer.NextTick, userSettingsModel.Divisor);
}

private void OnClose()
{
// TODO: do not remember last work time. Maybe delete property LastWorkTime
this.HabiticaSettingsReader.SetWithSave(x => x.LastWorkTime, Timer.NextTick);
}

private void AddTicksToAllSettings(int addedTicks)
{
HabiticaSettingsModel habiticaSettings = HabiticaSettingsReader.Read();
Expand Down
2 changes: 1 addition & 1 deletion HabiticaHourUpVSIX/source.extension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ internal sealed partial class Vsix
public const string Name = "HabiticaHourUpVSIX";
public const string Description = @"Empty VSIX Project.";
public const string Language = "en-US";
public const string Version = "1.5.0";
public const string Version = "1.5.1";
public const string Author = "Ar6";
public const string Tags = "";
}
Expand Down
2 changes: 1 addition & 1 deletion HabiticaHourUpVSIX/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="HabiticaHourUpVSIX.ade8e5f3-585d-49ca-8916-064b2237b928" Version="1.5.0" Language="en-US" Publisher="Ar6" />
<Identity Id="HabiticaHourUpVSIX.ade8e5f3-585d-49ca-8916-064b2237b928" Version="1.5.1" Language="en-US" Publisher="Ar6" />
<DisplayName>HabiticaHourUpVSIX</DisplayName>
<Description xml:space="preserve">Empty VSIX Project.</Description>
<Icon>Resources\Icon.png</Icon>
Expand Down

0 comments on commit 552788d

Please sign in to comment.