BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-11 01:32:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

4.6.0 release

Browse Source
This commit is contained in:
bancika
2020-05-03 09:27:46 +02:00
parent d291fcd373
commit 477839e111
13 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-swing/src/org/diylc/images/IconLoader.java
+1 -1
View File
@@ -66,7 +66,7 @@ public enum IconLoader {
Node("node.png"), Web("web.png"), Guitar("guitar.png"), Scientist("scientist.png"), StarGrey("star_grey.png"), StarBlue("star_blue.png"),
JarBeanInto("jar_bean_into.png"), GraphEdgeDirected("graph_edge_directed.png"), LaserPointer("laserpointer.png"), TapeMeasure("tape_measure1.png"),
Elements("elements1.png"), GraphNodes("graph_nodes.png"), User("user1.png"), FlexibleLeads("flexible_leads.png"), Pads("pads.png"), Lock("lock.png"),
Unlock("lock_open.png"), Earth("earth.png");
Unlock("lock_open.png"), Earth("earth.png"), Loadline("loadline.png"), LoadlineAdd("loadline_add.png");
protected String name;
diylc/diylc-swing/src/org/diylc/images/loadline.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 629 B

diylc/diylc-swing/src/org/diylc/images/loadline_add.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 648 B

diylc/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java
+10
View File
@@ -104,6 +104,16 @@ public class DialogFactory {
return processFileChooserResult(result, openFileChooser, defaultExtension);
}
public File showOpenDialog(Window owner, FileFilter fileFilter, File initialFile, String defaultExtension,
IFileChooserAccessory accessory) {
JFileChooser openFileChooser = new JFileChooser();
initializeFileChooser(openFileChooser, fileFilter, initialFile, defaultExtension, accessory, false);
int result = openFileChooser.showOpenDialog(owner);
return processFileChooserResult(result, openFileChooser, defaultExtension);
}
public File showOpenDialog(FileFilter fileFilter, File initialFile, String defaultExtension,
IFileChooserAccessory accessory, JFrame ownerFrame) {
diylc/diylc-swing/src/org/diylc/swing/loadline/LoadlineEditorFrame.java
+11 -5
View File
@@ -23,12 +23,14 @@ import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.UIManager;
import org.apache.log4j.Logger;
import org.apache.poi.util.IOUtils;
@@ -97,6 +99,8 @@ public class LoadlineEditorFrame extends JFrame implements IView {
public LoadlineEditorFrame() {
super("Loadline Editor");
setIconImage(IconLoader.Loadline.getImage());
setResizable(false);
if (loadline == null) {
loadline = new LoadlineEntity();
@@ -174,6 +178,7 @@ public class LoadlineEditorFrame extends JFrame implements IView {
toolbar.add(new JButton(new SaveAction()));
toolbar.add(new JButton(new LoadImageAction()));
toolbar.add(new JButton(new AddCurveAction()));
toolbar.setBorder(BorderFactory.createMatteBorder(1, 0, 1, 0, UIManager.getColor("InternalFrame.borderShadow")));
}
return toolbar;
}
@@ -265,6 +270,7 @@ public class LoadlineEditorFrame extends JFrame implements IView {
JButton updateButton = new JButton(new UpdateValuesAction());
controlPanel.add(updateButton);
controlPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, UIManager.getColor("InternalFrame.borderShadow")));
}
return controlPanel;
}
@@ -513,7 +519,7 @@ public class LoadlineEditorFrame extends JFrame implements IView {
@Override
public boolean editProperties(List<PropertyWrapper> properties,
Set<PropertyWrapper> defaultedProperties) {
PropertyEditorDialog editor = DialogFactory.getInstance().createPropertyEditorDialog(properties,
PropertyEditorDialog editor = DialogFactory.getInstance().createPropertyEditorDialog(LoadlineEditorFrame.this, properties,
LangUtil.translate("Edit Selection"), true);
editor.setVisible(true);
defaultedProperties.addAll(editor.getDefaultedProperties());
@@ -599,7 +605,7 @@ public class LoadlineEditorFrame extends JFrame implements IView {
@Override
public void actionPerformed(ActionEvent e) {
final File file = DialogFactory.getInstance().showOpenDialog(FileFilterEnum.CRV.getFilter(), null,
final File file = DialogFactory.getInstance().showOpenDialog(LoadlineEditorFrame.this, FileFilterEnum.CRV.getFilter(), null,
FileFilterEnum.CRV.getExtensions()[0], null);
if (file != null) {
try {
@@ -643,7 +649,7 @@ public class LoadlineEditorFrame extends JFrame implements IView {
public AddCurveAction() {
super();
putValue(Action.NAME, "Add a Curve");
// putValue(Action.SMALL_ICON, IconLoader.DiskBlue.getIcon());
putValue(Action.SMALL_ICON, IconLoader.LoadlineAdd.getIcon());
}
@Override
@@ -664,7 +670,7 @@ public class LoadlineEditorFrame extends JFrame implements IView {
@Override
public void actionPerformed(ActionEvent e) {
File file = DialogFactory.getInstance().showOpenDialog(FileFilterEnum.IMAGES.getFilter(),
File file = DialogFactory.getInstance().showOpenDialog(LoadlineEditorFrame.this, FileFilterEnum.IMAGES.getFilter(),
null, FileFilterEnum.IMAGES.getExtensions()[0], null);
if (file != null) {
FileInputStream fis;
@@ -702,7 +708,7 @@ public class LoadlineEditorFrame extends JFrame implements IView {
public LoadlineEditorAction() {
super();
putValue(Action.NAME, "Loadline Editor");
// putValue(Action.SMALL_ICON, IconLoader.Delete.getIcon());
putValue(Action.SMALL_ICON, IconLoader.Loadline.getIcon());
}
@Override
diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java
+2 -4
View File
@@ -39,8 +39,7 @@ import org.diylc.core.ExpansionMode;
import org.diylc.core.Project;
import org.diylc.images.IconLoader;
import org.diylc.swing.ActionFactory;
import org.diylc.swing.ISwingUI;
import org.diylc.swing.loadline.LoadlineEditorFrame;
import org.diylc.swing.ISwingUI;
public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
@@ -322,8 +321,7 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
swingUI.injectMenuAction(null, EDIT_TITLE);
swingUI.injectMenuAction(getFlexibleLeadsAction(), EDIT_TITLE);
swingUI.injectMenuAction(null, EDIT_TITLE);
swingUI.injectMenuAction(actionFactory.createEditProjectAction(plugInPort), EDIT_TITLE);
swingUI.injectMenuAction(new LoadlineEditorFrame.LoadlineEditorAction(), EDIT_TITLE);
swingUI.injectMenuAction(actionFactory.createEditProjectAction(plugInPort), EDIT_TITLE);
refreshActions();
}
diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java
+4 -2
View File
@@ -35,7 +35,8 @@ import org.diylc.common.IPlugInPort;
import org.diylc.images.IconLoader;
import org.diylc.swing.ActionFactory;
import org.diylc.swing.IDynamicSubmenuHandler;
import org.diylc.swing.ISwingUI;
import org.diylc.swing.ISwingUI;
import org.diylc.swing.loadline.LoadlineEditorFrame;
/**
* Entry point class for File management utilities.
@@ -103,7 +104,8 @@ public class FileMenuPlugin implements IPlugIn, IDynamicSubmenuHandler {
swingUI.injectMenuAction(actionFactory.createExportBlocksAction(swingUI), INTEGRATION_TITLE);
swingUI.injectMenuAction(null, INTEGRATION_TITLE);
swingUI.injectMenuAction(actionFactory.createImportVariantsAction(swingUI, plugInPort), INTEGRATION_TITLE);
swingUI.injectMenuAction(actionFactory.createExportVariantsAction(swingUI, plugInPort), INTEGRATION_TITLE);
swingUI.injectMenuAction(actionFactory.createExportVariantsAction(swingUI, plugInPort), INTEGRATION_TITLE);
swingUI.injectMenuAction(new LoadlineEditorFrame.LoadlineEditorAction(), FILE_TITLE);
swingUI.injectMenuAction(null, FILE_TITLE);
swingUI.injectMenuAction(actionFactory.createExitAction(plugInPort), FILE_TITLE);
}