从配置文件读取皮肤名称时去掉前面的斜杠

Author: zhongyang219

TrafficMonitor/SkinAutoAdaptSettingDlg.cpp

@@ -5,6 +5,7 @@
 #include "TrafficMonitor.h"
 #include "afxdialogex.h"
 #include "SkinAutoAdaptSettingDlg.h"
+#include "SkinManager.h"
 
 
 // CSkinAutoAdaptSettingDlg 对话框
@@ -25,11 +26,7 @@ CSkinAutoAdaptSettingDlg::~CSkinAutoAdaptSettingDlg()
 int CSkinAutoAdaptSettingDlg::FindSkinIndex(const wstring& skin_name)
 {
     std::wstring _skin_name{ skin_name };
-    //如果名称前面有斜杠，则将它去掉
-    if (!_skin_name.empty() && (_skin_name[0] == L'\\' || _skin_name[0] == L'/'))
-    {
-        _skin_name = _skin_name.substr(1);
-    }
+    CSkinManager::SkinNameNormalize(_skin_name);
     auto iter = std::find(m_skins.begin(), m_skins.end(), _skin_name);
     if (iter == m_skins.end())
         return 0;

TrafficMonitor/SkinManager.cpp

@@ -65,11 +65,7 @@ std::wstring CSkinManager::GetSkinName(int index) const
 int CSkinManager::FindSkinIndex(const std::wstring& skin_name) const
 {
     std::wstring _skin_name{ skin_name };
-    //如果名称前面有斜杠，则将它去掉
-    if (!_skin_name.empty() && (_skin_name[0] == L'\\' || _skin_name[0] == L'/'))
-    {
-        _skin_name = _skin_name.substr(1);
-    }
+    SkinNameNormalize(_skin_name);
     for (size_t i{}; i < m_skins.size(); i++)
     {
         if (m_skins[i] == _skin_name)
@@ -173,3 +169,13 @@ void CSkinManager::SkinSettingDataFronSkin(SkinSettingData& skin_setting_data, c
         }
     }
 }
+
+void CSkinManager::SkinNameNormalize(std::wstring& skin_name)
+{
+    //如果名称前面有斜杠，则将它去掉
+    if (!skin_name.empty() && (skin_name[0] == L'\\' || skin_name[0] == L'/'))
+    {
+        skin_name = skin_name.substr(1);
+    }
+
+}

TrafficMonitor/SkinManager.h

@@ -16,8 +16,12 @@ class CSkinManager
 
     void Save();
 
+    //从一个皮肤文件获取SkinSettingData对象
     static void SkinSettingDataFronSkin(SkinSettingData& skin_setting_data, const CSkinFile& skin_file);
 
+    //去掉皮肤名称前面的斜杠
+    static void SkinNameNormalize(std::wstring& skin_name);
+
 private:
     CSkinManager()
     {}

TrafficMonitor/TrafficMonitor.cpp

@@ -120,6 +120,7 @@ void CTrafficMonitorApp::LoadConfig()
     m_cfg_data.m_skin_name = ini.GetString(_T("config"), _T("skin_selected"), _T(""));
     if (m_cfg_data.m_skin_name.substr(0, 8) == L".\\skins\\")       //如果读取到的皮肤名称前面有".\\skins\\"，则把它删除。（用于和前一个版本保持兼容性）
         m_cfg_data.m_skin_name = m_cfg_data.m_skin_name.substr(7);
+    CSkinManager::SkinNameNormalize(m_cfg_data.m_skin_name);
 
     m_cfg_data.skin_auto_adapt = ini.GetBool(L"skins", L"skin_auto_adapt", false);
     m_cfg_data.skin_name_dark_mode = ini.GetString(L"skins", L"skin_name_dark_mode", L"");