diff --git a/include/bagn006.h b/include/bagn006.h index 5f54283b0..8b2837922 100755 --- a/include/bagn006.h +++ b/include/bagn006.h @@ -1,6 +1,7 @@ #define F_NEWREC 201 #define F_LINK 202 #define F_PRINT 203 +#define F_DELREC 204 #define F_SHEET 300 #define S_FILE 101 diff --git a/include/bagn006.uml b/include/bagn006.uml index 63bafc4fe..ed3c16e5e 100755 --- a/include/bagn006.uml +++ b/include/bagn006.uml @@ -1,4 +1,45 @@ #include +//maschera dei collegamenti ad oggetti esterni + +TOOLBAR "" 0 -3 0 3 + +BUTTON DLG_OK 10 2 +BEGIN + PROMPT -16 -1 "" +END + +BUTTON F_NEWREC 10 2 +BEGIN + PROMPT -26 -1 "" + PICTURE BMP_NEWREC +END + +BUTTON F_LINK 10 2 +BEGIN + PROMPT -36 -1 "~Edit" + PICTURE BMP_EDIT +END + +BUTTON F_DELREC 10 2 +BEGIN + PROMPT -46 -1 "" + PICTURE BMP_DELREC + PICTURE BMP_DELRECDN +END + +BUTTON F_PRINT 10 2 +BEGIN + PROMPT -56 -1 "" + PICTURE BMP_PRINT +END + +BUTTON DLG_CANCEL 10 2 +BEGIN + PROMPT -66 -1 "" +END + +ENDPAGE + PAGE "Oggetti esterni" -1, -1, 76, 16 @@ -10,39 +51,11 @@ BEGIN ITEM "Collegamento" END -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -15 -1 "" -END - -BUTTON F_NEWREC 10 2 -BEGIN - PROMPT -25 -1 "" - PICTURE BMP_NEWREC -END - -BUTTON F_LINK 10 2 -BEGIN - PROMPT -35 -1 "~Edit" - PICTURE BMP_EDIT -END - -BUTTON F_PRINT 10 2 -BEGIN - PROMPT -45 -1 "" - PICTURE BMP_PRINT -END - -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -55 -1 "" -END - ENDPAGE ENDMASK -PAGE "Oggetto esterno" -1, -1, 60, 6 +PAGE "Oggetto esterno" -1, -1, 76, 6 STRING S_FILE 256 50 BEGIN @@ -63,30 +76,37 @@ END BUTTON DLG_OK 10 2 BEGIN - PROMPT -15 -1 "" + PROMPT -16 -1 "" END BUTTON F_NEWREC 10 2 BEGIN - PROMPT -25 -1 "" + PROMPT -26 -1 "" PICTURE BMP_NEWREC END BUTTON F_LINK 10 2 BEGIN - PROMPT -35 -1 "~Edit" + PROMPT -36 -1 "~Edit" PICTURE BMP_EDIT END +BUTTON F_DELREC 10 2 +BEGIN + PROMPT -46 -1 "" + PICTURE BMP_DELREC + PICTURE BMP_DELRECDN +END + BUTTON F_PRINT 10 2 BEGIN - PROMPT -45 -1 "" + PROMPT -56 -1 "" PICTURE BMP_PRINT END BUTTON DLG_CANCEL 10 2 BEGIN - PROMPT -55 -1 "" + PROMPT -66 -1 "" END ENDPAGE diff --git a/include/golem.cpp b/include/golem.cpp index 878c07240..1e7421613 100755 --- a/include/golem.cpp +++ b/include/golem.cpp @@ -160,7 +160,7 @@ bool TGolem_mask::link_handler(TMask_field& f, KEY k) short id = f.dlg(); if (id == F_NEWREC && url.not_empty()) { - if (!fexist(url)) + if (!url.exist()) { TFilename name; char ext[_MAX_EXT]; @@ -181,6 +181,14 @@ bool TGolem_mask::link_handler(TMask_field& f, KEY k) id = F_LINK; } + if (id == F_DELREC) + { + if (!m.get_bool(S_LINK) && url.find("golem") > 0) + xvt_fsys_removefile(url); + m.stop_run(K_DEL); + return true; + } + if (url.not_empty()) { bool open = TRUE; @@ -251,6 +259,7 @@ TGolem_mask::TGolem_mask() TSheet_field& sheet = sfield(F_SHEET); set_handler(F_NEWREC, main_link_handler); + set_handler(F_DELREC, main_link_handler); set_handler(F_LINK, main_link_handler); set_handler(F_PRINT, main_link_handler);