mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Remove "C" prefix in class names
This commit is contained in:
Birunthan Mohanathas
@ -189,11 +189,11 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
|
||||
}
|
||||
else if (wcscmp(lpCmdLine, L"/Packager") == 0)
|
||||
{
|
||||
CDialogPackage::Create(hInstance, lpCmdLine);
|
||||
DialogPackage::Create(hInstance, lpCmdLine);
|
||||
}
|
||||
else
|
||||
{
|
||||
CDialogInstall::Create(hInstance, lpCmdLine);
|
||||
DialogInstall::Create(hInstance, lpCmdLine);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
extern GlobalData g_Data;
|
||||
|
||||
CDialogInstall* CDialogInstall::c_Dialog = NULL;
|
||||
DialogInstall* DialogInstall::c_Dialog = NULL;
|
||||
|
||||
inline bool IsWin32Build()
|
||||
{
|
||||
@ -43,7 +43,7 @@ inline bool IsWin32Build()
|
||||
** Constructor.
|
||||
**
|
||||
*/
|
||||
CDialogInstall::CDialogInstall(HWND wnd, const WCHAR* file) : CDialog(wnd),
|
||||
DialogInstall::DialogInstall(HWND wnd, const WCHAR* file) : Dialog(wnd),
|
||||
m_TabInstall(wnd),
|
||||
m_HeaderBitmap(),
|
||||
m_InstallThread(),
|
||||
@ -61,7 +61,7 @@ CDialogInstall::CDialogInstall(HWND wnd, const WCHAR* file) : CDialog(wnd),
|
||||
** Destructor.
|
||||
**
|
||||
*/
|
||||
CDialogInstall::~CDialogInstall()
|
||||
DialogInstall::~DialogInstall()
|
||||
{
|
||||
if (m_PackageUnzFile)
|
||||
{
|
||||
@ -73,7 +73,7 @@ CDialogInstall::~CDialogInstall()
|
||||
** Creates the dialog.
|
||||
**
|
||||
*/
|
||||
void CDialogInstall::Create(HINSTANCE hInstance, LPWSTR lpCmdLine)
|
||||
void DialogInstall::Create(HINSTANCE hInstance, LPWSTR lpCmdLine)
|
||||
{
|
||||
// Prompt to select .rmskin file if needed
|
||||
WCHAR buffer[MAX_PATH];
|
||||
@ -112,18 +112,18 @@ void CDialogInstall::Create(HINSTANCE hInstance, LPWSTR lpCmdLine)
|
||||
}
|
||||
}
|
||||
|
||||
CDialog::CTab& CDialogInstall::GetActiveTab()
|
||||
Dialog::Tab& DialogInstall::GetActiveTab()
|
||||
{
|
||||
return m_TabInstall;
|
||||
}
|
||||
|
||||
INT_PTR CALLBACK CDialogInstall::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK DialogInstall::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
if (!c_Dialog)
|
||||
{
|
||||
if (uMsg == WM_INITDIALOG)
|
||||
{
|
||||
c_Dialog = new CDialogInstall(hWnd, (const WCHAR*)lParam);
|
||||
c_Dialog = new DialogInstall(hWnd, (const WCHAR*)lParam);
|
||||
return c_Dialog->OnInitDialog(wParam, lParam);
|
||||
}
|
||||
}
|
||||
@ -151,7 +151,7 @@ INT_PTR CALLBACK CDialogInstall::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogInstall::OnInitDialog(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogInstall::OnInitDialog(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
HICON hIcon = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_SKININSTALLER), IMAGE_ICON, 16, 16, LR_SHARED);
|
||||
SendMessage(m_Window, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
|
||||
@ -162,7 +162,7 @@ INT_PTR CDialogInstall::OnInitDialog(WPARAM wParam, LPARAM lParam)
|
||||
}
|
||||
|
||||
HWND item = GetDlgItem(m_Window, IDC_INSTALL_ADVANCED_BUTTON);
|
||||
CDialog::SetMenuButton(item);
|
||||
Dialog::SetMenuButton(item);
|
||||
|
||||
if (ReadPackage())
|
||||
{
|
||||
@ -212,7 +212,7 @@ INT_PTR CDialogInstall::OnInitDialog(WPARAM wParam, LPARAM lParam)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogInstall::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogInstall::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (LOWORD(wParam))
|
||||
{
|
||||
@ -283,7 +283,7 @@ INT_PTR CDialogInstall::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogInstall::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogInstall::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
LPNMHDR nm = (LPNMHDR)lParam;
|
||||
switch (nm->code)
|
||||
@ -305,7 +305,7 @@ INT_PTR CDialogInstall::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
bool CDialogInstall::ExtractCurrentFile(const std::wstring& fileName)
|
||||
bool DialogInstall::ExtractCurrentFile(const std::wstring& fileName)
|
||||
{
|
||||
// Some archives don't explicity list directories, so create them recursively
|
||||
if (!CreateDirectoryRecursive(fileName))
|
||||
@ -349,7 +349,7 @@ bool CDialogInstall::ExtractCurrentFile(const std::wstring& fileName)
|
||||
return unzCloseCurrentFile(m_PackageUnzFile) == UNZ_OK && read == UNZ_EOF;
|
||||
}
|
||||
|
||||
bool CDialogInstall::ReadPackage()
|
||||
bool DialogInstall::ReadPackage()
|
||||
{
|
||||
const WCHAR* fileName = m_PackageFileName.c_str();
|
||||
const WCHAR* fileExtension = PathFindExtension(fileName);
|
||||
@ -565,7 +565,7 @@ bool CDialogInstall::ReadPackage()
|
||||
m_PackageAddons.empty() && m_PackageFonts.empty() && m_PackagePlugins.empty());
|
||||
}
|
||||
|
||||
bool CDialogInstall::ReadOptions(const WCHAR* file)
|
||||
bool DialogInstall::ReadOptions(const WCHAR* file)
|
||||
{
|
||||
WCHAR buffer[MAX_LINE_LENGTH];
|
||||
|
||||
@ -658,7 +658,7 @@ bool CDialogInstall::ReadOptions(const WCHAR* file)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CDialogInstall::InstallPackage()
|
||||
bool DialogInstall::InstallPackage()
|
||||
{
|
||||
if ((!m_MergeSkins && m_BackupSkins) || m_BackupPackage)
|
||||
{
|
||||
@ -852,7 +852,7 @@ bool CDialogInstall::InstallPackage()
|
||||
return true;
|
||||
}
|
||||
|
||||
void CDialogInstall::BeginInstall()
|
||||
void DialogInstall::BeginInstall()
|
||||
{
|
||||
HWND item = GetDlgItem(m_Window, IDC_INSTALL_ADVANCED_BUTTON);
|
||||
EnableWindow(item, FALSE);
|
||||
@ -910,9 +910,9 @@ void CDialogInstall::BeginInstall()
|
||||
}
|
||||
}
|
||||
|
||||
UINT __stdcall CDialogInstall::InstallThread(void* pParam)
|
||||
UINT __stdcall DialogInstall::InstallThread(void* pParam)
|
||||
{
|
||||
CDialogInstall* dialog = (CDialogInstall*)pParam;
|
||||
DialogInstall* dialog = (DialogInstall*)pParam;
|
||||
|
||||
if (!CloseRainmeterIfActive())
|
||||
{
|
||||
@ -951,7 +951,7 @@ UINT __stdcall CDialogInstall::InstallThread(void* pParam)
|
||||
return 0;
|
||||
}
|
||||
|
||||
void CDialogInstall::KeepVariables()
|
||||
void DialogInstall::KeepVariables()
|
||||
{
|
||||
WCHAR keyname[32767]; // Max size returned by GetPrivateProfileSection
|
||||
WCHAR buffer[4];
|
||||
@ -993,7 +993,7 @@ void CDialogInstall::KeepVariables()
|
||||
}
|
||||
}
|
||||
|
||||
void CDialogInstall::LaunchRainmeter()
|
||||
void DialogInstall::LaunchRainmeter()
|
||||
{
|
||||
// Execute Rainmeter and wait up to a minute for it process all messages
|
||||
std::wstring rainmeterExe = g_Data.programPath + L"Rainmeter.exe";
|
||||
@ -1057,7 +1057,7 @@ bool IsIgnoredName(const WCHAR* name, const WCHAR* names[], int namesCount)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CDialogInstall::IsIgnoredSkin(const WCHAR* name)
|
||||
bool DialogInstall::IsIgnoredSkin(const WCHAR* name)
|
||||
{
|
||||
static const WCHAR* s_Skins[] =
|
||||
{
|
||||
@ -1068,7 +1068,7 @@ bool CDialogInstall::IsIgnoredSkin(const WCHAR* name)
|
||||
return IsIgnoredName(name, s_Skins, _countof(s_Skins));
|
||||
}
|
||||
|
||||
bool CDialogInstall::IsIgnoredLayout(const WCHAR* name)
|
||||
bool DialogInstall::IsIgnoredLayout(const WCHAR* name)
|
||||
{
|
||||
static const WCHAR* s_Layouts[] =
|
||||
{
|
||||
@ -1079,7 +1079,7 @@ bool CDialogInstall::IsIgnoredLayout(const WCHAR* name)
|
||||
return IsIgnoredName(name, s_Layouts, _countof(s_Layouts));
|
||||
}
|
||||
|
||||
bool CDialogInstall::IsIgnoredAddon(const WCHAR* name)
|
||||
bool DialogInstall::IsIgnoredAddon(const WCHAR* name)
|
||||
{
|
||||
static const WCHAR* s_Addons[] =
|
||||
{
|
||||
@ -1091,7 +1091,7 @@ bool CDialogInstall::IsIgnoredAddon(const WCHAR* name)
|
||||
return IsIgnoredName(name, s_Addons, _countof(s_Addons));
|
||||
}
|
||||
|
||||
bool CDialogInstall::IsIgnoredPlugin(const WCHAR* name)
|
||||
bool DialogInstall::IsIgnoredPlugin(const WCHAR* name)
|
||||
{
|
||||
static const WCHAR* s_Plugins[] =
|
||||
{
|
||||
@ -1125,7 +1125,7 @@ bool CDialogInstall::IsIgnoredPlugin(const WCHAR* name)
|
||||
/*
|
||||
** Splits the string from the delimiters and trims whitespace.
|
||||
*/
|
||||
std::vector<std::wstring> CDialogInstall::Tokenize(const std::wstring& str, const std::wstring& delimiters)
|
||||
std::vector<std::wstring> DialogInstall::Tokenize(const std::wstring& str, const std::wstring& delimiters)
|
||||
{
|
||||
// Modified from http://www.digitalpeer.com/id/simple
|
||||
std::vector<std::wstring> tokens;
|
||||
@ -1160,7 +1160,7 @@ std::vector<std::wstring> CDialogInstall::Tokenize(const std::wstring& str, cons
|
||||
/*
|
||||
** Compares two version strings. Returns 0 if equal, 1 if A > B and -1 if A < B.
|
||||
*/
|
||||
int CDialogInstall::CompareVersions(const std::wstring& strA, const std::wstring& strB)
|
||||
int DialogInstall::CompareVersions(const std::wstring& strA, const std::wstring& strB)
|
||||
{
|
||||
if (strA.empty() && strB.empty()) return 0;
|
||||
if (strA.empty()) return -1;
|
||||
@ -1190,7 +1190,7 @@ int CDialogInstall::CompareVersions(const std::wstring& strA, const std::wstring
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool CDialogInstall::CreateDirectoryRecursive(const std::wstring& path)
|
||||
bool DialogInstall::CreateDirectoryRecursive(const std::wstring& path)
|
||||
{
|
||||
// Dirty...
|
||||
std::wstring& directory = (std::wstring&)path;
|
||||
@ -1214,7 +1214,7 @@ bool CDialogInstall::CreateDirectoryRecursive(const std::wstring& path)
|
||||
return !failed;
|
||||
}
|
||||
|
||||
std::wstring CDialogInstall::GetFileVersionString(const WCHAR* fileName)
|
||||
std::wstring DialogInstall::GetFileVersionString(const WCHAR* fileName)
|
||||
{
|
||||
DWORD bufSize = GetFileVersionInfoSize(fileName, 0);
|
||||
void* versionInfo = new WCHAR[bufSize];
|
||||
@ -1245,7 +1245,7 @@ std::wstring CDialogInstall::GetFileVersionString(const WCHAR* fileName)
|
||||
return result;
|
||||
}
|
||||
|
||||
std::wstring CDialogInstall::GetDotNetVersionString()
|
||||
std::wstring DialogInstall::GetDotNetVersionString()
|
||||
{
|
||||
WCHAR buffer[255];
|
||||
HKEY hKey;
|
||||
@ -1268,7 +1268,7 @@ std::wstring CDialogInstall::GetDotNetVersionString()
|
||||
return currVer;
|
||||
}
|
||||
|
||||
std::wstring CDialogInstall::GetWindowsVersionString()
|
||||
std::wstring DialogInstall::GetWindowsVersionString()
|
||||
{
|
||||
WCHAR buffer[16];
|
||||
OSVERSIONINFOEX osvi = {sizeof(OSVERSIONINFOEX)};
|
||||
@ -1288,11 +1288,11 @@ std::wstring CDialogInstall::GetWindowsVersionString()
|
||||
** Constructor.
|
||||
**
|
||||
*/
|
||||
CDialogInstall::CTabInstall::CTabInstall(HWND wnd) : CTab(GetModuleHandle(NULL), wnd, IDD_INSTALL_TAB, DlgProc)
|
||||
DialogInstall::TabInstall::TabInstall(HWND wnd) : Tab(GetModuleHandle(NULL), wnd, IDD_INSTALL_TAB, DlgProc)
|
||||
{
|
||||
}
|
||||
|
||||
void CDialogInstall::CTabInstall::Initialize()
|
||||
void DialogInstall::TabInstall::Initialize()
|
||||
{
|
||||
HWND item = GetDlgItem(m_Window, IDC_INSTALLTAB_COMPONENTS_LIST);
|
||||
|
||||
@ -1381,7 +1381,7 @@ void CDialogInstall::CTabInstall::Initialize()
|
||||
m_Initialized = true;
|
||||
}
|
||||
|
||||
INT_PTR CALLBACK CDialogInstall::CTabInstall::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK DialogInstall::TabInstall::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#include "unzip.h"
|
||||
#include "../Library/Dialog.h"
|
||||
|
||||
class CDialogInstall : public CDialog
|
||||
class DialogInstall : public Dialog
|
||||
{
|
||||
public:
|
||||
static void Create(HINSTANCE hInstance, LPWSTR lpCmdLine);
|
||||
@ -33,18 +33,18 @@ public:
|
||||
INT_PTR OnCommand(WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR OnNotify(WPARAM wParam, LPARAM lParam);
|
||||
|
||||
static CDialogInstall* c_Dialog;
|
||||
static DialogInstall* c_Dialog;
|
||||
|
||||
protected:
|
||||
virtual CTab& GetActiveTab();
|
||||
virtual Tab& GetActiveTab();
|
||||
|
||||
private:
|
||||
friend class CDialogPackage;
|
||||
friend class DialogPackage;
|
||||
|
||||
class CTabInstall : public CTab
|
||||
class TabInstall : public Tab
|
||||
{
|
||||
public:
|
||||
CTabInstall(HWND window);
|
||||
TabInstall(HWND window);
|
||||
|
||||
virtual void Initialize();
|
||||
|
||||
@ -75,8 +75,8 @@ private:
|
||||
char key[7];
|
||||
};
|
||||
|
||||
CDialogInstall(HWND wnd, const WCHAR* file);
|
||||
virtual ~CDialogInstall();
|
||||
DialogInstall(HWND wnd, const WCHAR* file);
|
||||
virtual ~DialogInstall();
|
||||
|
||||
bool ReadPackage();
|
||||
bool ReadOptions(const WCHAR* file);
|
||||
@ -100,7 +100,7 @@ private:
|
||||
static std::wstring GetDotNetVersionString();
|
||||
static std::wstring GetWindowsVersionString();
|
||||
|
||||
CTabInstall m_TabInstall;
|
||||
TabInstall m_TabInstall;
|
||||
|
||||
HBITMAP m_HeaderBitmap;
|
||||
|
||||
|
||||
@ -28,9 +28,9 @@
|
||||
extern GlobalData g_Data;
|
||||
extern OsNameVersion g_OsNameVersions[];
|
||||
|
||||
CDialogPackage* CDialogPackage::c_Dialog = NULL;
|
||||
DialogPackage* DialogPackage::c_Dialog = NULL;
|
||||
|
||||
CDialogPackage::CDialogPackage(HWND wnd) : CDialog(wnd),
|
||||
DialogPackage::DialogPackage(HWND wnd) : Dialog(wnd),
|
||||
m_TabInfo(wnd),
|
||||
m_TabOptions(wnd),
|
||||
m_TabAdvanced(wnd),
|
||||
@ -41,11 +41,11 @@ CDialogPackage::CDialogPackage(HWND wnd) : CDialog(wnd),
|
||||
{
|
||||
}
|
||||
|
||||
CDialogPackage::~CDialogPackage()
|
||||
DialogPackage::~DialogPackage()
|
||||
{
|
||||
}
|
||||
|
||||
void CDialogPackage::Create(HINSTANCE hInstance, LPWSTR lpCmdLine)
|
||||
void DialogPackage::Create(HINSTANCE hInstance, LPWSTR lpCmdLine)
|
||||
{
|
||||
HANDLE hMutex;
|
||||
if (IsRunning(L"Rainmeter Skin Packager", &hMutex))
|
||||
@ -60,7 +60,7 @@ void CDialogPackage::Create(HINSTANCE hInstance, LPWSTR lpCmdLine)
|
||||
}
|
||||
}
|
||||
|
||||
CDialog::CTab& CDialogPackage::GetActiveTab()
|
||||
Dialog::Tab& DialogPackage::GetActiveTab()
|
||||
{
|
||||
int sel = TabCtrl_GetCurSel(GetDlgItem(m_Window, IDC_PACKAGE_TAB));
|
||||
if (sel == -1)
|
||||
@ -77,13 +77,13 @@ CDialog::CTab& CDialogPackage::GetActiveTab()
|
||||
}
|
||||
}
|
||||
|
||||
INT_PTR CALLBACK CDialogPackage::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK DialogPackage::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
if (!c_Dialog)
|
||||
{
|
||||
if (uMsg == WM_INITDIALOG)
|
||||
{
|
||||
c_Dialog = new CDialogPackage(hWnd);
|
||||
c_Dialog = new DialogPackage(hWnd);
|
||||
return c_Dialog->OnInitDialog(wParam, lParam);
|
||||
}
|
||||
}
|
||||
@ -116,7 +116,7 @@ INT_PTR CALLBACK CDialogPackage::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogPackage::OnInitDialog(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogPackage::OnInitDialog(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
HICON hIcon = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_SKININSTALLER), IMAGE_ICON, 16, 16, LR_SHARED);
|
||||
SendMessage(m_Window, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
|
||||
@ -131,7 +131,7 @@ INT_PTR CDialogPackage::OnInitDialog(WPARAM wParam, LPARAM lParam)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogPackage::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogPackage::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (LOWORD(wParam))
|
||||
{
|
||||
@ -203,7 +203,7 @@ INT_PTR CDialogPackage::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogPackage::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogPackage::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
LPNMHDR nm = (LPNMHDR)lParam;
|
||||
switch (nm->idFrom)
|
||||
@ -227,13 +227,13 @@ INT_PTR CDialogPackage::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
return 0;
|
||||
}
|
||||
|
||||
void CDialogPackage::SetNextButtonState()
|
||||
void DialogPackage::SetNextButtonState()
|
||||
{
|
||||
BOOL state = !(m_Name.empty() || m_Author.empty() || m_SkinFolder.second.empty());
|
||||
EnableWindow(GetDlgItem(m_Window, IDC_PACKAGE_NEXT_BUTTON), state);
|
||||
}
|
||||
|
||||
bool CDialogPackage::CreatePackage()
|
||||
bool DialogPackage::CreatePackage()
|
||||
{
|
||||
// Create options file
|
||||
WCHAR tempFile[MAX_PATH];
|
||||
@ -336,7 +336,7 @@ bool CDialogPackage::CreatePackage()
|
||||
(file = _wfopen(m_TargetFile.c_str(), L"r+b")) != NULL)
|
||||
{
|
||||
fseek(file, 0, SEEK_END);
|
||||
CDialogInstall::PackageFooter footer = { _ftelli64(file), 0, "RMSKIN" };
|
||||
DialogInstall::PackageFooter footer = { _ftelli64(file), 0, "RMSKIN" };
|
||||
fwrite(&footer, sizeof(footer), 1, file);
|
||||
fclose(file);
|
||||
}
|
||||
@ -351,9 +351,9 @@ bool CDialogPackage::CreatePackage()
|
||||
return true;
|
||||
}
|
||||
|
||||
unsigned __stdcall CDialogPackage::PackagerThreadProc(void* pParam)
|
||||
unsigned __stdcall DialogPackage::PackagerThreadProc(void* pParam)
|
||||
{
|
||||
CDialogPackage* dialog = (CDialogPackage*)pParam;
|
||||
DialogPackage* dialog = (DialogPackage*)pParam;
|
||||
|
||||
if (dialog->CreatePackage())
|
||||
{
|
||||
@ -377,7 +377,7 @@ unsigned __stdcall CDialogPackage::PackagerThreadProc(void* pParam)
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool CDialogPackage::AddFileToPackage(const WCHAR* filePath, const WCHAR* zipPath)
|
||||
bool DialogPackage::AddFileToPackage(const WCHAR* filePath, const WCHAR* zipPath)
|
||||
{
|
||||
std::string zipPathAscii = ConvertToAscii(zipPath);
|
||||
for (int i = 0, isize = zipPathAscii.length(); i < isize; ++i)
|
||||
@ -437,7 +437,7 @@ bool CDialogPackage::AddFileToPackage(const WCHAR* filePath, const WCHAR* zipPat
|
||||
return zipCloseFileInZip(m_ZipFile) == ZIP_OK && result;
|
||||
}
|
||||
|
||||
bool CDialogPackage::AddFolderToPackage(const std::wstring& path, std::wstring base, const WCHAR* zipPrefix)
|
||||
bool DialogPackage::AddFolderToPackage(const std::wstring& path, std::wstring base, const WCHAR* zipPrefix)
|
||||
{
|
||||
std::wstring currentPath = path + base;
|
||||
currentPath += L'*';
|
||||
@ -521,7 +521,7 @@ bool CDialogPackage::AddFolderToPackage(const std::wstring& path, std::wstring b
|
||||
return result;
|
||||
}
|
||||
|
||||
void CDialogPackage::ShowHelp()
|
||||
void DialogPackage::ShowHelp()
|
||||
{
|
||||
std::wstring url = L"http://rainmeter.net/cms/UsingApplication-SkinPackager";
|
||||
if (revision_beta)
|
||||
@ -532,7 +532,7 @@ void CDialogPackage::ShowHelp()
|
||||
ShellExecute(m_Window, L"open", url.c_str(), NULL, NULL, SW_SHOWNORMAL);
|
||||
}
|
||||
|
||||
std::wstring CDialogPackage::SelectFolder(HWND parent, const std::wstring& existingPath)
|
||||
std::wstring DialogPackage::SelectFolder(HWND parent, const std::wstring& existingPath)
|
||||
{
|
||||
LPCWSTR dialog = MAKEINTRESOURCE(IDD_PACKAGESELECTFOLDER_DIALOG);
|
||||
std::wstring folder = existingPath;
|
||||
@ -543,7 +543,7 @@ std::wstring CDialogPackage::SelectFolder(HWND parent, const std::wstring& exist
|
||||
return folder;
|
||||
}
|
||||
|
||||
INT_PTR CALLBACK CDialogPackage::SelectFolderDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK DialogPackage::SelectFolderDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (uMsg)
|
||||
{
|
||||
@ -691,7 +691,7 @@ INT_PTR CALLBACK CDialogPackage::SelectFolderDlgProc(HWND hWnd, UINT uMsg, WPARA
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
std::pair<std::wstring, std::wstring> CDialogPackage::SelectPlugin(HWND parent)
|
||||
std::pair<std::wstring, std::wstring> DialogPackage::SelectPlugin(HWND parent)
|
||||
{
|
||||
LPCWSTR dialog = MAKEINTRESOURCE(IDD_PACKAGESELECTPLUGIN_DIALOG);
|
||||
std::pair<std::wstring, std::wstring> plugins;
|
||||
@ -703,7 +703,7 @@ std::pair<std::wstring, std::wstring> CDialogPackage::SelectPlugin(HWND parent)
|
||||
return plugins;
|
||||
}
|
||||
|
||||
INT_PTR CALLBACK CDialogPackage::SelectPluginDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK DialogPackage::SelectPluginDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (uMsg)
|
||||
{
|
||||
@ -800,11 +800,11 @@ INT_PTR CALLBACK CDialogPackage::SelectPluginDlgProc(HWND hWnd, UINT uMsg, WPARA
|
||||
//
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
|
||||
CDialogPackage::CTabInfo::CTabInfo(HWND wnd) : CTab(GetModuleHandle(NULL), wnd, IDD_PACKAGEINFO_TAB, DlgProc)
|
||||
DialogPackage::TabInfo::TabInfo(HWND wnd) : Tab(GetModuleHandle(NULL), wnd, IDD_PACKAGEINFO_TAB, DlgProc)
|
||||
{
|
||||
}
|
||||
|
||||
void CDialogPackage::CTabInfo::Initialize()
|
||||
void DialogPackage::TabInfo::Initialize()
|
||||
{
|
||||
m_Initialized = true;
|
||||
|
||||
@ -855,7 +855,7 @@ void CDialogPackage::CTabInfo::Initialize()
|
||||
ListView_InsertGroup(item, -1, &lvg);
|
||||
}
|
||||
|
||||
INT_PTR CALLBACK CDialogPackage::CTabInfo::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK DialogPackage::TabInfo::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (uMsg)
|
||||
{
|
||||
@ -869,7 +869,7 @@ INT_PTR CALLBACK CDialogPackage::CTabInfo::DlgProc(HWND hWnd, UINT uMsg, WPARAM
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogPackage::CTabInfo::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogPackage::TabInfo::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (LOWORD(wParam))
|
||||
{
|
||||
@ -1012,7 +1012,7 @@ INT_PTR CDialogPackage::CTabInfo::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogPackage::CTabInfo::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogPackage::TabInfo::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
LPNMHDR nm = (LPNMHDR)lParam;
|
||||
switch (nm->code)
|
||||
@ -1052,11 +1052,11 @@ INT_PTR CDialogPackage::CTabInfo::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
//
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
|
||||
CDialogPackage::CTabOptions::CTabOptions(HWND wnd) : CTab(GetModuleHandle(NULL), wnd, IDD_PACKAGEOPTIONS_TAB, DlgProc)
|
||||
DialogPackage::TabOptions::TabOptions(HWND wnd) : Tab(GetModuleHandle(NULL), wnd, IDD_PACKAGEOPTIONS_TAB, DlgProc)
|
||||
{
|
||||
}
|
||||
|
||||
void CDialogPackage::CTabOptions::Initialize()
|
||||
void DialogPackage::TabOptions::Initialize()
|
||||
{
|
||||
m_Initialized = true;
|
||||
|
||||
@ -1125,7 +1125,7 @@ void CDialogPackage::CTabOptions::Initialize()
|
||||
c_Dialog->m_MinimumWindows = g_OsNameVersions[0].version;
|
||||
}
|
||||
|
||||
INT_PTR CALLBACK CDialogPackage::CTabOptions::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK DialogPackage::TabOptions::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (uMsg)
|
||||
{
|
||||
@ -1136,7 +1136,7 @@ INT_PTR CALLBACK CDialogPackage::CTabOptions::DlgProc(HWND hWnd, UINT uMsg, WPAR
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogPackage::CTabOptions::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogPackage::TabOptions::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (LOWORD(wParam))
|
||||
{
|
||||
@ -1292,16 +1292,16 @@ INT_PTR CDialogPackage::CTabOptions::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
//
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
|
||||
CDialogPackage::CTabAdvanced::CTabAdvanced(HWND wnd) : CTab(GetModuleHandle(NULL), wnd, IDD_PACKAGEADVANCED_TAB, DlgProc)
|
||||
DialogPackage::TabAdvanced::TabAdvanced(HWND wnd) : Tab(GetModuleHandle(NULL), wnd, IDD_PACKAGEADVANCED_TAB, DlgProc)
|
||||
{
|
||||
}
|
||||
|
||||
void CDialogPackage::CTabAdvanced::Initialize()
|
||||
void DialogPackage::TabAdvanced::Initialize()
|
||||
{
|
||||
m_Initialized = true;
|
||||
}
|
||||
|
||||
INT_PTR CALLBACK CDialogPackage::CTabAdvanced::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK DialogPackage::TabAdvanced::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (uMsg)
|
||||
{
|
||||
@ -1315,7 +1315,7 @@ INT_PTR CALLBACK CDialogPackage::CTabAdvanced::DlgProc(HWND hWnd, UINT uMsg, WPA
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogPackage::CTabAdvanced::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogPackage::TabAdvanced::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (LOWORD(wParam))
|
||||
{
|
||||
@ -1362,7 +1362,7 @@ INT_PTR CDialogPackage::CTabAdvanced::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
INT_PTR CDialogPackage::CTabAdvanced::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR DialogPackage::TabAdvanced::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
LPNMHDR nm = (LPNMHDR)lParam;
|
||||
switch (nm->code)
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#include "zip.h"
|
||||
#include "../Library/Dialog.h"
|
||||
|
||||
class CDialogPackage : public CDialog
|
||||
class DialogPackage : public Dialog
|
||||
{
|
||||
public:
|
||||
static void Create(HINSTANCE hInstance, LPWSTR lpCmdLine);
|
||||
@ -33,16 +33,16 @@ public:
|
||||
INT_PTR OnCommand(WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR OnNotify(WPARAM wParam, LPARAM lParam);
|
||||
|
||||
static CDialogPackage* c_Dialog;
|
||||
static DialogPackage* c_Dialog;
|
||||
|
||||
protected:
|
||||
virtual CTab& GetActiveTab();
|
||||
virtual Tab& GetActiveTab();
|
||||
|
||||
private:
|
||||
class CTabInfo : public CTab
|
||||
class TabInfo : public Tab
|
||||
{
|
||||
public:
|
||||
CTabInfo(HWND window);
|
||||
TabInfo(HWND window);
|
||||
|
||||
virtual void Initialize();
|
||||
|
||||
@ -51,10 +51,10 @@ private:
|
||||
INT_PTR OnNotify(WPARAM wParam, LPARAM lParam);
|
||||
};
|
||||
|
||||
class CTabOptions : public CTab
|
||||
class TabOptions : public Tab
|
||||
{
|
||||
public:
|
||||
CTabOptions(HWND window);
|
||||
TabOptions(HWND window);
|
||||
|
||||
virtual void Initialize();
|
||||
|
||||
@ -62,10 +62,10 @@ private:
|
||||
INT_PTR OnCommand(WPARAM wParam, LPARAM lParam);
|
||||
};
|
||||
|
||||
class CTabAdvanced : public CTab
|
||||
class TabAdvanced : public Tab
|
||||
{
|
||||
public:
|
||||
CTabAdvanced(HWND window);
|
||||
TabAdvanced(HWND window);
|
||||
|
||||
virtual void Initialize();
|
||||
|
||||
@ -74,8 +74,8 @@ private:
|
||||
INT_PTR OnNotify(WPARAM wParam, LPARAM lParam);
|
||||
};
|
||||
|
||||
CDialogPackage(HWND wnd);
|
||||
virtual ~CDialogPackage();
|
||||
DialogPackage(HWND wnd);
|
||||
virtual ~DialogPackage();
|
||||
|
||||
void SetNextButtonState();
|
||||
|
||||
@ -93,9 +93,9 @@ private:
|
||||
static std::pair<std::wstring, std::wstring> SelectPlugin(HWND parent);
|
||||
static INT_PTR CALLBACK SelectPluginDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
CTabInfo m_TabInfo;
|
||||
CTabOptions m_TabOptions;
|
||||
CTabAdvanced m_TabAdvanced;
|
||||
TabInfo m_TabInfo;
|
||||
TabOptions m_TabOptions;
|
||||
TabAdvanced m_TabAdvanced;
|
||||
|
||||
std::wstring m_BackupTime;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user