From ab8befaca72f539a4d0f76cc2f5a2645dad3bd24 Mon Sep 17 00:00:00 2001 From: Ilhan Yesil Date: Tue, 23 Aug 2022 12:25:46 +0200 Subject: [PATCH] =?UTF-8?q?trac=2032113:=20Bei=20Standardbutton=20sind=20z?= =?UTF-8?q?us=C3=A4tzliche=20Optionen,=20beispielsweise=20Zuweisung=20der?= =?UTF-8?q?=20auszuf=C3=BChrenden=20Aktion,=20nicht=20n=C3=B6tig=20und=20w?= =?UTF-8?q?erden=20daher=20ausgeblendet.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/OneFormControlLineView.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlLineView.java b/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlLineView.java index 2f4b620e9..281737190 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlLineView.java +++ b/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlLineView.java @@ -192,7 +192,21 @@ public OneFormControlLineView(FormControlModel model, myPanel.add(makeTypeView()); myPanel.add(makeComboBoxAdditionalView()); myPanel.add(makeTextAreaAdditionalView()); - myPanel.add(makeButtonAdditionalView()); + + // additionalview nur bauen wenn kein standard button, + // makeButtonAdditionalView baut controls für openTemplate und openExt + if (!model.getAction().equals("abort") + && !model.getAction().equals("prevTab") + && !model.getAction().equals("nextTab") + && !model.getAction().equals("funcDialog") + && !model.getAction().equals("form2PDF") + && !model.getAction().equals("save") + && !model.getAction().equals("saveAs") + && !model.getAction().equals("printForm") + && !model.getAction().equals("closeAndOpenExt") + && !model.getAction().equals("saveTempAndOpenExt") + && !model.getAction().equals("form2EMail")) + myPanel.add(makeButtonAdditionalView()); myPanel.add(makeReadOnlyView()); normalFont = labelTextfield.getFont(); @@ -244,8 +258,9 @@ private void setViewVisibility() readOnlyfield.setVisible(!model.isTab() && viewVisibilityDescriptor != null && viewVisibilityDescriptor.isFormControlLineViewReadonly()); - buttonAdditionalView.setVisible(model.isButton() && (viewVisibilityDescriptor == null - || viewVisibilityDescriptor.isFormControlLineViewAdditional())); + if(buttonAdditionalView != null) + buttonAdditionalView.setVisible(model.isButton() && (viewVisibilityDescriptor == null + || viewVisibilityDescriptor.isFormControlLineViewAdditional())); /* * Wenn alle abgeschaltet sind, aktiviere zumindest das ID-Feld