Changeset 16

Timestamp:

Jan 8, 2016, 5:09:58 PM (9 years ago)

Author:

chronos

Message:

• Added: Preparation for filtering of non visible nodes.

Location:

trunk

Files:

• LinuxBuilder.lpi (modified) (7 diffs)
• UFormList.lfm (modified) (3 diffs)
• UFormList.pas (modified) (4 diffs)
• UFormMain.lfm (modified) (6 diffs)
• UFormMain.pas (modified) (5 diffs)
• UKConfig.pas (modified) (7 diffs)

trunk/LinuxBuilder.lpi

@@ -49 +49 @@
         <Filename Value="LinuxBuilder.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="LinuxBuilder"/>
       </Unit0>
       <Unit1>
@@ -57 +56 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormMain"/>
       </Unit1>
       <Unit2>
         <Filename Value="UKConfig.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UKConfig"/>
       </Unit2>
       <Unit3>
@@ -70 +67 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormList"/>
       </Unit3>
       <Unit4>
@@ -78 +74 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormLog"/>
       </Unit4>
       <Unit5>
@@ -86 +81 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormCompare"/>
       </Unit5>
       <Unit6>
@@ -94 +88 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormSearch"/>
       </Unit6>
     </Units>
@@ -132 +125 @@
       </Options>
     </Linking>
-    <Other>
-      <CompilerMessages>
-        <MsgFileName Value=""/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>

trunk/UFormList.lfm

@@ -1 +1 @@
 object FormList: TFormList
-  Left = 327
+  Left = 94
   Height = 1193
-  Top = 34
+  Top = 0
   Width = 1528
-  Caption = 'FormList'
+  Caption = 'Options list'
   ClientHeight = 1193
   ClientWidth = 1528
@@ -11 +11 @@
   object Memo1: TMemo
     Left = 8
-    Height = 1152
-    Top = 8
+    Height = 1128
+    Top = 32
     Width = 1510
     ReadOnly = True
@@ -26 +26 @@
     ParentColor = False
   end
+  object CheckBoxAccessible: TCheckBox
+    Left = 12
+    Height = 24
+    Top = 4
+    Width = 146
+    Caption = 'Only accessible'
+    TabOrder = 1
+  end
 end

trunk/UFormList.pas

@@ -13 +13 @@
 
   TFormList = class(TForm)
+    CheckBoxAccessible: TCheckBox;
     Label1: TLabel;
     Memo1: TMemo;
@@ -28 +29 @@
 
 uses
-  UFormMain;
+  UFormMain, UKConfig;
 
 {$R *.lfm}
@@ -37 +38 @@
 var
   List: TStringList;
+  I: Integer;
 begin
   try
@@ -43 +45 @@
     Memo1.Lines.Clear;
     FormMain.Config.TopNode.SaveToList(List);
+    if CheckBoxAccessible.Checked then
+    for I := List.Count - 1 to 0 do
+      if not TMenuNode(List.Objects[I]).CanBeVisible then
+        List.Delete(I);
     List.Sort;
     Memo1.Lines.Assign(List);

trunk/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 703
+  Left = 596
   Height = 587
-  Top = 236
+  Top = 245
   Width = 857
   ActiveControl = TreeView1
   Caption = 'LinuxBuilder'
-  ClientHeight = 561
+  ClientHeight = 557
   ClientWidth = 857
   Menu = MainMenu1
@@ -13 +13 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.3'
+  LCLVersion = '1.7'
   WindowState = wsMaximized
   object TreeView1: TTreeView
     Left = 8
-    Height = 504
+    Height = 500
     Top = 0
     Width = 520
@@ -32 +32 @@
     Left = 0
     Height = 26
-    Top = 535
+    Top = 531
     Width = 857
     Panels = <    
@@ -46 +46 @@
     Left = 0
     Height = 26
-    Top = 509
+    Top = 505
     Width = 857
     Align = alBottom
@@ -90 +90 @@
   object Memo1: TMemo
     Left = 536
