Merge branch 'mast' into master2

.github/ISSUE_TEMPLATE.md

@@ -43,4 +43,5 @@ It should contain:
 * OS (Windows, Linux, Mac)
 * IntelliJ Product + version (IDEA, RubyMine...)
 * Plugin version 
+* Plugin configuration (found in material_theme.xml)
 * If needed a list of enabled plugins

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.12.0
+- New components: slider and radio buttons
+
+## 0.11.0
+- Targeting 2017.3
+
+## 0.10.6
+- Fix ComboboxAction and IdeaButtonLookAction in 2017.3
+- Set default color for "NOT CHANGED" file status
+- Set directories color from "Up to date" file status
+- Fix issue with Run Configurations
+- Fix Scratches Color in the tree
+
+## 0.10.5
+- Bug fixes due to the passage to 2017.3
+
+## 0.10.4
+- Fix Tabbed Pane color in Arc and One Dark
+- Fix background color of list selected items in One Dark
+- Add babelrc.json to babel icon association
+- Fix (hopefully) the NullPointerException due to not being recognized File Colors
+
 ## 0.10.3
 - Material One Dark Color Scheme
 

build.gradle

@@ -81,20 +81,23 @@ jacocoTestReport {
 
 intellij {
     pluginName 'Material Theme'
-    version '172.4155.24'
-    type 'IU'
-    downloadSources false
+    version '173.2290.1'
+    downloadSources true
     sameSinceUntilBuild true
     alternativeIdePath idePath
     updateSinceUntilBuild = false
-    plugins = ['com.jetbrains.php:172.4155.25', 'yaml','properties', 'CSS', 'JavaScriptLanguage', 'com.jetbrains.twig:172' +
-            '.2827.17', 'Pythonid:2017.2.172.3317.93']
+    plugins = ['com.jetbrains.php:173.2290.12',
+               'yaml',
+               'properties',
+               'com.jetbrains.twig:173.2290.12',
+               'Pythonid:2017.3.173.2099.13']
 
 //    systemProperty "idea.platform.prefix","DataGrip"
 
     publishPlugin {
         username publishUsername
         password publishPassword
+//        channels = ['eap']
     }
 
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Sep 06 15:38:04 IDT 2017
+#Sun Sep 24 09:19:19 IDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/chrisrm/idea/MTConfig.java

@@ -52,7 +52,7 @@
 )
 public class MTConfig implements PersistentStateComponent<MTConfig> {
   public static final String DEFAULT_BG = "https://raw.githubusercontent" +
-      ".com/mallowigi/material-theme-jetbrains-eap/master/src/main/resources/themes/wall.jpg,60";
+                                          ".com/mallowigi/material-theme-jetbrains-eap/master/src/main/resources/themes/wall.jpg,60";
   public static final String ACCENT_COLOR = "80CBC4";
   // They are public so they can be serialized
   public MTThemes selectedTheme = MTThemes.DEFAULT;
@@ -101,7 +101,8 @@ public MTConfig() {
       if (this.highlightThickness == null) {
         highlightThickness = Integer.parseInt(properties.getProperty("material.tab.borderThickness"));
       }
-    } catch (final IOException ignored) {
+    }
+    catch (final IOException ignored) {
     }
   }
 
@@ -155,17 +156,17 @@ public void loadState(final MTConfig state) {
    */
   public void fireBeforeChanged(final MTForm form) {
     ApplicationManager.getApplication().getMessageBus()
-                      .syncPublisher(BeforeConfigNotifier.BEFORE_CONFIG_TOPIC)
-                      .beforeConfigChanged(this, form);
+        .syncPublisher(BeforeConfigNotifier.BEFORE_CONFIG_TOPIC)
+        .beforeConfigChanged(this, form);
   }
 
   /**
    * Fire an event to the application bus that the settings have changed
    */
   public void fireChanged() {
     ApplicationManager.getApplication().getMessageBus()
-                      .syncPublisher(ConfigNotifier.CONFIG_TOPIC)
-                      .configChanged(this);
+        .syncPublisher(ConfigNotifier.CONFIG_TOPIC)
+        .configChanged(this);
   }
 
   //region Tabs Highlight
@@ -293,13 +294,11 @@ public void setIsMaterialDesign(final boolean materialDesign) {
     isMaterialDesign = materialDesign;
   }
 
-
   public boolean isMaterialDesignChanged(final boolean isMaterialDesign) {
     return this.isMaterialDesign != isMaterialDesign;
   }
   //endregion
 
-
   //region Bold Tabs
   public boolean getIsBoldTabs() {
     return isBoldTabs;
@@ -324,7 +323,7 @@ public void setAccentColor(final String accentColor) {
   }
 
   public boolean isAccentColorChanged(final Color customAccentColor) {
-    return !Objects.equals(this.accentColor, customAccentColor);
+    return !Objects.equals(this.accentColor, ColorUtil.toHex(customAccentColor));
   }
   //endregion
 
@@ -354,7 +353,6 @@ public boolean isWallpaperSetChanged(final boolean isWallpaperSet) {
   }
   //endregion
 
-
   //region Material Icons
   public boolean isUseMaterialIcons() {
     return useMaterialIcons;
@@ -541,6 +539,4 @@ public boolean isUpperCaseTabsChanged(final boolean upperCaseTabs) {
   }
 
   //endregion
-
-
 }

src/main/java/com/chrisrm/idea/MTCustomThemeConfig.java

@@ -37,8 +37,9 @@
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.*;
 import java.awt.*;
+import java.util.Objects;
 
 @State(
     name = "MaterialCustomThemeConfig",
@@ -79,8 +80,8 @@ public void loadState(final MTCustomThemeConfig state) {
 
   public void fireChanged() {
     ApplicationManager.getApplication().getMessageBus()
-                      .syncPublisher(CustomConfigNotifier.CONFIG_TOPIC)
-                      .customConfigChanged(this);
+        .syncPublisher(CustomConfigNotifier.CONFIG_TOPIC)
+        .customConfigChanged(this);
   }
 
   public Color getTreeSelectionColor() {
@@ -259,11 +260,70 @@ public void setButtonHighlightColor(final Color buttonHighlightColor) {
     this.buttonHighlightColor = ColorUtil.toHex(buttonHighlightColor);
   }
 
-
   public void setTreeSelectionColor(final Color treeSelectionColor) {
     this.treeSelectionColor = ColorUtil.toHex(treeSelectionColor);
   }
 
+  public boolean isBackgroundColorChanged(Color backgroundColor) {
+    return !Objects.equals(this.backgroundColor, ColorUtil.toHex(backgroundColor));
+  }
+
+  public boolean isForegroundColorChanged(Color foregroundColor) {
+    return !Objects.equals(this.foregroundColor, ColorUtil.toHex(foregroundColor));
+  }
+
+  public boolean isTextColorChanged(Color textColor) {
+    return !Objects.equals(this.textColor, ColorUtil.toHex(textColor));
+  }
+
+  public boolean isSelectionBackgroundColorChanged(Color selectionBackgroundColor) {
+    return !Objects.equals(this.selectionBackgroundColor, ColorUtil.toHex(selectionBackgroundColor));
+  }
+
+  public boolean isSelectionForegroundColorChanged(Color selectionForegroundColor) {
+    return !Objects.equals(this.selectionForegroundColor, ColorUtil.toHex(selectionForegroundColor));
+  }
+
+  public boolean isInactiveColorChanged(Color inactiveColor) {
+    return !Objects.equals(this.inactiveColor, ColorUtil.toHex(inactiveColor));
+  }
+
+  public boolean isCaretColorChanged(Color caretColor) {
+    return !Objects.equals(this.caretColor, ColorUtil.toHex(caretColor));
+  }
+
+  public boolean isSecondaryBackgrouncColorChanged(Color secondaryBackgroundColor) {
+    return !Objects.equals(this.secondaryBackgroundColor, ColorUtil.toHex(secondaryBackgroundColor));
+  }
+
+  public boolean isDisabledColorChanged(Color disabledColor) {
+    return !Objects.equals(this.disabledColor, ColorUtil.toHex(disabledColor));
+  }
+
+  public boolean isContrastColorChanged(Color contrastColor) {
+    return !Objects.equals(this.contrastColor, ColorUtil.toHex(contrastColor));
+  }
+
+  public boolean isTableSelectionColorChanged(Color tableSelectedColor) {
+    return !Objects.equals(this.tableSelectedColor, ColorUtil.toHex(tableSelectedColor));
+  }
+
+  public boolean isSecondBorderColorChanged(Color secondBorderColor) {
+    return !Objects.equals(this.secondBorderColor, ColorUtil.toHex(secondBorderColor));
+  }
+
+  public boolean isHighlightColorChanged(Color highlightColor) {
+    return !Objects.equals(this.highlightColor, ColorUtil.toHex(highlightColor));
+  }
+
+  public boolean isButtonHighlightColorChanged(Color buttonHighlightColor) {
+    return !Objects.equals(this.buttonHighlightColor, ColorUtil.toHex(buttonHighlightColor));
+  }
+
+  public boolean isTreeSelectionColorChanged(Color treeSelectionColor) {
+    return !Objects.equals(this.treeSelectionColor.substring(0, 6), ColorUtil.toHex(treeSelectionColor));
+  }
+
   public static final class MTCustomDefaults {
     public static Color treeSelectionColor = ColorUtil.toAlpha(new ColorUIResource(0x546E7A), 50);
     public static ColorUIResource buttonHighlightColor = new ColorUIResource(0x304146);
@@ -281,5 +341,4 @@ public static final class MTCustomDefaults {
     public static ColorUIResource foregroundColor = new ColorUIResource(0xB0BEC5);
     public static ColorUIResource backgroundColor = new ColorUIResource(0x263238);
   }
-
 }