PackUpdater renamed to PluginUpdater - part 1

git-svn-id: http://svn.miranda-ng.org/main/trunk@1350 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

11 files changed, 40 insertions, 40 deletions

diff --git a/plugins/PackUpdater/PackUpdater_10.vcxproj b/plugins/PackUpdater/PackUpdater_10.vcxproj
index 5535f36413..ce340b3835 100644
--- a/plugins/PackUpdater/PackUpdater_10.vcxproj
+++ b/plugins/PackUpdater/PackUpdater_10.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>PackUpdater</ProjectName>

+    <ProjectName>PluginUpdater</ProjectName>

     <ProjectGuid>{21F6C0E4-DD1A-49E6-82FD-64574BB902BD}</ProjectGuid>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

@@ -202,7 +202,7 @@
     </ClCompile>

     <ClCompile Include="src\Notifications.cpp" />

     <ClCompile Include="src\Options.cpp" />

-    <ClCompile Include="src\PackUpdater.cpp">

+    <ClCompile Include="src\PluginUpdater.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\unzipfile.cpp" />

diff --git a/plugins/PackUpdater/PackUpdater_10.vcxproj.filters b/plugins/PackUpdater/PackUpdater_10.vcxproj.filters
index 67135ffd6c..b22edcde74 100644
--- a/plugins/PackUpdater/PackUpdater_10.vcxproj.filters
+++ b/plugins/PackUpdater/PackUpdater_10.vcxproj.filters
@@ -67,7 +67,7 @@
     <ClCompile Include="src\Options.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\PackUpdater.cpp">

+    <ClCompile Include="src\PluginUpdater.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\Utils.cpp">

diff --git a/plugins/PackUpdater/res/Resource.rc b/plugins/PackUpdater/res/Resource.rc
index 157ef25aa7..298b359b52 100644
--- a/plugins/PackUpdater/res/Resource.rc
+++ b/plugins/PackUpdater/res/Resource.rc
@@ -44,7 +44,7 @@ BEGIN
     DEFPUSHBUTTON   "Update",IDOK,12,187,50,14

     PUSHBUTTON      "Select &all",IDC_SELALL,68,187,50,14,NOT WS_TABSTOP

     PUSHBUTTON      "Cancel",IDCANCEL,180,187,50,14

-    CTEXT           "PackUpdater has detected updated versions\nof the following Miranda components:",IDC_UPDATETEXT,9,9,217,22

+    CTEXT           "PluginUpdater has detected updated versions\nof the following Miranda components:",IDC_UPDATETEXT,9,9,217,22

     CONTROL         "",IDC_LIST_UPDATES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,37,229,145

     PUSHBUTTON      "Select &none",IDC_SELNONE,124,187,50,14,NOT WS_TABSTOP

 END

@@ -68,9 +68,9 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    GROUPBOX        "Pack update options",IDC_STATIC,1,27,253,60

+    GROUPBOX        "Plugin update options",IDC_STATIC,1,27,253,60

     CONTROL         "On startup",IDC_UPDATEONSTARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,44,52,10

-    CONTROL         "Remind about not installed pack update",IDC_REMINDER,

+    CONTROL         "Remind about not installed plugin updates",IDC_REMINDER,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,72,198,10

     GROUPBOX        "Hotkey",IDC_STATIC,2,0,253,26

     CONTROL         "Go to Customize -> Hotkeys to change the hotkey",IDC_LINK_HOTKEY,

diff --git a/plugins/PackUpdater/src/Common.h b/plugins/PackUpdater/src/Common.h
index 507a5a511b..91da08498d 100644
--- a/plugins/PackUpdater/src/Common.h
+++ b/plugins/PackUpdater/src/Common.h
@@ -54,10 +54,10 @@ Boston, MA 02111-1307, USA.
 #include "resource.h"

 #include "Notifications.h"

 

-#define MODNAME					"PackUpdater"

-#define MODULEA					"Pack Updater"

-#define MODULEW					L"Pack Updater"

-#define DEFAULT_UPDATES_FOLDER	L"Pack Updates"

+#define MODNAME					"PluginUpdater"

+#define MODULEA					"Plugin Updater"

+#define MODULEW					L"Plugin Updater"

+#define DEFAULT_UPDATES_FOLDER	L"Plugin Updates"

 typedef std::wstring tString;

 #define MODULE	MODULEW

 

diff --git a/plugins/PackUpdater/src/Events.cpp b/plugins/PackUpdater/src/Events.cpp
index e08df623e3..f6998d028b 100644
--- a/plugins/PackUpdater/src/Events.cpp
+++ b/plugins/PackUpdater/src/Events.cpp
@@ -28,9 +28,9 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	HOTKEYDESC hkd = {0};

 	hkd.cbSize = sizeof(hkd);

 	hkd.dwFlags = HKD_TCHAR;

