Changeset 12 for trunk/UFormMain.pas

Timestamp:

May 5, 2014, 3:33:31 PM (10 years ago)

Author:

chronos

Message:

• Modified: Fixed project path replaced by directory select dialog and recent list menu.

File:

• trunk/UFormMain.pas (modified) (11 diffs)

trunk/UFormMain.pas

@@ -19 +19 @@
   TFormMain = class(TForm)
     ACompare: TAction;
+    AExit: TAction;
     ASearch: TAction;
     AShowList: TAction;
@@ -26 +27 @@
     ActionList1: TActionList;
     ImageList1: TImageList;
-    LastOpenedList1: TLastOpenedList;
+    LastOpenedListOpen: TLastOpenedList;
+    LastOpenedListCompare: TLastOpenedList;
     MainMenu1: TMainMenu;
     Memo1: TMemo;
     MenuItem1: TMenuItem;
     MenuItem10: TMenuItem;
+    MenuItemCompareRecent: TMenuItem;
     MenuItem2: TMenuItem;
     MenuItem3: TMenuItem;
@@ -40 +43 @@
     MenuItem9: TMenuItem;
     MenuItemOpenRecent: TMenuItem;
+    PopupMenuCompareRecent: TPopupMenu;
+    PopupMenuOpenRecent: TPopupMenu;
     StatusBar1: TStatusBar;
     ToolBar1: TToolBar;
@@ -46 +51 @@
     ToolButton3: TToolButton;
     ToolButton4: TToolButton;
+    ToolButton5: TToolButton;
+    ToolButton6: TToolButton;
     TreeView1: TTreeView;
     procedure ACompareExecute(Sender: TObject);
+    procedure AExitExecute(Sender: TObject);
     procedure AOpenDirExecute(Sender: TObject);
     procedure ASearchExecute(Sender: TObject);
