Skip to content

Commit

Permalink
temp commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@galisha
galisha committed Mar 14, 2024
1 parent 517cf8d commit ca4ee64
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 72 deletions.
3 changes: 2 additions & 1 deletion djf-demo/src/main/resources/ru/smartflex/djf/demo/sf_label.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ demo.gridfields.postal_index = Postal index
demo.gridfields.postal_index.lab_tips = In Russia a postal index includes 6 digits. This field is required.
demo.gridfields.salary = Salary
demo.gridfields.salary.tips = Month salary
demo.gridfields.street = Address
demo.gridfields.street = Street
demo.gridfields.home = Home
demo.gridfields_tab.gridwh.date = Work date
demo.gridfields_tab.gridwh.idWH = Id work history
demo.gridfields_tab.gridwh.remark = Work remark
Expand Down
8 changes: 4 additions & 4 deletions djf-demo/src/main/resources/ru/smartflex/djf/demo/xml/AccountAllFieldsGrid.pnl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<int bind="idAccount" title="${demo.gridfields.grid.idAcc}"
tips="${demo.gridfields.grid.idAcc.tips}" width="30" enabled="no" noResize="yes" />
<text bind="accountNumber" title="${label.demo.gridfields.grid.an}"
width="120:150" />
width="110:120" />
<checkbox bind="hasChildren" title="${demo.gridfields.grid.hasChildren}"
tips="${demo.gridfields.grid.hasChildren.tips}" width="40:40" />
<date bind="dateCreate" title="${demo.gridfields.grid.dc}"
Expand All @@ -21,12 +21,12 @@

<!-- Two linked combobox's -->
<combobox bind="carType" fill="ct.carName"
title="${demo.gridfields.grid.ct}" width="150:150"/>
title="${demo.gridfields.grid.ct}" width="120:120"/>
<combobox bind="carModel" fill="ct.modelList.modelName" parent="carType"
title="${demo.gridfields.grid.cm}" width="150:150"/>
title="${demo.gridfields.grid.cm}" width="120:120"/>

<text bind="remark" title="${label.demo.gridfields.grid.remark}"
width="150:1200" />
width="50:1200" />
</cols>
</grid>
</items>
Expand Down
61 changes: 25 additions & 36 deletions djf-demo/src/main/resources/ru/smartflex/djf/demo/xml/AccountFields.pnl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,62 +3,51 @@
<panel scroll="true">
<layout clazz="net.miginfocom.swing.MigLayout">
<param type="string" value="" />
<param type="string" value="[pref!][grow,fill][pref]" />
<param type="string" value="[pref!][pref!]" />
</layout>

<!-- Example of dynamic access denied -->
<items accessible="sfAll">

<label text="${demo.gridfields.ceil_phone}" constraint="gap para" />
<phone bind="pa.ceilPhone" constraint="wrap, span 2" id="idPhone"
tips="${demo.gridfields.ceil_phone.tips}" />
<phone bind="pa.ceilPhone" id="idPhone" tips="${demo.gridfields.ceil_phone.tips}" constraint="wrap" />
<label text="${demo.gridfields.date_create}" constraint="gap para" />
<date bind="pa.dateCreate" constraint="wrap, span 2" align="left" />
<label text="${demo.gridfields.postal_index}" constraint="gap para"
tips="${demo.gridfields.postal_index.lab_tips}" />
<text bind="pa.postalIndex" constraint="wrap, span 2"
tips="Only 10 symbol can be allowed" />
<date bind="pa.dateCreate" constraint="wrap" />
<label text="${demo.gridfields.postal_index}" tips="${demo.gridfields.postal_index.lab_tips}" constraint="gap para" />
<text bind="pa.postalIndex" tips="Only 10 symbol can be allowed" cols="10" constraint="wrap"/>

<!-- This block is intended only for special services. Example of static
control. In other words before application was started you have to define
these accessible labels -->
<label text="${demo.gridfields.military_rank}" constraint="gap para"
accessible="${form.itemsAccess}" />
<text bind="pa.militaryRank" constraint="wrap, span 2"
accessible="${form.itemsAccess}" enabled="false" id="idRank"
tips="${demo.gridfields.military_rank.tips}" />
<label text="${demo.gridfields.military_unit}" constraint="gap para"
accessible="${form.itemsAccess}"/>
<text bind="pa.militaryUnit" constraint="wrap, span 2" id="mlUnit"
<label text="${demo.gridfields.military_rank}" accessible="${form.itemsAccess}" constraint="gap para" />
<text bind="pa.militaryRank" accessible="${form.itemsAccess}" enabled="false" id="idRank"
tips="${demo.gridfields.military_rank.tips}" cols="10" constraint="wrap"/>
<label text="${demo.gridfields.military_unit}" accessible="${form.itemsAccess}" constraint="gap para" />
<text bind="pa.militaryUnit" id="mlUnit"
accessible="${form.itemsAccess}" enabled="${form.sf.assist.enabled}"
tips="${demo.gridfields.military_unit.tips}"/>
tips="${demo.gridfields.military_unit.tips}" cols="10" constraint="wrap, span 2"/>

