diff --git a/include/bagn001a.uml b/include/bagn001a.uml index 30d4752f9..cca16eb6d 100755 --- a/include/bagn001a.uml +++ b/include/bagn001a.uml @@ -1,10 +1,10 @@ #include -PAGE "IMPOSTAZIONE STAMPANTE" -1 -1 69 11 +PAGE "IMPOSTAZIONE STAMPANTE" -1 -1 78 9 -RADIOBUTTON MSK_TYPE 1 66 +RADIOBUTTON MSK_TYPE 1 76 BEGIN - PROMPT 2 1 "Stampa su..." + PROMPT 1 0 "@bStampa su..." HELP "Selezionare il tipo dove direzionare la stampa" ITEM "0|Stampante" MESSAGE SHOW,MSK_PRINTERS|HIDE,MSK_FILENAME @@ -15,35 +15,40 @@ BEGIN FLAGS "Z" END -LIST MSK_PRINTERS 49 +LIST MSK_PRINTERS 65 BEGIN - PROMPT 4 5 "Stampante " + PROMPT 1 3 "Stampante " END -STRING MSK_FILENAME 52 +STRING MSK_FILENAME 256 68 BEGIN - PROMPT 4 5 "Nome file " + PROMPT 1 3 "File " CHECKTYPE REQUIRED VALIDATE FILENAME_FUNC FLAGS "A" WARNING "E' necessario specificare un nome di file" END +GROUPBOX DLG_NULL 76 4 +BEGIN + PROMPT 1 4 "@bParametri di stampa" +END + LIST MSK_FONT 32 BEGIN - PROMPT 4 6 "Font " + PROMPT 2 5 "Font " ITEM "Courier|Courier" END LIST MSK_SIZE 3 BEGIN - PROMPT 52 6 "Carattere " + PROMPT 50 5 "Dimensioni carattere " ITEM "10|10" END LIST MSK_LINES 3 BEGIN - PROMPT 44 7 "Linee per pollice " + PROMPT 50 6 "Linee per pollice " ITEM "4|4" ITEM "5|5" ITEM "6|6" @@ -55,7 +60,7 @@ END BOOLEAN MSK_ISGRAPHICS BEGIN - PROMPT 4 8 "Stampa elementi grafici" + PROMPT 2 6 "Stampa elementi grafici" END BUTTON DLG_SETPRINT 10 2 diff --git a/include/printer.cpp b/include/printer.cpp index c047588d1..3be16647d 100755 --- a/include/printer.cpp +++ b/include/printer.cpp @@ -1298,8 +1298,10 @@ void TPrinter::read_configuration( if (xvt_print_is_valid(_print_rcd)) { + char name[256]; // Recupera nome "lungo" della stampante + xvt_print_get_name(_print_rcd, name, sizeof(name)); + _prname = name; init_formlen(); - xvt_print_get_name(_print_rcd, _prname.get_buffer(), _prname.size()); } else { diff --git a/include/report.cpp b/include/report.cpp index 8011b0242..c2cef0fed 100755 --- a/include/report.cpp +++ b/include/report.cpp @@ -1676,9 +1676,13 @@ bool TReport_field::load(const TXmlItem& fld) set_picture(fld.GetAttr("text")); set_codval(fld.GetAttr("codval")); set_link(fld.GetAttr("link")); + TXmlItem* src = fld.FindFirstChild("source"); if (src != NULL) src->GetEnclosedText(_field); + TXmlItem* alt_src = fld.FindFirstChild("alt_source"); + if (alt_src != NULL) + alt_src->GetEnclosedText(_alt_field); TReport_font font; if (font.load(fld))