From 1b335b08eb4347765d9f3bed041b3552d7656a99 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Tue, 30 Dec 2008 13:17:45 +0000
Subject: [PATCH] IDE: build modes: implemented move up/down

git-svn-id: trunk@17996 -
---
 ide/compileroptions.pp                       |  42 ++++---
 ide/compileroptionsdlg.pp                    |   2 +-
 ide/compoptcondpropsdlg.pas                  |  31 +++--
 ide/frames/options_compiler_buildmodes.lfm   |  12 +-
 ide/frames/options_compiler_buildmodes.lrs   |  73 ++++++------
 ide/frames/options_compiler_buildmodes.pas   | 114 ++++++++++++++++++-
 ide/frames/options_compiler_conditionals.lfm |   4 +-
 ide/frames/options_compiler_conditionals.lrs |   4 +-
 ide/frames/options_compiler_conditionals.pas |  13 ++-
 ideintf/projectintf.pas                      |  12 +-
 10 files changed, 231 insertions(+), 76 deletions(-)

diff --git a/ide/compileroptions.pp b/ide/compileroptions.pp
index da48f183b9..bd00fb8cd6 100644
--- a/ide/compileroptions.pp
+++ b/ide/compileroptions.pp
@@ -55,8 +55,8 @@ type
   TIDEBuildMode = class(TLazBuildMode)
   protected
     procedure SetIdentifier(const AValue: string); override;
-    procedure SetLocalizedName(const AValue: string); override;
-    procedure SetLocalizedValues(const AValue: TStrings); override;
+    procedure SetDescription(const AValue: string); override;
+    procedure SetValueDescriptions(const AValue: TStrings); override;
     procedure SetValues(const AValue: TStrings); override;
   public
     constructor Create;
@@ -3258,16 +3258,16 @@ begin
   FIdentifier:=AValue;
 end;
 
-procedure TIDEBuildMode.SetLocalizedName(const AValue: string);
+procedure TIDEBuildMode.SetDescription(const AValue: string);
 begin
-  if FLocalizedName=AValue then exit;
-  FLocalizedName:=AValue;
+  if FDescription=AValue then exit;
+  FDescription:=AValue;
 end;
 
-procedure TIDEBuildMode.SetLocalizedValues(const AValue: TStrings);
+procedure TIDEBuildMode.SetValueDescriptions(const AValue: TStrings);
 begin
-  if FLocalizedValues=AValue then exit;
-  FLocalizedValues.Assign(AValue);
+  if FValueDescriptions=AValue then exit;
+  FValueDescriptions.Assign(AValue);
 end;
 
 procedure TIDEBuildMode.SetValues(const AValue: TStrings);
@@ -3279,14 +3279,16 @@ end;
 constructor TIDEBuildMode.Create;
 begin
   FValues:=TStringList.Create;
-  FLocalizedValues:=TStringList.Create;
+  FValueDescriptions:=TStringList.Create;
   FDefaultValue:=TCompOptConditionals.Create(BuildModeSet.Evaluator);
+  FDefaultValue.Root.NodeType:=cocntAddValue;
+  FDefaultValue.Root.ValueType:=cocvtNone;
 end;
 
 destructor TIDEBuildMode.Destroy;
 begin
   FreeAndNil(FValues);
-  FreeAndNil(FLocalizedValues);
+  FreeAndNil(FValueDescriptions);
   FreeAndNil(FDefaultValue);
   inherited Destroy;
 end;
@@ -3295,8 +3297,8 @@ procedure TIDEBuildMode.Assign(Source: TLazBuildMode);
 begin
   FIdentifier:=Source.Identifier;
   FDefaultValue.Assign(Source.DefaultValue);
-  FLocalizedName:=Source.LocalizedName;
-  FLocalizedValues.Assign(Source.LocalizedValues);
+  FDescription:=Source.Description;
+  FValueDescriptions.Assign(Source.ValueDescriptions);
   FValues.Assign(Source.Values);
 end;
 
@@ -3304,16 +3306,26 @@ procedure TIDEBuildMode.LoadFromXMLConfig(AXMLConfig: TXMLConfig;
   const Path: string; DoSwitchPathDelims: boolean);
 begin
   FIdentifier:=AXMLConfig.GetValue(Path+'Identifier/Value','');
+  if not IsValidIdent(FIdentifier) then FIdentifier:='';
+  FDescription:=AXMLConfig.GetValue(Path+'Description/Value','');
   LoadStringList(AXMLConfig,FValues,Path+'Values/');
+  LoadStringList(AXMLConfig,FValueDescriptions,Path+'ValueDescriptions/');
   TCompOptConditionals(FDefaultValue).LoadFromXMLConfig(AXMLConfig,Path+'DefaultValue',
                                                         DoSwitchPathDelims);
+
+  while ValueDescriptions.Count>Values.Count do
+    ValueDescriptions.Delete(ValueDescriptions.Count-1);
+  while ValueDescriptions.Count<Values.Count do
+    ValueDescriptions.Add('');
 end;
 
 procedure TIDEBuildMode.SaveToXMLConfig(AXMLConfig: TXMLConfig;
   const Path: string);
 begin
   AXMLConfig.SetDeleteValue(Path+'Identifier/Value',FIdentifier,'');
