working on item layout

anti43 · Oct 27, 2017 · 2902ca5 · 2902ca5
1 parent 8ede6e4
commit 2902ca5
Show file tree

Hide file tree

Showing 10 changed files with 687 additions and 4,478 deletions.
diff --git a/src/mpv5/resources/languages/Panels.properties b/src/mpv5/resources/languages/Panels.properties
@@ -2035,7 +2035,6 @@ ItemPanel2.contactname._Label=Contact
 ItemPanel2.accountselect._Label=Account
 ItemPanel2.button_order2.text=+
 ItemPanel2.value.text=0
-ItemPanel2.jLabel4.text=Group:
 ItemPanel2.jLabel3.text=Value
 ItemPanel2.jLabel9.text=\ = 
 ItemPanel2.taxvalue.text=0
@@ -2247,3 +2246,5 @@ ControlPanel_Userproperties.testadress._Label=Testadress
 ControlPanel_Userproperties.smtpssl.text=Use SSL
 ContactPanel.button_product.text=New Product
 ContactPanel.button_credits.text=Credit notes
+ItemPanel2.groupnameselect._Label=Group
+ItemPanel2.button_order2.label=.
diff --git a/src/mpv5/ui/beans/LabeledCombobox.form b/src/mpv5/ui/beans/LabeledCombobox.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>
@@ -15,6 +15,7 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,25,0,0,1,-112"/>
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
@@ -35,9 +36,6 @@
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
           <Connection code="null" type="code"/>
         </Property>
-        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[33, 18]"/>
-        </Property>
       </Properties>
     </Component>
   </SubComponents>

