Browse Source

Merge branch 'release/8.0' of http://cloud.finedevelop.com:2015/scm/~plough/design into release/8.0

plough 8 years ago
parent
commit
af1f2e58d7
  1. 4
      designer_base/src/com/fr/start/Demo.java
  2. 7
      designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java

4
designer_base/src/com/fr/start/Demo.java

@ -18,7 +18,7 @@ public class Demo {
String executorPath;
if (OperatingSystem.isMacOS()) {
executorPath = StableUtils.pathJoin(installHome, "bin", "designer.app --args demo");
executorPath = StableUtils.pathJoin(installHome, "bin", "designer.app");
} else {
executorPath = StableUtils.pathJoin(installHome, "bin", "designer.exe demo");
}
@ -28,7 +28,7 @@ public class Demo {
if (OperatingSystem.isMacOS()) {
ProcessBuilder builder = new ProcessBuilder();
builder.command("open -a", executorPath);
builder.command("open", "-a", executorPath, "--args", "demo");
try {
builder.start();
} catch (IOException e) {

7
designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java

@ -659,13 +659,6 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
private void populateHyperlink(Plot plot) {
HashMap paneMap = renewMapWithPlot(plot);
//安装平台内打开插件时,添加相应按钮
Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
for (HyperlinkProvider provider : providers) {
NameableCreator nc = provider.createHyperlinkCreator();
paneMap.put(nc.getHyperlink(), nc.getUpdatePane());
}
List<UIMenuNameableCreator> list = refreshList(paneMap);
superLink.refreshMenuAndAddMenuAction(list);

Loading…
Cancel
Save