[SCM] applications.git branch, master, updated. 8787f7e22622c1b40c26212a7f5195ae4fd13f07
Benoit Sonntag
sonntag at icps.u-strasbg.fr
Fri Nov 20 22:38:55 UTC 2009
The following commit has been merged in the master branch:
commit 8787f7e22622c1b40c26212a7f5195ae4fd13f07
Author: Benoit Sonntag <sonntag at icps.u-strasbg.fr>
Date: Fri Nov 20 23:38:33 2009 +0100
draw example ok
diff --git a/examples/standard/gui/draw/TravCUT/.bct b/examples/standard/gui/draw/TravCUT/.bct
deleted file mode 100644
index 7f4a408..0000000
Binary files a/examples/standard/gui/draw/TravCUT/.bct and /dev/null differ
diff --git a/examples/standard/gui/draw/TravCUT/BASDESTAMfleche.bct b/examples/standard/gui/draw/TravCUT/BASDESTAMfleche.bct
new file mode 100644
index 0000000..02bd3f2
Binary files /dev/null and b/examples/standard/gui/draw/TravCUT/BASDESTAMfleche.bct differ
diff --git a/examples/standard/gui/draw/TravCUT/BASDESTAMlogo.bct b/examples/standard/gui/draw/TravCUT/BASDESTAMlogo.bct
new file mode 100644
index 0000000..7fa4781
Binary files /dev/null and b/examples/standard/gui/draw/TravCUT/BASDESTAMlogo.bct differ
diff --git a/examples/standard/gui/draw/TravCUT/JACADIvitrTrav.BCT b/examples/standard/gui/draw/TravCUT/JACADIvitrTrav.BCT
new file mode 100644
index 0000000..7f15634
Binary files /dev/null and b/examples/standard/gui/draw/TravCUT/JACADIvitrTrav.BCT differ
diff --git a/examples/standard/gui/draw/TravCUT/KANGOU jaune.bct b/examples/standard/gui/draw/TravCUT/KANGOU jaune.bct
new file mode 100644
index 0000000..d5acec0
Binary files /dev/null and b/examples/standard/gui/draw/TravCUT/KANGOU jaune.bct differ
diff --git a/examples/standard/gui/draw/TravCUT/KERMESSbanderole.bct b/examples/standard/gui/draw/TravCUT/KERMESSbanderole.bct
new file mode 100644
index 0000000..049acad
Binary files /dev/null and b/examples/standard/gui/draw/TravCUT/KERMESSbanderole.bct differ
diff --git a/examples/standard/gui/draw/TravCUT/MauriceMOTO.bct b/examples/standard/gui/draw/TravCUT/MauriceMOTO.bct
new file mode 100644
index 0000000..b34ab2b
Binary files /dev/null and b/examples/standard/gui/draw/TravCUT/MauriceMOTO.bct differ
diff --git a/examples/standard/gui/draw/TravCUT/SIGNAT.BCT b/examples/standard/gui/draw/TravCUT/SIGNAT.BCT
new file mode 100644
index 0000000..485c228
Binary files /dev/null and b/examples/standard/gui/draw/TravCUT/SIGNAT.BCT differ
diff --git a/examples/standard/gui/draw/TravCUT/SIGNATUREvinyl.bct b/examples/standard/gui/draw/TravCUT/SIGNATUREvinyl.bct
new file mode 100644
index 0000000..dd268ef
Binary files /dev/null and b/examples/standard/gui/draw/TravCUT/SIGNATUREvinyl.bct differ
diff --git a/examples/standard/gui/draw/example.li b/examples/standard/gui/draw/example.li
index aec5573..347d90c 100644
--- a/examples/standard/gui/draw/example.li
+++ b/examples/standard/gui/draw/example.li
@@ -56,13 +56,17 @@ Section Private
+ new_dir:{G_BUTTON; };
+ background:G_RAW;
+ directory:DIRECTORY;
-
+ - select_static:{ABSTRACT_STRING; };
+ - typ_static:ABSTRACT_STRING;
+ select_static := select;
+ typ_static := typ;
+
new_dir := { b:G_BUTTON;
+ name:G_OUT;
name ?= b.root;
path.text.keep_head (path.text.fast_last_index_of '/');
path.text.append (name.text);
- scan_directory_filter typ action_select select
+ scan_directory_filter typ_static action_select select_static
directory_widget dir_w file_widget fil_w path_widget path;
};
@@ -76,7 +80,6 @@ Section Private
path.text.copy (directory.path);
path.text.add_last '/';
path.refresh;
- /*
dir := G_BUTTON.create (G_OUT.create "..") action new_dir;
(directory.lower).to (directory.upper) do { j:INTEGER;
entry := directory.item j;
@@ -90,7 +93,7 @@ Section Private
path.text.keep_head (path.text.fast_last_index_of '/');
path.text.append (name.text);
path.refresh;
- select.value (path.text);
+ select_static.value (path.text);
};
(file = NULL).if {
file := bt;
@@ -110,7 +113,6 @@ Section Private
background.make (file.fix_height);
dir_w.refresh_in;
fil_w.refresh_in;
- */
);
Section Public
@@ -121,6 +123,8 @@ Section Public
action_select select:{ABSTRACT_STRING; } action_ok ok:{ABSTRACT_STRING; } <-
( + win:G_WIN_OUT;
+ body:G_EXPR;
+ - ok_static:{ABSTRACT_STRING; };
+ ok_static := ok;
dir_w := G_WIN_IN.create (160,240) with (G_RAW.create (G_OUT.create ""));
fil_w := G_WIN_IN.create (160,240) with (G_RAW.create (G_OUT.create ""));
@@ -148,7 +152,7 @@ Section Public
+ p:G_WIN_OUT;
p ?= b.parent;
p.close;
- ok.value (path.text);
+ ok_static.value (path.text);
} |
G_BUTTON.create (G_OUT.create "Cancel" justify (G_OUT.center)) action { b:G_BUTTON;
+ p:G_WIN_OUT;
@@ -161,6 +165,7 @@ Section Public
};
win := G_WIN_OUT.create "Open" with body;
win.open_by DESK;
+
scan_directory_filter suffix action_select select directory_widget dir_w
file_widget fil_w path_widget path;
);
@@ -195,7 +200,7 @@ Section Public
VIDEO.make_size (800,600);
action_not_yet_implemented := { bt:G_BUTTON;
- /*+ w:G_WIN_OUT;
+ + w:G_WIN_OUT;
+ g:AREA;
g := bt.parent;
@@ -207,7 +212,7 @@ Section Public
w.close;
};
message_not_yet_implemented;
- */
+
};
// Align Window :
@@ -264,19 +269,17 @@ Section Public
e := FILE_SYSTEM.get_entry name;
(e = NULL).if {
"Error file!\n".print;
- } else {
- f ?= e.open;
- (f = NULL).if {
+ } else {
+ (! e.open).if {
"Error open\n".print;
} else {
- /*
+ f ?= e;
(FORMAT_BCT.load f).if {
f.close;
page.refresh;
} else {
"Error format\n".print;
};
- */
};
};
};
diff --git a/examples/standard/gui/transparent/photo.bmp b/examples/standard/gui/transparent/photo.bmp
index 24f4a9f..972c344 100644
Binary files a/examples/standard/gui/transparent/photo.bmp and b/examples/standard/gui/transparent/photo.bmp differ
--
applications.git
More information about the Lisaac-commits
mailing list