Merge pull request #5 from SwagLyrics/dev

Version 0.2
SwagLyrics · Jul 17, 2020 · 3cd8122 · 3cd8122
2 parents fd0bc05 + 0b4df47
commit 3cd8122
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/SwagLyricsGUI/Bridge/swaglyrics_installer.py b/SwagLyricsGUI/Bridge/swaglyrics_installer.py
@@ -6,6 +6,8 @@
 installed = {pkg.key for pkg in pkg_resources.working_set}
 missing = required - installed
 
+print("Launching...")
+
 if missing:
     python = sys.executable
     print("Installing swaglyrics...")

diff --git a/SwagLyricsGUI/Models/PrerequisitesChecker.cs b/SwagLyricsGUI/Models/PrerequisitesChecker.cs
@@ -21,7 +21,7 @@ public void InstallSwagLyricsIfMissing()
             {
                 FileName = $"python{PythonCmdPostFix}",
                 Arguments = path,
-                UseShellExecute = false
+                UseShellExecute = false,
             };
             Process process = new Process() { StartInfo = start };
             process.Start();

diff --git a/SwagLyricsGUI/SwagLyricsGUI.csproj b/SwagLyricsGUI/SwagLyricsGUI.csproj
@@ -4,6 +4,13 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <RuntimeIdentifiers>win-x64;win-x86;osx-x64;linux-x64</RuntimeIdentifiers>
     <ApplicationIcon>swaglyrics_pfp.ico</ApplicationIcon>
+    <Version>0.0.2</Version>
+    <Authors>Krzysztof Krysiński</Authors>
+    <Company>SwagLyrics</Company>
+    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+    <RepositoryUrl>https://github.com/SwagLyrics/SwagLyricsGUI</RepositoryUrl>
+    <Description>A cross-platform, real-time lyrics fetching application.</Description>
+    <Copyright>Krzysztof Krysiński © 2020</Copyright>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
@@ -18,6 +25,10 @@
     <None Remove="Assets\Fonts\Roboto-Regular.ttf" />
     <None Remove="Bridge\SwagLyrics_api_bridge.py" />
     <None Remove="Bridge\swaglyrics_installer.py" />
+    <None Include="..\LICENSE.md">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Bridge\swaglyrics_api_bridge.py">

diff --git a/SwagLyricsGUI/Views/MainWindow.xaml b/SwagLyricsGUI/Views/MainWindow.xaml
@@ -7,7 +7,7 @@
         x:Class="SwagLyricsGUI.Views.MainWindow" Design.Width="400" Design.Height="800"
         Icon="/Assets/swaglyrics_pfp.ico" MinWidth="420" Width="420" MinHeight="400"
         Title="SwagLyricsGUI" FontFamily="/Assets/Fonts/Roboto-Regular.ttf" Topmost="True" 
-        WindowStartupLocation="CenterScreen" >
+        WindowStartupLocation="Manual" >
 
     <Design.DataContext>
         <vm:MainWindowViewModel/>

diff --git a/SwagLyricsGUI/Views/MainWindow.xaml.cs b/SwagLyricsGUI/Views/MainWindow.xaml.cs
@@ -17,8 +17,11 @@ public MainWindow()
             this.AttachDevTools();
 #endif
             sv = this.Find<ScrollViewer>("scrollViewer");
+
             MaxHeight = Screens.Primary.WorkingArea.Height;
-            Height = Screens.Primary.WorkingArea.Height - 40;
+            Height = Screens.Primary.WorkingArea.Height - 80;
+            Position = new PixelPoint(Screens.Primary.WorkingArea.Right - (int)Width - 15,
+    Screens.Primary.WorkingArea.Bottom - (int)Height - 30);
         }
 
         private void InitializeComponent()

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v0.1
+v0.2