- Fixed the prototype problem of dir_copy() in File::Access

- Added some notes about the problems of the feature of copying a whole
  directory
- Added some notes about my incompetence
- In the edit dialogue, there is a new checkbox allowing to continue editing the
  file after saving it

diff --git a/modules/Command.pm b/modules/Command.pm
index 5105c3bac96f4401773f28d98e4fa22008c48908..d779a6cd98db285acbb766f76d0bd375be1e2029 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,7 +6,7 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2005-07-06
+# Last modified: 2005-08-01

 #
 
 use strict;
 #
 
 use strict;


@@ -409,7 +409,9 @@ sub exec_endedit($$)
     print FILE $content;
    }
 
     print FILE $content;
    }
 

-   $output = devedit_reload({command => 'show', file => $dir});
+   $output = ($cgi->param('continue'))
+           ? devedit_reload({command => 'beginedit', file => $virtual})
+           : devedit_reload({command => 'show', file => $dir});

   }
 
   close(FILE);
   }
 
   close(FILE);

diff --git a/modules/File/Access.pm b/modules/File/Access.pm
index e0f4e557e91163d12b252c85365567e9ea09e5f8..248eb35ee852473a87b8286058e8a7f687794568 100644 (file)
--- a/modules/File/Access.pm
+++ b/modules/File/Access.pm
@@ -7,7 +7,7 @@ package File::Access;
 # using only one command
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # using only one command
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2005-07-05
+# Last modified: 2005-08-01

 #
 
 use strict;
 #
 
 use strict;


@@ -41,6 +41,10 @@ use base qw(Exporter);
 
 $has_flock = eval { local $SIG{'__DIE__'}; flock(STDOUT,0); 1 };
 
 
 $has_flock = eval { local $SIG{'__DIE__'}; flock(STDOUT,0); 1 };
 

+# Predeclaration of dir_copy()
+
+sub dir_copy($$);
+

 # dir_copy()
 #
 # Copy a directory
 # dir_copy()
 #
 # Copy a directory

diff --git a/templates/copydir.htm b/templates/copydir.htm
index b0d495d9a0a13fb7b95a3c40c6650104f7763d69..f98f63bb030a37f6ce631ac15e4578f02b559665 100644 (file)
--- a/templates/copydir.htm
+++ b/templates/copydir.htm
@@ -26,8 +26,12 @@
 <p><input type="submit" value="Copy directory!"></p>
 </form>
 
 <p><input type="submit" value="Copy directory!"></p>
 </form>
 

-<p><b>Note:</b><br>
-The target you want this directory to copy to must not exist!</p>
+<p><b>Important notes:</b></p>
+
+<ul>
+<li>The target you want this directory to copy to <b>must not</b> exist!</li>
+<li>Please make sure that all your files were copied correctly. Due to problems concerning the architecture of Dev-Editor, a check of this is currently impossible. And by the way, you are absolutely right if you think now that I'm a very lousy and incompetent programmer.</li>
+</ul>

 
 <hr>
 
 
 <hr>
 

diff --git a/templates/editfile.htm b/templates/editfile.htm
index a14b7fbbc92599783dd7f0abfd870bea5842a1c7..263b91e35ed091353473fd8def2dc28bc2bd88aa 100644 (file)
--- a/templates/editfile.htm
+++ b/templates/editfile.htm
@@ -23,7 +23,8 @@
 
 <p><textarea name="filecontent" rows="25" cols="120">{CONTENT}</textarea></p>
 
 
 <p><textarea name="filecontent" rows="25" cols="120">{CONTENT}</textarea></p>
 

-<p><input type="checkbox" name="saveas" id="newfile" value="1"><label for="newfile">Save as new file: {DIR} </label><input type="text" name="newfile" value="" onchange="if(this.form.newfile.value != '') this.form.saveas.checked = true; else this.form.saveas.checked = false;"></p>
+<p><input type="checkbox" name="saveas" id="newfile" value="1"><label for="newfile">Save as new file: {DIR} </label><input type="text" name="newfile" value="" onchange="if(this.form.newfile.value != '') this.form.saveas.checked = true; else this.form.saveas.checked = false;"><br>
+<input type="checkbox" name="continue" id="continue" value="1"><label for="continue">Save file and continue editing</label></p>

 
 <p><input type="submit" value="Save file"> <input type="reset" value="Discard changes"></p>
 </form>
 
 <p><input type="submit" value="Save file"> <input type="reset" value="Discard changes"></p>
 </form>