You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/10/09 08:59:17 UTC
[jmeter] branch master updated (8944917 -> c2b0934)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 8944917 Show proper application name and icon when using ./gradlew runGui with macOS
new cef8105 Integrate with macOS system menu when running as ./gradlew runGui under macOS
new c2b0934 Hide File -> Exit menu item when JMeter menu is integrated with macOS system one
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java | 6 +++++-
src/dist/build.gradle.kts | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
[jmeter] 01/02: Integrate with macOS system menu when running as
./gradlew runGui under macOS
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit cef8105348e9b9e447236441478261d49ff9797b
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Oct 9 11:58:22 2019 +0300
Integrate with macOS system menu when running as ./gradlew runGui under macOS
---
src/dist/build.gradle.kts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 07a749d..7242dc2 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -508,6 +508,8 @@ val runGui by tasks.registering() {
if (osName.contains(Regex("mac os x|darwin|osx", RegexOption.IGNORE_CASE))) {
jvmArgs("-Xdock:name=JMeter")
jvmArgs("-Xdock:icon=$rootDir/xdocs/images/jmeter_square.png")
+ jvmArgs("-Dapple.laf.useScreenMenuBar=true")
+ jvmArgs("-Dapple.eawt.quitStrategy=CLOSE_ALL_WINDOWS")
}
}
}
[jmeter] 02/02: Hide File -> Exit menu item when JMeter menu is
integrated with macOS system one
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit c2b09342847bd41e83e43b6f77c7d46f710fd96b
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Oct 9 11:59:02 2019 +0300
Hide File -> Exit menu item when JMeter menu is integrated with macOS system one
macOS generates the default JMeter -> Quit menu item, so there's no need in File -> Exit
---
.../src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
index cc877b2..e388ce6 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
@@ -524,7 +524,11 @@ public class JMeterMenuBar extends JMenuBar implements LocaleChangeListener {
addPluginsMenuItems(fileMenu, menuCreators, MENU_LOCATION.FILE);
- fileMenu.add(fileExit);
+ // When JMeter menu is integrated with macOS system menu, there's no need in extra "exit"
+ // macOS creates the default "Quit" item which is consistently located for all the apps
+ if (!Boolean.getBoolean("apple.laf.useScreenMenuBar")) {
+ fileMenu.add(fileExit);
+ }
}
private void makeSearchMenu() {