Patch level : 10.0

Files correlati     : ve0 ve1
Ricompilazione Demo : [ ]
Commento            :
Aggiornate barre


git-svn-id: svn://10.65.10.50/trunk@16745 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-06-13 08:45:21 +00:00
parent 3ae92c935f
commit b50bf4e4ca
6 changed files with 41 additions and 28 deletions

View File

@ -12,11 +12,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include <applicat.h>
#include <colmask.h>
#include <config.h>
#include <scanner.h>
#include <progind.h>
#include <tabutil.h>
#include <urldefid.h>
#include <utility.h>
@ -26,8 +22,6 @@
#include "veini.h"
#include "ve0100.h"
// Significato delle colonne nella tabella _tab0300b
#define B_NOME 0
#define B_MSKTYPE 1
@ -164,6 +158,7 @@ class _TableItem : public TObject
bool _b0, _b1;
TString _s0;
int _i0;
public:
virtual TObject* dup() const { return new _TableItem(*this); }
const bool b0() { return _b0;}
@ -591,8 +586,7 @@ static void genera_gruppo( const TObject& gruppo )
if (new_line)
row++;
TString16 wrk; wrk.format("%02d", row);
TString4 wrk; wrk.format("%02d", row);
line[row_pos++] = wrk[0];
line[row_pos] = wrk[1];
}
@ -614,7 +608,7 @@ static void genera_gruppo( const TObject& gruppo )
_mask_generator = &(grp.generatore());
grp.campi().for_each(verifica_campo);
do_events();
if(grp.present())
if (grp.present())
grp.genera();
if (_bar)
_bar->addstatus(1);
@ -1224,7 +1218,8 @@ void TMask_generator::genera( const TString& profilo )
_m = new TMaschera( _mskname );
// Definizione della toolbar
_m->outline( "TOOLBAR \"\" 0 -2 0 2" );
// _m->outline( "TOOLBAR \"\" 0 -2 0 2" );
_m->outline( "TOOLBAR \"\" 0 0 0 2" );
_m->control( T_BOTTONE, DLG_SAVEREC, 1002 );
_m->begin( );
@ -1468,10 +1463,10 @@ void TMask_generator::genera( const TString& profilo )
TString80 message;
message.format("Generazione profilo : %s", (const char *) profilo);
message.format("Generazione profilo : %s", (const char *)profilo);
_bar = new TProgind(sortedgroups.items(), message, FALSE, TRUE);
sortedgroups.for_each( genera_gruppo );
delete _bar;
delete _bar; _bar = NULL;
if ( _m->_pageopen == TRUE )
{
_m->end( );

View File

@ -136,23 +136,46 @@ BEGIN
GROUP 2
END
ENDPAGE
TOOLBAR "" 0 0 0 2
BUTTON DLG_PRINT 10 2
BEGIN
PROMPT -13 -1 "~Stampa"
PROMPT 1 1 "~Stampa"
MESSAGE EXIT,K_ENTER
END
BUTTON DLG_EMAIL 10 2
BEGIN
PROMPT -23 -1 "~Mail"
PROMPT 2 1 "~Mail"
PICTURE BMP_EMAIL
MESSAGE EXIT,77
FLAGS "H"
END
BUTTON DLG_SETPRINT 10 2
BEGIN
PROMPT 3 1 "~Imposta Stampante"
END
BUTTON DLG_INFO 2 2
BEGIN
PROMPT 4 1 "Informazioni"
MESSAGE EXIT,K_F2
PICTURE BMP_INFO
END
BUTTON DLG_HELP 2 2
BEGIN
PROMPT 5 1 "Help"
MESSAGE EXIT,K_F1
PICTURE BMP_HELP
END
BUTTON DLG_QUIT 10 2
BEGIN
PROMPT -33 -1 ""
PROMPT 6 1 ""
END
ENDPAGE

View File

@ -187,7 +187,7 @@ TDoc_recordset::TDoc_recordset(const TRecordset& doc, const TString& old_query)
if (has_conai)
{
TConfig c(CONFIG_DITTA);
TConfig c(CONFIG_DITTA, "ve");
TString conai = c.get("DESCCONAIASS");
if (conai.empty())
conai = TR("Contributo CONAI assolto");

View File

@ -8,7 +8,6 @@
///////////////////////////////////////////////////////////
class TPeterParker_app : public TKlarkKent_app
{
protected:
virtual TReport* create_report(const char* name) const;
@ -19,7 +18,6 @@ TReport* TPeterParker_app::create_report(const char* name) const
TDocument_report* rep = new TDocument_report;
rep->load(name);
return rep;
}
int ve1400(int argc, char* argv[])

View File

@ -339,15 +339,14 @@ void TDocumento_mask::insert_anal_page()
int newpage = win2page(_sheet->parent());
if (newpage == 0)
newpage++;
create_page("Pagina", newpage); // Inserisce una pagina vuota con un titolo a caso
create_page("Pag.", newpage); // Inserisce una pagina vuota con un titolo a caso
// Rinumera i titoli di tutte le pagine
const int lastpage = win2page(fld(fields()-1).parent()); // Calcola in numero dell'ultima pagina
TToken_string caption;
int i;
for (i = 0; i <= lastpage; i++)
for (int i = 0; i <= lastpage; i++)
{
TString16 tag = TR("Pag.");
TString8 tag = TR("Pag.");
tag << (i+1); // Calcola il titolo di ogni pagina
caption.add(tag);
}
@ -376,7 +375,7 @@ void TDocumento_mask::insert_anal_page()
short dlg = F_CDC1; // id del primo campo da generare
short dlgd = F_DESCDC1;
for (i = 0; i < 2; i++)
for (int i = 0; i < 2; i++)
{
const TString& level = ini.get("Level", NULL, i+1); // Legge il livello 1 o 2
if (level == "CDC") // Crea centro di costo

View File

@ -154,9 +154,7 @@ bool ora_hndl( TMask_field& field, KEY key )
if (field.automagic() && field.get().empty())
{
time_t lt; time(&lt);
struct tm* t = localtime(&lt);
struct tm* t = xvt_time_now();
ora.format("%02d%02d", t->tm_hour, t->tm_min);
field.set((ora));
}