+  AXMLConfig.SetDeleteValue(Path+'Description/Value',FDescription,'');
   SaveStringList(AXMLConfig,FValues,Path+'Values/');
+  SaveStringList(AXMLConfig,FValueDescriptions,Path+'ValueDescriptions/');
   TCompOptConditionals(FDefaultValue).SaveToXMLConfig(AXMLConfig,Path+'DefaultValue');
 end;
 
@@ -3321,7 +3333,9 @@ procedure TIDEBuildMode.CreateDiff(OtherMode: TLazBuildMode;
   Tool: TCompilerDiffTool);
 begin
   Tool.AddDiff('Identifier',Identifier,OtherMode.Identifier);
+  Tool.AddDiff('Description',Description,OtherMode.Description);
   Tool.AddStringsDiff('Values',Values,OtherMode.Values);
+  Tool.AddStringsDiff('ValueDescriptions',ValueDescriptions,OtherMode.ValueDescriptions);
   TCompOptConditionals(DefaultValue).CreateDiff(OtherMode.DefaultValue,Tool);
 end;
 
@@ -3330,8 +3344,8 @@ begin
   Identifier:=Source.Identifier;
   Values:=Source.Values;
   DefaultValue.Assign(Source.DefaultValue);
-  LocalizedName:=Source.LocalizedName;
-  LocalizedValues:=Source.LocalizedValues;
+  Description:=Source.Description;
+  ValueDescriptions:=Source.ValueDescriptions;
 end;
 
 { TIDEBuildModes }
diff --git a/ide/compileroptionsdlg.pp b/ide/compileroptionsdlg.pp
index 598c5637f5..dc6893db4a 100644
--- a/ide/compileroptionsdlg.pp
+++ b/ide/compileroptionsdlg.pp
@@ -47,7 +47,7 @@ uses
   TransferMacros, PathEditorDlg, LazarusIDEStrConsts, IDEOptionDefs, LazConf,
   IDEProcs, IDEImagesIntf, ShowCompilerOpts, Project, PackageDefs,
   CompilerOptions, CheckCompilerOpts, CompOptsModes,
-  Options_Compiler_Conditionals;
+  Options_Compiler_Conditionals, options_compiler_buildmodes;
 
 type
   { Compiler options form }
diff --git a/ide/compoptcondpropsdlg.pas b/ide/compoptcondpropsdlg.pas
index 8ade08d0e0..a1b5bf384c 100644
--- a/ide/compoptcondpropsdlg.pas
+++ b/ide/compoptcondpropsdlg.pas
@@ -49,6 +49,7 @@ type
     procedure ValueEditEditingDone(Sender: TObject);
     procedure ValueTypeComboBoxEditingDone(Sender: TObject);
   private
+    FAllowedValueTypes: TCOCValueTypes;
     FOriginalNode: TCompOptCondNode;
     FNodeType: TCOCNodeType;
     FValueType: TCOCValueType;
@@ -56,6 +57,7 @@ type
     function GetNodeType: TCOCNodeType;
     function GetValue: string;
     function GetValueType: TCOCValueType;
+    procedure SetAllowedValueTypes(const AValue: TCOCValueTypes);
     procedure SetNodeType(const AValue: TCOCNodeType);
     procedure SetOriginalNode(const AValue: TCompOptCondNode);
     procedure SetValue(const AValue: string);
@@ -67,19 +69,23 @@ type
     property NodeType: TCOCNodeType read GetNodeType write SetNodeType;
     property ValueType: TCOCValueType read GetValueType write SetValueType;
     property Value: string read GetValue write SetValue;
+    property AllowedValueTypes: TCOCValueTypes read FAllowedValueTypes write SetAllowedValueTypes;
   end;
 
-function EditCompOptCondProperties(Node: TCompOptCondNode): TModalResult;
+function EditCompOptCondProperties(Node: TCompOptCondNode;
+  const AllowedValueTypes: TCOCValueTypes): TModalResult;
 
 implementation
 
-function EditCompOptCondProperties(Node: TCompOptCondNode): TModalResult;
+function EditCompOptCondProperties(Node: TCompOptCondNode;
+  const AllowedValueTypes: TCOCValueTypes): TModalResult;
 var
   CompOptCondPropsDialog: TCompOptCondPropsDialog;
 begin
   CompOptCondPropsDialog:=TCompOptCondPropsDialog.Create(nil);
   try
     CompOptCondPropsDialog.OriginalNode:=Node;
+    CompOptCondPropsDialog.AllowedValueTypes:=AllowedValueTypes;
     Result:=CompOptCondPropsDialog.ShowModal;
   finally
     CompOptCondPropsDialog.Free;
@@ -91,7 +97,6 @@ end;
 procedure TCompOptCondPropsDialog.FormCreate(Sender: TObject);
 var
   nt: TCOCNodeType;