<label text="${demo.gridfields.account_type}" constraint="gap para" />
<combobox bind="pa.typeAccount" fill="pt.nameType"
constraint="wrap, span 2" />
<combobox bind="pa.typeAccount" fill="pt.nameType" cols="20" constraint="wrap" />

<label text="${demo.gridfields.street}" constraint="gap para" />
<combobox bind="pa.street" fill="st.streetName" />
<combobox bind="pa.building" fill="st.buildings.buildingNumber" parent="street"
constraint="wrap, w 20:70:90" />
<combobox bind="pa.street" fill="st.streetName" cols="20" constraint="wrap"/>
<label text="${demo.gridfields.home}" constraint="gap para" />
<combobox bind="pa.building" fill="st.buildings.buildingNumber" parent="street" cols="7" constraint="wrap" />

<label constraint="gap para" accessible="${form.itemsAccessBank}" />
<checkbox bind="pa.hasCredit" constraint="wrap, span 2" text="Has a credit?"
accessible="${form.itemsAccessBank}" tips="If a person has a credit then check it field" />
<label accessible="${form.itemsAccessBank}" constraint="gap para" />
<checkbox bind="pa.hasCredit" text="Has a credit?" accessible="${form.itemsAccessBank}"
tips="If a person has a credit then check it field" constraint="wrap" />

<label text="${demo.gridfields.calc_period}" constraint="gap para" accessible="${form.itemsAccess}"/>
<period bind="pa.calcPeriod" constraint="wrap, span 2" align="left"
accessible="${form.itemsAccess}" tips="${demo.gridfields.calc_period.tips}" />
<label text="${demo.gridfields.calc_period}" accessible="${form.itemsAccess}" constraint="gap para" />
<period bind="pa.calcPeriod" accessible="${form.itemsAccess}" tips="${demo.gridfields.calc_period.tips}" constraint="wrap" />

<label text="${demo.gridfields.inn_code}" constraint="gap para" accessible="${form.itemsAccess}" />
<long bind="pa.innCode" constraint="wrap, span 2"
accessible="${form.itemsAccess}" tips="${demo.gridfields.inn_code.tips}" />
<label text="${demo.gridfields.inn_code}" accessible="${form.itemsAccess}" constraint="gap para" />
<long bind="pa.innCode" accessible="${form.itemsAccess}" tips="${demo.gridfields.inn_code.tips}" cols="20" constraint="wrap" />

<label text="${demo.gridfields.salary}" constraint="gap para" accessible="${form.itemsAccess}" />
<num bind="pa.salary" constraint="wrap, span 2"
accessible="${form.itemsAccess}" tips="${demo.gridfields.salary.tips}" />
<label text="${demo.gridfields.salary}" accessible="${form.itemsAccess}" constraint="gap para" />
<num bind="pa.salary" accessible="${form.itemsAccess}" tips="${demo.gridfields.salary.tips}" cols="10" constraint="wrap" />

<button belong="pa" text="Address dictionary"
constraint="gap para" action="goAddress" />
<button belong="pa" text="Address dictionary" action="goAddress" constraint="span 2, gap para, gaptop 10, gapbottom 10" />
</items>
</panel>
6 changes: 3 additions & 3 deletions djf-demo/src/main/resources/ru/smartflex/djf/demo/xml/AccountGrid.pnl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
width="30" enabled="no" noResize="yes" />

<text bind="accountNumber" title="${demo.gridfields.grid.an}"
width="120:150" />
width="110:120" />
<checkbox bind="hasChildren" title="${demo.gridfields.grid.hasChildren}"
width="40:40" accessible="${form.itemsAccessBank}"
enabled="yes" />
<date bind="dateCreate" title="${demo.gridfields.grid.dc}"
width="100:100" />
<combobox bind="carType" fill="ct.carName"
title="${label.demo.gridfields.grid.ct}"
width="150:150"/>
width="120:120"/>

