Support selectable, user-defined themes contained in zip files

Author: Mumfrey

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

@@ -38,6 +38,7 @@
 import processing.app.I18n;
 import processing.app.PreferencesData;
 import processing.app.Theme;
+import processing.app.Theme.ZippedTheme;
 import processing.app.helpers.FileUtils;
 import processing.app.legacy.PApplet;
 
@@ -46,6 +47,7 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.WindowEvent;
 import java.io.File;
+import java.util.Collection;
 import java.util.LinkedList;
 
 import static processing.app.I18n.tr;
@@ -159,6 +161,9 @@ private void initComponents() {
     autoProxyUsername = new javax.swing.JTextField();
     autoProxyPassword = new javax.swing.JPasswordField();
     autoProxyPasswordLabel = new javax.swing.JLabel();
+    comboThemeLabel = new javax.swing.JLabel();
+    comboTheme = new JComboBox();
+    requiresRestartLabel2 = new javax.swing.JLabel();
     javax.swing.JPanel jPanel3 = new javax.swing.JPanel();
     javax.swing.JButton okButton = new javax.swing.JButton();
     javax.swing.JButton cancelButton = new javax.swing.JButton();
@@ -302,6 +307,12 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
     autoScaleCheckBox.getAccessibleContext().setAccessibleName("Automatic interface scale (requires restart of Arduino");
 
     jLabel3.setText("%");
+    
+    comboThemeLabel.setText(tr("Theme: "));
+
+    comboTheme.getAccessibleContext().setAccessibleName("Theme (requires restart of Arduino)");
+
+    requiresRestartLabel2.setText(tr("  (requires restart of Arduino)"));
 
     javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
     jPanel1.setLayout(jPanel1Layout);
@@ -341,9 +352,14 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
               .addGroup(jPanel1Layout.createSequentialGroup()
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                   .addComponent(comboLanguageLabel)
-                  .addComponent(fontSizeLabel))
+                  .addComponent(fontSizeLabel)
+                  .addComponent(comboThemeLabel))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                  .addGroup(jPanel1Layout.createSequentialGroup()
+                    .addComponent(comboTheme, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(requiresRestartLabel2))
                   .addComponent(fontSizeField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                   .addGroup(jPanel1Layout.createSequentialGroup()
                     .addComponent(comboLanguage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -363,7 +379,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
         .addContainerGap())
     );
 
-    jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {comboLanguageLabel, comboWarningsLabel, fontSizeLabel, jLabel1, showVerboseLabel});
+    jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {comboLanguageLabel, comboWarningsLabel, fontSizeLabel, jLabel1, showVerboseLabel, comboThemeLabel});
 
     jPanel1Layout.setVerticalGroup(
       jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -391,6 +407,11 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
           .addComponent(autoScaleCheckBox)
           .addComponent(jLabel3))
         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+        .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+          .addComponent(comboThemeLabel)
+          .addComponent(comboTheme, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+          .addComponent(requiresRestartLabel2))
+        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
           .addComponent(showVerboseLabel)
           .addComponent(verboseCompilationBox)
@@ -742,6 +763,9 @@ private void autoScaleCheckBoxItemStateChanged(java.awt.event.ItemEvent evt) {//
   private javax.swing.JCheckBox verboseCompilationBox;
   private javax.swing.JCheckBox verboseUploadBox;
   private javax.swing.JCheckBox verifyUploadBox;
+  private javax.swing.JComboBox comboTheme;
+  private javax.swing.JLabel comboThemeLabel;
+  private javax.swing.JLabel requiresRestartLabel2;
   // End of variables declaration//GEN-END:variables
 
   private java.util.List<String> validateData() {
@@ -769,6 +793,12 @@ private void savePreferencesData() {
 
     Language newLanguage = (Language) comboLanguage.getSelectedItem();
     PreferencesData.set("editor.languages.current", newLanguage.getIsoCode());
+    
+    if (comboTheme.getSelectedIndex() == 0) {
+      PreferencesData.set("theme.file", "");
+    } else {
+      PreferencesData.set("theme.file", ((ZippedTheme) comboTheme.getSelectedItem()).getKey());
+    }
 
     String newSizeText = fontSizeField.getText();
     try {
@@ -834,6 +864,16 @@ private void showPrerefencesData() {
         comboLanguage.setSelectedItem(language);
       }
     }
+    
+    String selectedTheme = PreferencesData.get("theme.file", "");
+    Collection<ZippedTheme> availablethemes = Theme.getAvailablethemes();
+    comboTheme.addItem(tr("Default theme"));
+    for (ZippedTheme theme : availablethemes) {
+      comboTheme.addItem(theme);
+      if (theme.getKey().equals(selectedTheme)) {
+        comboTheme.setSelectedItem(theme);
+      }
+    }
 
     Font editorFont = PreferencesData.getFont("editor.font");
     fontSizeField.setText(String.valueOf(editorFont.getSize()));