mirrors/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Completed a previous commit, especially to web form library (WSF_FORM).

Browse Source 
Updated EiffelStudio wizard.
This commit is contained in:
Jocelyn FIAT
2020-10-02 15:29:20 +02:00
parent c0de4a5bf7
commit 37644e66bb
28 changed files with 391 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/estudio_wizard/console_wizard.ecf
View File

@@ -7,7 +7,10 @@
<exclude>/\.git$</exclude>
<exclude>/\.svn$</exclude>
</file_rule>
<option warning="true">
</option>
<setting name="console_application" value="true"/>
<setting name="dead_code_removal" value="all"/>
<capability>
<concurrency support="none" use="none"/>
</capability>

4
tools/estudio_wizard/lib/wizard/console/console_wizard_application.e
View File

@@ -1,5 +1,5 @@
note
description: "Console wizard."
author: "$Author$"
date: "$Date$"
revision: "$Revision$"
@@ -301,7 +301,7 @@ feature {NONE} -- Implementation
if
a_required_valid_option and then
a_options /= Void and then
not across a_options as o some attached o.item.value as v and then Result.same_string (v) end
not across a_options as o some attached o.item.value as v and then Result.same_string_general (v) end
then
l_answered := False
Result := Void

4
tools/estudio_wizard/lib/wizard/console/console_wizard_page.e
View File

@@ -1,6 +1,4 @@
note
description: "Summary description for {CONSOLE_WIZARD_PAGE}."
author: ""
date: "$Date$"
revision: "$Revision$"
@@ -13,7 +11,7 @@ inherit
create
make
feature {WIZARD, WIZARD_ENGINE, WIZARD_PAGE} -- Implementation
feature {WIZARD, WIZARD_PAGE} -- Implementation
reuse
do

16
tools/estudio_wizard/lib/wizard/core/wizard_application.e
View File

@@ -33,6 +33,7 @@ feature {NONE} -- Initialization
if s.same_string_general ("-callback") or s.same_string_general ("--callback") then
i := i + 1
if i <= n then
s := args.argument (i)
create callback_file_name.make_from_string (s)
end
elseif wizard_directory_name = Void then
@@ -114,13 +115,14 @@ feature -- Helpers
Result := a_folder.extended (a_name)
ok := not ut.directory_path_exists (Result)
p := Result
if not ok then
if attached p.extension as ext then
l_ext := ext
l_name := p.name
l_name.remove_head (ext.count + 1)
create p.make_from_string (l_name)
end
if
not ok and then
attached p.extension as ext
then
l_ext := ext
l_name := p.name
l_name.remove_head (ext.count + 1)
create p.make_from_string (l_name)
end
until
ok

18
tools/estudio_wizard/lib/wizard/core/wizard_generator.e
View File

@@ -51,11 +51,8 @@ feature -- Response
feature -- Factory
new_uuid: STRING_8
local
gen: UUID_GENERATOR
do
create gen
Result := gen.generate_uuid.out
Result := {UUID_GENERATOR}.generate_uuid.out
end
feature -- Operations
@@ -98,19 +95,17 @@ feature -- Templates
recursive_copy_templates (a_src: PATH; a_target: PATH)
local
d,td, subdir: DIRECTORY
d, subdir: DIRECTORY
p, ip, tp: PATH
do
create d.make_with_path (a_src)
if d.exists and then d.is_readable then
create td.make_with_path (a_target)
td.recursive_create_dir
;(create {DIRECTORY}.make_with_path (a_target)).recursive_create_dir
across
d.entries as ic
loop
p := ic.item
if p.is_parent_symbol or p.is_current_symbol then
else
if not p.is_parent_symbol and not p.is_current_symbol then
ip := a_src.extended_path (p)
create subdir.make_with_path (ip)
tp := a_target.extended_path (resolved_path_name (p))
@@ -133,7 +128,6 @@ feature -- Templates
a_src_is_a_template_file: is_template_file (a_src)
local
f,t: PLAIN_TEXT_FILE
line: READABLE_STRING_8
do
create f.make_with_path (a_src)
if f.exists and f.is_readable then
@@ -146,8 +140,7 @@ feature -- Templates
until
f.exhausted
loop
line := f.last_string
t.put_string (resolved_string_8 (line))
t.put_string (resolved_string_8 (f.last_string))
t.put_new_line
f.read_line
end
@@ -177,7 +170,6 @@ feature -- Resolvers
from
i := 1
n := s.count
q := 0
until
i > n
loop

