From 127ca1f97515b7cc7fdc14cc1d1bfa435967e35c Mon Sep 17 00:00:00 2001 From: Elior Date: Mon, 7 Aug 2017 08:52:08 +0300 Subject: [PATCH 01/66] reorganize files v1 --- .../com/chrisrm/idea/{themes => }/MTLafComponent.java | 3 +-- .../com/chrisrm/idea/{themes => }/MTThemeManager.java | 10 +++------- .../com/chrisrm/idea/actions/MTBiggerTabsAction.java | 2 +- .../chrisrm/idea/actions/MTCompactSidebarAction.java | 2 +- .../chrisrm/idea/actions/MTCompactStatusBarAction.java | 2 +- .../com/chrisrm/idea/actions/MTContrastAction.java | 2 +- .../java/com/chrisrm/idea/actions/MTDarkerTheme.java | 2 +- .../java/com/chrisrm/idea/actions/MTDefaultTheme.java | 2 +- .../idea/actions/MTDisableComponentsAction.java | 2 +- .../com/chrisrm/idea/actions/MTDisableThemeAction.java | 2 +- .../chrisrm/idea/actions/MTHideFileIconsAction.java | 2 +- .../java/com/chrisrm/idea/actions/MTLighterTheme.java | 2 +- .../chrisrm/idea/actions/MTMaterialIconsAction.java | 2 +- .../com/chrisrm/idea/actions/MTPalenightTheme.java | 2 +- .../actions/MTToggleProjectViewDecoratorsAction.java | 2 +- .../idea/actions/MTToggleStatusbarIndicatorAction.java | 2 +- .../idea/actions/accents/MTAbstractAccentAction.java | 2 +- .../{themes => panes}/MTFrameComponentExtension.java | 2 +- .../chrisrm/idea/{themes => panes}/MTIdePanePanel.java | 2 +- .../com/chrisrm/idea/schemes/MTThemesComponent.java | 2 +- .../idea/tabs/MTTabsPainterPatcherComponent.java | 2 +- .../{themes => wallpaper}/MTWallpaperComponent.java | 2 +- src/main/resources/META-INF/plugin.xml | 6 +++--- 23 files changed, 27 insertions(+), 32 deletions(-) rename src/main/java/com/chrisrm/idea/{themes => }/MTLafComponent.java (99%) rename src/main/java/com/chrisrm/idea/{themes => }/MTThemeManager.java (98%) rename src/main/java/com/chrisrm/idea/{themes => panes}/MTFrameComponentExtension.java (99%) rename src/main/java/com/chrisrm/idea/{themes => panes}/MTIdePanePanel.java (97%) rename src/main/java/com/chrisrm/idea/{themes => wallpaper}/MTWallpaperComponent.java (99%) diff --git a/src/main/java/com/chrisrm/idea/themes/MTLafComponent.java b/src/main/java/com/chrisrm/idea/MTLafComponent.java similarity index 99% rename from src/main/java/com/chrisrm/idea/themes/MTLafComponent.java rename to src/main/java/com/chrisrm/idea/MTLafComponent.java index 5744ef3e5..3a0fe19d0 100644 --- a/src/main/java/com/chrisrm/idea/themes/MTLafComponent.java +++ b/src/main/java/com/chrisrm/idea/MTLafComponent.java @@ -24,9 +24,8 @@ * */ -package com.chrisrm.idea.themes; +package com.chrisrm.idea; -import com.chrisrm.idea.MTConfig; import com.chrisrm.idea.config.BeforeConfigNotifier; import com.chrisrm.idea.config.ConfigNotifier; import com.chrisrm.idea.config.ui.MTForm; diff --git a/src/main/java/com/chrisrm/idea/themes/MTThemeManager.java b/src/main/java/com/chrisrm/idea/MTThemeManager.java similarity index 98% rename from src/main/java/com/chrisrm/idea/themes/MTThemeManager.java rename to src/main/java/com/chrisrm/idea/MTThemeManager.java index 169dcef75..ef62fbef1 100644 --- a/src/main/java/com/chrisrm/idea/themes/MTThemeManager.java +++ b/src/main/java/com/chrisrm/idea/MTThemeManager.java @@ -24,11 +24,8 @@ * */ -package com.chrisrm.idea.themes; +package com.chrisrm.idea; -import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.MTLaf; -import com.chrisrm.idea.MTTheme; import com.chrisrm.idea.messages.MaterialThemeBundle; import com.chrisrm.idea.utils.MTUiUtils; import com.chrisrm.idea.utils.UIReplacer; @@ -57,9 +54,8 @@ import sun.awt.AppContext; import javax.swing.*; -import javax.swing.plaf.FontUIResource; -import javax.swing.text.html.HTMLEditorKit; -import javax.swing.text.html.StyleSheet; +import javax.swing.plaf.*; +import javax.swing.text.html.*; import java.awt.*; import java.lang.reflect.Field; import java.net.URL; diff --git a/src/main/java/com/chrisrm/idea/actions/MTBiggerTabsAction.java b/src/main/java/com/chrisrm/idea/actions/MTBiggerTabsAction.java index 5eb9fb829..d590027f6 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTBiggerTabsAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTBiggerTabsAction.java @@ -26,7 +26,7 @@ package com.chrisrm.idea.actions; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/src/main/java/com/chrisrm/idea/actions/MTCompactSidebarAction.java b/src/main/java/com/chrisrm/idea/actions/MTCompactSidebarAction.java index efde6cc71..7b494ca03 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTCompactSidebarAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTCompactSidebarAction.java @@ -27,7 +27,7 @@ package com.chrisrm.idea.actions; import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; diff --git a/src/main/java/com/chrisrm/idea/actions/MTCompactStatusBarAction.java b/src/main/java/com/chrisrm/idea/actions/MTCompactStatusBarAction.java index 408ce3e22..2e9232184 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTCompactStatusBarAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTCompactStatusBarAction.java @@ -27,7 +27,7 @@ package com.chrisrm.idea.actions; import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; diff --git a/src/main/java/com/chrisrm/idea/actions/MTContrastAction.java b/src/main/java/com/chrisrm/idea/actions/MTContrastAction.java index bdf037683..6f631b633 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTContrastAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTContrastAction.java @@ -27,7 +27,7 @@ package com.chrisrm.idea.actions; import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; diff --git a/src/main/java/com/chrisrm/idea/actions/MTDarkerTheme.java b/src/main/java/com/chrisrm/idea/actions/MTDarkerTheme.java index c0770873d..963f2fd40 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTDarkerTheme.java +++ b/src/main/java/com/chrisrm/idea/actions/MTDarkerTheme.java @@ -28,7 +28,7 @@ import com.chrisrm.idea.MTConfig; import com.chrisrm.idea.MTTheme; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; public final class MTDarkerTheme extends MTAbstractTheme { diff --git a/src/main/java/com/chrisrm/idea/actions/MTDefaultTheme.java b/src/main/java/com/chrisrm/idea/actions/MTDefaultTheme.java index eb3f0e8d3..f720b2921 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTDefaultTheme.java +++ b/src/main/java/com/chrisrm/idea/actions/MTDefaultTheme.java @@ -28,7 +28,7 @@ import com.chrisrm.idea.MTConfig; import com.chrisrm.idea.MTTheme; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; public final class MTDefaultTheme extends MTAbstractTheme { diff --git a/src/main/java/com/chrisrm/idea/actions/MTDisableComponentsAction.java b/src/main/java/com/chrisrm/idea/actions/MTDisableComponentsAction.java index 8dc3154c8..545ced5cc 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTDisableComponentsAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTDisableComponentsAction.java @@ -27,7 +27,7 @@ package com.chrisrm.idea.actions; import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; diff --git a/src/main/java/com/chrisrm/idea/actions/MTDisableThemeAction.java b/src/main/java/com/chrisrm/idea/actions/MTDisableThemeAction.java index 2e5eef28c..7fdc0d048 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTDisableThemeAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTDisableThemeAction.java @@ -27,7 +27,7 @@ package com.chrisrm.idea.actions; import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; diff --git a/src/main/java/com/chrisrm/idea/actions/MTHideFileIconsAction.java b/src/main/java/com/chrisrm/idea/actions/MTHideFileIconsAction.java index b94f24141..d0bcf9658 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTHideFileIconsAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTHideFileIconsAction.java @@ -27,7 +27,7 @@ package com.chrisrm.idea.actions; import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; diff --git a/src/main/java/com/chrisrm/idea/actions/MTLighterTheme.java b/src/main/java/com/chrisrm/idea/actions/MTLighterTheme.java index d2dd35210..990bea255 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTLighterTheme.java +++ b/src/main/java/com/chrisrm/idea/actions/MTLighterTheme.java @@ -28,7 +28,7 @@ import com.chrisrm.idea.MTConfig; import com.chrisrm.idea.MTTheme; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; public final class MTLighterTheme extends MTAbstractTheme { diff --git a/src/main/java/com/chrisrm/idea/actions/MTMaterialIconsAction.java b/src/main/java/com/chrisrm/idea/actions/MTMaterialIconsAction.java index 54ba34447..44f116ea0 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTMaterialIconsAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTMaterialIconsAction.java @@ -27,7 +27,7 @@ package com.chrisrm.idea.actions; import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; diff --git a/src/main/java/com/chrisrm/idea/actions/MTPalenightTheme.java b/src/main/java/com/chrisrm/idea/actions/MTPalenightTheme.java index bb46a63e6..771c21d8b 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTPalenightTheme.java +++ b/src/main/java/com/chrisrm/idea/actions/MTPalenightTheme.java @@ -28,7 +28,7 @@ import com.chrisrm.idea.MTConfig; import com.chrisrm.idea.MTTheme; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; public final class MTPalenightTheme extends MTAbstractTheme { diff --git a/src/main/java/com/chrisrm/idea/actions/MTToggleProjectViewDecoratorsAction.java b/src/main/java/com/chrisrm/idea/actions/MTToggleProjectViewDecoratorsAction.java index 5e4e939e7..cdbe6eaa3 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTToggleProjectViewDecoratorsAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTToggleProjectViewDecoratorsAction.java @@ -27,7 +27,7 @@ package com.chrisrm.idea.actions; import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; diff --git a/src/main/java/com/chrisrm/idea/actions/MTToggleStatusbarIndicatorAction.java b/src/main/java/com/chrisrm/idea/actions/MTToggleStatusbarIndicatorAction.java index 2a157e03f..1958717cd 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTToggleStatusbarIndicatorAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTToggleStatusbarIndicatorAction.java @@ -27,7 +27,7 @@ package com.chrisrm.idea.actions; import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; diff --git a/src/main/java/com/chrisrm/idea/actions/accents/MTAbstractAccentAction.java b/src/main/java/com/chrisrm/idea/actions/accents/MTAbstractAccentAction.java index 308019fa2..a7d3949d5 100644 --- a/src/main/java/com/chrisrm/idea/actions/accents/MTAbstractAccentAction.java +++ b/src/main/java/com/chrisrm/idea/actions/accents/MTAbstractAccentAction.java @@ -27,7 +27,7 @@ package com.chrisrm.idea.actions.accents; import com.chrisrm.idea.MTConfig; -import com.chrisrm.idea.themes.MTThemeManager; +import com.chrisrm.idea.MTThemeManager; import com.chrisrm.idea.utils.IconReplacer; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; diff --git a/src/main/java/com/chrisrm/idea/themes/MTFrameComponentExtension.java b/src/main/java/com/chrisrm/idea/panes/MTFrameComponentExtension.java similarity index 99% rename from src/main/java/com/chrisrm/idea/themes/MTFrameComponentExtension.java rename to src/main/java/com/chrisrm/idea/panes/MTFrameComponentExtension.java index 5d02a3124..cb8f64dc4 100644 --- a/src/main/java/com/chrisrm/idea/themes/MTFrameComponentExtension.java +++ b/src/main/java/com/chrisrm/idea/panes/MTFrameComponentExtension.java @@ -24,7 +24,7 @@ * */ -package com.chrisrm.idea.themes; +package com.chrisrm.idea.panes; import com.intellij.ide.ui.UISettings; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/chrisrm/idea/themes/MTIdePanePanel.java b/src/main/java/com/chrisrm/idea/panes/MTIdePanePanel.java similarity index 97% rename from src/main/java/com/chrisrm/idea/themes/MTIdePanePanel.java rename to src/main/java/com/chrisrm/idea/panes/MTIdePanePanel.java index 907fc3265..6b832b5e1 100644 --- a/src/main/java/com/chrisrm/idea/themes/MTIdePanePanel.java +++ b/src/main/java/com/chrisrm/idea/panes/MTIdePanePanel.java @@ -24,7 +24,7 @@ * */ -package com.chrisrm.idea.themes; +package com.chrisrm.idea.panes; import com.intellij.openapi.wm.impl.IdePanePanel; diff --git a/src/main/java/com/chrisrm/idea/schemes/MTThemesComponent.java b/src/main/java/com/chrisrm/idea/schemes/MTThemesComponent.java index a890430c3..f3d164a6a 100644 --- a/src/main/java/com/chrisrm/idea/schemes/MTThemesComponent.java +++ b/src/main/java/com/chrisrm/idea/schemes/MTThemesComponent.java @@ -26,8 +26,8 @@ package com.chrisrm.idea.schemes; +import com.chrisrm.idea.MTThemeManager; import com.chrisrm.idea.config.ConfigNotifier; -import com.chrisrm.idea.themes.MTThemeManager; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ApplicationComponent; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/chrisrm/idea/tabs/MTTabsPainterPatcherComponent.java b/src/main/java/com/chrisrm/idea/tabs/MTTabsPainterPatcherComponent.java index dc7a91586..54b9cf41a 100644 --- a/src/main/java/com/chrisrm/idea/tabs/MTTabsPainterPatcherComponent.java +++ b/src/main/java/com/chrisrm/idea/tabs/MTTabsPainterPatcherComponent.java @@ -28,8 +28,8 @@ import com.chrisrm.idea.MTConfig; import com.chrisrm.idea.MTTheme; +import com.chrisrm.idea.MTThemeManager; import com.chrisrm.idea.config.ConfigNotifier; -import com.chrisrm.idea.themes.MTThemeManager; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.components.ApplicationComponent; diff --git a/src/main/java/com/chrisrm/idea/themes/MTWallpaperComponent.java b/src/main/java/com/chrisrm/idea/wallpaper/MTWallpaperComponent.java similarity index 99% rename from src/main/java/com/chrisrm/idea/themes/MTWallpaperComponent.java rename to src/main/java/com/chrisrm/idea/wallpaper/MTWallpaperComponent.java index e9c3b677c..687d37f42 100644 --- a/src/main/java/com/chrisrm/idea/themes/MTWallpaperComponent.java +++ b/src/main/java/com/chrisrm/idea/wallpaper/MTWallpaperComponent.java @@ -24,7 +24,7 @@ * */ -package com.chrisrm.idea.themes; +package com.chrisrm.idea.wallpaper; import com.chrisrm.idea.MTConfig; import com.chrisrm.idea.config.ConfigNotifier; diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 192c45d60..32e669cbd 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -49,7 +49,7 @@ - + - com.chrisrm.idea.themes.MTLafComponent + com.chrisrm.idea.MTLafComponent com.chrisrm.idea.schemes.MTThemesComponent @@ -91,7 +91,7 @@ com.chrisrm.idea.icons.MTIconReplacerComponent - com.chrisrm.idea.themes.MTWallpaperComponent + com.chrisrm.idea.wallpaper.MTWallpaperComponent From 6444b88b4c589ab223a1aa169648db0275cf885d Mon Sep 17 00:00:00 2001 From: Elior Date: Mon, 7 Aug 2017 08:58:41 +0300 Subject: [PATCH 02/66] reorganize files v2 --- ...ractTheme.java => MTAbstractThemeAction.java} | 2 +- ...DarkerTheme.java => MTDarkerThemeAction.java} | 2 +- ...faultTheme.java => MTDefaultThemeAction.java} | 2 +- ...ghterTheme.java => MTLighterThemeAction.java} | 2 +- ...ghtTheme.java => MTPalenightThemeAction.java} | 2 +- .../idea/config/scope/MTScopeComponent.java | 16 ++++++++-------- src/main/resources/META-INF/plugin.xml | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) rename src/main/java/com/chrisrm/idea/actions/{MTAbstractTheme.java => MTAbstractThemeAction.java} (97%) rename src/main/java/com/chrisrm/idea/actions/{MTDarkerTheme.java => MTDarkerThemeAction.java} (97%) rename src/main/java/com/chrisrm/idea/actions/{MTDefaultTheme.java => MTDefaultThemeAction.java} (97%) rename src/main/java/com/chrisrm/idea/actions/{MTLighterTheme.java => MTLighterThemeAction.java} (97%) rename src/main/java/com/chrisrm/idea/actions/{MTPalenightTheme.java => MTPalenightThemeAction.java} (97%) diff --git a/src/main/java/com/chrisrm/idea/actions/MTAbstractTheme.java b/src/main/java/com/chrisrm/idea/actions/MTAbstractThemeAction.java similarity index 97% rename from src/main/java/com/chrisrm/idea/actions/MTAbstractTheme.java rename to src/main/java/com/chrisrm/idea/actions/MTAbstractThemeAction.java index b60f72b51..92bb453fb 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTAbstractTheme.java +++ b/src/main/java/com/chrisrm/idea/actions/MTAbstractThemeAction.java @@ -30,7 +30,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; -public abstract class MTAbstractTheme extends ToggleAction { +public abstract class MTAbstractThemeAction extends ToggleAction { public static final String BACKGROUND = ""; // 38, 50, 56 public static final String FOREGROUND = ""; // 176, 190, 197 public static final String CARET = ""; // 255, 204, 0 diff --git a/src/main/java/com/chrisrm/idea/actions/MTDarkerTheme.java b/src/main/java/com/chrisrm/idea/actions/MTDarkerThemeAction.java similarity index 97% rename from src/main/java/com/chrisrm/idea/actions/MTDarkerTheme.java rename to src/main/java/com/chrisrm/idea/actions/MTDarkerThemeAction.java index 963f2fd40..a928aa128 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTDarkerTheme.java +++ b/src/main/java/com/chrisrm/idea/actions/MTDarkerThemeAction.java @@ -31,7 +31,7 @@ import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; -public final class MTDarkerTheme extends MTAbstractTheme { +public final class MTDarkerThemeAction extends MTAbstractThemeAction { public static final String BACKGROUND = "212121"; // 33, 33, 33 public static final String FOREGROUND = "B0BEC5"; // 176, 190, 197 public static final String CARET = "FFCC00"; // 255, 204, 0 diff --git a/src/main/java/com/chrisrm/idea/actions/MTDefaultTheme.java b/src/main/java/com/chrisrm/idea/actions/MTDefaultThemeAction.java similarity index 97% rename from src/main/java/com/chrisrm/idea/actions/MTDefaultTheme.java rename to src/main/java/com/chrisrm/idea/actions/MTDefaultThemeAction.java index f720b2921..7c66decf1 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTDefaultTheme.java +++ b/src/main/java/com/chrisrm/idea/actions/MTDefaultThemeAction.java @@ -31,7 +31,7 @@ import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; -public final class MTDefaultTheme extends MTAbstractTheme { +public final class MTDefaultThemeAction extends MTAbstractThemeAction { public static final String BACKGROUND = "263238"; // 38, 50, 56 public static final String FOREGROUND = "B0BEC5"; // 176, 190, 197 public static final String CARET = "FFCC00"; // 255, 204, 0 diff --git a/src/main/java/com/chrisrm/idea/actions/MTLighterTheme.java b/src/main/java/com/chrisrm/idea/actions/MTLighterThemeAction.java similarity index 97% rename from src/main/java/com/chrisrm/idea/actions/MTLighterTheme.java rename to src/main/java/com/chrisrm/idea/actions/MTLighterThemeAction.java index 990bea255..d58f84c44 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTLighterTheme.java +++ b/src/main/java/com/chrisrm/idea/actions/MTLighterThemeAction.java @@ -31,7 +31,7 @@ import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; -public final class MTLighterTheme extends MTAbstractTheme { +public final class MTLighterThemeAction extends MTAbstractThemeAction { public static final String BACKGROUND = "FAFAFA"; // 250, 250, 250 public static final String FOREGROUND = "A7ADB0"; // 167, 173, 176 public static final String CARET = "FFCC00"; // 255, 204, 0 diff --git a/src/main/java/com/chrisrm/idea/actions/MTPalenightTheme.java b/src/main/java/com/chrisrm/idea/actions/MTPalenightThemeAction.java similarity index 97% rename from src/main/java/com/chrisrm/idea/actions/MTPalenightTheme.java rename to src/main/java/com/chrisrm/idea/actions/MTPalenightThemeAction.java index 771c21d8b..6d49e46e9 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTPalenightTheme.java +++ b/src/main/java/com/chrisrm/idea/actions/MTPalenightThemeAction.java @@ -31,7 +31,7 @@ import com.chrisrm.idea.MTThemeManager; import com.intellij.openapi.actionSystem.AnActionEvent; -public final class MTPalenightTheme extends MTAbstractTheme { +public final class MTPalenightThemeAction extends MTAbstractThemeAction { public static final String BACKGROUND = "292D3E"; // 41, 45, 62 public static final String FOREGROUND = "B0BEC5"; // 176, 190, 197 public static final String CARET = "FFCC00"; // 255, 204, 0 diff --git a/src/main/java/com/chrisrm/idea/config/scope/MTScopeComponent.java b/src/main/java/com/chrisrm/idea/config/scope/MTScopeComponent.java index af7c698fb..f94b6bf4f 100644 --- a/src/main/java/com/chrisrm/idea/config/scope/MTScopeComponent.java +++ b/src/main/java/com/chrisrm/idea/config/scope/MTScopeComponent.java @@ -26,10 +26,10 @@ package com.chrisrm.idea.config.scope; -import com.chrisrm.idea.actions.MTDarkerTheme; -import com.chrisrm.idea.actions.MTDefaultTheme; -import com.chrisrm.idea.actions.MTLighterTheme; -import com.chrisrm.idea.actions.MTPalenightTheme; +import com.chrisrm.idea.actions.MTDarkerThemeAction; +import com.chrisrm.idea.actions.MTDefaultThemeAction; +import com.chrisrm.idea.actions.MTLighterThemeAction; +import com.chrisrm.idea.actions.MTPalenightThemeAction; import com.intellij.openapi.components.AbstractProjectComponent; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.project.Project; @@ -57,10 +57,10 @@ public void initComponent() { */ private void addDisabledFileColors() { FileColorManager manager = FileColorManager.getInstance(myProject); - manager.addScopeColor(MTDefaultNonProjectScope.NAME, MTDefaultTheme.DISABLED, false); - manager.addScopeColor(MTDarkerNonProjectScope.NAME, MTDarkerTheme.DISABLED, false); - manager.addScopeColor(MTLighterNonProjectScope.NAME, MTLighterTheme.DISABLED, false); - manager.addScopeColor(MTPalenightNonProjectScope.NAME, MTPalenightTheme.DISABLED, false); + manager.addScopeColor(MTDefaultNonProjectScope.NAME, MTDefaultThemeAction.DISABLED, false); + manager.addScopeColor(MTDarkerNonProjectScope.NAME, MTDarkerThemeAction.DISABLED, false); + manager.addScopeColor(MTLighterNonProjectScope.NAME, MTLighterThemeAction.DISABLED, false); + manager.addScopeColor(MTPalenightNonProjectScope.NAME, MTPalenightThemeAction.DISABLED, false); } } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 32e669cbd..bd5815eee 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -112,19 +112,19 @@ icon="/icons/actions/material-theme.png"> - - - - From 9c9eb324274083cb9c27ed54dd02d0b2d9d649f2 Mon Sep 17 00:00:00 2001 From: Elior Date: Mon, 7 Aug 2017 09:12:07 +0300 Subject: [PATCH 03/66] putting themes in themes dir --- .../idea/actions/MTAbstractThemeAction.java | 17 ------ .../idea/actions/MTDarkerThemeAction.java | 21 ------- .../idea/actions/MTDefaultThemeAction.java | 18 ------ .../idea/actions/MTLighterThemeAction.java | 21 ------- .../idea/actions/MTPalenightThemeAction.java | 21 ------- .../com/chrisrm/idea/themes/LafTheme.java | 5 ++ .../chrisrm/idea/themes/MTDarkerTheme.java | 55 +++++++++++++++++++ .../chrisrm/idea/themes/MTDefaultTheme.java | 52 ++++++++++++++++++ .../chrisrm/idea/themes/MTLighterTheme.java | 55 +++++++++++++++++++ .../chrisrm/idea/themes/MTPalenightTheme.java | 55 +++++++++++++++++++ 10 files changed, 222 insertions(+), 98 deletions(-) create mode 100644 src/main/java/com/chrisrm/idea/themes/LafTheme.java create mode 100644 src/main/java/com/chrisrm/idea/themes/MTDarkerTheme.java create mode 100644 src/main/java/com/chrisrm/idea/themes/MTDefaultTheme.java create mode 100644 src/main/java/com/chrisrm/idea/themes/MTLighterTheme.java create mode 100644 src/main/java/com/chrisrm/idea/themes/MTPalenightTheme.java diff --git a/src/main/java/com/chrisrm/idea/actions/MTAbstractThemeAction.java b/src/main/java/com/chrisrm/idea/actions/MTAbstractThemeAction.java index 92bb453fb..3b7fb5a24 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTAbstractThemeAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTAbstractThemeAction.java @@ -31,23 +31,6 @@ import com.intellij.openapi.actionSystem.ToggleAction; public abstract class MTAbstractThemeAction extends ToggleAction { - public static final String BACKGROUND = ""; // 38, 50, 56 - public static final String FOREGROUND = ""; // 176, 190, 197 - public static final String CARET = ""; // 255, 204, 0 - public static final String BORDER = ""; // 34, 45, 51 - public static final String TEXT = ""; // 96, 125, 139 - public static final String SELECTION_BACKGROUND = ""; // 84, 110, 122 - public static final String SELECTION_FOREGROUND = ""; - public static final String LABEL = ""; // 176, 190, 197 - public static final String SUB_LABEL = ""; // 84, 110, 122 - public static final String DISABLED = ""; // 65, 89, 103 - public static final String SIDEBAR_HEADING = ""; // 207, 216, 220 - public static final String STATUS_LABEL = ""; // 120, 144, 156 - public static final String INPUT_BORDER = ""; //55, 71, 79 - public static final String BUTTON_BACKGROUND = ""; // 44, 60, 65 - public static final String BUTTON_FOREGROUND = ""; // 96, 125, 139 - public static final String BUTTON_SELECTED = ""; // 49, 69, 73 - public static final String ACCENT_COLOR = ""; // 128, 203, 196 /** * Set button disabled if material theme is disabled diff --git a/src/main/java/com/chrisrm/idea/actions/MTDarkerThemeAction.java b/src/main/java/com/chrisrm/idea/actions/MTDarkerThemeAction.java index a928aa128..b531b5e40 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTDarkerThemeAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTDarkerThemeAction.java @@ -32,27 +32,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent; public final class MTDarkerThemeAction extends MTAbstractThemeAction { - public static final String BACKGROUND = "212121"; // 33, 33, 33 - public static final String FOREGROUND = "B0BEC5"; // 176, 190, 197 - public static final String CARET = "FFCC00"; // 255, 204, 0 - public static final String BORDER = "1B1B1B"; // 27, 27, 27 - public static final String TEXT = "616161"; // 97, 97, 97 - public static final String SELECTION_BACKGROUND = "424242"; // 66, 66, 66 - public static final String SELECTION_FOREGROUND = "FFFFFF"; - public static final String LABEL = "B0BEC5"; // 176, 190, 197 - public static final String SUB_LABEL = "616161"; // 97, 97, 97 - public static final String DISABLED = "323232"; // 65, 89, 103 - - public static final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 - public static final String STATUS_LABEL = "616161"; // 97, 97, 97 - public static final String INPUT_BORDER = "484848"; //72, 72, 72 - - public static final String BUTTON_BACKGROUND = "2B2B2B"; // 43, 43, 43 - public static final String BUTTON_FOREGROUND = "616161"; // 97, 97, 97 - public static final String BUTTON_SELECTED = "383838"; // 56,56,56 - - public static final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 - @Override public boolean isSelected(final AnActionEvent e) { return MTConfig.getInstance().getSelectedTheme() == MTTheme.DARKER; diff --git a/src/main/java/com/chrisrm/idea/actions/MTDefaultThemeAction.java b/src/main/java/com/chrisrm/idea/actions/MTDefaultThemeAction.java index 7c66decf1..b6ea303f0 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTDefaultThemeAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTDefaultThemeAction.java @@ -32,24 +32,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent; public final class MTDefaultThemeAction extends MTAbstractThemeAction { - public static final String BACKGROUND = "263238"; // 38, 50, 56 - public static final String FOREGROUND = "B0BEC5"; // 176, 190, 197 - public static final String CARET = "FFCC00"; // 255, 204, 0 - public static final String BORDER = "222D33"; // 34, 45, 51 - public static final String TEXT = "607D8B"; // 96, 125, 139 - public static final String SELECTION_BACKGROUND = "546E7A"; // 84, 110, 122 - public static final String SELECTION_FOREGROUND = "FFFFFF"; - public static final String LABEL = "B0BEC5"; // 176, 190, 197 - public static final String SUB_LABEL = "546E7A"; // 84, 110, 122 - public static final String DISABLED = "2E3C43"; // 65, 89, 103 - public static final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 - public static final String STATUS_LABEL = "78909C"; // 120, 144, 156 - public static final String INPUT_BORDER = "37474F"; //55, 71, 79 - public static final String BUTTON_BACKGROUND = "2C3C41"; // 44, 60, 65 - public static final String BUTTON_FOREGROUND = "607D8B"; // 96, 125, 139 - public static final String BUTTON_SELECTED = "314549"; // 49, 69, 73 - public static final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 - @Override public boolean isSelected(final AnActionEvent e) { return MTConfig.getInstance().getSelectedTheme() == MTTheme.DEFAULT; diff --git a/src/main/java/com/chrisrm/idea/actions/MTLighterThemeAction.java b/src/main/java/com/chrisrm/idea/actions/MTLighterThemeAction.java index d58f84c44..7f9cdf317 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTLighterThemeAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTLighterThemeAction.java @@ -32,27 +32,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent; public final class MTLighterThemeAction extends MTAbstractThemeAction { - public static final String BACKGROUND = "FAFAFA"; // 250, 250, 250 - public static final String FOREGROUND = "A7ADB0"; // 167, 173, 176 - public static final String CARET = "FFCC00"; // 255, 204, 0 - public static final String BORDER = "E6E6E6"; // 230, 230, 230 - public static final String TEXT = "A7ADB0"; // 167, 173, 176 - public static final String SELECTION_BACKGROUND = "546E7A"; // 84, 110, 122 - public static final String SELECTION_FOREGROUND = "FFFFFF"; - public static final String LABEL = "546E7A"; // 84, 110, 122 - public static final String SUB_LABEL = "B0BEC5"; // 176, 190, 197 - public static final String DISABLED = "eae8e8"; - - public static final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 - public static final String STATUS_LABEL = "90A4AE"; // 144, 164, 174 - public static final String INPUT_BORDER = "CFD8DC"; // 207, 216, 220 - - public static final String BUTTON_BACKGROUND = "EAF3F2"; // 234, 243, 242 - public static final String BUTTON_FOREGROUND = "676E95"; // 103, 110, 149 - public static final String BUTTON_SELECTED = "CCEAE7"; // 204, 234, 231 - - public static final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 - @Override public boolean isSelected(final AnActionEvent e) { return MTConfig.getInstance().getSelectedTheme() == MTTheme.LIGHTER; diff --git a/src/main/java/com/chrisrm/idea/actions/MTPalenightThemeAction.java b/src/main/java/com/chrisrm/idea/actions/MTPalenightThemeAction.java index 6d49e46e9..6752fce92 100644 --- a/src/main/java/com/chrisrm/idea/actions/MTPalenightThemeAction.java +++ b/src/main/java/com/chrisrm/idea/actions/MTPalenightThemeAction.java @@ -32,27 +32,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent; public final class MTPalenightThemeAction extends MTAbstractThemeAction { - public static final String BACKGROUND = "292D3E"; // 41, 45, 62 - public static final String FOREGROUND = "B0BEC5"; // 176, 190, 197 - public static final String CARET = "FFCC00"; // 255, 204, 0 - public static final String BORDER = "202226"; // 32, 34, 38 - public static final String TEXT = "676E95"; // 103, 110, 149 - public static final String SELECTION_BACKGROUND = "676E95"; // 103, 110, 149 - public static final String SELECTION_FOREGROUND = "FFFFFF"; - public static final String LABEL = "A6ACCD"; // 166, 172, 205 - public static final String SUB_LABEL = "676E95"; // 103, 110, 149 - public static final String DISABLED = "2f2e43"; - - public static final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 - public static final String STATUS_LABEL = "676E95"; // 103, 110, 149 - public static final String INPUT_BORDER = "373B4D"; // 55, 59, 77 - - public static final String BUTTON_BACKGROUND = "2D3144"; - public static final String BUTTON_FOREGROUND = "676E95"; // 103, 110, 149 - public static final String BUTTON_SELECTED = "32374D"; // 50, 55, 77 - - public static final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 - @Override public boolean isSelected(final AnActionEvent e) { return MTConfig.getInstance().getSelectedTheme() == MTTheme.PALENIGHT; diff --git a/src/main/java/com/chrisrm/idea/themes/LafTheme.java b/src/main/java/com/chrisrm/idea/themes/LafTheme.java new file mode 100644 index 000000000..a73e2284e --- /dev/null +++ b/src/main/java/com/chrisrm/idea/themes/LafTheme.java @@ -0,0 +1,5 @@ +package com.chrisrm.idea.themes; + +public interface LafTheme { + String getDisabled(); +} diff --git a/src/main/java/com/chrisrm/idea/themes/MTDarkerTheme.java b/src/main/java/com/chrisrm/idea/themes/MTDarkerTheme.java new file mode 100644 index 000000000..fa9a621ab --- /dev/null +++ b/src/main/java/com/chrisrm/idea/themes/MTDarkerTheme.java @@ -0,0 +1,55 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2017 Chris Magnussen and Elior Boukhobza + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * + */ + +package com.chrisrm.idea.themes; + +public final class MTDarkerTheme implements LafTheme { + public final String BACKGROUND = "212121"; // 33, 33, 33 + public final String FOREGROUND = "B0BEC5"; // 176, 190, 197 + public final String CARET = "FFCC00"; // 255, 204, 0 + public final String BORDER = "1B1B1B"; // 27, 27, 27 + public final String TEXT = "616161"; // 97, 97, 97 + public final String SELECTION_BACKGROUND = "424242"; // 66, 66, 66 + public final String SELECTION_FOREGROUND = "FFFFFF"; + public final String LABEL = "B0BEC5"; // 176, 190, 197 + public final String SUB_LABEL = "616161"; // 97, 97, 97 + public final String DISABLED = "323232"; // 65, 89, 103 + + public final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 + public final String STATUS_LABEL = "616161"; // 97, 97, 97 + public final String INPUT_BORDER = "484848"; //72, 72, 72 + + public final String BUTTON_BACKGROUND = "2B2B2B"; // 43, 43, 43 + public final String BUTTON_FOREGROUND = "616161"; // 97, 97, 97 + public final String BUTTON_SELECTED = "383838"; // 56,56,56 + + public final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 + + @Override + public String getDisabled() { + return DISABLED; + } +} diff --git a/src/main/java/com/chrisrm/idea/themes/MTDefaultTheme.java b/src/main/java/com/chrisrm/idea/themes/MTDefaultTheme.java new file mode 100644 index 000000000..18a0e6729 --- /dev/null +++ b/src/main/java/com/chrisrm/idea/themes/MTDefaultTheme.java @@ -0,0 +1,52 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2017 Chris Magnussen and Elior Boukhobza + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * + */ + +package com.chrisrm.idea.themes; + +public final class MTDefaultTheme implements LafTheme { + public final String BACKGROUND = "263238"; // 38, 50, 56 + public final String FOREGROUND = "B0BEC5"; // 176, 190, 197 + public final String CARET = "FFCC00"; // 255, 204, 0 + public final String BORDER = "222D33"; // 34, 45, 51 + public final String TEXT = "607D8B"; // 96, 125, 139 + public final String SELECTION_BACKGROUND = "546E7A"; // 84, 110, 122 + public final String SELECTION_FOREGROUND = "FFFFFF"; + public final String LABEL = "B0BEC5"; // 176, 190, 197 + public final String SUB_LABEL = "546E7A"; // 84, 110, 122 + public final String DISABLED = "2E3C43"; // 65, 89, 103 + public final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 + public final String STATUS_LABEL = "78909C"; // 120, 144, 156 + public final String INPUT_BORDER = "37474F"; //55, 71, 79 + public final String BUTTON_BACKGROUND = "2C3C41"; // 44, 60, 65 + public final String BUTTON_FOREGROUND = "607D8B"; // 96, 125, 139 + public final String BUTTON_SELECTED = "314549"; // 49, 69, 73 + public final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 + + @Override + public String getDisabled() { + return DISABLED; + } +} diff --git a/src/main/java/com/chrisrm/idea/themes/MTLighterTheme.java b/src/main/java/com/chrisrm/idea/themes/MTLighterTheme.java new file mode 100644 index 000000000..390d5f396 --- /dev/null +++ b/src/main/java/com/chrisrm/idea/themes/MTLighterTheme.java @@ -0,0 +1,55 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2017 Chris Magnussen and Elior Boukhobza + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * + */ + +package com.chrisrm.idea.themes; + +public final class MTLighterTheme implements LafTheme { + public String BACKGROUND = "FAFAFA"; // 250, 250, 250 + public String FOREGROUND = "A7ADB0"; // 167, 173, 176 + public String CARET = "FFCC00"; // 255, 204, 0 + public String BORDER = "E6E6E6"; // 230, 230, 230 + public String TEXT = "A7ADB0"; // 167, 173, 176 + public String SELECTION_BACKGROUND = "546E7A"; // 84, 110, 122 + public String SELECTION_FOREGROUND = "FFFFFF"; + public String LABEL = "546E7A"; // 84, 110, 122 + public String SUB_LABEL = "B0BEC5"; // 176, 190, 197 + public String DISABLED = "eae8e8"; + + public String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 + public String STATUS_LABEL = "90A4AE"; // 144, 164, 174 + public String INPUT_BORDER = "CFD8DC"; // 207, 216, 220 + + public String BUTTON_BACKGROUND = "EAF3F2"; // 234, 243, 242 + public String BUTTON_FOREGROUND = "676E95"; // 103, 110, 149 + public String BUTTON_SELECTED = "CCEAE7"; // 204, 234, 231 + + public String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 + + @Override + public String getDisabled() { + return DISABLED; + } +} diff --git a/src/main/java/com/chrisrm/idea/themes/MTPalenightTheme.java b/src/main/java/com/chrisrm/idea/themes/MTPalenightTheme.java new file mode 100644 index 000000000..143012ced --- /dev/null +++ b/src/main/java/com/chrisrm/idea/themes/MTPalenightTheme.java @@ -0,0 +1,55 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2017 Chris Magnussen and Elior Boukhobza + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * + */ + +package com.chrisrm.idea.themes; + +public final class MTPalenightTheme implements LafTheme { + public final String BACKGROUND = "292D3E"; // 41, 45, 62 + public final String FOREGROUND = "B0BEC5"; // 176, 190, 197 + public final String CARET = "FFCC00"; // 255, 204, 0 + public final String BORDER = "202226"; // 32, 34, 38 + public final String TEXT = "676E95"; // 103, 110, 149 + public final String SELECTION_BACKGROUND = "676E95"; // 103, 110, 149 + public final String SELECTION_FOREGROUND = "FFFFFF"; + public final String LABEL = "A6ACCD"; // 166, 172, 205 + public final String SUB_LABEL = "676E95"; // 103, 110, 149 + public final String DISABLED = "2f2e43"; + + public final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 + public final String STATUS_LABEL = "676E95"; // 103, 110, 149 + public final String INPUT_BORDER = "373B4D"; // 55, 59, 77 + + public final String BUTTON_BACKGROUND = "2D3144"; + public final String BUTTON_FOREGROUND = "676E95"; // 103, 110, 149 + public final String BUTTON_SELECTED = "32374D"; // 50, 55, 77 + + public final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 + + @Override + public String getDisabled() { + return DISABLED; + } +} From d148bd438827633dda0593815618916a1a547bb0 Mon Sep 17 00:00:00 2001 From: mallowigi Date: Sun, 6 Aug 2017 07:34:19 +0300 Subject: [PATCH 04/66] fix combobox action button --- .../java/com/chrisrm/idea/MTLafComponent.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/com/chrisrm/idea/MTLafComponent.java b/src/main/java/com/chrisrm/idea/MTLafComponent.java index 3a0fe19d0..ec021dcf9 100644 --- a/src/main/java/com/chrisrm/idea/MTLafComponent.java +++ b/src/main/java/com/chrisrm/idea/MTLafComponent.java @@ -195,6 +195,23 @@ public void edit(final MethodCall m) throws CannotCompileException { }); ctClass.toClass(); + + final CtClass comboBoxActionButtonClass = cp.get("com.intellij.openapi.actionSystem.ex.ComboBoxAction$ComboBoxButton"); + final CtMethod paint = comboBoxActionButtonClass.getDeclaredMethod("paint"); + paint.instrument(new ExprEditor() { + @Override + public void edit(final MethodCall m) throws CannotCompileException { + if (m.getMethodName().equals("drawRoundRect")) { + m.replace("{ $2 = $4; $5 = 0; $6 = 0; $_ = $proceed($$); }"); + } else if (m.getMethodName().equals("setPaint") && m.getLineNumber() > 454 && m.getLineNumber() < 460) { + final String color = "javax.swing.UIManager.getColor(\"TextField.selectedSeparatorColor\")"; + m.replace("{ $1 = myMouseInside ? " + color + " : com.intellij.ui.Gray._95; $_ = $proceed($$); }"); + } + } + }); + + comboBoxActionButtonClass.toClass(); + } catch (final Exception e) { e.printStackTrace(); } From 3d56c165b6d7e19630323807ed078d73b37e727b Mon Sep 17 00:00:00 2001 From: mallowigi Date: Mon, 7 Aug 2017 22:10:10 +0300 Subject: [PATCH 05/66] fix scope component --- .../idea/config/scope/MTScopeComponent.java | 18 +++++----- .../chrisrm/idea/themes/MTDarkerTheme.java | 34 +++++++++---------- .../chrisrm/idea/themes/MTDefaultTheme.java | 34 +++++++++---------- .../chrisrm/idea/themes/MTLighterTheme.java | 34 +++++++++---------- .../chrisrm/idea/themes/MTPalenightTheme.java | 34 +++++++++---------- 5 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/main/java/com/chrisrm/idea/config/scope/MTScopeComponent.java b/src/main/java/com/chrisrm/idea/config/scope/MTScopeComponent.java index f94b6bf4f..646ebd78b 100644 --- a/src/main/java/com/chrisrm/idea/config/scope/MTScopeComponent.java +++ b/src/main/java/com/chrisrm/idea/config/scope/MTScopeComponent.java @@ -26,10 +26,10 @@ package com.chrisrm.idea.config.scope; -import com.chrisrm.idea.actions.MTDarkerThemeAction; -import com.chrisrm.idea.actions.MTDefaultThemeAction; -import com.chrisrm.idea.actions.MTLighterThemeAction; -import com.chrisrm.idea.actions.MTPalenightThemeAction; +import com.chrisrm.idea.themes.MTDarkerTheme; +import com.chrisrm.idea.themes.MTDefaultTheme; +import com.chrisrm.idea.themes.MTLighterTheme; +import com.chrisrm.idea.themes.MTPalenightTheme; import com.intellij.openapi.components.AbstractProjectComponent; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.project.Project; @@ -56,11 +56,11 @@ public void initComponent() { * Note: If the scope has changed somehow (by changing the name or the color), it will add a duplicate. */ private void addDisabledFileColors() { - FileColorManager manager = FileColorManager.getInstance(myProject); - manager.addScopeColor(MTDefaultNonProjectScope.NAME, MTDefaultThemeAction.DISABLED, false); - manager.addScopeColor(MTDarkerNonProjectScope.NAME, MTDarkerThemeAction.DISABLED, false); - manager.addScopeColor(MTLighterNonProjectScope.NAME, MTLighterThemeAction.DISABLED, false); - manager.addScopeColor(MTPalenightNonProjectScope.NAME, MTPalenightThemeAction.DISABLED, false); + final FileColorManager manager = FileColorManager.getInstance(myProject); + manager.addScopeColor(MTDefaultNonProjectScope.NAME, MTDefaultTheme.DISABLED, false); + manager.addScopeColor(MTDarkerNonProjectScope.NAME, MTDarkerTheme.DISABLED, false); + manager.addScopeColor(MTLighterNonProjectScope.NAME, MTLighterTheme.DISABLED, false); + manager.addScopeColor(MTPalenightNonProjectScope.NAME, MTPalenightTheme.DISABLED, false); } } diff --git a/src/main/java/com/chrisrm/idea/themes/MTDarkerTheme.java b/src/main/java/com/chrisrm/idea/themes/MTDarkerTheme.java index fa9a621ab..68a97268e 100644 --- a/src/main/java/com/chrisrm/idea/themes/MTDarkerTheme.java +++ b/src/main/java/com/chrisrm/idea/themes/MTDarkerTheme.java @@ -27,26 +27,26 @@ package com.chrisrm.idea.themes; public final class MTDarkerTheme implements LafTheme { - public final String BACKGROUND = "212121"; // 33, 33, 33 - public final String FOREGROUND = "B0BEC5"; // 176, 190, 197 - public final String CARET = "FFCC00"; // 255, 204, 0 - public final String BORDER = "1B1B1B"; // 27, 27, 27 - public final String TEXT = "616161"; // 97, 97, 97 - public final String SELECTION_BACKGROUND = "424242"; // 66, 66, 66 - public final String SELECTION_FOREGROUND = "FFFFFF"; - public final String LABEL = "B0BEC5"; // 176, 190, 197 - public final String SUB_LABEL = "616161"; // 97, 97, 97 - public final String DISABLED = "323232"; // 65, 89, 103 + public static final String BACKGROUND = "212121"; // 33, 33, 33 + public static final String FOREGROUND = "B0BEC5"; // 176, 190, 197 + public static final String CARET = "FFCC00"; // 255, 204, 0 + public static final String BORDER = "1B1B1B"; // 27, 27, 27 + public static final String TEXT = "616161"; // 97, 97, 97 + public static final String SELECTION_BACKGROUND = "424242"; // 66, 66, 66 + public static final String SELECTION_FOREGROUND = "FFFFFF"; + public static final String LABEL = "B0BEC5"; // 176, 190, 197 + public static final String SUB_LABEL = "616161"; // 97, 97, 97 + public static final String DISABLED = "323232"; // 65, 89, 103 - public final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 - public final String STATUS_LABEL = "616161"; // 97, 97, 97 - public final String INPUT_BORDER = "484848"; //72, 72, 72 + public static final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 + public static final String STATUS_LABEL = "616161"; // 97, 97, 97 + public static final String INPUT_BORDER = "484848"; //72, 72, 72 - public final String BUTTON_BACKGROUND = "2B2B2B"; // 43, 43, 43 - public final String BUTTON_FOREGROUND = "616161"; // 97, 97, 97 - public final String BUTTON_SELECTED = "383838"; // 56,56,56 + public static final String BUTTON_BACKGROUND = "2B2B2B"; // 43, 43, 43 + public static final String BUTTON_FOREGROUND = "616161"; // 97, 97, 97 + public static final String BUTTON_SELECTED = "383838"; // 56,56,56 - public final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 + public static final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 @Override public String getDisabled() { diff --git a/src/main/java/com/chrisrm/idea/themes/MTDefaultTheme.java b/src/main/java/com/chrisrm/idea/themes/MTDefaultTheme.java index 18a0e6729..4cd7a6dbe 100644 --- a/src/main/java/com/chrisrm/idea/themes/MTDefaultTheme.java +++ b/src/main/java/com/chrisrm/idea/themes/MTDefaultTheme.java @@ -27,23 +27,23 @@ package com.chrisrm.idea.themes; public final class MTDefaultTheme implements LafTheme { - public final String BACKGROUND = "263238"; // 38, 50, 56 - public final String FOREGROUND = "B0BEC5"; // 176, 190, 197 - public final String CARET = "FFCC00"; // 255, 204, 0 - public final String BORDER = "222D33"; // 34, 45, 51 - public final String TEXT = "607D8B"; // 96, 125, 139 - public final String SELECTION_BACKGROUND = "546E7A"; // 84, 110, 122 - public final String SELECTION_FOREGROUND = "FFFFFF"; - public final String LABEL = "B0BEC5"; // 176, 190, 197 - public final String SUB_LABEL = "546E7A"; // 84, 110, 122 - public final String DISABLED = "2E3C43"; // 65, 89, 103 - public final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 - public final String STATUS_LABEL = "78909C"; // 120, 144, 156 - public final String INPUT_BORDER = "37474F"; //55, 71, 79 - public final String BUTTON_BACKGROUND = "2C3C41"; // 44, 60, 65 - public final String BUTTON_FOREGROUND = "607D8B"; // 96, 125, 139 - public final String BUTTON_SELECTED = "314549"; // 49, 69, 73 - public final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 + public static final String BACKGROUND = "263238"; // 38, 50, 56 + public static final String FOREGROUND = "B0BEC5"; // 176, 190, 197 + public static final String CARET = "FFCC00"; // 255, 204, 0 + public static final String BORDER = "222D33"; // 34, 45, 51 + public static final String TEXT = "607D8B"; // 96, 125, 139 + public static final String SELECTION_BACKGROUND = "546E7A"; // 84, 110, 122 + public static final String SELECTION_FOREGROUND = "FFFFFF"; + public static final String LABEL = "B0BEC5"; // 176, 190, 197 + public static final String SUB_LABEL = "546E7A"; // 84, 110, 122 + public static final String DISABLED = "2E3C43"; // 65, 89, 103 + public static final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 + public static final String STATUS_LABEL = "78909C"; // 120, 144, 156 + public static final String INPUT_BORDER = "37474F"; //55, 71, 79 + public static final String BUTTON_BACKGROUND = "2C3C41"; // 44, 60, 65 + public static final String BUTTON_FOREGROUND = "607D8B"; // 96, 125, 139 + public static final String BUTTON_SELECTED = "314549"; // 49, 69, 73 + public static final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 @Override public String getDisabled() { diff --git a/src/main/java/com/chrisrm/idea/themes/MTLighterTheme.java b/src/main/java/com/chrisrm/idea/themes/MTLighterTheme.java index 390d5f396..06b747d26 100644 --- a/src/main/java/com/chrisrm/idea/themes/MTLighterTheme.java +++ b/src/main/java/com/chrisrm/idea/themes/MTLighterTheme.java @@ -27,26 +27,26 @@ package com.chrisrm.idea.themes; public final class MTLighterTheme implements LafTheme { - public String BACKGROUND = "FAFAFA"; // 250, 250, 250 - public String FOREGROUND = "A7ADB0"; // 167, 173, 176 - public String CARET = "FFCC00"; // 255, 204, 0 - public String BORDER = "E6E6E6"; // 230, 230, 230 - public String TEXT = "A7ADB0"; // 167, 173, 176 - public String SELECTION_BACKGROUND = "546E7A"; // 84, 110, 122 - public String SELECTION_FOREGROUND = "FFFFFF"; - public String LABEL = "546E7A"; // 84, 110, 122 - public String SUB_LABEL = "B0BEC5"; // 176, 190, 197 - public String DISABLED = "eae8e8"; + public static final String BACKGROUND = "FAFAFA"; // 250, 250, 250 + public static final String FOREGROUND = "A7ADB0"; // 167, 173, 176 + public static final String CARET = "FFCC00"; // 255, 204, 0 + public static final String BORDER = "E6E6E6"; // 230, 230, 230 + public static final String TEXT = "A7ADB0"; // 167, 173, 176 + public static final String SELECTION_BACKGROUND = "546E7A"; // 84, 110, 122 + public static final String SELECTION_FOREGROUND = "FFFFFF"; + public static final String LABEL = "546E7A"; // 84, 110, 122 + public static final String SUB_LABEL = "B0BEC5"; // 176, 190, 197 + public static final String DISABLED = "eae8e8"; - public String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 - public String STATUS_LABEL = "90A4AE"; // 144, 164, 174 - public String INPUT_BORDER = "CFD8DC"; // 207, 216, 220 + public static final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 + public static final String STATUS_LABEL = "90A4AE"; // 144, 164, 174 + public static final String INPUT_BORDER = "CFD8DC"; // 207, 216, 220 - public String BUTTON_BACKGROUND = "EAF3F2"; // 234, 243, 242 - public String BUTTON_FOREGROUND = "676E95"; // 103, 110, 149 - public String BUTTON_SELECTED = "CCEAE7"; // 204, 234, 231 + public static final String BUTTON_BACKGROUND = "EAF3F2"; // 234, 243, 242 + public static final String BUTTON_FOREGROUND = "676E95"; // 103, 110, 149 + public static final String BUTTON_SELECTED = "CCEAE7"; // 204, 234, 231 - public String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 + public static final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 @Override public String getDisabled() { diff --git a/src/main/java/com/chrisrm/idea/themes/MTPalenightTheme.java b/src/main/java/com/chrisrm/idea/themes/MTPalenightTheme.java index 143012ced..4a8c057e9 100644 --- a/src/main/java/com/chrisrm/idea/themes/MTPalenightTheme.java +++ b/src/main/java/com/chrisrm/idea/themes/MTPalenightTheme.java @@ -27,26 +27,26 @@ package com.chrisrm.idea.themes; public final class MTPalenightTheme implements LafTheme { - public final String BACKGROUND = "292D3E"; // 41, 45, 62 - public final String FOREGROUND = "B0BEC5"; // 176, 190, 197 - public final String CARET = "FFCC00"; // 255, 204, 0 - public final String BORDER = "202226"; // 32, 34, 38 - public final String TEXT = "676E95"; // 103, 110, 149 - public final String SELECTION_BACKGROUND = "676E95"; // 103, 110, 149 - public final String SELECTION_FOREGROUND = "FFFFFF"; - public final String LABEL = "A6ACCD"; // 166, 172, 205 - public final String SUB_LABEL = "676E95"; // 103, 110, 149 - public final String DISABLED = "2f2e43"; + public static final String BACKGROUND = "292D3E"; // 41, 45, 62 + public static final String FOREGROUND = "B0BEC5"; // 176, 190, 197 + public static final String CARET = "FFCC00"; // 255, 204, 0 + public static final String BORDER = "202226"; // 32, 34, 38 + public static final String TEXT = "676E95"; // 103, 110, 149 + public static final String SELECTION_BACKGROUND = "676E95"; // 103, 110, 149 + public static final String SELECTION_FOREGROUND = "FFFFFF"; + public static final String LABEL = "A6ACCD"; // 166, 172, 205 + public static final String SUB_LABEL = "676E95"; // 103, 110, 149 + public static final String DISABLED = "2f2e43"; - public final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 - public final String STATUS_LABEL = "676E95"; // 103, 110, 149 - public final String INPUT_BORDER = "373B4D"; // 55, 59, 77 + public static final String SIDEBAR_HEADING = "CFD8DC"; // 207, 216, 220 + public static final String STATUS_LABEL = "676E95"; // 103, 110, 149 + public static final String INPUT_BORDER = "373B4D"; // 55, 59, 77 - public final String BUTTON_BACKGROUND = "2D3144"; - public final String BUTTON_FOREGROUND = "676E95"; // 103, 110, 149 - public final String BUTTON_SELECTED = "32374D"; // 50, 55, 77 + public static final String BUTTON_BACKGROUND = "2D3144"; + public static final String BUTTON_FOREGROUND = "676E95"; // 103, 110, 149 + public static final String BUTTON_SELECTED = "32374D"; // 50, 55, 77 - public final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 + public static final String ACCENT_COLOR = "80CBC4"; // 128, 203, 196 @Override public String getDisabled() { From 9e72fb3d2701ae9d3c22d74e84bf2cb7f6eb4c08 Mon Sep 17 00:00:00 2001 From: mallowigi Date: Mon, 7 Aug 2017 23:30:49 +0300 Subject: [PATCH 06/66] rewrite hacktextifeld --- .../java/com/chrisrm/idea/MTLafComponent.java | 43 ++++++++++++------- .../com/chrisrm/idea/mt.default.properties | 35 --------------- 2 files changed, 28 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/chrisrm/idea/MTLafComponent.java b/src/main/java/com/chrisrm/idea/MTLafComponent.java index ec021dcf9..d106f8230 100644 --- a/src/main/java/com/chrisrm/idea/MTLafComponent.java +++ b/src/main/java/com/chrisrm/idea/MTLafComponent.java @@ -49,6 +49,7 @@ import javassist.expr.ConstructorCall; import javassist.expr.ExprEditor; import javassist.expr.MethodCall; +import javassist.expr.NewExpr; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -62,7 +63,7 @@ public final class MTLafComponent extends JBPanel implements ApplicationComponen private boolean willRestartIde = false; static { - // patchUIUtil(); + // hackSearchTextField(); hackTitleLabel(); hackIdeaActionButton(); } @@ -146,6 +147,32 @@ public void edit(final MethodCall m) throws CannotCompileException { } } + /** + * Hack SearchTextField to override SDK's createUI + */ + private static void hackSearchTextField() { + try { + final ClassPool cp = new ClassPool(true); + cp.insertClassPath(new ClassClassPath(MTTextFieldUI.class)); + + final CtClass darculaClass = cp.get("com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI"); + final CtClass componentClass = cp.get("javax.swing.JComponent"); + final CtMethod createUI = darculaClass.getDeclaredMethod("createUI", new CtClass[]{componentClass}); + createUI.instrument(new ExprEditor() { + @Override + public void edit(NewExpr e) throws CannotCompileException { + if (e.getClassName().equals("com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI")) { + e.replace("{ $_ = (javax.swing.plaf.ComponentUI)javax.swing.SwingUtilities.loadSystemClass(\"com.chrisrm.idea.ui" + + ".MTTextFieldUI\").newInstance(); }"); + } + } + }); + darculaClass.toClass(); + } catch (Exception e) { + ; + } + } + /** * Change Look and feel of Action buttons */ @@ -273,20 +300,6 @@ private void restartIdeIfNecessary(final MTConfig mtConfig, final MTForm form) { } } - /** - * Hack SearchTextField to override SDK's createUI - */ - private static void hackSearchTextField() throws NotFoundException, CannotCompileException { - final ClassPool cp = ClassPool.getDefault(); - cp.insertClassPath(new ClassClassPath(MTTextFieldUI.class)); - - final CtClass darculaClass = cp.get("com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI"); - final CtClass componentClass = cp.get("javax.swing.JComponent"); - final CtMethod createUI = darculaClass.getDeclaredMethod("createUI", new CtClass[]{componentClass}); - createUI.setBody("{ return com.chrisrm.idea.ui.MTTextFieldFactory.newInstance($1); }"); - darculaClass.toClass(); - } - /** * Replace Table headers */ diff --git a/src/main/resources/com/chrisrm/idea/mt.default.properties b/src/main/resources/com/chrisrm/idea/mt.default.properties index 78664e2ff..49d5afdea 100644 --- a/src/main/resources/com/chrisrm/idea/mt.default.properties +++ b/src/main/resources/com/chrisrm/idea/mt.default.properties @@ -50,19 +50,9 @@ infoText=B0BEC5 # Controls (buttons, combobox...) default colors control=263238 controlText=B0BEC5 -# Need to try this on windows and linux... -#controlHighlight=ffffff -#controlLtHighlight=ffff00 -#controlShadow=00ff00 -#controlDkShadow=00ffff # Link color link.foreground=80CBC4 # ----------- Alerts ---------------- -# Replace alert pane icons with something more material like... -#OptionPane.errorIcon=/icons/option_error.png -#OptionPane.informationIcon=/icons/option_info.png -#OptionPane.warningIcon=/icons/option_warn.png -#OptionPane.questionIcon=/icons/option_help.png OptionPane.messageForeground=B0BEC5 # --------- Menus -------------- Menu.maxGutterIconWidth=18 @@ -98,7 +88,6 @@ ScrollBarUI=com.intellij.ui.components.JBScrollBar ScrollBar.thumb=546E7A # --------------------- Tables -------------------------TableHeaderUI=com.chrisrm.idea.ui.MTTableHeaderUI -TableHeader.cellBorder=com.chrisrm.idea.ui.MTTableHeaderBorder Table.background=263238 Table.gridColor=263238 Table.sortIconColor=B0BEC5 @@ -106,11 +95,8 @@ Table.sortIconColor=B0BEC5 Table.stripedBackground=1E272C Table.selectionForeground=ffffff Table.selectionBackground=314549 -Table.ascendingSortIcon=AllIcons.General.SplitUp -Table.descendingSortIcon=AllIcons.General.SplitDown Table.cellNoFocusBorder=10,2,10,2 Table.focusCellBackground=0D293E -Table.focusSelectedCellHighlightBorder=com.chrisrm.idea.ui.MTTableSelectedCellHighlightBorder Table.highlightOuter=485C66 Table.highlightInner=3E5159 Table.shadowOuter=192024 @@ -123,7 +109,6 @@ MenuBar.shadow=263238 MenuBar.darcula.borderColor=2E3C43 MenuBar.darcula.borderShadowColor=2A373E # ------------------- Tabbed panes ------------------------ -TabbedPaneUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTabbedPaneUI TabbedPane.tabInsets=5,10,5,10 TabbedPane.highlight=263238 TabbedPane.light=444444 @@ -145,8 +130,6 @@ TextField.selectedSeparatorColor=80CBCF TextField.inactiveForeground=415967 TextField.selectionBackground=314549 TextField.selectionForeground=ffffff -TextFieldUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI -TextField.border=com.intellij.ide.ui.laf.darcula.ui.DarculaTextBorder TextField.darcula.search.icon=/com/intellij/ide/ui/laf/darcula/icons/search.png TextField.darcula.searchWithHistory.icon=/com/intellij/ide/ui/laf/darcula/icons/searchWithHistory.png TextField.darcula.clear.icon=/com/intellij/ide/ui/laf/darcula/icons/clear.png @@ -156,12 +139,8 @@ PasswordField.background=263238 PasswordField.inactiveForeground=415967 PasswordField.selectionBackground=314549 PasswordField.selectionForeground=ffffff -PasswordFieldUI=com.intellij.ide.ui.laf.darcula.ui.DarculaPasswordFieldUI -PasswordField.border=com.intellij.ide.ui.laf.darcula.ui.DarculaTextBorder PasswordField.preview.icon=/icons/general/eye.png # ------------------------ Progress bar -------------------------- -ProgressBarUI=com.intellij.ide.ui.laf.darcula.ui.DarculaProgressBarUI -ProgressBar.border=com.intellij.ide.ui.laf.darcula.ui.DarculaProgressBarBorder ProgressBar.foreground=80CBC4 ProgressBar.color=80CBC4 ProgressBar.halfColor=425B67 @@ -172,8 +151,6 @@ TextArea.selectionForeground=304349 TextArea.background=263238 TextAreaUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTextAreaUI # ------------------------- Checkboxes ----------------------------- -CheckBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxUI -CheckBox.border=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxBorder CheckBox.darcula.inactiveFillColor=425B67 CheckBox.darcula.borderColor1=80CBC4 CheckBox.darcula.borderColor2=80CBC4 @@ -198,7 +175,6 @@ CheckBox.darcula.focused.backgroundColor2.selected=80CBC4 CheckBoxMenuItemUI=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxMenuItemUI CheckBoxMenuItem.borderPainted=false # ---------------------- Dropdowns (comboboxes) --------------------- -ComboBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaComboBoxUI ComboBox.background=263238 ComboBox.disabledBackground=263238 ComboBox.disabledForeground=607D8B @@ -216,8 +192,6 @@ RadioButtonMenuItem.borderPainted=false StatusBar.topColor=263238 StatusBar.top2Color=263238 StatusBar.bottomColor=263238 -Button.border=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonPainter -ButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI Button.disabledText=415967 Button.background=263238 Button.foreground=607D8B @@ -234,12 +208,8 @@ Button.mt.selection.color2=304146 Button.mt.background=2E3C43 Button.mt.foreground=607D8B Button.mt.selectedForeground=FFFFFF -ToggleButton.border=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonPainter -ToggleButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI ToolTip.background=263238 # ----------------------- Spinners --------------------------- -SpinnerUI=com.intellij.ide.ui.laf.darcula.ui.DarculaSpinnerUI -Spinner.border=com.intellij.ide.ui.laf.darcula.ui.DarculaSpinnerBorder Spinner.background=263238 Spinner.arrowButtonInsets=1,1,1,1 Spinner.editorBorderPainted=false @@ -253,15 +223,10 @@ SidePanel.background=263238 # ----------------------- Lists --------------------------- List.background=32424A -#List.selectionBackground=263238 # ---------------- Trees ------------------------------- -TreeUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTreeUI -Tree.collapsedIcon=AllIcons.Mac.Tree_white_right_arrow -Tree.expandedIcon=AllIcons.Mac.Tree_white_down_arrow Tree.rightChildIndent=6 Tree.selectionBackground=546E7A50 Tree.foreground=607D8B -FileView.fileIcon=AllIcons.FileTypes.Unknown # ------------- Internal dividers ----------------------- DialogWrapper.southPanelDivider=263238 OnePixelDivider.background=263238 From 7ccc5ca6a323726966764c349463bbdca6f35e7d Mon Sep 17 00:00:00 2001 From: mallowigi Date: Mon, 7 Aug 2017 23:51:38 +0300 Subject: [PATCH 07/66] set focus ring to accent --- src/main/java/com/chrisrm/idea/utils/UIReplacer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chrisrm/idea/utils/UIReplacer.java b/src/main/java/com/chrisrm/idea/utils/UIReplacer.java index 0bc4bfbeb..8f0356d3c 100644 --- a/src/main/java/com/chrisrm/idea/utils/UIReplacer.java +++ b/src/main/java/com/chrisrm/idea/utils/UIReplacer.java @@ -31,6 +31,7 @@ import com.intellij.codeInsight.hint.ParameterInfoComponent; import com.intellij.codeInsight.lookup.impl.LookupCellRenderer; import com.intellij.icons.AllIcons; +import com.intellij.ide.ui.laf.darcula.DarculaUIUtil; import com.intellij.lang.parameterInfo.ParameterInfoUIContextEx; import com.intellij.notification.impl.NotificationsManagerImpl; import com.intellij.openapi.options.newEditor.SettingsTreeView; @@ -46,7 +47,7 @@ import com.intellij.vcs.log.ui.highlighters.MergeCommitsHighlighter; import javax.swing.*; -import javax.swing.plaf.*; +import javax.swing.plaf.ColorUIResource; import java.awt.*; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -111,6 +112,10 @@ static void patchPanels() throws Exception { StaticPatcher.setFinalStatic(UIUtil.class, "CONTRAST_BORDER_COLOR", color); StaticPatcher.setFinalStatic(UIUtil.class, "BORDER_COLOR", color); StaticPatcher.setFinalStatic(UIUtil.class, "AQUA_SEPARATOR_FOREGROUND_COLOR", color); + + final Color accentColor = ColorUtil.fromHex(MTConfig.getInstance().getAccentColor()); + StaticPatcher.setFinalStatic(DarculaUIUtil.class, "g", accentColor); + StaticPatcher.setFinalStatic(DarculaUIUtil.class, "h", accentColor); } static void patchMemoryIndicator() throws Exception { From 495bb7f4fe8482fae4c09aae6f8f860c3afdcfa3 Mon Sep 17 00:00:00 2001 From: Elior Date: Tue, 8 Aug 2017 18:01:07 +0300 Subject: [PATCH 08/66] fix --- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/resources/META-INF/plugin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b9df82a68..275fe4e03 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Thu Jul 20 19:13:56 IDT 2017 +#Tue Aug 08 17:46:06 IDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index bd5815eee..7118dc1fd 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -27,7 +27,7 @@ com.chrisrm.idea.MaterialThemeUIFork Material Theme UI EAP - 0.8.0.2 + 0.8.0.3 Mallowigi Date: Wed, 9 Aug 2017 14:48:18 +0300 Subject: [PATCH 09/66] revert last changes --- CHANGELOG.md | 3 +++ src/main/resources/META-INF/plugin.xml | 2 +- src/main/resources/com/chrisrm/idea/mt.default.properties | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 825e3ddb9..035b5b1fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 0.8.0.5 +- Reverting back last changes as it broke a lot of stuff. + ## 0.8.0.2 - Fix issue with custom file statuses not being colorable - Themed Material Combobox Action button diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 7118dc1fd..829febbdf 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -27,7 +27,7 @@ com.chrisrm.idea.MaterialThemeUIFork Material Theme UI EAP - 0.8.0.3 + 0.8.0.5 Mallowigi Date: Wed, 9 Aug 2017 17:01:09 +0300 Subject: [PATCH 10/66] revert again --- .../com/chrisrm/idea/mt.default.properties | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/resources/com/chrisrm/idea/mt.default.properties b/src/main/resources/com/chrisrm/idea/mt.default.properties index d26c97295..b1130523a 100644 --- a/src/main/resources/com/chrisrm/idea/mt.default.properties +++ b/src/main/resources/com/chrisrm/idea/mt.default.properties @@ -88,6 +88,7 @@ ScrollBarUI=com.intellij.ui.components.JBScrollBar ScrollBar.thumb=546E7A # --------------------- Tables -------------------------TableHeaderUI=com.chrisrm.idea.ui.MTTableHeaderUI +TableHeader.cellBorder=com.chrisrm.idea.ui.MTTableHeaderBorder Table.background=263238 Table.gridColor=263238 Table.sortIconColor=B0BEC5 @@ -99,6 +100,7 @@ Table.ascendingSortIcon=AllIcons.General.SplitUp Table.descendingSortIcon=AllIcons.General.SplitDown Table.cellNoFocusBorder=10,2,10,2 Table.focusCellBackground=0D293E +Table.focusSelectedCellHighlightBorder=com.chrisrm.idea.ui.MTTableSelectedCellHighlightBorder Table.highlightOuter=485C66 Table.highlightInner=3E5159 Table.shadowOuter=192024 @@ -111,6 +113,7 @@ MenuBar.shadow=263238 MenuBar.darcula.borderColor=2E3C43 MenuBar.darcula.borderShadowColor=2A373E # ------------------- Tabbed panes ------------------------ +TabbedPaneUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTabbedPaneUI TabbedPane.tabInsets=5,10,5,10 TabbedPane.highlight=263238 TabbedPane.light=444444 @@ -132,6 +135,8 @@ TextField.selectedSeparatorColor=80CBCF TextField.inactiveForeground=415967 TextField.selectionBackground=314549 TextField.selectionForeground=ffffff +TextFieldUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI +TextField.border=com.intellij.ide.ui.laf.darcula.ui.DarculaTextBorder TextField.darcula.search.icon=/com/intellij/ide/ui/laf/darcula/icons/search.png TextField.darcula.searchWithHistory.icon=/com/intellij/ide/ui/laf/darcula/icons/searchWithHistory.png TextField.darcula.clear.icon=/com/intellij/ide/ui/laf/darcula/icons/clear.png @@ -141,8 +146,12 @@ PasswordField.background=263238 PasswordField.inactiveForeground=415967 PasswordField.selectionBackground=314549 PasswordField.selectionForeground=ffffff +PasswordFieldUI=com.intellij.ide.ui.laf.darcula.ui.DarculaPasswordFieldUI +PasswordField.border=com.intellij.ide.ui.laf.darcula.ui.DarculaTextBorder PasswordField.preview.icon=/icons/general/eye.png # ------------------------ Progress bar -------------------------- +ProgressBarUI=com.intellij.ide.ui.laf.darcula.ui.DarculaProgressBarUI +ProgressBar.border=com.intellij.ide.ui.laf.darcula.ui.DarculaProgressBarBorder ProgressBar.foreground=80CBC4 ProgressBar.color=80CBC4 ProgressBar.halfColor=425B67 @@ -153,6 +162,8 @@ TextArea.selectionForeground=304349 TextArea.background=263238 TextAreaUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTextAreaUI # ------------------------- Checkboxes ----------------------------- +CheckBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxUI +CheckBox.border=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxBorder CheckBox.darcula.inactiveFillColor=425B67 CheckBox.darcula.borderColor1=80CBC4 CheckBox.darcula.borderColor2=80CBC4 @@ -177,6 +188,7 @@ CheckBox.darcula.focused.backgroundColor2.selected=80CBC4 CheckBoxMenuItemUI=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxMenuItemUI CheckBoxMenuItem.borderPainted=false # ---------------------- Dropdowns (comboboxes) --------------------- +ComboBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaComboBoxUI ComboBox.background=263238 ComboBox.disabledBackground=263238 ComboBox.disabledForeground=607D8B @@ -194,6 +206,8 @@ RadioButtonMenuItem.borderPainted=false StatusBar.topColor=263238 StatusBar.top2Color=263238 StatusBar.bottomColor=263238 +Button.border=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonPainter +ButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI Button.disabledText=415967 Button.background=263238 Button.foreground=607D8B @@ -210,8 +224,12 @@ Button.mt.selection.color2=304146 Button.mt.background=2E3C43 Button.mt.foreground=607D8B Button.mt.selectedForeground=FFFFFF +ToggleButton.border=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonPainter +ToggleButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI ToolTip.background=263238 # ----------------------- Spinners --------------------------- +SpinnerUI=com.intellij.ide.ui.laf.darcula.ui.DarculaSpinnerUI +Spinner.border=com.intellij.ide.ui.laf.darcula.ui.DarculaSpinnerBorder Spinner.background=263238 Spinner.arrowButtonInsets=1,1,1,1 Spinner.editorBorderPainted=false @@ -226,11 +244,13 @@ SidePanel.background=263238 # ----------------------- Lists --------------------------- List.background=32424A # ---------------- Trees ------------------------------- +TreeUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTreeUI Tree.collapsedIcon=AllIcons.Mac.Tree_white_right_arrow Tree.expandedIcon=AllIcons.Mac.Tree_white_down_arrow Tree.rightChildIndent=6 Tree.selectionBackground=546E7A50 Tree.foreground=607D8B +FileView.fileIcon=AllIcons.FileTypes.Unknown # ------------- Internal dividers ----------------------- DialogWrapper.southPanelDivider=263238 OnePixelDivider.background=263238 From 3fc6152fd23cdf038ca2315dea3c95ddf53d204e Mon Sep 17 00:00:00 2001 From: Elior Date: Wed, 9 Aug 2017 17:01:37 +0300 Subject: [PATCH 11/66] revert again --- CHANGELOG.md | 4 ++-- src/main/resources/META-INF/plugin.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 035b5b1fa..d37b2b96e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog -## 0.8.0.5 -- Reverting back last changes as it broke a lot of stuff. +## 0.8.0.6 +- Revert again ## 0.8.0.2 - Fix issue with custom file statuses not being colorable diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 829febbdf..90c06d2b5 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -27,7 +27,7 @@ com.chrisrm.idea.MaterialThemeUIFork Material Theme UI EAP - 0.8.0.5 + 0.8.0.6 Mallowigi Date: Thu, 10 Aug 2017 11:33:04 +0300 Subject: [PATCH 12/66] fix issue with uireplacer --- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/com/chrisrm/idea/utils/UIReplacer.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 275fe4e03..1983ef32c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Tue Aug 08 17:46:06 IDT 2017 +#Thu Aug 10 10:41:48 IDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/chrisrm/idea/utils/UIReplacer.java b/src/main/java/com/chrisrm/idea/utils/UIReplacer.java index 8f0356d3c..9ce04b9b2 100644 --- a/src/main/java/com/chrisrm/idea/utils/UIReplacer.java +++ b/src/main/java/com/chrisrm/idea/utils/UIReplacer.java @@ -47,7 +47,7 @@ import com.intellij.vcs.log.ui.highlighters.MergeCommitsHighlighter; import javax.swing.*; -import javax.swing.plaf.ColorUIResource; +import javax.swing.plaf.*; import java.awt.*; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -113,9 +113,14 @@ static void patchPanels() throws Exception { StaticPatcher.setFinalStatic(UIUtil.class, "BORDER_COLOR", color); StaticPatcher.setFinalStatic(UIUtil.class, "AQUA_SEPARATOR_FOREGROUND_COLOR", color); + final Field[] fields = DarculaUIUtil.class.getDeclaredFields(); + final Object[] objects = Arrays.stream(fields) + .filter(f -> f.getType().equals(JBColor.class)) + .toArray(); final Color accentColor = ColorUtil.fromHex(MTConfig.getInstance().getAccentColor()); - StaticPatcher.setFinalStatic(DarculaUIUtil.class, "g", accentColor); - StaticPatcher.setFinalStatic(DarculaUIUtil.class, "h", accentColor); + final JBColor accentJBColor = new JBColor(accentColor, accentColor); + StaticPatcher.setFinalStatic((Field) objects[0], accentJBColor); + StaticPatcher.setFinalStatic((Field) objects[1], accentJBColor); } static void patchMemoryIndicator() throws Exception { From 8b96eae8e065d46095d6450bece595270501f523 Mon Sep 17 00:00:00 2001 From: Elior Date: Thu, 10 Aug 2017 11:49:39 +0300 Subject: [PATCH 13/66] prerelease --- src/main/resources/META-INF/plugin.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 90c06d2b5..ef1cb65f4 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -27,7 +27,7 @@ com.chrisrm.idea.MaterialThemeUIFork Material Theme UI EAP - 0.8.0.6 + 0.8.0.7 Mallowigi + 0.8.1 +
    +
  • Set accent color to non-customizable search boxes
    • +
  • Fix issues with Elements not being themed
    • +
+ 0.8.0
  • Allow customization of file status colors
    • From 3b6924962952a3738f7900f3db2f817ba41fc604 Mon Sep 17 00:00:00 2001 From: Elior Date: Thu, 10 Aug 2017 12:26:18 +0300 Subject: [PATCH 14/66] fix contrast mode button --- .../java/com/chrisrm/idea/MTThemeManager.java | 15 +++++++++++---- src/main/resources/META-INF/plugin.xml | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chrisrm/idea/MTThemeManager.java b/src/main/java/com/chrisrm/idea/MTThemeManager.java index ef62fbef1..3154112f2 100644 --- a/src/main/java/com/chrisrm/idea/MTThemeManager.java +++ b/src/main/java/com/chrisrm/idea/MTThemeManager.java @@ -362,7 +362,8 @@ public void applyAccents(final boolean reloadUI) { UIManager.put("Focus.color", ColorUtil.toAlpha(accentColorColor, 70)); if (reloadUI) { - reloadUI(); + MTTheme mtTheme = MTConfig.getInstance().getSelectedTheme(); + reloadUI(mtTheme); } } @@ -461,7 +462,7 @@ private void applyContrast(final boolean reloadUI) { } if (reloadUI) { - reloadUI(); + reloadUI(mtTheme); } } @@ -503,7 +504,8 @@ private void applyCompactSidebar(final boolean reloadUI) { UIManager.put("Tree.rowHeight", rowHeight); if (reloadUI) { - reloadUI(); + MTTheme mtTheme = MTConfig.getInstance().getSelectedTheme(); + reloadUI(mtTheme); } } //endregion @@ -569,11 +571,16 @@ public void setBoldTabs() { /** * Trigger a reloadUI event + * @param mtTheme */ - private void reloadUI() { + private void reloadUI(MTTheme mtTheme) { try { UIManager.setLookAndFeel(new MTLaf(MTConfig.getInstance().getSelectedTheme())); applyFonts(); + DarculaInstaller.uninstall(); + if (mtTheme.isDark()) { + DarculaInstaller.install(); + } } catch (final UnsupportedLookAndFeelException e) { e.printStackTrace(); } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index ef1cb65f4..930499f5a 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -27,7 +27,7 @@ com.chrisrm.idea.MaterialThemeUIFork Material Theme UI EAP - 0.8.0.7 + 0.8.1 Mallowigi
  • Set accent color to non-customizable search boxes
  • Fix issues with Elements not being themed
    • +
  • Fix action buttons not working
0.8.0 From 6ecd7bf0a568d43d43d466310ee298f082d9f724 Mon Sep 17 00:00:00 2001 From: Elior Date: Thu, 10 Aug 2017 13:02:47 +0300 Subject: [PATCH 15/66] fix search results --- CHANGELOG.md | 7 +++++-- src/main/resources/META-INF/plugin.xml | 3 ++- src/main/resources/colors/Material Theme - Darker.xml | 2 +- src/main/resources/colors/Material Theme - Default.xml | 2 +- src/main/resources/colors/Material Theme - Lighter.xml | 2 +- src/main/resources/colors/Material Theme - Palenight.xml | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d37b2b96e..074024fbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ # Changelog -## 0.8.0.6 -- Revert again +## 0.8.1 +- Fix issue with Contrast action button not working +- Fix issues with not themed popups +- Add accent color to non-themed search bars +- Add background color to search result ## 0.8.0.2 - Fix issue with custom file statuses not being colorable diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 930499f5a..75e47b008 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -27,7 +27,7 @@ com.chrisrm.idea.MaterialThemeUIFork Material Theme UI EAP - 0.8.1 + 0.8.1.1 Mallowigi Set accent color to non-customizable search boxes
  • Fix issues with Elements not being themed
  • Fix action buttons not working
    • +
  • Add background color to search result
    • 0.8.0 diff --git a/src/main/resources/colors/Material Theme - Darker.xml b/src/main/resources/colors/Material Theme - Darker.xml index 07828e393..18bcca70f 100644 --- a/src/main/resources/colors/Material Theme - Darker.xml +++ b/src/main/resources/colors/Material Theme - Darker.xml @@ -2805,7 +2805,7 @@