From ca97e51bc8522538feb522940682a55f0620b90c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 5 Nov 2023 22:06:24 +0300
Subject: mir_fonts.cpp erased because the problems with translation

---
 plugins/AutoShutdown/shutdown.vcxproj            | 5 -----
 plugins/AutoShutdown/shutdown.vcxproj.filters    | 3 ---
 plugins/AutoShutdown/src/frame.cpp               | 6 +++---
 plugins/AutoShutdown/src/stdafx.h                | 2 --
 plugins/FloatingContacts/FltCont.vcxproj         | 5 -----
 plugins/FloatingContacts/FltCont.vcxproj.filters | 3 ---
 plugins/FloatingContacts/src/main.cpp            | 4 +---
 7 files changed, 4 insertions(+), 24 deletions(-)

(limited to 'plugins')

diff --git a/plugins/AutoShutdown/shutdown.vcxproj b/plugins/AutoShutdown/shutdown.vcxproj
index 358f9347a0..8b0bcff49f 100644
--- a/plugins/AutoShutdown/shutdown.vcxproj
+++ b/plugins/AutoShutdown/shutdown.vcxproj
@@ -48,11 +48,6 @@
     <ClInclude Include="src\version.h" />
     <ClInclude Include="src\watcher.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\utils\mir_fonts.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\resource.rc" />
     <ResourceCompile Include="res\version.rc" />
diff --git a/plugins/AutoShutdown/shutdown.vcxproj.filters b/plugins/AutoShutdown/shutdown.vcxproj.filters
index 1b2285e93d..71709f0a0e 100644
--- a/plugins/AutoShutdown/shutdown.vcxproj.filters
+++ b/plugins/AutoShutdown/shutdown.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClCompile Include="src\watcher.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\utils\mir_fonts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\cpuusage.h">
diff --git a/plugins/AutoShutdown/src/frame.cpp b/plugins/AutoShutdown/src/frame.cpp
index b340a69db5..c073c64e65 100644
--- a/plugins/AutoShutdown/src/frame.cpp
+++ b/plugins/AutoShutdown/src/frame.cpp
@@ -553,13 +553,13 @@ static int FrameModulesLoaded(WPARAM, LPARAM)
 		LOGFONT lf;
 		/* built-in font module is not available before this hook */
 		COLORREF clr = GetDefaultColor(FRAMEELEMENT_TEXT);
-		FontService_RegisterFont(MODULENAME, "CountdownFont", LPGENW("Automatic shutdown"), LPGENW("Countdown on frame"), LPGENW("Automatic shutdown"), LPGENW("Background"), 0, FALSE, GetDefaultFont(&lf), clr);
+		g_plugin.addFont(MODULENAME, "CountdownFont", LPGENW("Automatic shutdown"), LPGENW("Countdown on frame"), LPGENW("Automatic shutdown"), LPGENW("Background"), 0, FALSE, GetDefaultFont(&lf), clr);
 		clr = GetDefaultColor(FRAMEELEMENT_BKGRND);
-		FontService_RegisterColor(MODULENAME, "BkgColor", LPGENW("Automatic shutdown"), LPGENW("Background"), clr);
+		g_plugin.addColor(MODULENAME, "BkgColor", LPGENW("Automatic shutdown"), LPGENW("Background"), clr);
 		if (!IsThemeActive()) {
 			/* progressbar color can only be changed with classic theme */
 			clr = GetDefaultColor(FRAMEELEMENT_BAR);
-			FontService_RegisterColor(MODULENAME, "ProgressColor", TranslateT("Automatic shutdown"), TranslateT("Progress bar"), clr);
+			g_plugin.addColor(MODULENAME, "ProgressColor", TranslateT("Automatic shutdown"), TranslateT("Progress bar"), clr);
 		}
 	}
 	return 0;
diff --git a/plugins/AutoShutdown/src/stdafx.h b/plugins/AutoShutdown/src/stdafx.h
index e45715116c..3ee6fd516b 100644
--- a/plugins/AutoShutdown/src/stdafx.h
+++ b/plugins/AutoShutdown/src/stdafx.h
@@ -58,8 +58,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_icolib.h>
 #include <m_hotkeys.h>
 
-#include "../../utils/mir_fonts.h"
-
 #include <m_weather.h>
 #include <m_toptoolbar.h>
 #include <m_shutdown.h>
diff --git a/plugins/FloatingContacts/FltCont.vcxproj b/plugins/FloatingContacts/FltCont.vcxproj
index ec5281e433..c68b660d84 100644
--- a/plugins/FloatingContacts/FltCont.vcxproj
+++ b/plugins/FloatingContacts/FltCont.vcxproj
@@ -42,11 +42,6 @@
     <ClInclude Include="src\thumbs.h" />
     <ClInclude Include="src\version.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\utils\mir_fonts.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\fltcnt.rc" />
     <ResourceCompile Include="res\version.rc" />
diff --git a/plugins/FloatingContacts/FltCont.vcxproj.filters b/plugins/FloatingContacts/FltCont.vcxproj.filters
index 8beef67a69..903f361bf0 100644
--- a/plugins/FloatingContacts/FltCont.vcxproj.filters
+++ b/plugins/FloatingContacts/FltCont.vcxproj.filters
@@ -20,9 +20,6 @@
     <ClCompile Include="src\thumbs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\utils\mir_fonts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\bitmap_funcs.h">
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp
index eb64c54463..a1265dba97 100644
--- a/plugins/FloatingContacts/src/main.cpp
+++ b/plugins/FloatingContacts/src/main.cpp
@@ -16,8 +16,6 @@ No warranty for any misbehaviour.
 
 #include "stdafx.h"
 
-#include "../../utils/mir_fonts.h"
-
 /////////////////////////////////////////////////////////////////////////////
 // Globals
 
@@ -908,7 +906,7 @@ int CMPlugin::Load()
 
 		char szId[20];
 		mir_snprintf(szId, "Font%d", i);
-		FontService_RegisterFont(MODULENAME, szId, LPGENW("Floating contacts"), s_fonts[i], nullptr, nullptr, i + 1, false, &lf, defColor);
+		addFont(MODULENAME, szId, LPGENW("Floating contacts"), s_fonts[i], nullptr, nullptr, i + 1, false, &lf, defColor);
 	}
 
 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoded);
-- 
cgit v1.2.3