Skip to content

Commit

Permalink
Improvements and new option for "Open File" dialog
Browse files Browse the repository at this point in the history 
- Added new checkbox "Keep dialog always on top"
- Stabilized size of the file drop area
- Improved overall dialog layout
  • Loading branch information
@Argent77
Argent77 committed Oct 30, 2024
1 parent 76dff4d commit 4e77bd8
Showing 1 changed file with 66 additions and 64 deletions.
130 changes: 66 additions & 64 deletions src/org/infinity/gui/OpenFileFrame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package org.infinity.gui;

import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
Expand Down Expand Up @@ -57,6 +57,7 @@ public final class OpenFileFrame extends ChildFrame implements ActionListener {
private final JButton bOpen = new JButton("Open", Icons.ICON_OPEN_16.getIcon());
private final JButton bOpenNew = new JButton("Open in new window", Icons.ICON_OPEN_16.getIcon());
private final JCheckBox cbStayOpen = new JCheckBox("Keep this dialog open");
private final JCheckBox cbAlwaysOnTop = new JCheckBox("Keep dialog always on top");
private final JLabel lExternalDrop = new JLabel("or drop file(s) here", SwingConstants.CENTER);
private final JRadioButton rbExternal = new JRadioButton("Open external file");
private final JRadioButton rbInternal = new JRadioButton("Open internal file");
Expand All @@ -71,6 +72,8 @@ public OpenFileFrame() {
rbExternal.setMnemonic('e');
rbInternal.setMnemonic('i');
cbStayOpen.setMnemonic('k');
cbAlwaysOnTop.setMnemonic('t');
cbAlwaysOnTop.addActionListener(this);
ButtonGroup gb = new ButtonGroup();
gb.add(rbExternal);
gb.add(rbInternal);
Expand Down Expand Up @@ -102,6 +105,8 @@ public void changedUpdate(DocumentEvent e) {
bOpenNew.setEnabled(false);
bOpen.setMnemonic('o');
bOpenNew.setMnemonic('n');
final Dimension dim = lExternalDrop.getPreferredSize();
lExternalDrop.setPreferredSize(new Dimension(dim.width, dim.height * 4));
lExternalDrop.setBorder(BorderFactory.createLineBorder(UIManager.getColor("controlDkShadow")));
new DropTarget(lExternalDrop, new MyDropTargetListener());
rbExternal.setSelected(true);
Expand All @@ -117,69 +122,64 @@ public void mouseClicked(MouseEvent event) {
}
});

JPanel pane = (JPanel) getContentPane();
GridBagLayout gbl = new GridBagLayout();
GridBagConstraints gbc = new GridBagConstraints();
pane.setLayout(gbl);

gbc.weightx = 1.0;
gbc.gridwidth = GridBagConstraints.REMAINDER;
gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.insets = new Insets(6, 4, 3, 8);
gbl.setConstraints(rbExternal, gbc);
pane.add(rbExternal);

gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.weightx = 1.0;
gbc.gridwidth = 1;
gbc.insets = new Insets(0, 8, 3, 0);
gbl.setConstraints(tfExternalName, gbc);
pane.add(tfExternalName);

gbc.fill = GridBagConstraints.NONE;
gbc.weightx = 0.0;
gbc.gridwidth = GridBagConstraints.REMAINDER;
gbc.insets = new Insets(0, 3, 3, 8);
gbl.setConstraints(bExternalBrowse, gbc);
pane.add(bExternalBrowse);

gbc.fill = GridBagConstraints.BOTH;
gbc.weightx = 1.0;
gbc.weighty = 1.0;
gbc.insets = new Insets(0, 8, 3, 8);
gbl.setConstraints(lExternalDrop, gbc);
pane.add(lExternalDrop);

gbc.weighty = 0.0;
gbc.weightx = 1.0;
gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.insets = new Insets(9, 4, 3, 8);
gbl.setConstraints(rbInternal, gbc);
pane.add(rbInternal);

gbc.weighty = 3.0;
gbc.fill = GridBagConstraints.BOTH;
gbc.insets = new Insets(0, 8, 3, 8);
gbl.setConstraints(lpInternal, gbc);
pane.add(lpInternal);

JPanel bPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
bPanel.add(bOpen);
bPanel.add(bOpenNew);

gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.weighty = 0.0;
gbc.insets = new Insets(3, 8, 0, 8);

gbl.setConstraints(bPanel, gbc);
pane.add(bPanel);

gbc.insets.top = 0;
gbc.insets.bottom = 6;
gbc.anchor = GridBagConstraints.CENTER;
gbc.fill = GridBagConstraints.NONE;
gbl.setConstraints(cbStayOpen, gbc);
pane.add(cbStayOpen);
final Container pane = getContentPane();
pane.setLayout(new GridBagLayout());

final JPanel mainPanel = new JPanel(new GridBagLayout());
final GridBagConstraints gbc = new GridBagConstraints();

final JPanel externalFilePanel = new JPanel(new GridBagLayout());
ViewerUtil.setGBC(gbc, 0, 0, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(0, 0, 0, 0), 0, 0);
externalFilePanel.add(tfExternalName, gbc);
ViewerUtil.setGBC(gbc, 1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE,
new Insets(0, 8, 0, 0), 0, 0);
externalFilePanel.add(bExternalBrowse, gbc);

final JPanel buttonPanel = new JPanel(new GridBagLayout());
ViewerUtil.setGBC(gbc, 0, 0, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE,
new Insets(0, 0, 0, 4), 0, 0);
buttonPanel.add(bOpen, gbc);
ViewerUtil.setGBC(gbc, 1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE,
new Insets(0, 4, 0, 0), 0, 0);
buttonPanel.add(bOpenNew, gbc);

final JPanel optionsPanel = new JPanel(new GridBagLayout());
ViewerUtil.setGBC(gbc, 0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE,
new Insets(0, 0, 0, 0), 0, 0);
optionsPanel.add(cbStayOpen, gbc);
ViewerUtil.setGBC(gbc, 1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE,
new Insets(0, 8, 0, 0), 0, 0);
optionsPanel.add(cbAlwaysOnTop, gbc);
ViewerUtil.setGBC(gbc, 2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(0, 0, 0, 0), 0, 0);
optionsPanel.add(new JPanel(), gbc);

ViewerUtil.setGBC(gbc, 0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(0, 0, 0, 0), 0, 0);
mainPanel.add(rbExternal, gbc);
ViewerUtil.setGBC(gbc, 0, 1, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(8, 0, 0, 0), 0, 0);
mainPanel.add(externalFilePanel, gbc);
ViewerUtil.setGBC(gbc, 0, 2, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(8, 0, 0, 0), 0, 0);
mainPanel.add(lExternalDrop, gbc);
ViewerUtil.setGBC(gbc, 0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(16, 0, 0, 0), 0, 0);
mainPanel.add(rbInternal, gbc);
ViewerUtil.setGBC(gbc, 0, 4, 1, 1, 1.0, 1.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH,
new Insets(8, 0, 0, 0), 0, 0);
mainPanel.add(lpInternal, gbc);
ViewerUtil.setGBC(gbc, 0, 5, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(8, 0, 0, 0), 0, 0);
mainPanel.add(buttonPanel, gbc);
ViewerUtil.setGBC(gbc, 0, 6, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(8, 0, 0, 0), 0, 0);
mainPanel.add(optionsPanel, gbc);

ViewerUtil.setGBC(gbc, 0, 0, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(8, 8, 8, 8), 0, 0);
pane.add(mainPanel, gbc);

pack();
setMinimumSize(getSize());
Expand Down Expand Up @@ -226,6 +226,8 @@ public void actionPerformed(ActionEvent event) {
} else {
openExternalFile(this, FileManager.resolve(tfExternalName.getText()));
}
} else if (event.getSource() == cbAlwaysOnTop) {
setAlwaysOnTop(cbAlwaysOnTop.isSelected());
}
}

Expand Down

0 comments on commit 4e77bd8

Please sign in to comment.