relates to #153 and #141, help notes no longer modal and better sync mode support

Author: David Bannon

po/tomboy-ng.es.po

@@ -283,10 +283,20 @@ msgctxt "resourcestr.rscannotfindnote"
 msgid "ERROR, cannot find "
 msgstr "ERROR: no se encuentra "
 
+#: resourcestr.rschangefilesync
+#, fuzzy
+msgctxt "resourcestr.rschangefilesync"
+msgid "Change File Sync Repo"
+msgstr "Cambiar repositorio de sincronización"
+
 #: resourcestr.rschangenameofnotebook
 msgid "Change the name of this Notebook"
 msgstr "Cambiar el nombre de este cuaderno"
 
+#: resourcestr.rschangenetsync
+msgid "Change Net Sync Repo"
+msgstr ""
+
 #: resourcestr.rscreatenewrepo
 msgctxt "resourcestr.rscreatenewrepo"
 msgid "Create a new Repo ?"
@@ -1484,6 +1494,7 @@ msgid "Set Spell Library"
 msgstr "Establecer Biblioteca Ortográfica"
 
 #: tsett.buttonsetsynserver.caption
+msgctxt "tsett.buttonsetsynserver.caption"
 msgid "Change File Sync Repo"
 msgstr "Cambiar repositorio de sincronización"
 
@@ -1652,6 +1663,10 @@ msgctxt "tsett.labelsnapdir.caption"
 msgid ".... and its not available just yet !"
 msgstr "... y ¡no está disponible en este momento!"
 
+#: tsett.labelsyncurl.caption
+msgid "LabelSyncURL"
+msgstr ""
+
 #: tsett.menufriday.caption
 msgid "Friday"
 msgstr "Viernes"

po/tomboy-ng.nl.po

@@ -283,10 +283,20 @@ msgctxt "resourcestr.rscannotfindnote"
 msgid "ERROR, cannot find "
 msgstr ""
 
+#: resourcestr.rschangefilesync
+#, fuzzy
+msgctxt "resourcestr.rschangefilesync"
+msgid "Change File Sync Repo"
+msgstr "Bestandssynchronisatie aanpassen"
+
 #: resourcestr.rschangenameofnotebook
 msgid "Change the name of this Notebook"
 msgstr ""
 
+#: resourcestr.rschangenetsync
+msgid "Change Net Sync Repo"
+msgstr ""
+
 #: resourcestr.rscreatenewrepo
 #, fuzzy
 msgctxt "resourcestr.rscreatenewrepo"
@@ -1487,6 +1497,7 @@ msgid "Set Spell Library"
 msgstr "Spellingcontrolebiblotheek instellen"
 
 #: tsett.buttonsetsynserver.caption
+msgctxt "tsett.buttonsetsynserver.caption"
 msgid "Change File Sync Repo"
 msgstr "Bestandssynchronisatie aanpassen"
 
@@ -1648,6 +1659,10 @@ msgstr "Een momentopname is een kopie van je huidige notitiemap."
 msgid ".... and its not available just yet !"
 msgstr "... en is nog niet beschikbaar!"
 
+#: tsett.labelsyncurl.caption
+msgid "LabelSyncURL"
+msgstr ""
+
 #: tsett.menufriday.caption
 msgid "Friday"
 msgstr "vrijdag"

po/tomboy-ng.po

@@ -261,10 +261,19 @@ msgctxt "resourcestr.rscannotfindnote"
 msgid "ERROR, cannot find "
 msgstr ""
 
+#: resourcestr.rschangefilesync
+msgctxt "resourcestr.rschangefilesync"
+msgid "Change File Sync Repo"
+msgstr ""
+
 #: resourcestr.rschangenameofnotebook
 msgid "Change the name of this Notebook"
 msgstr ""
 
+#: resourcestr.rschangenetsync
+msgid "Change Net Sync Repo"
+msgstr ""
+
 #: resourcestr.rscreatenewrepo
 msgctxt "resourcestr.rscreatenewrepo"
 msgid "Create a new Repo ?"
@@ -1431,6 +1440,7 @@ msgid "Set Spell Library"
 msgstr ""
 
 #: tsett.buttonsetsynserver.caption
+msgctxt "tsett.buttonsetsynserver.caption"
 msgid "Change File Sync Repo"
 msgstr ""
 
@@ -1589,6 +1599,10 @@ msgstr ""
 msgid ".... and its not available just yet !"
 msgstr ""
 
+#: tsett.labelsyncurl.caption
+msgid "LabelSyncURL"
+msgstr ""
+
 #: tsett.menufriday.caption
 msgid "Friday"
 msgstr ""

tomboy-ng/mainunit.pas

@@ -63,6 +63,7 @@
     2019/12/11  Heavily restructured Startup, Main Menu everywhere !
     2019/12/20  Added option --delay-start for when desktop is slow to determine its (dark) colours
     2020/03/30  Allow user to set display colours.
+    2020/04/10  Make help files non modal
 
     CommandLine Switches
 
@@ -110,6 +111,9 @@ interface
 // These are the possible kinds of main menu items
 // type TMenuKind = (mkFileMenu, mkRecentMenu, mkHelpMenu);
 
+
+
+
 type
 
     { TMainForm }
@@ -155,6 +159,7 @@     TMainForm = class(TForm)
         procedure TrayIconClick(Sender: TObject);
         procedure TrayMenuTomdroidClick(Sender: TObject);
     private
