svn commit: r1793967 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java xdocs/changes.xml

[mi...@apache.org]

Author: milamber
Date: Fri May  5 07:38:45 2017
New Revision: 1793967

URL: http://svn.apache.org/viewvc?rev=1793967&view=rev
Log:
HTTP Test Script Recorder : Port field is very small under some Windows LAF
HTTP(S) Test Script Recorder panel have some fields with bad size on HiDPI screen or GTK+ L&F on Linux/XWayland
Not needed to use the MinimumSize or PreferredSize for UI panel/components, let's the UI manager set the good dimension depending the L&F settings
Using the icon size settings for images on control panel

Bugzilla Id: 60995

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1793967&r1=1793966&r2=1793967&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Fri May  5 07:38:45 2017
@@ -68,6 +68,7 @@ import org.apache.jmeter.gui.UnsharedCom
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
 import org.apache.jmeter.gui.util.HorizontalPanel;
+import org.apache.jmeter.gui.util.JMeterToolBar;
 import org.apache.jmeter.gui.util.MenuFactory;
 import org.apache.jmeter.gui.util.PowerTableModel;
 import org.apache.jmeter.gui.util.VerticalPanel;
@@ -670,21 +671,24 @@ public class ProxyControlGui extends Log
     }
 
     private JPanel createControls() {
+
+        String iconSize = JMeterUtils.getPropDefault(JMeterToolBar.TOOLBAR_ICON_SIZE, JMeterToolBar.DEFAULT_TOOLBAR_ICON_SIZE); 
+
         start = new JButton(JMeterUtils.getResString("start")); // $NON-NLS-1$
-        ImageIcon startImage = JMeterUtils.getImage("toolbar/32x32/arrow-right-3.png");
+        ImageIcon startImage = JMeterUtils.getImage("toolbar/" + iconSize + "/arrow-right-3.png");
         start.setIcon(startImage);
         start.addActionListener(this);
         start.setActionCommand(START);
         start.setEnabled(true);
         
         stop = new JButton(JMeterUtils.getResString("stop")); // $NON-NLS-1$
-        ImageIcon stopImage = JMeterUtils.getImage("toolbar/32x32/process-stop-4.png");
+        ImageIcon stopImage = JMeterUtils.getImage("toolbar/" + iconSize + "/process-stop-4.png");
         stop.setIcon(stopImage);
         stop.addActionListener(this);
         stop.setActionCommand(STOP);
         stop.setEnabled(false);
 
-        ImageIcon restartImage = JMeterUtils.getImage("toolbar/32x32/edit-redo-7.png");
+        ImageIcon restartImage = JMeterUtils.getImage("toolbar/" + iconSize + "/edit-redo-7.png");
         restart = new JButton(JMeterUtils.getResString("restart")); // $NON-NLS-1$
         restart.setIcon(restartImage);
         restart.addActionListener(this);
@@ -692,8 +696,6 @@ public class ProxyControlGui extends Log
         restart.setEnabled(false);
 
         JPanel panel = new JPanel();
-        panel.setMinimumSize(new Dimension(100, 70));
-        panel.setPreferredSize(new Dimension(100, 70));
         panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
                 JMeterUtils.getResString("proxy_general_lifecycle"))); // $NON-NLS-1$
         panel.add(start);
@@ -738,8 +740,6 @@ public class ProxyControlGui extends Log
         gbc.weighty = 1;
 
         JPanel gPane = new JPanel(gridBagLayout);
-        gPane.setMinimumSize(new Dimension(400,50));
-        gPane.setPreferredSize(new Dimension(400,50));
         gPane.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
                 JMeterUtils.getResString("proxy_general_settings"))); // $NON-NLS-1$
         gPane.add(panel, gbc.clone());
@@ -791,7 +791,6 @@ public class ProxyControlGui extends Log
         }
         m.addElement(USE_DEFAULT_HTTP_IMPL);
         samplerTypeName = new JComboBox<>(m);
-        samplerTypeName.setPreferredSize(new Dimension(150, 20));
         samplerTypeName.setSelectedItem(USE_DEFAULT_HTTP_IMPL);
         samplerTypeName.addItemListener(this);
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1793967&r1=1793966&r2=1793967&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri May  5 07:38:45 2017
@@ -171,6 +171,7 @@ Summary
     <li><bug>61026</bug>Cannot run program "keytool": CreateProcess error=2 when starting JMeter 3.2 in gui mode</li>
     <li><bug>61054</bug>Endless loop in JOrphanUtils#replaceAllWithRegex when regex is contained in replacement</li>
     <li><bug>60995</bug>HTTP Test Script Recorder: Port field is very small under some LAF</li>
+    <li><bug>61073</bug>HTTP(S) Test Script Recorder panel have some fields with bad size on HiDPI screen or GTK+ L&F on Linux/XWayland</li>
 </ul>
 
  <!--  =================== Thanks =================== -->