-  vt: TCOCValueType;
 begin
   Caption:=lisPropertiesOfConditionalCompilerOption;
   PropsGroupBox.Caption:=lisHlpOptsProperties;
@@ -99,13 +104,10 @@ begin
   NodeTypeLabel.Caption:=lisUIDType;
   ValueTypeLabel.Caption:=lisAction;
   ValueLabel.Caption:=lisValue;
-  ValueTypeComboBox.Items.Clear;
   NodeTypeComboBox.Items.Clear;
   for nt:=Low(TCOCNodeType) to High(TCOCNodeType) do
     NodeTypeComboBox.Items.Add(COCNodeTypeLocalizedName(nt));
-  for vt:=Low(TCOCValueType) to High(TCOCValueType) do
-    ValueTypeComboBox.Items.Add(COCValueTypeLocalizedName(vt));
-
+  AllowedValueTypes:=[cocvtNone];
   ButtonPanel1.OKButton.OnClick:=@ButtonPanel1OkClick;
 end;
 
@@ -183,6 +185,21 @@ begin
   Result:=FValueType;
 end;
 
+procedure TCompOptCondPropsDialog.SetAllowedValueTypes(
+  const AValue: TCOCValueTypes);
+var
+  vt: TCOCValueType;
+begin
+  if FAllowedValueTypes=AValue then exit;
+  FAllowedValueTypes:=AValue;
+  ValueTypeComboBox.Items.BeginUpdate;
+  ValueTypeComboBox.Items.Clear;
+  for vt:=Low(TCOCValueType) to High(TCOCValueType) do
+    if vt in AllowedValueTypes then
+      ValueTypeComboBox.Items.Add(COCValueTypeLocalizedName(vt));
+  ValueTypeComboBox.Items.EndUpdate;
+end;
+
 procedure TCompOptCondPropsDialog.SetNodeType(const AValue: TCOCNodeType);
 begin
   if FNodeType=AValue then exit;
diff --git a/ide/frames/options_compiler_buildmodes.lfm b/ide/frames/options_compiler_buildmodes.lfm
index 76ecf92a70..db67a47f69 100644
--- a/ide/frames/options_compiler_buildmodes.lfm
+++ b/ide/frames/options_compiler_buildmodes.lfm
@@ -8,8 +8,8 @@ object CompOptBuildModesFrame: TCompOptBuildModesFrame
   Ctl3D = False
   TabOrder = 0
   Visible = False
-  DesignLeft = 299
-  DesignTop = 280
+  DesignLeft = 309
+  DesignTop = 328
   object ModesGroupBox: TGroupBox
     Left = 0
     Height = 229
@@ -32,6 +32,7 @@ object CompOptBuildModesFrame: TCompOptBuildModesFrame
       Anchors = [akLeft, akBottom]
       Color = clBtnFace
       NumGlyphs = 0
+      OnClick = NewSpeedButtonClick
     end
     object DeleteSpeedButton: TSpeedButton
       AnchorSideLeft.Control = NewSpeedButton
@@ -43,6 +44,7 @@ object CompOptBuildModesFrame: TCompOptBuildModesFrame
       Width = 23
       Color = clBtnFace
       NumGlyphs = 0
+      OnClick = DeleteSpeedButtonClick
     end
     object MoveDownSpeedButton: TSpeedButton
       AnchorSideLeft.Control = DeleteSpeedButton
@@ -54,6 +56,7 @@ object CompOptBuildModesFrame: TCompOptBuildModesFrame
       Width = 23
       Color = clBtnFace
       NumGlyphs = 0
+      OnClick = MoveDownSpeedButtonClick
     end
     object MoveUpSpeedButton: TSpeedButton
       AnchorSideLeft.Control = MoveDownSpeedButton
@@ -65,6 +68,7 @@ object CompOptBuildModesFrame: TCompOptBuildModesFrame
       Width = 23
       Color = clBtnFace
       NumGlyphs = 0
+      OnClick = MoveUpSpeedButtonClick
     end
     object ModesListBox: TListBox
       AnchorSideBottom.Control = NewSpeedButton
@@ -111,13 +115,15 @@ object CompOptBuildModesFrame: TCompOptBuildModesFrame
       ClientWidth = 289
       Ctl3D = False
       TabOrder = 1
-      inline CompOptsConditionalsFrame1: TCompOptsConditionalsFrame
+      inline DefaultValueEditor: TCompOptsConditionalsFrame
         Height = 90
         Width = 289
         Align = alClient
         ClientHeight = 86
         ClientWidth = 285
         Visible = True
+        DesignLeft = 434
+        DesignTop = 329
         inherited COCTreeView: TTreeView
           Height = 86
           Width = 285
diff --git a/ide/frames/options_compiler_buildmodes.lrs b/ide/frames/options_compiler_buildmodes.lrs
index 094001b037..0de6a18086 100644
--- a/ide/frames/options_compiler_buildmodes.lrs
+++ b/ide/frames/options_compiler_buildmodes.lrs
@@ -3,48 +3,51 @@
 LazarusResources.Add('TCompOptBuildModesFrame','FORMDATA',[
   'TPF0'#23'TCompOptBuildModesFrame'#22'CompOptBuildModesFrame'#4'Left'#2#0#6'H'
   +'eight'#3#233#0#3'Top'#2#0#5'Width'#3#236#1#12'ClientHeight'#3#229#0#11'Clie'
-  +'ntWidth'#3#232#1#5'Ctl3D'#8#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3'+'
-  +#1#9'DesignTop'#3#24#1#0#9'TGroupBox'#13'ModesGroupBox'#4'Left'#2#0#6'Height'
+  +'ntWidth'#3#232#1#5'Ctl3D'#8#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3'5'
+  +#1#9'DesignTop'#3'H'#1#0#9'TGroupBox'#13'ModesGroupBox'#4'Left'#2#0#6'Height'
   +#3#229#0#3'Top'#2#0#5'Width'#3#186#0#5'Align'#7#6'alLeft'#7'Caption'#6#13'Mo'
   +'desGroupBox'#12'ClientHeight'#3#210#0#11'ClientWidth'#3#182#0#5'Ctl3D'#8#8
   +'TabOrder'#2#0#0#12'TSpeedButton'#14'NewSpeedButton'#22'AnchorSideLeft.Contr'
   +'ol'#7#13'ModesGroupBox'#24'AnchorSideBottom.Control'#7#13'ModesGroupBox'#21
   +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#22#3'Top'#3
   +#188#0#5'Width'#2#23#7'Anchors'#11#6'akLeft'#8'akBottom'#0#5'Color'#7#9'clBt'
-  +'nFace'#9'NumGlyphs'#2#0#0#0#12'TSpeedButton'#17'DeleteSpeedButton'#22'Ancho'
-  +'rSideLeft.Control'#7#14'NewSpeedButton'#19'AnchorSideLeft.Side'#7#9'asrBott'
-  +'om'#21'AnchorSideTop.Control'#7#14'NewSpeedButton'#4'Left'#2#23#6'Height'#2
-  +#22#3'Top'#3#188#0#5'Width'#2#23#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#0#0
+  +'nFace'#9'NumGlyphs'#2#0#7'OnClick'#7#19'NewSpeedButtonClick'#0#0#12'TSpeedB'
+  +'utton'#17'DeleteSpeedButton'#22'AnchorSideLeft.Control'#7#14'NewSpeedButton'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#14'NewSp'
+  +'eedButton'#4'Left'#2#23#6'Height'#2#22#3'Top'#3#188#0#5'Width'#2#23#5'Color'
+  +#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#22'DeleteSpeedButtonClick'#0#0
   +#12'TSpeedButton'#19'MoveDownSpeedButton'#22'AnchorSideLeft.Control'#7#17'De'
   +'leteSpeedButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Co'
   +'ntrol'#7#14'NewSpeedButton'#4'Left'#2'.'#6'Height'#2#22#3'Top'#3#188#0#5'Wi'
-  +'dth'#2#23#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#0#0#12'TSpeedButton'#17
-  +'MoveUpSpeedButton'#22'AnchorSideLeft.Control'#7#19'MoveDownSpeedButton'#19
-  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#14'NewSpeed'
-  +'Button'#4'Left'#2'E'#6'Height'#2#22#3'Top'#3#188#0#5'Width'#2#23#5'Color'#7
-  +#9'clBtnFace'#9'NumGlyphs'#2#0#0#0#8'TListBox'#12'ModesListBox'#24'AnchorSid'
-  +'eBottom.Control'#7#14'NewSpeedButton'#4'Left'#2#0#6'Height'#3#188#0#3'Top'#2
-  +#0#5'Width'#3#182#0#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'a'
-  +'kRight'#8'akBottom'#0#10'ItemHeight'#2#0#8'TabOrder'#2#0#8'TopIndex'#2#255#0
-  +#0#0#9'TGroupBox'#14'ValuesGroupBox'#4'Left'#3#191#0#6'Height'#3#229#0#3'Top'
-  +#2#0#5'Width'#3')'#1#5'Align'#7#8'alClient'#7'Caption'#6#14'ValuesGroupBox'
-  +#12'ClientHeight'#3#210#0#11'ClientWidth'#3'%'#1#5'Ctl3D'#8#8'TabOrder'#2#1#0
-  +#11'TStringGrid'#16'ValuesStringGrid'#4'Left'#2#0#6'Height'#2'_'#3'Top'#2#0#5
-  +'Width'#3'%'#1#5'Align'#7#8'alClient'#8'ColCount'#2#2#9'FixedCols'#2#0#8'Tab'
-  +'Order'#2#0#0#0#9'TGroupBox'#20'DefaultValueGroupBox'#4'Left'#2#0#6'Height'#2
-  +'m'#3'Top'#2'e'#5'Width'#3'%'#1#5'Align'#7#8'alBottom'#7'Caption'#6#20'Defau'
-  +'ltValueGroupBox'#12'ClientHeight'#2'Z'#11'ClientWidth'#3'!'#1#5'Ctl3D'#8#8
-  +'TabOrder'#2#1#0#244#26'TCompOptsConditionalsFrame'#26'CompOptsConditionalsF'
-  +'rame1'#6'Height'#2'Z'#5'Width'#3'!'#1#5'Align'#7#8'alClient'#12'ClientHeigh'
-  +'t'#2'V'#11'ClientWidth'#3#29#1#7'Visible'#9#0#241#9'TTreeView'#11'COCTreeVi'
-  +'ew'#6'Height'#2'V'#5'Width'#3#29#1#0#0#241#10'TPopupMenu'#12'COCPopupMenu'#0
-  +#241#9'TMenuItem'#19'InsertAboveMenuItem'#0#0#241#9'TMenuItem'#19'InsertBelo'
-  +'wMenuItem'#0#0#241#9'TMenuItem'#19'InsertChildMenuItem'#0#0#241#9'TMenuItem'
-  +#14'DeleteMenuItem'#0#0#241#9'TMenuItem'#14'MoveUpMenuItem'#0#0#241#9'TMenuI'
-  +'tem'#16'MoveDownMenuItem'#0#0#241#9'TMenuItem'#17'MoveLvlUpMenuItem'#0#0#241
-  +#9'TMenuItem'#19'MoveLvlDownMenuItem'#0#0#241#9'TMenuItem'#18'PropertiesMenu'
-  +'Item'#0#0#0#0#0#9'TSplitter'#14'ValuesSplitter'#6'Cursor'#7#8'crVSplit'#4'L'
-  +'eft'#2#0#6'Height'#2#6#3'Top'#2'_'#5'Width'#3'%'#1#5'Align'#7#8'alBottom'#12
-  +'ResizeAnchor'#7#8'akBottom'#0#0#0#9'TSplitter'#12'MainSplitter'#4'Left'#3
-  +#186#0#6'Height'#3#229#0#3'Top'#2#0#5'Width'#2#5#0#0#0
+  +'dth'#2#23#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#24'MoveDown'
+  +'SpeedButtonClick'#0#0#12'TSpeedButton'#17'MoveUpSpeedButton'#22'AnchorSideL'
+  +'eft.Control'#7#19'MoveDownSpeedButton'#19'AnchorSideLeft.Side'#7#9'asrBotto'
+  +'m'#21'AnchorSideTop.Control'#7#14'NewSpeedButton'#4'Left'#2'E'#6'Height'#2
+  +#22#3'Top'#3#188#0#5'Width'#2#23#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7
+  +'OnClick'#7#22'MoveUpSpeedButtonClick'#0#0#8'TListBox'#12'ModesListBox'#24'A'
+  +'nchorSideBottom.Control'#7#14'NewSpeedButton'#4'Left'#2#0#6'Height'#3#188#0
+  +#3'Top'#2#0#5'Width'#3#182#0#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'ak'
+  +'Left'#7'akRight'#8'akBottom'#0#10'ItemHeight'#2#0#8'TabOrder'#2#0#8'TopInde'
+  +'x'#2#255#0#0#0#9'TGroupBox'#14'ValuesGroupBox'#4'Left'#3#191#0#6'Height'#3
+  +#229#0#3'Top'#2#0#5'Width'#3')'#1#5'Align'#7#8'alClient'#7'Caption'#6#14'Val'
+  +'uesGroupBox'#12'ClientHeight'#3#210#0#11'ClientWidth'#3'%'#1#5'Ctl3D'#8#8'T'
+  +'abOrder'#2#1#0#11'TStringGrid'#16'ValuesStringGrid'#4'Left'#2#0#6'Height'#2
+  +'_'#3'Top'#2#0#5'Width'#3'%'#1#5'Align'#7#8'alClient'#8'ColCount'#2#2#9'Fixe'
+  +'dCols'#2#0#8'TabOrder'#2#0#0#0#9'TGroupBox'#20'DefaultValueGroupBox'#4'Left'
+  +#2#0#6'Height'#2'm'#3'Top'#2'e'#5'Width'#3'%'#1#5'Align'#7#8'alBottom'#7'Cap'
+  +'tion'#6#20'DefaultValueGroupBox'#12'ClientHeight'#2'Z'#11'ClientWidth'#3'!'
+  +#1#5'Ctl3D'#8#8'TabOrder'#2#1#0#244#26'TCompOptsConditionalsFrame'#18'Defaul'
+  +'tValueEditor'#6'Height'#2'Z'#5'Width'#3'!'#1#5'Align'#7#8'alClient'#12'Clie'
+  +'ntHeight'#2'V'#11'ClientWidth'#3#29#1#7'Visible'#9#10'DesignLeft'#3#178#1#9
+  +'DesignTop'#3'I'#1#0#241#9'TTreeView'#11'COCTreeView'#6'Height'#2'V'#5'Width'
+  +#3#29#1#0#0#241#10'TPopupMenu'#12'COCPopupMenu'#0#241#9'TMenuItem'#19'Insert'
+  +'AboveMenuItem'#0#0#241#9'TMenuItem'#19'InsertBelowMenuItem'#0#0#241#9'TMenu'
+  +'Item'#19'InsertChildMenuItem'#0#0#241#9'TMenuItem'#14'DeleteMenuItem'#0#0
+  +#241#9'TMenuItem'#14'MoveUpMenuItem'#0#0#241#9'TMenuItem'#16'MoveDownMenuIte'
+  +'m'#0#0#241#9'TMenuItem'#17'MoveLvlUpMenuItem'#0#0#241#9'TMenuItem'#19'MoveL'
+  +'vlDownMenuItem'#0#0#241#9'TMenuItem'#18'PropertiesMenuItem'#0#0#0#0#0#9'TSp'
+  +'litter'#14'ValuesSplitter'#6'Cursor'#7#8'crVSplit'#4'Left'#2#0#6'Height'#2#6
+  +#3'Top'#2'_'#5'Width'#3'%'#1#5'Align'#7#8'alBottom'#12'ResizeAnchor'#7#8'akB'
+  +'ottom'#0#0#0#9'TSplitter'#12'MainSplitter'#4'Left'#3#186#0#6'Height'#3#229#0
+  +#3'Top'#2#0#5'Width'#2#5#0#0#0
 ]);