11
tools/estudio_wizard/lib/wizard/gui/graphical_wizard_application.e
View File

@@ -1,8 +1,7 @@
note
description : "Objects that ..."
author : "$Author$"
date : "$Date$"
revision : "$Revision$"
author: "$Author$"
date: "$Date$"
revision: "$Revision$"
deferred class
GRAPHICAL_WIZARD_APPLICATION
@@ -53,8 +52,6 @@ feature {NONE} -- Widget
feature -- Factory
new_page (a_page_id: READABLE_STRING_8): GRAPHICAL_WIZARD_PAGE
local
lab: EV_LABEL
do
create Result.make (a_page_id)
end
@@ -89,7 +86,6 @@ feature {NONE} -- Implementation: UI
hb,hb2: EV_HORIZONTAL_BOX
mb, vb, headerb: EV_VERTICAL_BOX
lab: EV_LABEL
but: EV_BUTTON
cl: EV_CELL
fr: detachable EV_FRAME
do
@@ -182,7 +178,6 @@ feature {NONE} -- Implementation: UI
mb.extend (fr)
mb.disable_item_expand (fr)
fr := Void
end
-- ./Text part

13
tools/estudio_wizard/lib/wizard/gui/graphical_wizard_page.e
View File

@@ -1,6 +1,4 @@
note
description: "Summary description for {GRAPHICAL_WIZARD_PAGE}."
author: ""
date: "$Date$"
revision: "$Revision$"
@@ -20,7 +18,7 @@ inherit
create
make
feature {WIZARD, WIZARD_ENGINE, WIZARD_PAGE} -- Implementation
feature {WIZARD, WIZARD_PAGE} -- Implementation
reuse
do
@@ -95,10 +93,11 @@ feature {NONE} -- Implementation
unparent (i: WIZARD_PAGE_ITEM)
do
if attached {GRAPHICAL_WIZARD_PAGE_ITEM} i as gpi then
if attached gpi.widget.parent as l_parent then
l_parent.prune (gpi.widget)
end
if
attached {GRAPHICAL_WIZARD_PAGE_ITEM} i as gpi and then
attached gpi.widget.parent as l_parent
then
l_parent.prune (gpi.widget)
end
end

10
tools/estudio_wizard/lib/wizard/gui/graphical_wizard_styler.e
View File

@@ -1,6 +1,4 @@
note
description: "Summary description for {GRAPHICAL_WIZARD_STYLER}."
author: ""
date: "$Date$"
revision: "$Revision$"
@@ -42,9 +40,7 @@ feature -- Style
lab.align_text_top
end
end
if attached {EV_COLORIZABLE} w as l_colorizable then
l_colorizable.set_foreground_color (colors.black)
end
w.set_foreground_color (colors.black)
if attached {EV_FONTABLE} w as l_fontable then
l_fontable.set_font (text_font)
end
@@ -82,9 +78,7 @@ feature -- Style
apply_field_description_style (w: EV_WIDGET)
do
apply_text_style (w)
if attached {EV_COLORIZABLE} w as l_colorizable then
l_colorizable.set_foreground_color (colors.dark_gray)
end
w.set_foreground_color (colors.dark_gray)
if attached {EV_FONTABLE} w as l_fontable then
l_fontable.set_font (field_description_font)
end

8
tools/estudio_wizard/lib/wizard/gui/items/graphical_wizard_directory_question.e
View File

