From 85ff07a3e8b562ed4d86b2e055f95e3b55bbf1e3 Mon Sep 17 00:00:00 2001 From: kichik Date: Mon, 2 Sep 2002 10:15:53 +0000 Subject: [PATCH] Copy details to clipboard added git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@858 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Language files/English.nlf | 5 +++-- Source/lang.cpp | 5 ++++- Source/lang.h | 17 +++++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Contrib/Language files/English.nlf b/Contrib/Language files/English.nlf index f14c239d..a74ba8d1 100644 --- a/Contrib/Language files/English.nlf +++ b/Contrib/Language files/English.nlf @@ -1,5 +1,5 @@ # Header, don't edit -NLF v1 +NLF v2 # Language ID 1033 # Start editing here @@ -59,4 +59,5 @@ Output directory: Remove directory: Rename on reboot: Rename: -Skipped: \ No newline at end of file +Skipped: +Copy Details To Clipboard \ No newline at end of file diff --git a/Source/lang.cpp b/Source/lang.cpp index 1de2eccf..87159947 100644 --- a/Source/lang.cpp +++ b/Source/lang.cpp @@ -63,7 +63,8 @@ extern char *english_strings[] = { "Remove directory: ", "Rename on reboot: ", "Rename: ", - "Skipped: " + "Skipped: ", + "Copy Details To Clipboard" }; int CEXEBuild::SetString(char *string, int id, int process, LANGID lang/*=0*/) { @@ -438,6 +439,7 @@ void CEXEBuild::FillDefaultsIfNeeded(StringTable *table, NLF *nlf/*=0*/) { SET_INSTRUCTION(NLF_INST_CORRUPTED, inst_corrupted); SET_INSTRUCTION(NLF_OUTPUT_DIR, output_dir); SET_INSTRUCTION(NLF_CREATE_DIR, create_dir); + SET_INSTRUCTION(NLF_COPY_DETAILS, copy_details); } bool CEXEBuild::_IsNotSet(int *str) { @@ -477,6 +479,7 @@ NLF::NLF(char *filename) { // Check header if (strncmp(buf, "NLF v", 5)) throw runtime_error("Invalid language file!"); + int nlf_version = atoi(buf+5); if (atoi(buf+5) != NLF_VERSION) throw runtime_error("Language file version doesn't match NSIS version!"); // Get language ID diff --git a/Source/lang.h b/Source/lang.h index 5c80a3fa..f9f73da5 100644 --- a/Source/lang.h +++ b/Source/lang.h @@ -14,8 +14,8 @@ struct StringTable { uninstall_strings uninstall; }; -#define NLF_VERSION 1 -#define NLF_STRINGS 56 +#define NLF_VERSION 2 +#define NLF_STRINGS 57 #define NLF_BRANDING 0 #define NLF_CAPTION 1 @@ -73,13 +73,14 @@ struct StringTable { #define NLF_RENAME_ON_REBOOT 53 #define NLF_RENAME 54 #define NLF_SKIPPED 55 +#define NLF_COPY_DETAILS 56 -#define LANG_NAME 56 -#define LANG_COMP_TEXT 57 -#define LANG_LICENSE_TEXT 58 -#define LANG_LICENSE_DATA 59 -#define LANG_DIR_TEXT 60 -#define LANG_UNINST_TEXT 61 +#define LANG_NAME 102 +#define LANG_COMP_TEXT 103 +#define LANG_LICENSE_TEXT 104 +#define LANG_LICENSE_DATA 105 +#define LANG_DIR_TEXT 106 +#define LANG_UNINST_TEXT 107 extern char *english_strings[NLF_STRINGS];