root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0

Browse Source 
Files correlati     : bagn006.msk ba0 ve0
Ricompilazione Demo : [ ]
Commento            :
Corretta gestione maschera proprieta' colori
Allargato sheet oggetti collegati


git-svn-id: svn://10.65.10.50/trunk@18767 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2009-04-22 13:33:07 +00:00
parent 096949519e
commit f4028dbd31
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/bagn006.uml
View File

@ -3,45 +3,44 @@
TOOLBAR "" 0 0 0 2 TOOLBAR "" 0 0 0 2
BUTTON DLG_OK 10 2 BUTTON DLG_OK
BEGIN BEGIN
PROMPT -15 -1 "" PROMPT -15 -1 ""
END END
BUTTON F_NEWREC 10 2 BUTTON F_NEWREC
BEGIN BEGIN
PROMPT -25 -1 "~Nuovo" PROMPT -25 -1 "~Nuovo"
PICTURE TOOL_NEWREC PICTURE TOOL_NEWREC
END END
BUTTON F_LINK 10 2 BUTTON F_LINK
BEGIN BEGIN
PROMPT -35 -1 "~Edit" PROMPT -35 -1 "~Edit"
PICTURE TOOL_EDIT PICTURE TOOL_EDIT
END END
BUTTON F_PRINT 10 2 BUTTON F_PRINT
BEGIN BEGIN
PROMPT -45 -1 "Stampa" PROMPT -45 -1 "Stampa"
PICTURE TOOL_PRINT PICTURE TOOL_PRINT
END END
BUTTON DLG_CANCEL 10 2 BUTTON DLG_CANCEL
BEGIN BEGIN
PROMPT -55 -1 "" PROMPT -55 -1 ""
END END
ENDPAGE ENDPAGE
PAGE "Oggetti esterni" 0 2 0 0 PAGE "Oggetti esterni" 0 2 0 0
SPREADSHEET F_SHEET 78 SPREADSHEET F_SHEET
BEGIN BEGIN
PROMPT 1 4 "Lista" PROMPT 0 4 "Lista"
ITEM "File@35" ITEM "File@60"
ITEM "Nome@20" ITEM "Nome@32"
ITEM "Collegamento" ITEM "Link"
END END
ENDPAGE ENDPAGE
@ -50,7 +49,7 @@ ENDMASK
PAGE "Oggetto esterno" -1 -1 60 4 PAGE "Oggetto esterno" -1 -1 60 4
STRING S_FILE 256 50 STRING S_FILE 260 50
BEGIN BEGIN
PROMPT 1 1 "File " PROMPT 1 1 "File "
FLAGS "B" FLAGS "B"
@ -71,36 +70,36 @@ ENDPAGE
TOOLBAR "topbar" 0 0 0 2 TOOLBAR "topbar" 0 0 0 2
BUTTON DLG_OK 10 2 BUTTON DLG_OK
BEGIN BEGIN
PROMPT -16 -1 "" PROMPT -16 -1 ""
END END
BUTTON F_NEWREC 10 2 BUTTON F_NEWREC
BEGIN BEGIN
PROMPT -26 -1 "~Nuovo" PROMPT -26 -1 "~Nuovo"
PICTURE TOOL_NEWREC PICTURE TOOL_NEWREC
END END
BUTTON F_LINK 10 2 BUTTON F_LINK
BEGIN BEGIN
PROMPT -36 -1 "~Edit" PROMPT -36 -1 "~Edit"
PICTURE TOOL_EDIT PICTURE TOOL_EDIT
END END
BUTTON DLG_DELREC 10 2 BUTTON DLG_DELREC
BEGIN BEGIN
PROMPT -46 -1 "" PROMPT -46 -1 ""
PICTURE TOOL_DELREC PICTURE TOOL_DELREC
END END
BUTTON F_PRINT 10 2 BUTTON F_PRINT
BEGIN BEGIN
PROMPT -56 -1 "Stampa" PROMPT -56 -1 "Stampa"
PICTURE TOOL_PRINT PICTURE TOOL_PRINT
END END
BUTTON DLG_CANCEL 10 2 BUTTON DLG_CANCEL
BEGIN BEGIN
PROMPT -66 -1 "" PROMPT -66 -1 ""
END END

3
include/config.cpp
View File

@ -1,5 +1,3 @@
#include <time.h>
#include <applicat.h> #include <applicat.h>
#include <colors.h> #include <colors.h>
#include <config.h> #include <config.h>
@ -762,6 +760,7 @@ static void cfg2file(int which_config, TFilename& file)
file.add(u); file.add(u);
file.ext("ini"); file.ext("ini");
} }
break;
default: default:
break; break;
} }

5
include/golem.cpp
View File

@ -83,7 +83,6 @@ protected:
public: public:
TGolem_mask(); TGolem_mask();
virtual ~TGolem_mask() { }
}; };
bool TGolem_mask::file_handler(TMask_field& f, KEY k) bool TGolem_mask::file_handler(TMask_field& f, KEY k)
@ -415,7 +414,7 @@ bool TGolem_field::autosave(TRelation& r)
golem_path.compare(old_file, golem_path.len(), true) == 0; golem_path.compare(old_file, golem_path.len(), true) == 0;
const bool tobe_stored = new_row.get_char(2) <= ' '; const bool tobe_stored = new_row.get_char(2) <= ' ';
if (was_stored && fexist(old_file)) if (was_stored && fexist(old_file))
::remove(old_file); old_file.fremove();
if (tobe_stored && !new_file.blank()) if (tobe_stored && !new_file.blank())
{ {
char ext[_MAX_EXT]; char ext[_MAX_EXT];
@ -429,7 +428,7 @@ bool TGolem_field::autosave(TRelation& r)
// Cancella il file originale se temporaneo // Cancella il file originale se temporaneo
TFilename tmp; tmp.tempdir(); TFilename tmp; tmp.tempdir();
if (tmp.compare(new_file, tmp.len(), true) == 0) if (tmp.compare(new_file, tmp.len(), true) == 0)
::remove(new_file); new_file.fremove();
} }
} }
} }