+        HelpList : TStringList;
         CommsClient : TSimpleIPCClient;
         CommsServer : TSimpleIPCServer;
         // Don't assign if desktop is KDE and Qt5, it stuffs up in November 2019
@@ -280,13 +285,52 @@ procedure TMainForm.SingleNoteMode(FullFileName : string; const CloseOnExit, Vie
     if CloseOnExit then Close;      // we also use singlenotemode internally in several places
 end;
 
+
 // ---------------- HELP NOTES STUFF ------------------
 
 procedure TMainForm.ShowHelpNote(HelpNoteName: string);
+var
+    EBox : TEditBoxForm;
+    TheForm : TForm;
+    Index : integer;
 begin
-    if FileExists(ActualHelpNotesPath() + HelpNoteName) then
-       SingleNoteMode(ActualHelpNotesPath() + HelpNoteName, False, True)
-    else showmessage('Unable to find ' + HelpNotesPath + HelpNoteName);
+    if FileExists(ActualHelpNotesPath() + HelpNoteName) then begin
+        If HelpList = nil then
+            HelpList := TStringList.Create
+        else begin
+            if HelpList.Find(HelpNoteName, Index) then begin
+                // Bring TForm(HelpList.Objects[Index]) to front
+                TheForm := TForm(HelpList.Objects[Index]);
+                try
+                    //writeln('Attempting a reshow');
+          	        TheForm.Show;
+                    SearchForm.MoveWindowHere(TheForm.Caption);
+                    TheForm.EnsureVisible(true);
+                    exit;
+				except on E: Exception do {showmessage(E.Message)};
+                // If user had this help page open but then closed it entry is still in
+                // list so we catch the exception, ignore it and upen a new note.
+                // its pretty ugly under debugger but user does not see this.
+				end;
+			end;
+		end;
+        // If we did not find it in the list and exit, above, we will make a new one.
+        //SingleNoteMode(ActualHelpNotesPath() + HelpNoteName, False, True)
+        EBox := TEditBoxForm.Create(Application);
+        EBox.SetReadOnly(False);
+        EBox.SearchedTerm := '';
+        EBox.NoteTitle:= '';
+        EBox.NoteFileName := ActualHelpNotesPath() + HelpNoteName;
+        Ebox.TemplateIs := '';
+        EBox.Show;
+        EBox.Dirty := False;
+        writeln('Adding to list');
+        HelpList.AddObject(HelpNoteName, EBox);
+        HelpList.Sort;
+        //showmessage('List is sorted ' + booltostr(HelpList.Sorted, true));
+        HelpList.Sorted:=True;
+
+    end else showmessage('Unable to find ' + HelpNotesPath + HelpNoteName);
 end;
 
 function TMainForm.ActualHelpNotesPath(): string;
@@ -399,6 +443,7 @@ function TMainForm.HaveCMDParam() : boolean;
 
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
+    HelpList := Nil;
     if Application.HasOption('delay-start') then   // This to allow eg Enlightenment to decide its colours.
         sleep(2000);
     AssignPopupToTray := True;
@@ -452,6 +497,8 @@ procedure TMainForm.FormDestroy(Sender: TObject);
 begin
     freeandnil(CommsServer);
     freeandnil(HelpNotes);
+    //if HelpList <> Nil then writeln('Help List has ' + inttostr(HelpList.Count));
+    freeandnil(HelpList);
 end;
 
 procedure TMainForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);

tomboy-ng/resourcestr.pas

@@ -58,6 +58,13 @@ interface
   rsSyncError = 'A Sync Error occured';
   rsLastSync = 'Last Sync';     // Followed by a date and simplified sync report
 
+
+// Settings but only part ...
+
+  rsChangeNetSync = 'Change Net Sync Repo';          // These are labels on the button used to set sync repo
+  rsChangeFileSync = 'Change File Sync Repo';
+
+
 implementation
 
 end.

tomboy-ng/settings.lfm

@@ -1,7 +1,7 @@
 object Sett: TSett
-  Left = 483
+  Left = 1230
   Height = 525
-  Top = 220
+  Top = 184
   Width = 630
   BorderIcons = []
   Caption = 'tomboy-ng Settings'
@@ -451,14 +451,16 @@ object Sett: TSett
         ParentFont = False
       end
       object GroupBoxSyncType: TGroupBox
+        AnchorSideLeft.Control = GroupBox4
+        AnchorSideLeft.Side = asrCenter
         AnchorSideRight.Control = GroupBox4
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = GroupBox4
         Left = 432
         Height = 107
         Top = 24
         Width = 185
-        Anchors = [akTop, akLeft, akRight, akBottom]
+        Anchors = [akTop, akRight, akBottom]
         BorderSpacing.Bottom = 4
         Caption = 'Sync Type'
         ClientHeight = 86
@@ -471,6 +473,7 @@ object Sett: TSett
           Width = 90
           Caption = 'Net Sync'
           Checked = True
+          OnChange = RadioNetSyncChange
           TabOrder = 0
         end
         object RadioFileSync: TRadioButton
@@ -479,9 +482,18 @@ object Sett: TSett
           Top = 48
           Width = 89
           Caption = 'File Sync'
+          OnChange = RadioFileSyncChange
           TabOrder = 1
         end
       end
+      object LabelSyncURL: TLabel
+        Left = 7
+        Height = 19
+        Top = 39
+        Width = 100
+        Caption = 'LabelSyncURL'
+        ParentColor = False
+      end
     end
     object TabBackUp: TTabSheet
       Caption = 'BackUp'