Merge pull request #2 from arduino/master

update

Author: bhagman

README.md

@@ -29,7 +29,7 @@ https://groups.google.com/a/arduino.cc/forum/#!forum/developers
 Installation
 ------------
 Detailed instructions for installation in popular operating systems.  
-For Linux: https://www.arduino.cc/en/Guide/Linux (see also the Arduino playground page http://www.arduino.cc/playground/Learning/Linux)   
+For Linux: https://www.arduino.cc/en/Guide/Linux (see also the Arduino playground page https://playground.arduino.cc/Learning/Linux)   
 For macOS X: https://www.arduino.cc/en/Guide/MacOSX   
 For Windows: https://www.arduino.cc/en/Guide/Windows
 
@@ -47,7 +47,7 @@ Arduino uses
 [avrdude](http://www.nongnu.org/avrdude/),
 [bossac](http://www.shumatech.com/web/products/bossa),
 [openOCD](http://openocd.org/)
-and code from [Processing](http://www.processing.org)
+and code from [Processing](https://www.processing.org)
 and [Wiring](http://wiring.org.co).
 
 Icon and about image designed by [ToDo](https://www.todo.to.it/)

app/src/cc/arduino/i18n/Languages.java

@@ -102,7 +102,7 @@ public class Languages {
       new Language(tr("Telugu"), "తెలుగు", "te"),
       new Language(tr("Thai"), "ภาษาไทย", "th"),
       new Language(tr("Turkish"), "Türk", "tr"),
-      new Language(tr("Ukrainian"), "Український", "uk"),
+      new Language(tr("Ukrainian"), "Українська", "uk"),
       new Language(tr("Vietnamese"), "Tiếng Việt", "vi"),
       new Language(tr("Western Frisian"), "Western Frisian", "fy")
     };

app/src/cc/arduino/view/preferences/Preferences.java

@@ -174,7 +174,8 @@ private void initComponents() {
     jTabbedPane1.setRequestFocusEnabled(false);
 
     sketchbookLocationLabel.setText(tr("Sketchbook location:"));
-
+    sketchbookLocationLabel.setLabelFor(sketchbookLocationField);
+    
     sketchbookLocationField.setColumns(40);
 
     browseButton.setText(I18n.PROMPT_BROWSE);
@@ -187,21 +188,28 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
     comboLanguageLabel.setText(tr("Editor language: "));
 
     requiresRestartLabel.setText(tr("  (requires restart of Arduino)"));
+    
+    comboLanguage.getAccessibleContext().setAccessibleName("Editor language (requires restart of Arduino)");
 
     fontSizeLabel.setText(tr("Editor font size: "));
+    fontSizeLabel.setLabelFor(fontSizeField);
 
     fontSizeField.setColumns(4);
 
     showVerboseLabel.setText(tr("Show verbose output during: "));
 
     verboseCompilationBox.setText(tr("compilation "));
+    verboseCompilationBox.getAccessibleContext().setAccessibleName("Show verbose output during compilation");
 
     verboseUploadBox.setText(tr("upload"));
+    verboseUploadBox.getAccessibleContext().setAccessibleName("Show verbose output during upload");
 
     comboWarningsLabel.setText(tr("Compiler warnings: "));
+    comboWarningsLabel.setLabelFor(comboWarnings);
 
     additionalBoardsManagerLabel.setText(tr("Additional Boards Manager URLs: "));
     additionalBoardsManagerLabel.setToolTipText(tr("Enter a comma separated list of urls"));
+    additionalBoardsManagerLabel.setLabelFor(additionalBoardsManagerField);
 
     additionalBoardsManagerField.setToolTipText(tr("Enter a comma separated list of urls"));
 
@@ -212,6 +220,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         extendedAdditionalUrlFieldWindowActionPerformed(evt);
       }
     });
+    extendedAdditionalUrlFieldWindow.getAccessibleContext().setAccessibleName("New Window");
 
     morePreferencesLabel.setForeground(Color.GRAY);
     morePreferencesLabel.setText(tr("More preferences can be edited directly in the file"));
@@ -229,6 +238,7 @@ public void mouseEntered(java.awt.event.MouseEvent evt) {
         preferencesFileLabelMouseEntered(evt);
       }
     });
+    preferencesFileLabel.setFocusable(true);
 
     arduinoNotRunningLabel.setForeground(Color.GRAY);
     arduinoNotRunningLabel.setText(tr("(edit only when Arduino is not running)"));
@@ -280,6 +290,7 @@ public void mouseEntered(java.awt.event.MouseEvent evt) {
 
     scaleSpinner.setModel(new javax.swing.SpinnerNumberModel(100, 100, 400, 5));
     scaleSpinner.setEnabled(false);
+    scaleSpinner.getAccessibleContext().setAccessibleName("Interface scale (requires restart of Arduino)");
 
     autoScaleCheckBox.setSelected(true);
     autoScaleCheckBox.setText(tr("Automatic"));
@@ -288,6 +299,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
         autoScaleCheckBoxItemStateChanged(evt);
       }
     });
+    autoScaleCheckBox.getAccessibleContext().setAccessibleName("Automatic interface scale (requires restart of Arduino");
 
     jLabel3.setText("%");
 

app/src/processing/app/Base.java

@@ -133,6 +133,10 @@ static public void main(String args[]) throws Exception {
     System.setProperty("java.net.useSystemProxies", "true");
 
     if (OSUtils.isMacOS()) {
+      System.setProperty("apple.laf.useScreenMenuBar",
+        String.valueOf(!System.getProperty("os.version").startsWith("10.13")
+          || com.apple.eawt.Application.getApplication().isAboutMenuItemPresent()));
+
       ThinkDifferent.init();
     }
 
@@ -388,6 +392,7 @@ public Base(String[] args) throws Exception {
         outputFile = new Compiler(sketch).build(progress -> {}, false);
       } catch (Exception e) {
         // Error during build
+        e.printStackTrace();
         System.exit(1);
       }
 
@@ -967,7 +972,7 @@ public boolean handleQuit() {
       // Save out the current prefs state
       PreferencesData.save();
 
-      if (!OSUtils.isMacOS()) {
+      if (!OSUtils.hasMacOSStyleMenus()) {
         // If this was fired from the menu or an AppleEvent (the Finder),
         // then Mac OS X will send the terminate signal itself.
         System.exit(0);
@@ -1070,6 +1075,10 @@ public void rebuildImportMenu(JMenu importMenu) {
     importMenu.removeAll();
 
     JMenuItem menu = new JMenuItem(tr("Manage Libraries..."));
+    // Ctrl+Shift+I on Windows and Linux, Command+Shift+I on macOS
+    menu.setAccelerator(KeyStroke.getKeyStroke('I',
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() |
+        ActionEvent.SHIFT_MASK));
     menu.addActionListener(e -> openLibraryManager("", ""));
     importMenu.add(menu);
     importMenu.addSeparator();
@@ -1093,12 +1102,13 @@ public void actionPerformed(ActionEvent e) {
       List<ContributedLibrary> libs = getSortedLibraries();
       String lastLibType = null;
       for (ContributedLibrary lib : libs) {
-        if (lastLibType == null || !lastLibType.equals(lib.getTypes().get(0))) {
+        String libType = lib.getTypes().get(0);
+        if (!libType.equals(lastLibType)) {
           if (lastLibType != null) {
             importMenu.addSeparator();
           }
-          lastLibType = lib.getTypes().get(0);
-          JMenuItem platformItem = new JMenuItem(I18n.format(tr("{0} libraries"), lastLibType));
+          lastLibType = libType;
+          JMenuItem platformItem = new JMenuItem(I18n.format(tr("{0} libraries"), tr(lastLibType)));
           platformItem.setEnabled(false);
           importMenu.add(platformItem);
         }
@@ -1168,7 +1178,7 @@ public void rebuildExamplesMenu(JMenu menu) {
     // any incompatible sketchbook libs further divided into their own list.
     // The 7th list of "other" libraries should always be empty, but serves
     // as a safety feature to prevent any library from vanishing.
-    LibraryList allLibraries = new LibraryList(BaseNoGui.librariesIndexer.getInstalledLibraries());
+    LibraryList allLibraries = BaseNoGui.librariesIndexer.getInstalledLibraries();
     LibraryList ideLibs = new LibraryList();
     LibraryList retiredIdeLibs = new LibraryList();
     LibraryList platformLibs = new LibraryList();
@@ -1399,7 +1409,7 @@ public void rebuildBoardsMenu() throws Exception {
     // The first custom menu is the "Board" selection submenu
     JMenu boardMenu = new JMenu(tr("Board"));
     boardMenu.putClientProperty("removeOnWindowDeactivation", true);
-    MenuScroller.setScrollerFor(boardMenu);
+    MenuScroller.setScrollerFor(boardMenu).setTopFixedCount(1);
 
     boardMenu.add(new JMenuItem(new AbstractAction(tr("Boards Manager...")) {
       public void actionPerformed(ActionEvent actionevent) {
@@ -1868,11 +1878,6 @@ public void handleFontSizeChange(int change) {
     getEditors().forEach(Editor::applyPreferences);
   }
 
-  // XXX: Remove this method and make librariesIndexer non-static
-  static public LibraryList getLibraries() {
-    return BaseNoGui.librariesIndexer.getInstalledLibraries();
-  }
-
   public List<JMenu> getBoardsCustomMenus() {
     return boardsCustomMenus;
   }

app/src/processing/app/Editor.java

@@ -158,7 +158,7 @@ public boolean test(SketchController sketch) {
 
   static volatile AbstractMonitor serialMonitor;
   static AbstractMonitor serialPlotter;
-  
+
   final EditorHeader header;
   EditorStatus status;
   EditorConsole console;
@@ -248,7 +248,7 @@ public void windowDeactivated(WindowEvent e) {
 
     //PdeKeywords keywords = new PdeKeywords();
     //sketchbook = new Sketchbook(this);
-    
+
     buildMenuBar();
 
     // For rev 0120, placing things inside a JPanel
@@ -399,8 +399,7 @@ public boolean importData(JComponent src, Transferable transferable) {
         statusNotice(tr("One file added to the sketch."));
 
       } else {
-        statusNotice(
-	    I18n.format(tr("{0} files added to the sketch."), successful));
+        statusNotice(I18n.format(tr("{0} files added to the sketch."), successful));
       }
       return true;
     }
@@ -619,7 +618,7 @@ public void actionPerformed(ActionEvent e) {
     fileMenu.add(item);
 
     // macosx already has its own preferences and quit menu
-    if (!OSUtils.isMacOS()) {
+    if (!OSUtils.hasMacOSStyleMenus()) {
       fileMenu.addSeparator();
 
       item = newJMenuItem(tr("Preferences"), ',');
@@ -732,16 +731,16 @@ private JMenu buildToolsMenu() {
 
     addInternalTools(toolsMenu);
 
-    JMenuItem item = newJMenuItemShift(tr("Serial Monitor"), 'M');
+    JMenuItem item = newJMenuItemShift(tr("Manage Libraries..."), 'I');
+    item.addActionListener(e -> base.openLibraryManager("", ""));
+    toolsMenu.add(item);
+
+    item = newJMenuItemShift(tr("Serial Monitor"), 'M');
     item.addActionListener(e -> handleSerial());
     toolsMenu.add(item);
 
     item = newJMenuItemShift(tr("Serial Plotter"), 'L');
-    item.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          handlePlotter();
-        }
-    });
+    item.addActionListener(e -> handlePlotter());
     toolsMenu.add(item);
 
     addTools(toolsMenu, BaseNoGui.getToolsFolder());
@@ -769,6 +768,7 @@ public void actionPerformed(ActionEvent e) {
 
     base.rebuildProgrammerMenu();
     programmersMenu = new JMenu(tr("Programmer"));
+    MenuScroller.setScrollerFor(programmersMenu);
     base.getProgrammerMenus().stream().forEach(programmersMenu::add);
     toolsMenu.add(programmersMenu);
 
@@ -947,14 +947,14 @@ private String findClassInZipFile(String base, File file) {
     } finally {
       if (zipFile != null) {
         try {
-          zipFile.close();
-        } catch (IOException e) {
-          // noop
-        }
-      }
-    }
-    return null;
-	}
+           zipFile.close();
+         } catch (IOException e) {
+           // noop
+         }
+       }
+     }
+     return null;
+   }
 
   public void updateKeywords(PdeKeywords keywords) {
     for (EditorTab tab : tabs)
@@ -1252,7 +1252,7 @@ public void actionPerformed(ActionEvent e) {
     menu.add(item);
 
     // macosx already has its own about menu
-    if (!OSUtils.isMacOS()) {
+    if (!OSUtils.hasMacOSStyleMenus()) {
       menu.addSeparator();
       item = new JMenuItem(tr("About Arduino"));
       item.addActionListener(new ActionListener() {
@@ -1476,6 +1476,7 @@ static public JMenuItem newJMenuItem(String title, int what) {
   /**
    * Like newJMenuItem() but adds shift as a modifier for the key command.
    */
+  // 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));
@@ -1812,7 +1813,7 @@ protected boolean checkModified() {
     String prompt = I18n.format(tr("Save changes to \"{0}\"?  "),
                                 sketch.getName());
 
-    if (!OSUtils.isMacOS()) {
+    if (!OSUtils.hasMacOSStyleMenus()) {
       int result =
         JOptionPane.showConfirmDialog(this, prompt, tr("Close"),
                                       JOptionPane.YES_NO_CANCEL_OPTION,
@@ -2096,18 +2097,19 @@ private boolean serialPrompt() {
       names[i] = portMenu.getItem(i).getText();
     }
 
+    // FIXME: This is horribly unreadable
     String result = (String)
-      JOptionPane.showInputDialog(this,
-	I18n.format(
-	  tr("Serial port {0} not found.\n" +
-	    "Retry the upload with another serial port?"),
-	  PreferencesData.get("serial.port")
-	),
-				  "Serial port not found",
-                                  JOptionPane.PLAIN_MESSAGE,
-                                  null,
-                                  names,
-                                  0);
+    JOptionPane.showInputDialog(this,
+     I18n.format(
+      tr("Serial port {0} not found.\n" +
+       "Retry the upload with another serial port?"),
+      PreferencesData.get("serial.port")
+     ),
+     "Serial port not found",
+     JOptionPane.PLAIN_MESSAGE,
+     null,
+     names,
+     0);
     if (result == null) return false;
     selectSerialPort(result);
     base.onBoardOrPortChange();
@@ -2321,7 +2323,7 @@ public void handleSerial() {
         return;
       }
     }
-  
+
     if (serialMonitor != null) {
       // The serial monitor already exists
 
@@ -2351,14 +2353,14 @@ public void handleSerial() {
     }
 
     serialMonitor = new MonitorFactory().newMonitor(port);
-    
+
     if (serialMonitor == null) {
       String board = port.getPrefs().get("board");
       String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board);
       statusError(I18n.format(tr("Serial monitor is not supported on network ports such as {0} for the {1} in this release"), PreferencesData.get("serial.port"), boardName));
       return;
     }
-    
+
     Base.setIcon(serialMonitor);
 
     // If currently uploading, disable the monitor (it will be later
@@ -2418,7 +2420,7 @@ public void handleSerial() {
     } while (serialMonitor.requiresAuthorization() && !success);
 
   }
-  
+
   public void handlePlotter() {
     if(serialMonitor != null) {
       if(serialMonitor.isClosed()) {
@@ -2428,7 +2430,7 @@ public void handlePlotter() {
         return;
       }
     }
-  
+
     if (serialPlotter != null) {
       // The serial plotter already exists
 

app/src/processing/app/helpers/Keys.java

@@ -220,7 +220,7 @@ public static KeyStroke ctrlShift(int keyCode) {
   }
 
   /**
-   * Creates a KeyCode for the "menu shortcut" + shift + the key passed in. By
+   * Creates a KeyCode for the "menu shortcut" + alt + the key passed in. By
    * default, the menu shortcut is the ctrl key (hence the method name), but
    * platforms might use a different key (like the Apple key on OSX).
    *