From 8b2e59e000783fc9aa5180d09b42b85eba911cbf Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Thu, 22 Sep 2016 08:59:39 +0000
Subject: [PATCH] IDE: external tools: MS Windows options ShowConsole and
 HideWindow

git-svn-id: trunk@53017 -
---
 ide/exttooleditdlg.lfm      |  6 ++++++
 ide/exttooleditdlg.pas      | 15 ++++++++++-----
 ide/lazarusidestrconsts.pas |  9 +++++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ide/exttooleditdlg.lfm b/ide/exttooleditdlg.lfm
index 508bbd1f5a..65b1da2dfb 100644
--- a/ide/exttooleditdlg.lfm
+++ b/ide/exttooleditdlg.lfm
@@ -115,6 +115,7 @@ object ExternalToolOptionDlg: TExternalToolOptionDlg
       Width = 244
       BorderSpacing.Around = 6
       Caption = 'ScanOutputForMakeMessagesCheckBox'
+      ParentShowHint = False
       TabOrder = 1
     end
     object ScannersButton: TButton
@@ -134,6 +135,9 @@ object ExternalToolOptionDlg: TExternalToolOptionDlg
       Top = 6
       Width = 152
       Caption = 'ShowConsoleCheckBox'
+      OnChange = ShowConsoleCheckBoxChange
+      ParentShowHint = False
+      ShowHint = True
       TabOrder = 3
       Visible = False
     end
@@ -143,6 +147,8 @@ object ExternalToolOptionDlg: TExternalToolOptionDlg
       Top = 36
       Width = 152
       Caption = 'HideWindowCheckBox'
+      ParentShowHint = False
+      ShowHint = True
       TabOrder = 4
       Visible = False
     end
diff --git a/ide/exttooleditdlg.pas b/ide/exttooleditdlg.pas
index 9df6d906a0..73a77f1c12 100644
--- a/ide/exttooleditdlg.pas
+++ b/ide/exttooleditdlg.pas
@@ -172,6 +172,7 @@ type
     procedure MacrosListboxClick(Sender: TObject);
     procedure MacrosListboxDblClick(Sender: TObject);
     procedure OKButtonClick(Sender: TObject);
+    procedure ShowConsoleCheckBoxChange(Sender: TObject);
   private
     fAllKeys: TKeyCommandRelationList;
     fOptions: TExternalUserTool;
@@ -703,12 +704,10 @@ end;
 procedure TExternalToolOptionDlg.UpdateButtons;
 begin
   ScannersButton.Visible:=false;
-  {$IFDEF EnableDetach}
   {$IFDEF Windows}
   HideWindowCheckBox.Visible:=true;
   ShowConsoleCheckBox.Visible:=true;
   {$ENDIF}
-  {$ENDIF}
 end;
 
 function TExternalToolOptionDlg.ScannersToString(List: TStrings): string;
@@ -747,13 +746,13 @@ begin
   WorkingDirLabel.Caption:=lisEdtExtToolWorkingDirectory;
   OptionsGroupBox.Caption:=lisLazBuildOptions;
 
-  // ToDo: add hints
   with ScanOutputForFPCMessagesCheckBox do
     Caption:=lisEdtExtToolScanOutputForFreePascalCompilerMessages;
   with ScanOutputForMakeMessagesCheckBox do
     Caption:=lisEdtExtToolScanOutputForMakeMessages;
-  ShowConsoleCheckBox.Caption:='Show console';
-  HideWindowCheckBox.Caption:='Hide window';
+  ShowConsoleCheckBox.Caption:=lisShowConsole;
+  ShowConsoleCheckBox.Hint:=lisOnlyAvailableOnWindowsRunToolInANewConsole;
+  HideWindowCheckBox.Caption:=lisOnlyAvailableOnWindowsRunTheToolHidden;
 
   with KeyGroupBox do
     Caption:=lisEdtExtToolKey;
@@ -943,6 +942,12 @@ begin
   end;
 end;
 
+procedure TExternalToolOptionDlg.ShowConsoleCheckBoxChange(Sender: TObject);
+begin
+  if ShowConsoleCheckBox.Checked then
+    HideWindowCheckBox.Checked:=false;
+end;
+
 initialization
   ExternalUserToolsClass := TExternalUserTools;
 
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 18a9aa8487..45dd7ed64e 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -4029,9 +4029,14 @@ resourcestring
   lisEdtExtToolParameters = 'Parameters:';
   lisEdtExtToolWorkingDirectory = 'Working Directory:';
   lisEdtExtToolScanOutputForFreePascalCompilerMessages = 'Scan output for '
-    +'Free Pascal Compiler messages';
-  lisEdtExtToolScanOutputForMakeMessages = 'Scan output for make messages';
+    +'FPC messages';
+  lisEdtExtToolScanOutputForMakeMessages = 'Scan output for "make" messages';
+  lisShowConsole = 'Show console';
+  lisOnlyAvailableOnWindowsRunToolInANewConsole = 'Only available on Windows. '
+    +'Run tool in a new console.';
   lisEdtExtToolKey = 'Key';
+  lisOnlyAvailableOnWindowsRunTheToolHidden = 'Only available on Windows. Run '
+    +'the tool hidden.';
   lisAlternativeKey = 'Alternative key';
   lisEdtExtToolMacros = 'Macros';
   lisWorkingDirectoryForBuilding = 'Working directory for building';