Changeset 15

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk

Files:

• UFormCompare.lfm (modified) (3 diffs)
• UFormCompare.pas (modified) (1 diff)
• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (6 diffs)
• UKConfig.pas (modified) (8 diffs)

trunk/UFormCompare.lfm

@@ -1 +1 @@
 object FormCompare: TFormCompare
-  Left = 449
+  Left = -29
   Height = 996
-  Top = 327
+  Top = 110
   Width = 1520
   Caption = 'Compare'
@@ -13 +13 @@
     Top = 0
     Width = 1520
-    ActivePage = TabSheet2
+    ActivePage = TabSheet4
     Align = alClient
-    TabIndex = 1
+    TabIndex = 3
     TabOrder = 0
     object TabSheet1: TTabSheet
@@ -47 +47 @@
       end
     end
+    object TabSheet3: TTabSheet
+      Caption = 'List 1'
+      ClientHeight = 956
+      ClientWidth = 1514
+      object Memo3: TMemo
+        Left = 0
+        Height = 956
+        Top = 0
+        Width = 1514
+        Align = alClient
+        ReadOnly = True
+        ScrollBars = ssAutoBoth
+        TabOrder = 0
+      end
+    end
+    object TabSheet4: TTabSheet
+      Caption = 'List 2'
+      ClientHeight = 956
+      ClientWidth = 1514
+      object Memo4: TMemo
+        Left = 0
+        Height = 956
+        Top = 0
+        Width = 1514
+        Align = alClient
+        ReadOnly = True
+        ScrollBars = ssAutoBoth
+        TabOrder = 0
+      end
+    end
   end
 end

trunk/UFormCompare.pas

@@ -16 +16 @@
     Memo1: TMemo;
     Memo2: TMemo;
+    Memo3: TMemo;
+    Memo4: TMemo;
     PageControl1: TPageControl;
     TabSheet1: TTabSheet;
     TabSheet2: TTabSheet;
+    TabSheet3: TTabSheet;
+    TabSheet4: TTabSheet;
   private
     { private declarations }

trunk/UFormMain.lfm

@@ -158 +158 @@
       object MenuItem10: TMenuItem
         Action = AExit
+      end
+    end
+    object MenuItemArch: TMenuItem
+      Caption = 'Architecture'
+      object MenuItem12: TMenuItem
+        Caption = 'New Item14'
       end
     end

trunk/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  ActnList, ComCtrls, StdCtrls, UKConfig, ULastOpenedList, URegistry, MyRegistry;
+  ActnList, ComCtrls, StdCtrls, UKConfig, ULastOpenedList, URegistry, MyRegistry,
+  UFindFile;
 
 const
@@ -33 +34 @@
     MenuItem1: TMenuItem;
     MenuItem10: TMenuItem;
+    MenuItemArch: TMenuItem;
+    MenuItem12: TMenuItem;
     MenuItemCompareRecent: TMenuItem;
     MenuItem2: TMenuItem;
@@ -72 +75 @@
     procedure OpenDir(Dir: string);
     procedure CompareDir(Dir: string);
+    procedure ReloadArch(Dir: string);
+    procedure MenuItemArchExecute(Sender: TObject);
   public
     AutoOpen: Boolean;
@@ -156 +161 @@
     FormCompare.Memo1.Lines.Assign(Missing1);
     FormCompare.Memo2.Lines.Assign(Missing2);
+    FormCompare.Memo3.Lines.Assign(List1);
+    FormCompare.Memo4.Lines.Assign(List2);
     FormCompare.Show;
   finally
@@ -163 +170 @@
     List1.Free;
     List2.Free;
+  end;
+end;
+
+procedure TFormMain.ReloadArch(Dir: string);
+var
+  FindFile: TFindFile;
+  List: TStringList;
+  I: Integer;
+  NewMenuItem: TMenuItem;
+  DirName: string;
+begin
+  try
+    FindFile := TFindFile.Create(nil);
+    FindFile.FileAttr := [ffaDirectory];
+    FindFile.Path := Dir;
+    FindFile.FileMask := '*';
+    List := FindFile.SearchForFiles;
+    MenuItemArch.Clear;
+    for I := 0 to List.Count - 1 do begin
+      DirName := ExtractFileName(List[I]);
+      if (DirName <> '..') and (DirName <> '.') and
+        FileExists(List[I] + DirectorySeparator + 'Kconfig') then begin
+        NewMenuItem := TMenuItem.Create(MenuItemArch);
+        NewMenuItem.Caption := DirName;
+        NewMenuItem.OnClick := MenuItemArchExecute;
+        if Config.Arch = DirName then NewMenuItem.Checked := True;
+        MenuItemArch.Add(NewMenuItem);
+      end;
+    end;
+  finally
+    FindFile.Free;
+  end
+end;
+
+procedure TFormMain.MenuItemArchExecute(Sender: TObject);
+begin
+  if Sender is TMenuItem then begin
+    Config.Arch := TMenuItem(Sender).Caption;
+    Reload;
   end;
 end;
@@ -178 +224 @@
     TreeView1.TopItem.Expanded := True;
     StatusBar1.Panels[0].Text := 'Count: ' + IntToStr(Config.TopNode.GetCount);
+    ReloadArch(Config.BaseDir + DirectorySeparator + 'arch');
   end else begin
     StatusBar1.Panels[0].Text := '';

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;