ide: starting usage of global compiler messages list. Added the selection of the compiler messages into environment->files frame

git-svn-id: trunk@25235 -

ide/environmentopts.pp

@@ -215,6 +215,9 @@ type
     FFPCSourceDirHistory: TStringList;
     FMakeFileName: string;
     FMakeFileHistory: TStringList;
+    FCompilerMessagesFilename: string;
+    FCompilerMessagesFileHistory: TStringList;
+
    // TODO: store per debuggerclass options
     // Maybe these should go to a new TDebuggerOptions class
     FDebuggerSearchPath: string;
@@ -449,6 +452,10 @@ type
     property DebuggerEventLogShowOutput: Boolean read FDebuggerEventLogShowOutput write FDebuggerEventLogShowOutput;
     property DebuggerEventLogShowWindow: Boolean read FDebuggerEventLogShowWindow write FDebuggerEventLogShowWindow;
     property DebuggerEventLogShowDebugger: Boolean read FDebuggerEventLogShowDebugger write FDebuggerEventLogShowDebugger;
+    property CompilerMessagesFilename: string read FCompilerMessagesFilename
+                                              write FCompilerMessagesFilename;
+    property CompilerMessagesFileHistory: TStringList read FCompilerMessagesFileHistory
+                                                     write FCompilerMessagesFileHistory;
 
     // recent files and directories
     property RecentOpenFiles: TStringList read FRecentOpenFiles
@@ -734,6 +741,8 @@ begin
   FDebuggerSearchPath:='';
   TestBuildDirectory:=GetDefaultTestBuildDirectory;
   FTestBuildDirHistory:=TStringList.Create;
+  CompilerMessagesFilename:='';
+  FCompilerMessagesFileHistory:=TStringList.Create;
 
   // recent files and directories
   FRecentOpenFiles:=TStringList.Create;
@@ -784,6 +793,7 @@ begin
   FreeAndNil(FMakeFileHistory);
   FreeAndNil(FDebuggerFileHistory);
   FreeAndNil(FTestBuildDirHistory);
+  FreeAndNil(FCompilerMessagesFileHistory);
   if IDEWindowIntf.IDEDialogLayoutList=FIDEDialogLayoutList then
     IDEWindowIntf.IDEDialogLayoutList:=nil;
   FreeAndNil(FIDEDialogLayoutList);
@@ -1028,6 +1038,10 @@ begin
          Path+'TestBuildDirectory/History/');
       if FTestBuildDirHistory.Count=0 then
         GetDefaultTestBuildDirs(FTestBuildDirHistory);
+      CompilerMessagesFilename:=XMLConfig.GetValue(
+         Path+'CompilerMessagesFilename/Value',FCompilerMessagesFilename);
+      LoadRecentList(XMLConfig, FCompilerMessagesFileHistory,
+         Path+'CompilerMessagesFilename/History/');
 
       // backup
       LoadBackupInfo(FBackupInfoProjectFiles
@@ -1305,6 +1319,10 @@ begin
          Path+'TestBuildDirectory/Value',FTestBuildDirectory);
       SaveRecentList(XMLConfig,FTestBuildDirHistory,
          Path+'TestBuildDirectory/History/');
