diff --git a/fonts/master_palett b/fonts/master_palett new file mode 100644 index 0000000..cdd8d11 --- /dev/null +++ b/fonts/master_palett @@ -0,0 +1,116 @@ + +http://paletton.com/#uid=15C0u0k005X009i007G00450021 +http://paletton.com/#uid=15C0u0k009i00cf00aO007H005X +http://paletton.com/#uid=1000u0k00cb00eS00dz00aL009e + +http://paletton.com/#uid=73U1q0kmNnTght5jWq2oUkZrQhw +http://paletton.com/#uid=74B1q0kmNnTght5jWq2oUkZrQhw +http://paletton.com/#uid=1001q0kmNnTght5jWq2oUkZrQhw + + +B/W + +ACCENT --- shade 1 = #ECECEC = rgb(236,236,236) = rgba(236,236,236,1) = rgb0(0.925,0.925,0.925) + shade 2 = #E2E2E2 = rgb(226,226,226) = rgba(226,226,226,1) = rgb0(0.886,0.886,0.886) + shade 0 = #D7D7D7 = rgb(215,215,215) = rgba(215,215,215,1) = rgb0(0.843,0.843,0.843) + shade 3 = #CECECE = rgb(206,206,206) = rgba(206,206,206,1) = rgb0(0.808,0.808,0.808) + + shade 1 = #C4C4C4 = rgb(196,196,196) = rgba(196,196,196,1) = rgb0(0.769,0.769,0.769) +COMMON TEXT -- shade 2 = #BABABA = rgb(186,186,186) = rgba(186,186,186,1) = rgb0(0.729,0.729,0.729) + shade 0 = #B1B1B1 = rgb(177,177,177) = rgba(177,177,177,1) = rgb0(0.694,0.694,0.694) + shade 3 = #A7A7A7 = rgb(167,167,167) = rgba(167,167,167,1) = rgb0(0.655,0.655,0.655) + + shade 1 = #9E9E9E = rgb(158,158,158) = rgba(158,158,158,1) = rgb0(0.62,0.62,0.62) + shade 2 = #949494 = rgb(148,148,148) = rgba(148,148,148,1) = rgb0(0.58,0.58,0.58) +FOLDING BAR -- #8A8A8A = rgb(138,138,138) = rgba(138,138,138,1) = rgb0(0.541,0.541,0.541) + shade 2 = #818181 = rgb(129,129,129) = rgba(129,129,129,1) = rgb0(0.506,0.506,0.506) + shade 1 = #767676 = rgb(118,118,118) = rgba(118,118,118,1) = rgb0(0.463,0.463,0.463) + +FOLD / COMMENT -- shade 2 = #6C6C6C = rgb(108,108,108) = rgba(108,108,108,1) = rgb0(0.424,0.424,0.424) + +// shade 3 = #616161 = rgb( 97, 97, 97) = rgba( 97, 97, 97,1) = rgb0(0.38,0.38,0.38) +SELECTED TEXT -- #555555 = rgb( 85, 85, 85) = rgba( 85, 85, 85,1) = rgb0(0.333,0.333,0.333) +SEARCH BLOCK -- #494949 = rgb( 73, 73, 73) = rgba( 73, 73, 73,1) = rgb0(0.286,0.286,0.286) +TEXT COLOR ON HIGHLIGHTS & SEACH & BRACES -- #3D3D3D = rgb( 61, 61, 61) = rgba( 61, 61, 61,1) = rgb0(0.239,0.239,0.239) +HIGHLIGHT CARET ROW -- #2F2F2F = rgb( 47, 47, 47) = rgba( 47, 47, 47,1) = rgb0(0.184,0.184,0.184) +INDENT GUIDE LINES -- #202020 = rgb( 32, 32, 32) = rgba( 32, 32, 32,1) = rgb0(0.125,0.125,0.125) +BACKGROUND -- #101010 = rgb( 16, 16, 16) = rgba( 16, 16, 16,1) = rgb0(0.063,0.063,0.063) + + +BRACES MATCH -- #BE6C37 = rgb(190,108, 55) = rgba(190,108, 55,1) = rgb0(0.745,0.424,0.216) +BRACES NOT MATCH -- #BEB937 = rgb(190,185, 55) = rgba(190,185, 55,1) = rgb0(0.745,0.725,0.216) + + + +Purple + +* shade 0 = #5A2B80 = rgb( 90, 43,128) = rgba( 90, 43,128,1) = rgb0(0.353,0.169,0.502) + shade 1 = #7B529C = rgb(123, 82,156) = rgba(123, 82,156,1) = rgb0(0.482,0.322,0.612) +// shade 2 = #673A8C = rgb(103, 58,140) = rgba(103, 58,140,1) = rgb0(0.404,0.227,0.549) +// shade 3 = #4C1F70 = rgb( 76, 31,112) = rgba( 76, 31,112,1) = rgb0(0.298,0.122,0.439) + shade 4 = #3C125E = rgb( 60, 18, 94) = rgba( 60, 18, 94,1) = rgb0(0.235,0.071,0.369) + +Orange + +* shade 0 = #BE6C37 = rgb(190,108, 55) = rgba(190,108, 55,1) = rgb0(0.745,0.424,0.216) + shade 1 = #E8A072 = rgb(232,160,114) = rgba(232,160,114,1) = rgb0(0.91,0.627,0.447) +// shade 2 = #CF814E = rgb(207,129, 78) = rgba(207,129, 78,1) = rgb0(0.812,0.506,0.306) +// shade 3 = #A75825 = rgb(167, 88, 37) = rgba(167, 88, 37,1) = rgb0(0.655,0.345,0.145) + shade 4 = #8B4212 = rgb(139, 66, 18) = rgba(139, 66, 18,1) = rgb0(0.545,0.259,0.071) + +Cyan + +* shade 0 = #237A69 = rgb( 35,122,105) = rgba( 35,122,105,1) = rgb0(0.137,0.478,0.412) + shade 1 = #499485 = rgb( 73,148,133) = rgba( 73,148,133,1) = rgb0(0.286,0.58,0.522) +// shade 2 = #328574 = rgb( 50,133,116) = rgba( 50,133,116,1) = rgb0(0.196,0.522,0.455) +// shade 3 = #186B5B = rgb( 24,107, 91) = rgba( 24,107, 91,1) = rgb0(0.094,0.42,0.357) + shade 4 = #0C594A = rgb( 12, 89, 74) = rgba( 12, 89, 74,1) = rgb0(0.047,0.349,0.29) + +Yellow + +* shade 0 = #BEB937 = rgb(190,185, 55) = rgba(190,185, 55,1) = rgb0(0.745,0.725,0.216) + shade 1 = #E8E372 = rgb(232,227,114) = rgba(232,227,114,1) = rgb0(0.91,0.89,0.447) +// shade 2 = #CFCB4E = rgb(207,203, 78) = rgba(207,203, 78,1) = rgb0(0.812,0.796,0.306) +// shade 3 = #A7A225 = rgb(167,162, 37) = rgba(167,162, 37,1) = rgb0(0.655,0.635,0.145) + shade 4 = #8B8712 = rgb(139,135, 18) = rgba(139,135, 18,1) = rgb0(0.545,0.529,0.071) + +Blue + +* shade 0 = #323D83 = rgb( 50, 61,131) = rgba( 50, 61,131,1) = rgb0(0.196,0.239,0.514) + shade 1 = #59629F = rgb( 89, 98,159) = rgba( 89, 98,159,1) = rgb0(0.349,0.384,0.624) +// shade 2 = #414C8E = rgb( 65, 76,142) = rgba( 65, 76,142,1) = rgb0(0.255,0.298,0.557) +// shade 3 = #253073 = rgb( 37, 48,115) = rgba( 37, 48,115,1) = rgb0(0.145,0.188,0.451) + shade 4 = #172160 = rgb( 23, 33, 96) = rgba( 23, 33, 96,1) = rgb0(0.09,0.129,0.376) + +Pink + +* shade 0 = #A32F5E = rgb(163, 47, 94) = rgba(163, 47, 94,1) = rgb0(0.639,0.184,0.369) + shade 1 = #C7628B = rgb(199, 98,139) = rgba(199, 98,139,1) = rgb0(0.78,0.384,0.545) +// shade 2 = #B24370 = rgb(178, 67,112) = rgba(178, 67,112,1) = rgb0(0.698,0.263,0.439) +// shade 3 = #90204D = rgb(144, 32, 77) = rgba(144, 32, 77,1) = rgb0(0.565,0.125,0.302) + shade 4 = #78103A = rgb(120, 16, 58) = rgba(120, 16, 58,1) = rgb0(0.471,0.063,0.227) + +Green + +* shade 0 = #76AD32 = rgb(118,173, 50) = rgba(118,173, 50,1) = rgb0(0.463,0.678,0.196) + shade 1 = #A3D368 = rgb(163,211,104) = rgba(163,211,104,1) = rgb0(0.639,0.827,0.408) +// shade 2 = #88BD47 = rgb(136,189, 71) = rgba(136,189, 71,1) = rgb0(0.533,0.741,0.278) +// shade 3 = #639822 = rgb( 99,152, 34) = rgba( 99,152, 34,1) = rgb0(0.388,0.596,0.133) + shade 4 = #4D7F11 = rgb( 77,127, 17) = rgba( 77,127, 17,1) = rgb0(0.302,0.498,0.067) + +Orange + +* shade 0 = #BE9837 = rgb(190,152, 55) = rgba(190,152, 55,1) = rgb0(0.745,0.596,0.216) + shade 1 = #E8C672 = rgb(232,198,114) = rgba(232,198,114,1) = rgb0(0.91,0.776,0.447) +// shade 2 = #CFAB4E = rgb(207,171, 78) = rgba(207,171, 78,1) = rgb0(0.812,0.671,0.306) +// shade 3 = #A78225 = rgb(167,130, 37) = rgba(167,130, 37,1) = rgb0(0.655,0.51,0.145) + shade 4 = #8B6912 = rgb(139,105, 18) = rgba(139,105, 18,1) = rgb0(0.545,0.412,0.071) + +RED + +* shade 0 = #BE3737 = rgb(190, 55, 55) = rgba(190, 55, 55,1) = rgb0(0.745,0.216,0.216) + shade 1 = #E87272 = rgb(232,114,114) = rgba(232,114,114,1) = rgb0(0.91,0.447,0.447) + shade 2 = #CF4E4E = rgb(207, 78, 78) = rgba(207, 78, 78,1) = rgb0(0.812,0.306,0.306) + shade 3 = #A72525 = rgb(167, 37, 37) = rgba(167, 37, 37,1) = rgb0(0.655,0.145,0.145) + shade 4 = #8B1212 = rgb(139, 18, 18) = rgba(139, 18, 18,1) = rgb0(0.545,0.071,0.071) + diff --git a/manifest.mf b/manifest.mf index efa6c80..bfc2d75 100644 --- a/manifest.mf +++ b/manifest.mf @@ -1,7 +1,7 @@ Manifest-Version: 1.0 AutoUpdate-Show-In-Client: true OpenIDE-Module: org.idp.laf/1 -OpenIDE-Module-Implementation-Version: 3 +OpenIDE-Module-Implementation-Version: 4 OpenIDE-Module-Localizing-Bundle: org/idp/laf/Bundle.properties OpenIDE-Module-Install: org/idp/laf/Installer.class OpenIDE-Module-Requires: org.openide.windows.WindowManager diff --git a/src/org/idp/laf/Kernel.java b/src/org/idp/laf/Kernel.java index 762dd0b..e61218a 100644 --- a/src/org/idp/laf/Kernel.java +++ b/src/org/idp/laf/Kernel.java @@ -5,6 +5,8 @@ */ package org.idp.laf; +import com.sun.java.swing.plaf.windows.WindowsBorders; +import java.awt.BasicStroke; import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; @@ -19,11 +21,21 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Random; +import java.util.Set; import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.BevelBorder; +import javax.swing.border.CompoundBorder; +import javax.swing.border.EmptyBorder; +import javax.swing.border.EtchedBorder; +import javax.swing.border.LineBorder; +import javax.swing.border.MatteBorder; +import javax.swing.border.StrokeBorder; +import javax.swing.plaf.BorderUIResource.CompoundBorderUIResource; import javax.swing.plaf.ColorUIResource; import javax.swing.plaf.metal.DefaultMetalTheme; import javax.swing.plaf.metal.MetalLookAndFeel; @@ -44,7 +56,6 @@ public class Kernel { String nb_etc = retrieve_netbeans_etc_dir(); setup_font_antialiaing_hints(nb_etc); - String cfh_dir = retrieve_app_folder(); boolean a = (new File (cfh_dir).mkdirs()); load_setup (cfh_dir); @@ -55,6 +66,95 @@ public class Kernel { + "modifications done. Follow your ugly way of live."); } + String [] letsNULLit = { +// "Button.border", +// "ToggleButton.border", + "CheckBox.border", + "DesktopIcon.border", + "ToggleButton.border", + "FormattedTextField.border", + "PasswordField.border", + "TextField.border", + "RadioButton.border", + //, + "TextArea.border", + "TextPane.border", + "SplitPane.border", + + //"Nb.Desktop.border", + //"TabbedContainer.editor.outerBorder", + //"TabbedContainer.view.outerBorder", + //"nb.explorer.ministatusbar.border" + + +} ; + String [] menuShit ={ + +"CheckBoxMenuItem.border", +//, +"RadioButtonMenuItem.border", +"PopupMenu.border" + }; + + + javax.swing.border.EmptyBorder eb = new EmptyBorder(0,0,0,0); + javax.swing.border.LineBorder bdT = new LineBorder(java.awt.Color.RED, 1); + javax.swing.border.LineBorder bd1 = new LineBorder(java.awt.Color.BLUE, 1); + javax.swing.border.LineBorder bd2 = new LineBorder(java.awt.Color.GREEN, 1); + javax.swing.border.LineBorder bd3 = new LineBorder(java.awt.Color.PINK, 1); + + + + + + java.awt.Color cc = new java.awt.Color(0, 0, 0, 31); + + javax.swing.border.LineBorder lb1 = new LineBorder(cc, 2); + javax.swing.border.LineBorder lb2 = new LineBorder(cc, 2); + javax.swing.border.EmptyBorder epp = new EmptyBorder(4,6,4,6); + javax.swing.border.CompoundBorder cpp = new CompoundBorder(lb2, epp); + + UIManager.put ("EditorPane.border", eb); // Editor FUCKING LINE! + + UIManager.put ("TabbedContainer.editor.outerBorder", eb); // Editor round border!! + UIManager.put ("TabbedContainer.view.outerBorder", lb1); // Navigator/Project/etc. round border!! + + // Button managment here! + UIManager.put ("ToggleButton.border", cpp); + UIManager.put ("Button.border", cpp); + + + // Menu managment NP! + + javax.swing.border.EmptyBorder mainMenuBorder = new EmptyBorder(2,4,2,4); + javax.swing.border.EmptyBorder itemBorder = new EmptyBorder(2,2,2,2); + UIManager.put ("MenuBar.border", cpp); + UIManager.put ("Menu.border", mainMenuBorder); + UIManager.put ("MenuItem.border", itemBorder); + + for (String o : letsNULLit) + { + UIManager.put(o, cpp); + } + + for (String o : menuShit) + { + UIManager.put(o, eb); + } + + + + for (String o : Keys.borders) + { + System.out.println(o + " : " + UIManager.getDefaults().get(o)); + } + +// javax.swing.border.EmptyBorder bd = new EmptyBorder(0,0,0,0); +// UIManager.put("TabbedContainer.view.outerBorder", bd); + + + + } private static String retrieve_app_folder () diff --git a/src/org/idp/laf/Keys.java b/src/org/idp/laf/Keys.java index d73199e..655158a 100644 --- a/src/org/idp/laf/Keys.java +++ b/src/org/idp/laf/Keys.java @@ -10,6 +10,60 @@ package org.idp.laf; */ public class Keys { + public static final String [] borders = { + "Button.border", + "CheckBox.border", + "CheckBoxMenuItem.border", + "DesktopIcon.border", + "EditorPane.border", + "FormattedTextField.border", + "Menu.border", + "List.focusCellHighlightBorder", + "MenuBar.border", + "MenuItem.border", + "OptionPane.border", + "PasswordField.border", + "PopupMenu.border", + "ProgressBar.border", + "RadioButton.border", + "RadioButtonMenuItem.border", + "ScrollPane.border", + "SplitPane.border", + //"TabbedPane.tabsOverlapBorder", boolean WTF?! + "Table.focusCellHighlightBorder", + "Table.scrollPaneBorder", + "TableHeader.cellBorder", + "TextArea.border", + "TextField.border", + "TextPane.border", + "TitledBorder.border", + "ToggleButton.border", + "ToolBar.border", + "ToolTip.border", + "Tree.editorBorder", + "Nb.Editor.Status.leftBorder", + "Nb.Editor.Status.innerBorder", + "Nb.Editor.Status.rightBorder", + "Nb.Editor.Status.onlyOneBorder", + "Nb.Editor.Toolbar.border", + "Nb.Explorer.Status.border", + "Nb.Desktop.border", +// "TabbedContainer.editor.contentBorder", null +// "TabbedContainer.editor.tabsBorder", null + "TabbedContainer.editor.outerBorder", +// "TabbedContainer.view.contentBorder", null +// "TabbedContainer.view.tabsBorder", null + "TabbedContainer.view.outerBorder", +// "TabbedContainer.sliding.contentBorder", null +// "TabbedContainer.sliding.tabsBorder", null +// "TabbedContainer.sliding.outerBorder", null + "nb.explorer.ministatusbar.border", +// "nb.desktop.splitpane.border", null + "CheckBox.border" + }; + + + public static final String [] color_keys = { "Button.background", diff --git a/src/org/idp/laf/gui/ColorEditorTopComponent.java b/src/org/idp/laf/gui/ColorEditorTopComponent.java index 3b32633..4127d40 100644 --- a/src/org/idp/laf/gui/ColorEditorTopComponent.java +++ b/src/org/idp/laf/gui/ColorEditorTopComponent.java @@ -16,7 +16,6 @@ import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.windows.TopComponent; import org.openide.util.NbBundle.Messages; -import sun.swing.PrintColorUIResource; /** * @author Edward M. Kagan diff --git a/update/org-idp-laf-1.0.4.nbm b/update/org-idp-laf-1.0.4.nbm new file mode 100644 index 0000000..24449c2 Binary files /dev/null and b/update/org-idp-laf-1.0.4.nbm differ diff --git a/update/updates.xml b/update/updates.xml index 92b939b..bf483bf 100644 --- a/update/updates.xml +++ b/update/updates.xml @@ -1,12 +1,12 @@ - + - - + +