Changeset 15 for trunk/UKConfig.pas

Timestamp:

May 21, 2014, 5:33:14 PM (10 years ago)

Author:

chronos

Message:

• Added: Architecture selection through main menu item Architecture.
• Added: In comparison show also full ID list for both configuration.

File:

• trunk/UKConfig.pas (modified) (8 diffs)

trunk/UKConfig.pas

@@ -72 +72 @@
     RangeMax: string;
     MenuConfig: Boolean;
+    Optional: Boolean;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -98 +99 @@
     CurrentMenu: TMenuNode;
     ConditionStack: TStringList;
-    Arch: string;
+    FArch: string;
     FOnLog: TOnLogEvent;
     ParseFileName: string;
@@ -117 +118 @@
     procedure ParseMakeFile;
     function GetLog: string;
+    procedure SetArch(AValue: string);
   public
     TopNode: TMenuNode;
@@ -129 +131 @@
     constructor Create;
     destructor Destroy; override;
+    property Arch: string read FArch write SetArch;
   end;
 
@@ -609 +612 @@
 begin
   Result := ' ' + ParseFileName + ':' + IntToStr(LineNumber);
+end;
+
+procedure TConfigMenu.SetArch(AValue: string);
+begin
+  if FArch = AValue then Exit;
+  FArch := AValue;
+  LoadFromDir(BaseDir);
 end;
 
@@ -895 +905 @@
         //VisibleCondition := GetNextToken(Line);
       end else
+      if Command = 'optional' then begin
+        NewItem.Optional := True;
+      end else
       if Command = 'endif' then begin
         ConditionStack.Delete(ConditionStack.Count - 1);
@@ -1018 +1031 @@
   I: Integer;
 begin
-  Self.Arch := 'x86';
   BaseDir := Dir;
   ParseMakeFile;
@@ -1038 +1050 @@
 begin
   ConditionStack := TStringList.Create;
+  Self.FArch := 'x86';
 end;