docview: Implements the Bookmark Maintenance form.

We can now Jump To bookmark, rename bookmarks, delete bookmarks etc.

1 files changed, 19 insertions, 31 deletions

diff --git a/docview/src/frm_main.pas b/docview/src/frm_main.pas
index 0463c69a..42d8fa73 100644
--- a/docview/src/frm_main.pas
+++ b/docview/src/frm_main.pas
@@ -132,6 +132,7 @@ type
     procedure   miConfigureClicked(Sender: TObject);
     procedure   miViewExpandAllClicked(Sender: TObject);
     procedure   miViewCollapseAllClicked(Sender: TObject);
+    procedure   miOpenBookmarksMenuClicked(Sender: TObject);
     procedure   miBookmarksMenuItemClicked(Sender: TObject);
     procedure   miHelpProdInfoClicked(Sender: TObject);
     procedure   miHelpAboutFPGui(Sender: TObject);
@@ -234,7 +235,6 @@ type
     procedure   ClearBookmarks;
     procedure   OnBookmarksChanged(Sender: TObject);
     procedure   BuildBookmarksMenu;
-    procedure   UpdateBookmarksDisplay;
     procedure   NavigateToBookmark(Bookmark: TBookmark);
   public
     constructor Create(AOwner: TComponent); override;
@@ -265,6 +265,7 @@ uses
   ,frm_configuration
   ,frm_text
   ,frm_note
+  ,frm_bookmarks
   ,CanvasFontManager
   ,HelpNote
   ,RichTextDocumentUnit
@@ -621,6 +622,21 @@ begin
   tvContents.FullCollapse;
 end;
 
+procedure TMainForm.miOpenBookmarksMenuClicked(Sender: TObject);
+var
+  frm: TBookmarksForm;
+begin
+  frm := TBookmarksForm.Create(nil);
+  try
+    frm.BookmarkList := Bookmarks;
+    frm.OnGotoBookmark := @NavigateToBookmark;
+    frm.OnBookmarksChanged := @OnBookmarksChanged;
+    frm.ShowModal;
+  finally
+    frm.Free;
+  end;
+end;
+
 procedure TMainForm.miBookmarksMenuItemClicked(Sender: TObject);
 var
   t: PtrInt;
@@ -3130,8 +3146,8 @@ begin
   begin
     Name := 'miBookmarks';
     SetPosition(292, 144, 132, 20);
-    AddMenuItem('Add..', '', nil).Enabled := False;
-    AddMenuItem('Show', '', nil).Enabled := False;
+    AddMenuItem('Add', '', @btnBookmarkClick);
+    AddMenuItem('Show...', '', @miOpenBookmarksMenuClicked);
   end;
 
   miView := TfpgPopupMenu.Create(self);
@@ -3870,7 +3886,6 @@ end;
 procedure TMainForm.OnBookmarksChanged(Sender: TObject);
 begin
   BuildBookmarksMenu;
-//  UpdateBookmarksForm;
   SaveBookmarks;
 end;
 
@@ -3898,33 +3913,6 @@ begin
   end;
 end;
 
-procedure TMainForm.UpdateBookmarksDisplay;
-var
-  i: integer;
-  Bookmark: TBookmark;
-Begin
-(*
-  BookmarksListBox.Items.BeginUpdate;
-  BookmarksListBox.Clear;
-
-  if not Assigned( BookmarkList ) then
-    exit;
-
-  for i := 0 to BookmarkList.Count - 1 do
-  begin
-    Bookmark := BookmarkList[ i ];
-    BookmarksListBox.Items.AddObject( Bookmark.Name,
-                                      Bookmark );
-  end;
-
-  if BookmarksListBox.Items.Count > 0 then
-    BookmarksListBox.ItemIndex := 0;
-
-  BookmarksListBox.Items.EndUpdate;
-  UpdateControls;
-*)
-end;
-
 procedure TMainForm.NavigateToBookmark(Bookmark: TBookmark);
 begin
   DisplayTopic(Bookmark.ContentsTopic);