Uninstall icon; 'Utilities' sub-folder; optional desktop icon

installers/windows/Monero.iss

@@ -195,6 +195,10 @@ Source: "bin\libwinpthread-1.dll"; DestDir: "{app}"; Flags: comparetimestamp
 Source: "bin\zlib1.dll"; DestDir: "{app}"; Flags: comparetimestamp
 
 
+[Tasks]
+Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:";
+
+
 [Run]
 Filename: "{app}\ReadMe.htm"; Description: "Show ReadMe"; Flags: postinstall shellexec skipifsilent
 
@@ -313,7 +317,7 @@ var s: String;
 begin
   s := 'Please note: Uninstall will not delete any downloaded blockchain. ';
   s := s + 'If you do not need it anymore you have to delete it manually.';
-  s := s + #13#10#13#10 + 'Uninstall also will not delete any wallets that you created.';
+  s := s + #13#10#13#10 + 'Uninstall will not delete any wallets that you created either.';
   MsgBox(s, mbInformation, MB_OK);
   Result := true;
 end;
@@ -323,22 +327,28 @@ end;
 ; Icons in the "Monero GUI Wallet" program group
 ; Windows will almost always display icons in alphabetical order, per level, so specify the text accordingly
 Name: "{group}\GUI Wallet"; Filename: "{app}\monero-wallet-gui.exe"
-Name: "{group}\Monero Daemon"; Filename: "{app}\monerod.exe"; Parameters: {code:DaemonFlags}
-Name: "{group}\Read Me"; Filename: "{app}\ReadMe.htm"
-Name: "{group}\Textual (CLI) Wallet"; Filename: "{app}\monero-wallet-cli.exe"
+Name: "{group}\Uninstall GUI Wallet"; Filename: "{uninstallexe}"
+
+; Sub-folder "Utilities";
+; Note that Windows 10, unlike Windows 7, ignores such sub-folders completely
+; and insists on displaying ALL icons on one single level
+Name: "{group}\Utilities\Monero Daemon"; Filename: "{app}\monerod.exe"; Parameters: {code:DaemonFlags}
+Name: "{group}\Utilities\Read Me"; Filename: "{app}\ReadMe.htm"
+Name: "{group}\Utilities\Textual (CLI) Wallet"; Filename: "{app}\monero-wallet-cli.exe"
 
 ; Icons for troubleshooting problems / testing / debugging
-; For Windows 7 it would be ok to go one level deeper with those icons into a folder, e.g. called "Troubleshooting"
-;   Syntax would be:   Name: "{group}\Troubleshooting\GUI Wallet Low Graphics Mode" ...
-; However, Windows 10 stupidly insists on displayin ALL icons on one single level despite finding them in such a folder
-; So just make those icons visually different from the others by text, and make them sort at the end by the help of "x" in front 
-Name: "{group}\x (Try GUI Wallet Low Graphics Mode)"; Filename: "{app}\start-low-graphics-mode.bat"
-Name: "{group}\x (Try Daemon, Exit Confirm)"; Filename: "{app}\monero-daemon.bat"
-Name: "{group}\x (Try Kill Daemon)"; Filename: "Taskkill.exe"; Parameters: "/IM monerod.exe /T /F"
-Name: "{group}\x (Check GUI Wallet Log)"; Filename: "Notepad"; Parameters: "{app}\monero-wallet-gui.log"
-Name: "{group}\x (Check Daemon Log)"; Filename: "Notepad"; Parameters: {code:DaemonLog}
-Name: "{group}\x (Check Default Wallet Folder)"; Filename: "{win}\Explorer.exe"; Parameters: "{userdocs}\Monero\wallets"
-Name: "{group}\x (Check Blockchain Folder)"; Filename: "{win}\Explorer.exe"; Parameters: {code:BlockChainDir}
+; To show that they are in some way different (not for everyday use), make them visually different
+; from the others by text, and make them sort at the end by the help of "x" in front 
+Name: "{group}\Utilities\x (Check Blockchain Folder)"; Filename: "{win}\Explorer.exe"; Parameters: {code:BlockChainDir}
+Name: "{group}\Utilities\x (Check Daemon Log)"; Filename: "Notepad"; Parameters: {code:DaemonLog}
+Name: "{group}\Utilities\x (Check Default Wallet Folder)"; Filename: "{win}\Explorer.exe"; Parameters: "{userdocs}\Monero\wallets"
+Name: "{group}\Utilities\x (Check GUI Wallet Log)"; Filename: "Notepad"; Parameters: "{app}\monero-wallet-gui.log"
+Name: "{group}\Utilities\x (Try Daemon, Exit Confirm)"; Filename: "{app}\monero-daemon.bat"
+Name: "{group}\Utilities\x (Try GUI Wallet Low Graphics Mode)"; Filename: "{app}\start-low-graphics-mode.bat"
+Name: "{group}\Utilities\x (Try Kill Daemon)"; Filename: "Taskkill.exe"; Parameters: "/IM monerod.exe /T /F"
+
+; Desktop icons, optional with the help of the "Task" section
+Name: "{userdesktop}\GUI Wallet"; Filename: "{app}\monero-wallet-gui.exe"; Tasks: desktopicon
 
 
 [Registry]

