chore: upgrade StudioBridge v2.1.2 -> v2.1.3, add persistent-folder creation, update runbook
- Rebuild StudioBridge-2.1.3.jar from latest upstream (v2.1.3) and deploy to portable-dist - Add ensurePersistentDirectories() so the app creates ~/.studio-bridge and Profiles at startup (GUI + --sendonly) - Bundle full StudioBridge source under StudioBridge-src/ (with rebuild-jar.bat) - Update launchers (Launch-StudioBridge.bat, portable-dist/StudioBridge.bat) to v2.1.3 - Add check-update.ps1 and UPDATE.md for the step-by-step update runbook - Update README (v2.1.3, persistent data + updating sections) - Ignore StudioBridge-src/target/ build output
This commit is contained in:
ske087
@@ -0,0 +1,192 @@
|
||||
package rdiger36.StudioBridge.gui;
|
||||
|
||||
import java.awt.Toolkit;
|
||||
import java.awt.Dialog.ModalExclusionType;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.WindowAdapter;
|
||||
import java.awt.event.WindowEvent;
|
||||
import javax.swing.ImageIcon;
|
||||
import javax.swing.JDialog;
|
||||
import javax.swing.JFrame;
|
||||
import net.miginfocom.swing.MigLayout;
|
||||
import rdiger36.StudioBridge.functions.*;
|
||||
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JSeparator;
|
||||
import javax.swing.SwingConstants;
|
||||
import javax.swing.SwingUtilities;
|
||||
import javax.swing.SwingWorker;
|
||||
import javax.swing.JButton;
|
||||
|
||||
/**
|
||||
* A dialog window that checks the connectivity of a printer using ping and
|
||||
* a TCP/TLS handshake test. Both checks are executed in background threads,
|
||||
* and the results are displayed in the dialog.
|
||||
*/
|
||||
public class PrinterCheck {
|
||||
|
||||
// Prevents multiple scans from running at the same time
|
||||
boolean isRunning = false;
|
||||
|
||||
/**
|
||||
* Creates and displays a modal dialog that performs connectivity checks
|
||||
* for a printer at the given IP address.
|
||||
*
|
||||
* @param frmStudioBridge the parent frame used for positioning the dialog
|
||||
* @param IPAddress the IP address of the printer to test
|
||||
*/
|
||||
public PrinterCheck(JFrame frmStudioBridge, String IPAddress) {
|
||||
|
||||
// Create dialog
|
||||
JDialog dialPrinter = new JDialog();
|
||||
dialPrinter.setResizable(false);
|
||||
dialPrinter.setModalExclusionType(ModalExclusionType.APPLICATION_EXCLUDE);
|
||||
dialPrinter.setModal(true);
|
||||
dialPrinter.setAlwaysOnTop(true);
|
||||
dialPrinter.setTitle("Check Printer Connectivity");
|
||||
dialPrinter.setIconImage(Toolkit.getDefaultToolkit().getImage(MultiPrinterSetup.class.getResource("/icon.png")));
|
||||
dialPrinter.setBounds(100, 100, 602, 482);
|
||||
dialPrinter.toFront();
|
||||
|
||||
// Close dialog on window close
|
||||
dialPrinter.addWindowListener(new WindowAdapter() {
|
||||
public void windowClosing(WindowEvent e) {
|
||||
dialPrinter.dispose();
|
||||
}
|
||||
});
|
||||
|
||||
dialPrinter.getContentPane().setLayout(new MigLayout("", "[][]", "[][10px:10px:10px][][10px:10px:10px][][][][]"));
|
||||
|
||||
// Intro text
|
||||
JLabel lblInfo = new JLabel("<html>Here you can verify whether your printer is reachable from your machine and whether"
|
||||
+ "<br>it accepts TCP connections on port 6000. If both tests succeed, everything is working correctly."
|
||||
+ "<br>If either test fails, you should review your network settings. If the TCP handshake fails specifically,"
|
||||
+ "<br>Bambu Studio often displays a \"Connection Failed Error –1\" message.</html>");
|
||||
dialPrinter.getContentPane().add(lblInfo, "cell 0 0 2 1");
|
||||
|
||||
// Separator line
|
||||
JSeparator separator = new JSeparator();
|
||||
dialPrinter.getContentPane().add(separator, "cell 0 1 2 1,growx,aligny center");
|
||||
|
||||
// IP information
|
||||
JLabel lblInfoIP = new JLabel("Connectivity check for the printer witc the IP-Address: " + IPAddress);
|
||||
dialPrinter.getContentPane().add(lblInfoIP, "cell 0 2 2 1,alignx center,aligny top");
|
||||
|
||||
// Ping test label
|
||||
JLabel lblPing = new JLabel("Is printer reachable?");
|
||||
dialPrinter.getContentPane().add(lblPing, "cell 0 4");
|
||||
|
||||
// Ping test status
|
||||
JLabel lblPingState = new JLabel("Please wait...");
|
||||
lblPingState.setIcon(new ImageIcon(Toolkit.getDefaultToolkit().getImage(MultiPrinterSetup.class.getResource("/load.gif"))));
|
||||
lblPingState.setHorizontalTextPosition(SwingConstants.LEFT);
|
||||
lblPingState.setVerticalTextPosition(SwingConstants.CENTER);
|
||||
dialPrinter.getContentPane().add(lblPingState, "cell 1 4");
|
||||
|
||||
// Handshake test label
|
||||
JLabel lblHandshake = new JLabel("TCP handshake ");
|
||||
dialPrinter.getContentPane().add(lblHandshake, "cell 0 5");
|
||||
|
||||
// Handshake test status
|
||||
JLabel lblHandshakeState = new JLabel("Please wait...");
|
||||
lblHandshakeState.setIcon(new ImageIcon(Toolkit.getDefaultToolkit().getImage(MultiPrinterSetup.class.getResource("/load.gif"))));
|
||||
lblHandshakeState.setHorizontalTextPosition(SwingConstants.LEFT);
|
||||
lblHandshakeState.setVerticalTextPosition(SwingConstants.CENTER);
|
||||
dialPrinter.getContentPane().add(lblHandshakeState, "cell 1 5");
|
||||
|
||||
// Retry button
|
||||
JButton btnRetry = new JButton("Retry");
|
||||
dialPrinter.getContentPane().add(btnRetry, "cell 0 7 2 1,alignx center");
|
||||
|
||||
// Start scan automatically when dialog opens
|
||||
dialPrinter.addWindowListener(new WindowAdapter() {
|
||||
@Override public void windowOpened(WindowEvent e) {
|
||||
new SwingWorker<Void, Void>() {
|
||||
@Override protected Void doInBackground() {
|
||||
startScan(IPAddress, lblPingState, lblHandshakeState);
|
||||
return null;
|
||||
}
|
||||
}.execute();
|
||||
}
|
||||
});
|
||||
|
||||
// Retry button action
|
||||
btnRetry.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent arg0) {
|
||||
// Make sure no scan is running
|
||||
if (!isRunning)
|
||||
new Thread(() -> startScan(IPAddress, lblPingState, lblHandshakeState)).start();
|
||||
}
|
||||
});
|
||||
|
||||
dialPrinter.requestFocus();
|
||||
dialPrinter.pack();
|
||||
dialPrinter.setLocationRelativeTo(frmStudioBridge);
|
||||
dialPrinter.setVisible(true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes a ping check and a TLS handshake against the given printer IP
|
||||
* and updates the provided label components with the results.
|
||||
*
|
||||
* @param IPAddress the printer's IP address
|
||||
* @param lblPingState label that displays ping test results
|
||||
* @param lblHandshakeState label that displays handshake results
|
||||
*/
|
||||
private void startScan(String IPAddress, JLabel lblPingState, JLabel lblHandshakeState) {
|
||||
|
||||
isRunning = true;
|
||||
|
||||
// Set both indicators to "loading"
|
||||
SwingUtilities.invokeLater(() -> {
|
||||
lblPingState.setText("Please wait...");
|
||||
lblPingState.setIcon(new ImageIcon(Toolkit.getDefaultToolkit().getImage(MultiPrinterSetup.class.getResource("/load.gif"))));
|
||||
|
||||
lblHandshakeState.setText("Please wait...");
|
||||
lblHandshakeState.setIcon(new ImageIcon(Toolkit.getDefaultToolkit().getImage(MultiPrinterSetup.class.getResource("/load.gif"))));
|
||||
});
|
||||
|
||||
// Execute ping test
|
||||
if (Connectivity.pingPrinter(IPAddress)) {
|
||||
|
||||
// Ping successful
|
||||
SwingUtilities.invokeLater(() -> {
|
||||
lblPingState.setText("Printer is reachable from your computer!");
|
||||
lblPingState.setIcon(Resize.setNewImageIconSize(new ImageIcon(ToolInfo.class.getResource("/success.png")), 16, 16));
|
||||
});
|
||||
|
||||
// Execute handshake test
|
||||
if (Connectivity.checkTLSHandshake(IPAddress)) {
|
||||
|
||||
// Handshake successful
|
||||
SwingUtilities.invokeLater(() -> {
|
||||
lblHandshakeState.setText("Handshake was sucessfully between computer and printer!");
|
||||
lblHandshakeState.setIcon(Resize.setNewImageIconSize(new ImageIcon(ToolInfo.class.getResource("/success.png")), 16, 16));
|
||||
});
|
||||
|
||||
} else {
|
||||
|
||||
// Handshake failed
|
||||
SwingUtilities.invokeLater(() -> {
|
||||
lblHandshakeState.setText("Error on Handshake between computer and printer!");
|
||||
lblHandshakeState.setIcon(Resize.setNewImageIconSize(new ImageIcon(ToolInfo.class.getResource("/delete.png")), 16, 16));
|
||||
});
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
// Printer not reachable
|
||||
SwingUtilities.invokeLater(() -> {
|
||||
lblPingState.setText("Printer is not reachable from your computer!");
|
||||
lblPingState.setIcon(Resize.setNewImageIconSize(new ImageIcon(ToolInfo.class.getResource("/delete.png")), 16, 16));
|
||||
|
||||
lblHandshakeState.setText("Printer is not reachable from your computer!");
|
||||
lblHandshakeState.setIcon(Resize.setNewImageIconSize(new ImageIcon(ToolInfo.class.getResource("/delete.png")), 16, 16));
|
||||
});
|
||||
}
|
||||
|
||||
isRunning = false;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user