ba1600.cpp Corretta aggiunta alla lista files bottoni di import/export

ba1600b.uml  Corretto sheet della lista dei files


git-svn-id: svn://10.65.10.50/trunk@5677 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1997-12-01 14:36:13 +00:00
parent e5ac0bd122
commit d6430e9709
2 changed files with 16 additions and 14 deletions

View File

@ -41,7 +41,8 @@ int TInstall_ini::build_list(const TString& module, TString_array& a,
// Quando creo il disco di aggiornamento salto tutti i file // Quando creo il disco di aggiornamento salto tutti i file
// che non hanno il flag di aggiornamento settato // che non hanno il flag di aggiornamento settato
if (agg && tmp.get_char(1) <= ' ') const bool inagg = tmp.get_char(2) > ' ';
if (agg && !inagg)
continue; continue;
if (sum) if (sum)
@ -393,9 +394,10 @@ bool TModule_mask::link_handler(TMask_field& f, KEY k)
TMask& mainmask = sf->mask(); TMask& mainmask = sf->mask();
TSheet_field& sheet = mainmask.sfield(F_SHEET); TSheet_field& sheet = mainmask.sfield(F_SHEET);
TToken_string& newrow = sheet.row(-1); TToken_string& newrow = sheet.row(-1);
newrow = modmask.get(101); newrow = modmask.get(101); // Nome del file
newrow.add(""); // Non fa' parte dell'aggiornamento
TString16 submod = newrow.left(2); TString16 submod = newrow.left(2);
submod << '0'; submod << '0'; // Sottomodulo standard
newrow.add(submod); newrow.add(submod);
if (modmask.is_running()) if (modmask.is_running())
{ {
@ -416,7 +418,6 @@ bool TModule_mask::deselect_handler(TMask_field& f, KEY k)
TSheet_field& sheet = f.mask().sfield(F_SHEET); TSheet_field& sheet = f.mask().sfield(F_SHEET);
FOR_EACH_SHEET_ROW_BACK(sheet, r, row) FOR_EACH_SHEET_ROW_BACK(sheet, r, row)
row->add(" ", 1); row->add(" ", 1);
sheet.force_update(); sheet.force_update();
} }
return TRUE; return TRUE;
@ -506,8 +507,8 @@ void TModule_mask::save()
if (isdigit(sub[0]) || sub.left(2) == module) if (isdigit(sub[0]) || sub.left(2) == module)
{ {
tmp = row->get(0); // Nome del file tmp = row->get(0); // Nome del file
const bool agg = row->get_char() > ' '; const bool agg = row->get_char(1) > ' ';
if (agg) tmp.add("X"); // Flag aggiornamento if (agg) tmp.add("X"); // Flag aggiornamento
ini.set("File", tmp, sub, TRUE, index++); ini.set("File", tmp, sub, TRUE, index++);
} }
} }
@ -600,7 +601,7 @@ bool TFascicolator_mask::import_export_handler(TMask_field& f, KEY k)
const TString& module = m.get(S_MODULE); const TString& module = m.get(S_MODULE);
const TFascicolator_mask& fm = (const TFascicolator_mask&)m.get_sheet()->mask(); const TFascicolator_mask& fm = (const TFascicolator_mask&)m.get_sheet()->mask();
TFilename path; TFilename path = module;
fm.build_export_path(path); fm.build_export_path(path);
FILE_SPEC fs; FILE_SPEC fs;
@ -649,7 +650,8 @@ bool TFascicolator_mask::import_export_handler(TMask_field& f, KEY k)
const TFilename& TFascicolator_mask::build_export_path(TFilename& path) const const TFilename& TFascicolator_mask::build_export_path(TFilename& path) const
{ {
const TString& module = get(S_MODULE); CHECK(path.not_empty(), "Please, specify the module");
const TString module(path);
path.cut(0); path.cut(0);
path << SLASH << 'u' << SLASH << user() << SLASH << "src" << SLASH << module; path << SLASH << 'u' << SLASH << user() << SLASH << "src" << SLASH << module;
if (!fexist(path)) if (!fexist(path))

View File

@ -54,16 +54,16 @@ BEGIN
FLAGS "B" FLAGS "B"
END END
BOOLEAN 102
BEGIN
PROMPT 1 2 "Includi nell'aggiornamento"
END
STRING 103 3 STRING 103 3
BEGIN BEGIN
PROMPT 30 2 "Sottomodulo " PROMPT 30 2 "Sottomodulo "
END END
BOOLEAN 102
BEGIN
PROMPT 1 2 "Includi nell'aggiornamento"
END
BUTTON DLG_OK 10 2 BUTTON DLG_OK 10 2
BEGIN BEGIN
PROMPT -13 -1 "" PROMPT -13 -1 ""