hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#1305] Bigger default preset window size + remember column width

Browse Source
This commit is contained in:
SiboVG 2022-08-13 15:35:00 +02:00
parent c0ba04edac
commit caac0040fc
8 changed files with 84 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swing/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java
View File

@ -164,8 +164,10 @@ public class EditDecalDialog extends JDialog {
this.add(panel); this.add(panel);
GUIUtil.rememberWindowSize(this);
GUIUtil.setDisposableDialogOptions(this, okButton); GUIUtil.setDisposableDialogOptions(this, okButton);
GUIUtil.rememberWindowSize(this);
this.setLocationByPlatform(true);
GUIUtil.rememberWindowPosition(this);
} }

2
swing/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java
View File

@ -116,6 +116,8 @@ public class OptimizationPlotDialog extends JDialog {
GUIUtil.setDisposableDialogOptions(this, close); GUIUtil.setDisposableDialogOptions(this, close);
GUIUtil.rememberWindowSize(this); GUIUtil.rememberWindowSize(this);
this.setLocationByPlatform(true);
GUIUtil.rememberWindowPosition(this);
} }

14
swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
View File

@ -2,6 +2,7 @@ package net.sf.openrocket.gui.dialogs.preset;
import java.awt.Dialog; import java.awt.Dialog;
import java.awt.Dimension;
import java.awt.Window; import java.awt.Window;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@ -78,6 +79,10 @@ public class ComponentPresetChooserDialog extends JDialog {
this.presetType = component.getPresetType(); this.presetType = component.getPresetType();
this.presets = Application.getComponentPresetDao().listForType(component.getPresetType()); this.presets = Application.getComponentPresetDao().listForType(component.getPresetType());
if (owner.getParent() != null) {
this.setPreferredSize(new Dimension((int)(0.7 * owner.getParent().getWidth()), (int) (0.7 * owner.getParent().getHeight())));
this.setLocationRelativeTo(owner.getParent());
}
List<TypedKey<?>> displayedColumnKeys = Arrays.asList(component.getPresetType().getDisplayedColumns()); List<TypedKey<?>> displayedColumnKeys = Arrays.asList(component.getPresetType().getDisplayedColumns());
{ {
@ -138,7 +143,7 @@ public class ComponentPresetChooserDialog extends JDialog {
// need to create componentSelectionTable before filter checkboxes, // need to create componentSelectionTable before filter checkboxes,
// but add to panel after // but add to panel after
componentSelectionTable = new ComponentPresetTable(presetType, presets, displayedColumnKeys); componentSelectionTable = new ComponentPresetTable(presetType, presets, displayedColumnKeys);
// GUIUtil.setAutomaticColumnTableWidths(componentSelectionTable, 20); GUIUtil.setAutomaticColumnTableWidths(componentSelectionTable, 20);
int w = componentSelectionTable.getRowHeight() + 4; int w = componentSelectionTable.getRowHeight() + 4;
XTableColumnModel tm = componentSelectionTable.getXColumnModel(); XTableColumnModel tm = componentSelectionTable.getXColumnModel();
//TableColumn tc = componentSelectionTable.getColumnModel().getColumn(0); //TableColumn tc = componentSelectionTable.getColumnModel().getColumn(0);
@ -151,7 +156,7 @@ public class ComponentPresetChooserDialog extends JDialog {
JScrollPane scrollpane = new JScrollPane(); JScrollPane scrollpane = new JScrollPane();
scrollpane.setViewportView(componentSelectionTable); scrollpane.setViewportView(componentSelectionTable);
panel.add(scrollpane, "grow, width 700lp, height 300lp, pushy, spanx, wrap rel"); panel.add(scrollpane, "grow, pushy, spanx, wrap rel");
panel.add(new StyledLabel(String.format("<html>%s %s</html>", Chars.UP_ARROW, trans.get("lbl.favorites")), -1), "spanx, gapleft 5px, wrap para"); panel.add(new StyledLabel(String.format("<html>%s %s</html>", Chars.UP_ARROW, trans.get("lbl.favorites")), -1), "spanx, gapleft 5px, wrap para");
@ -168,8 +173,11 @@ public class ComponentPresetChooserDialog extends JDialog {
this.add(panel); this.add(panel);
GUIUtil.rememberWindowSize(this);
GUIUtil.setDisposableDialogOptions(this, closeButton); GUIUtil.setDisposableDialogOptions(this, closeButton);
GUIUtil.rememberWindowSize(this);
this.setLocationByPlatform(true);
GUIUtil.rememberWindowPosition(this);
GUIUtil.rememberTableColumnWidths(componentSelectionTable, "Presets" + component.getClass().getCanonicalName());
updateFilters(); updateFilters();
} }

3
swing/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java
View File

@ -94,8 +94,9 @@ public class SlideShowDialog extends JDialog {
addKeyActions(); addKeyActions();
GUIUtil.setDisposableDialogOptions(this, nextButton); GUIUtil.setDisposableDialogOptions(this, nextButton);
nextButton.grabFocus(); nextButton.grabFocus();
GUIUtil.rememberWindowPosition(this);
GUIUtil.rememberWindowSize(this); GUIUtil.rememberWindowSize(this);
this.setLocationByPlatform(true);
GUIUtil.rememberWindowPosition(this);
// this.setAlwaysOnTop(true); // this.setAlwaysOnTop(true);
} }

1
swing/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -241,6 +241,7 @@ public class BasicFrame extends JFrame {
GUIUtil.rememberWindowSize(this); GUIUtil.rememberWindowSize(this);
this.setLocationByPlatform(true); this.setLocationByPlatform(true);
GUIUtil.rememberWindowPosition(this);
GUIUtil.setWindowIcons(this); GUIUtil.setWindowIcons(this);

2
swing/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java
View File

@ -168,6 +168,8 @@ public class SimulationPlotDialog extends JDialog {
GUIUtil.setDisposableDialogOptions(this, button); GUIUtil.setDisposableDialogOptions(this, button);
GUIUtil.rememberWindowSize(this); GUIUtil.rememberWindowSize(this);
this.setLocationByPlatform(true);
GUIUtil.rememberWindowPosition(this);
} }
private boolean doPngExport(ChartPanel chartPanel, JFreeChart chart){ private boolean doPngExport(ChartPanel chartPanel, JFreeChart chart){

32
swing/src/net/sf/openrocket/gui/util/GUIUtil.java
View File

@ -13,12 +13,14 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -52,9 +54,11 @@ import javax.swing.SwingUtilities;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.border.TitledBorder; import javax.swing.border.TitledBorder;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import javax.swing.event.TableColumnModelListener;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableColumnModel; import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.DefaultTableModel; import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel; import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel; import javax.swing.table.TableModel;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
@ -65,6 +69,7 @@ import javax.swing.tree.TreeSelectionModel;
import net.sf.openrocket.gui.Resettable; import net.sf.openrocket.gui.Resettable;
import net.sf.openrocket.logging.Markers; import net.sf.openrocket.logging.Markers;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.Invalidatable; import net.sf.openrocket.util.Invalidatable;
@ -348,6 +353,33 @@ public class GUIUtil {
} }
} }
public static void rememberTableColumnWidths(final JTable table, String keyName) {
final String key = keyName == null ? table.getClass().getName() : keyName;
for (int i = 0; i < table.getColumnCount(); i++) {
final int column = i;
table.getColumnModel().getColumn(i).addPropertyChangeListener(new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals("width")) {
log.debug("Storing width of " + table.getName() + "-" + table.getColumnName(column) + ": " + table.getColumnModel().getColumn(column).getWidth());
((SwingPreferences) Application.getPreferences()).setTableColumnWidth(
key, column, table.getColumnModel().getColumn(column).getWidth());
}
}
});
final Integer width = ((SwingPreferences) Application.getPreferences()).getTableColumnWidth(
key, column);
if (width != null) {
table.getColumnModel().getColumn(column).setPreferredWidth(width);
}
}
}
public static void rememberTableColumnWidths(final JTable table) {
rememberTableColumnWidths(table, null);
}
/** /**
* Automatically remember the position of a window. The position is stored in the user preferences * Automatically remember the position of a window. The position is stored in the user preferences

28
swing/src/net/sf/openrocket/gui/util/SwingPreferences.java
View File

@ -402,6 +402,34 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
storeVersion(); storeVersion();
} }
public Integer getTableColumnWidth(String keyName, int columnIdx) {
String pref = PREFNODE.node("tables").get(
"cw." + keyName + "." + columnIdx, null);
if (pref == null)
return null;
try {
return Integer.parseInt(pref);
} catch (NumberFormatException e) {
return null;
}
}
public Integer getTableColumnWidth(Class<?> c, int columnIdx) {
return getTableColumnWidth(c.getCanonicalName(), columnIdx);
}
public void setTableColumnWidth(String keyName, int columnIdx, Integer width) {
PREFNODE.node("tables").put(
"cw." + keyName + "." + columnIdx, width.toString());
storeVersion();
}
public void setTableColumnWidth(Class<?> c, int columnIdx, Integer width) {
setTableColumnWidth(c.getCanonicalName(), columnIdx, width);
}
/** /**
* this class returns a java.awt.Color object for the specified key. * this class returns a java.awt.Color object for the specified key.
* you can pass (java.awt.Color) null to the second argument to * you can pass (java.awt.Color) null to the second argument to