Attr "Numerator" in Designer.
authorDmintriy L. Kruglikov <master@shadow.breg.pl.ua>
Thu, 3 Jul 2008 10:26:39 +0000 (13:26 +0300)
committerDmintriy L. Kruglikov <master@shadow.breg.pl.ua>
Thu, 3 Jul 2008 10:26:39 +0000 (13:26 +0300)
src/designer/deditfield.ui
src/designer/deditfield.ui.h
src/lib/acfg.h

index 2d4084b..cbcc76b 100644 (file)
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>585</width>
-            <height>478</height>
+            <width>570</width>
+            <height>507</height>
         </rect>
     </property>
     <property name="caption">
                             <bool>false</bool>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="0" column="3">
-                        <property name="name">
-                            <cstring>eCname</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>7</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>2</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="font">
-                            <font>
-                            </font>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="2">
-                        <property name="name">
-                            <cstring>textLabel1_2</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>1</hsizetype>
-                                <vsizetype>5</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="font">
-                            <font>
-                            </font>
-                        </property>
-                        <property name="text">
-                            <string>Cname</string>
-                        </property>
-                    </widget>
-                    <widget class="QLineEdit" row="0" column="1">
-                        <property name="name">
-                            <cstring>eName</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>7</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>2</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="font">
-                            <font>
-                            </font>
-                        </property>
-                    </widget>
                     <widget class="QLabel" row="3" column="0">
                         <property name="name">
                             <cstring>tWidth</cstring>
                             </spacer>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="7" column="1" rowspan="1" colspan="3">
+                    <widget class="QGroupBox" row="5" column="0" rowspan="1" colspan="4">
+                        <property name="name">
+                            <cstring>ValidateGroupBox</cstring>
+                        </property>
+                        <property name="title">
+                            <string>Validator</string>
+                        </property>
+                        <property name="checkable">
+                            <bool>false</bool>
+                        </property>
+                        <grid>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3">
+                                <property name="name">
+                                    <cstring>textLabel3</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&lt;u&gt;Example:&lt;/u&gt; RegExp &lt;b&gt;&lt;i&gt;[A-C]\d{5}[W-Z]&lt;/b&gt;&lt;/i&gt; for string &lt;i&gt;&lt;b&gt;A12345Z&lt;/b&gt;&lt;/i&gt;</string>
+                                </property>
+                                <property name="textFormat">
+                                    <enum>AutoText</enum>
+                                </property>
+                            </widget>
+                            <widget class="QLabel" row="0" column="0">
+                                <property name="name">
+                                    <cstring>textLabel1_5</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>RegExp</string>
+                                </property>
+                            </widget>
+                            <widget class="QCheckBox" row="0" column="2">
+                                <property name="name">
+                                    <cstring>two_state</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Intermediate == Invalid</string>
+                                </property>
+                            </widget>
+                            <widget class="QLabel" row="1" column="0">
+                                <property name="name">
+                                    <cstring>textLabel1_4</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Input Mask</string>
+                                </property>
+                            </widget>
+                            <widget class="QLineEdit" row="0" column="1">
+                                <property name="name">
+                                    <cstring>VdRegEx</cstring>
+                                </property>
+                                <property name="toolTip" stdset="0">
+                                    <string>[ABCD], will match an A or a B or a C or a D.</string>
+                                </property>
+                            </widget>
+                            <widget class="QLineEdit" row="1" column="1">
+                                <property name="name">
+                                    <cstring>inputMask</cstring>
+                                </property>
+                                <property name="toolTip" stdset="0">
+                                    <string>[ABCD], will match an A or a B or a C or a D.</string>
+                                </property>
+                            </widget>
+                            <widget class="QLayoutWidget" row="1" column="2">
+                                <property name="name">
+                                    <cstring>layout7</cstring>
+                                </property>
+                                <hbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="QLabel">
+                                        <property name="name">
+                                            <cstring>textLabel2_3</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Test:</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="QLineEdit">
+                                        <property name="name">
+                                            <cstring>Testline</cstring>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget class="QLabel" row="0" column="2">
+                        <property name="name">
+                            <cstring>textLabel1_2</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>1</hsizetype>
+                                <vsizetype>5</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="font">
+                            <font>
+                            </font>
+                        </property>
+                        <property name="text">
+                            <string>Cname</string>
+                        </property>
+                    </widget>
+                    <widget class="QLineEdit" row="0" column="1">
+                        <property name="name">
+                            <cstring>eName</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>2</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="font">
+                            <font>
+                            </font>
+                        </property>
+                    </widget>
+                    <widget class="QLineEdit" row="0" column="3">
+                        <property name="name">
+                            <cstring>eCname</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>2</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="font">
+                            <font>
+                            </font>
+                        </property>
+                    </widget>
+                    <spacer row="6" column="3">
+                        <property name="name">
+                            <cstring>spacer13</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>16</width>
+                                <height>40</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>layout19</cstring>
                         </property>
                             </widget>
                         </hbox>
                     </widget>
