From 361dbff6bc53c93f533f1a62696281b3f9fe1ce0 Mon Sep 17 00:00:00 2001 From: ramon18 Date: Wed, 11 Jun 2003 23:57:24 +0000 Subject: [PATCH] READONLY in text box git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2631 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/Changelog.txt | 1 + Contrib/InstallOptions/InstallerOptions.cpp | 7 ++++++- Examples/Modern UI/ioA.ini | 13 +++++++++++-- Plugins/InstallOptions.dll | Bin 14336 -> 14336 bytes 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Contrib/InstallOptions/Changelog.txt b/Contrib/InstallOptions/Changelog.txt index 16b565ff..5fd44f1f 100644 --- a/Contrib/InstallOptions/Changelog.txt +++ b/Contrib/InstallOptions/Changelog.txt @@ -2,6 +2,7 @@ DLL version 2.2 (6/10/2003) * \r\n converts to newline in Multiline edit box * Support for multiline edit box * Better tab order in DirRequest and FileRequest +* Added READONLY option to text box * Minor fixes DLL version 2.1 (3/15/2003) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index d9203470..9ec3e54e 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -93,6 +93,7 @@ char *STRDUP(const char *c) #define FLAG_WANTRETURN 0x00100000 #define FLAG_VSCROLL 0x00200000 #define FLAG_HSCROLL 0x00400000 +#define FLAG_READONLY 0x00800000 struct TableEntry { char *pszName; @@ -544,7 +545,8 @@ bool ReadSettings(void) { { "MULTILINE", FLAG_MULTILINE }, { "VSCROLL", FLAG_VSCROLL }, { "HSCROLL", FLAG_HSCROLL }, - { "WANTRETURN", FLAG_WANTRETURN }, + { "WANTRETURN", FLAG_WANTRETURN }, + { "READONLY", FLAG_READONLY }, { NULL, 0 } }; @@ -922,6 +924,9 @@ int createCfgDlg() dwStyle |= WS_VSCROLL; if (pFields[nIdx].nFlags & FLAG_HSCROLL) dwStyle |= WS_HSCROLL; + if (pFields[nIdx].nFlags & FLAG_READONLY) + dwStyle |= ES_READONLY + ; title = pFields[nIdx].pszState; break; case FIELD_COMBOBOX: diff --git a/Examples/Modern UI/ioA.ini b/Examples/Modern UI/ioA.ini index 162f19e7..6643b727 100644 --- a/Examples/Modern UI/ioA.ini +++ b/Examples/Modern UI/ioA.ini @@ -1,5 +1,5 @@ [Settings] -NumFields=1 +NumFields=2 [Field 1] Type=label @@ -7,4 +7,13 @@ Text=Install Options Page A Left=0 Right=-1 Top=0 -Bottom=10 \ No newline at end of file +Bottom=10 + +[Field 2] +Type=text +Left=0 +Right=-1 +Top=20 +Bottom=100 +flags=MULTILINE|VSCROLL|READONLY +State="Description:\r\n\r\n1 - Show custom page A (where you are now)\r\n2 - Show the components page\r\n3 - Show custom page B\r\n4 - Show directory page\r\n5 - Show custom page C\r\n6 - Show installation progress" \ No newline at end of file diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index c2a5da580559f2c00b3e5ba35783c2d33beb1011..20b858299788fd90550c93b35965c71fb5da81dc 100644 GIT binary patch delta 4697 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 Qa_)2PA0vIK+2+XkFW4DK{{R30 delta 4666 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