prepared for bigbrother 1.5 release1.5

git-svn-id: http://svn.klever.net/kin/bigbrother/trunk@5 fe716a7a-6dde-0310-88d9-d003556173a8

2 files changed, 8 insertions, 8 deletions

diff --git a/install/install.cpp b/install/install.cpp
index 0ab8fa9..12b20f7 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,68 +1,68 @@
 #include "resource.h"

 #include "../shared-code/install.h"

 

 #define KINSHORT "BigBro"

 #define KINNAME "Big Brother"

 #define VERSION "1.5"

 

 BOOL Install(void)

 {

-STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group, Inc.",KINSHORT "Path");

-STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group, Inc.","KINPath");

+STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",KINSHORT "Path");

+STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");

 LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");

 STRING path = REQUESTPATH("  " KINNAME " " VERSION,"\nEnter destination path:",qPath);

 	if(!path)

 		return NULL;

 

 #ifdef	K_ANNED

 STRING sysDir(_MAX_PATH);

 	GetSystemDirectory(sysDir,_MAX_PATH);

 	INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll");

 #endif

 

 	MAKE_PATH(path);

 STRING shortPath = GET_SHORT_PATH(path);

 	if(!shortPath){

 		MessageBox(NULL,"Failed to install " KINNAME " " VERSION " in specified directory",NULL,MB_ICONERROR|MB_OK);

 		return FALSE;

 	}

 

 	if(!(

 		INSTALLFILE("bigbro.ex_",path,"bigbro.exe") &&

 		INSTALLFILE("bigbro.hl_",path,"bigbro.hlp") && 

 		INSTALLFILE("bigbro.cn_",path,"bigbro.cnt")

 	)){

 		MessageBox(NULL,"Failed to install " KINNAME " " VERSION " in specified directory",NULL,MB_ICONERROR|MB_OK);

 		return FALSE;

 	}

-	ADDMENU("Accessories\\Klever Co.",KINNAME,path,"bigbro.exe");

+	ADDMENU("Klever Group",KINNAME,path,"bigbro.exe");

 

-	strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group, Inc.",KINSHORT "Path",path);

-	strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group, Inc.","KINPath",path);

+	strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",KINSHORT "Path",path);

+	strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path);

 

 FILE* inf=CREATE_INF_FILE(path,KINSHORT ".INF");

 	if(!inf){

 		MessageBox(NULL,"Failed to install " KINNAME " " VERSION,NULL,MB_ICONERROR|MB_OK);

 		return FALSE;

 	}

 	INF_FILE_HEADER(inf);

 	INF_FILE_SECTION(inf,"Uninstall");

 	fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n");

 	INF_FILE_SECTION(inf,"kFiles");

 	INF_REMOVE_ROOT(inf,KINSHORT "Files",path);

 	INF_REMOVE_FILE(inf,KINSHORT "Files","bigbro.exe");

 	INF_REMOVE_HELP_FILE(inf,KINSHORT "Files","bigbro");

 	INF_REMOVE_FILE(inf,KINSHORT "Files","bigbro.inf");

 	INF_FILE_SECTION(inf,"kReg");

 	INF_UNINSTALL_REG(inf,KINSHORT);

 	INF_FILE_SECTION(inf,"kMenu");

-	INF_MENU_GROUP(inf,1,"Accessories\\Klever Co.");

+	INF_MENU_GROUP(inf,1,"Klever Group");

 	INF_MENU_ITEM(inf,1,KINNAME);

 	fclose(inf);

 

 	REG_UNINSTALL_COMMAND(KINSHORT,"Klever " KINNAME " " VERSION,shortPath,KINSHORT".INF","Uninstall");

 

-	MessageBox(NULL,KINNAME" " VERSION " installed successfully, you may now run it from Programs/Accessories/Klever Co. menu or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK);

+	MessageBox(NULL,KINNAME" " VERSION " installed successfully, you may now run it from 'Programs/Klever Group' menu or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK);

 

 	return TRUE;

 }

diff --git a/install/install.rc b/install/install.rc
index 12740e5..958704a 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -58,125 +58,125 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,135,52,50,14

 END

 

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // DESIGNINFO

 //

 

 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO DISCARDABLE 

 BEGIN

     "IDD_INSTALLING$(FALSE)", DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 193

         TOPMARGIN, 7

         BOTTOMMARGIN, 67

         HORZGUIDE, 39

     END

 

     IDD_PATH, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 248

         VERTGUIDE, 202

         VERTGUIDE, 208

         TOPMARGIN, 7

         BOTTOMMARGIN, 66

         HORZGUIDE, 37

     END

 END

 #endif    // APSTUDIO_INVOKED

 

 

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

 // TEXTINCLUDE

 //

 

 1 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "resource.h\0"

 END

 

 2 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

 3 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#include ""custom.rch""\0"

 END

 

 #endif    // APSTUDIO_INVOKED

 

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Icon

 //

 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico"

 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION 1,5,0,0

  PRODUCTVERSION 1,5,0,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

  FILEOS 0x40004L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "INSTALL: Big Brother, network monitoring tool\0"

             VALUE "FileVersion", "1, 5, 0, 0\0"

             VALUE "InternalName", "INSTALL\0"

-            VALUE "LegalCopyright", "Copyright © 1996, 2002 Klever Group (http://www.klever.net/)\0"

+            VALUE "LegalCopyright", "Copyright © 1996-2004 Klever Group (http://www.klever.net/)\0"

             VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "INSTALL.EXE\0"

             VALUE "ProductName", "Big Brother\0"

             VALUE "ProductVersion", "1, 5, 0, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

 

 #ifndef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

 // Generated from the TEXTINCLUDE 3 resource.

 //

 #include "custom.rch"

 /////////////////////////////////////////////////////////////////////////////

 #endif    // not APSTUDIO_INVOKED