Skip to content

Commit

Permalink
Merge pull request #368 from NickvisionApps/home
Browse files Browse the repository at this point in the history
WinUI - Better HomePage Design + Update ATL
  • Loading branch information
nlogozzo authored Oct 18, 2023
2 parents a6f5535 + b49065a commit 97c6daa
Show file tree
Hide file tree
Showing 28 changed files with 4,720 additions and 5,167 deletions.
2 changes: 1 addition & 1 deletion NickvisionTagger.GNOME/Views/MainWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ private MainWindow(Gtk.Builder builder, MainWindowController controller, Adw.App
};
_publishingDateCalendar.OnDaySelected += (sender, e) =>
{
if(_updatePublishingDate)
if (_updatePublishingDate)
{
var glibDate = gtk_calendar_get_date(_publishingDateCalendar.Handle);
var date = new DateTime(g_date_time_get_year(ref glibDate), g_date_time_get_month(ref glibDate), g_date_time_get_day_of_month(ref glibDate));
Expand Down
6 changes: 3 additions & 3 deletions NickvisionTagger.GNOME/nuget-sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -687,10 +687,10 @@
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/z440.atl.core/5.9.0/z440.atl.core.5.9.0.nupkg",
"sha512": "8a85a66c5f5911311c630676c9bb09f5b5708d88b9d7a404dd11c5d20e68161a41920e5fa3343e4cb4cab984c21d0ecf7524cf6cf66dc243df3a0b6df326c5b0",
"url": "https://api.nuget.org/v3-flatcontainer/z440.atl.core/5.10.0/z440.atl.core.5.10.0.nupkg",
"sha512": "9aa0b7a763f69db5675cba28b53be5f095ef1d220b82c359a4be4aca21e9d87f3b59fce653fca6a6266ae937cea6b47c72f6ed0c8f60162985d127f54b825bf8",
"dest": "nuget-sources",
"dest-filename": "z440.atl.core.5.9.0.nupkg"
"dest-filename": "z440.atl.core.5.10.0.nupkg"
},
{
"type": "file",
Expand Down
20 changes: 1 addition & 19 deletions NickvisionTagger.Shared/Controllers/MainWindowController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -272,24 +272,6 @@ public TaskbarItem? TaskbarItem
}
}

/// <summary>
/// The string for greeting on the home page
/// </summary>
public string Greeting
{
get
{
return DateTime.Now.Hour switch
{
>= 0 and < 6 => _p("Night", "Good Morning!"),
< 12 => _p("Morning", "Good Morning!"),
< 18 => _("Good Afternoon!"),
< 24 => _("Good Evening!"),
_ => _("Good Day!")
};
}
}

