diff --git a/icon/color_wheel_dock_icon_by_andybaumgar-d3ezjgc.png b/icon/color_wheel_dock_icon_by_andybaumgar-d3ezjgc.png deleted file mode 100644 index ef7e92b..0000000 Binary files a/icon/color_wheel_dock_icon_by_andybaumgar-d3ezjgc.png and /dev/null differ diff --git a/icon/wheel.png b/icon/wheel.png deleted file mode 100644 index 03fbb27..0000000 Binary files a/icon/wheel.png and /dev/null differ diff --git a/org-idp-laf-1.1.zip b/org-idp-laf-1.1.zip new file mode 100644 index 0000000..5b4e770 Binary files /dev/null and b/org-idp-laf-1.1.zip differ diff --git a/src/org/idp/laf/Color.java b/src/org/idp/laf/Color.java index c5083e8..d2187f6 100644 --- a/src/org/idp/laf/Color.java +++ b/src/org/idp/laf/Color.java @@ -95,6 +95,8 @@ public class Color implements Serializable{ this.cls = AT; } + this.description = vals[3]; + vals = vals[2].split(","); @@ -103,8 +105,6 @@ public class Color implements Serializable{ this.B = Integer.parseInt(vals[2]); this.A = Integer.parseInt(vals[3]); - this.description = vals[3]; - } else { diff --git a/src/org/idp/laf/Kernel.java b/src/org/idp/laf/Kernel.java index 2ac0967..22dd2b4 100644 --- a/src/org/idp/laf/Kernel.java +++ b/src/org/idp/laf/Kernel.java @@ -178,43 +178,45 @@ public class Kernel { private static boolean save_scheme(String scheme_file) { - ArrayList color_map = new ArrayList(); - for (int i = 0; i < Keys.color_keys.length; i ++) - { - - Object o = UIManager.get(Keys.color_keys[i]); - if (o != null) - { - if (o.getClass().equals(javax.swing.plaf.ColorUIResource.class)) - { - ColorUIResource oo = (ColorUIResource) o; - Color c = new Color(Keys.color_keys[i], Color.ColorClass.SF, oo.getRed(), oo.getGreen(), oo.getBlue(), oo.getAlpha(),"..."); - color_map.add(c); - //System.out.println( "\"" + Keys.color_keys[i] + "\","); - } - else if (o.getClass().equals(java.awt.Color.class)) - { - java.awt.Color oo = (java.awt.Color) o; - Color c = new Color(Keys.color_keys[i], Color.ColorClass.AT, oo.getRed(), oo.getGreen(), oo.getBlue(), oo.getAlpha(),"..."); - color_map.add(c); - //System.out.println( "\"" + Keys.color_keys[i] + "\","); - } - } - else - { - ColorUIResource oo = new ColorUIResource(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)); - Color c = new Color(Keys.color_keys[i], Color.ColorClass.SF, oo.getRed(), oo.getGreen(), oo.getBlue(), oo.getAlpha(),"..."); - color_map.add(c); - //System.out.println( " \"" + Keys.color_keys[i] + "\","); - } - } - +// ArrayList color_map = new ArrayList(); +// for (int i = 0; i < Keys.color_keys.length; i ++) +// { +// +// Object o = UIManager.get(Keys.color_keys[i]); +// if (o != null) +// { +// if (o.getClass().equals(javax.swing.plaf.ColorUIResource.class)) +// { +// ColorUIResource oo = (ColorUIResource) o; +// Color c = new Color(Keys.color_keys[i], Color.ColorClass.SF, oo.getRed(), oo.getGreen(), oo.getBlue(), oo.getAlpha(),"..."); +// color_map.add(c); +// //System.out.println( "\"" + Keys.color_keys[i] + "\","); +// } +// else if (o.getClass().equals(java.awt.Color.class)) +// { +// java.awt.Color oo = (java.awt.Color) o; +// Color c = new Color(Keys.color_keys[i], Color.ColorClass.AT, oo.getRed(), oo.getGreen(), oo.getBlue(), oo.getAlpha(),"..."); +// color_map.add(c); +// //System.out.println( "\"" + Keys.color_keys[i] + "\","); +// } +// } +// else +// { +// ColorUIResource oo = new ColorUIResource(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)); +// Color c = new Color(Keys.color_keys[i], Color.ColorClass.SF, oo.getRed(), oo.getGreen(), oo.getBlue(), oo.getAlpha(),"..."); +// color_map.add(c); +// //System.out.println( " \"" + Keys.color_keys[i] + "\","); +// } +// } +// +// + try { PrintWriter writer = new PrintWriter(scheme_file , "UTF-8"); - for (int i = 0; i < color_map.size(); i ++) + for (int i = 0; i < color_scheme_loaded.length; i ++) { - writer.println(color_map.get(i).toStringC()); + writer.println(color_scheme_loaded[i].toStringC()); } writer.close(); return true; @@ -245,9 +247,7 @@ public class Kernel { { color_map.add(new Color (s)); } - - - + color_scheme_loaded = new Color[color_map.size()]; color_map.toArray(color_scheme_loaded); diff --git a/src/org/idp/laf/gui/Bundle.properties b/src/org/idp/laf/gui/Bundle.properties index 7c1c4e2..fd90765 100644 --- a/src/org/idp/laf/gui/Bundle.properties +++ b/src/org/idp/laf/gui/Bundle.properties @@ -18,3 +18,4 @@ ColorEditorTopComponent.test_mode.text=Pink Daemon Mode ColorEditorTopComponent.save_btn.text=Write Scheme ColorEditorTopComponent.reload_btn.text=Reload Scheme ColorEditorTopComponent.load_btn.text=Load Scheme from File +ColorEditorTopComponent.color_desc.text_1=jTextField1 diff --git a/src/org/idp/laf/gui/ColorEditorTopComponent.form b/src/org/idp/laf/gui/ColorEditorTopComponent.form index 452f37b..d4348a2 100644 --- a/src/org/idp/laf/gui/ColorEditorTopComponent.form +++ b/src/org/idp/laf/gui/ColorEditorTopComponent.form @@ -18,8 +18,8 @@ - - + + @@ -31,9 +31,9 @@ - + - + @@ -109,12 +109,11 @@ - + + - - - + @@ -129,12 +128,10 @@ - - - + - + @@ -153,7 +150,7 @@ - + @@ -246,46 +243,67 @@ - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/org/idp/laf/gui/ColorEditorTopComponent.java b/src/org/idp/laf/gui/ColorEditorTopComponent.java index 95c0f70..c30158e 100644 --- a/src/org/idp/laf/gui/ColorEditorTopComponent.java +++ b/src/org/idp/laf/gui/ColorEditorTopComponent.java @@ -80,10 +80,12 @@ public final class ColorEditorTopComponent extends TopComponent { color_G = new javax.swing.JTextField(); jLabel4 = new javax.swing.JLabel(); color_B = new javax.swing.JTextField(); + test_mode = new javax.swing.JToggleButton(); + color_desc = new javax.swing.JTextField(); + jPanel3 = new javax.swing.JPanel(); + load_btn = new javax.swing.JButton(); reload_btn = new javax.swing.JButton(); save_btn = new javax.swing.JButton(); - load_btn = new javax.swing.JButton(); - test_mode = new javax.swing.JToggleButton(); jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(ColorEditorTopComponent.class, "ColorEditorTopComponent.jPanel2.border.title"))); // NOI18N jPanel2.setLayout(new javax.swing.BoxLayout(jPanel2, javax.swing.BoxLayout.LINE_AXIS)); @@ -115,7 +117,7 @@ public final class ColorEditorTopComponent extends TopComponent { color_preview_panel.setLayout(color_preview_panelLayout); color_preview_panelLayout.setHorizontalGroup( color_preview_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 234, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); color_preview_panelLayout.setVerticalGroup( color_preview_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -188,33 +190,50 @@ public final class ColorEditorTopComponent extends TopComponent { }); jPanel1.add(color_B); - org.openide.awt.Mnemonics.setLocalizedText(reload_btn, org.openide.util.NbBundle.getMessage(ColorEditorTopComponent.class, "ColorEditorTopComponent.reload_btn.text")); // NOI18N - reload_btn.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - reload_btnActionPerformed(evt); + org.openide.awt.Mnemonics.setLocalizedText(test_mode, org.openide.util.NbBundle.getMessage(ColorEditorTopComponent.class, "ColorEditorTopComponent.test_mode.text")); // NOI18N + test_mode.addChangeListener(new javax.swing.event.ChangeListener() { + public void stateChanged(javax.swing.event.ChangeEvent evt) { + test_modeStateChanged(evt); } }); - org.openide.awt.Mnemonics.setLocalizedText(save_btn, org.openide.util.NbBundle.getMessage(ColorEditorTopComponent.class, "ColorEditorTopComponent.save_btn.text")); // NOI18N - save_btn.addActionListener(new java.awt.event.ActionListener() { + color_desc.setText(org.openide.util.NbBundle.getMessage(ColorEditorTopComponent.class, "ColorEditorTopComponent.color_desc.text_1")); // NOI18N + color_desc.addFocusListener(new java.awt.event.FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent evt) { + color_descFocusLost(evt); + } + }); + color_desc.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - save_btnActionPerformed(evt); + color_descActionPerformed(evt); } }); + jPanel3.setLayout(new java.awt.GridLayout(3, 0, 0, 5)); + org.openide.awt.Mnemonics.setLocalizedText(load_btn, org.openide.util.NbBundle.getMessage(ColorEditorTopComponent.class, "ColorEditorTopComponent.load_btn.text")); // NOI18N load_btn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { load_btnActionPerformed(evt); } }); + jPanel3.add(load_btn); - org.openide.awt.Mnemonics.setLocalizedText(test_mode, org.openide.util.NbBundle.getMessage(ColorEditorTopComponent.class, "ColorEditorTopComponent.test_mode.text")); // NOI18N - test_mode.addChangeListener(new javax.swing.event.ChangeListener() { - public void stateChanged(javax.swing.event.ChangeEvent evt) { - test_modeStateChanged(evt); + org.openide.awt.Mnemonics.setLocalizedText(reload_btn, org.openide.util.NbBundle.getMessage(ColorEditorTopComponent.class, "ColorEditorTopComponent.reload_btn.text")); // NOI18N + reload_btn.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + reload_btnActionPerformed(evt); } }); + jPanel3.add(reload_btn); + + org.openide.awt.Mnemonics.setLocalizedText(save_btn, org.openide.util.NbBundle.getMessage(ColorEditorTopComponent.class, "ColorEditorTopComponent.save_btn.text")); // NOI18N + save_btn.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + save_btnActionPerformed(evt); + } + }); + jPanel3.add(save_btn); javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4); jPanel4.setLayout(jPanel4Layout); @@ -223,12 +242,11 @@ public final class ColorEditorTopComponent extends TopComponent { .addGroup(jPanel4Layout.createSequentialGroup() .addContainerGap() .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 236, Short.MAX_VALUE) + .addComponent(color_desc, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(color_preview_panel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(save_btn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(reload_btn, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(load_btn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(test_mode, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(test_mode, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, 236, Short.MAX_VALUE)) .addContainerGap()) ); jPanel4Layout.setVerticalGroup( @@ -240,12 +258,10 @@ public final class ColorEditorTopComponent extends TopComponent { .addComponent(test_mode, javax.swing.GroupLayout.PREFERRED_SIZE, 45, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 97, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(save_btn) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(reload_btn) + .addComponent(color_desc, javax.swing.GroupLayout.DEFAULT_SIZE, 72, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(load_btn) + .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap()) ); @@ -255,8 +271,8 @@ public final class ColorEditorTopComponent extends TopComponent { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, 636, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, 624, Short.MAX_VALUE) + .addGap(18, 18, 18) .addComponent(jPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap()) ); @@ -266,8 +282,8 @@ public final class ColorEditorTopComponent extends TopComponent { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() - .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, 527, Short.MAX_VALUE)) - .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, 539, Short.MAX_VALUE)) + .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, 529, Short.MAX_VALUE)) .addContainerGap()) ); }// //GEN-END:initComponents @@ -295,6 +311,7 @@ public final class ColorEditorTopComponent extends TopComponent { this.color_B.setText(String.valueOf (col.getBlue())); this.color_hex.setText(String.format("#%06X", (0xFFFFFF & col.getRGB()))); } + this.color_desc.setText(sel_col.getDescription()); } }//GEN-LAST:event_color_listValueChanged @@ -418,6 +435,7 @@ public final class ColorEditorTopComponent extends TopComponent { this.save_btn.setEnabled(false); this.load_btn.setEnabled(false); this.reload_btn.setEnabled(false); + this.color_desc.setEnabled(false); Color real = (Color) this.color_list.getSelectedValue(); @@ -442,6 +460,7 @@ public final class ColorEditorTopComponent extends TopComponent { this.save_btn.setEnabled(true); this.load_btn.setEnabled(true); this.reload_btn.setEnabled(true); + this.color_desc.setEnabled(true); Color real = (Color) this.color_list.getSelectedValue(); java.awt.Color cc = (java.awt.Color) real.getObject(); @@ -513,10 +532,20 @@ public final class ColorEditorTopComponent extends TopComponent { // TODO add your handling code here: }//GEN-LAST:event_load_btnActionPerformed + private void color_descActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_color_descActionPerformed + Color sel_col = (Color) this.color_list.getSelectedValue(); + sel_col.setDescription(this.color_desc.getText()); + }//GEN-LAST:event_color_descActionPerformed + + private void color_descFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_color_descFocusLost + color_descActionPerformed (null); + }//GEN-LAST:event_color_descFocusLost + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JTextField color_B; private javax.swing.JTextField color_G; private javax.swing.JTextField color_R; + private javax.swing.JTextField color_desc; private javax.swing.JTextField color_hex; private javax.swing.JList color_list; private javax.swing.JPanel color_preview_panel; @@ -526,6 +555,7 @@ public final class ColorEditorTopComponent extends TopComponent { private javax.swing.JLabel jLabel4; private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; + private javax.swing.JPanel jPanel3; private javax.swing.JPanel jPanel4; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JButton load_btn; diff --git a/update/org-idp-laf-1.1.nbm b/update/org-idp-laf-1.1.nbm new file mode 100644 index 0000000..5b4e770 Binary files /dev/null and b/update/org-idp-laf-1.1.nbm differ diff --git a/update/updates.xml b/update/updates.xml index f7b390a..3618297 100644 --- a/update/updates.xml +++ b/update/updates.xml @@ -1,12 +1,12 @@ - + - - + +