<phone bind="homePhone" title="${demo.gridfields.grid.home_phone}" width="135:135"/>
<text bind="remark" title="${label.demo.gridfields.grid.remark}"
width="150:1200" />
width="50:1200" />

</cols>
</grid>
Expand Down
2 changes: 1 addition & 1 deletion djf-demo/src/main/resources/ru/smartflex/djf/demo/xml/Address.frm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<layout clazz="net.miginfocom.swing.MigLayout">
<param type="string" value="" />
<param type="string" value="[0:0, grow 70, fill][0:0, grow 30, fill]" />
<param type="string" value="[c, pref, fill] 15 [c, 150px] 10 [c, pref!]" />
<param type="string" value="[c, pref, fill] 15 [c, 200px] 10 [c, pref!]" />
</layout>
<items>
<grid bindPref="st">
Expand Down
43 changes: 18 additions & 25 deletions djf-demo/src/main/resources/ru/smartflex/djf/demo/xml/GridFields.pnl.xml
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>

<panel>
<layout clazz="java.awt.GridLayout">
<param type="int" value="1" />
<param type="int" value="2" />
<param type="int" value="5" />
<param type="int" value="5" />
<layout clazz="net.miginfocom.swing.MigLayout">
<param type="string" value="insets 5" />
<param type="string" value="[grow, fill] [pref]" />
<param type="string" value="[35%, grow, fill] [grow, fill]" />
</layout>

<panel include="ru/smartflex/djf/demo/xml/AccountGrid.pnl.xml" />

<panel>
<layout clazz="java.awt.BorderLayout" />
<panel constraint="spany 2, wrap">
<layout clazz="net.miginfocom.swing.MigLayout">
<param type="string" value="insets 5" />
<param type="string" value="[pref!]" />
</layout>

<!-- Filter panel -->
<panel constraint="North" border="line">
<panel constraint="sizegroupx c1, wrap" border="line">
<layout clazz="net.miginfocom.swing.MigLayout">
<param type="string" value="" />
<param type="string" value="[pref!][grow,fill]" />
<param type="string" value="[pref!][pref!]" />
</layout>
<items>
<label text="${demo.gridfields.grid.an}" constraint="gap para" />
<text bind="fl.accountNumber" constraint="span, wrap" />
<text bind="fl.accountNumber" cols="15" constraint="gap para, span, wrap" />
<label text="${demo.gridfields.account_type}" constraint="gap para" />
<combobox bind="fl.typeAccount" fill="pt.nameType"
tipsItem="false" constraint="span, wrap" />
<combobox bind="fl.typeAccount" fill="pt.nameType" tipsItem="false" cols="15" constraint="gap para, span, wrap" />
<button text="${demo.gridfields.btn_filter}" belong="fl"
tips="${demo.gridfields.btn_filter.tips}" constraint="gap para"
action="filter" id="btn_filter"/>
tips="${demo.gridfields.btn_filter.tips}" action="filter" id="btn_filter" constraint="gap para, growx"/>
</items>
</panel>

<panel constraint="Center">
<layout clazz="net.miginfocom.swing.MigLayout">
<param type="string" value="insets 5 0 0 0" />
<param type="string" value="[grow, fill][grow, fill]" />
<param type="string" value="[grow, fill][grow, fill]" />
</layout>
<panel include="ru/smartflex/djf/demo/xml/AccountFields.pnl.xml"
constraint="span 2, wrap" />
<panel include="ru/smartflex/djf/demo/xml/AccEquipmentGrid.pnl.xml"
constraint="span 2" />
</panel>
<panel include="ru/smartflex/djf/demo/xml/AccountFields.pnl.xml" constraint="sizegroupx c1, growy"/>

</panel>

<panel include="ru/smartflex/djf/demo/xml/AccEquipmentGrid.pnl.xml" />

</panel>
4 changes: 2 additions & 2 deletions djf-demo/src/main/resources/ru/smartflex/djf/demo/xml/Tasks.pnl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<layout clazz="net.miginfocom.swing.MigLayout">
<param type="string" value="wrap 1" />
<param type="string" value="[100%, grow, fill]" />
<param type="string" value="[35%][20px][60%, grow, fill]" />
<param type="string" value="[37%, grow, fill][20px][60%, grow, fill]" />
</layout>

<panel>
Expand All @@ -23,7 +23,7 @@
</cols>
</grid>
<run tips="${demo.task.run_form}" form="${form.selected.formXML}"
constraint="h 50, w 100, gapleft 15px" />
constraint="h 50, growx, gapleft 15px, bottom" />
</items>
</panel>

Expand Down

0 comments on commit ca4ee64

Please sign in to comment.