From 477839e1114307f05ae1bcad5f74c1c4c4c70a6c Mon Sep 17 00:00:00 2001 From: bancika Date: Sun, 3 May 2020 09:27:46 +0200 Subject: [PATCH] 4.6.0 release --- .../src/org/diylc/presenter/update.xml | 6 +++++- diylc/diylc-library/lib/diylc-core.jar | Bin 332813 -> 332873 bytes .../org/diylc/components/misc/Loadline.java | 8 ++++---- diylc/diylc-swing/build.xml | 2 +- diylc/diylc-swing/lib/diylc-core.jar | Bin 332813 -> 332873 bytes diylc/diylc-swing/library/main.jar | Bin 704445 -> 704211 bytes .../src/org/diylc/images/IconLoader.java | 2 +- .../src/org/diylc/images/loadline.png | Bin 0 -> 629 bytes .../src/org/diylc/images/loadline_add.png | Bin 0 -> 648 bytes .../org/diylc/swing/gui/DialogFactory.java | 10 ++++++++++ .../swing/loadline/LoadlineEditorFrame.java | 16 +++++++++++----- .../swing/plugins/edit/EditMenuPlugin.java | 6 ++---- .../swing/plugins/file/FileMenuPlugin.java | 6 ++++-- 13 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 diylc/diylc-swing/src/org/diylc/images/loadline.png create mode 100644 diylc/diylc-swing/src/org/diylc/images/loadline_add.png diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 66ab4cee..1cc0ee1e 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -3039,7 +3039,7 @@ 6 0 - 2020-04-20 00:00:00.000 CET + 2020-05-03 00:00:00.000 CET @@ -3050,6 +3050,10 @@ NEW_FEATURE Added "Sizing Mode" to Image component that allows stretching the image freely using two control points + + NEW_FEATURE + Added "Loadline Editor" to the File menu, to be used in the future to calculate tube or transistor bias point using loadlines + IMPROVEMENT Include themes and fonts in OSX app package diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index e4eda30dc5773173791033644a43dbb60d958eec..21092913bcce03ce7f9b6152c56afa7d48536dd6 100644 GIT binary patch delta 22646 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 diff --git a/diylc/diylc-library/src/org/diylc/components/misc/Loadline.java b/diylc/diylc-library/src/org/diylc/components/misc/Loadline.java index 79a8c626..fcc4e979 100644 --- a/diylc/diylc-library/src/org/diylc/components/misc/Loadline.java +++ b/diylc/diylc-library/src/org/diylc/components/misc/Loadline.java @@ -36,10 +36,10 @@ import org.diylc.core.annotations.BomPolicy; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; -@ComponentDescriptor(name = "Loadline", category = "Misc", author = "Branislav Stojkovic", - zOrder = IDIYComponent.BOARD, instanceNamePrefix = "LL", - description = "Loadline of a tube or transistor", bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, - autoEdit = false, transformer = SimpleComponentTransformer.class) +//@ComponentDescriptor(name = "Loadline", category = "Misc", author = "Branislav Stojkovic", +// zOrder = IDIYComponent.BOARD, instanceNamePrefix = "LL", +// description = "Loadline of a tube or transistor", bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, +// autoEdit = false, transformer = SimpleComponentTransformer.class) public class Loadline extends AbstractBoard { private static final long serialVersionUID = 1L; diff --git a/diylc/diylc-swing/build.xml b/diylc/diylc-swing/build.xml index e9394afb..1e77ea6b 100644 --- a/diylc/diylc-swing/build.xml +++ b/diylc/diylc-swing/build.xml @@ -10,7 +10,7 @@ - + diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index e4eda30dc5773173791033644a43dbb60d958eec..21092913bcce03ce7f9b6152c56afa7d48536dd6 100644 GIT binary patch delta 22646 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 diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 1b7c65fa158b95aa1da528dd9435dcbe46d33b24..5d42a00c150424120d346d310efefd8daa5381fe 100644 GIT binary patch delta 13058 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 LhF9tY=PKiWEe2ow diff --git a/diylc/diylc-swing/src/org/diylc/images/IconLoader.java b/diylc/diylc-swing/src/org/diylc/images/IconLoader.java index d1f444fb..56391f55 100644 --- a/diylc/diylc-swing/src/org/diylc/images/IconLoader.java +++ b/diylc/diylc-swing/src/org/diylc/images/IconLoader.java @@ -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; diff --git a/diylc/diylc-swing/src/org/diylc/images/loadline.png b/diylc/diylc-swing/src/org/diylc/images/loadline.png new file mode 100644 index 0000000000000000000000000000000000000000..57757f962151cbd590619ab32e182ab0b0c3e7f1 GIT binary patch literal 629 zcmV-*0*d{KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGe@Bjb`@Bu=sG?)MY0t!h)K~y+Tl~Z3x zQ(+YUZTetgW(1{_7{29O^k#cAH^EEzAieaEJrooKtLP!>DX5ni(}X!+2P#5)@?wI4 zfh>&zWsIo6jh2cN#I2cbur+&X0Q?fk1$Y#Ul2zR4N_1 zx9Io#F9AqF1O$ZwQ9e%;4o^}xOO#F%ZEg~6Y!HP)leD@@luQyO5=36Fm$>)|v(?G9 ztO#&8fK0Z$DI>F8-e|Ni>udq;Qc;8~-gyozeb=W2_g@0hpYl%K=9HyY64NwgZx>EY znJOk%T!?&%p{*I1nK7}l=EB0~m?fZ~RNQXErgY=+80hLUkSjEz$L&%FJ3DpWeO>1k z>=7)AxWuiDp7~;vewJoG{&0TboIQfV9s$b-;m0q))%MC*b6h^dK)GNfW}h>UX1{;_%_0W^*DRlP!~j_@6~yMJ;IL!(EAYhm1@BF8#awi z?0W=!TLvEAoabWQogS&ufiv^>1YW!aj0ZsXHQ=7Hh@ny728($*fY588;bh(}-tU3K z=kwV=)Bk>;Y6gSBL9QQm@Y2fcW6HO!MmhqdkKfF9B2dRXUyjE?4nXQ3;^T839hhXC P00000NkvXXu0mjf-{Kw+ literal 0 HcmV?d00001 diff --git a/diylc/diylc-swing/src/org/diylc/images/loadline_add.png b/diylc/diylc-swing/src/org/diylc/images/loadline_add.png new file mode 100644 index 0000000000000000000000000000000000000000..480037462efcc5887a85910ba2da0884907484d4 GIT binary patch literal 648 zcmV;30(bq1P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGe@Bjb`@Bu=sG?)MY0v$<2K~y+Tl~YYf zR8bWEW*9;j{b5o;W=Wf(T}#~w<3JNgxUkJ+ivopkC|tsbk2G6=BHfb2j4yS-FLt5oO|wjzCL}a{M*lH zI|*bmW=#?`Py}QM2E+Q`iMzVOTGgE?;Bv47Up|@W>~zBqnJqimE#_4 z1E)?@E31-+GU^Px5`}Nx1D7sTMW<(cI6LdZIgWJ(GI$0;c_(qg0Q$PCjfD+7x)sq_ z3vFUL?KV*$o39ToVW)T${^C4ZUR`lTY-HO!`3+1pb93(FHb(G74WvN=n={`WUc%y9 z8(vHR$ByuNk~0rPRBTxmVv!J6=wR%*+ep0yDfxSrKdo_~SU7}fj!lQ%@+IToLp~2D zkM)Hx`Ya9X^16`W&lMVR?=cV_07C7+Q13exdp-GfmGHDFr3QM09iV@^pPPh9F$f%N zEa2jSah$)#Kh16ltE&zS;{#`}|AF8G9!$PwSLu`9g48F=Xl3>=<=fU<`45Qr2lJ&E iG%$~s<9@)0!TKN7)@yX!T&8mX0000 properties, Set 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 diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java index 3af5ba45..07106bfb 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java @@ -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(); } diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java index 9022e28b..39ae2fa4 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java @@ -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); }