+      XMLConfig.SetValue(
+         Path+'CompilerMessagesFilename/Value',FCompilerMessagesFilename);
+      SaveRecentList(XMLConfig,FCompilerMessagesFileHistory,
+         Path+'CompilerMessagesFilename/History/');
 
       // backup
       SaveBackupInfo(FBackupInfoProjectFiles

ide/frames/files_options.lfm

@@ -5,15 +5,15 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
   ClientWidth = 569
   TabOrder = 0
   Visible = False
-  DesignLeft = 406
-  DesignTop = 93
+  DesignLeft = 558
+  DesignTop = 159
   object MaxRecentOpenFilesLabel: TLabel[0]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 0
-    Height = 18
+    Height = 16
     Top = 0
-    Width = 165
+    Width = 139
     Caption = 'MaxRecentOpenFilesLabel'
     ParentColor = False
   end
@@ -22,9 +22,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = MaxRecentOpenFilesComboBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 18
-    Top = 53
-    Width = 175
+    Height = 16
+    Top = 45
+    Width = 147
     BorderSpacing.Top = 6
     Caption = 'MaxRecentProjectFilesLabel'
     ParentColor = False
@@ -36,11 +36,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 29
-    Top = 18
+    Height = 23
+    Top = 16
     Width = 569
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 0
+    ItemHeight = 15
     Items.Strings = (
       '5'
       '10'
@@ -58,11 +58,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 29
-    Top = 71
+    Height = 23
+    Top = 61
     Width = 569
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 0
+    ItemHeight = 15
     Items.Strings = (
       '5'
       '10'
@@ -79,9 +79,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 22
-    Top = 106
-    Width = 238
+    Height = 19
+    Top = 90
+    Width = 195
     BorderSpacing.Top = 6
     Caption = 'OpenLastProjectAtStartCheckBox'
     TabOrder = 2
@@ -92,9 +92,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 22
-    Top = 128
-    Width = 213
+    Height = 19
+    Top = 109
+    Width = 180
     Caption = 'ShowCompileDialogCheckBox'
     OnChange = ShowCompileDialogCheckBoxChange
     TabOrder = 3
@@ -104,9 +104,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = AutoCloseCompileDialogCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 18
-    Top = 182
-    Width = 103
+    Height = 16
+    Top = 157
+    Width = 83
     BorderSpacing.Top = 10
     Caption = 'LazarusDirLabel'
     ParentColor = False
@@ -119,8 +119,8 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideBottom.Control = LazarusDirComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 544
-    Height = 29
-    Top = 200
+    Height = 23
+    Top = 173
     Width = 25
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
@@ -133,11 +133,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = LazarusDirButton
     Left = 0
-    Height = 29
-    Top = 200
+    Height = 23
+    Top = 173
     Width = 544
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 0
+    ItemHeight = 15
     TabOrder = 5
     Text = 'LazarusDirComboBox'
   end
@@ -147,11 +147,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = CompilerPathButton
     Left = 0
-    Height = 29
-    Top = 253
+    Height = 23
+    Top = 218
     Width = 544
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 0
+    ItemHeight = 15
     TabOrder = 6
     Text = 'CompilerPathComboBox'
   end
@@ -162,8 +162,8 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideBottom.Control = CompilerPathComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 544
-    Height = 29
-    Top = 253
+    Height = 23
+    Top = 218
     Width = 25
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
@@ -175,9 +175,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = LazarusDirComboBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 18
-    Top = 235
-    Width = 120
+    Height = 16
+    Top = 202
+    Width = 102
     BorderSpacing.Top = 6
     Caption = 'CompilerPathLabel'
     ParentColor = False
@@ -188,11 +188,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = FPCSourceDirButton
     Left = 0
-    Height = 29
-    Top = 306
+    Height = 23
+    Top = 263
     Width = 544
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 0
+    ItemHeight = 15
     TabOrder = 8
     Text = 'FPCSourceDirComboBox'
   end
@@ -203,8 +203,8 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideBottom.Control = FPCSourceDirComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 544
-    Height = 29
-    Top = 306
+    Height = 23
+    Top = 263
     Width = 25
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
@@ -216,9 +216,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = CompilerPathComboBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 18
-    Top = 288
-    Width = 122
+    Height = 16
+    Top = 247
+    Width = 101
     BorderSpacing.Top = 6
     Caption = 'FPCSourceDirLabel'
     ParentColor = False
@@ -228,9 +228,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = FPCSourceDirComboBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 18
-    Top = 341
-    Width = 97
+    Height = 16
+    Top = 292
+    Width = 82
     BorderSpacing.Top = 6
     Caption = 'MakePathLabel'
     ParentColor = False
@@ -240,9 +240,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = MakePathComboBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 18
-    Top = 394
-    Width = 109
+    Height = 16
+    Top = 337
+    Width = 93
     BorderSpacing.Top = 6
     Caption = 'TestBuildDirLabel'
     ParentColor = False
@@ -253,11 +253,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = MakePathButton
     Left = 0
-    Height = 29
-    Top = 359
+    Height = 23
+    Top = 308
     Width = 544
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 0
+    ItemHeight = 15
     TabOrder = 10
     Text = 'MakePathComboBox'
   end
@@ -268,8 +268,8 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideBottom.Control = MakePathComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 544
-    Height = 29
-    Top = 359
+    Height = 23
+    Top = 308
     Width = 25
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
@@ -282,11 +282,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = TestBuildDirButton
     Left = 0
-    Height = 29
-    Top = 412
+    Height = 23
+    Top = 353
     Width = 544
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 0
+    ItemHeight = 15
     TabOrder = 12
     Text = 'TestBuildDirComboBox'
   end
@@ -297,8 +297,8 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideBottom.Control = TestBuildDirComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 544
-    Height = 29
-    Top = 412
+    Height = 23
+    Top = 353
     Width = 25
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
@@ -311,11 +311,53 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 30
-    Height = 22
-    Top = 150
-    Width = 244
+    Height = 19
+    Top = 128
+    Width = 206
     BorderSpacing.Left = 30
     Caption = 'AutoCloseCompileDialogCheckBox'
     TabOrder = 14
   end
+  object CompilerMessagesLabel: TLabel[22]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = TestBuildDirComboBox
+    AnchorSideTop.Side = asrBottom
+    Left = 0
+    Height = 16
+    Top = 382
+    Width = 129
+    Alignment = taRightJustify
+    BorderSpacing.Top = 6
+    Caption = 'CompilerMessagesLabel'
+    ParentColor = False
+  end
+  object CompilerMessagesButton: TButton[23]
+    AnchorSideTop.Control = CompilerMessagesComboBox
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = CompilerMessagesComboBox
+    AnchorSideBottom.Side = asrBottom
+    Left = 544
+    Height = 23
+    Top = 398
+    Width = 25
+    Anchors = [akTop, akRight, akBottom]
+    Caption = '...'
+    OnClick = CompilerMessagesButtonClick
+    TabOrder = 15
+  end
+  object CompilerMessagesComboBox: TComboBox[24]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CompilerMessagesLabel
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = CompilerMessagesButton
+    Left = 0
+    Height = 23
+    Top = 398
+    Width = 544
+    Anchors = [akTop, akLeft, akRight]
+    ItemHeight = 15
+    TabOrder = 16
+    Text = 'CompilerMessagesComboBox'
+  end
 end

ide/frames/files_options.pas

@@ -35,16 +35,19 @@ type
 
   TFilesOptionsFrame = class(TAbstractIDEOptionsEditor)
     AutoCloseCompileDialogCheckBox: TCheckBox;
+    CompilerMessagesButton:TButton;
     CompilerPathButton:TButton;
     CompilerPathComboBox:TComboBox;
     FPCSourceDirButton:TButton;
     FPCSourceDirComboBox:TComboBox;
     CompilerPathLabel:TLabel;
     FPCSourceDirLabel:TLabel;
+    CompilerMessagesLabel:TLabel;
     MakePathButton:TButton;
     MakePathComboBox:TComboBox;
     TestBuildDirButton:TButton;
     TestBuildDirComboBox:TComboBox;
+    CompilerMessagesComboBox:TComboBox;
     TestBuildDirLabel:TLabel;
     MakePathLabel:TLabel;
     LazarusDirButton:TButton;
@@ -56,6 +59,7 @@ type
     MaxRecentProjectFilesLabel: TLabel;
     OpenLastProjectAtStartCheckBox: TCheckBox;
     ShowCompileDialogCheckBox: TCheckBox;
+    procedure CompilerMessagesButtonClick(Sender:TObject);
     procedure FilesButtonClick(Sender: TObject);
     procedure DirectoriesButtonClick(Sender: TObject);
     procedure ShowCompileDialogCheckBoxChange(Sender: TObject);
@@ -124,6 +128,27 @@ begin
   end;
 end;
 
+procedure TFilesOptionsFrame.CompilerMessagesButtonClick(Sender:TObject);
+var
+  OpenDialog: TOpenDialog;
+  AFilename: string;
+begin
+  OpenDialog:=TOpenDialog.Create(nil);
+  try
+    InputHistories.ApplyFileDialogSettings(OpenDialog);
+    OpenDialog.Options:=OpenDialog.Options+[ofPathMustExist];
+    OpenDialog.Title:=lisChooseCompilerMessages;
+    OpenDialog.Filter:='FPC message file (*.msg)|*.msg|Any file|'+AllFilesMask;
+    if OpenDialog.Execute then begin
+      AFilename:=CleanAndExpandFilename(OpenDialog.Filename);
+      SetComboBoxText(CompilerMessagesComboBox,AFilename);
+    end;
+    InputHistories.StoreFileDialogSettings(OpenDialog);
+  finally
+    OpenDialog.Free;
+  end;
+end;
+
 procedure TFilesOptionsFrame.DirectoriesButtonClick(Sender: TObject);
 var
   OpenDialog: TSelectDirectoryDialog;
@@ -211,6 +236,7 @@ begin
     Add('c:/windows/temp');
     EndUpdate;
   end;
+  CompilerMessagesLabel.Caption:=dlgCompilerMessages;
 end;
 
 function TFilesOptionsFrame.GetTitle: String;
@@ -269,6 +295,8 @@ begin
     TestBuildDirComboBox.Items.Assign(TestBuildDirHistory);
     FOldTestDir:=TestBuildDirectory;
     SetComboBoxText(TestBuildDirComboBox,TestBuildDirectory,MaxComboBoxCount);
+    CompilerMessagesComboBox.Items.Assign(CompilerMessagesFileHistory);
+    SetComboBoxText(CompilerMessagesComboBox,CompilerMessagesFilename,MaxComboBoxCount);
 
     // recent files and directories
     SetComboBoxText(MaxRecentOpenFilesComboBox,IntToStr(MaxRecentOpenFiles));
@@ -294,6 +322,8 @@ begin
     MakeFileHistory.Assign(MakePathComboBox.Items);
     TestBuildDirHistory.Assign(TestBuildDirComboBox.Items);
     TestBuildDirectory:=TestBuildDirComboBox.Text;
+    CompilerMessagesFileHistory.Assign(CompilerMessagesComboBox.Items);
+    CompilerMessagesFilename:=CompilerMessagesComboBox.Text;
 
     // recent files and directories
     MaxRecentOpenFiles:=StrToIntDef(

ide/lazarusidestrconsts.pas

@@ -784,6 +784,7 @@ resourcestring
   lisChooseLazarusSourceDirectory = 'Choose Lazarus Directory';
   lisChooseCompilerPath = 'Choose compiler filename (%s)';
   lisChooseFPCSourceDir = 'Choose FPC source directory';
+  lisChooseCompilerMessages = 'Choose compiler messages file';
   lisChooseMakePath = 'Choose make path';
   lisChooseDebuggerPath = 'Choose debugger filename';
   lisChooseTestBuildDir = 'Choose the directory for tests';
@@ -1068,6 +1069,7 @@ resourcestring
   dlgFpcPath = 'Compiler path (e.g. %s)';
   dlgFpcSrcPath = 'FPC source directory';
   dlgMakePath = 'Make path';
+  dlgCompilerMessages = 'Compiler messages language file';
   dlgDebugType = 'Debugger type and path';
   dlgTestPrjDir = 'Directory for building test projects';
   dlgQShowGrid = 'Show grid';