Automated merge with http://hg.netbeans.org/main/contrib
authorS. Aubrecht <saubrecht@netbeans.org>
Thu, 10 Jan 2013 14:49:56 +0100
changeset 179118d66c5693810
parent 17909 96684497edf6
parent 17910 56c3cc837d65
child 17912 100f438c28c5
Automated merge with http://hg.netbeans.org/main/contrib
darknimbustheme/src/org/netbeans/nimbus/theme/Bundle.properties
darknimbustheme/src/org/netbeans/nimbus/theme/Installer.java
     1.1 --- a/darknimbustheme/manifest.mf	Thu Jan 10 12:30:28 2013 +0100
     1.2 +++ b/darknimbustheme/manifest.mf	Thu Jan 10 14:49:56 2013 +0100
     1.3 @@ -1,6 +1,6 @@
     1.4  Manifest-Version: 1.0
     1.5 -OpenIDE-Module: org.netbeans.nimbus.theme/1
     1.6 +OpenIDE-Module: org.netbeans.modules.nimbus.theme/1
     1.7  OpenIDE-Module-Implementation-Version: 1
     1.8 -OpenIDE-Module-Install: org/netbeans/nimbus/theme/Installer.class
     1.9 -OpenIDE-Module-Localizing-Bundle: org/netbeans/nimbus/theme/Bundle.properties
    1.10 +OpenIDE-Module-Install: org/netbeans/modules/nimbus/theme/Installer.class
    1.11 +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/nimbus/theme/Bundle.properties
    1.12  
     2.1 --- a/darknimbustheme/nbproject/project.xml	Thu Jan 10 12:30:28 2013 +0100
     2.2 +++ b/darknimbustheme/nbproject/project.xml	Thu Jan 10 14:49:56 2013 +0100
     2.3 @@ -3,7 +3,7 @@
     2.4      <type>org.netbeans.modules.apisupport.project</type>
     2.5      <configuration>
     2.6          <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
     2.7 -            <code-name-base>org.netbeans.nimbus.theme</code-name-base>
     2.8 +            <code-name-base>org.netbeans.modules.nimbus.theme</code-name-base>
     2.9              <standalone/>
    2.10              <module-dependencies>
    2.11                  <dependency>
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/darknimbustheme/src/org/netbeans/modules/nimbus/theme/Bundle.properties	Thu Jan 10 14:49:56 2013 +0100
     3.3 @@ -0,0 +1,8 @@
     3.4 +OpenIDE-Module-Display-Category=Base IDE
     3.5 +OpenIDE-Module-Long-Description=\
     3.6 +    Dark theme for Nimbus Look and Feel. \
     3.7 +    It goes well with "Norway Today" editor color scheme.\n\
     3.8 +    It does not affect other look and feel implementations so you must force Nimbus l&f, e.g. by using --laf Nimbus command line switch. \
     3.9 +    To revert back to the default Nimbus theme just uninstall this module.
    3.10 +OpenIDE-Module-Name=Dark Nimbus Theme
    3.11 +OpenIDE-Module-Short-Description=Dark theme for Nimbus Look and Feel
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/darknimbustheme/src/org/netbeans/modules/nimbus/theme/Installer.java	Thu Jan 10 14:49:56 2013 +0100
     4.3 @@ -0,0 +1,85 @@
     4.4 +/*
     4.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     4.6 + *
     4.7 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     4.8 + *
     4.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    4.10 + * Other names may be trademarks of their respective owners.
    4.11 + *
    4.12 + * The contents of this file are subject to the terms of either the GNU
    4.13 + * General Public License Version 2 only ("GPL") or the Common
    4.14 + * Development and Distribution License("CDDL") (collectively, the
    4.15 + * "License"). You may not use this file except in compliance with the
    4.16 + * License. You can obtain a copy of the License at
    4.17 + * http://www.netbeans.org/cddl-gplv2.html
    4.18 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    4.19 + * specific language governing permissions and limitations under the
    4.20 + * License.  When distributing the software, include this License Header
    4.21 + * Notice in each file and include the License file at
    4.22 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    4.23 + * particular file as subject to the "Classpath" exception as provided
    4.24 + * by Oracle in the GPL Version 2 section of the License file that
    4.25 + * accompanied this code. If applicable, add the following below the
    4.26 + * License Header, with the fields enclosed by brackets [] replaced by
    4.27 + * your own identifying information:
    4.28 + * "Portions Copyrighted [year] [name of copyright owner]"
    4.29 + *
    4.30 + * Contributor(s):
    4.31 + *
    4.32 + * The Original Software is NetBeans. The Initial Developer of the Original
    4.33 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    4.34 + * Microsystems, Inc. All Rights Reserved.
    4.35 + *
    4.36 + * If you wish your version of this file to be governed by only the CDDL
    4.37 + * or only the GPL Version 2, indicate your decision by adding
    4.38 + * "[Contributor] elects to include this software in this distribution
    4.39 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
    4.40 + * single choice of license, a recipient has the option to distribute
    4.41 + * your version of this file under either the CDDL, the GPL Version 2 or
    4.42 + * to extend the choice of license to its licensees as provided above.
    4.43 + * However, if you add GPL Version 2 code and therefore, elected the GPL
    4.44 + * Version 2 license, then the option applies only if the new code is
    4.45 + * made subject to such option by the copyright holder.
    4.46 + */
    4.47 +package org.netbeans.modules.nimbus.theme;
    4.48 +
    4.49 +import java.awt.Color;
    4.50 +import javax.swing.UIManager;
    4.51 +import org.openide.modules.ModuleInstall;
    4.52 +
    4.53 +/**
    4.54 + * 
    4.55 + * @author S. Aubrecht
    4.56 + */
    4.57 +public class Installer extends ModuleInstall {
    4.58 +
    4.59 +    @Override
    4.60 +    public void restored() {
    4.61 +    }
    4.62 +
    4.63 +    @Override
    4.64 +    public void validate() throws IllegalStateException {
    4.65 +        super.validate();
    4.66 +        UIManager.put( "control", new Color( 128, 128, 128) );
    4.67 +        UIManager.put( "info", new Color(128,128,128) );
    4.68 +        UIManager.put( "nimbusBase", new Color( 18, 30, 49) );
    4.69 +        UIManager.put( "nimbusAlertYellow", new Color( 248, 187, 0) );
    4.70 +        UIManager.put( "nimbusDisabledText", new Color( 128, 128, 128) );
    4.71 +        UIManager.put( "nimbusFocus", new Color(115,164,209) );
    4.72 +        UIManager.put( "nimbusGreen", new Color(176,179,50) );
    4.73 +        UIManager.put( "nimbusInfoBlue", new Color( 66, 139, 221) );
    4.74 +        UIManager.put( "nimbusLightBackground", new Color( 18, 30, 49) );
    4.75 +        UIManager.put( "nimbusOrange", new Color(191,98,4) );
    4.76 +        UIManager.put( "nimbusRed", new Color(169,46,34) );
    4.77 +        UIManager.put( "nimbusSelectedText", new Color( 255, 255, 255) );
    4.78 +        UIManager.put( "nimbusSelectionBackground", new Color( 104, 93, 156) );
    4.79 +        UIManager.put( "text", new Color( 230, 230, 230) );
    4.80 +
    4.81 +        //there's a problem with HtmlLabelUI.ensureContrastingColor() which
    4.82 +        //automatically assumes white background on Nimbus thus reverts white foreground
    4.83 +        //of unselected text into black. With Swing based rendering it works fine.
    4.84 +        System.setProperty( "nb.useSwingHtmlRendering", "true");
    4.85 +    }
    4.86 +
    4.87 +
    4.88 +}
     5.1 --- a/darknimbustheme/src/org/netbeans/nimbus/theme/Bundle.properties	Thu Jan 10 12:30:28 2013 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,8 +0,0 @@
     5.4 -OpenIDE-Module-Display-Category=Base IDE
     5.5 -OpenIDE-Module-Long-Description=\
     5.6 -    Dark theme for Nimbus Look and Feel. \
     5.7 -    It goes well with "Norway Today" editor color scheme.\n\
     5.8 -    It does not affect other look and feel implementations so you must force Nimbus l&f, e.g. by using --laf Nimbus command line switch. \
     5.9 -    To revert back to the default Nimbus theme just uninstall this module.
    5.10 -OpenIDE-Module-Name=Dark Nimbus Theme
    5.11 -OpenIDE-Module-Short-Description=Dark theme for Nimbus Look and Feel
     6.1 --- a/darknimbustheme/src/org/netbeans/nimbus/theme/Installer.java	Thu Jan 10 12:30:28 2013 +0100
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,85 +0,0 @@
     6.4 -/*
     6.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     6.6 - *
     6.7 - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     6.8 - *
     6.9 - * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    6.10 - * Other names may be trademarks of their respective owners.
    6.11 - *
    6.12 - * The contents of this file are subject to the terms of either the GNU
    6.13 - * General Public License Version 2 only ("GPL") or the Common
    6.14 - * Development and Distribution License("CDDL") (collectively, the
    6.15 - * "License"). You may not use this file except in compliance with the
    6.16 - * License. You can obtain a copy of the License at
    6.17 - * http://www.netbeans.org/cddl-gplv2.html
    6.18 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    6.19 - * specific language governing permissions and limitations under the
    6.20 - * License.  When distributing the software, include this License Header
    6.21 - * Notice in each file and include the License file at
    6.22 - * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    6.23 - * particular file as subject to the "Classpath" exception as provided
    6.24 - * by Oracle in the GPL Version 2 section of the License file that
    6.25 - * accompanied this code. If applicable, add the following below the
    6.26 - * License Header, with the fields enclosed by brackets [] replaced by
    6.27 - * your own identifying information:
    6.28 - * "Portions Copyrighted [year] [name of copyright owner]"
    6.29 - *
    6.30 - * Contributor(s):
    6.31 - *
    6.32 - * The Original Software is NetBeans. The Initial Developer of the Original
    6.33 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    6.34 - * Microsystems, Inc. All Rights Reserved.
    6.35 - *
    6.36 - * If you wish your version of this file to be governed by only the CDDL
    6.37 - * or only the GPL Version 2, indicate your decision by adding
    6.38 - * "[Contributor] elects to include this software in this distribution
    6.39 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
    6.40 - * single choice of license, a recipient has the option to distribute
    6.41 - * your version of this file under either the CDDL, the GPL Version 2 or
    6.42 - * to extend the choice of license to its licensees as provided above.
    6.43 - * However, if you add GPL Version 2 code and therefore, elected the GPL
    6.44 - * Version 2 license, then the option applies only if the new code is
    6.45 - * made subject to such option by the copyright holder.
    6.46 - */
    6.47 -package org.netbeans.nimbus.theme;
    6.48 -
    6.49 -import java.awt.Color;
    6.50 -import javax.swing.UIManager;
    6.51 -import org.openide.modules.ModuleInstall;
    6.52 -
    6.53 -/**
    6.54 - * 
    6.55 - * @author S. Aubrecht
    6.56 - */
    6.57 -public class Installer extends ModuleInstall {
    6.58 -
    6.59 -    @Override
    6.60 -    public void restored() {
    6.61 -    }
    6.62 -
    6.63 -    @Override
    6.64 -    public void validate() throws IllegalStateException {
    6.65 -        super.validate();
    6.66 -        UIManager.put( "control", new Color( 128, 128, 128) );
    6.67 -        UIManager.put( "info", new Color(128,128,128) );
    6.68 -        UIManager.put( "nimbusBase", new Color( 18, 30, 49) );
    6.69 -        UIManager.put( "nimbusAlertYellow", new Color( 248, 187, 0) );
    6.70 -        UIManager.put( "nimbusDisabledText", new Color( 128, 128, 128) );
    6.71 -        UIManager.put( "nimbusFocus", new Color(115,164,209) );
    6.72 -        UIManager.put( "nimbusGreen", new Color(176,179,50) );
    6.73 -        UIManager.put( "nimbusInfoBlue", new Color( 66, 139, 221) );
    6.74 -        UIManager.put( "nimbusLightBackground", new Color( 18, 30, 49) );
    6.75 -        UIManager.put( "nimbusOrange", new Color(191,98,4) );
    6.76 -        UIManager.put( "nimbusRed", new Color(169,46,34) );
    6.77 -        UIManager.put( "nimbusSelectedText", new Color( 255, 255, 255) );
    6.78 -        UIManager.put( "nimbusSelectionBackground", new Color( 104, 93, 156) );
    6.79 -        UIManager.put( "text", new Color( 230, 230, 230) );
    6.80 -
    6.81 -        //there's a problem with HtmlLabelUI.ensureContrastingColor() which
    6.82 -        //automatically assumes white background on Nimbus thus reverts white foreground
    6.83 -        //of unselected text into black. With Swing based rendering it works fine.
    6.84 -        System.setProperty( "nb.useSwingHtmlRendering", "true");
    6.85 -    }
    6.86 -
    6.87 -
    6.88 -}