Make _UI suffix consistent

Signed-off-by: Simon Rozman <simon@rozman.si>

EAPMethods/build/EAPMethod_UI.props

@@ -7,10 +7,10 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <PrecompiledHeaderFile>StdAfxUI.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>StdAfx_UI.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
-      <ModuleDefinitionFile>EAPMethodUI.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>EAPMethod_UI.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />

EAPMethods/build/EAPTTLS_UI.vcxproj

@@ -28,7 +28,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{DD7A97CA-F18E-43B7-95C4-D06E6A291624}</ProjectGuid>
-    <RootNamespace>EAPTTLSUI</RootNamespace>
+    <RootNamespace>EAPTTLS_UI</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -78,7 +78,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="EAPMethodUI.props" />
+    <Import Project="EAPMethod_UI.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
@@ -100,16 +100,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <ItemGroup>
-    <ClInclude Include="..\src\StdAfxUI.h" />
+    <ClInclude Include="..\src\StdAfx_UI.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\MainUI.cpp" />
+    <ClCompile Include="..\src\Main_UI.cpp" />
-    <ClCompile Include="..\src\StdAfxUI.cpp">
+    <ClCompile Include="..\src\StdAfx_UI.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\res\EAPTTLSUI.rc" />
+    <ResourceCompile Include="..\res\EAPTTLS_UI.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
@@ -165,7 +165,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="EAPMethodUI.def" />
+    <None Include="EAPMethod_UI.def" />
     <None Include="..\locale\EAPMethods.pot" />
   </ItemGroup>
   <ItemGroup>

EAPMethods/build/EAPTTLS_UI.vcxproj.filters

@@ -19,25 +19,25 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\StdAfxUI.h">
+    <ClInclude Include="..\src\StdAfx_UI.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\StdAfxUI.cpp">
+    <ClCompile Include="..\src\StdAfx_UI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\MainUI.cpp">
+    <ClCompile Include="..\src\Main_UI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\res\EAPTTLSUI.rc">
+    <ResourceCompile Include="..\res\EAPTTLS_UI.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="EAPMethodUI.def">
+    <None Include="EAPMethod_UI.def">
       <Filter>Source Files</Filter>
     </None>
     <None Include="..\locale\EAPMethods.pot">

EAPMethods/src/Main_UI.cpp

@@ -18,7 +18,7 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "StdAfxUI.h"
+#include "StdAfx_UI.h"
 
 #pragma comment(lib, "msxml6.lib")
 

EAPMethods/src/StdAfx_UI.cpp

@@ -1,21 +1,21 @@
-/*
+/*
-    Copyright 2015-2020 Amebis
+    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
+    Copyright 2016 GÉANT
-
+
-    This file is part of GÉANTLink.
+    This file is part of GÉANTLink.
-
+
-    GÉANTLink is free software: you can redistribute it and/or modify it
+    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
+    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+    (at your option) any later version.
-
+
-    GÉANTLink is distributed in the hope that it will be useful, but
+    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
+    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU General Public License for more details.
-
+
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
+*/
-
+
-#include "StdAfxUI.h"
+#include "StdAfx_UI.h"

GEANTLink.sln

@@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\Cred
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\build\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS_UI", "EAPMethods\build\EAPTTLS_UI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}"
 EndProject

README.md

@@ -123,7 +123,7 @@ Before one can attempt to debug EAP DLLs, you should run `nmake register` from a
 
 Next, one must configure a network profile to actually use one of this product's EAP modules for the authentication.
 
-EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLSUI.dll_).
+EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLS_UI.dll_).
 
 ##### Backend DLL
 

lib/TTLS_UI/src/Module.cpp

@@ -524,7 +524,7 @@ wxInitializerPeer::wxInitializerPeer(_In_ HINSTANCE instance, _In_opt_ HWND hwnd
         s_locale = new wxLocale;
         if (wxInitializeLocale(*s_locale)) {
             s_locale->AddCatalog(wxT("wxExtend") wxT(wxExtendVersion));
-            s_locale->AddCatalog(wxT("EAPTTLSUI"));
+            s_locale->AddCatalog(wxT("EAPTTLS_UI"));
         }
     }
 

output/locale/.gitignore

@@ -1,4 +1,4 @@
-*/EAPTTLSUI.mo
+*/EAPTTLS_UI.mo
 */EventMonitor.mo
 */wxExtend*.mo
 */wxstd.mo