SiboVG
|
4dbbc0f4fd
|
Fix JMenu deselection issue
|
2024-08-11 12:14:25 +02:00 |
|
SiboVG
|
a38230a05e
|
Merge branch 'refs/heads/unstable' into material-groups
# Conflicts:
# core/src/main/java/info/openrocket/core/database/Databases.java
# core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java
# core/src/main/java/info/openrocket/core/material/Material.java
# swing/src/main/java/info/openrocket/swing/gui/configdialog/ParachuteConfig.java
# swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java
# swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java
# swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/MaterialEditPanel.java
# swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java
# swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java
|
2024-08-09 20:46:55 +02:00 |
|
SiboVG
|
9f247a6ef9
|
Also use MaterialComboBox for other material widgets
|
2024-08-09 19:05:58 +02:00 |
|
SiboVG
|
c963d8104c
|
Merge branch 'refs/heads/unstable' into material-groups
# Conflicts:
# core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java
# core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java
|
2024-08-09 18:30:18 +02:00 |
|
SiboVG
|
d6cb2e84cc
|
Refactor to GroupableAndSearchableComboBox
|
2024-08-09 18:24:31 +02:00 |
|
SiboVG
|
383bb4e4bb
|
Use JCheckBoxMenuItem instead of custom painting
|
2024-08-09 18:16:53 +02:00 |
|
SiboVG
|
cb86446b22
|
Revert "fix" for going outside menu group
|
2024-08-09 18:07:24 +02:00 |
|
SiboVG
|
1c5bddf54b
|
Fix small numerical issues
|
2024-08-09 05:37:47 +02:00 |
|
SiboVG
|
64b2b9a40e
|
Fix combobox infer
|
2024-08-09 05:31:17 +02:00 |
|
SiboVG
|
aebb8b87d2
|
Use enhanced switch
|
2024-08-09 05:22:01 +02:00 |
|
SiboVG
|
fd3f2e167c
|
Use enhanced for-loops
|
2024-08-09 05:20:27 +02:00 |
|
SiboVG
|
71d1c02070
|
Simplify map operations
|
2024-08-09 05:19:07 +02:00 |
|
SiboVG
|
0533ba23a0
|
Use Comparator.comparing
|
2024-08-09 05:18:30 +02:00 |
|
SiboVG
|
eaf59aeb75
|
Replace Collections.sort with List.sort
|
2024-08-09 05:18:08 +02:00 |
|
SiboVG
|
8df1fa881a
|
Collapse catch blocks
|
2024-08-09 05:17:16 +02:00 |
|
SiboVG
|
3f8b35343c
|
Replace try finally with try with resources
|
2024-08-09 05:16:41 +02:00 |
|
SiboVG
|
595406ab68
|
Replace explicit type with <>
|
2024-08-09 05:15:51 +02:00 |
|
SiboVG
|
aef972699a
|
Performance improvements
|
2024-08-09 05:14:37 +02:00 |
|
SiboVG
|
9cde5c9766
|
Replace wildcard imports with single imports
|
2024-08-09 05:07:41 +02:00 |
|
SiboVG
|
af7f26ab48
|
Remove unused imports
|
2024-08-09 04:36:51 +02:00 |
|
SiboVG
|
a27ab137cc
|
Somewhat fix menu items still being opened when not hovered over
|
2024-08-09 01:07:39 +02:00 |
|
SiboVG
|
e4ca56f8e8
|
Refactor SearchableAndCategorizableComboBox to group instead of category
|
2024-08-09 00:05:48 +02:00 |
|
SiboVG
|
117d7d79df
|
Ensure to set old material to doc material
|
2024-08-08 23:57:13 +02:00 |
|
SiboVG
|
2a53ee9420
|
Allow taking group from user-defined materials
|
2024-08-08 23:40:31 +02:00 |
|
SiboVG
|
cee3cb04ae
|
Fix component material not being updated after editing it in the preferences
|
2024-08-08 23:36:58 +02:00 |
|
SiboVG
|
370e6bffd7
|
Fix hiding popups after selection
|
2024-08-08 23:04:37 +02:00 |
|
SiboVG
|
9f0b7c9b15
|
Check when a material to be removed is in use by a component
|
2024-08-08 22:43:21 +02:00 |
|
SiboVG
|
e63e521e90
|
Refactor material addition/removal
|
2024-08-08 22:01:29 +02:00 |
|
SiboVG
|
b5ff851263
|
Disable material doc material just to be sure
|
2024-08-08 21:43:40 +02:00 |
|
SiboVG
|
09d6137ac0
|
Use dedicated methods for adding/removing doc materials
|
2024-08-08 19:24:17 +02:00 |
|
SiboVG
|
00acb8b68f
|
Always start from a blank material when creating a new custom material
|
2024-08-07 23:57:01 +02:00 |
|
SiboVG
|
48e9536769
|
Goddamn, this index issue caused me so much trouble
Fixes updating combobox after adding custom material
|
2024-08-07 23:12:42 +02:00 |
|
SiboVG
|
16bd21bb90
|
Fix triggering of model after item change
|
2024-08-07 21:40:34 +02:00 |
|
SiboVG
|
b0feb33459
|
Construct itemGroup within SearchableAndCategorizableComboBox
|
2024-08-07 21:27:15 +02:00 |
|
SiboVG
|
354843deb9
|
Refactor SearchableAndCategorizableComboBox
|
2024-08-07 18:56:31 +02:00 |
|
SiboVG
|
e3ce3ac7dd
|
Refactor SearchableAndCategorizableComboBox to use Group and Groupable interface
|
2024-08-07 14:19:46 +02:00 |
|
SiboVG
|
2e8accf097
|
Also add checkmark to selected group
|
2024-08-07 12:48:41 +02:00 |
|
SiboVG
|
693f2625ba
|
Update materialmodel after combobox change
|
2024-08-07 12:45:28 +02:00 |
|
SiboVG
|
bb1d3dd3e8
|
Use == instead of equals for item check
|
2024-08-07 12:39:13 +02:00 |
|
SiboVG
|
f2fbcc69d3
|
Set material group non-null in the constructor
|
2024-08-07 12:17:34 +02:00 |
|
SiboVG
|
829109ee2d
|
Display user-defined materials with (ud) prefix
|
2024-08-07 12:01:08 +02:00 |
|
SiboVG
|
faeec8e854
|
Use enhanced loop
|
2024-08-07 11:51:02 +02:00 |
|
SiboVG
|
98da7340fe
|
Add checkmark for the currently selected item
|
2024-08-07 11:28:15 +02:00 |
|
JoePfeiffer
|
0e437a8cb7
|
Split UniqueID functionality into new ModID class and java UUID
|
2024-07-26 06:46:32 -06:00 |
|
SiboVG
|
8dcb120cc5
|
Add option to select material group in material editor
|
2024-07-24 22:48:21 +02:00 |
|
SiboVG
|
5d45d075ce
|
Save document materials in document preferences
|
2024-07-23 00:34:59 +02:00 |
|
SiboVG
|
500c75aeab
|
Save document preferences in design file
|
2024-07-22 00:02:08 +02:00 |
|
SiboVG
|
bb9e17d0b4
|
Refactor ORPreferences to ApplicationPreferences
|
2024-07-21 23:14:19 +02:00 |
|
SiboVG
|
c86c04bd42
|
Move ORPreferences to preferences package
|
2024-07-21 23:10:41 +02:00 |
|
SiboVG
|
464d42fb81
|
Rename Preferences to ORReferences
To not cause confusion with java.util.prefs
|
2024-07-21 22:00:48 +02:00 |
|