Index: ../src-rep/src/lib/aqua-common/com/common/plaf/CLookAndFeel.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../src-rep/src/lib/aqua-common/com/common/plaf/CLookAndFeel.java (revision 58248) +++ ../src-rep/src/lib/aqua-common/com/common/plaf/CLookAndFeel.java (revision ) @@ -45,6 +45,11 @@ public String getProperty() { return "Aqua Data Studio"; } }, + LOOK_AQUA_DARK { + public String toString() { return TXT.get("CLookAndFeel.LOOK_AQUA_DARK", "Aqua Data Studio (Dark)"); } + + public String getProperty() { return "Aqua Data Studio (Dark)"; } + }, LOOK_AQUA_STYLUS { public String toString() { return TXT.get("CLookAndFeel.LOOK_AQUA_STYLUS", "Aqua Data Studio (Stylus)"); } @@ -78,6 +83,7 @@ public static String lfMotif = "com.sun.java.swing.plaf.motif.MotifLookAndFeel"; public static String lfWindows = "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; public static String lfAqua = LookAndFeelFactory.AQUA_LNF; + public static String lfAquaDark = "com.intellij.ide.ui.laf.darcula.DarculaLaf"; //public static String lfPlasticElegant = "com.jgoodies.looks.plastic.AquaPlasticLookAndFeel"; public static String lfPlasticElegant3D = "com.jgoodies.looks.plastic.Plastic3DLookAndFeel"; //public static String lfPlasticElegantXP = "com.jgoodies.looks.plastic.AquaPlasticXPLookAndFeel"; @@ -115,9 +121,15 @@ public static String getLAFClassByName(CLookAndFeel appearanceLAF) { if (shouldMapToAqua(appearanceLAF)) { if (AQSystemUtils.isOSX()) { + if(appearanceLAF == LOOK_AQUA_DARK) { + return lfAquaDark; + } return lfAqua; } else if (AQSystemUtils.isWindows()) { + if(appearanceLAF == LOOK_AQUA_DARK) { + return lfAquaDark; + } return lfWindows; } else { @@ -135,6 +147,7 @@ public static ArrayList getAvailableLookAndFeels() { ArrayList a = new ArrayList<>(); a.add(LOOK_AQUA); + a.add(LOOK_AQUA_DARK); if (!AQSystemUtils.isOSX()) { a.add(LOOK_METAL); @@ -225,6 +238,7 @@ private static boolean shouldMapToAqua(CLookAndFeel appearanceLAF) { return appearanceLAF.equals(LOOK_AQUA) || + appearanceLAF.equals(LOOK_AQUA_DARK) || appearanceLAF.equals(LOOK_AQUA_STYLUS) || appearanceLAF.equals(LOOK_AQUA_CLASSIC) || appearanceLAF.equals(LOOK_MAC_OSX_AQUA) ||