+                    <widget class="QLayoutWidget" row="3" column="1" rowspan="1" colspan="3">
+                        <property name="name">
+                            <cstring>layout8</cstring>
+                        </property>
+                        <hbox>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <widget class="QSpinBox">
+                                <property name="name">
+                                    <cstring>eWidth</cstring>
+                                </property>
+                                <property name="font">
+                                    <font>
+                                    </font>
+                                </property>
+                                <property name="maxValue">
+                                    <number>254</number>
+                                </property>
+                                <property name="minValue">
+                                    <number>1</number>
+                                </property>
+                                <property name="value">
+                                    <number>10</number>
+                                </property>
+                            </widget>
+                            <widget class="QLabel">
+                                <property name="name">
+                                    <cstring>tDec</cstring>
+                                </property>
+                                <property name="font">
+                                    <font>
+                                    </font>
+                                </property>
+                                <property name="text">
+                                    <string>,</string>
+                                </property>
+                            </widget>
+                            <widget class="QSpinBox">
+                                <property name="name">
+                                    <cstring>eDec</cstring>
+                                </property>
+                                <property name="font">
+                                    <font>
+                                    </font>
+                                </property>
+                            </widget>
+                            <widget class="QCheckBox">
+                                <property name="name">
+                                    <cstring>tNotBound</cstring>
+                                </property>
+                                <property name="font">
+                                    <font>
+                                    </font>
+                                </property>
+                                <property name="text">
+                                    <string>Max</string>
+                                </property>
+                            </widget>
+                            <widget class="QCheckBox">
+                                <property name="name">
+                                    <cstring>tSepTriads</cstring>
+                                </property>
+                                <property name="font">
+                                    <font>
+                                    </font>
+                                </property>
+                                <property name="text">
+                                    <string>As triads</string>
+                                </property>
+                            </widget>
+                            <widget class="QCheckBox">
+                                <property name="name">
+                                    <cstring>efVd</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Vd</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                            <widget class="QCheckBox">
+                                <property name="name">
+                                    <cstring>efNumerator</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Num</string>
+                                </property>
+                            </widget>
+                            <spacer>
+                                <property name="name">
+                                    <cstring>spacer7</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>64</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </hbox>
+                    </widget>
                     <widget class="QGroupBox" row="4" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>NumeratorGroupBox</cstring>
                         </property>
                         <property name="title">
-                            <string>Numeranor</string>
+                            <string>Numerator</string>
                         </property>
                         <grid>
                             <property name="name">
                                     <cstring>Num_Label</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Numerator</string>
+                                    <string>Construct:</string>
                                 </property>
                             </widget>
                             <widget class="QCheckBox" row="1" column="0">
                                     <cstring>DateFormat</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>and date</string>
+                                    <string>+ Date as:</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="0" column="1">
-                                <property name="name">
-                                    <cstring>layout19</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>7</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <hbox>
-                                    <property name="name">
-                                        <cstring>unnamed</cstring>
-                                    </property>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>MinLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Min:</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>eMin</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>7</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>2</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>MaxLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Max:</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>eMax</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>7</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>2</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>PrLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Prefix:</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>ePrefix</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>7</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>1</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>SfLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Suffix:</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>eSuffix</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>7</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>1</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                    </widget>
-                                </hbox>
-                            </widget>
                             <widget class="QLayoutWidget" row="2" column="1">
                                 <property name="name">
                                     <cstring>layout27</cstring>
                             </widget>
                             <widget class="QLayoutWidget" row="1" column="1">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                             <cstring>useOwnFofmat</cstring>
                                         </property>
                                         <property name="text">
