1.0.4 Allow installation of Gtk if missing

boiscljo · Mar 8, 2021 · 031f507 · 031f507
1 parent dc2ba64
commit 031f507
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/DRAL_UI/DRAL_GTK.csproj b/DRAL_UI/DRAL_GTK.csproj
@@ -7,9 +7,11 @@
     <AssemblyName>DRAL</AssemblyName>
     <RepositoryUrl>https://github.com/boiscljo/DRAL</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <AssemblyVersion>1.0.3.0</AssemblyVersion>
-    <FileVersion>1.0.3.0</FileVersion>
+    <AssemblyVersion>1.0.4.0</AssemblyVersion>
+    <FileVersion>1.0.4.0</FileVersion>
     <Nullable>annotations</Nullable>
+    <PackageProjectUrl>https://github.com/boiscljo/DRAL</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/DRAL_UI/Program.cs b/DRAL_UI/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.IO.Compression;
 using System.Linq;
 using System.Net;
 using System.Reflection;
@@ -55,7 +56,20 @@ static void Main(string[] args)
             }
             if (args.Contains("-v") || args.Contains("--verbose"))
                 verbose = true;
-            Gtk.Application.Init();
+            try
+            {
+                Gtk.Application.Init();
+            }
+            catch 
+            {
+                Console.WriteLine("Installing Gtk libraries for current user");
+                WebClient wc = new WebClient();
+                wc.DownloadFile("https://zergling.moyskleytech.com/dataset/DRAL/Gtk.zip" , "Gtk.zip");
+                ZipFile.ExtractToDirectory("Gtk.zip" , Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData));
+                System.IO.File.Delete("Gtk.zip");
+                Console.WriteLine("Please run DRAL again.");
+                return;
+            }
 
             if (args.Contains("--out"))
             {
@@ -106,6 +120,7 @@ static void Main(string[] args)
                 return;
             }
 
+
             if (withWindow)
                 window.Show();
             if (args.Contains("--fix") || args.Contains("-f") || args.Contains("--fix-dataset") ||

diff --git a/DRAL_UI/UI/NewTagWindow.cs b/DRAL_UI/UI/NewTagWindow.cs
@@ -258,11 +258,11 @@ private void Left_MotionNotifyEvent(object o, MotionNotifyEventArgs args)
         private void Previous(bool v)
         {
             attentionHandler.Previous();
-            var lbl = manager.GetLabel(attentionHandler.Filename);
+            /*var lbl = manager.GetLabel(attentionHandler.Filename);
             while (lbl == null)
             {
                 attentionHandler.Previous();
-            }
+            }*/
             LoadImageInformation();
             if (v)
             {