diff --git a/ide/frames/options_compiler_buildmodes.pas b/ide/frames/options_compiler_buildmodes.pas
index 98a28db724..d280ed364c 100644
--- a/ide/frames/options_compiler_buildmodes.pas
+++ b/ide/frames/options_compiler_buildmodes.pas
@@ -24,17 +24,17 @@ unit options_compiler_buildmodes;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, StdCtrls, Grids, Buttons,
-  ExtCtrls,
+  Classes, SysUtils, FileUtil, Controls, LResources, Forms, StdCtrls, Grids,
+  Buttons, ExtCtrls, Dialogs,
   IDEImagesIntf, ProjectIntf, CompilerOptions,
-  Options_Compiler_Conditionals, LazarusIDEStrConsts;
+  Options_Compiler_Conditionals, LazarusIDEStrConsts, CompOptsModes;
 
 type
 
   { TCompOptBuildModesFrame }
 
   TCompOptBuildModesFrame = class(TFrame)
-    CompOptsConditionalsFrame1: TCompOptsConditionalsFrame;
+    DefaultValueEditor: TCompOptsConditionalsFrame;
     DefaultValueGroupBox: TGroupBox;
     ValuesGroupBox: TGroupBox;
     ModesGroupBox: TGroupBox;
@@ -46,6 +46,10 @@ type
     MainSplitter: TSplitter;
     ValuesSplitter: TSplitter;
     ValuesStringGrid: TStringGrid;
