You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/01/22 14:50:04 UTC
svn commit: r1779819 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/util/
src/core/org/apache/jmeter/images/toolbar/
src/core/org/apache/jmeter/images/toolbar/22x22/
src/core/org/apache/jmeter/images/toolbar/32x32/
src/core/org/apache/jmeter/images...
Author: pmouawad
Date: Sun Jan 22 14:50:03 2017
New Revision: 1779819
URL: http://svn.apache.org/viewvc?rev=1779819&view=rev
Log:
Bug 55258 - Drop "Close" icon from toolbar and add "New" to menu
This closes #227
Bugzilla Id: 55258
Removed:
jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/22x22/document-close-4.png
jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/32x32/document-close-4.png
jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/48x48/document-close-4.png
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sun Jan 22 14:50:03 2017
@@ -81,7 +81,7 @@ public class JMeterMenuBar extends JMenu
private JMenuItem fileExit;
- private JMenuItem fileClose;
+ private JMenuItem fileNew;
private JMenu editMenu;
@@ -512,16 +512,16 @@ public class JMeterMenuBar extends JMenu
templates = makeMenuItemRes("template_menu", 'T', ActionNames.TEMPLATES); //$NON-NLS-1$
templates.setEnabled(true);
- fileClose = makeMenuItemRes("menu_close", 'C', ActionNames.CLOSE, KeyStrokes.CLOSE); //$NON-NLS-1$
+ fileNew = makeMenuItemRes("new", 'N', ActionNames.CLOSE, KeyStrokes.CLOSE); //$NON-NLS-1$
fileExit = makeMenuItemRes("exit", 'X', ActionNames.EXIT, KeyStrokes.EXIT); //$NON-NLS-1$
fileMerge = makeMenuItemRes("menu_merge", 'M', ActionNames.MERGE); //$NON-NLS-1$
fileMerge.setEnabled(false);
- fileMenu.add(fileClose);
- fileMenu.add(fileLoad);
+ fileMenu.add(fileNew);
fileMenu.add(templates);
+ fileMenu.add(fileLoad);
fileMenu.add(fileMerge);
fileMenu.addSeparator();
fileMenu.add(fileSave);
Modified: jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties Sun Jan 22 14:50:03 2017
@@ -23,7 +23,6 @@ toolbar=new,templates,open,close,save,sa
new=new,CLOSE,org/apache/jmeter/images/toolbar/<SIZE>/document-new-4.png
templates=template_menu,TEMPLATES,org/apache/jmeter/images/toolbar/<SIZE>/applications-office.png
open=menu_open,OPEN,org/apache/jmeter/images/toolbar/<SIZE>/document-open-2.png
-close=menu_close,CLOSE,org/apache/jmeter/images/toolbar/<SIZE>/document-close-4.png
save=save,SAVE,org/apache/jmeter/images/toolbar/<SIZE>/document-save-5.png
save_as_testplan=save_as,SAVE_AS,org/apache/jmeter/images/toolbar/<SIZE>/document-save-as-5.png
cut=cut,CUT,org/apache/jmeter/images/toolbar/<SIZE>/edit-cut-4.png
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sun Jan 22 14:50:03 2017
@@ -645,7 +645,6 @@ md5hex_assertion_md5hex_test=MD5Hex to A
md5hex_assertion_title=MD5Hex Assertion
mechanism=Mechanism
menu_assertions=Assertions
-menu_close=Close
menu_collapse_all=Collapse All
menu_config_element=Config Element
menu_edit=Edit
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties Sun Jan 22 14:50:03 2017
@@ -305,7 +305,6 @@ md5hex_assertion_md5hex_test=Zu pr\u00FC
md5hex_assertion_title=MD5 Hex \u00DCberpr\u00FCfung
mechanism=Mechanismus
menu_assertions=\u00DCberpr\u00FCfung
-menu_close=Schlie\u00DFen
menu_collapse_all=Alle schlie\u00DFen
menu_config_element=Konfigurations Element
menu_edit=Editieren
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties Sun Jan 22 14:50:03 2017
@@ -460,7 +460,6 @@ md5hex_assertion_label=MD5Hex
md5hex_assertion_md5hex_test=MD5Hex a Comprobar
md5hex_assertion_title=Aserci\u00F3n MD5Hex
menu_assertions=Aserciones
-menu_close=Cerrar
menu_collapse_all=Colapsar todo
menu_config_element=Elemento de Configuraci\u00F3n
menu_edit=Editar
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Sun Jan 22 14:50:03 2017
@@ -635,7 +635,6 @@ md5hex_assertion_md5hex_test=MD5Hex \u00
md5hex_assertion_title=Assertion MD5Hex
mechanism=M\u00E9canisme
menu_assertions=Assertions
-menu_close=Fermer
menu_collapse_all=R\u00E9duire tout
menu_config_element=Configurations
menu_edit=Editer
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties Sun Jan 22 14:50:03 2017
@@ -239,7 +239,6 @@ md5hex_assertion_failure=MD5 sum \u30A2\
md5hex_assertion_md5hex_test=\u30A2\u30B5\u30FC\u30C8\u5BFE\u8C61\u306EMD5Hex
md5hex_assertion_title=MD5Hex\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3
menu_assertions=\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3
-menu_close=\u9589\u3058\u308B
menu_config_element=\u8A2D\u5B9A\u30A8\u30EC\u30E1\u30F3\u30C8
menu_edit=\u7DE8\u96C6
menu_generative_controller=\u30B5\u30F3\u30D7\u30E9\u30FC
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties Sun Jan 22 14:50:03 2017
@@ -148,7 +148,6 @@ mail_reader_server_type=Typ serwera:
mail_sent=Wiadomo\u015B\u0107 zosta\u0142a wys\u0142ana
max=Maksimum
menu_assertions=Assercje
-menu_close=Zamknij
menu_collapse_all=Zwi\u0144 wszystko
menu_config_element=Element konfiguruj\u0105cy
menu_edit=Edytuj
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties Sun Jan 22 14:50:03 2017
@@ -435,7 +435,6 @@ md5hex_assertion_failure=Erro avaliando
md5hex_assertion_md5hex_test=MD5Hex para Asser\u00E7\u00E3o
md5hex_assertion_title=Asser\u00E7\u00E3o MD5Hex
menu_assertions=Asser\u00E7\u00F5es
-menu_close=Fechar
menu_collapse_all=Fechar Todos
menu_config_element=Elemento de Configura\u00E7\u00E3o
menu_edit=Editar
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties Sun Jan 22 14:50:03 2017
@@ -415,7 +415,6 @@ md5hex_assertion_label=MDBHex
md5hex_assertion_md5hex_test=Do\u011Frulanacak MD5Hex
md5hex_assertion_title=MD5Hex Do\u011Frulamas\u0131
menu_assertions=Do\u011Frulamalar
-menu_close=Kapat
menu_collapse_all=Hepsini Kapat
menu_config_element=Ayar Eleman\u0131
menu_edit=D\u00FCzenle
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties Sun Jan 22 14:50:03 2017
@@ -233,7 +233,6 @@ md5hex_assertion_failure=MD5\u603B\u5408
md5hex_assertion_md5hex_test=\u8981\u65AD\u8A00\u7684MD5Hex
md5hex_assertion_title=MD5Hex\u65AD\u8A00
menu_assertions=\u65AD\u8A00
-menu_close=\u5173\u95ED
menu_config_element=\u914D\u7F6E\u5143\u4EF6
menu_edit=\u7F16\u8F91
menu_listener=\u76D1\u542C\u5668
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties Sun Jan 22 14:50:03 2017
@@ -329,7 +329,6 @@ md5hex_assertion_failure=\u9A57\u8B49 MD
md5hex_assertion_md5hex_test=\u88AB\u9A57\u8B49\u7684 MD5Hex
md5hex_assertion_title=MD5Hex \u9A57\u8B49
menu_assertions=\u9A57\u8B49
-menu_close=\u95DC\u9589
menu_config_element=\u8A2D\u5B9A\u5143\u7D20
menu_edit=\u7DE8\u8F2F
menu_generative_controller=\u53D6\u6A23
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1779819&r1=1779818&r2=1779819&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Jan 22 14:50:03 2017
@@ -157,6 +157,7 @@ JMeter now requires Java 8. Ensure you u
<li><bug>60514</bug>Ability to apply a naming convention on Children of a Transaction Controller. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
<li><bug>60593</bug>Switch to G1 GC algorithm</li>
<li><bug>60595</bug>Add a SplashScreen at the start of JMeter GUI. Contributed by Maxime Chassagneux (maxime.chassagneux at gmail.com).</li>
+ <li><bug>55258</bug>Drop "Close" icon from toolbar and add "New" to menu. Partly based on contribution from Sanduni Kanishka (https://github.com/SanduniKanishka)</li>
</ul>
<ch_section>Non-functional changes</ch_section>
@@ -243,6 +244,7 @@ JMeter now requires Java 8. Ensure you u
<li>\u5ffb\u9686 (298015902 at qq.com)</li>
<li><a href="http://ubikloadpack.com">Ubik Load Pack</a></li>
<li>Graham Russell (graham at ham1.co.uk)</li>
+<li>Sanduni Kanishka (https://github.com/SanduniKanishka)</li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter. <br/>
For this release we want to give special thanks to the following reporters for the clear reports and tests made after our fixes:</p>