Skip to content

Fixing the dialog size. Fixing adding new form fieldset #323

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

Merged
merged 5 commits into from
Oct 22, 2020
Merged

Fixing the dialog size. Fixing adding new form fieldset #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a6aa09
Fixing the dialog size. Fixing adding new fieldset
eduard13 Oct 21, 2020
b91149d
Merge branch '2.0.0-develop' into ui-form-fixes
Oct 21, 2020
8111673
Merging 2.0.0-develop
eduard13 Oct 22, 2020
33cd5c3
Fixing static tests
eduard13 Oct 22, 2020
d4cbc20
Merge branch 'ui-form-fixes' of https://github.com/eduard13/magento2-…
eduard13 Oct 22, 2020
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
4 changes: 2 additions & 2 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="12" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="10" left="10" bottom="10" right="10"/>
<constraints>
<xy x="48" y="54" width="888" height="657"/>
<xy x="48" y="54" width="1056" height="1327"/>
</constraints>
<properties>
<preferredSize width="400" height="600"/>
<preferredSize width="838" height="619"/>
</properties>
<border type="none"/>
<children>
Expand Down
14 changes: 4 additions & 10 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import com.magento.idea.magento2plugin.ui.table.TableButton;
import com.magento.idea.magento2plugin.util.magento.GetAclResourcesListUtil;
import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
Expand Down Expand Up @@ -205,7 +204,6 @@ public class NewUiComponentFormDialog extends AbstractDialog {
public NewUiComponentFormDialog(final Project project, final PsiDirectory directory) {
super();
this.project = project;
updateDialogSizeToDefaults();
formButtonsValidator = new FormButtonsValidator(this);
formFieldsetsValidator = new FormFieldsetsValidator(this);
formFieldsValidator = new FormFieldsValidator(this);
Expand Down Expand Up @@ -286,10 +284,11 @@ protected void initButtonsTable() {
}

protected void initFieldSetsTable() {
final Integer rowPosition = 10;
final DefaultTableModel model = getFieldsetsModel();
model.setDataVector(
new Object[][] {{"general", "General","10",DELETE_COLUMN}},
new Object[] { NAME_COLUMN, LABEL_COLUMN, SORT_ORDER_COLUMN, ACTION_COLUMN}
new Object[][] {{"General", rowPosition, DELETE_COLUMN}},
new Object[] { LABEL_COLUMN, SORT_ORDER_COLUMN, ACTION_COLUMN}
);

final TableColumn column = fieldsets.getColumn(ACTION_COLUMN);
Expand All @@ -298,7 +297,7 @@ protected void initFieldSetsTable() {
new DeleteRowButton(new JCheckBox()));

addFieldset.addActionListener(e -> {
model.addRow(new Object[] {"","",DELETE_COLUMN});
model.addRow(new Object[] {"", rowPosition + 10, DELETE_COLUMN});
});
model.addTableModelListener(
event -> {
Expand Down Expand Up @@ -755,9 +754,4 @@ protected boolean validateFormFields() {
&& formFieldsetsValidator.validate()
&& formFieldsValidator.validate();
}

private void updateDialogSizeToDefaults() {
final Dimension screenSize = getToolkit().getScreenSize();
setPreferredSize(new Dimension(screenSize.width / 2, screenSize.height / 2));
}
}