+    procedure DeleteSpeedButtonClick(Sender: TObject);
+    procedure MoveDownSpeedButtonClick(Sender: TObject);
+    procedure MoveUpSpeedButtonClick(Sender: TObject);
+    procedure NewSpeedButtonClick(Sender: TObject);
   private
     FBuildModes: TIDEBuildModes;
     procedure SetBuildModes(const AValue: TIDEBuildModes);
@@ -53,6 +57,7 @@ type
     procedure UpdateValues;
     procedure UpdateDefaultValue;
     procedure UpdateButtons;
+    function GetSelectedBuildMode(out BuildMode: TIDEBuildMode): boolean;
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -63,6 +68,57 @@ implementation
 
 { TCompOptBuildModesFrame }
 
+procedure TCompOptBuildModesFrame.NewSpeedButtonClick(Sender: TObject);
+begin
+
+end;
+
+procedure TCompOptBuildModesFrame.DeleteSpeedButtonClick(Sender: TObject);
+var
+  BuildMode: TIDEBuildMode;
+  i: LongInt;
+begin
+  if not GetSelectedBuildMode(BuildMode) then exit;
+  i:=ModesListBox.ItemIndex;
+  if MessageDlg('Confirm delete',
+    'Delete build mode "'+BuildMode.Identifier+'"?',
+    mtConfirmation,[mbYes,mbCancel],0)<>mrYes
+  then exit;
+  BuildModes.Delete(i);
+  ModesListBox.Items.Delete(i);
+  if i=ModesListBox.Items.Count then
+    dec(i);
+  ModesListBox.ItemIndex:=i;
+end;
+
+procedure TCompOptBuildModesFrame.MoveDownSpeedButtonClick(Sender: TObject);
+var
+  i: LongInt;
+  BuildMode: TIDEBuildMode;
+begin
+  if not GetSelectedBuildMode(BuildMode) then exit;
+  i:=ModesListBox.ItemIndex;
+  if i<ModesListBox.Items.Count-1 then begin
+    BuildModes.Move(i,i+1);
+    ModesListBox.Items.Move(i,i+1);
+    ModesListBox.ItemIndex:=i+1;
+  end;
+end;
+
+procedure TCompOptBuildModesFrame.MoveUpSpeedButtonClick(Sender: TObject);
+var
+  i: LongInt;
+  BuildMode: TIDEBuildMode;
+begin
+  if not GetSelectedBuildMode(BuildMode) then exit;
+  i:=ModesListBox.ItemIndex;
+  if i>0 then begin
+    BuildModes.Move(i,i-1);
+    ModesListBox.Items.Move(i,i-1);
+    ModesListBox.ItemIndex:=i-1;
+  end;
+end;
+
 procedure TCompOptBuildModesFrame.SetBuildModes(const AValue: TIDEBuildModes);
 begin
   if FBuildModes=AValue then exit;
