From 15fc84e0216ffabeb75b58e735dd15a984b418b7 Mon Sep 17 00:00:00 2001 From: yzykov Date: Fri, 27 Mar 2020 14:56:10 -0700 Subject: [PATCH 1/6] Ctrl-shift-U does not work work when editor is focused #9895 --- app/src/processing/app/Editor.java | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 2ec29c498cb..469f4dd2e6d 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -169,6 +169,9 @@ public boolean test(SketchController controller) { /** Command-Option on Mac OS X, Ctrl-Alt on Windows and Linux */ static final int SHORTCUT_ALT_KEY_MASK = ActionEvent.ALT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); + /** Command-Option on Mac OS X, Ctrl-Shift on Windows and Linux */ + static final int SHORTCUT_SHIFT_KEY_MASK = ActionEvent.SHIFT_MASK | + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); /** * true if this file has not yet been given a name by the user @@ -670,9 +673,22 @@ private void buildSketchMenu(JMenu sketchMenu) { item.addActionListener(event -> handleExport(false)); sketchMenu.add(item); - item = newJMenuItemShift(tr("Upload Using Programmer"), 'U'); - item.addActionListener(event -> handleExport(true)); - sketchMenu.add(item); + // Since CTRL+SHIFT+U is not working on iBus keyboard input method + // Lets redirect the shorcut for Linux to CTRL+ALT+U + // Leaving the preexisting behaviour for Windows & Mac OS + String OS = System.getProperty("os.name").toLowerCase(); + if (OS.indexOf("nix") >= 0 || OS.indexOf("nux") >= 0 || OS.indexOf("aix") > 0) + { + item = newJMenuItemAlt(tr("Upload Using Programmer"), 'U'); + item.addActionListener(event -> handleExport(true)); + sketchMenu.add(item); + } + else + { + item = newJMenuItemShift(tr("Upload Using Programmer"), 'U'); + item.addActionListener(event -> handleExport(true)); + sketchMenu.add(item); + } item = newJMenuItemAlt(tr("Export compiled Binary"), 'S'); item.addActionListener(event -> { @@ -1350,7 +1366,7 @@ static public JMenuItem newJMenuItem(String title, int what) { // Control + Shift + K seems to not be working on linux (Xubuntu 17.04, 2017-08-19) static public JMenuItem newJMenuItemShift(String title, int what) { JMenuItem menuItem = new JMenuItem(title); - menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_KEY_MASK | ActionEvent.SHIFT_MASK)); + menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_SHIFT_KEY_MASK)); return menuItem; } From 3def4aa1039cf8f2e55d7f06ab7e693a3dd24f83 Mon Sep 17 00:00:00 2001 From: yzykov Date: Fri, 27 Mar 2020 16:53:38 -0700 Subject: [PATCH 2/6] [Preferences] Button problem in Preferences #9185 --- app/src/cc/arduino/view/preferences/Preferences.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/cc/arduino/view/preferences/Preferences.java b/app/src/cc/arduino/view/preferences/Preferences.java index 005d2f83e54..065052315b2 100644 --- a/app/src/cc/arduino/view/preferences/Preferences.java +++ b/app/src/cc/arduino/view/preferences/Preferences.java @@ -218,6 +218,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { additionalBoardsManagerField.setToolTipText(tr("Enter a comma separated list of urls")); extendedAdditionalUrlFieldWindow.setIcon(new ImageIcon(Theme.getThemeImage("newwindow", this, Theme.scale(16), Theme.scale(14)))); + extendedAdditionalUrlFieldWindow.setToolTipText(tr("Enter additional URLs, one for each row")); extendedAdditionalUrlFieldWindow.setMargin(new java.awt.Insets(1, 1, 1, 1)); extendedAdditionalUrlFieldWindow.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { From 70974d7a1318bd79ab67b1f67390a7dca7b524b1 Mon Sep 17 00:00:00 2001 From: yzykov Date: Fri, 27 Mar 2020 17:05:20 -0700 Subject: [PATCH 3/6] Revert "[Preferences] Button problem in Preferences #9185" This reverts commit 3def4aa1039cf8f2e55d7f06ab7e693a3dd24f83. --- app/src/cc/arduino/view/preferences/Preferences.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/cc/arduino/view/preferences/Preferences.java b/app/src/cc/arduino/view/preferences/Preferences.java index 065052315b2..005d2f83e54 100644 --- a/app/src/cc/arduino/view/preferences/Preferences.java +++ b/app/src/cc/arduino/view/preferences/Preferences.java @@ -218,7 +218,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { additionalBoardsManagerField.setToolTipText(tr("Enter a comma separated list of urls")); extendedAdditionalUrlFieldWindow.setIcon(new ImageIcon(Theme.getThemeImage("newwindow", this, Theme.scale(16), Theme.scale(14)))); - extendedAdditionalUrlFieldWindow.setToolTipText(tr("Enter additional URLs, one for each row")); extendedAdditionalUrlFieldWindow.setMargin(new java.awt.Insets(1, 1, 1, 1)); extendedAdditionalUrlFieldWindow.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { From fbb07bbe7638f48374e64c0472d86b4f4aba3c50 Mon Sep 17 00:00:00 2001 From: yzykov Date: Fri, 27 Mar 2020 17:08:45 -0700 Subject: [PATCH 4/6] Revert "Revert "[Preferences] Button problem in Preferences #9185"" This reverts commit 70974d7a1318bd79ab67b1f67390a7dca7b524b1. --- app/src/cc/arduino/view/preferences/Preferences.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/cc/arduino/view/preferences/Preferences.java b/app/src/cc/arduino/view/preferences/Preferences.java index 005d2f83e54..065052315b2 100644 --- a/app/src/cc/arduino/view/preferences/Preferences.java +++ b/app/src/cc/arduino/view/preferences/Preferences.java @@ -218,6 +218,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { additionalBoardsManagerField.setToolTipText(tr("Enter a comma separated list of urls")); extendedAdditionalUrlFieldWindow.setIcon(new ImageIcon(Theme.getThemeImage("newwindow", this, Theme.scale(16), Theme.scale(14)))); + extendedAdditionalUrlFieldWindow.setToolTipText(tr("Enter additional URLs, one for each row")); extendedAdditionalUrlFieldWindow.setMargin(new java.awt.Insets(1, 1, 1, 1)); extendedAdditionalUrlFieldWindow.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { From 2c520687000c7732763a261bc86fa32c262cf6ac Mon Sep 17 00:00:00 2001 From: yzykov Date: Fri, 27 Mar 2020 17:09:03 -0700 Subject: [PATCH 5/6] Revert "Ctrl-shift-U does not work work when editor is focused #9895" This reverts commit 15fc84e0216ffabeb75b58e735dd15a984b418b7. --- app/src/processing/app/Editor.java | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 469f4dd2e6d..2ec29c498cb 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -169,9 +169,6 @@ public boolean test(SketchController controller) { /** Command-Option on Mac OS X, Ctrl-Alt on Windows and Linux */ static final int SHORTCUT_ALT_KEY_MASK = ActionEvent.ALT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); - /** Command-Option on Mac OS X, Ctrl-Shift on Windows and Linux */ - static final int SHORTCUT_SHIFT_KEY_MASK = ActionEvent.SHIFT_MASK | - Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); /** * true if this file has not yet been given a name by the user @@ -673,22 +670,9 @@ private void buildSketchMenu(JMenu sketchMenu) { item.addActionListener(event -> handleExport(false)); sketchMenu.add(item); - // Since CTRL+SHIFT+U is not working on iBus keyboard input method - // Lets redirect the shorcut for Linux to CTRL+ALT+U - // Leaving the preexisting behaviour for Windows & Mac OS - String OS = System.getProperty("os.name").toLowerCase(); - if (OS.indexOf("nix") >= 0 || OS.indexOf("nux") >= 0 || OS.indexOf("aix") > 0) - { - item = newJMenuItemAlt(tr("Upload Using Programmer"), 'U'); - item.addActionListener(event -> handleExport(true)); - sketchMenu.add(item); - } - else - { - item = newJMenuItemShift(tr("Upload Using Programmer"), 'U'); - item.addActionListener(event -> handleExport(true)); - sketchMenu.add(item); - } + item = newJMenuItemShift(tr("Upload Using Programmer"), 'U'); + item.addActionListener(event -> handleExport(true)); + sketchMenu.add(item); item = newJMenuItemAlt(tr("Export compiled Binary"), 'S'); item.addActionListener(event -> { @@ -1366,7 +1350,7 @@ static public JMenuItem newJMenuItem(String title, int what) { // Control + Shift + K seems to not be working on linux (Xubuntu 17.04, 2017-08-19) static public JMenuItem newJMenuItemShift(String title, int what) { JMenuItem menuItem = new JMenuItem(title); - menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_SHIFT_KEY_MASK)); + menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_KEY_MASK | ActionEvent.SHIFT_MASK)); return menuItem; } From b66ef391cf706cc5be9c2512b9464c8fd6b87f89 Mon Sep 17 00:00:00 2001 From: yzykov Date: Fri, 27 Mar 2020 22:03:00 -0700 Subject: [PATCH 6/6] Added field in Preferences.form --- app/src/cc/arduino/view/preferences/Preferences.form | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/cc/arduino/view/preferences/Preferences.form b/app/src/cc/arduino/view/preferences/Preferences.form index 797e9d57ded..2383e6fa78b 100644 --- a/app/src/cc/arduino/view/preferences/Preferences.form +++ b/app/src/cc/arduino/view/preferences/Preferences.form @@ -366,6 +366,9 @@ + + + pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy