Improvements

SHRP · Apr 12, 2020 · 213be1b · 213be1b
1 parent 606dc63
commit 213be1b
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 3 deletions.
diff --git a/src/main/java/com/shrp/themes/main.form b/src/main/java/com/shrp/themes/main.form
@@ -2029,7 +2029,7 @@
               </AuxValues>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="207" y="240" width="-1" height="-1"/>
+                  <AbsoluteConstraints x="209" y="240" width="-1" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -2166,6 +2166,31 @@
                 </Constraint>
               </Constraints>
             </Component>
+            <Component class="javax.swing.JRadioButton" name="dIcoPlainL">
+              <Properties>
+                <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="28" green="1c" red="1c" type="rgb"/>
+                </Property>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="dType"/>
+                </Property>
+                <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="ff" green="ff" red="ff" type="rgb"/>
+                </Property>
+                <Property name="text" type="java.lang.String" value="Plain Large"/>
+                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                  <Border info="null"/>
+                </Property>
+              </Properties>
+              <AuxValues>
+                <AuxValue name="JavaCodeGenerator_AddingCodePost" type="java.lang.String" value="dIcoPlain.setBackground(null);"/>
+              </AuxValues>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="207" y="175" width="-1" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
           </SubComponents>
         </Container>
         <Component class="javax.swing.JLabel" name="versionLabel">

diff --git a/src/main/java/com/shrp/themes/main.java b/src/main/java/com/shrp/themes/main.java
@@ -159,6 +159,7 @@ private void initComponents() {
         thName = new javax.swing.JTextField();
         thNameS = new javax.swing.JSeparator();
         cleanupBtn = new javax.swing.JButton();
+        dIcoPlainL = new javax.swing.JRadioButton();
         versionLabel = new javax.swing.JLabel();
         helpPanel = new javax.swing.JPanel();
         helpHeader = new javax.swing.JLabel();
@@ -850,7 +851,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         nIcoCustom.setForeground(new java.awt.Color(255, 255, 255));
         nIcoCustom.setText("Custom");
         nIcoCustom.setBorder(null);
-        configurationPanel.add(nIcoCustom, new org.netbeans.lib.awtextra.AbsoluteConstraints(207, 240, -1, -1));
+        configurationPanel.add(nIcoCustom, new org.netbeans.lib.awtextra.AbsoluteConstraints(209, 240, -1, -1));
         nIcoCustom.setBackground(null);
 
         prevBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/res/prevBtn.png"))); // NOI18N
@@ -903,6 +904,14 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         configurationPanel.add(cleanupBtn, new org.netbeans.lib.awtextra.AbsoluteConstraints(350, 520, -1, 24));
 
+        dIcoPlainL.setBackground(new java.awt.Color(28, 28, 40));
+        dType.add(dIcoPlainL);
+        dIcoPlainL.setForeground(new java.awt.Color(255, 255, 255));
+        dIcoPlainL.setText("Plain Large");
+        dIcoPlainL.setBorder(null);
+        configurationPanel.add(dIcoPlainL, new org.netbeans.lib.awtextra.AbsoluteConstraints(207, 175, -1, -1));
+        dIcoPlain.setBackground(null);
+
         mainBasePanel.add(configurationPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(230, 40, 540, 570));
         configurationPanel.setVisible(false);
 
@@ -1189,7 +1198,15 @@ public static void main(String args[]) {
     }
     boolean verifyColor(String color){
         if(color.length()==7||color.length()==9){
-            return color.charAt(0)=='#';
+            int x=1;
+            char ch;
+            while(x<color.length()){
+                ch=color.charAt(x++);
+                if(!(color.charAt(0)=='#'&&(ch=='A'||ch=='a'||ch=='B'||ch=='b'||ch=='C'||ch=='c'||ch=='D'||ch=='d'||ch=='E'||ch=='e'||ch=='F'||ch=='f'||ch=='0'||ch=='1'||ch=='2'||ch=='3'||ch=='4'||ch=='5'||ch=='6'||ch=='7'||ch=='8'||ch=='9'))){
+                    return false;
+                }
+            }
+            return true;
         }else{
             return false;
         }
@@ -1201,6 +1218,8 @@ int getDType(){
             return 2;
         }else if(dIcoPlain.isSelected()){
             return 3;
+        }else if(dIcoPlainL.isSelected()){
+            return 4;
         }else{
             return 0;
         }
@@ -1379,6 +1398,7 @@ void colorParse(String color){
     private javax.swing.JRadioButton dIcoDefault;
     private javax.swing.JRadioButton dIcoMaterial;
     private javax.swing.JRadioButton dIcoPlain;
+    private javax.swing.JRadioButton dIcoPlainL;
     private javax.swing.ButtonGroup dType;
     private javax.swing.JButton executeBtn;
     private javax.swing.JRadioButton g3Color;