previewpanel is deprecated, refactored to use native pdf view

anti43 · Sep 17, 2018 · 45c4e92 · 45c4e92
1 parent 94a6706
commit 45c4e92
Show file tree

Hide file tree

Showing 9 changed files with 172 additions and 531 deletions.
diff --git a/src/mpv5/ui/dialogs/subcomponents/ControlPanel_Reminder.java b/src/mpv5/ui/dialogs/subcomponents/ControlPanel_Reminder.java
@@ -25,16 +25,12 @@
 import mpv5.data.PropertyStore;
 import mpv5.ui.panels.*;
 import mpv5.handler.TemplateHandler;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+
 import java.io.File;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.DefaultListModel;
 import mpv5.db.common.Context;
 import mpv5.db.common.DatabaseObject;
@@ -45,12 +41,10 @@
 import mpv5.db.objects.Template;
 import mpv5.globals.Constants;
 import mpv5.globals.Messages;
-import mpv5.handler.FormFieldsHandler;
 import mpv5.logging.Log;
 import mpv5.ui.dialogs.ControlApplet;
 import mpv5.ui.dialogs.DialogForFile;
 import mpv5.ui.dialogs.Popup;
-import mpv5.ui.frames.MPView;
 import mpv5.utils.export.Export;
 import mpv5.utils.export.Exportable;
 import mpv5.utils.files.FileDirectoryHandler;
@@ -299,7 +293,7 @@ private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
 
         int group = 1;
 
-        PreviewPanel pr;
+        PreviewWaiter pr;
         if (dataOwner != null && dataOwner.isExisting()) {
 
             if (labeledCombobox2.getSelectedItem() != null) {
@@ -316,7 +310,7 @@ private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
                 ex.setTemplate(te);
                 ex.setTargetFile(f2);
 
-                pr = new PreviewPanel();
+                pr = new PreviewWaiter();
                 pr.setDataOwner(dataOwner);
                 new Job(ex, pr).execute();
             } else {
@@ -351,7 +345,7 @@ private void jButton8ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
 
         int group = 1;
 
-        PreviewPanel pr;
+        PreviewWaiter pr;
         if (dataOwner != null && dataOwner.isExisting()) {
 
             if (labeledCombobox2.getSelectedItem() != null) {

diff --git a/src/mpv5/ui/dialogs/subcomponents/ControlPanel_Templates.java b/src/mpv5/ui/dialogs/subcomponents/ControlPanel_Templates.java
@@ -44,10 +44,9 @@
 import mpv5.ui.dialogs.DialogForFile;
 import mpv5.ui.dialogs.Notificator;
 import mpv5.ui.dialogs.Search2;
-import mpv5.ui.panels.PreviewPanel;
+import mpv5.ui.panels.PreviewWaiter;
 import mpv5.utils.export.Export;
 import mpv5.utils.export.ODTFile2;
-import mpv5.utils.export.PDFFile;
 import mpv5.utils.files.FileDirectoryHandler;
 import mpv5.utils.files.FileExecutor;
 import mpv5.utils.files.FileMonitor;
@@ -981,7 +980,7 @@ private void test() {
 
                 ex.setTargetFile(f2);
 
-                new Job(ex, new PreviewPanel()).execute();
+                new Job(ex, new PreviewWaiter()).execute();
             } catch (Exception ex1) {
                 Log.Debug(ex1);
                 Popup.error(ex1);

diff --git a/src/mpv5/ui/panels/ItemPanel2.java b/src/mpv5/ui/panels/ItemPanel2.java
@@ -2964,10 +2964,10 @@ public void actionPerformed(ActionEvent e) {
     }
 
     private void delivery() {
-        PreviewPanel pr;
+        PreviewWaiter pr;
         if (dataOwner != null && dataOwner.isExisting()) {
             if (TemplateHandler.isLoaded(Long.valueOf(dataOwner.templateGroupIds()), Constants.TYPE_DELIVERY_NOTE)) {
-                pr = new PreviewPanel();
+                pr = new PreviewWaiter();
                 pr.setDataOwner(dataOwner);
                 new Job(Export.createFile(TemplateHandler.loadTemplate(dataOwner.templateGroupIds(), Constants.TYPE_DELIVERY_NOTE), dataOwner), pr).execute();
             } else {
@@ -2977,11 +2977,11 @@ private void delivery() {
     }
 
     private void confirmation() {
-        PreviewPanel pr;
+        PreviewWaiter pr;
         if (dataOwner != null && dataOwner.isExisting()) {
             if (TemplateHandler.isLoaded(Long.valueOf(dataOwner.templateGroupIds()), Constants.TYPE_ORDER_CONFIRMATION)) {
 
-                pr = new PreviewPanel();
+                pr = new PreviewWaiter();
                 pr.setDataOwner(dataOwner);
                 new Job(Export.createFile(TemplateHandler.loadTemplate(dataOwner.templateGroupIds(), Constants.TYPE_ORDER_CONFIRMATION), dataOwner), pr).execute();
             } else {
@@ -3029,10 +3029,10 @@ public void print() {
     }
 
     private void preview() {
-        PreviewPanel pr;
+        PreviewWaiter pr;
         if (dataOwner != null && dataOwner.isExisting()) {
             if (TemplateHandler.isLoaded(Long.valueOf(dataOwner.templateGroupIds()), dataOwner.__getInttype())) {
-                pr = new PreviewPanel();
+                pr = new PreviewWaiter();
                 pr.setDataOwner(dataOwner);
                 new Job(Export.createFile(TemplateHandler.loadTemplate(dataOwner.templateGroupIds(), dataOwner.__getInttype()), dataOwner), pr).execute();
             } else {

diff --git a/src/mpv5/ui/panels/JournalPanel.java b/src/mpv5/ui/panels/JournalPanel.java
@@ -1451,9 +1451,9 @@ private void setData() {
     }
 
     private void preview() {
-        PreviewPanel pr;
+        PreviewWaiter pr;
         if (journalOrContactTemplate != null) {
-            pr = new PreviewPanel();
+            pr = new PreviewWaiter();
             pr.setDataOwner(dataOwner);
             TreeMap<String, Object> map = new TreeMap<String, Object>();
             map.put("journal.netvalue", volumeNetto.getText()); //NOI18N