Transaction log dialogs -> turn into popup panels

Former-commit-id: 31a08bfd

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/PendingTransactionsDialog.java

@@ -48,8 +48,8 @@ public class PendingTransactionsDialog extends TransactionInfoDialog {
     private Button commitButton;
     private Button rollbackButton;
 
-    public PendingTransactionsDialog(Shell parentShell, IWorkbenchPart activePart) {
-        super(parentShell, activePart);
+    private PendingTransactionsDialog(Shell parentShell, IWorkbenchPart activePart) {
+        super(parentShell, "Pending transactions", activePart);
     }
 
     @Override
@@ -70,8 +70,6 @@ public class PendingTransactionsDialog extends TransactionInfoDialog {
     @Override
     protected Control createDialogArea(Composite parent)
     {
-        getShell().setText("Pending transactions");
-
         Composite composite = (Composite) super.createDialogArea(parent);
 
         contextTree = new Tree(composite, SWT.FULL_SELECTION | SWT.BORDER);
@@ -100,6 +98,8 @@ public class PendingTransactionsDialog extends TransactionInfoDialog {
             }
         });
 
+        closeOnFocusLost(contextTree);
+
         {
             Composite controlPanel = UIUtils.createPlaceholder(composite, 3, 5);
             controlPanel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -129,6 +129,8 @@ public class PendingTransactionsDialog extends TransactionInfoDialog {
                     endTransaction(false);
                 }
             });
+
+            closeOnFocusLost(showAllCheck, commitButton, rollbackButton);
         }
 
         super.createTransactionLogPanel(composite);
@@ -206,6 +208,7 @@ public class PendingTransactionsDialog extends TransactionInfoDialog {
                 "No active part.");
         } else {
             final PendingTransactionsDialog dialog = new PendingTransactionsDialog(shell, activePart);
+            dialog.setModeless(true);
             dialog.open();
         }
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/TransactionInfoDialog.java

@@ -16,7 +16,6 @@
  */
 package org.jkiss.dbeaver.ui.controls.txn;
 
-import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -36,9 +35,10 @@ import org.jkiss.dbeaver.model.qm.meta.QMMStatementExecuteInfo;
 import org.jkiss.dbeaver.model.qm.meta.QMMTransactionSavepointInfo;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.querylog.QueryLogViewer;
+import org.jkiss.dbeaver.ui.dialogs.AbstractPopupPanel;
 import org.jkiss.utils.CommonUtils;
 
-public abstract class TransactionInfoDialog extends Dialog {
+public abstract class TransactionInfoDialog extends AbstractPopupPanel {
 
     private static final QMEventFilter VOID_FILTER = event -> false;
 
@@ -48,9 +48,9 @@ public abstract class TransactionInfoDialog extends Dialog {
     private Button showAllCheck;
     protected Button showPreviousCheck;
 
-    public TransactionInfoDialog(Shell parentShell, IWorkbenchPart activeEditor)
+    TransactionInfoDialog(Shell parentShell, String title, IWorkbenchPart activeEditor)
     {
-        super(parentShell);
+        super(parentShell, title);
         this.activeEditor = activeEditor;
     }
 
@@ -87,6 +87,7 @@ public abstract class TransactionInfoDialog extends Dialog {
             }
         });
 
+        closeOnFocusLost(logViewer.getSearchText(), logViewer.getControl(), showAllCheck, showPreviousCheck);
     }
 
     protected void updateTransactionFilter() {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/TransactionLogDialog.java

@@ -35,9 +35,11 @@ public class TransactionLogDialog extends TransactionInfoDialog {
     private final DBCExecutionContext context;
     private final boolean showPreviousTxn;
 
-    public TransactionLogDialog(Shell parentShell, DBCExecutionContext context, IWorkbenchPart activeEditor, boolean showPreviousTxn)
+    private TransactionLogDialog(Shell parentShell, DBCExecutionContext context, IWorkbenchPart activeEditor, boolean showPreviousTxn)
     {
-        super(parentShell, activeEditor);
+        super(parentShell,
+            NLS.bind(CoreMessages.transaction_log_dialog_header_transaction_log, context.getDataSource().getContainer().getName(), context.getContextName()),
+            activeEditor);
         this.context = context;
         this.showPreviousTxn = showPreviousTxn;
     }
@@ -60,8 +62,6 @@ public class TransactionLogDialog extends TransactionInfoDialog {
     @Override
     protected Control createDialogArea(Composite parent)
     {
-        getShell().setText(NLS.bind(CoreMessages.transaction_log_dialog_header_transaction_log, context.getDataSource().getContainer().getName(), context.getContextName())); //$NON-NLS-2$ //$NON-NLS-3$
-
         Composite composite = (Composite) super.createDialogArea(parent);
 
         super.createTransactionLogPanel(composite);
@@ -88,6 +88,7 @@ public class TransactionLogDialog extends TransactionInfoDialog {
                 CoreMessages.transaction_log_dialog_error_connect_to_a_database);
         } else {
             final TransactionLogDialog dialog = new TransactionLogDialog(shell, executionContext, activeEditor, showPreviousTxn);
+            dialog.setModeless(true);
             dialog.open();
         }
     }