fix: refresh session tree after import per More > Import settings file

Refs #2532

Author: ansgarbecker

source/connections.dfm

@@ -140,11 +140,9 @@ object connform: Tconnform
         Top = 184
         Width = 493
         Height = 25
+        Action = MainForm.actImportSettings
         Anchors = [akLeft, akTop, akRight]
-        Caption = 'Import settings ...'
-        ImageIndex = 101
         TabOrder = 0
-        OnClick = btnImportSettingsClick
       end
     end
     object tabSettings: TTabSheet

source/connections.pas

@@ -175,7 +175,6 @@   Tconnform = class(TExtForm)
       var NodeDataSize: Integer);
     procedure comboNetTypeChange(Sender: TObject);
     procedure splitterMainMoved(Sender: TObject);
-    procedure btnImportSettingsClick(Sender: TObject);
     procedure timerSettingsImportTimer(Sender: TObject);
     procedure ListSessionsStructureChange(Sender: TBaseVirtualTree;
       Node: PVirtualNode; Reason: TChangeReason);
@@ -238,6 +237,8 @@   Tconnform = class(TExtForm)
     { Public declarations }
   end;
 
+var
+  connform: Tconnform;
 
 implementation
 
@@ -296,6 +297,7 @@ procedure Tconnform.FormCreate(Sender: TObject);
   btnImportSettings.Caption := MainForm.actImportSettings.Caption;
   FLoaded := False;
   menuFoldersAtTop.Checked := AppSettings.ReadBool(asSessionManagerListFoldersAtTop);
+  FSettingsImportWaitTime := 0;
 
   comboNetType.Clear;
   Params := TConnectionParameters.Create;
@@ -588,22 +590,17 @@ procedure Tconnform.btnSaveAsClick(Sender: TObject);
 end;
 
 
-procedure Tconnform.btnImportSettingsClick(Sender: TObject);
-begin
-  MainForm.actImportSettings.Execute;
-  FSettingsImportWaitTime := 0;
-  timerSettingsImport.Enabled := MainForm.ImportSettingsDone;
-end;
-
-
 procedure Tconnform.timerSettingsImportTimer(Sender: TObject);
 begin
   Inc(FSettingsImportWaitTime, timerSettingsImport.Interval);
   RefreshSessions(nil);
-  if ListSessions.RootNodeCount > 0 then
+  if ListSessions.RootNodeCount > 0 then begin
     timerSettingsImport.Enabled := False;
+    FSettingsImportWaitTime := 0;
+  end;
   if FSettingsImportWaitTime >= 10000 then begin
     timerSettingsImport.Enabled := False;
+    FSettingsImportWaitTime := 0;
     MessageDialog(f_('Imported sessions could not be detected. Restarting %s may solve that.', [APPNAME]), mtWarning, [mbOK]);
   end;
 end;

source/main.pas

@@ -1335,7 +1335,6 @@   TMainForm = class(TExtForm)
     QueryTabs: TQueryTabList;
     ActiveObjectEditor: TDBObjectEditor;
     FileEncodings: TStringList;
-    ImportSettingsDone: Boolean;
 
     // Data grid related stuff
     DataGridHiddenColumns: TStringList;
@@ -2234,7 +2233,6 @@ procedure TMainForm.AfterFormCreate;
   StatsCall: THttpDownload;
   SessionPaths: TStringlist;
   DlgResult: TModalResult;
-  SessionManager: TConnForm;
 begin
   if AppSettings.ReadBool(asUpdatecheck) then begin
     // Do an updatecheck if checked in settings
@@ -2347,11 +2345,11 @@ procedure TMainForm.AfterFormCreate;
   // Display session manager
   if Connections.Count = 0 then begin
     // Cannot be done in OnCreate because we need ready forms here:
-    SessionManager := TConnForm.Create(Self);
+    connform := TConnForm.Create(Self);
     DlgResult := mrCancel;
     try
-      DlgResult := SessionManager.ShowModal;
-      SessionManager.Free;
+      DlgResult := connform.ShowModal;
+      FreeAndNil(connform);
     except
       // Work around VCL bug: Suppress access violation in TCustomForm.IsFormSizeStored
       // when closing dialog via Alt+F4
@@ -2637,12 +2635,10 @@ procedure TMainForm.TimerStoreTabsTimer(Sender: TObject);
 
 
 procedure TMainForm.actSessionManagerExecute(Sender: TObject);
-var
-  Dialog: TConnForm;
 begin
-  Dialog := TConnForm.Create(Self);
-  Dialog.ShowModal;
-  Dialog.Free;
+  connform := TConnForm.Create(Self);
+  connform.ShowModal;
+  FreeAndNil(connform);
 end;
 
 
@@ -2651,7 +2647,6 @@ procedure TMainForm.actDisconnectExecute(Sender: TObject);
   Connection: TDBConnection;
   Node: PVirtualNode;
   DlgResult: Integer;
-  Dialog: TConnForm;
 begin
   // Disconnect active connection. If it's the last, exit application
   Connection := ActiveConnection;
@@ -2662,9 +2657,9 @@ procedure TMainForm.actDisconnectExecute(Sender: TObject);
   // TODO: focus last session?
   SelectNode(DBtree, GetNextNode(DBtree, nil));
   if FConnections.Count = 0 then begin
-    Dialog := TConnForm.Create(Self);
-    DlgResult := Dialog.ShowModal;
-    Dialog.Free;
+    connform := TConnForm.Create(Self);
+    DlgResult := connform.ShowModal;
+    FreeAndNil(connform);
     if DlgResult = mrCancel then
       actExitApplication.Execute;
   end;
@@ -3204,15 +3199,16 @@ procedure TMainForm.actImportSettingsExecute(Sender: TObject);
   Dialog := TOpenDialog.Create(Self);
   Dialog.Title := f_('Import %s settings from file ...', [APPNAME]);
   Dialog.Filter := _('Text files')+' (*.txt)|*.txt|'+_('Registry dump, deprecated')+' (*.reg)|*.reg|'+_('All files')+' (*.*)|*.*';
-  ImportSettingsDone := False;
   if Dialog.Execute then try
     if LowerCase(ExtractFileExt(Dialog.FileName)) = 'reg' then
       ShellExec('regedit.exe', '', '"'+Dialog.FileName+'"')
-    else begin
+    else
       AppSettings.ImportSettings(Dialog.FileName);
-      MessageDialog(f_('Settings successfully restored from %s', [Dialog.FileName]), mtInformation, [mbOK]);
+    // Refresh in session manager per timer interval
+    if Assigned(connform) then begin
+      connform.timerSettingsImport.Enabled := True;
     end;
-    ImportSettingsDone := True;
+    MessageDialog(f_('Settings successfully restored from %s', [Dialog.FileName]), mtInformation, [mbOK]);
   except
     on E:Exception do
       ErrorDialog(E.Message);