Skip to content

Various file browser fixes. #889

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
davidgiven merged 6 commits into from
Oct 24, 2026
Merged

Various file browser fixes. #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b7eb54a
Add drag-and-drop into the files window.
davidgiven Oct 18, 2026
15389b8
Add basic drag-and-drop of files.
davidgiven Oct 23, 2026
4b8fb3f
Refactor lots of things to use CompletableFutures rather than my home
davidgiven Oct 23, 2026
2436e7a
The workflow selector is stored in preferences.
davidgiven Oct 23, 2026
178af4f
Remember the current directory inside file dialogues.
davidgiven Oct 23, 2026
dcc6256
Merge.
davidgiven Oct 23, 2026
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
114 changes: 52 additions & 62 deletions java/com/cowlark/fluxengine/gui/ApplicationFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.cowlark.fluxengine.gui;

import static com.cowlark.fluxengine.gui.UiUtils.EDT_EXECUTOR;
import static com.cowlark.fluxengine.gui.PreferencesReaderWriter.WORKFLOW;
import static com.cowlark.fluxengine.gui.UiUtils.createSplitButton;
import static com.cowlark.fluxengine.gui.UiUtils.sizePts;
import static swingtree.UI.Axis.HORIZONTAL;
Expand Down Expand Up @@ -30,7 +32,6 @@
import javax.swing.JPanel;
import javax.swing.JSplitPane;
import javax.swing.JTabbedPane;
import javax.swing.SwingUtilities;
import java.awt.Color;
import java.awt.Toolkit;
import java.net.URL;
Expand All @@ -50,11 +51,12 @@ public class ApplicationFrame extends JFrame
private final FilesystemPanel filesystemPanel;

private final ImageViewModel model;
private final Var<Workflow> currentWorkflow = Var.of(Workflow.DISK_READING);
private final Var<Workflow> currentWorkflow;

ApplicationFrame(ImageViewModel model)
ApplicationFrame(ImageViewModel model, PreferencesReaderWriter preferences)
{
this.model = model;
currentWorkflow = preferences.makeEnumPreference(WORKFLOW, Workflow.DISK_READING);
summaryPanel = new SummaryPanel(model);
logPanel = new LogPanel(model);
imagePanel = new ImagePanel(model);
Expand All @@ -68,62 +70,55 @@ public class ApplicationFrame extends JFrame
setTitle("FluxEngine");

int leftPaneWidth = configurationPanel.getPreferredSize().width;
UIForTabbedPane<JTabbedPane> leftPane = tabbedPane().add(tab("Configuration").add(scrollPane()
.withPrefWidth(leftPaneWidth)
.withMinSize(leftPaneWidth, 0)
.withMaxSize(leftPaneWidth, Integer.MAX_VALUE)
.withVerticalScrollBarPolicy(UI.Active.ALWAYS)
.add(of(configurationPanel))));

UIForSplitPane<JSplitPane> topPane =
splitPane(HORIZONTAL)
.peek(pane -> {
pane.setResizeWeight(1.0);
})
.add(
TOP,
tabbedPane()
.withMinSize(100, 0)
.add(tab("Image").add(of(imagePanel)))
.add(tab("Log").add(of(logPanel)))
.add(tab("Files").add(of(filesystemPanel))))
.add(
BOTTOM,
tabbedPane()
.withMinSize(100, 0)
.add(tab("Visualiser").add(of(visualiserPanel))));

UIForPanel<JPanel> controlPanel =
panel("wrap 4, center, nogrid")
.add("aligny center", label("I want to"))
.add(
"aligny center",
comboBox(currentWorkflow,
Workflow.values(),
Workflow::getDisplayName))
.add(label(":"))
.add(
"aligny center",
panel("fill, ins 0")
.withSizeExactly(sizePts(CARD_WIDTH_PTS, CARD_HEIGHT_PTS))
.add(
"align center",
currentWorkflow,
createControlPanelCard(model)))
.add(
"aligny center",
button("Stop")
.isEnabledIf(model.getBusy())
.withForeground(Color.RED)
.onClick(model::onEmergencyStop));
UIForTabbedPane<JTabbedPane> leftPane =
tabbedPane().add(tab("Configuration").add(scrollPane()
.withPrefWidth(leftPaneWidth)
.withMinSize(leftPaneWidth, 0)
.withMaxSize(leftPaneWidth, Integer.MAX_VALUE)
.withVerticalScrollBarPolicy(UI.Active.ALWAYS)
.add(of(configurationPanel))));

UIForSplitPane<JSplitPane> topPane = splitPane(HORIZONTAL).peek(pane -> {
pane.setResizeWeight(1.0);
})
.add(
TOP,
tabbedPane().withMinSize(100, 0)
.add(tab("Image").add(of(imagePanel)))
.add(tab("Log").add(of(logPanel)))
.add(tab("Files").add(of(filesystemPanel))))
.add(
BOTTOM,
tabbedPane().withMinSize(100, 0)
.add(tab("Visualiser").add(of(visualiserPanel))));

UIForPanel<JPanel> controlPanel = panel("wrap 4, center, nogrid")
.add("aligny center", label("I want to"))
.add(
"aligny center",
comboBox(currentWorkflow, Workflow.values(), Workflow::getDisplayName))
.add(label(":"))
.add(
"aligny center",
panel("fill, ins 0")
.withSizeExactly(sizePts(CARD_WIDTH_PTS, CARD_HEIGHT_PTS))
.add(
"align center",
currentWorkflow,
createControlPanelCard(model)))
.add(
"aligny center",
button("Stop")
.isEnabledIf(model.getBusy())
.withForeground(Color.RED)
.onClick(model::onEmergencyStop));

UIForTabbedPane<JTabbedPane> bottomPane =
tabbedPane().add(tab("Summary").add(panel("fillx, wrap 1")
.add("growx, pushx, hmin 100pt", of(summaryPanel))
.add("growx", controlPanel)));

UIForSplitPane<JSplitPane> outerSplit = splitPane(HORIZONTAL)
.peek(pane -> {
UIForSplitPane<JSplitPane> outerSplit = splitPane(HORIZONTAL).peek(pane -> {
pane.setResizeWeight(0.0);
pane.setDividerSize(5);
pane.setContinuousLayout(true);
Expand All @@ -134,25 +129,20 @@ public class ApplicationFrame extends JFrame
* width without needing a manual resize or sash touch.
* withPrefWidth scales via UI.scale, so the divider must
* be scaled the same way. */
SwingUtilities.invokeLater(() -> pane.setDividerLocation(
UI.scale(leftPaneWidth)));
EDT_EXECUTOR.execute(() -> pane.setDividerLocation(UI.scale(leftPaneWidth)));
})
.add(TOP, leftPane)
.add(
BOTTOM,
splitPane(Axis.VERTICAL)
.peek(pane -> pane.setResizeWeight(1.0))
splitPane(Axis.VERTICAL).peek(pane -> pane.setResizeWeight(1.0))
.add(TOP, topPane)
.add(BOTTOM, bottomPane));

of(this)
.withOnCloseOperation(UI.OnWindowClose.DISPOSE)
.onClose(it -> {
of(this).withOnCloseOperation(UI.OnWindowClose.DISPOSE).onClose(it -> {
model.onEmergencyStop();
dispose();
System.exit(0);
})
.peek(frame -> {
}).peek(frame -> {
frame.setJMenuBar(ApplicationMenu.createMenu());
})
.add(outerSplit);
Expand Down
Loading
Loading