/// <summary>
/// Whether or not the window can close freely
/// </summary>
Expand Down Expand Up @@ -714,7 +696,7 @@ public void UpdateTags(PropertyMap map, bool triggerSelectedMusicFilesProperties
pair.Value.Publisher = map.Publisher;
updated = map.Publisher != _filesBeingEditedOriginals[pair.Key].Publisher;
}
if(map.PublishingDate != (pair.Value.PublishingDate == DateTime.MinValue ? "" : pair.Value.PublishingDate.ToShortDateString()) && map.PublishingDate != _("<keep>"))
if (map.PublishingDate != (pair.Value.PublishingDate == DateTime.MinValue ? "" : pair.Value.PublishingDate.ToShortDateString()) && map.PublishingDate != _("<keep>"))
{
try
{
Expand Down
4 changes: 2 additions & 2 deletions NickvisionTagger.Shared/Docs/html/cs/configuration.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<li class="list"><p class="p"><span class="code">Název souboru</span></p></li>
<li class="list"><p class="p"><span class="code">Cesta k souboru</span></p></li>
<li class="list"><p class="p"><span class="code">Nadpis</span></p></li>
<li class="list"><p class="p"><span class="code">Artist</span></p></li>
<li class="list"><p class="p"><span class="code">Umělec</span></p></li>
<li class="list"><p class="p"><span class="code">Album</span></p></li>
<li class="list"><p class="p"><span class="code">Year</span></p></li>
<li class="list"><p class="p"><span class="code">Rok</span></p></li>
<li class="list"><p class="p"><span class="code">Stopa</span></p></li>
<li class="list"><p class="p"><span class="code">Žánr</span></p></li>
</ul></div></div></div>
Expand Down
2 changes: 1 addition & 1 deletion NickvisionTagger.Shared/Docs/html/ru/format-strings.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<li class="list"><p class="p"><span class="code">composer</span></p></li>
<li class="list"><p class="p"><span class="code">описание</span></p></li>
<li class="list"><p class="p"><span class="code">издатель</span></p></li>
<li class="list"><p class="p"><span class="code">publishingdate</span></p></li>
<li class="list"><p class="p"><span class="code">датапубликации</span></p></li>
</ul></div></div></div>
<div class="note" title="Примечание">
<svg height="24" width="24" version="1.1">
Expand Down
2 changes: 1 addition & 1 deletion NickvisionTagger.Shared/Docs/html/ru/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<li class="list"><p class="p"><span class="code">composer</span></p></li>
<li class="list"><p class="p"><span class="code">описание</span></p></li>
<li class="list"><p class="p"><span class="code">издатель</span></p></li>
<li class="list"><p class="p"><span class="code">publishingdate</span></p></li>
<li class="list"><p class="p"><span class="code">датапубликации</span></p></li>
<li class="list"><p class="p"><span class="code">custom</span></p></li>
</ul></div></div></div>
<p class="p">Properties are case-insensitive.</p>
Expand Down
4 changes: 2 additions & 2 deletions NickvisionTagger.Shared/Docs/yelp/cs/configuration.page
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
<item><p><code>Název souboru</code></p></item>
<item><p><code>Cesta k souboru</code></p></item>
<item><p><code>Nadpis</code></p></item>
<item><p><code>Artist</code></p></item>
<item><p><code>Umělec</code></p></item>
<item><p><code>Album</code></p></item>
<item><p><code>Year</code></p></item>
<item><p><code>Rok</code></p></item>
<item><p><code>Stopa</code></p></item>
<item><p><code>Žánr</code></p></item>
</list>
Expand Down
2 changes: 1 addition & 1 deletion NickvisionTagger.Shared/Docs/yelp/ru/format-strings.page
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<item><p><code>composer</code></p></item>
<item><p><code>описание</code></p></item>
<item><p><code>издатель</code></p></item>
<item><p><code>publishingdate</code></p></item>
<item><p><code>датапубликации</code></p></item>
</list>
<note>
<p>When using conversions, custom property names can also be used.</p>
Expand Down
2 changes: 1 addition & 1 deletion NickvisionTagger.Shared/Docs/yelp/ru/search.page
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<item><p><code>composer</code></p></item>
<item><p><code>описание</code></p></item>
<item><p><code>издатель</code></p></item>
<item><p><code>publishingdate</code></p></item>
<item><p><code>датапубликации</code></p></item>
<item><p><code>custom</code></p></item>
</list>
<p>Properties are case-insensitive.</p></section>
Expand Down
2 changes: 1 addition & 1 deletion NickvisionTagger.Shared/NickvisionTagger.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageReference Include="AcoustID.NET" Version="1.3.3" />
<PackageReference Include="Nickvision.Aura" Version="2023.10.1.3" />
<PackageReference Include="z440.atl.core" Version="5.9.0" />
<PackageReference Include="z440.atl.core" Version="5.10.0" />
<PackageReference Include="MetaBrainz.MusicBrainz" Version="5.0.0" />
<PackageReference Include="MetaBrainz.MusicBrainz.CoverArt" Version="5.0.0" />
<PackageReference Include="FuzzySharp" Version="2.0.2" />
Expand Down
Loading

0 comments on commit 97c6daa

Please sign in to comment.