@@ -53 +61 @@
     procedure AShowLogExecute(Sender: TObject);
     procedure AViemSystemExecute(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure LastOpenedList1Change(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure LastOpenedListCompareChange(Sender: TObject);
+    procedure LastOpenedListOpenChange(Sender: TObject);
     procedure MenuItemOpenRecentClick(Sender: TObject);
     procedure TreeView1SelectionChanged(Sender: TObject);
@@ -63 +72 @@
     procedure DoLog(Text: string);
     procedure OpenDir(Dir: string);
+    procedure CompareDir(Dir: string);
   public
     AutoOpen: Boolean;
@@ -85 +95 @@
 begin
   AutoOpen := True;
-  LastOpenedList1.LoadFromRegistry(RegContext(RootKey, RootPath));
-  if AutoOpen and (LastOpenedList1.Items.Count > 0) then
-    OpenDir(LastOpenedList1.Items[0])
+  LastOpenedListOpen.LoadFromRegistry(RegContext(RootKey, RootPath + '/OpenRecent'));
+  LastOpenedListCompare.LoadFromRegistry(RegContext(RootKey, RootPath + '/CompareRecent'));
+  if AutoOpen and (LastOpenedListOpen.Items.Count > 0) then
+    OpenDir(LastOpenedListOpen.Items[0])
     else Reload;
 end;
 
-procedure TFormMain.LastOpenedList1Change(Sender: TObject);
-begin
-  LastOpenedList1.LoadToMenuItem(MenuItemOpenRecent, AOpenDirExecute);
+procedure TFormMain.LastOpenedListCompareChange(Sender: TObject);
+begin
+  LastOpenedListOpen.LoadToMenuItem(MenuItemCompareRecent, ACompareExecute);
+  LastOpenedListOpen.LoadToMenuItem(PopupMenuCompareRecent.Items, ACompareExecute);
+end;
+
+procedure TFormMain.LastOpenedListOpenChange(Sender: TObject);
+begin
+  LastOpenedListOpen.LoadToMenuItem(MenuItemOpenRecent, AOpenDirExecute);
+  LastOpenedListOpen.LoadToMenuItem(PopupMenuOpenRecent.Items, AOpenDirExecute);
 end;
 
@@ -118 +136 @@
 begin
   Config.LoadFromDir(Dir);
-  LastOpenedList1.AddItem(Dir);
+  LastOpenedListOpen.AddItem(Dir);
   Reload;
 end;
 
-procedure TFormMain.Reload;
-var
-  Options: TLoadTreeOptions;
-begin
-  TreeView1.Items.Clear;
-  if Assigned(Config.TopNode) then begin
-    TreeView1.Items.AddChild(nil, Config.TopNode.GetName);
-    Options := [];
-    if AViemSystem.Checked then Include(Options, toShowSystem);
-    Config.TopNode.LoadTreeNode(TreeView1.TopItem, Options);
-    TreeView1.TopItem.Expanded := True;
-    StatusBar1.Panels[0].Text := 'Count: ' + IntToStr(Config.TopNode.GetCount);
-  end else begin
-    StatusBar1.Panels[0].Text := '';
-  end;
-end;
-
-procedure TFormMain.FocusTreeNode(Node: TMenuNode);
-var
-  TreeNode: TTreeNode;
-begin
-  TreeNode := TreeView1.Items.FindNodeWithData(Node);
-  if Assigned(TreeNode) then begin
-    TreeNode.Selected := True;
-    TreeNode.ExpandParents;
-  end;
-end;
-
-procedure TFormMain.AOpenDirExecute(Sender: TObject);
-var
-  OutDir: string;
-begin
-  if Sender is TMenuItem then begin
-    OpenDir(TMenuItem(Sender).Caption);
-  end;
-  if SelectDirectory('Select Linux source directory', Config.BaseDir, OutDir) then begin
-    OpenDir(OutDir);
-  end;
-end;
-
-procedure TFormMain.ASearchExecute(Sender: TObject);
-begin
-  FormSearch.Show;
-end;
-
-procedure TFormMain.ACompareExecute(Sender: TObject);
+procedure TFormMain.CompareDir(Dir: string);
 var
   List1, List2: TStringList;
@@ -180 +153 @@
     Config2 := TConfigMenu.Create;
     Config.TopNode.SaveToList(List1);
-    Config2.LoadFromDir('/opt/elinos-D6.0/linux/linux-p4-3.0/');
+    Config2.LoadFromDir(Dir);
     Config2.TopNode.SaveToList(List2);
     Config.CompareStringLists(List1, List2, Missing1, Missing2);
@@ -199 +172 @@
 end;
 
+procedure TFormMain.Reload;
+var
+  Options: TLoadTreeOptions;
+begin
+  TreeView1.Items.Clear;
+  if Assigned(Config.TopNode) then begin
+    TreeView1.Items.AddChild(nil, Config.TopNode.GetName);
+    Options := [];
+    if AViemSystem.Checked then Include(Options, toShowSystem);
+    Config.TopNode.LoadTreeNode(TreeView1.TopItem, Options);
+    TreeView1.TopItem.Expanded := True;
+    StatusBar1.Panels[0].Text := 'Count: ' + IntToStr(Config.TopNode.GetCount);
+  end else begin
+    StatusBar1.Panels[0].Text := '';
+  end;
+end;
+
+procedure TFormMain.FocusTreeNode(Node: TMenuNode);
+var
+  TreeNode: TTreeNode;
+begin
+  TreeNode := TreeView1.Items.FindNodeWithData(Node);
+  if Assigned(TreeNode) then begin
+    TreeNode.Selected := True;
+    TreeNode.ExpandParents;
+  end;
+end;
+
+procedure TFormMain.AOpenDirExecute(Sender: TObject);
+var
+  OutDir: string;
+begin
+  if Sender is TMenuItem then begin
+    OpenDir(TMenuItem(Sender).Caption);
+  end else begin
+    if SelectDirectory('Select Linux source directory', Config.BaseDir, OutDir) then begin
+      OpenDir(OutDir);
+    end;
+  end;
+end;
+
+procedure TFormMain.ASearchExecute(Sender: TObject);
+begin
+  FormSearch.Show;
+end;
+
+procedure TFormMain.ACompareExecute(Sender: TObject);
+var
+  OutDir: string;
+begin
+  if Sender is TMenuItem then begin
+    CompareDir(TMenuItem(Sender).Caption);
+  end else begin
+    if SelectDirectory('Select Linux source directory for compare', Config.BaseDir, OutDir) then begin
+      CompareDir(OutDir);
+    end;
+  end;
+end;
+
+procedure TFormMain.AExitExecute(Sender: TObject);
+begin
+  Application.Terminate;
+end;
+
 procedure TFormMain.AShowListExecute(Sender: TObject);
 begin
@@ -217 +254 @@
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  LastOpenedList1.SaveToRegistry(RegContext(RootKey, RootPath));
+  LastOpenedListOpen.SaveToRegistry(RegContext(RootKey, RootPath + '/OpenRecent'));
+  LastOpenedListCompare.SaveToRegistry(RegContext(RootKey, RootPath + '/CompareRecent'));
 end;