From 3f236acdc5c07470bafc63ae2e17b5a4e5de96df Mon Sep 17 00:00:00 2001
From: xiaoxia <xiaoxia@finereport.com>
Date: Wed, 19 Oct 2016 22:39:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/form/images/download.png    | Bin 98 -> 186 bytes
 .../com/fr/design/form/images/showmenu.png    | Bin 0 -> 98 bytes
 .../mainframe/FormWidgetDetailPane.java       |  57 ++++++++++++++++--
 3 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 designer_form/src/com/fr/design/form/images/showmenu.png

diff --git a/designer_form/src/com/fr/design/form/images/download.png b/designer_form/src/com/fr/design/form/images/download.png
index fa7b09dea32a9cce0962b2da23a6cfa34bc59baf..57c328d73bdae515704173aac5c3c8e32480f4c9 100644
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^d_c^@!3HFQ8hUO4DaPU;cPEB*=VV?2IVGMhjv*SN
z$q5G-wXW^?#ec|RiR6p|PXVFj``yH5*jqUrk>IrCSK$x#w_P5#w)QTAv1l5z2hR~V
zHVLzBtlee?hDK(GL>g}>7)r>yZ9X7z!o)-Ig4hNDGhYSHHByd3J4_m$I5Y^}v=>l(
h<iTSvw7j>Gks;7n^}<%ASW}?=44$rjF6*2UngAg%HYWf8

literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CF!3HE7boT!OQjEnx?oJHr&dIz4a%4PR977}|
vlh;Iier3<h+0e<dwIt}2#Vd9tCn<)KJDi4+-K!@6)iHRw`njxgN@xNADasj%

diff --git a/designer_form/src/com/fr/design/form/images/showmenu.png b/designer_form/src/com/fr/design/form/images/showmenu.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa7b09dea32a9cce0962b2da23a6cfa34bc59baf
GIT binary patch
literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CF!3HE7boT!OQjEnx?oJHr&dIz4a%4PR977}|
vlh;Iier3<h+0e<dwIt}2#Vd9tCn<)KJDi4+-K!@6)iHRw`njxgN@xNADasj%

literal 0
HcmV?d00001

diff --git a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java
index ae5bc069dc..1f5c170f9f 100644
--- a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java
@@ -1,6 +1,8 @@
 package com.fr.design.mainframe;
 
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.*;
@@ -10,12 +12,26 @@ import javax.swing.*;
 import javax.swing.border.LineBorder;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.actions.file.WebPreviewUtils;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.extra.PluginWebBridge;
+import com.fr.design.extra.ShopDialog;
+import com.fr.design.extra.WebManagerPaneFactory;
+import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.file.MutilTempalteTabPane;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIPreviewButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.imenu.UIMenuItem;
+import com.fr.design.gui.imenu.UIPopupMenu;
+import com.fr.design.gui.itoolbar.UILargeToolbar;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.share.ShareConstants;
 import com.fr.form.share.ShareLoader;
 import com.fr.form.ui.ElCaseBindInfo;
@@ -30,10 +46,11 @@ import com.fr.general.Inter;
 public class FormWidgetDetailPane extends FormDockView{
 
     private UITabbedPane tabbedPane;
-    private JScrollPane downPanel;
+    private UIScrollPane downPanel;
     private JPanel reuWidgetPanel;
     private UIComboBox comboBox;
     private ElCaseBindInfo[] elCaseBindInfoList;
+    private UIButton downloadButton;
 
     public static FormWidgetDetailPane getInstance() {
         if (HOLDER.singleton == null) {
@@ -84,14 +101,12 @@ public class FormWidgetDetailPane extends FormDockView{
         }
         initReuWidgetPanel();
         esp.add(reuWidgetPanel, BorderLayout.CENTER);
-        UIButton button = new UIButton();
-        button.setIcon(BaseUtils.readIcon("/com/fr/design/form/images/download.png"));
-        button.set4ToolbarButton();
+        createDownButton();
         JPanel widgetPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
         widgetPane.setBorder(BorderFactory.createEmptyBorder(3, 10, 3, 3));
         widgetPane.add(new UILabel(Inter.getLocText("FR-Designer_LocalWidget"),
                 SwingConstants.HORIZONTAL), BorderLayout.WEST);
-        widgetPane.add(button, BorderLayout.EAST);
+        widgetPane.add(downloadButton, BorderLayout.EAST);
         esp.add(widgetPane,BorderLayout.NORTH);
         tabbedPane = new UITabbedPane();
         tabbedPane.setOpaque(true);
@@ -110,7 +125,7 @@ public class FormWidgetDetailPane extends FormDockView{
         int rowCount = (elCaseBindInfoList.length + 1)/2;
         downPanel = new UIScrollPane(new ShareWidgetPane(elCaseBindInfoList));
         downPanel.setPreferredSize(new Dimension(236, rowCount * 82));
-        reuWidgetPanel = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
+        reuWidgetPanel = new JPanel();
         comboBox = new UIComboBox(getCategories());
         comboBox.setPreferredSize(new Dimension(236, 30));
         initComboBoxSelectedListener();
@@ -136,6 +151,36 @@ public class FormWidgetDetailPane extends FormDockView{
         });
     }
 
+    private void createDownButton() {
+        downloadButton = new UIButton();
+        downloadButton.setIcon(BaseUtils.readIcon("/com/fr/design/form/images/showmenu.png"));
+        downloadButton.set4ToolbarButton();
+        downloadButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+                if (jt == null) {
+                    return;
+                }
+
+                UIPopupMenu menu = new UIPopupMenu();
+
+                UIMenuItem downloadItem = new UIMenuItem(Inter.getLocText("FR-Designer_Download_Template"), BaseUtils.readIcon("/com/fr/design/form/images/download.png"));
+                menu.add(downloadItem);
+                downloadItem.addActionListener(new ActionListener() {
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        BasicPane managerPane = new WebManagerPaneFactory().createReusePane();
+                        UIDialog dlg = new ShopDialog(DesignerContext.getDesignerFrame(), managerPane);
+                        PluginWebBridge.getHelper().setDialogHandle(dlg);
+                        dlg.setVisible(true);
+                    }
+                });
+                GUICoreUtils.showPopupMenu(menu, tabbedPane, tabbedPane.getX() + 140, tabbedPane.getY() + 26);
+
+            }
+        });
+    }
     public String[] getCategories() {
         return ShareConstants.WIDGET_CATEGORIES;
     }