-                                            <string>use own format</string>
+                                            <string>Own format</string>
                                         </property>
                                     </widget>
                                     <widget class="QLineEdit">
                                     </widget>
                                 </hbox>
                             </widget>
-                        </grid>
-                    </widget>
-                    <widget class="QLayoutWidget" row="3" column="1" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>layout7</cstring>
-                        </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QSpinBox">
-                                <property name="name">
-                                    <cstring>eWidth</cstring>
-                                </property>
-                                <property name="font">
-                                    <font>
-                                    </font>
-                                </property>
-                                <property name="maxValue">
-                                    <number>254</number>
-                                </property>
-                                <property name="minValue">
-                                    <number>1</number>
-                                </property>
-                                <property name="value">
-                                    <number>10</number>
-                                </property>
-                            </widget>
-                            <widget class="QLabel">
-                                <property name="name">
-                                    <cstring>tDec</cstring>
-                                </property>
-                                <property name="font">
-                                    <font>
-                                    </font>
-                                </property>
-                                <property name="text">
-                                    <string>,</string>
-                                </property>
-                            </widget>
-                            <widget class="QSpinBox">
-                                <property name="name">
-                                    <cstring>eDec</cstring>
-                                </property>
-                                <property name="font">
-                                    <font>
-                                    </font>
-                                </property>
-                            </widget>
-                            <widget class="QCheckBox">
-                                <property name="name">
-                                    <cstring>tNotBound</cstring>
-                                </property>
-                                <property name="font">
-                                    <font>
-                                    </font>
-                                </property>
-                                <property name="text">
-                                    <string>Max</string>
-                                </property>
-                            </widget>
-                            <widget class="QCheckBox">
-                                <property name="name">
-                                    <cstring>tSepTriads</cstring>
-                                </property>
-                                <property name="font">
-                                    <font>
-                                    </font>
-                                </property>
-                                <property name="text">
-                                    <string>As triads</string>
-                                </property>
-                            </widget>
-                            <widget class="QCheckBox">
-                                <property name="name">
-                                    <cstring>lzcheckBox</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>LZ</string>
-                                </property>
-                            </widget>
-                            <widget class="QCheckBox">
-                                <property name="name">
-                                    <cstring>efVd</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Vd</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                            </widget>
-                            <widget class="QCheckBox">
-                                <property name="name">
-                                    <cstring>efNumerator</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Num</string>
-                                </property>
-                            </widget>
-                            <spacer>
-                                <property name="name">
-                                    <cstring>spacer7</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>45</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                        </hbox>
-                    </widget>
-                    <widget class="QGroupBox" row="5" column="0" rowspan="1" colspan="4">
-                        <property name="name">
-                            <cstring>ValidateGroupBox</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Validator</string>
-                        </property>
-                        <property name="checkable">
-                            <bool>false</bool>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3">
-                                <property name="name">
-                                    <cstring>textLabel3</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&lt;u&gt;Example:&lt;/u&gt; RegExp &lt;b&gt;&lt;i&gt;[A-C]\d{5}[W-Z]&lt;/b&gt;&lt;/i&gt; for string &lt;i&gt;&lt;b&gt;A12345Z&lt;/b&gt;&lt;/i&gt;</string>
-                                </property>
-                                <property name="textFormat">
-                                    <enum>AutoText</enum>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="0" column="0">
-                                <property name="name">
-                                    <cstring>textLabel1_5</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>RegExp</string>
-                                </property>
-                            </widget>
-                            <widget class="QCheckBox" row="0" column="2">
-                                <property name="name">
-                                    <cstring>two_state</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Intermediate == Invalid</string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="1" column="0">
-                                <property name="name">
-                                    <cstring>textLabel1_4</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Input Mask</string>
-                                </property>
-                            </widget>
-                            <widget class="QLineEdit" row="0" column="1">
-                                <property name="name">
-                                    <cstring>VdRegEx</cstring>
-                                </property>
-                                <property name="toolTip" stdset="0">
-                                    <string>[ABCD], will match an A or a B or a C or a D.</string>
-                                </property>
-                            </widget>
-                            <widget class="QLineEdit" row="1" column="1">
-                                <property name="name">
-                                    <cstring>inputMask</cstring>
-                                </property>
-                                <property name="toolTip" stdset="0">
-                                    <string>[ABCD], will match an A or a B or a C or a D.</string>
-                                </property>
-                            </widget>
-                            <widget class="QLayoutWidget" row="1" column="2">
+                            <widget class="QLayoutWidget" row="0" column="1">
                                 <property name="name">
