Skip to content

trac 32113: Bei Standardbutton sind zusätzliche Optionen, beispielsweise #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ilhany359 wants to merge 1 commit into
base: WollMux_18.2
Choose a base branch
from
Open

trac 32113: Bei Standardbutton sind zusätzliche Optionen, beispielsweise #384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlLineView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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
Expand Down