@@ -71,24 +127,70 @@ begin
 end;
 
 procedure TCompOptBuildModesFrame.UpdateModes;
+var
+  i: Integer;
 begin
-
+  ModesListBox.Items.BeginUpdate;
+  ModesListBox.Items.Clear;
+  if BuildModes<>nil then begin
+    for i:=0 to BuildModes.Count-1 do begin
+      ModesListBox.Items.Add(BuildModes.Items[i].Identifier);
+    end;
+  end;
+  ModesListBox.Items.EndUpdate;
   UpdateValues;
+  UpdateButtons;
 end;
 
 procedure TCompOptBuildModesFrame.UpdateValues;
+var
+  BuildMode: TIDEBuildMode;
+  i: Integer;
 begin
+  if not GetSelectedBuildMode(BuildMode) then exit;
+  ValuesStringGrid.ColCount:=2;
+  ValuesStringGrid.FixedCols:=0;
+  ValuesStringGrid.RowCount:=BuildMode.Values.Count+1;
+  ValuesStringGrid.FixedRows:=1;
+  ValuesStringGrid.Cells[0,0]:='Value';
+  ValuesStringGrid.Cells[1,0]:='Description';
+  ValuesStringGrid.ColWidths[0]:=90;
+  ValuesStringGrid.ColWidths[1]:=120;
+  for i:=0 to BuildMode.Values.Count-1 do begin
+    ValuesStringGrid.Cells[0,i+1]:=BuildMode.Values[i];
+    if i<BuildMode.ValueDescriptions.Count then
+      ValuesStringGrid.Cells[1,i+1]:=BuildMode.ValueDescriptions[i]
+    else
+      ValuesStringGrid.Cells[1,i+1]:='';
+  end;
   UpdateDefaultValue;
 end;
 
 procedure TCompOptBuildModesFrame.UpdateDefaultValue;
+var
+  BuildMode: TIDEBuildMode;
 begin
-
+  if not GetSelectedBuildMode(BuildMode) then exit;
+  DefaultValueEditor.Conditionals:=TCompOptConditionals(BuildMode.DefaultValue);
 end;
 
 procedure TCompOptBuildModesFrame.UpdateButtons;
 begin
+  NewSpeedButton.Enabled:=BuildModes<>nil;
+  DeleteSpeedButton.Enabled:=(ModesListBox.ItemIndex>=0);
+  MoveDownSpeedButton.Enabled:=(ModesListBox.ItemIndex>=0)
+                        and (ModesListBox.ItemIndex<ModesListBox.Items.Count-1);
+  MoveUpSpeedButton.Enabled:=(ModesListBox.ItemIndex>0);
+end;
 
+function TCompOptBuildModesFrame.GetSelectedBuildMode(
+  out BuildMode: TIDEBuildMode): boolean;
+begin
+  BuildMode:=nil;
+  if BuildModes=nil then exit(false);
+  if ModesListBox.ItemIndex<0 then exit(false);
+  BuildMode:=TIDEBuildMode(BuildModes.Items[ModesListBox.ItemIndex]);
+  Result:=true;
 end;
 
 constructor TCompOptBuildModesFrame.Create(TheOwner: TComponent);
diff --git a/ide/frames/options_compiler_conditionals.lfm b/ide/frames/options_compiler_conditionals.lfm
index d469c21212..9274c3fc1d 100644
--- a/ide/frames/options_compiler_conditionals.lfm
+++ b/ide/frames/options_compiler_conditionals.lfm
@@ -8,8 +8,8 @@ object CompOptsConditionalsFrame: TCompOptsConditionalsFrame
   Ctl3D = False
   TabOrder = 0
   Visible = False
-  DesignLeft = 434
-  DesignTop = 329
+  DesignLeft = 439
+  DesignTop = 353
   object COCTreeView: TTreeView
     Left = 0
     Height = 166
diff --git a/ide/frames/options_compiler_conditionals.lrs b/ide/frames/options_compiler_conditionals.lrs
index 6f8d51aaa0..3e2174a019 100644
--- a/ide/frames/options_compiler_conditionals.lrs
+++ b/ide/frames/options_compiler_conditionals.lrs
@@ -1,8 +1,10 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TCompOptsConditionalsFrame','FORMDATA',[
   'TPF0'#26'TCompOptsConditionalsFrame'#25'CompOptsConditionalsFrame'#4'Left'#2
   +#0#6'Height'#3#170#0#3'Top'#2#0#5'Width'#3#129#1#12'ClientHeight'#3#166#0#11
   +'ClientWidth'#3'}'#1#5'Ctl3D'#8#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3
