From 9a5d925206abbd3fad374b6f1b621601948dba11 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Sat, 3 Sep 2022 21:06:30 +0200 Subject: [PATCH] [restart dev --- blender_files/exportEmf.py | 5 +- .../resources/ewol/theme/shape/Button.emf | 46 ++++----- .../resources/ewol/theme/shape/Entry.emf | 46 ++++----- .../resources/ewol/theme/shape/Entry.mtl | 24 ----- .../resources/ewol/theme/shape/Entry.obj | 99 ------------------- resources/resources/ewol/theme/shape/Tick.emf | 31 +++--- .../resources/ewol/theme/shape/Tick.json | 2 +- .../sample/atriasoft/ewol/BasicWindows.java | 25 ++++- .../atriasoft/ewol/sampleButton/Appl.java | 82 --------------- .../ewol/sampleButton/MainWindows.java | 35 ------- .../ewol/sampleEntry/SampleEntryMain.java | 16 --- .../Appl.java | 3 +- .../atriasoft/ewol/validationWidget/Log.java | 73 ++++++++++++++ .../ewol/validationWidget/MainWindows.java | 62 ++++++++++++ .../ValidatorMain.java} | 6 +- .../atriasoft/ewol/context/EwolContext.java | 1 - src/org/atriasoft/ewol/widget/CheckBox.java | 6 +- src/org/atriasoft/ewol/widget/Composer.java | 21 ++-- src/org/atriasoft/ewol/widget/Spin.java | 3 - 19 files changed, 242 insertions(+), 344 deletions(-) delete mode 100644 resources/resources/ewol/theme/shape/Entry.mtl delete mode 100644 resources/resources/ewol/theme/shape/Entry.obj delete mode 100644 samples/src/sample/atriasoft/ewol/sampleButton/Appl.java delete mode 100644 samples/src/sample/atriasoft/ewol/sampleButton/MainWindows.java delete mode 100644 samples/src/sample/atriasoft/ewol/sampleEntry/SampleEntryMain.java rename samples/src/sample/atriasoft/ewol/{sampleEntry => validationWidget}/Appl.java (96%) create mode 100644 samples/src/sample/atriasoft/ewol/validationWidget/Log.java create mode 100644 samples/src/sample/atriasoft/ewol/validationWidget/MainWindows.java rename samples/src/sample/atriasoft/ewol/{sampleButton/SampleButtonMain.java => validationWidget/ValidatorMain.java} (72%) diff --git a/blender_files/exportEmf.py b/blender_files/exportEmf.py index 2683c54..616c751 100644 --- a/blender_files/exportEmf.py +++ b/blender_files/exportEmf.py @@ -7,8 +7,9 @@ import bpy list_elem = [ "Entry", - "CheckBox", - "ScrollBar" + "Tick", + "ScrollBar", + "Button" ] for elem in list_elem: diff --git a/resources/resources/ewol/theme/shape/Button.emf b/resources/resources/ewol/theme/shape/Button.emf index e4e9a27..fa505da 100644 --- a/resources/resources/ewol/theme/shape/Button.emf +++ b/resources/resources/ewol/theme/shape/Button.emf @@ -1,34 +1,24 @@ EMF(STRING) -# Blender v2.92.0 EMF File: 'Entry.blend' -Mesh:EntryBox_Cube +# Blender v3.1.2 EMF File: 'Button.blend' +Mesh:CheckBox_Cube Vertex:16 - 20.042355 19.982376 -7.860689|20.042355 -20.102333 -7.862826|20.042355 19.981716 4.524041|20.042355 -20.102993 4.521903|-20.042355 19.982376 -7.860689|-20.042355 -20.102333 -7.862826|-20.042355 19.981716 4.524041|-20.042355 -20.102993 4.521903|10.127714 10.066911 7.616918|10.127714 -10.188519 7.615837|-10.127714 10.066911 7.616918|-10.127714 -10.188519 7.615837|-10.127714 -10.188596 7.897926|-10.127714 10.066834 7.899007|10.127714 10.066834 7.899007|10.127714 -10.188596 7.897926| + 12.043998 11.983889 -5.389912|12.043998 -12.104107 -5.391196|12.043998 11.983492 2.052411|12.043998 -12.104505 2.051126|-12.043998 11.983889 -5.389912|-12.043998 -12.104107 -5.391196|-12.043998 11.983492 2.052411|-12.043998 -12.104505 2.051126|10.127714 10.066911 7.616918|10.127714 -10.188519 7.615837|-10.127714 10.066911 7.616918|-10.127714 -10.188519 7.615837|-10.199120 -10.192897 3.116539|-10.199120 10.181330 3.117619|10.199120 10.181330 3.117619|10.199120 -10.192897 3.116539| UV-mapping: - 1.000000 1.000000|-0.000001 -0.000000|0.999976 0.000023|0.000001 1.000001|0.074219 0.995849|0.120606 0.943115|0.121582 0.993408|0.112927 0.992387|0.078245 0.948093|0.073324 0.991157|0.101769 0.970961|0.080974 0.959440|0.102023 0.957458|0.111927 0.985005|0.078476 0.953015|0.082167 0.983774|0.074219 0.944092|0.111696 0.944402|0.080720 0.975385|0.113157 0.949323|0.174907 0.947863|0.131613 0.991157|0.132843 0.945402|0.178368 0.944941|0.137534 0.984544|0.142456 0.948632|0.171985 0.949093|0.136074 0.991157|0.137304 0.950323|0.174677 0.949093|0.135074 0.992387|0.136304 0.949093|0.178598 0.993618|0.178368 0.988235|0.173216 0.991157|0.175907 0.989926|0.013265 0.951784|0.051868 0.992387|0.013034 0.993618|0.054098 0.951784|0.137534 0.988235|0.177138 0.947863|0.135074 0.947862|0.172446 0.988465| - Normal(face):22 - 0.000000 -0.000053 1.000000|-0.297843 -0.000051 0.954615|0.000000 -0.297894 0.954599|0.000000 0.297792 0.954631|0.297843 -0.000051 0.954615|0.000000 1.000000 0.000053|-1.000000 0.000000 0.000000|0.000000 -1.000000 -0.000053|1.000000 -0.000000 -0.000000|0.000000 0.000053 -1.000000| - Face:22 - gui_dynamic_1 - 14/0/0 12/1/0 15/2/0| 14/0/0 13/3/0 12/1/0| + 0.121582 0.993408|0.074219 0.944092|0.120606 0.943115|0.112927 0.992387|0.078245 0.948093|0.073324 0.991157|0.101769 0.970961|0.080974 0.959440|0.102023 0.957458|0.111927 0.985005|0.078476 0.953015|0.082167 0.983774|0.074219 0.995849|0.111696 0.944402|0.080720 0.975385|0.113157 0.949323|0.174907 0.947863|0.131613 0.991157|0.132843 0.945402|0.142456 0.948632|0.178368 0.988235|0.137534 0.984544|0.171985 0.949093|0.136074 0.991157|0.137304 0.950323|0.136304 0.949093|0.175907 0.989926|0.135074 0.992387|0.178598 0.993618|0.178368 0.944941|0.173216 0.991157|0.174677 0.949093|0.013265 0.951784|0.051868 0.992387|0.013034 0.993618|0.054098 0.951784|0.137534 0.988235|0.177138 0.947863|0.135074 0.947862|0.172446 0.988465| + Normal(face):28 + -0.945506 -0.000017 0.325604|0.000000 -0.945524 0.325553|0.000000 0.945489 0.325654|0.945506 -0.000017 0.325604|0.000000 1.000000 0.000053|-1.000000 0.000000 0.000000|0.000000 -1.000000 -0.000053|1.000000 -0.000000 0.000000|-0.999874 0.000001 -0.015868|0.000000 -0.999677 -0.025422|0.999874 0.000001 -0.015868|0.000000 1.000000 -0.000973|0.000000 -0.000053 1.000000|0.000000 0.000053 -1.000000| + Face:28 palette:gui_border_1 - 7/4/1 10/5/1 6/6/1| 3/7/2 11/8/2 7/9/2| 6/10/3 8/11/3 2/12/3| 2/13/4 9/14/4 3/15/4| 7/4/1 11/16/1 10/5/1| 3/7/2 9/17/2 11/8/2| 6/10/3 10/18/3 8/11/3| 2/13/4 8/19/4 9/14/4| + 6/0/0 11/1/0 10/2/0| 3/3/1 11/4/1 7/5/1| 6/6/2 8/7/2 2/8/2| 2/9/3 9/10/3 3/11/3| 6/0/0 7/12/0 11/1/0| 3/3/1 9/13/1 11/4/1| 6/6/2 10/14/2 8/7/2| 2/9/3 8/15/3 9/10/3| palette:gui_border_2 - 4/20/5 2/21/5 0/22/5| 6/23/6 5/24/6 7/25/6| 1/26/7 7/27/7 5/28/7| 0/29/8 3/30/8 1/31/8| 4/20/5 6/32/5 2/21/5| 6/23/6 4/33/6 5/24/6| 1/26/7 3/34/7 7/27/7| 0/29/8 2/35/8 3/30/8| + 4/16/4 2/17/4 0/18/4| 7/19/5 4/20/5 5/21/5| 1/22/6 7/23/6 5/24/6| 1/25/7 2/26/7 3/27/7| 4/16/4 6/28/4 2/17/4| 7/19/5 6/29/5 4/20/5| 1/22/6 3/30/6 7/23/6| 1/25/7 0/31/7 2/26/7| + palette:gui_border_inside + 8/7/8 15/32/8 9/10/8| 13/33/9 8/7/9 10/14/9| 10/14/10 12/34/10 13/33/10| 15/32/11 11/4/11 9/10/11| 8/7/8 14/35/8 15/32/8| 13/33/9 14/35/9 8/7/9| 10/14/10 11/4/10 12/34/10| 15/32/11 12/34/11 11/4/11| palette:gui_center - 9/36/0 10/37/0 11/38/0| 9/36/0 8/39/0 10/37/0| + 15/32/12 13/33/12 12/34/12| 15/32/12 14/35/12 13/33/12| palette:gui_back - 5/40/9 0/41/9 1/42/9| 5/40/9 4/43/9 0/41/9| + 5/36/13 0/37/13 1/38/13| 5/36/13 4/39/13 0/37/13| -Materials:gui_dynamic_1 - Ns 225.000000 - Ka 1.000000 1.000000 1.000000 - Kd 0.800000 0.800000 0.800000 - Ks 0.500000 0.500000 0.500000 - Ke 0.000000 0.000000 0.000000 - vNi 1.450000 - d 1.000000 - illum 2 - map_Kd empty_area.png # Just for information: Palettes:gui_back Ns 225.000000 @@ -60,6 +50,16 @@ Palettes:gui_border_2 d 1.000000 illum 2 # Just for information: +Palettes:gui_border_inside + Ns 225.000000 + Ka 1.000000 1.000000 1.000000 + Kd 0.003877 0.001682 0.147314 + Ks 0.500000 0.500000 0.500000 + Ke 0.000000 0.000000 0.000000 + vNi 1.450000 + d 1.000000 + illum 2 +# Just for information: Palettes:gui_center Ns 225.000000 Ka 1.000000 1.000000 1.000000 diff --git a/resources/resources/ewol/theme/shape/Entry.emf b/resources/resources/ewol/theme/shape/Entry.emf index 96a8313..95d3d02 100644 --- a/resources/resources/ewol/theme/shape/Entry.emf +++ b/resources/resources/ewol/theme/shape/Entry.emf @@ -1,34 +1,24 @@ EMF(STRING) -# Blender v3.0.0 EMF File: 'Entry.blend' -Mesh:EntryBox_Cube +# Blender v3.1.2 EMF File: 'Entry.blend' +Mesh:CheckBox_Cube Vertex:16 - 20.042355 19.982376 -7.860689|20.042355 -20.102333 -7.862826|20.042355 19.981716 4.524041|20.042355 -20.102993 4.521903|-20.042355 19.982376 -7.860689|-20.042355 -20.102333 -7.862826|-20.042355 19.981716 4.524041|-20.042355 -20.102993 4.521903|10.127714 10.066911 7.616918|10.127714 -10.188519 7.615837|-10.127714 10.066911 7.616918|-10.127714 -10.188519 7.615837|-10.127714 -10.188596 7.897926|-10.127714 10.066834 7.899007|10.127714 10.066834 7.899007|10.127714 -10.188596 7.897926| + 13.004523 12.944430 -5.686628|13.004523 -13.064616 -5.688015|13.004523 12.944001 2.349230|13.004523 -13.065046 2.347842|-13.004523 12.944430 -5.686628|-13.004523 -13.064616 -5.688015|-13.004523 12.944001 2.349230|-13.004523 -13.065046 2.347842|10.127714 10.066911 7.616918|10.127714 -10.188519 7.615837|-10.127714 10.066911 7.616918|-10.127714 -10.188519 7.615837|-10.199120 -10.192897 3.116539|-10.199120 10.181330 3.117619|10.199120 10.181330 3.117619|10.199120 -10.192897 3.116539| UV-mapping: - 1.000000 1.000000|-0.000001 -0.000000|0.999976 0.000023|0.000001 1.000001|0.074219 0.995849|0.120606 0.943115|0.121582 0.993408|0.112927 0.992387|0.078245 0.948093|0.073324 0.991157|0.101769 0.970961|0.080974 0.959440|0.102023 0.957458|0.111927 0.985005|0.078476 0.953015|0.082167 0.983774|0.074219 0.944092|0.111696 0.944402|0.080720 0.975385|0.113157 0.949323|0.174907 0.947863|0.131613 0.991157|0.132843 0.945402|0.178368 0.944941|0.137534 0.984544|0.142456 0.948632|0.171985 0.949093|0.136074 0.991157|0.137304 0.950323|0.174677 0.949093|0.135074 0.992387|0.136304 0.949093|0.178598 0.993618|0.178368 0.988235|0.173216 0.991157|0.175907 0.989926|0.013265 0.951784|0.051868 0.992387|0.013034 0.993618|0.054098 0.951784|0.137534 0.988235|0.177138 0.947863|0.135074 0.947862|0.172446 0.988465| - Normal(face):22 - 0.000000 -0.000053 1.000000|-0.297843 -0.000051 0.954615|0.000000 -0.297894 0.954599|0.000000 0.297792 0.954631|0.297843 -0.000051 0.954615|0.000000 1.000000 0.000053|-1.000000 0.000000 0.000000|0.000000 -1.000000 -0.000053|1.000000 -0.000000 -0.000000|0.000000 0.000053 -1.000000| - Face:22 - gui_dynamic_1 - 14/0/0 12/1/0 15/2/0| 14/0/0 13/3/0 12/1/0| + 0.121582 0.993408|0.074219 0.944092|0.120606 0.943115|0.112927 0.992387|0.078245 0.948093|0.073324 0.991157|0.102023 0.957458|0.080720 0.975385|0.080974 0.959440|0.111927 0.985005|0.078476 0.953015|0.082167 0.983774|0.074219 0.995849|0.111696 0.944402|0.101769 0.970961|0.113157 0.949323|0.174907 0.947863|0.131613 0.991157|0.132843 0.945402|0.178368 0.944941|0.137534 0.984544|0.142456 0.948632|0.171985 0.949093|0.136074 0.991157|0.137304 0.950323|0.174677 0.949093|0.135074 0.992387|0.136304 0.949093|0.178598 0.993618|0.178368 0.988235|0.173216 0.991157|0.175907 0.989926|0.013265 0.951784|0.051868 0.992387|0.013034 0.993618|0.054098 0.951784|0.137534 0.988235|0.177138 0.947863|0.135074 0.947862|0.172446 0.988465| + Normal(face):28 + -0.877654 -0.000026 0.479294|0.000000 -0.877680 0.479247|0.000000 0.877629 0.479341|0.877654 -0.000026 0.479294|0.000000 1.000000 0.000053|-1.000000 0.000000 0.000000|0.000000 -1.000000 -0.000054|1.000000 -0.000000 -0.000000|-0.999874 0.000001 -0.015868|0.000000 -0.999677 -0.025422|0.999874 0.000001 -0.015868|0.000000 1.000000 -0.000973|0.000000 -0.000053 1.000000|0.000000 0.000053 -1.000000| + Face:28 palette:gui_border_1 - 7/4/1 10/5/1 6/6/1| 3/7/2 11/8/2 7/9/2| 6/10/3 8/11/3 2/12/3| 2/13/4 9/14/4 3/15/4| 7/4/1 11/16/1 10/5/1| 3/7/2 9/17/2 11/8/2| 6/10/3 10/18/3 8/11/3| 2/13/4 8/19/4 9/14/4| + 6/0/0 11/1/0 10/2/0| 3/3/1 11/4/1 7/5/1| 2/6/2 10/7/2 8/8/2| 2/9/3 9/10/3 3/11/3| 6/0/0 7/12/0 11/1/0| 3/3/1 9/13/1 11/4/1| 2/6/2 6/14/2 10/7/2| 2/9/3 8/15/3 9/10/3| palette:gui_border_2 - 4/20/5 2/21/5 0/22/5| 6/23/6 5/24/6 7/25/6| 1/26/7 7/27/7 5/28/7| 0/29/8 3/30/8 1/31/8| 4/20/5 6/32/5 2/21/5| 6/23/6 4/33/6 5/24/6| 1/26/7 3/34/7 7/27/7| 0/29/8 2/35/8 3/30/8| + 4/16/4 2/17/4 0/18/4| 6/19/5 5/20/5 7/21/5| 1/22/6 7/23/6 5/24/6| 0/25/7 3/26/7 1/27/7| 4/16/4 6/28/4 2/17/4| 6/19/5 4/29/5 5/20/5| 1/22/6 3/30/6 7/23/6| 0/25/7 2/31/7 3/26/7| + palette:gui_border_inside + 8/8/8 15/32/8 9/10/8| 13/33/9 8/8/9 10/7/9| 10/7/10 12/34/10 13/33/10| 15/32/11 11/4/11 9/10/11| 8/8/8 14/35/8 15/32/8| 13/33/9 14/35/9 8/8/9| 10/7/10 11/4/10 12/34/10| 15/32/11 12/34/11 11/4/11| palette:gui_center - 9/36/0 10/37/0 11/38/0| 9/36/0 8/39/0 10/37/0| + 15/32/12 13/33/12 12/34/12| 15/32/12 14/35/12 13/33/12| palette:gui_back - 5/40/9 0/41/9 1/42/9| 5/40/9 4/43/9 0/41/9| + 5/36/13 0/37/13 1/38/13| 5/36/13 4/39/13 0/37/13| -Materials:gui_dynamic_1 - Ns 225.000000 - Ka 1.000000 1.000000 1.000000 - Kd 0.800000 0.800000 0.800000 - Ks 0.500000 0.500000 0.500000 - Ke 0.000000 0.000000 0.000000 - vNi 1.450000 - d 1.000000 - illum 2 - map_Kd empty_area.png # Just for information: Palettes:gui_back Ns 225.000000 @@ -60,6 +50,16 @@ Palettes:gui_border_2 d 1.000000 illum 2 # Just for information: +Palettes:gui_border_inside + Ns 225.000000 + Ka 1.000000 1.000000 1.000000 + Kd 0.003877 0.001682 0.147314 + Ks 0.500000 0.500000 0.500000 + Ke 0.000000 0.000000 0.000000 + vNi 1.450000 + d 1.000000 + illum 2 +# Just for information: Palettes:gui_center Ns 225.000000 Ka 1.000000 1.000000 1.000000 diff --git a/resources/resources/ewol/theme/shape/Entry.mtl b/resources/resources/ewol/theme/shape/Entry.mtl deleted file mode 100644 index 4f7a6c4..0000000 --- a/resources/resources/ewol/theme/shape/Entry.mtl +++ /dev/null @@ -1,24 +0,0 @@ -# Blender MTL File: 'Entry.blend' -# Material Count: 2 - -newmtl TextArea -Ns 225.000000 -Ka 1.000000 1.000000 1.000000 -Kd 0.800000 0.800000 0.800000 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.450000 -d 1.000000 -illum 2 -map_Kd empty_area.png - -newmtl center -Ns 225.000000 -Ka 1.000000 1.000000 1.000000 -Kd 0.800000 0.800000 0.800000 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.450000 -d 1.000000 -illum 2 -map_Kd GuiPaletteColor.png diff --git a/resources/resources/ewol/theme/shape/Entry.obj b/resources/resources/ewol/theme/shape/Entry.obj deleted file mode 100644 index 62398b4..0000000 --- a/resources/resources/ewol/theme/shape/Entry.obj +++ /dev/null @@ -1,99 +0,0 @@ -# Blender v2.92.0 OBJ File: 'Entry.blend' -# www.blender.org -mtllib Entry.mtl -o Cube -v 20.042355 20.042355 -7.751226 -v 20.042355 -20.042355 -7.751226 -v 20.042355 20.042355 4.633502 -v 20.042355 -20.042355 4.633502 -v -20.042355 20.042355 -7.751226 -v -20.042355 -20.042355 -7.751226 -v -20.042355 20.042355 4.633502 -v -20.042355 -20.042355 4.633502 -v 10.127714 10.127714 7.726907 -v 10.127714 -10.127714 7.726907 -v -10.127714 10.127714 7.726907 -v -10.127714 -10.127714 7.726907 -v -10.127714 -10.127714 9.146553 -v -10.127714 10.127714 9.146553 -v 10.127714 10.127714 9.146553 -v 10.127714 -10.127714 9.146553 -vt 0.174907 0.947863 -vt 0.131613 0.991157 -vt 0.132843 0.945402 -vt 0.074219 0.995849 -vt 0.120606 0.943115 -vt 0.121582 0.993408 -vt 0.178368 0.944941 -vt 0.137534 0.984544 -vt 0.142456 0.948632 -vt 0.171985 0.949093 -vt 0.136074 0.991157 -vt 0.137304 0.950323 -vt 0.174677 0.949093 -vt 0.135074 0.992387 -vt 0.136304 0.949093 -vt 0.112927 0.992387 -vt 0.078245 0.948093 -vt 0.073324 0.991157 -vt 0.101769 0.970961 -vt 0.080974 0.959440 -vt 0.102023 0.957458 -vt 0.111927 0.985005 -vt 0.078476 0.953015 -vt 0.082167 0.983774 -vt 0.137534 0.988235 -vt 0.177138 0.947863 -vt 0.135074 0.947862 -vt 0.013265 0.951784 -vt 0.051868 0.992387 -vt 0.013034 0.993618 -vt 0.178598 0.993618 -vt 0.074219 0.944092 -vt 0.178368 0.988235 -vt 0.173216 0.991157 -vt 0.175907 0.989926 -vt 0.111696 0.944402 -vt 0.080720 0.975385 -vt 0.113157 0.949323 -vt 0.172446 0.988465 -vt 0.054098 0.951784 -vt 0.000100 0.000100 -vt 0.999900 0.999900 -vt 0.000100 0.999900 -vt 0.999900 0.000100 -vn 0.0000 1.0000 0.0000 -vn -0.2978 0.0000 0.9546 -vn -1.0000 0.0000 0.0000 -vn 0.0000 -1.0000 0.0000 -vn 1.0000 0.0000 0.0000 -vn 0.0000 -0.2978 0.9546 -vn 0.0000 0.2978 0.9546 -vn 0.2978 0.0000 0.9546 -vn 0.0000 0.0000 -1.0000 -vn 0.0000 0.0000 1.0000 -usemtl center -s off -f 5/1/1 3/2/1 1/3/1 -f 8/4/2 11/5/2 7/6/2 -f 7/7/3 6/8/3 8/9/3 -f 2/10/4 8/11/4 6/12/4 -f 1/13/5 4/14/5 2/15/5 -f 4/16/6 12/17/6 8/18/6 -f 7/19/7 9/20/7 3/21/7 -f 3/22/8 10/23/8 4/24/8 -f 6/25/9 1/26/9 2/27/9 -f 10/28/10 11/29/10 12/30/10 -f 5/1/1 7/31/1 3/2/1 -f 8/4/2 12/32/2 11/5/2 -f 7/7/3 5/33/3 6/8/3 -f 2/10/4 4/34/4 8/11/4 -f 1/13/5 3/35/5 4/14/5 -f 4/16/6 10/36/6 12/17/6 -f 7/19/7 11/37/7 9/20/7 -f 3/22/8 9/38/8 10/23/8 -f 6/25/9 5/39/9 1/26/9 -f 10/28/10 9/40/10 11/29/10 -usemtl TextArea -f 15/41/10 13/42/10 16/43/10 -f 15/41/10 14/44/10 13/42/10 diff --git a/resources/resources/ewol/theme/shape/Tick.emf b/resources/resources/ewol/theme/shape/Tick.emf index 5671949..3398b98 100644 --- a/resources/resources/ewol/theme/shape/Tick.emf +++ b/resources/resources/ewol/theme/shape/Tick.emf @@ -1,17 +1,17 @@ EMF(STRING) -# Blender v3.0.0 EMF File: 'CheckBox.blend' +# Blender v3.1.2 EMF File: 'CheckBox.blend' Mesh:CheckBox_Cube Vertex:16 - 20.042355 19.982376 -7.860689|20.042355 -20.102333 -7.862826|20.042355 19.981716 4.524041|20.042355 -20.102993 4.521903|-20.042355 19.982376 -7.860689|-20.042355 -20.102333 -7.862826|-20.042355 19.981716 4.524041|-20.042355 -20.102993 4.521903|10.127714 10.066911 7.616918|10.127714 -10.188519 7.615837|-10.127714 10.066911 7.616918|-10.127714 -10.188519 7.615837|-10.199120 -10.192897 3.116539|-10.199120 10.181330 3.117619|10.199120 10.181330 3.117619|10.199120 -10.192897 3.116539| + 12.043998 11.983889 -5.389912|12.043998 -12.104107 -5.391196|12.043998 11.983492 2.052411|12.043998 -12.104505 2.051126|-12.043998 11.983889 -5.389912|-12.043998 -12.104107 -5.391196|-12.043998 11.983492 2.052411|-12.043998 -12.104505 2.051126|10.127714 10.066911 7.616918|10.127714 -10.188519 7.615837|-10.127714 10.066911 7.616918|-10.127714 -10.188519 7.615837|-10.199120 -10.192897 3.116539|-10.199120 10.181330 3.117619|10.199120 10.181330 3.117619|10.199120 -10.192897 3.116539| UV-mapping: - 0.074219 0.995849|0.120606 0.943115|0.121582 0.993408|0.112927 0.992387|0.078245 0.948093|0.073324 0.991157|0.101769 0.970961|0.080974 0.959440|0.102023 0.957458|0.111927 0.985005|0.078476 0.953015|0.082167 0.983774|0.074219 0.944092|0.111696 0.944402|0.080720 0.975385|0.113157 0.949323|0.174907 0.947863|0.131613 0.991157|0.132843 0.945402|0.178368 0.944941|0.137534 0.984544|0.142456 0.948632|0.171985 0.949093|0.136074 0.991157|0.137304 0.950323|0.174677 0.949093|0.135074 0.992387|0.136304 0.949093|0.178598 0.993618|0.178368 0.988235|0.173216 0.991157|0.175907 0.989926|0.013265 0.951784|0.051868 0.992387|0.013034 0.993618|0.054098 0.951784|0.137534 0.988235|0.177138 0.947863|0.135074 0.947862|0.172446 0.988465| + 0.121582 0.993408|0.074219 0.944092|0.120606 0.943115|0.112927 0.992387|0.078245 0.948093|0.073324 0.991157|0.101769 0.970961|0.080974 0.959440|0.102023 0.957458|0.111927 0.985005|0.078476 0.953015|0.082167 0.983774|0.074219 0.995849|0.111696 0.944402|0.080720 0.975385|0.113157 0.949323|0.174907 0.947863|0.131613 0.991157|0.132843 0.945402|0.142456 0.948632|0.178368 0.988235|0.137534 0.984544|0.171985 0.949093|0.136074 0.991157|0.137304 0.950323|0.136304 0.949093|0.175907 0.989926|0.135074 0.992387|0.178598 0.993618|0.178368 0.944941|0.173216 0.991157|0.174677 0.949093|0.013265 0.951784|0.051868 0.992387|0.013034 0.993618|0.054098 0.951784|0.137534 0.988235|0.177138 0.947863|0.135074 0.947862|0.172446 0.988465| Normal(face):28 - -0.297843 -0.000051 0.954615|0.000000 -0.297894 0.954599|0.000000 0.297792 0.954631|0.297843 -0.000051 0.954615|0.000000 1.000000 0.000053|-1.000000 0.000000 0.000000|0.000000 -1.000000 -0.000053|1.000000 -0.000000 -0.000000|-0.999874 0.000001 -0.015868|0.000000 -0.999677 -0.025422|0.999874 0.000001 -0.015868|0.000000 1.000000 -0.000973|0.000000 -0.000053 1.000000|0.000000 0.000053 -1.000000| + -0.945506 -0.000017 0.325604|0.000000 -0.945524 0.325553|0.000000 0.945489 0.325654|0.945506 -0.000017 0.325604|0.000000 1.000000 0.000053|-1.000000 0.000000 0.000000|0.000000 -1.000000 -0.000053|1.000000 -0.000000 0.000000|-0.999874 0.000001 -0.015868|0.000000 -0.999677 -0.025422|0.999874 0.000001 -0.015868|0.000000 1.000000 -0.000973|0.000000 -0.000053 1.000000|0.000000 0.000053 -1.000000| Face:28 palette:gui_border_1 - 7/0/0 10/1/0 6/2/0| 3/3/1 11/4/1 7/5/1| 6/6/2 8/7/2 2/8/2| 2/9/3 9/10/3 3/11/3| 7/0/0 11/12/0 10/1/0| 3/3/1 9/13/1 11/4/1| 6/6/2 10/14/2 8/7/2| 2/9/3 8/15/3 9/10/3| + 6/0/0 11/1/0 10/2/0| 3/3/1 11/4/1 7/5/1| 6/6/2 8/7/2 2/8/2| 2/9/3 9/10/3 3/11/3| 6/0/0 7/12/0 11/1/0| 3/3/1 9/13/1 11/4/1| 6/6/2 10/14/2 8/7/2| 2/9/3 8/15/3 9/10/3| palette:gui_border_2 - 4/16/4 2/17/4 0/18/4| 6/19/5 5/20/5 7/21/5| 1/22/6 7/23/6 5/24/6| 0/25/7 3/26/7 1/27/7| 4/16/4 6/28/4 2/17/4| 6/19/5 4/29/5 5/20/5| 1/22/6 3/30/6 7/23/6| 0/25/7 2/31/7 3/26/7| + 4/16/4 2/17/4 0/18/4| 7/19/5 4/20/5 5/21/5| 1/22/6 7/23/6 5/24/6| 1/25/7 2/26/7 3/27/7| 4/16/4 6/28/4 2/17/4| 7/19/5 6/29/5 4/20/5| 1/22/6 3/30/6 7/23/6| 1/25/7 0/31/7 2/26/7| palette:gui_border_inside 8/7/8 15/32/8 9/10/8| 13/33/9 8/7/9 10/14/9| 10/14/10 12/34/10 13/33/10| 15/32/11 11/4/11 9/10/11| 8/7/8 14/35/8 15/32/8| 13/33/9 14/35/9 8/7/9| 10/14/10 11/4/10 12/34/10| 15/32/11 12/34/11 11/4/11| palette:gui_center @@ -60,6 +60,16 @@ Palettes:gui_border_2 d 1.000000 illum 2 # Just for information: +Palettes:gui_border_inside + Ns 225.000000 + Ka 1.000000 1.000000 1.000000 + Kd 0.003877 0.001682 0.147314 + Ks 0.500000 0.500000 0.500000 + Ke 0.000000 0.000000 0.000000 + vNi 1.450000 + d 1.000000 + illum 2 +# Just for information: Palettes:gui_center Ns 225.000000 Ka 1.000000 1.000000 1.000000 @@ -79,12 +89,3 @@ Palettes:gui_checked vNi 1.450000 d 1.000000 illum 2 -Palettes:gui_border_inside - Ns 225.000000 - Ka 1.000000 1.000000 1.000000 - Kd 0.003877 0.001682 0.147314 - Ks 0.500000 0.500000 0.500000 - Ke 0.000000 0.000000 0.000000 - vNi 1.450000 - d 1.000000 - illum 2 diff --git a/resources/resources/ewol/theme/shape/Tick.json b/resources/resources/ewol/theme/shape/Tick.json index e3fc5a9..f671b1d 100644 --- a/resources/resources/ewol/theme/shape/Tick.json +++ b/resources/resources/ewol/theme/shape/Tick.json @@ -21,5 +21,5 @@ "palette":"THEME:shape/palette_gui.json?lib=ewol", - "change-time":200 + "change-time":100 } diff --git a/samples/src/sample/atriasoft/ewol/BasicWindows.java b/samples/src/sample/atriasoft/ewol/BasicWindows.java index b8cb25e..2bdddb1 100644 --- a/samples/src/sample/atriasoft/ewol/BasicWindows.java +++ b/samples/src/sample/atriasoft/ewol/BasicWindows.java @@ -40,9 +40,15 @@ import org.atriasoft.ewol.widget.Windows; public class BasicWindows extends Windows { private static final String LABEL_GRAVITY = "gravity: "; + public static void staticRequestNext(final BasicWindows self) { + self.requestNext(); + } + Widget testWidget; Sizer sizerTestAreaHori; + Sizer sizerMenuRoot; Sizer sizerMenu; + Gravity basicGravity = Gravity.BOTTOM_LEFT; private final List conections = new ArrayList<>(); @@ -56,13 +62,25 @@ public class BasicWindows extends Windows { sizerMain.setPropertyFill(Vector3b.TRUE); setSubWidget(sizerMain); + this.sizerMenuRoot = new Sizer(DisplayMode.VERTICAL); + this.sizerMenuRoot.setPropertyExpand(Vector3b.FALSE_TRUE_FALSE); + this.sizerMenuRoot.setPropertyLockExpand(Vector3b.TRUE); + this.sizerMenuRoot.setPropertyFill(Vector3b.TRUE); + this.sizerMenuRoot.setPropertyMinSize(new Dimension3f(new Vector3f(350, 10, 10), Distance.PIXEL)); + this.sizerMenuRoot.setPropertyGravity(Gravity.TOP); + sizerMain.subWidgetAdd(this.sizerMenuRoot); + + final Button next = Button.createLabelButton("Next ..."); + this.sizerMenuRoot.subWidgetAdd(next); + next.signalClick.connectAuto(this, BasicWindows::staticRequestNext); + this.sizerMenu = new Sizer(DisplayMode.VERTICAL); this.sizerMenu.setPropertyExpand(Vector3b.FALSE_TRUE_FALSE); this.sizerMenu.setPropertyLockExpand(Vector3b.TRUE); this.sizerMenu.setPropertyFill(Vector3b.TRUE); this.sizerMenu.setPropertyMinSize(new Dimension3f(new Vector3f(350, 10, 10), Distance.PIXEL)); this.sizerMenu.setPropertyGravity(Gravity.TOP); - sizerMain.subWidgetAdd(this.sizerMenu); + this.sizerMenuRoot.subWidgetAdd(this.sizerMenu); final Sizer sizerVertMain = new Sizer(DisplayMode.VERTICAL); sizerVertMain.setPropertyExpand(Vector3b.TRUE); @@ -1131,7 +1149,12 @@ public class BasicWindows extends Windows { } } + public void requestNext() { + // nothing to do ... + } + public void setTestWidget(final Widget widget) { + this.sizerMenu.subWidgetRemoveAll(); try { final IntrospectionModelComplex modelPojo = new IntrospectionModelComplex(widget.getClass()); diff --git a/samples/src/sample/atriasoft/ewol/sampleButton/Appl.java b/samples/src/sample/atriasoft/ewol/sampleButton/Appl.java deleted file mode 100644 index 956ce99..0000000 --- a/samples/src/sample/atriasoft/ewol/sampleButton/Appl.java +++ /dev/null @@ -1,82 +0,0 @@ -package sample.atriasoft.ewol.sampleButton; - -import org.atriasoft.etk.Configs; -import org.atriasoft.etk.math.Vector2f; -import org.atriasoft.ewol.context.EwolApplication; -import org.atriasoft.ewol.context.EwolContext; - -import sample.atriasoft.ewol.Log; - -public class Appl implements EwolApplication { - - //! [ewol_sample_HW_main_application] - private void localCreate(final EwolContext context) { - //! [ewol_sample_HW_main_parse_arguments] - // parse all the argument of the application - for (int iii = 0; iii < context.getCmd().size(); iii++) { - String tmpppp = context.getCmd().get(iii); - if (tmpppp == "-h" || tmpppp == "--help") { - Log.print(" -h/--help display this help"); - System.exit(0); - } - } - //! [ewol_sample_HW_main_parse_arguments] - //! [ewol_sample_HW_main_set_windows_size] - // TODO : Remove this: Move if in the windows properties - context.setSize(new Vector2f(800, 600)); - //! [ewol_sample_HW_main_set_windows_size] - //! [ewol_sample_HW_main_set_font_property] - // select font preference of der with a basic application size - Configs.getConfigFonts().set("FreeSherif", 12); - //! [ewol_sample_HW_main_set_font_property] - //! [ewol_sample_HW_main_set_windows] - // Create the windows - MainWindows basicWindows = new MainWindows(); - // configure the ewol context to use the new windows - context.setWindows(basicWindows); - //! [ewol_sample_HW_main_set_windows] - } - - @Override - public void onCreate(final EwolContext context) { - Log.info("Application onCreate: [BEGIN]"); - localCreate(context); - Log.info("Application onCreate: [ END ]"); - } - - @Override - public void onDestroy(final EwolContext context) { - Log.info("Application onDestroy: [BEGIN]"); - - Log.info("Application onDestroy: [ END ]"); - } - - @Override - public void onPause(final EwolContext context) { - Log.info("Application onPause: [BEGIN]"); - - Log.info("Application onPause: [ END ]"); - } - - @Override - public void onResume(final EwolContext context) { - Log.info("Application onResume: [BEGIN]"); - - Log.info("Application onResume: [ END ]"); - } - - @Override - public void onStart(final EwolContext context) { - Log.info("Application onStart: [BEGIN]"); - - Log.info("Application onStart: [ END ]"); - } - - @Override - public void onStop(final EwolContext context) { - Log.info("Application onStop: [BEGIN]"); - - Log.info("Application onStop: [ END ]"); - } - -} \ No newline at end of file diff --git a/samples/src/sample/atriasoft/ewol/sampleButton/MainWindows.java b/samples/src/sample/atriasoft/ewol/sampleButton/MainWindows.java deleted file mode 100644 index b32fa9d..0000000 --- a/samples/src/sample/atriasoft/ewol/sampleButton/MainWindows.java +++ /dev/null @@ -1,35 +0,0 @@ -package sample.atriasoft.ewol.sampleButton; - -import org.atriasoft.ewol.widget.Composer; -import org.atriasoft.ewol.widget.Widget; - -import sample.atriasoft.ewol.BasicWindows; - -public class MainWindows extends BasicWindows { - - public MainWindows() { - setPropertyTitle("Simple Button test"); - //final Widget data = Composer.composerGenerateString(""); - //final Widget data = Composer.composerGenerateString(""); - /* */ - final Widget data = Composer.composerGenerateString(""); - /* */ - //final Widget data = Composer.composerGenerateFile(new Uri("DATA", "ewol-gui-file-chooser.xml", "ewol")); - this.setTestWidget(data); - /* - final Button simpleButton = Button - .createLabelButton("1 - My button internal
2 - label
3 - an other text ...
4 - and an other line to be sure ..."); - simpleButton.setPropertyExpand(Vector3b.TRUE); - simpleButton.setPropertyFill(Vector3b.FALSE); - this.setTestWidget(simpleButton); - */ - /* - final ListFileSystem widget = new ListFileSystem(); - widget.setPropertyPath("/home/heero"); - widget.setPropertyExpand(Vector3b.TRUE); - widget.setPropertyFill(Vector3b.FALSE); - this.setTestWidget(widget); - */ - } -} diff --git a/samples/src/sample/atriasoft/ewol/sampleEntry/SampleEntryMain.java b/samples/src/sample/atriasoft/ewol/sampleEntry/SampleEntryMain.java deleted file mode 100644 index e5d35e3..0000000 --- a/samples/src/sample/atriasoft/ewol/sampleEntry/SampleEntryMain.java +++ /dev/null @@ -1,16 +0,0 @@ -package sample.atriasoft.ewol.sampleEntry; - -import org.atriasoft.etk.Uri; -import org.atriasoft.ewol.Ewol; -import org.atriasoft.ewol.widget.MainWindows; - -public class SampleEntryMain { - public static void main(final String[] args) { - Ewol.init(); - //Uri.addLibrary("ne", MainCollisionTest.class, "testDataLoxelEngine/"); - Uri.setApplication(MainWindows.class); - Ewol.run(new Appl(), args); - } - - private SampleEntryMain() {} -} diff --git a/samples/src/sample/atriasoft/ewol/sampleEntry/Appl.java b/samples/src/sample/atriasoft/ewol/validationWidget/Appl.java similarity index 96% rename from samples/src/sample/atriasoft/ewol/sampleEntry/Appl.java rename to samples/src/sample/atriasoft/ewol/validationWidget/Appl.java index 078e291..c11ec7f 100644 --- a/samples/src/sample/atriasoft/ewol/sampleEntry/Appl.java +++ b/samples/src/sample/atriasoft/ewol/validationWidget/Appl.java @@ -1,10 +1,9 @@ -package sample.atriasoft.ewol.sampleEntry; +package sample.atriasoft.ewol.validationWidget; import org.atriasoft.etk.Configs; import org.atriasoft.etk.math.Vector2f; import org.atriasoft.ewol.context.EwolApplication; import org.atriasoft.ewol.context.EwolContext; -import org.atriasoft.ewol.widget.MainWindows; import sample.atriasoft.ewol.Log; diff --git a/samples/src/sample/atriasoft/ewol/validationWidget/Log.java b/samples/src/sample/atriasoft/ewol/validationWidget/Log.java new file mode 100644 index 0000000..eec27f1 --- /dev/null +++ b/samples/src/sample/atriasoft/ewol/validationWidget/Log.java @@ -0,0 +1,73 @@ +/** @file + * @author Edouard DUPIN + * @copyright 2021, Edouard DUPIN, all right reserved + * @license MPL v2.0 (see license file) + */ +package sample.atriasoft.ewol.validationWidget; + +import io.scenarium.logger.LogLevel; +import io.scenarium.logger.Logger; + +public class Log { + private static final String LIB_NAME = "ejson-test"; + private static final String LIB_NAME_DRAW = Logger.getDrawableName(LIB_NAME); + private static final boolean PRINT_CRITICAL = Logger.getNeedPrint(LIB_NAME, LogLevel.CRITICAL); + private static final boolean PRINT_ERROR = Logger.getNeedPrint(LIB_NAME, LogLevel.ERROR); + private static final boolean PRINT_WARNING = Logger.getNeedPrint(LIB_NAME, LogLevel.WARNING); + private static final boolean PRINT_INFO = Logger.getNeedPrint(LIB_NAME, LogLevel.INFO); + private static final boolean PRINT_DEBUG = Logger.getNeedPrint(LIB_NAME, LogLevel.DEBUG); + private static final boolean PRINT_VERBOSE = Logger.getNeedPrint(LIB_NAME, LogLevel.VERBOSE); + private static final boolean PRINT_TODO = Logger.getNeedPrint(LIB_NAME, LogLevel.TODO); + private static final boolean PRINT_PRINT = Logger.getNeedPrint(LIB_NAME, LogLevel.PRINT); + + public static void critical(final String data, final Object... objects) { + if (PRINT_CRITICAL) { + Logger.critical(LIB_NAME_DRAW, data, objects); + } + } + + public static void debug(final String data, final Object... objects) { + if (PRINT_DEBUG) { + Logger.debug(LIB_NAME_DRAW, data, objects); + } + } + + public static void error(final String data, final Object... objects) { + if (PRINT_ERROR) { + Logger.error(LIB_NAME_DRAW, data, objects); + } + } + + public static void info(final String data, final Object... objects) { + if (PRINT_INFO) { + Logger.info(LIB_NAME_DRAW, data, objects); + } + } + + public static void print(final String data, final Object... objects) { + if (PRINT_PRINT) { + Logger.print(LIB_NAME_DRAW, data, objects); + } + } + + public static void todo(final String data, final Object... objects) { + if (PRINT_TODO) { + Logger.todo(LIB_NAME_DRAW, data, objects); + } + } + + public static void verbose(final String data, final Object... objects) { + if (PRINT_VERBOSE) { + Logger.verbose(LIB_NAME_DRAW, data, objects); + } + } + + public static void warning(final String data, final Object... objects) { + if (PRINT_WARNING) { + Logger.warning(LIB_NAME_DRAW, data, objects); + } + } + + private Log() {} + +} diff --git a/samples/src/sample/atriasoft/ewol/validationWidget/MainWindows.java b/samples/src/sample/atriasoft/ewol/validationWidget/MainWindows.java new file mode 100644 index 0000000..6a01d3f --- /dev/null +++ b/samples/src/sample/atriasoft/ewol/validationWidget/MainWindows.java @@ -0,0 +1,62 @@ +package sample.atriasoft.ewol.validationWidget; + +import java.util.ArrayList; +import java.util.List; + +import org.atriasoft.ewol.widget.Composer; +import org.atriasoft.ewol.widget.Widget; + +import sample.atriasoft.ewol.BasicWindows; + +public class MainWindows extends BasicWindows { + + private int index = -1; + private final List values = new ArrayList<>(); + private final List titles = new ArrayList<>(); + + public MainWindows() { + setPropertyTitle("Test all compositing"); + + this.titles.add("test Entry"); + this.values.add(""" + + """); + + this.titles.add("test button"); + this.values.add(""" + + """); + + this.titles.add("test button toogle"); + this.values.add(""" + + """); + this.titles.add("test checkBox"); + this.values.add(""" + + + """); + // set first item + requestNext(); + } + + @Override + public void requestNext() { + System.out.print("Request change !!!!"); + this.index++; + setPropertyTitle(this.titles.get(this.index)); + + final String dataString = this.values.get(this.index); + final Widget data = Composer.composerGenerateString(dataString); + this.setTestWidget(data); + } +} diff --git a/samples/src/sample/atriasoft/ewol/sampleButton/SampleButtonMain.java b/samples/src/sample/atriasoft/ewol/validationWidget/ValidatorMain.java similarity index 72% rename from samples/src/sample/atriasoft/ewol/sampleButton/SampleButtonMain.java rename to samples/src/sample/atriasoft/ewol/validationWidget/ValidatorMain.java index 39bbb8b..ccbecd1 100644 --- a/samples/src/sample/atriasoft/ewol/sampleButton/SampleButtonMain.java +++ b/samples/src/sample/atriasoft/ewol/validationWidget/ValidatorMain.java @@ -1,9 +1,9 @@ -package sample.atriasoft.ewol.sampleButton; +package sample.atriasoft.ewol.validationWidget; import org.atriasoft.etk.Uri; import org.atriasoft.ewol.Ewol; -public class SampleButtonMain { +public class ValidatorMain { public static void main(final String[] args) { Ewol.init(); //Uri.addLibrary("ne", MainCollisionTest.class, "testDataLoxelEngine/"); @@ -11,5 +11,5 @@ public class SampleButtonMain { Ewol.run(new Appl(), args); } - private SampleButtonMain() {} + private ValidatorMain() {} } diff --git a/src/org/atriasoft/ewol/context/EwolContext.java b/src/org/atriasoft/ewol/context/EwolContext.java index bbc3092..bafec6f 100644 --- a/src/org/atriasoft/ewol/context/EwolContext.java +++ b/src/org/atriasoft/ewol/context/EwolContext.java @@ -301,7 +301,6 @@ public class EwolContext extends GaleApplication { @Override public void onPointer(final KeySpecial special, final KeyType type, final int pointerID, final Vector2f pos, final KeyStatus state) { - // TODO: WTF !!! this.input.setLastKeyboardSpecial(special); switch (state) { case move: diff --git a/src/org/atriasoft/ewol/widget/CheckBox.java b/src/org/atriasoft/ewol/widget/CheckBox.java index 695b958..fb789a7 100644 --- a/src/org/atriasoft/ewol/widget/CheckBox.java +++ b/src/org/atriasoft/ewol/widget/CheckBox.java @@ -1,11 +1,10 @@ package org.atriasoft.ewol.widget; +import org.atriasoft.aknot.annotation.AknotAttribute; import org.atriasoft.aknot.annotation.AknotDescription; import org.atriasoft.aknot.annotation.AknotManaged; import org.atriasoft.aknot.annotation.AknotName; import org.atriasoft.aknot.annotation.AknotSignal; -import org.atriasoft.aknot.annotation.AknotAttribute; -import org.atriasoft.aknot.annotation.AknotText; import org.atriasoft.esignal.Signal; import org.atriasoft.esignal.SignalEmpty; import org.atriasoft.etk.math.Vector3b; @@ -83,7 +82,8 @@ public class CheckBox extends Container { } @AknotManaged - @AknotText + //@AknotText + @AknotAttribute @AknotName(value = "label") @AknotDescription(value = "value of the label") public String getPropertyLabel() { diff --git a/src/org/atriasoft/ewol/widget/Composer.java b/src/org/atriasoft/ewol/widget/Composer.java index 9ca8d2c..c271f94 100644 --- a/src/org/atriasoft/ewol/widget/Composer.java +++ b/src/org/atriasoft/ewol/widget/Composer.java @@ -1,12 +1,13 @@ package org.atriasoft.ewol.widget; -import org.atriasoft.aknot.annotation.AknotAttribute; -import org.atriasoft.aknot.annotation.AknotDescription; /** * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved * @license MPL v2.0 (see license file) */ + +import org.atriasoft.aknot.annotation.AknotAttribute; +import org.atriasoft.aknot.annotation.AknotDescription; import org.atriasoft.aknot.annotation.AknotManaged; import org.atriasoft.aknot.annotation.AknotName; import org.atriasoft.aknot.exception.AknotException; @@ -18,7 +19,7 @@ import org.atriasoft.ewol.DrawProperty; import org.atriasoft.ewol.Gravity; import org.atriasoft.ewol.internal.Log; import org.atriasoft.ewol.object.EwolObject; -import org.atriasoft.exml.Exml; +import org.atriasoft.exml.XmlMapper; import org.atriasoft.exml.exception.ExmlException; import org.atriasoft.gale.context.ClipboardList; import org.atriasoft.gale.context.Cursor; @@ -58,13 +59,11 @@ public class Composer extends Container { requestComposer = false; } data = data.replace("{ID}", Long.toString(id)); - Composer[] result = null; + Composer result = null; + final XmlMapper mapper = new XmlMapper(); try { - result = Exml.parse(data, Composer.class, "Composer");//new WidgetXmlFactory()); - } catch (final ExmlException ex) { - Log.error("Fail to load Data !!! {}", ex.toString()); - ex.printStackTrace(); - } catch (final AknotException ex) { + result = mapper.parse(data, Composer.class);//new WidgetXmlFactory()); + } catch (final ExmlException | AknotException ex) { Log.error("Fail to load Data !!! {}", ex.toString()); ex.printStackTrace(); } @@ -72,9 +71,9 @@ public class Composer extends Container { return null; } if (requestComposer) { - return result[0]; + return result; } - return result[0].getSubWidget(); + return result.getSubWidget(); } protected boolean propertyRemoveIfUnderRemove; //!< Remove the composer if sub element request a remove diff --git a/src/org/atriasoft/ewol/widget/Spin.java b/src/org/atriasoft/ewol/widget/Spin.java index 38f0ee7..2832d75 100644 --- a/src/org/atriasoft/ewol/widget/Spin.java +++ b/src/org/atriasoft/ewol/widget/Spin.java @@ -49,7 +49,6 @@ public class Spin extends SpinBase { public void checkValue(long value) { value = FMath.clamp(this.propertyMin, value, this.propertyMax); this.propertyValue = value; - // TODO: manage the mantis ... this.widgetEntry.setPropertyValue(Long.toString(value)); this.signalValue.emit(this.propertyValue); } @@ -57,10 +56,8 @@ public class Spin extends SpinBase { public void connectGui() { Log.warning("updateGui [START]"); super.updateGui(); - if (this.widgetEntry != null && !this.connectionEntry.isConnected()) { this.connectionEntry = this.widgetEntry.signalModify.connect(this, Spin::onCallbackModify); - // TODO: set a regExp Filter } if (this.widgetButtonUp != null && !this.connectionButtonUp.isConnected()) { this.connectionButtonUp = this.widgetButtonUp.signalValue.connect(this, Spin::onCallbackUp);