chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
Birunthan Mohanathas
2012-06-17 18:35:57 +03:00
parent 1d38698c7a
commit d7fb5f4bb5
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SkinInstaller/DialogInstall.cpp
View File

@@ -489,8 +489,8 @@ bool CDialogInstall::ReadPackage()
{ {
m_PackageSkins.insert(item); m_PackageSkins.insert(item);
} }
else if (_wcsicmp(component, L"Themes") == 0 && else if (_wcsicmp(component, m_PackageFormat == PackageFormat::Old ? L"Themes" : L"Layouts") == 0 &&
_wcsicmp(extension, L".thm") == 0 && _wcsicmp(extension, m_PackageFormat == PackageFormat::Old ? L".thm" : L".ini") == 0 &&
!IsIgnoredTheme(itemSz)) !IsIgnoredTheme(itemSz))
{ {
m_PackageThemes.insert(item); m_PackageThemes.insert(item);
@@ -773,10 +773,15 @@ bool CDialogInstall::InstallPackage()
targetPath += path; targetPath += path;
error = !ExtractCurrentFile(targetPath); error = !ExtractCurrentFile(targetPath);
} }
else if (_wcsicmp(component, L"Themes") == 0 && else if (_wcsicmp(component, m_PackageFormat == PackageFormat::New ? L"Layouts" : L"Themes") == 0 &&
_wcsicmp(extension, L".thm") == 0 && _wcsicmp(extension, m_PackageFormat == PackageFormat::New ? L".ini" : L".thm") == 0 &&
m_PackageThemes.find(item) != m_PackageThemes.end()) m_PackageThemes.find(item) != m_PackageThemes.end())
{ {
if (m_PackageFormat == PackageFormat::New)
{
wcscpy_s(extension, 5, L".thm");
}
targetPath = g_Data.settingsPath; targetPath = g_Data.settingsPath;
targetPath += L"Themes\\"; targetPath += L"Themes\\";
targetPath += path; targetPath += path;

4
SkinInstaller/DialogPackage.cpp
View File

@@ -282,8 +282,8 @@ bool CDialogPackage::CreatePackage()
for (auto iter = m_ThemeFolders.cbegin(); iter != m_ThemeFolders.cend(); ++iter) for (auto iter = m_ThemeFolders.cbegin(); iter != m_ThemeFolders.cend(); ++iter)
{ {
std::wstring realPath = (*iter).second + L"Rainmeter.thm"; std::wstring realPath = (*iter).second + L"Rainmeter.thm";
std::wstring zipPath = L"Themes\\" + (*iter).first; std::wstring zipPath = L"Layouts\\" + (*iter).first;
zipPath += L"\\Rainmeter.thm"; zipPath += L"\\Rainmeter.ini";
if (!AddFileToPackage(realPath.c_str(), zipPath.c_str())) if (!AddFileToPackage(realPath.c_str(), zipPath.c_str()))
{ {
std::wstring error = L"Error adding theme '"; std::wstring error = L"Error adding theme '";