remove edit Color button (moved to the text entry )

dzmipt · Apr 19, 2024 · 483f5da · 483f5da
1 parent f6c8a57
commit 483f5da
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/src/studio/ui/ServerForm.java b/src/studio/ui/ServerForm.java
@@ -10,6 +10,8 @@
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
@@ -120,8 +122,6 @@ private void initComponents() {
         txtPassword = new javax.swing.JPasswordField();
         colorLabel = new javax.swing.JLabel();
         jSeparator3 = new javax.swing.JSeparator();
-        btnEditColor = new javax.swing.JButton();
-        btnEditColor.setName("editColor");
         sampleTextOnBackgroundTextField = new javax.swing.JTextField();
         sampleTextOnBackgroundTextField.setName("sampleTextOnBackground");
         authenticationMechanism = new javax.swing.JComboBox();
@@ -155,16 +155,14 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         colorLabel.setText("Color");
 
-        btnEditColor.setText("Edit Color");
-        btnEditColor.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                onColor(evt);
+        sampleTextOnBackgroundTextField.setText("Sample text on background (click to modify)");
+        sampleTextOnBackgroundTextField.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                onColorAction();
             }
         });
 
-        sampleTextOnBackgroundTextField.setText("Sample text on background");
-
-
         authMethodLabel.setText("Auth. Method");
 
         tlsLabel.setText("Use TLS");
@@ -188,7 +186,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                                 .addPreferredGap(RELATED, 21, Short.MAX_VALUE)
                                 .addGroup(layout.createParallelGroup(LEADING)
                                         .addGroup(layout.createSequentialGroup()
-                                                .addComponent(btnEditColor)
                                                 .addPreferredGap(RELATED, DEFAULT_SIZE, Short.MAX_VALUE)
                                                 .addComponent(cancelButton)
                                                 .addPreferredGap(RELATED)
@@ -273,8 +270,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                                 .addPreferredGap(RELATED)
                                 .addGroup(layout.createParallelGroup(BASELINE)
                                         .addComponent(okButton)
-                                        .addComponent(cancelButton)
-                                        .addComponent(btnEditColor))
+                                        .addComponent(cancelButton))
                                 .addContainerGap())
         );
     }
@@ -316,7 +312,7 @@ private void onCancel(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_onCance
         cancel();
     }
 
-    private void onColor(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_onColor
+    private void onColorAction() {//GEN-FIRST:event_onColor
         Color result = ColorChooser.chooseColor(this, "Select background color for editor",
                 sampleTextOnBackgroundTextField.getBackground());
 
@@ -325,7 +321,6 @@ private void onColor(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_onColor
         }
     }
 
-    private javax.swing.JButton btnEditColor;
     private javax.swing.JTextField sampleTextOnBackgroundTextField;
     private javax.swing.JComboBox<String> authenticationMechanism;
     private javax.swing.JButton cancelButton;

diff --git a/test-integration/studio/ui/ServerTest.java b/test-integration/studio/ui/ServerTest.java
@@ -66,7 +66,7 @@ public void testChangeBackgroundColor() {
 
         Color newColor = new Color (171, 255, 171);
         ColorChooser.mock(newColor);
-        serverDialog.button("editColor").click();
+        sample.click();
         bgColor = execute(() -> sample.target().getBackground());
         assertEquals(newColor, bgColor);