-                                    <cstring>layout7</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                     </property>
                                     <widget class="QLabel">
                                         <property name="name">
-                                            <cstring>textLabel2_3</cstring>
+                                            <cstring>PrLabel</cstring>
                                         </property>
                                         <property name="text">
-                                            <string>Test:</string>
+                                            <string>Prefix:</string>
                                         </property>
                                     </widget>
                                     <widget class="QLineEdit">
                                         <property name="name">
-                                            <cstring>Testline</cstring>
+                                            <cstring>ePrefix</cstring>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>7</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>1</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                    </widget>
+                                    <widget class="QLabel">
+                                        <property name="name">
+                                            <cstring>textLabel1_6</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>+</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="QCheckBox">
+                                        <property name="name">
+                                            <cstring>lzcheckBox</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>LZ</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="QLabel">
+                                        <property name="name">
+                                            <cstring>textLabel1_3</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>+ UID +</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="QLabel">
+                                        <property name="name">
+                                            <cstring>SfLabel</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Suffix:</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="QLineEdit">
+                                        <property name="name">
+                                            <cstring>eSuffix</cstring>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>7</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>1</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
                                         </property>
                                     </widget>
                                 </hbox>
                             </widget>
                         </grid>
                     </widget>
-                    <spacer row="6" column="2">
-                        <property name="name">
-                            <cstring>spacer13</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>16</width>
-                                <height>80</height>
-                            </size>
-                        </property>
-                    </spacer>
                 </grid>
             </widget>
             <widget class="QWidget">
         <slot>setExample()</slot>
     </connection>
     <connection>
-        <sender>eMin</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>dEditField</receiver>
-        <slot>setExample()</slot>
-    </connection>
-    <connection>
-        <sender>eMax</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>dEditField</receiver>
-        <slot>setExample()</slot>
-    </connection>
-    <connection>
         <sender>lzcheckBox</sender>
         <signal>toggled(bool)</signal>
         <receiver>dEditField</receiver>
         <receiver>dEditField</receiver>
         <slot>DateFormat_stateChanged(int)</slot>
     </connection>
+    <connection>
+        <sender>DateFormat</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>dEditField</receiver>
+        <slot>setExample()</slot>
+    </connection>
+    <connection>
+        <sender>useOwnFofmat</sender>
+        <signal>stateChanged(int)</signal>
+        <receiver>dEditField</receiver>
+        <slot>useOwnFofmat_stateChanged(int)</slot>
+    </connection>
+    <connection>
+        <sender>eWidth</sender>
+        <signal>valueChanged(int)</signal>
+        <receiver>dEditField</receiver>
+        <slot>eWidth_valueChanged(int)</slot>
+    </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in declaration">acfg.h</include>
     <slot>inputMask_textChanged( const QString &amp; )</slot>
     <slot>efNumerator_stateChanged( int )</slot>
     <slot>DateFormat_stateChanged( int )</slot>
+    <slot>useOwnFofmat_stateChanged( int )</slot>
+    <slot>eWidth_valueChanged( int )</slot>
 </slots>
 <functions>
     <function access="private">destroy()</function>
index 9f5ec42..79b8ffb 100644 (file)
@@ -72,7 +72,7 @@ void dEditField::init()
        artypes.clear();
        eType->clear();
        otypes.append(" ");