diff --git a/src/mpv5/ui/beans/LabeledCombobox.java b/src/mpv5/ui/beans/LabeledCombobox.java
@@ -35,10 +35,12 @@ public class LabeledCombobox extends javax.swing.JPanel {
     private static final long serialVersionUID = 1L;
     private String _text;
     private String _label;
+    private boolean _invisible;
 
     /** Creates new form LabeledTextField */
     public LabeledCombobox() {
         initComponents();
+        setVisible(!_invisible);
     }
 
     public JComboBox getComboBox() {
@@ -213,7 +215,6 @@ private void initComponents() {
         add(jLabel1);
 
         mPCombobox1.setBorder(null);
-        mPCombobox1.setMinimumSize(new java.awt.Dimension(33, 18));
         add(mPCombobox1);
     }// </editor-fold>//GEN-END:initComponents
     // Variables declaration - do not modify//GEN-BEGIN:variables
@@ -361,4 +362,18 @@ public void actionPerformed(ActionEvent e) {
     public void setNullSelection() {
        mPCombobox1.setSelectedIndex(-1);
     }
+
+    /**
+     * @return the _invisible
+     */
+    public boolean isInvisible() {
+        return _invisible;
+    }
+
+    /**
+     * @param _invisible the _invisible to set
+     */
+    public void setInvisible(boolean _invisible) {
+        this._invisible = _invisible;
+    }
 }
diff --git a/src/mpv5/ui/beans/LabeledTextField.java b/src/mpv5/ui/beans/LabeledTextField.java
@@ -41,10 +41,13 @@ public final class LabeledTextField extends javax.swing.JPanel {
     private boolean searchOnEnterEnabled;
     private Object displayingObject;
     private int labelWidth=100;
+    private boolean _invisible;
 
+
     /** Creates new form LabeledTextField */
     public LabeledTextField() {
         initComponents();
+        setVisible(!_invisible);
     }
 
      /** Creates new form LabeledTextField
@@ -410,4 +413,18 @@ public String getText(boolean nonNull, String value) {
     public int getLabelWidth() {
         return labelWidth;
     }
+
+        /**
+     * @return the _invisible
+     */
+    public boolean isInvisible() {
+        return _invisible;
+    }
+
+    /**
+     * @param _invisible the _invisible to set
+     */
+    public void setInvisible(boolean _invisible) {
+        this._invisible = _invisible;
+    }
 }
diff --git a/src/mpv5/ui/panels/ContactPanel.form b/src/mpv5/ui/panels/ContactPanel.form
@@ -205,7 +205,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[150, 23]"/>
+                      <Dimension value="[350, 23]"/>
                     </Property>
                     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                       <Dimension value="[150, 23]"/>
@@ -343,7 +343,7 @@
                       <ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ContactPanel.groupnameselect._Label" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[150, 23]"/>
+                      <Dimension value="[350, 23]"/>
                     </Property>
                     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                       <Dimension value="[150, 23]"/>
@@ -365,12 +365,15 @@
                       </FontInfo>
                     </Property>
                     <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[150, 23]"/>
+                      <Dimension value="[350, 23]"/>
                     </Property>
                     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                       <Dimension value="[150, 23]"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="taxnumber" noResource="true"/>
+                    <Property name="parent" type="mpv5.ui.panels.DataPanel" editor="org.netbeans.modules.form.ComponentChooserEditor">
+                      <ComponentRef name="default"/>
+                    </Property>
                     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                       <Dimension value="[300, 23]"/>
                     </Property>
@@ -382,7 +385,7 @@
                       <ResourceString bundle="mpv5/resources/languages/Panels.properties" key="ContactPanel.companyselect._Label" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[150, 23]"/>
+                      <Dimension value="[350, 23]"/>
                     </Property>
                     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                       <Dimension value="[150, 23]"/>
@@ -407,7 +410,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[150, 23]"/>
+                      <Dimension value="[350, 23]"/>
                     </Property>
                     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                       <Dimension value="[150, 23]"/>

diff --git a/src/mpv5/ui/panels/ContactPanel.java b/src/mpv5/ui/panels/ContactPanel.java
@@ -493,7 +493,7 @@ public Component prepareRenderer(TableCellRenderer renderer,
         prinitingComboBox1 = new mpv5.ui.beans.PrinitingComboBox();
         toolbarpane = new javax.swing.JPanel();
 
-        java.util.ResourceBundle bundle = mpv5.i18n.LanguageManager.getBundle(); // NOI18N
+        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("mpv5/resources/languages/Panels"); // NOI18N
         setBorder(javax.swing.BorderFactory.createTitledBorder(bundle.getString("ContactPanel.border.title"))); // NOI18N
         setName("Form"); // NOI18N
         setLayout(new java.awt.BorderLayout());
@@ -519,7 +519,7 @@ public Component prepareRenderer(TableCellRenderer renderer,
         number.setEnabled(false);
         number.setFocusable(false);
         number.setFont(number.getFont());
-        number.setMaximumSize(new java.awt.Dimension(150, 23));
+        number.setMaximumSize(new java.awt.Dimension(350, 23));
         number.setMinimumSize(new java.awt.Dimension(150, 23));
         number.setName("number"); // NOI18N
         number.setPreferredSize(new java.awt.Dimension(300, 23));
@@ -585,28 +585,28 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
         jToolBar2.add(manufacturer);
 
         groupnameselect.set_Label(bundle.getString("ContactPanel.groupnameselect._Label")); // NOI18N
-        groupnameselect.setMaximumSize(new java.awt.Dimension(150, 23));
+        groupnameselect.setMaximumSize(new java.awt.Dimension(350, 23));
         groupnameselect.setMinimumSize(new java.awt.Dimension(150, 23));
         groupnameselect.setName("groupnameselect"); // NOI18N
         groupnameselect.setPreferredSize(new java.awt.Dimension(300, 23));
 
         taxnumber.set_Label(bundle.getString("ContactPanel.taxnumber._Label")); // NOI18N
         taxnumber.setFont(taxnumber.getFont().deriveFont(taxnumber.getFont().getStyle() | java.awt.Font.BOLD));
-        taxnumber.setMaximumSize(new java.awt.Dimension(150, 23));
+        taxnumber.setMaximumSize(new java.awt.Dimension(350, 23));
         taxnumber.setMinimumSize(new java.awt.Dimension(150, 23));
         taxnumber.setName("taxnumber"); // NOI18N
         taxnumber.setPreferredSize(new java.awt.Dimension(300, 23));
 
         companyselect.set_Label(bundle.getString("ContactPanel.companyselect._Label")); // NOI18N
-        companyselect.setMaximumSize(new java.awt.Dimension(150, 23));
+        companyselect.setMaximumSize(new java.awt.Dimension(350, 23));
         companyselect.setMinimumSize(new java.awt.Dimension(150, 23));
         companyselect.setName("companyselect"); // NOI18N
         companyselect.setPreferredSize(new java.awt.Dimension(300, 23));
 
         payterm.set_Label(bundle.getString("ContactPanel.payterm._Label")); // NOI18N
         payterm.set_ValueClass(Integer.class);
         payterm.setFont(payterm.getFont().deriveFont(payterm.getFont().getStyle() | java.awt.Font.BOLD));
-        payterm.setMaximumSize(new java.awt.Dimension(150, 23));
+        payterm.setMaximumSize(new java.awt.Dimension(350, 23));
         payterm.setMinimumSize(new java.awt.Dimension(150, 23));
         payterm.setName("payterm"); // NOI18N
         payterm.setPreferredSize(new java.awt.Dimension(300, 23));