version 1.31

XyLe-GBP · Oct 1, 2022 · 7102cbd · 7102cbd
1 parent f818635
commit 7102cbd
Show file tree

Hide file tree

Showing 16 changed files with 1,365 additions and 809 deletions.
diff --git a/Localization/Strings.Designer.cs b/Localization/Strings.Designer.cs
diff --git a/Localization/Strings.en.resx b/Localization/Strings.en.resx
@@ -389,6 +389,10 @@ Please configure the settings from the 'Settings' item.</value>
   <data name="UnExpectedError" xml:space="preserve">
     <value>An unexpected error has occurred.
 {0}</value>
+  </data>
+  <data name="UnknownFFmpegCaption" xml:space="preserve">
+    <value>FFmpeg exists, but the version is unknown.
+Do you want to download the official version?</value>
   </data>
   <data name="UpdateCompletedCaption" xml:space="preserve">
     <value>The update has been completed.</value>

diff --git a/Localization/Strings.ja.resx b/Localization/Strings.ja.resx
@@ -403,6 +403,10 @@ Real-ESRGAN Photo: 写真等をアップスケールする際に適したモデ
   <data name="UnExpectedError" xml:space="preserve">
     <value>予期せぬエラーが発生しました。
 {0}</value>
+  </data>
+  <data name="UnknownFFmpegCaption" xml:space="preserve">
+    <value>FFmpegが存在しますが、バージョンが不明です。
+正規バージョンをダウンロードしますか？</value>
   </data>
   <data name="UpdateCompletedCaption" xml:space="preserve">
     <value>アップデートが完了しました。</value>

diff --git a/Localization/Strings.resx b/Localization/Strings.resx
@@ -404,6 +404,10 @@ Please configure the settings from the 'Settings' item.</value>
   <data name="UnExpectedError" xml:space="preserve">
     <value>An unexpected error has occurred.
 {0}</value>
+  </data>
+  <data name="UnknownFFmpegCaption" xml:space="preserve">
+    <value>FFmpeg exists, but the version is unknown.
+Do you want to download the official version?</value>
   </data>
   <data name="UpdateCompletedCaption" xml:space="preserve">
     <value>The update has been completed.</value>

diff --git a/Localization/Strings.zh.resx b/Localization/Strings.zh.resx
@@ -403,6 +403,10 @@ Real-ESRGAN Photo：该模型适用于放大照片等。</value>
   <data name="UnExpectedError" xml:space="preserve">
     <value>发生了一个意外的错误。
 {0}</value>
+  </data>
+  <data name="UnknownFFmpegCaption" xml:space="preserve">
+    <value>FFmpeg存在，但版本不明。
+你想下载官方版本吗？</value>
   </data>
   <data name="UpdateCompletedCaption" xml:space="preserve">
     <value>更新完成。</value>

diff --git a/VERSIONINFO b/VERSIONINFO
@@ -1 +1 @@
-version:1.30.2220.615
+version:1.31.2220.1001
diff --git a/src/Common.cs b/src/Common.cs
@@ -1170,6 +1170,49 @@ public static void GetVideoControllerInformation(string[] buffers)
                 }
             }
         }
+
+        public static List<string> GetGraphicsCardNamesInformation()
+        {
+            var clist = new List<string>();
+            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_VideoController");
+            string graphicsCard = string.Empty;
+            foreach (ManagementObject obj in searcher.Get())
+            {
+                if (obj["CurrentBitsPerPixel"] != null && obj["CurrentHorizontalResolution"] != null)
+                {
+                    graphicsCard = obj["Name"].ToString();
+                    clist.Add(graphicsCard);
+                }
+            }
+
+            if (clist.Count != 0)
+            {
+                return clist;
+            }
+            else { return null; }
+        }
+
+        public static List<string> GetGraphicsCardsInformation()
+        {
+            var clist = new List<string>();
+            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_VideoController");
+            string graphicsCard = string.Empty;
+            foreach (ManagementObject obj in searcher.Get())
+            {
+                if (obj["CurrentBitsPerPixel"] != null && obj["CurrentHorizontalResolution"] != null)
+                {
+                    long ram = long.Parse(obj["AdapterRAM"].ToString()) / 1048576;
+                    graphicsCard = obj["Name"].ToString() + " - " + obj["DriverVersion"].ToString() + " [ " + ram.ToString() + "MiB RAM ]";
+                    clist.Add(graphicsCard);
+                }
+            }
+
+            if (clist.Count != 0)
+            {
+                return clist;
+            }
+            else { return null; }
+        }
     }
 
     class Config