-       lzcheckBox->setText(tr("Add leading zeros"));
+       lzcheckBox->setText(tr("Add zeros"));
        efVd->setText(tr("Validate"));
        efNumerator->setText(tr("Numerator"));
        eType->insertItem(tr("Unknown"), 0);
@@ -125,13 +125,53 @@ void dEditField::setData( aListViewItem *o )
        else efPlus->setChecked( false );
        if( md->attr( obj, mda_nz ) == "1" ) efNZ->setChecked( true );
        else efNZ->setChecked( false );
-       if( md->attr( obj, mda_vd ) == "1" ) efVd->setChecked( true );
-       else efVd->setChecked( false );
-       if( md->attr( obj, mda_twostate ) == "1" ) two_state->setChecked( true );
-       else two_state->setChecked( false );
+       if( md->attr( obj, mda_vd ) == "1" ) {
+               efVd->setChecked( true );
+               ValidateGroupBox->show();
+       }else {
+               efVd->setChecked( false );
+               ValidateGroupBox->hide();
+       }
+       if( md->attr( obj, mda_numerator) == "1" )
+       {
+               efNumerator->setChecked( true );
+               NumeratorGroupBox->show();
+       }else {
+               efNumerator->setChecked( false );
+               NumeratorGroupBox->hide();
+       }
+       two_state->setChecked( md->attr( obj, mda_twostate ) == "1" );
+       lzcheckBox->setChecked( md->attr( obj, mda_lz ) == "1" );
        VdRegEx->setText( md->attr( obj, mda_validator ) );
        inputMask->setText( md->attr( obj, mda_inputmask ) );
 
+       if (md->attr( obj, mda_numdate) != "")
+       {
+               DateFormat->setChecked( md->attr( obj, mda_numdate) != "");
+               int i;
+               bool found;
+               found = FALSE;
+               for (i=0; i < aDFormatBox->count(); ++i)
+               {
+                       if (aDFormatBox->text(i) == md->attr( obj, mda_numdate))
+                       { aDFormatBox->setCurrentText(md->attr( obj, mda_numdate));
+                       aDFormatBox->setEnabled(TRUE);
+                       found = TRUE;
+                       }
+               }
+               if (found == FALSE)
+               {
+                       eOwnFormat->setText(md->attr( obj, mda_numdate));
+                       aDFormatBox->setEnabled(FALSE);
+                       useOwnFofmat->setChecked(TRUE);
+               }
+
+       }
+
+
+       ePrefix->setText( md->attr( obj, mda_numpref ) );
+       eSuffix->setText( md->attr( obj, mda_numsuff ) );
+
        efSum->setChecked(md->attr( obj, mda_sum ) == "1");
 
        QStringList tlist;
@@ -299,9 +339,28 @@ void dEditField::updateMD()
  else md->setAttr( obj, mda_plus, "0" );
  if( efNZ->isChecked() ) md->setAttr( obj, mda_nz, "1" );
  else md->setAttr( obj, mda_nz, "0" );
- if( efVd->isChecked() ) md->setAttr( obj, mda_vd, "1" );
- else md->setAttr( obj, mda_vd, "0" );
+ if( efVd->isChecked() ) {
+        md->setAttr( obj, mda_vd, "1" );
+ }else{
+        md->setAttr( obj, mda_vd, "0" );
+ }
+ if (efNumerator->isChecked() ){
+        md->setAttr( obj, mda_numerator, "1" );
+ }else{
+        md->setAttr( obj, mda_numerator, "0" );
+ }
  if (VdRegEx->text() )md->setAttr( obj, mda_validator, VdRegEx->text().stripWhiteSpace() );
+ if (ePrefix->text() ) md->setAttr( obj, mda_numpref, ePrefix->text());
+ if (eSuffix->text() ) md->setAttr( obj, mda_numsuff, eSuffix->text());
+ if (DateFormat->isChecked() )
+ {
+        if (useOwnFofmat->isChecked() )
+        {
+                md->setAttr( obj, mda_numdate, eOwnFormat->text() );
+        }else{
+                md->setAttr( obj, mda_numdate, aDFormatBox->currentText() );
+        }
+ }
  if (inputMask->text() )md->setAttr( obj, mda_inputmask, inputMask->text().stripWhiteSpace() );
  if (two_state->isChecked() ) md->setAttr( obj, mda_twostate, "1" );
  else md->setAttr( obj, mda_twostate, "0" );
