From 8f8d80122f24f1249c8ba3891d62fd219cd08be9 Mon Sep 17 00:00:00 2001 From: flabbet Date: Thu, 16 Jul 2020 22:03:21 +0200 Subject: [PATCH 1/2] Set startup location to right --- SwagLyricsGUI/Views/MainWindow.xaml | 2 +- SwagLyricsGUI/Views/MainWindow.xaml.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SwagLyricsGUI/Views/MainWindow.xaml b/SwagLyricsGUI/Views/MainWindow.xaml index 915989e..ef7f35b 100644 --- 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" > diff --git a/SwagLyricsGUI/Views/MainWindow.xaml.cs b/SwagLyricsGUI/Views/MainWindow.xaml.cs index b1b37ce..e73ffaa 100644 --- 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"); + 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() From 0b4df4701a71736dc221932e421309e2c3f924c9 Mon Sep 17 00:00:00 2001 From: flabbet Date: Fri, 17 Jul 2020 21:05:37 +0200 Subject: [PATCH 2/2] Changed csproj and version --- SwagLyricsGUI/Bridge/swaglyrics_installer.py | 2 ++ SwagLyricsGUI/Models/PrerequisitesChecker.cs | 2 +- SwagLyricsGUI/SwagLyricsGUI.csproj | 11 +++++++++++ version.txt | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/SwagLyricsGUI/Bridge/swaglyrics_installer.py b/SwagLyricsGUI/Bridge/swaglyrics_installer.py index a43d6e1..3f94c84 100644 --- 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 index 3a8989f..21cd395 100644 --- 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 index 5ce74a2..2d8c2a7 100644 --- a/SwagLyricsGUI/SwagLyricsGUI.csproj +++ b/SwagLyricsGUI/SwagLyricsGUI.csproj @@ -4,6 +4,13 @@ netcoreapp3.1 win-x64;win-x86;osx-x64;linux-x64 swaglyrics_pfp.ico + 0.0.2 + Krzysztof Krysiński + SwagLyrics + LICENSE.md + https://github.com/SwagLyrics/SwagLyricsGUI + A cross-platform, real-time lyrics fetching application. + Krzysztof Krysiński © 2020 @@ -18,6 +25,10 @@ + + True + + diff --git a/version.txt b/version.txt index aa33868..e2cfc99 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.1 \ No newline at end of file +v0.2 \ No newline at end of file