installers/windows/ReadMe.htm

@@ -7,7 +7,7 @@
 <h1>Monero GUI Wallet Beta 2</h1>
 
   <p>Copyright (c) 2014-2017, The Monero Project<br>
-  Date: June 23, 2017</p>
+  Date: June 28, 2017</p>
 
 <h2>Preface</h2>
 
@@ -57,7 +57,8 @@
 
   <p>If you decide to work with your own copy of the blockchain, which you should whenever possible, you have to
   download it first; it's not part of the installed package.
-  Beside the GUI wallet there is second program, the so-called <i>Monero daemon</i>, which will carry out that download.</p>
+  Beside the GUI wallet there is second program, the so-called <i>Monero daemon</i>, which will carry out that download.
+  You find it in the <i>Utilities</i> sub-folder of the program group.</p>
 
   <p>Depending on your Internet access and the speed of your computer this can take
   <b>several hours</b>, in some cases <b>more than a day</b>. Furthermore there are unfortunate cases where the
@@ -66,8 +67,8 @@
 
   <p>The GUI wallet can start the daemon for you, but that way you will not see much during initial blockchain
   download, especially you probably won't see any error messages in case something goes wrong. By starting the
-  daemon yourself "by hand" using the <i>Monero Daemon</i> icon in the Monero program group you will
-  see it running and displaying messages in a separate window.</p>
+  daemon yourself "by hand" using the <i>Monero Daemon</i> icon in the <i>Utilities</i> sub-folder of the
+  Monero program group you will see it running and displaying messages in a separate window.</p>
    
   <p>If all goes well the daemon will finally display a message like this:
   <i>You are now synchronized with the network.</i></p>
@@ -102,9 +103,9 @@
   Symptoms are problems in the communication between the wallet and the daemon, e.g. the wallet not "seeing" the
   daemon and then not knowing whether it is "synchronized" with the network and thus ready to work or not. You can
   avoid these problems by starting the daemon yourself, with the help of the <i>Monero Daemon</i> icon in the
-  Monero program group.</p>
+  <i>Utilities</i> sub-folder of the Monero program group.</p>
 
-  <p>In the <i>Monero GUI Wallet</i> program group there are several icons that may help you to solve problems.
+  <p>In the <i>Utilities</i> sub-folder there are several more icons that may help you to solve problems.
   These are the icons with a <i>x</i> in front and the name <i>(in parenthesis)</i> to make them visually stand
   apart from the "normal" ones because you will probably only need them in case of trouble, but not during normal
   usage of Monero.</p>
@@ -121,7 +122,7 @@
     </tr>
 
     <tr>
-      <td><i>x (Monero Daemon, Exit Confirm)</i></td>
+      <td><i>x (Try Daemon, Exit Confirm)</i></td>
       <td>
         Run the Monero daemon in a window that does not automatically close if
         the daemon should exit because of a fatal error; useful in cases where the normal daemon icon