diff --git a/README.md b/README.md index 66abd501..c12c9e36 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,12 @@ - +

+ v3.1.5 - December 21, 2023 - Download (3.4 MB)
v3.1.4 (Stable) - May 9, 2021 - Download (3.4 MB)

Older versions and release notes @@ -103,27 +104,36 @@ scoop install quick-picture-viewer ## 🔨 Contribution: -Help Module Art! +#### Help Module Art! - Give us a star ⭐ - Fork and Clone! Awesome - Select existing issues or create a new issue and give us a PR with your bugfix or improvement after. We love it ❤ -How to clone: +#### How to clone: + +1. Clone: ```powershell -git clone --recurse-submodules https://github.com/ModuleArt/quick-picture-viewer +git clone --recurse-submodules https://github.com/ModuleArt/qpv-plugins +``` + +2. Download submodules: + +``` git submodule init git submodule update ``` -Code contributors: +3. Build submodules. + +#### Code contributors: -- adriengivry - Texture filtering modes -- FLeXyo - Open folder recursively feature +- adriengivry - Texture filtering modes +- FLeXyo - Open folder recursively feature - Beelink - Everything else 😘 -Translation contributors: +#### Translation contributors: - Arabic: Jalal-Althahab - Chinese: jiwangyihao @@ -138,10 +148,10 @@ Translation contributors: Help us translate this app -## 🔗 Useful links: +## 📦 Related projects: -- How to uninstall built-in photos app in Windows 10 -- Extension module for Windows Explorer to render SVG thumbnails +- Quick Library - Windows Forms Control class library for "Quick" apps (.NET Framework)
+- QPV Plugins - Set of preinstalled plugins for the Quick Picture Viewer ## 🧰 Other great apps: diff --git a/inno-setup/quick-picture-viewer.iss b/inno-setup/quick-picture-viewer.iss index bcd635af..268a661f 100644 --- a/inno-setup/quick-picture-viewer.iss +++ b/inno-setup/quick-picture-viewer.iss @@ -1,5 +1,5 @@ #define MyAppName "Quick Picture Viewer" -#define MyAppVersion "3.1.4" +#define MyAppVersion "3.1.5" #define MyAppPublisher "Module Art" #define MyAppURL "https://moduleart.github.io/quick-picture-viewer" #define MyAppExeName "quick-picture-viewer.exe" diff --git a/libs/SimplePsd.dll b/libs/SimplePsd.dll new file mode 100644 index 00000000..1c43588a Binary files /dev/null and b/libs/SimplePsd.dll differ diff --git a/quick-picture-viewer.sln b/quick-picture-viewer.sln index 3803559e..0ea9038a 100644 --- a/quick-picture-viewer.sln +++ b/quick-picture-viewer.sln @@ -1,9 +1,9 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.8.34322.80 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "quick-picture-viewer", "quick-picture-viewer\quick-picture-viewer.csproj", "{53748C49-255E-424B-B789-5919CEFEF473}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "quick-picture-viewer", "quick-picture-viewer\quick-picture-viewer.csproj", "{53748C49-255E-424B-B789-5919CEFEF473}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLibrary", "dependencies\quick-library\QuickLibrary\QuickLibrary.csproj", "{90F913B5-1B48-4E7B-83AA-21C0946B4F81}" EndProject diff --git a/quick-picture-viewer/Properties/AssemblyInfo.cs b/quick-picture-viewer/Properties/AssemblyInfo.cs deleted file mode 100644 index c27932a0..00000000 --- a/quick-picture-viewer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Quick Picture Viewer")] -[assembly: AssemblyDescription("Lightweight, versatile desktop image viewer for Windows. The best replacement for the default Windows photo viewer.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Module Art")] -[assembly: AssemblyProduct("Quick Picture Viewer")] -[assembly: AssemblyCopyright("Copyright © 2021 Module Art")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("53748c49-255e-424b-b789-5919cefef473")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.1.4")] -[assembly: AssemblyFileVersion("3.1.4")] -[assembly: NeutralResourcesLanguage("en")] diff --git a/quick-picture-viewer/forms/MainForm.cs b/quick-picture-viewer/forms/MainForm.cs index 1f43b827..b45fcd9e 100644 --- a/quick-picture-viewer/forms/MainForm.cs +++ b/quick-picture-viewer/forms/MainForm.cs @@ -69,7 +69,7 @@ public MainForm(string openPath, bool darkMode) zoomTextBox.Height = 21; zoomTextBox.TextBox.MouseWheel += TextBox_MouseWheel; zoomTextBox.LostFocus += PicturePanel_LostFocus; - zoomTextBox.TextBox.ContextMenu = new ContextMenu(); + zoomTextBox.TextBox.ContextMenuStrip = new ContextMenuStrip(); SetDarkMode(darkMode); InitLanguage(); diff --git a/quick-picture-viewer/forms/SettingsForm.cs b/quick-picture-viewer/forms/SettingsForm.cs index d16b2ca0..ba6fb872 100644 --- a/quick-picture-viewer/forms/SettingsForm.cs +++ b/quick-picture-viewer/forms/SettingsForm.cs @@ -22,6 +22,11 @@ private struct Language Authors = new string[] { "Beelink" } }, new Language + { + Code = "ar", + Authors = new string[] { "Jalal-Althahab" } + }, + new Language { Code = "cn", Authors = new string[] { "jiwangyihao" } @@ -39,7 +44,7 @@ private struct Language new Language { Code = "de", - Authors = new string[] { "l-33ter" } + Authors = new string[] { "l-33ter", "tomo2403" } }, new Language { @@ -55,6 +60,11 @@ private struct Language { Code = "es", Authors = new string[] { "asluppiter", "Alplox" } + }, + new Language + { + Code = "es", + Authors = new string[] { "ataberkcemunal" } } }; diff --git a/quick-picture-viewer/packages.config b/quick-picture-viewer/packages.config deleted file mode 100644 index bfcbfb4a..00000000 --- a/quick-picture-viewer/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/quick-picture-viewer/quick-picture-viewer.csproj b/quick-picture-viewer/quick-picture-viewer.csproj index 6124a43d..6930dab4 100644 --- a/quick-picture-viewer/quick-picture-viewer.csproj +++ b/quick-picture-viewer/quick-picture-viewer.csproj @@ -1,21 +1,9 @@ - - - + - Debug - AnyCPU - {53748C49-255E-424B-B789-5919CEFEF473} + net8.0-windows WinExe quick_picture_viewer - quick-picture-viewer - v4.8 - 512 - true - true false - - - publish\ true Disk @@ -30,27 +18,10 @@ 3.1.0.0 false true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false + false + true + true + true resources\imgs\picture.ico @@ -67,9 +38,6 @@ quick-picture-viewer_TemporaryKey.pfx - - false - @@ -81,341 +49,12 @@ app.manifest - - - ..\packages\Fizzler.1.3.0\lib\netstandard2.0\Fizzler.dll - - - ..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll - - - ..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll - - - ..\packages\Octokit.0.50.0\lib\net46\Octokit.dll - - - ..\packages\Pfim.0.10.0\lib\netstandard2.0\Pfim.dll - - - - - False - resources\dlls\SimplePsd.dll - - - ..\packages\Svg.3.2.3\lib\net461\Svg.dll - - - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - - - ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll - True - True - - - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - - - - - - - - + Component - - True - True - lang_hr.resx - - - - - - + Component - - - - - - - - Form - - - InfoForm.cs - - - True - True - lang_cn.resx - - - True - True - lang_de.resx - - - True - True - lang_en.resx - - - True - True - lang_es.resx - Always - - - True - True - lang_fr.resx - - - True - True - lang_hu.resx - - - True - True - lang_ru.resx - - - Form - - - MiniViewForm.cs - - - True - True - Resources.resx - - - Form - - - SelectionForm.cs - - - Form - - - PluginManForm.cs - - - - - Form - - - SettingsForm.cs - - - - Form - - - SvgOpsForm.cs - - - Form - - - PrintForm.cs - - - Form - - - EditSelForm.cs - - - Form - - - WallpaperForm.cs - - - Form - - - AboutForm.cs - - - Form - - - MainForm.cs - - - - - - InfoForm.cs - - - - Always - PublicResXFileCodeGenerator - lang_cn.Designer.cs - Designer - - - Always - PublicResXFileCodeGenerator - lang_de.Designer.cs - Designer - - - PublicResXFileCodeGenerator - lang_es.Designer.cs - Always - Designer - - - Always - PublicResXFileCodeGenerator - lang_fr.Designer.cs - Designer - - - Designer - Always - PublicResXFileCodeGenerator - lang_hr.Designer.cs - - - Always - PublicResXFileCodeGenerator - lang_hu.Designer.cs - Designer - - - - - - PublicResXFileCodeGenerator - lang_ru.Designer.cs - Always - Designer - - - PublicResXFileCodeGenerator - lang_en.Designer.cs - Always - Designer - - - MiniViewForm.cs - - - SelectionForm.cs - - - PluginManForm.cs - - - PrintForm.cs - - - SettingsForm.cs - - - - SvgOpsForm.cs - - - EditSelForm.cs - - - WallpaperForm.cs - - - AboutForm.cs - - - MainForm.cs - Designer - - - ResXFileCodeGenerator - Designer - Resources.Designer.cs - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -430,107 +69,26 @@ - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {90f913b5-1b48-4e7b-83aa-21c0946b4f81} - QuickLibrary - + + ..\dependencies\quick-library\QuickLibrary\bin\Release\QuickLibrary.dll + + + ..\libs\SimplePsd.dll + - \ No newline at end of file diff --git a/quick-picture-viewer/typewrappers/Cr2Wrapper.cs b/quick-picture-viewer/typewrappers/Cr2Wrapper.cs index 8d97970a..84082a1a 100644 --- a/quick-picture-viewer/typewrappers/Cr2Wrapper.cs +++ b/quick-picture-viewer/typewrappers/Cr2Wrapper.cs @@ -193,11 +193,6 @@ public override void Close() m_f.Close(); } - public override System.Runtime.Remoting.ObjRef CreateObjRef(Type requestedType) - { - return m_f.CreateObjRef(requestedType); - } - public override int EndRead(IAsyncResult asyncResult) { return m_f.EndRead(asyncResult);