-    Height = 498
+    Height = 494
     Top = 0
     Width = 312
@@ -162 +162 @@
     object MenuItemArch: TMenuItem
       Caption = 'Architecture'
-      object MenuItem12: TMenuItem
-        Caption = 'New Item14'
-      end
     end
     object MenuItem2: TMenuItem

trunk/UFormMain.pas

@@ -35 +35 @@
     MenuItem10: TMenuItem;
     MenuItemArch: TMenuItem;
-    MenuItem12: TMenuItem;
     MenuItemCompareRecent: TMenuItem;
     MenuItem2: TMenuItem;
@@ -81 +80 @@
     Config: TConfigMenu;
     procedure Reload;
+    procedure UpdateInterface;
     procedure FocusTreeNode(Node: TMenuNode);
   end;
@@ -137 +137 @@
   LastOpenedListOpen.AddItem(Dir);
   Reload;
+  UpdateInterface;
 end;
 
@@ -230 +231 @@
 end;
 
+procedure TFormMain.UpdateInterface;
+begin
+  Caption :=  Config.BaseDir + ' - ' + Application.Title;
+end;
+
 procedure TFormMain.FocusTreeNode(Node: TMenuNode);
 var
@@ -274 +280 @@
 procedure TFormMain.AExitExecute(Sender: TObject);
 begin
-  Application.Terminate;
+  FormMain.Close;
 end;
 

trunk/UKConfig.pas

@@ -33 +33 @@
     Parent: TExpression;
     function Show: String; virtual;
+    function CanBeTrue: Boolean; virtual;
     procedure GetList(List: TStringList); virtual;
     constructor Create; virtual;
@@ -44 +45 @@
   TExpressionVar = class(TExpression)
     Name: string;
-    Node: TMenuNode;
+    //Node: TMenuNode;
     Negative: Boolean;
     Compare: TCompareType;
     Value: string;
+    function CompareValue: Boolean;
+    function CanBeTrue: Boolean; override;
     constructor Create; override;
     procedure GetList(List: TStringList); override;
@@ -88 +91 @@
     function GetTopNode: TMenuNode; virtual;
     function FindNode(ID: string): TMenuNode; virtual;
+    function CanBeVisible: Boolean;
     property Visible: Boolean read GetVisible;
   end;
@@ -138 +142 @@
 { TExpressionVar }
 
+function TExpressionVar.CompareValue: Boolean;
+begin
+
+end;
+
+function TExpressionVar.CanBeTrue: Boolean;
+begin
+  if Compare = ctNone then begin
+
+  end else
+  if Compare = ctEqual then begin
+    Result := Result and CompareValue;
+  end else
+  if Compare = ctNotEqual then begin
+    Result := Result and not CompareValue;
+  end;
+//  Result := Node.CanBeVisible;
+end;
+
 constructor TExpressionVar.Create;
 begin
@@ -176 +199 @@
   end;
   if Assigned(Parent) then Result := '(' + Result + ')';
+end;
+
+function TExpression.CanBeTrue: Boolean;
+var
+  I: Integer;
+begin
+  if ExpOperator = eoAnd then begin
+    Result := True;
+    for I := 0 to Items.Count - 1 do
+      Result := Result and TExpression(Items[I]).CanBeTrue;
+  end else
+  if ExpOperator = eoOr then begin
+    Result := False;
+    for I := 0 to Items.Count - 1 do
+      Result := Result or TExpression(Items[I]).CanBeTrue;
+  end;
 end;
 
@@ -320 +359 @@
   I: Integer;
 begin
-  if ID <> '' then List.Add(ID);
+  if ID <> '' then List.AddObject(ID, Self);
   for I := 0 to Items.Count - 1 do
   with TMenuNode(Items[I]) do begin
@@ -403 +442 @@
     end;
   end;
+end;
+
+function TMenuNode.CanBeVisible: Boolean;
+begin
+  // TODO
+  // Check if it can be selected manually if manual option
+  // Check if it can be selected automatically by other option
+
 end;