@@ -309,6 +368,12 @@ void dEditField::updateMD()
      md->setAttr( obj, mda_sum, "1" );
  else
      md->setAttr( obj, mda_sum, "0" );
+
+ if( lzcheckBox->isChecked() )
+        md->setAttr( obj, mda_lz, "1" );
+ else
+        md->setAttr( obj, mda_lz, "0" );
+
  if(eType->currentItem()==0)
  {
         st.sprintf(artypes[comboBox2->currentItem()]);
@@ -335,7 +400,6 @@ void dEditField::typeSelect( int idx )
                eDec->show();
                tWidth->show();
                tDec->show();
-               lzcheckBox->show();
                efSum->show();
                tNotBound->hide();
                tSepTriads->show();
@@ -358,12 +422,11 @@ void dEditField::typeSelect( int idx )
                        tDec->hide();
                        efSum->hide();
                        tSepTriads->hide();
-                       lzcheckBox->hide();
                        tNotBound->show();
                        efNumerator->show();
-                       NumeratorGroupBox->show();
+                       if ( efNumerator->isChecked() )         NumeratorGroupBox->show();
                        efVd->show();
-                       ValidateGroupBox->show();
+                       if ( efVd->isChecked() )  ValidateGroupBox->show();
                        efSum->setChecked(false);
                        comboBox2->setEnabled(false);
                        comboBox2->hide();
@@ -377,7 +440,6 @@ void dEditField::typeSelect( int idx )
                            comboBox2->show();
                            comboBox2->setEnabled(true);
                            eWidth->hide();
-                           lzcheckBox->hide();
                            eDec->hide();
                            tWidth->hide();
                            tDec->hide();
@@ -395,7 +457,6 @@ void dEditField::typeSelect( int idx )
                                comboBox2->setEnabled(false);
                                comboBox2->hide();
                                saldoTextLabel->hide();
-                               lzcheckBox->hide();
                                eWidth->hide();
                                eDec->hide();
                                tWidth->hide();
@@ -463,10 +524,10 @@ void dEditField::setExample()
 
      if (lzcheckBox->isChecked())
      {
-       numerator = eMin->text().rightJustify( eWidth->value(), '0' );
+       numerator = QString("789").rightJustify( eWidth->value(), '0' );
      }
      else {
-       numerator = eMin->text();
+       numerator = QString("789");
      }
     eXample->setText(QString("%1%2%3%4").arg(ePrefix->text()).arg(numerator).arg(eSuffix->text()).arg(curdate));
 }
@@ -523,6 +584,7 @@ void dEditField::efNumerator_stateChanged( int )
     if (efNumerator->isChecked() )
     {
        NumeratorGroupBox->show();
+       eWidth->setValue(10);
     } else {
        NumeratorGroupBox->hide();
     }
@@ -544,3 +606,21 @@ void dEditField::DateFormat_stateChanged( int )
        eOwnFormat->setEnabled(FALSE);
     }
 }
+
+
+void dEditField::useOwnFofmat_stateChanged( int )
+{
+       if (useOwnFofmat->isChecked() )
+       {
+               aDFormatBox->setEnabled(FALSE);
+       }else{
+               aDFormatBox->setEnabled(TRUE);
+       }
+
+}
+
+
+void dEditField::eWidth_valueChanged( int )
+{
+    if (efNumerator->isChecked() ) setExample();
+}
index d16f174..8507dc6 100644 (file)
@@ -214,6 +214,11 @@ Metadata attributes.
 #define mda_twostate           "twostate"
 #define mda_validator          "validator"
 #define mda_inputmask          "inputmask"
+#define mda_numerator          "numerator"
+#define mda_numpref            "numpref"
+#define mda_numsuff            "numsuff"
+#define mda_numdate            "numdate"
+#define mda_lz                 "lz"
 
 
 /*!