fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #1304 in BA/design from ~HZZZ/design:REPORT-3410 to release/9.0 

* commit '0cb007d2f8b78719d766590e16e3fb889206c887':
  数据集工具栏图标
  数据集工具栏图标
  预览按钮背景色
  toolbar背景色
master
superman 7 years ago
parent
6797115fcb 0cb007d2f8
commit
575658df0c
5 changed files with 104 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 195
      designer/src/com/fr/start/Designer.java
  2. 27
      designer_base/src/com/fr/design/gui/itoolbar/UIToolBarUI.java
  3. 2
      designer_base/src/com/fr/design/icon/IconPathConstants.java
  4. BIN
      designer_base/src/com/fr/design/images/control/edit.png
  5. BIN
      designer_base/src/com/fr/design/images/control/tab/remove.png

195
designer/src/com/fr/start/Designer.java
Unescape View File

@ -51,17 +51,17 @@ public class Designer extends BaseDesigner {
private static final int TOOLBARPANEVGAP = -4; private static final int TOOLBARPANEVGAP = -4;
private static final int PREVIEW_DOWN_X_GAP = 92; private static final int PREVIEW_DOWN_X_GAP = 92;
private static final int GAP = 7; private static final int GAP = 7;
private static final String OLD_ENV_FOLDER_71 = ".FineReport71"; private static final String OLD_ENV_FOLDER_71 = ".FineReport71";
private static final String OLD_ENV_FOLDER_70 = ".FineReport70"; private static final String OLD_ENV_FOLDER_70 = ".FineReport70";
private UserInfoPane userInfoPane; private UserInfoPane userInfoPane;
private UIButton saveButton; private UIButton saveButton;
private UIButton undo; private UIButton undo;
private UIButton redo; private UIButton redo;
private UIPreviewButton run; private UIPreviewButton run;
/** /**
* 设计器启动的Main方法 * 设计器启动的Main方法
@ -135,30 +135,31 @@ public class Designer extends BaseDesigner {
public UILargeToolbar createLargeToolbar() { public UILargeToolbar createLargeToolbar() {
UILargeToolbar largeToolbar = super.createLargeToolbar(); UILargeToolbar largeToolbar = super.createLargeToolbar();
largeToolbar.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 4)); largeToolbar.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 4));
largeToolbar.add(new JPanel() { largeToolbar.add(generateEmptyGap(1));
public Dimension getPreferredSize() {
Dimension dim = super.getPreferredSize();
dim.width = 1;
return dim;
}
});
createRunButton(largeToolbar); createRunButton(largeToolbar);
largeToolbar.add(run); largeToolbar.add(run);
run.setBackground(UIConstants.TREE_BACKGROUND); run.setBackground(Color.WHITE);
largeToolbar.add(new JPanel() { largeToolbar.add(generateEmptyGap(GAP));
largeToolbar.addSeparator(new Dimension(2, 42));
largeToolbar.setBorder(new MatteBorder(new Insets(0, 0, 1, 0), UIConstants.LINE_COLOR));
return largeToolbar;
}
private JPanel generateEmptyGap(int width) {
JPanel panel = new JPanel() {
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
Dimension dim = super.getPreferredSize(); Dimension dim = super.getPreferredSize();
dim.width = GAP; dim.width = width;
return dim; return dim;
} }
}); };
largeToolbar.addSeparator(new Dimension(2, 42)); panel.setBackground(Color.WHITE);
largeToolbar.setBorder(new MatteBorder(new Insets(0, 0, 1, 0), UIConstants.LINE_COLOR)); return panel;
return largeToolbar;
} }
/** /**
* 创建上面一排的工具栏按钮 * 创建上面一排的工具栏按钮
*
* @return 按钮 * @return 按钮
*/ */
public UIButton[] createUp() { public UIButton[] createUp() {
@ -181,7 +182,7 @@ public class Designer extends BaseDesigner {
}); });
return saveButton; return saveButton;
} }
private UIButton createUndoButton() { private UIButton createUndoButton() {
undo = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/undo.png")); undo = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/undo.png"));
undo.setToolTipText(KeySetUtils.UNDO.getMenuKeySetName()); undo.setToolTipText(KeySetUtils.UNDO.getMenuKeySetName());
@ -290,9 +291,10 @@ public class Designer extends BaseDesigner {
/** /**
* 生成工具栏 * 生成工具栏
*
* @param toolbarComponent 工具栏 * @param toolbarComponent 工具栏
* @param plus 对象 * @param plus 对象
* @return 更新后的toolbar * @return 更新后的toolbar
*/ */
public JComponent resetToolBar(JComponent toolbarComponent, ToolBarMenuDockPlus plus) { public JComponent resetToolBar(JComponent toolbarComponent, ToolBarMenuDockPlus plus) {
//如果是处于权限编辑状态 //如果是处于权限编辑状态
@ -331,16 +333,15 @@ public class Designer extends BaseDesigner {
public JTemplate<?, ?> createNewTemplate() { public JTemplate<?, ?> createNewTemplate() {
return new JWorkBook(); return new JWorkBook();
} }
/** /**
* 创建论坛登录面板, chart那边不需要 * 创建论坛登录面板, chart那边不需要
* *
* @return 面板组件 * @return 面板组件
* */
*/ public Component createBBSLoginPane() {
public Component createBBSLoginPane(){ if (userInfoPane == null) {
if (userInfoPane == null){ userInfoPane = new UserInfoPane();
userInfoPane = new UserInfoPane();
} }
return userInfoPane; return userInfoPane;
} }
@ -358,68 +359,67 @@ public class Designer extends BaseDesigner {
protected SplashPane createSplashPane() { protected SplashPane createSplashPane() {
return new ReportSplashPane(); return new ReportSplashPane();
} }
/** /**
* 收集用户信息吗 * 收集用户信息吗
* */
*/
protected void collectUserInformation() { protected void collectUserInformation() {
//定制的就不弹出来了 //定制的就不弹出来了
if (!ComparatorUtils.equals(ProductConstants.APP_NAME, ProductConstants.DEFAULT_APP_NAME)) { if (!ComparatorUtils.equals(ProductConstants.APP_NAME, ProductConstants.DEFAULT_APP_NAME)) {
return; return;
} }
DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
final String key = envManager.getActivationKey(); final String key = envManager.getActivationKey();
//本地验证通过 //本地验证通过
if(ActiveKeyGenerator.localVerify(key)){ if (ActiveKeyGenerator.localVerify(key)) {
onLineVerify(envManager, key); onLineVerify(envManager, key);
UserInfoLabel.showBBSDialog(); UserInfoLabel.showBBSDialog();
return; return;
} }
if(StableUtils.checkDesignerActive(readOldKey())){ if (StableUtils.checkDesignerActive(readOldKey())) {
//只要有老的key, 就不弹窗, 下次启动的时候, 在线验证下就行. //只要有老的key, 就不弹窗, 下次启动的时候, 在线验证下就行.
String newKey = ActiveKeyGenerator.generateActiveKey(); String newKey = ActiveKeyGenerator.generateActiveKey();
envManager.setActivationKey(newKey); envManager.setActivationKey(newKey);
UserInfoLabel.showBBSDialog(); UserInfoLabel.showBBSDialog();
return; return;
} }
CollectUserInformationDialog activeDialog = new CollectUserInformationDialog( CollectUserInformationDialog activeDialog = new CollectUserInformationDialog(
DesignerContext.getDesignerFrame()); DesignerContext.getDesignerFrame());
activeDialog.setVisible(true); activeDialog.setVisible(true);
} }
private void onLineVerify(DesignerEnvManager envManager, final String key){ private void onLineVerify(DesignerEnvManager envManager, final String key) {
int status = envManager.getActiveKeyStatus(); int status = envManager.getActiveKeyStatus();
//没有联网验证过 //没有联网验证过
if (status != 0) { if (status != 0) {
Thread authThread = new Thread(new Runnable() { Thread authThread = new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
ActiveKeyGenerator.onLineVerify(key); ActiveKeyGenerator.onLineVerify(key);
} }
}); });
authThread.start(); authThread.start();
} }
} }
private File getOldEnvFile(String folderName){ private File getOldEnvFile(String folderName) {
String userHome = System.getProperty("user.home"); String userHome = System.getProperty("user.home");
if (userHome == null) { if (userHome == null) {
userHome = System.getProperty("userHome"); userHome = System.getProperty("userHome");
} }
String filePath = StableUtils.pathJoin(userHome, folderName, ProductConstants.APP_NAME + "Env.xml"); String filePath = StableUtils.pathJoin(userHome, folderName, ProductConstants.APP_NAME + "Env.xml");
return new File(filePath); return new File(filePath);
} }
private String getOldActiveKeyFromFile(File envFile){ private String getOldActiveKeyFromFile(File envFile) {
if (!envFile.exists()) { if (!envFile.exists()) {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
DesignerEnvManager temp = new DesignerEnvManager(); DesignerEnvManager temp = new DesignerEnvManager();
try { try {
XMLTools.readFileXML(temp, envFile); XMLTools.readFileXML(temp, envFile);
@ -428,26 +428,25 @@ public class Designer extends BaseDesigner {
} }
return temp.getActivationKey(); return temp.getActivationKey();
} }
//默认只从7.0和711的设计器里读取key //默认只从7.0和711的设计器里读取key
private String readOldKey(){ private String readOldKey() {
File file71 = getOldEnvFile(OLD_ENV_FOLDER_71); File file71 = getOldEnvFile(OLD_ENV_FOLDER_71);
if (!file71.exists()) { if (!file71.exists()) {
File file70 = getOldEnvFile(OLD_ENV_FOLDER_70); File file70 = getOldEnvFile(OLD_ENV_FOLDER_70);
return getOldActiveKeyFromFile(file70); return getOldActiveKeyFromFile(file70);
} }
return getOldActiveKeyFromFile(file71); return getOldActiveKeyFromFile(file71);
} }
/** /**
* 设计器退出时, 做的一些操作. * 设计器退出时, 做的一些操作.
* */
*/ public void shutDown() {
public void shutDown(){ InformationCollector collector = InformationCollector.getInstance();
InformationCollector collector = InformationCollector.getInstance(); collector.collectStopTime();
collector.collectStopTime(); collector.saveXMLFile();
collector.saveXMLFile();
ServletContext.fireServletStopListener(); ServletContext.fireServletStopListener();
} }

27
designer_base/src/com/fr/design/gui/itoolbar/UIToolBarUI.java
Unescape View File

@ -1,31 +1,16 @@
package com.fr.design.gui.itoolbar; package com.fr.design.gui.itoolbar;
import java.awt.Component; import com.fr.design.gui.ibutton.UIToolButtonBorder;
import java.awt.Dialog; import com.fr.design.gui.icheckbox.UICheckBox;
import java.awt.Frame;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Window;
import java.awt.event.WindowListener;
import javax.swing.AbstractButton; import javax.swing.*;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JRadioButton;
import javax.swing.JToolBar;
import javax.swing.RootPaneContainer;
import javax.swing.SwingUtilities;
import javax.swing.border.Border; import javax.swing.border.Border;
import javax.swing.plaf.ComponentUI; import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.UIResource; import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalToolBarUI; import javax.swing.plaf.metal.MetalToolBarUI;
import java.awt.*;
import com.fr.design.constants.UIConstants; import java.awt.event.WindowListener;
import com.fr.design.gui.ibutton.UIToolButtonBorder;
import com.fr.design.gui.icheckbox.UICheckBox;
import static com.fr.design.utils.ThemeUtils.BACK_COLOR;
public class UIToolBarUI extends MetalToolBarUI { public class UIToolBarUI extends MetalToolBarUI {
public static final String IS_TOOL_BAR_BUTTON_KEY = "JToolBar.isToolbarButton"; public static final String IS_TOOL_BAR_BUTTON_KEY = "JToolBar.isToolbarButton";
@ -91,7 +76,7 @@ public class UIToolBarUI extends MetalToolBarUI {
*/ */
public void paint(Graphics g, JComponent c) { public void paint(Graphics g, JComponent c) {
Graphics2D g2 = (Graphics2D) g; Graphics2D g2 = (Graphics2D) g;
g2.setColor(BACK_COLOR); g2.setColor(Color.WHITE);
g2.fillRect(0, 0, c.getWidth(), c.getHeight()); g2.fillRect(0, 0, c.getWidth(), c.getHeight());
} }

2
designer_base/src/com/fr/design/icon/IconPathConstants.java
Unescape View File

@ -1 +1 @@
package com.fr.design.icon; /** * Created by IntelliJ IDEA. * Author : Richer * Version: 6.5.6 * Date: 12-12-18 * Time: 上午9:42 * 用于保存所有图标路径的类 */ public class IconPathConstants { private IconPathConstants() { } public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png"; public static final String DS_ICON_PATH = "/com/fr/design/images/data/datasource.png"; public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png"; public static final String EMB_TD_ICON_PATH = "/com/fr/design/images/data/dataTable.png"; public static final String DS_RELATION_TD_ICON_PATH = "/com/fr/design/images/data/multi.png"; public static final String FILE_TD_ICON_PATH = "/com/fr/design/images/data/file.png"; private IconPathConstants() { private IconPathConstants() { private IconPathConstants() { private IconPathConstants() { private IconPathConstants() { } private IconPathConstants() { public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png"; private IconPathConstants() { public static final String DS_ICON_PATH = "/com/fr/design/images/data/datasource.png"; private IconPathConstants() { public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png"; private IconPathConstants() { public static final String EMB_TD_ICON_PATH = "/com/fr/design/images/data/dataTable.png"; private IconPathConstants() { public static final String DS_RELATION_TD_ICON_PATH = "/com/fr/design/images/data/multi.png"; private IconPathConstants() { public static final String FILE_TD_ICON_PATH = "/com/fr/design/images/data/file.png"; private IconPathConstants() { "/com/fr/web/images/form/forbid.png"; } package com.fr.design.icon; /** * Created by IntelliJ IDEA. * Author : Richer * Version: 6.5.6 * Date: 12-12-18 * Time: 上午9:42 * 用于保存所有图标路径的类 */ public class IconPathConstants { } public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png"; } public static final String DS_ICON_PATH = "/com/fr/design/images/data/datasource.png"; public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png"; public static final String EMB_TD_ICON_PATH = "/com/fr/design/images/data/dataTable.png"; public static final String DS_RELATION_TD_ICON_PATH = "/com/fr/design/images/data/multi.png"; public static final String FILE_TD_ICON_PATH = "/com/fr/design/images/data/file.png"; } } private IconPathConstants() { } } } } public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png"; } public static final String DS_ICON_PATH = "/com/fr/design/images/data/datasource.png"; } public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png"; } public static final String EMB_TD_ICON_PATH = "/com/fr/design/images/data/dataTable.png"; } public static final String DS_RELATION_TD_ICON_PATH = "/com/fr/design/images/data/multi.png"; } public static final String FILE_TD_ICON_PATH = "/com/fr/design/images/data/file.png"; public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png"; public static final String XMLA_ICON_PATH = "/com/fr/design/images/data/cube.png"; public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png"; "/com/fr/web/images/form/forbid.png"; }

BIN
designer_base/src/com/fr/design/images/control/edit.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 352 B

BIN
designer_base/src/com/fr/design/images/control/tab/remove.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 167 B

Write Preview
Loading…
Cancel
Save