Custom updates for ER

MediaArea · Jan 12, 2024 · 59fa2ae · 59fa2ae
1 parent 27bfe06
commit 59fa2ae
Show file tree

Hide file tree

Showing 14 changed files with 1,559 additions and 580 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,17 @@ Thumbs.db
 Win32
 x64
 My Project
+*.vsidx
+*.lock
+*.db-shm
+*.db-wal
+*.bin
+Project/QMake/build-MediaInfoQt-Desktop_Qt_6_6_1_MSVC2019_64bit-Release/_Automated/
+Project/QMake/build-MediaInfoQt-Desktop_Qt_6_6_1_MSVC2019_64bit-Release/.qtc_clangd/
+Project/QMake/build-MediaInfoQt-Desktop_Qt_5_15_2_MSVC2019_64bit-Release/_Automated/
+Project/QMake/build-MediaInfoQt-Desktop_Qt_5_15_2_MSVC2019_64bit-Release/.qtc_clangd/
+Project/QMake/build-MediaInfoQt-Desktop_Qt_5_15_2_MSVC2019_64bit-Profile/.qtc_clangd/
+Project/QMake/build-MediaInfoQt-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug/.qtc_clangd/
+Project/BCB/PreRelease/
+Project/BCB/GUI/__astcache/
+Project/QMake/build*/
diff --git a/Project/BCB/GUI/MediaInfo_GUI.cbproj b/Project/BCB/GUI/MediaInfo_GUI.cbproj
diff --git a/Project/BCB/MediaInfo_Proj.groupproj b/Project/BCB/MediaInfo_Proj.groupproj
@@ -1,48 +1,48 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-		<PropertyGroup>
-			<ProjectGuid>{9BC64FBB-D1DE-4EA9-815A-CA946F8D3857}</ProjectGuid>
-		</PropertyGroup>
-		<ItemGroup>
-			<Projects Include="PreRelease\PreRelease.cbproj">
-				<Dependencies/>
-			</Projects>
-			<Projects Include="GUI\MediaInfo_GUI.cbproj">
-				<Dependencies/>
-			</Projects>
-		</ItemGroup>
-		<ProjectExtensions>
-			<Borland.Personality>Default.Personality.12</Borland.Personality>
-			<Borland.ProjectType/>
-			<BorlandProject>
-				<Default.Personality/>
-			</BorlandProject>
-		</ProjectExtensions>
-		<Target Name="PreRelease">
-			<MSBuild Projects="PreRelease\PreRelease.cbproj"/>
-		</Target>
-		<Target Name="PreRelease:Clean">
-			<MSBuild Targets="Clean" Projects="PreRelease\PreRelease.cbproj"/>
-		</Target>
-		<Target Name="PreRelease:Make">
-			<MSBuild Targets="Make" Projects="PreRelease\PreRelease.cbproj"/>
-		</Target>
-		<Target Name="MediaInfo_GUI">
-			<MSBuild Projects="GUI\MediaInfo_GUI.cbproj"/>
-		</Target>
-		<Target Name="MediaInfo_GUI:Clean">
-			<MSBuild Targets="Clean" Projects="GUI\MediaInfo_GUI.cbproj"/>
-		</Target>
-		<Target Name="MediaInfo_GUI:Make">
-			<MSBuild Targets="Make" Projects="GUI\MediaInfo_GUI.cbproj"/>
-		</Target>
-		<Target Name="Build">
-			<CallTarget Targets="PreRelease;MediaInfo_GUI"/>
-		</Target>
-		<Target Name="Clean">
-			<CallTarget Targets="PreRelease:Clean;MediaInfo_GUI:Clean"/>
-		</Target>
-		<Target Name="Make">
-			<CallTarget Targets="PreRelease:Make;MediaInfo_GUI:Make"/>
-		</Target>
-		<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
-	</Project>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{9BC64FBB-D1DE-4EA9-815A-CA946F8D3857}</ProjectGuid>
+    </PropertyGroup>
+    <ItemGroup>
+        <Projects Include="PreRelease\PreRelease.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="GUI\MediaInfo_GUI.cbproj">
+            <Dependencies/>
+        </Projects>
+    </ItemGroup>
+    <ProjectExtensions>
+        <Borland.Personality>Default.Personality.12</Borland.Personality>
+        <Borland.ProjectType/>
+        <BorlandProject>
+            <Default.Personality/>
+        </BorlandProject>
+    </ProjectExtensions>
+    <Target Name="PreRelease">
+        <MSBuild Projects="PreRelease\PreRelease.cbproj"/>
+    </Target>
+    <Target Name="PreRelease:Clean">
+        <MSBuild Projects="PreRelease\PreRelease.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="PreRelease:Make">
+        <MSBuild Projects="PreRelease\PreRelease.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="MediaInfo_GUI">
+        <MSBuild Projects="GUI\MediaInfo_GUI.cbproj"/>
+    </Target>
+    <Target Name="MediaInfo_GUI:Clean">
+        <MSBuild Projects="GUI\MediaInfo_GUI.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="MediaInfo_GUI:Make">
+        <MSBuild Projects="GUI\MediaInfo_GUI.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="Build">
+        <CallTarget Targets="PreRelease;MediaInfo_GUI"/>
+    </Target>
+    <Target Name="Clean">
+        <CallTarget Targets="PreRelease:Clean;MediaInfo_GUI:Clean"/>
+    </Target>
+    <Target Name="Make">
+        <CallTarget Targets="PreRelease:Make;MediaInfo_GUI:Make"/>
+    </Target>
+    <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
+</Project>
diff --git a/Project/BCB/PreRelease/PreRelease.cbproj b/Project/BCB/PreRelease/PreRelease.cbproj
diff --git a/Project/MSVC2019/CLI/MediaInfo.vcxproj b/Project/MSVC2019/CLI/MediaInfo.vcxproj
@@ -28,22 +28,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/Project/MSVC2019/GUI/MediaInfo_GUI.vcxproj b/Project/MSVC2019/GUI/MediaInfo_GUI.vcxproj
@@ -28,22 +28,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/Project/MSVC2022/MediaInfo.sln b/Project/MSVC2022/MediaInfo.sln
@@ -57,6 +57,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\..\..\zlib\c
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RegressionTest", "..\..\..\MediaInfoLib\Project\MSVC2022\RegressionTest\RegressionTest.vcxproj", "{91C094CA-1170-4CE4-9B79-17324C8DACA8}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaInfo_Qt", "MediaInfo_Qt\MediaInfo_Qt.vcxproj", "{2C8E0377-F9D5-4CD8-B894-CA421ECA46DF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -161,6 +163,14 @@ Global
 		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.Release|Win32.Build.0 = Release|Win32
 		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.Release|x64.ActiveCfg = Release|x64
 		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.Release|x64.Build.0 = Release|x64
+		{2C8E0377-F9D5-4CD8-B894-CA421ECA46DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2C8E0377-F9D5-4CD8-B894-CA421ECA46DF}.Debug|Win32.Build.0 = Debug|Win32
+		{2C8E0377-F9D5-4CD8-B894-CA421ECA46DF}.Debug|x64.ActiveCfg = Debug|x64
+		{2C8E0377-F9D5-4CD8-B894-CA421ECA46DF}.Debug|x64.Build.0 = Debug|x64
+		{2C8E0377-F9D5-4CD8-B894-CA421ECA46DF}.Release|Win32.ActiveCfg = Release|Win32
+		{2C8E0377-F9D5-4CD8-B894-CA421ECA46DF}.Release|Win32.Build.0 = Release|Win32
+		{2C8E0377-F9D5-4CD8-B894-CA421ECA46DF}.Release|x64.ActiveCfg = Release|x64
+		{2C8E0377-F9D5-4CD8-B894-CA421ECA46DF}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Project/QMake/GUI/MediaInfoQt.pro b/Project/QMake/GUI/MediaInfoQt.pro
@@ -73,21 +73,21 @@ win32 {
         INCLUDEPATH+=$$[QT_INSTALL_PREFIX]/include/QtCore/$$[QT_VERSION]
 
         contains(QT_ARCH, ARM) {
-            exists(../../../../MediaInfoLib/Project/MSVC2017/Arm/Release/MediaInfo-Static_UWP.lib) {
+            exists(../../../../MediaInfoLib/Project/MSVC2022/Arm/Release/MediaInfo-Static_UWP.lib) {
                 INCLUDEPATH += ../../../../MediaInfoLib/Source
-                LIBS += ../../../../MediaInfoLib/Project/MSVC2017/Arm/Release/MediaInfo-Static_UWP.lib
+                LIBS += ../../../../MediaInfoLib/Project/MSVC2022/Arm/Release/MediaInfo-Static_UWP.lib
             } else {
                 error("libmediainfo not found on system")
             }
 
-            exists(../../../../ZenLib/Project/MSVC2017/Arm/Release/ZenLib_UWP.lib) {
+            exists(../../../../ZenLib/Project/MSVC2022/Arm/Release/ZenLib_UWP.lib) {
                 INCLUDEPATH += ../../../../ZenLib/Source
-                LIBS += ../../../../ZenLib/Project/MSVC2017/Arm/Release/ZenLib_UWP.lib
+                LIBS += ../../../../ZenLib/Project/MSVC2022/Arm/Release/ZenLib_UWP.lib
             } else {
                 error("libzen not found on system")
             }
 
-            exists(../../../../zlib/contrib/vstudio/vc15/Arm/Release/zlibuwp.lib) {
+            exists(../../../../zlib/contrib/vstudio/vc17/Arm/Release/zlibuwp.lib) {
                 INCLUDEPATH += ../../../../zlib
                 LIBS += ../../../../zlib/contrib/vstudio/Arm/x86/Release/zlibuwp.lib
             } else {
@@ -96,92 +96,92 @@ win32 {
         }
 
         contains(QT_ARCH, i386) {
-            exists(../../../../MediaInfoLib/Project/MSVC2017/Win32/Release/MediaInfo-Static_UWP.lib) {
+            exists(../../../../MediaInfoLib/Project/MSVC2022/Win32/Release/MediaInfo-Static_UWP.lib) {
                 INCLUDEPATH += ../../../../MediaInfoLib/Source
-                LIBS += ../../../../MediaInfoLib/Project/MSVC2017/Win32/Release/MediaInfo-Static_UWP.lib
+                LIBS += ../../../../MediaInfoLib/Project/MSVC2022/Win32/Release/MediaInfo-Static_UWP.lib
             } else {
                 error("libmediainfo not found on system")
             }
 
-            exists(../../../../ZenLib/Project/MSVC2017/Win32/Release/ZenLib_UWP.lib) {
+            exists(../../../../ZenLib/Project/MSVC2022/Win32/Release/ZenLib_UWP.lib) {
                 INCLUDEPATH += ../../../../ZenLib/Source
-                LIBS += ../../../../ZenLib/Project/MSVC2017/Win32/Release/ZenLib_UWP.lib
+                LIBS += ../../../../ZenLib/Project/MSVC2022/Win32/Release/ZenLib_UWP.lib
             } else {
                 error("libzen not found on system")
             }
 
-            exists(../../../../zlib/contrib/vstudio/vc15/Release/zlibuwp/zlibuwp.lib) {
+            exists(../../../../zlib/contrib/vstudio/vc17/Release/zlibuwp/zlibuwp.lib) {
                 INCLUDEPATH += ../../../../zlib
-                LIBS += ../../../../zlib/contrib/vstudio/vc15/Release/zlibuwp/zlibuwp.lib
+                LIBS += ../../../../zlib/contrib/vstudio/vc17/Release/zlibuwp/zlibuwp.lib
             } else {
                 error("zlib not found on system")
             }
         }
 
         contains(QT_ARCH, x86_64) {
-            exists(../../../../MediaInfoLib/Project/MSVC2017/x64/Release/MediaInfo-Static_UWP.lib) {
+            exists(../../../../MediaInfoLib/Project/MSVC2022/x64/Release/MediaInfo-Static_UWP.lib) {
                 INCLUDEPATH += ../../../../MediaInfoLib/Source
-                LIBS += ../../../../MediaInfoLib/Project/MSVC2017/x64/Release/MediaInfo-Static_UWP.lib
+                LIBS += ../../../../MediaInfoLib/Project/MSVC2022/x64/Release/MediaInfo-Static_UWP.lib
             } else {
                 error("libmediainfo not found on system")
             }
 
-            exists(../../../../ZenLib/Project/MSVC2017/x64/Release/ZenLib_UWP.lib) {
+            exists(../../../../ZenLib/Project/MSVC2022/x64/Release/ZenLib_UWP.lib) {
                 INCLUDEPATH += ../../../../ZenLib/Source
-                LIBS += ../../../../ZenLib/Project/MSVC2017/x64/Release/ZenLib_UWP.lib
+                LIBS += ../../../../ZenLib/Project/MSVC2022/x64/Release/ZenLib_UWP.lib
             } else {
                 error("libzen not found on system")
             }
 
-            exists(../../../../zlib/contrib/vstudio/vc15/x64/Release/zlibuwp/zlibuwp.lib) {
+            exists(../../../../zlib/contrib/vstudio/vc17/x64/Release/zlibuwp/zlibuwp.lib) {
                 INCLUDEPATH += ../../../../zlib
-                LIBS += ../../../../zlib/contrib/vstudio/vc15/x64/Release/zlibuwp/zlibuwp.lib
+                LIBS += ../../../../zlib/contrib/vstudio/vc17/x64/Release/zlibuwp/zlibuwp.lib
             } else {
                 error("zlib not found on system")
             }
         }
     } else {
         contains(QT_ARCH, i386) {
-            exists(../../../../MediaInfoLib/Project/MSVC2017/Win32/Release/MediaInfo-Static.lib) {
+            exists(../../../../MediaInfoLib/Project/MSVC2022/Win32/Release/MediaInfo-Static.lib) {
                 INCLUDEPATH += ../../../../MediaInfoLib/Source
-                LIBS += ../../../../MediaInfoLib/Project/MSVC2017/Win32/Release/MediaInfo-Static.lib
+                LIBS += ../../../../MediaInfoLib/Project/MSVC2022/Win32/Release/MediaInfo-Static.lib
             } else {
                 error("libmediainfo not found on system")
             }
 
-            exists(../../../../ZenLib/Project/MSVC2017/Win32/Release/ZenLib.lib) {
+            exists(../../../../ZenLib/Project/MSVC2022/Win32/Release/ZenLib.lib) {
                 INCLUDEPATH += ../../../../ZenLib/Source
-                LIBS += ../../../../ZenLib/Project/MSVC2017/Win32/Release/ZenLib.lib
+                LIBS += ../../../../ZenLib/Project/MSVC2022/Win32/Release/ZenLib.lib
             } else {
                 error("libzen not found on system")
             }
 
-            exists(../../../../zlib/contrib/vstudio/vc15/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib) {
+            exists(../../../../zlib/contrib/vstudio/vc17/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib) {
                 INCLUDEPATH += ../../../../zlib
-                LIBS += ../../../../zlib/contrib/vstudio/vc15/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib
+                LIBS += ../../../../zlib/contrib/vstudio/vc17/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib
             } else {
                 error("zlib not found on system")
             }
         }
 
         contains(QT_ARCH, x86_64) {
-            exists(../../../../MediaInfoLib/Project/MSVC2017/x64/Release/MediaInfo-Static.lib) {
+            exists(../../../../MediaInfoLib/Project/MSVC2022/x64/Release/MediaInfo-Static.lib) {
                 INCLUDEPATH += ../../../../MediaInfoLib/Source
-                LIBS += ../../../../MediaInfoLib/Project/MSVC2017/x64/Release/MediaInfo-Static.lib
+                LIBS += ../../../../MediaInfoLib/Project/MSVC2022/x64/Release/MediaInfo-Static.lib
             } else {
                 error("libmediainfo not found on system")
             }
 
-            exists(../../../../ZenLib/Project/MSVC2017/x64/Release/ZenLib.lib) {
+            exists(../../../../ZenLib/Project/MSVC2022/x64/Release/ZenLib.lib) {
                 INCLUDEPATH += ../../../../ZenLib/Source
-                LIBS += ../../../../ZenLib/Project/MSVC2017/x64/Release/ZenLib.lib
+                LIBS += ../../../../ZenLib/Project/MSVC2022/x64/Release/ZenLib.lib
             } else {
                 error("libzen not found on system")
             }
 
-            exists(../../../../zlib/contrib/vstudio/vc15/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib) {
+            exists(../../../../zlib/contrib/vstudio/vc17/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib) {
                 INCLUDEPATH += ../../../../zlib
-                LIBS += ../../../../zlib/contrib/vstudio/vc15/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib
+                LIBS += ../../../../zlib/contrib/vstudio/vc17/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib
             } else {
                 error("zlib not found on system")
             }

diff --git a/Source/Common/Preferences.cpp b/Source/Common/Preferences.cpp
@@ -162,8 +162,8 @@ int Preferences::Config_Load()
     ShellToolTip();
 
     //Internet
-    if (Retour!=2 && Config(__T("CheckUpdate"))==__T("1"))
-        Prefs->InternetCheck();
+	//if (Retour!=2 && Config(__T("CheckUpdate"))==__T("1"))
+    //    Prefs->InternetCheck();
 
     //New version menu
     if (!Prefs->Config(__T("Version")).empty() && Prefs->Config(__T("Version"))!=Prefs->Config(__T("NewestVersion")))

diff --git a/Source/GUI/Qt/mainwindow.ui b/Source/GUI/Qt/mainwindow.ui
@@ -51,7 +51,7 @@
      <x>0</x>
      <y>0</y>
      <width>600</width>
-     <height>25</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuView">
@@ -101,7 +101,7 @@
     <string>toolBar</string>
    </property>
    <property name="orientation">
-    <enum>Qt::Horizontal</enum>
+    <enum>Qt::Vertical</enum>
    </property>
    <property name="iconSize">
     <size>
@@ -110,7 +110,7 @@
     </size>
    </property>
    <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
+    <enum>LeftToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
     <bool>false</bool>
@@ -119,8 +119,6 @@
    <addaction name="actionOpen_Folder"/>
    <addaction name="actionExport"/>
    <addaction name="separator"/>
-   <addaction name="actionClose_All"/>
-   <addaction name="separator"/>
    <addaction name="actionAbout"/>
    <addaction name="separator"/>
    <addaction name="actionPreferences"/>