Changeset 8 for trunk

Timestamp:

May 2, 2014, 12:02:30 PM (11 years ago)

Author:

chronos

Message:

• Modified: Make config group from menuconfig.

Location:

trunk

Files:

• UFormMain.pas (modified) (1 diff)
• UKConfig.pas (modified) (8 diffs)

trunk/UFormMain.pas

@@ -146 +146 @@
     Config2.OptionListNames(Missing1);
     Config.OptionListNames(Missing2);
+    Missing1.Sort;
+    Missing2.Sort;
     FormCompare.Memo1.Lines.Assign(Missing1);
     FormCompare.Memo2.Lines.Assign(Missing2);

trunk/UKConfig.pas

@@ -39 +39 @@
     RangeMin: string;
     RangeMax: string;
+    MenuConfig: Boolean;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -99 +100 @@
   Selects := TStringList.Create;
   Items := TObjectList.Create;
+  MenuConfig := False;
 end;
 
@@ -196 +198 @@
   NewMove: TObjectMove;
   Index: Integer;
-begin
-  if ID = 'KVM_INTEL' then
+  P: TMenuNode;
+begin
+  if ID = 'EXT4_FS' then
     Name := Name + '$';
   NewParent := Parent;
-  if Condition <> '' then begin
+  P := Parent;
+{  if Condition <> '' then begin
     Index := Lookup.IndexOf(Condition);
     if Index <> -1 then Node := TMenuNode(Lookup.Objects[Index])
       else Node := nil;
-    if Assigned(Node) and (NewParent <> Node) then begin
+    if Assigned(Node) and (NewParent <> Node) and Node.MenuConfig then begin
       NewParent := Node;
     end;
-  end;
+  end;}
   if Depends.Count > 0 then begin
     Index := Lookup.IndexOf(Depends[0]);
@@ -467 +471 @@
         NewItem.Condition := GetTopCondition;
         CurrentMenu.Items.Add(NewItem);
+        if Command = 'menuconfig' then NewItem.MenuConfig := True;
       end else
       if (Command = 'comment')  then begin
@@ -493 +498 @@
         NewMenu.Parent := CurrentMenu;
         NewMenu.Condition := GetTopCondition;
-        ConditionStack.Add('');
+        ConditionStack.AddObject('', nil);
         NewItem := NewMenu;
         CurrentMenu.Items.Add(NewMenu);
@@ -517 +522 @@
         NewMenu.Parent := CurrentMenu;
         NewMenu.Condition := GetTopCondition;
-        ConditionStack.Add('');
+        ConditionStack.AddObject('', nil);
         NewItem := NewMenu;
         CurrentMenu.Items.Add(NewMenu);
@@ -530 +535 @@
       end else
       if Command = 'if' then begin
-        ConditionStack.Add(GetNextToken(Line));
+        ConditionStack.AddObject(GetNextToken(Line), NewItem);
+        if Assigned(NewItem) and NewItem.MenuConfig then begin
+          CurrentMenu := NewItem;
+        end;
       end else
       if Command = 'visible' then begin
         //VisibleCondition := GetNextToken(Line);
       end else
-      if command = 'endif' then begin
+      if Command = 'endif' then begin
+        if Assigned(ConditionStack.Objects[ConditionStack.Count - 1]) then
+          if TMenuNode(ConditionStack.Objects[ConditionStack.Count - 1]).MenuConfig then
+            CurrentMenu := CurrentMenu.Parent;
         ConditionStack.Delete(ConditionStack.Count - 1);
       end else
@@ -600 +611 @@
     Node := TopNode.FindNode(List[I]);
     if Assigned(Node) then
-      List[I] := List[I] + ' ' + Node.GetAbsoluteName;
+      List[I] := Node.GetAbsoluteName + ' (' + List[I] + ')';
   end;
 end;