-	hkd.pszName = "Check for pack updates";

-	hkd.ptszDescription = _T("Check for pack updates");

-	hkd.ptszSection = _T("Pack Updater");

+	hkd.pszName = "Check for plugin updates";

+	hkd.ptszDescription = _T("Check for plugin updates");

+	hkd.ptszSection = _T("Plugin Updater");

 	hkd.pszService = MODNAME"/CheckUpdates";

 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_F10) | HKF_MIRANDA_LOCAL;

 	hkd.lParam = FALSE;

diff --git a/plugins/PackUpdater/src/Notifications.cpp b/plugins/PackUpdater/src/Notifications.cpp
index a531fe69a6..9abd58265f 100644
--- a/plugins/PackUpdater/src/Notifications.cpp
+++ b/plugins/PackUpdater/src/Notifications.cpp
@@ -199,7 +199,7 @@ void DlgDownloadProc(FILEURL *pFileUrl, PopupDataText temp)
 	}

 

 	if (!DownloadFile(pFileUrl->tszDownloadURL, pFileUrl->tszDiskPath)) {

-		LPCTSTR Title = TranslateT("Pack Updater");

+		LPCTSTR Title = TranslateT("Plugin Updater");

 		LPCTSTR Text = TranslateT("An error occured while downloading the update.");

 		if (ServiceExists(MS_POPUP_ADDPOPUPEX) && DBGetContactSettingByte(NULL, "PopUp", "ModuleIsEnabled", 1) && DBGetContactSettingByte(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) {

 			Number = 1;

@@ -248,9 +248,9 @@ LBL_Skip:
 		// download update

 		FILEURL *pFileUrl = &todo[i].File;

 		PopupDataText temp;

-		temp.Title = TranslateT("Pack Updater");

+		temp.Title = TranslateT("Plugin Updater");

 		if (todo[i].FileType == 1)

-			temp.Text = TranslateT("Downloading pack updates...");

+			temp.Text = TranslateT("Downloading plugin updates...");

 		else

 			temp.Text = TranslateT("Downloading update...");

 		DlgDownloadProc(pFileUrl, temp);

@@ -263,7 +263,7 @@ LBL_Skip:
 

 	INT rc = -1;

 	PopupDataText temp;

-	temp.Title = TranslateT("Pack Updater");

+	temp.Title = TranslateT("Plugin Updater");

 	temp.Text = tszBuff;

 	lstrcpyn(tszBuff, TranslateT("Download complete. Start updating? All your data will be saved and Miranda IM will be closed."), SIZEOF(tszBuff));

 	if (ServiceExists(MS_POPUP_ADDPOPUPEX) && ServiceExists(MS_POPUP_REGISTERACTIONS) && DBGetContactSettingByte(NULL, "PopUp", "ModuleIsEnabled", 1) && DBGetContactSettingByte(NULL,MODNAME, "Popups0", DEFAULT_POPUP_ENABLED) && (DBGetContactSettingDword(NULL, "PopUp", "Actions", 0) & 1))

@@ -271,8 +271,8 @@ LBL_Skip:
 	else

 		rc = MessageBox(NULL, temp.Text, temp.Title, MB_YESNO | MB_ICONQUESTION);

 	if (rc != IDYES) {

-		mir_sntprintf(tszBuff, SIZEOF(tszBuff), TranslateT("You have chosen not to install the pack update immediately.\nYou can install it manually from this location:\n\n%s"), tszFileBack);

-		LPCTSTR Title = TranslateT("Pack Updater");

+		mir_sntprintf(tszBuff, SIZEOF(tszBuff), TranslateT("You have chosen not to install the plugin updates immediately.\nYou can install it manually from this location:\n\n%s"), tszFileBack);

+		LPCTSTR Title = TranslateT("Plugin Updater");

 		LPCTSTR Text = tszBuff;

 		if (ServiceExists(MS_POPUP_ADDPOPUPEX) && DBGetContactSettingByte(NULL, "PopUp", "ModuleIsEnabled", 1) && DBGetContactSettingByte(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) {

 			Number = 2;

diff --git a/plugins/PackUpdater/src/Options.cpp b/plugins/PackUpdater/src/Options.cpp
index 1966aceb49..a8464746c6 100644
--- a/plugins/PackUpdater/src/Options.cpp
+++ b/plugins/PackUpdater/src/Options.cpp
@@ -320,7 +320,7 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 

 			case IDC_PREVIEW: 

 				{//Declarations and initializations

-					LPCTSTR Title = TranslateT("Pack Updater");

+					LPCTSTR Title = TranslateT("Plugin Updater");

 					LPCTSTR Text = TranslateT("Test");

 					for (int i = 0; i < POPUPS; i++) {

 						if ((!IsDlgButtonChecked(hdlg, (i+40071))) || (!IsWindowEnabled(GetDlgItem(hdlg, (i+40071)))))

@@ -417,14 +417,14 @@ int OptInit(WPARAM wParam, LPARAM lParam)
 	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_UPDATENOTIFY);

 	odp.ptszGroup = LPGENT("Events");

-	odp.ptszTitle = LPGENT("Pack Updater");

+	odp.ptszTitle = LPGENT("Plugin Updater");

 	odp.pfnDlgProc = UpdateNotifyOptsProc;

 	Options_AddPage(wParam, &odp);

 

 	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);

 		odp.ptszGroup = LPGENT("PopUps");

-		odp.ptszTitle = LPGENT("Pack Updater");

+		odp.ptszTitle = LPGENT("Plugin Updater");

 		odp.pfnDlgProc = DlgPopUpOpts;

 		Options_AddPage(wParam, &odp);

 	}

diff --git a/plugins/PackUpdater/src/PackUpdater.cpp b/plugins/PackUpdater/src/PackUpdater.cpp
index 5d1af1b1cc..73bcee1e13 100644
--- a/plugins/PackUpdater/src/PackUpdater.cpp
+++ b/plugins/PackUpdater/src/PackUpdater.cpp
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.
 

 HINSTANCE hInst = NULL;

 

-HANDLE hPackUpdaterFolder = NULL, hCheckUpdates = NULL, hEmptyFolder = NULL;

+HANDLE hPluginUpdaterFolder = NULL, hCheckUpdates = NULL, hEmptyFolder = NULL;

 TCHAR tszRoot[MAX_PATH] = {0};

 int hLangpack;

 

@@ -57,8 +57,8 @@ extern "C" __declspec(dllexport) int Load(void)
 	TCHAR* tszFolder = Utils_ReplaceVarsT(_T("%miranda_userdata%\\"DEFAULT_UPDATES_FOLDER));

 	lstrcpyn(tszRoot, tszFolder, SIZEOF(tszRoot));

 	if (ServiceExists(MS_FOLDERS_REGISTER_PATH)) {

-		hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, "Pack Updater", MIRANDA_USERDATAT _T("\\")DEFAULT_UPDATES_FOLDER);

-		FoldersGetCustomPathT(hPackUpdaterFolder, tszRoot, MAX_PATH, _T(""));

+		hPluginUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, "Plugin Updater", MIRANDA_USERDATAT _T("\\")DEFAULT_UPDATES_FOLDER);

+		FoldersGetCustomPathT(hPluginUpdaterFolder, tszRoot, MAX_PATH, _T(""));

 	}

 	mir_free(tszFolder);

 

@@ -75,7 +75,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	mi.position = -0x7FFFFFFF;

 	mi.flags = CMIF_ICONFROMICOLIB;

 	mi.icolibItem = Skin_GetIconHandle("check_update");

-	mi.pszName = LPGEN("Check for pack updates");

+	mi.pszName = LPGEN("Check for plugin updates");

 	mi.pszService = MODNAME"/CheckUpdates";

 	Menu_AddMainMenuItem(&mi);

 

@@ -83,7 +83,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	hEmptyFolder = CreateServiceFunction(MODNAME"/EmptyFolder", EmptyFolder);

 

 	mi.icolibItem = Skin_GetIconHandle("empty_folder");

-	mi.pszName = LPGEN("Clear pack updates folder");

+	mi.pszName = LPGEN("Clear plugin updates folder");

 	mi.pszService = MODNAME"/EmptyFolder";

 	Menu_AddMainMenuItem(&mi);

 

diff --git a/plugins/PackUpdater/src/Utils.cpp b/plugins/PackUpdater/src/Utils.cpp
index a92a81d2fe..38eb1aa4e0 100644
--- a/plugins/PackUpdater/src/Utils.cpp
+++ b/plugins/PackUpdater/src/Utils.cpp
@@ -45,8 +45,8 @@ struct
 }

 static iconList[] =

 {

-	{ "check_update", LPGEN("Check for pack updates"),    IDI_MENU },

-	{ "empty_folder", LPGEN("Clear pack updates folder"), IDI_DELETE },

+	{ "check_update", LPGEN("Check for plugin updates"),    IDI_MENU },

+	{ "empty_folder", LPGEN("Clear plugin updates folder"), IDI_DELETE },

 	{ "btn_ok",			LPGEN("'Yes' Button"),              IDI_OK },

 	{ "btn_cancel",   LPGEN("'No' Button"),               IDI_CANCEL }

 };

@@ -76,7 +76,7 @@ BOOL NetlibInit()
 	NETLIBUSER nlu = {0};

 	nlu.cbSize = sizeof(nlu);

 	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_TCHAR;	// | NUF_HTTPGATEWAY;

-	nlu.ptszDescriptiveName = TranslateT("Pack Updater HTTP connection");

+	nlu.ptszDescriptiveName = TranslateT("Plugin Updater HTTP connection");

 	nlu.szSettingsModule = MODNAME;

 	hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);

 

@@ -294,7 +294,7 @@ static void CheckUpdates(void *)
 	lstrcpyn(pFileUrl->tszDiskPath, tszBuff, SIZEOF(pFileUrl->tszDiskPath));

 	lstrcpyn(tszTmpIni, tszBuff, SIZEOF(tszTmpIni));

 	PopupDataText temp;

-	temp.Title = TranslateT("Pack Updater");

+	temp.Title = TranslateT("Plugin Updater");

 	temp.Text = TranslateT("Downloading version info...");

 	DlgDownloadProc(pFileUrl, temp);

 	mir_free(pFileUrl);

@@ -335,7 +335,7 @@ static void CheckUpdates(void *)
 	}

 

 	if (!UpdateFiles.size() && !Silent) {

-		LPCTSTR Title = TranslateT("Pack Updater");

+		LPCTSTR Title = TranslateT("Plugin Updater");

 		LPCTSTR Text = TranslateT("No updates found.");

 		if (ServiceExists(MS_POPUP_ADDPOPUPEX) && DBGetContactSettingByte(NULL, "PopUp", "ModuleIsEnabled", 1) &&  DBGetContactSettingByte(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) {

 			Number = 2;

@@ -351,7 +351,7 @@ static void CheckUpdates(void *)
 void DoCheck(int iFlag, int iFlag2)

 {

 	if (iFlag2) {

-		LPCTSTR Title = TranslateT("Pack Updater");

+		LPCTSTR Title = TranslateT("Plugin Updater");

 		LPCTSTR Text = TranslateT("Update checking already started!");

 		if (ServiceExists(MS_POPUP_ADDPOPUPEX) && DBGetContactSettingByte(NULL, "PopUp", "ModuleIsEnabled", 1) &&  DBGetContactSettingByte(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED))

 		{

diff --git a/plugins/PackUpdater/src/Version.h b/plugins/PackUpdater/src/Version.h
index cf907db92a..2938d6763a 100644
--- a/plugins/PackUpdater/src/Version.h
+++ b/plugins/PackUpdater/src/Version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION           0

 #define __MINOR_VERSION           0

 #define __RELEASE_NUM             1

-#define __BUILD_NUM               1

+#define __BUILD_NUM               2

 

 #define __FILEVERSION_STRING      __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 #define __FILEVERSION_DOTS        __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

@@ -10,11 +10,11 @@
 #define __STRINGIFY(x)            __STRINGIFY_IMPL(x)

 #define __VERSION_STRING          __STRINGIFY(__FILEVERSION_DOTS)

 

-#define __PLUGIN_NAME             "PackUpdater"

-#define __INTERNAL_NAME           "PackUpdater"

-#define __FILENAME                "PackUpdater.dll"

-#define __DESCRIPTION             "Simple updater for Miranda IM premodified packs."

+#define __PLUGIN_NAME             "PluginUpdater"

+#define __INTERNAL_NAME           "PluginUpdater"

+#define __FILENAME                "PluginUpdater.dll"

+#define __DESCRIPTION             "Plugin updater for Miranda NG."

 #define __AUTHOR                  "Mataes, ZERO_BiT"

 #define __AUTHOREMAIL             "mataes2007@gmail.com, zero-bit@mail.ru"

 #define __AUTHORWEB               "http://miranda-ng.org/"

-#define __COPYRIGHT               "© 2011 Mataes, 2007 ZERO_BiT"

+#define __COPYRIGHT               "© 2012 Mataes, 2007 ZERO_BiT"

diff --git a/plugins/PackUpdater/src/resource.h b/plugins/PackUpdater/src/resource.h
index 001732cbf9..7e71315760 100644
--- a/plugins/PackUpdater/src/resource.h
+++ b/plugins/PackUpdater/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by D:\Myranda\plugins\PackUpdater\res\Resource.rc

+// Used by D:\Myranda\plugins\PluginUpdater\res\Resource.rc

 //

 #define IDI_MENU                        101

 #define IDD_UPDATE                      102