From: krakjoe Date: Fri, 29 Nov 2013 13:20:26 +0000 (+0000) Subject: update ui X-Git-Tag: php-5.6.0alpha1~110^2~30^2~40 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22fd520fb5839e8099d3041bbc0cc6e143d99414;p=php update ui echo checkbox move input to bottom like a normal console --- diff --git a/tutorials/java/dist/phpdbg-ui.jar b/tutorials/java/dist/phpdbg-ui.jar index 9df88060a6..f317aa4769 100644 Binary files a/tutorials/java/dist/phpdbg-ui.jar and b/tutorials/java/dist/phpdbg-ui.jar differ diff --git a/tutorials/java/src/phpdbg/ui/DebugSocket.java b/tutorials/java/src/phpdbg/ui/DebugSocket.java index eb46af016b..05db2077c3 100644 --- a/tutorials/java/src/phpdbg/ui/DebugSocket.java +++ b/tutorials/java/src/phpdbg/ui/DebugSocket.java @@ -70,7 +70,12 @@ public class DebugSocket extends Socket implements Runnable { command = main.getInputField().getText(); /* send command to stdin socket */ - if (command != null) { + if (command != null) { + if (main.isEchoing()) { + main.getOutputField().appendANSI("remote> "); + main.getOutputField().appendANSI(command); + main.getOutputField().appendANSI("\n"); + } output.write( command.getBytes()); output.write("\n".getBytes()); diff --git a/tutorials/java/src/phpdbg/ui/JConsole.form b/tutorials/java/src/phpdbg/ui/JConsole.form index 69ab5773a4..224a13aeef 100644 --- a/tutorials/java/src/phpdbg/ui/JConsole.form +++ b/tutorials/java/src/phpdbg/ui/JConsole.form @@ -42,14 +42,14 @@ - + - - + + - + @@ -59,7 +59,12 @@ - + + + + + + @@ -70,18 +75,23 @@ - + - - - + + + + + + + + @@ -89,54 +99,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -146,7 +108,7 @@ - + @@ -165,8 +127,8 @@ + - @@ -175,7 +137,7 @@ - + @@ -183,5 +145,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tutorials/java/src/phpdbg/ui/JConsole.java b/tutorials/java/src/phpdbg/ui/JConsole.java index 2958cb90ee..bf85012013 100644 --- a/tutorials/java/src/phpdbg/ui/JConsole.java +++ b/tutorials/java/src/phpdbg/ui/JConsole.java @@ -40,10 +40,6 @@ public class JConsole extends javax.swing.JDialog { stdoutPopupMenu = new javax.swing.JPopupMenu(); resetStdout = new javax.swing.JMenuItem(); - mainSplit = new javax.swing.JSplitPane(); - input = new javax.swing.JTextField(); - outputScrollPane = new javax.swing.JScrollPane(); - output = new phpdbg.ui.JTerminalPane(); host = new javax.swing.JTextField(); stdoutPort = new javax.swing.JTextField(); stdinCheckBox = new javax.swing.JCheckBox(); @@ -51,6 +47,10 @@ public class JConsole extends javax.swing.JDialog { openButton = new javax.swing.JButton(); stdinPort = new javax.swing.JTextField(); hostLabel = new javax.swing.JLabel(); + input = new javax.swing.JTextField(); + outputScrollPane = new javax.swing.JScrollPane(); + output = new phpdbg.ui.JTerminalPane(); + echoCheckBox = new javax.swing.JCheckBox(); resetStdout.setText("Clear"); resetStdout.addActionListener(new java.awt.event.ActionListener() { @@ -63,29 +63,11 @@ public class JConsole extends javax.swing.JDialog { setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("phpdbg jui"); - mainSplit.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); - mainSplit.setToolTipText(""); - - input.setToolTipText(""); - input.setEnabled(false); - input.addKeyListener(new java.awt.event.KeyAdapter() { - public void keyReleased(java.awt.event.KeyEvent evt) { - inputKeyReleased(evt); - } - }); - mainSplit.setLeftComponent(input); - - output.setFont(new java.awt.Font("DialogInput", 0, 12)); // NOI18N - output.setComponentPopupMenu(stdoutPopupMenu); - outputScrollPane.setViewportView(output); - - mainSplit.setRightComponent(outputScrollPane); - host.setText("127.0.0.1"); host.setToolTipText("Set the hostname, or IPv4 address of the machine running the phpdbg remote console server"); stdoutPort.setText("8000"); - stdoutPort.setToolTipText(""); + stdoutPort.setToolTipText("By default, stdin * 2"); stdinCheckBox.setSelected(true); stdinCheckBox.setText("stdin:"); @@ -95,8 +77,8 @@ public class JConsole extends javax.swing.JDialog { stdoutCheckBox.setText("stdout:"); stdoutCheckBox.setToolTipText("Set the port for stdout, or unset to disable stdout"); + openButton.setText("Connect"); openButton.setActionCommand("open"); - openButton.setLabel("open"); openButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { openButtonActionPerformed(evt); @@ -104,10 +86,27 @@ public class JConsole extends javax.swing.JDialog { }); stdinPort.setText("4000"); - stdinPort.setToolTipText(""); + stdinPort.setToolTipText("The listen port passed to phpdbg (-l option)"); hostLabel.setText("Hostname:"); + input.setToolTipText("Enter phpdbg commands here !"); + input.setEnabled(false); + input.addKeyListener(new java.awt.event.KeyAdapter() { + public void keyReleased(java.awt.event.KeyEvent evt) { + inputKeyReleased(evt); + } + }); + + output.setFont(new java.awt.Font("DialogInput", 0, 12)); // NOI18N + output.setComponentPopupMenu(stdoutPopupMenu); + outputScrollPane.setViewportView(output); + + echoCheckBox.setSelected(true); + echoCheckBox.setToolTipText("Check to echo sent commands in output"); + echoCheckBox.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); + echoCheckBox.setLabel("echo"); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -115,11 +114,11 @@ public class JConsole extends javax.swing.JDialog { .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(mainSplit) - .addGroup(layout.createSequentialGroup() + .addComponent(outputScrollPane) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(hostLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(host, javax.swing.GroupLayout.DEFAULT_SIZE, 359, Short.MAX_VALUE) + .addComponent(host, javax.swing.GroupLayout.DEFAULT_SIZE, 345, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(stdinCheckBox) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) @@ -129,24 +128,32 @@ public class JConsole extends javax.swing.JDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(stdoutPort, javax.swing.GroupLayout.PREFERRED_SIZE, 60, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(openButton))) + .addComponent(openButton, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(input) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(echoCheckBox))) .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addComponent(mainSplit, javax.swing.GroupLayout.DEFAULT_SIZE, 428, Short.MAX_VALUE) + .addComponent(outputScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 403, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(host, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(openButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(input, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(echoCheckBox)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(stdoutPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(stdinCheckBox) .addComponent(stdoutCheckBox) .addComponent(stdinPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hostLabel))) + .addComponent(hostLabel) + .addComponent(host, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(openButton)) .addContainerGap()) ); @@ -238,6 +245,10 @@ public class JConsole extends javax.swing.JDialog { return connected; } + public Boolean isEchoing() { + return echoCheckBox.isSelected(); + } + public void setConnected(Boolean isConnected) { synchronized(this) { if (isConnected) { @@ -353,10 +364,10 @@ public class JConsole extends javax.swing.JDialog { private static CommandHistory history = new CommandHistory(); // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JCheckBox echoCheckBox; private javax.swing.JTextField host; private javax.swing.JLabel hostLabel; private javax.swing.JTextField input; - private javax.swing.JSplitPane mainSplit; private javax.swing.JButton openButton; private phpdbg.ui.JTerminalPane output; private javax.swing.JScrollPane outputScrollPane;