@@ -66,7 +66,7 @@ feature -- Conversion
text: STRING_32
do
Result := input_widget.text
Result := input_widget.file_path.name
end
value: detachable PATH
@@ -92,11 +92,7 @@ feature -- Element change
set_value (p: like value)
do
if p = Void then
input_widget.set_text ("")
else
input_widget.set_text (p.name)
end
input_widget.set_file_path (if attached p then p else create {PATH}.make_empty end)
end
end

4
tools/estudio_wizard/lib/wizard/gui/items/graphical_wizard_integer_question.e
View File

@@ -1,6 +1,4 @@
note
description: "Summary description for {GRAPHICAL_WIZARD_INTEGER_QUESTION}."
author: ""
date: "$Date$"
revision: "$Revision$"
@@ -94,8 +92,6 @@ feature -- Element change
set_value (0)
elseif t.is_integer then
set_value (t.to_integer)
else
-- ignore !
end
end

3
tools/estudio_wizard/lib/wizard/gui/items/graphical_wizard_question.e
View File

@@ -1,6 +1,4 @@
note
description: "Summary description for {GRAPHICAL_WIZARD_QUESTION}."
author: ""
date: "$Date$"
revision: "$Revision$"
@@ -41,7 +39,6 @@ feature {NONE} -- Implementation
append_indented_widget (w: EV_WIDGET; a_container: EV_BOX)
local
lab: EV_LABEL
hb: EV_HORIZONTAL_BOX
do
create hb

20
tools/estudio_wizard/rootdir/resources/${APP_NAME}.ecf
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="{$WIZ.project.name/}" uuid="{$UUID/}">
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-18-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-18-0 http://www.eiffel.com/developers/xml/configuration-1-18-0.xsd" name="{$WIZ.project.name/}" uuid="{$UUID/}">
<target name="common" abstract="true">
<file_rule>
<exclude>/EIFGENs$</exclude>
@@ -9,15 +9,15 @@
<option warning="true">
<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
</option>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
</target>
<target name="{$WIZ.project.name/}_any" extends="common">
<root class="{$APP_ROOT/}" feature="make_and_launch"/>
{if condition="$WIZ.connectors.use_standalone ~ $WIZ_YES"}<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone-safe.ecf"/>{/if}
{if condition="$WIZ.connectors.use_cgi ~ $WIZ_YES"}<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi-safe.ecf"/>{/if}
{if condition="$WIZ.connectors.use_libfcgi ~ $WIZ_YES"}<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi-safe.ecf"/>{/if}
{if condition="$WIZ.connectors.use_standalone ~ $WIZ_YES"}<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone.ecf"/>{/if}
{if condition="$WIZ.connectors.use_cgi ~ $WIZ_YES"}<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi.ecf"/>{/if}
{if condition="$WIZ.connectors.use_libfcgi ~ $WIZ_YES"}<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi.ecf"/>{/if}
<cluster name="launcher" location=".\launcher\">
<cluster name="any_launcher" location="$|any"/>
</cluster>
@@ -27,7 +27,7 @@
<target name="{$WIZ.project.name/}_standalone" extends="common">
<root class="{$APP_ROOT/}" feature="make_and_launch"/>
<variable name="httpd_ssl_disabled" value="true"/><!-- for now ... due to issue with libcurl+eiffelnet ssl -->
<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone.ecf"/>
<cluster name="launcher" location=".\launcher\">
<cluster name="default_launcher" location="$|default"/>
</cluster>
@@ -39,7 +39,7 @@
<capability>
<concurrency use="none" />
</capability>
<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi.ecf"/>
<cluster name="launcher" location=".\launcher\">
<cluster name="default_launcher" location="$|default"/>
</cluster>
@@ -51,7 +51,7 @@
<capability>
<concurrency use="none" />
</capability>
<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi.ecf"/>
<cluster name="launcher" location=".\launcher\">
<cluster name="default_launcher" location="$|default"/>
</cluster>