-  +#178#1#9'DesignTop'#3'I'#1#0#9'TTreeView'#11'COCTreeView'#4'Left'#2#0#6'Heig'
+  +#183#1#9'DesignTop'#3'a'#1#0#9'TTreeView'#11'COCTreeView'#4'Left'#2#0#6'Heig'
   +'ht'#3#166#0#3'Top'#2#0#5'Width'#3'}'#1#5'Align'#7#8'alClient'#10'AutoExpand'
   +#9#5'Ctl3D'#8#17'DefaultItemHeight'#2#19#9'PopupMenu'#7#12'COCPopupMenu'#8'R'
   +'eadOnly'#9#9'RowSelect'#9#8'TabOrder'#2#0#7'Options'#11#13'tvoAutoExpand'#17
diff --git a/ide/frames/options_compiler_conditionals.pas b/ide/frames/options_compiler_conditionals.pas
index 3b4d134350..0426735ccb 100644
--- a/ide/frames/options_compiler_conditionals.pas
+++ b/ide/frames/options_compiler_conditionals.pas
@@ -56,8 +56,10 @@ type
     procedure MoveUpMenuItemClick(Sender: TObject);
     procedure PropertiesMenuItemClick(Sender: TObject);
   private
+    FAllowedValueTypes: TCOCValueTypes;
     FConditionals: TCompOptConditionals;
     FNodeTypeImageIDs: array[TCOCNodeType] of integer;
+    procedure SetAllowedValueTypes(const AValue: TCOCValueTypes);
     procedure SetConditionals(const AValue: TCompOptConditionals);
     procedure FillTreeView;
     procedure ConsistencyCheck;
@@ -68,6 +70,7 @@ type
   public
     constructor Create(TheOwner: TComponent); override;
     property Conditionals: TCompOptConditionals read FConditionals write SetConditionals;
+    property AllowedValueTypes: TCOCValueTypes read FAllowedValueTypes write SetAllowedValueTypes;
   end;
 
 implementation
@@ -188,7 +191,7 @@ var
   TVNode: TTreeNode;
 begin
   if not GetSelectedNode(COCNode,TVNode,false) then exit;
-  EditCompOptCondProperties(COCNode);
+  EditCompOptCondProperties(COCNode,AllowedValueTypes);
   TVNode.Text:=NodeToCaption(COCNode);
   TVNode.ImageIndex:=FNodeTypeImageIDs[COCNode.NodeType];
   TVNode.SelectedIndex:=TVNode.ImageIndex;
@@ -202,6 +205,13 @@ begin
   FillTreeView;
 end;
 
+procedure TCompOptsConditionalsFrame.SetAllowedValueTypes(
+  const AValue: TCOCValueTypes);
+begin
+  if FAllowedValueTypes=AValue then exit;
+  FAllowedValueTypes:=AValue;
+end;
+
 procedure TCompOptsConditionalsFrame.FillTreeView;
 
   procedure Add(COCNode: TCompOptCondNode; ParentTVNode: TTreeNode);
@@ -363,6 +373,7 @@ var
   nt: TCOCNodeType;
 begin
   inherited Create(TheOwner);
+  FAllowedValueTypes:=[low(TCOCValueType)..high(TCOCValueType)];
 
   COCTreeView.Images := IDEImages.Images_24;
 
diff --git a/ideintf/projectintf.pas b/ideintf/projectintf.pas
index 0d404306e3..14ff5416be 100644
--- a/ideintf/projectintf.pas
+++ b/ideintf/projectintf.pas
@@ -154,19 +154,19 @@ type
   protected
     FDefaultValue: TLazCompOptConditionals;
     FIdentifier: string;
-    FLocalizedName: string;
-    FLocalizedValues: TStrings;
+    FDescription: string;
+    FValueDescriptions: TStrings;
     FValues: TStrings;
     procedure SetIdentifier(const AValue: string); virtual; abstract;
-    procedure SetLocalizedName(const AValue: string); virtual; abstract;
-    procedure SetLocalizedValues(const AValue: TStrings); virtual; abstract;
+    procedure SetDescription(const AValue: string); virtual; abstract;
+    procedure SetValueDescriptions(const AValue: TStrings); virtual; abstract;
     procedure SetValues(const AValue: TStrings); virtual; abstract;
   public
     procedure Assign(Source: TLazBuildMode); virtual; abstract;
     property Identifier: string read FIdentifier write SetIdentifier;
-    property LocalizedName: string read FLocalizedName write SetLocalizedName;
+    property Description: string read FDescription write SetDescription;
     property Values: TStrings read FValues write SetValues;
-    property LocalizedValues: TStrings read FLocalizedValues write SetLocalizedValues;
+    property ValueDescriptions: TStrings read FValueDescriptions write SetValueDescriptions;
     property DefaultValue: TLazCompOptConditionals read FDefaultValue;
   end;