Patch level :10.0 nuovo cd

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
0000830: schermate da allineare
Descrizione  i bottoni sono ancora vecchio stile, in fondo alla videate in:
ricerca soci, stampe anagrafiche, stampa codici iva, stampa codici attività, tutte le stampe tabelle ministeriali,visualizzazione liquidazione richiesta parametri.


git-svn-id: svn://10.65.10.50/trunk@17596 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2008-11-12 11:20:51 +00:00
parent 26698cf670
commit 5004d5b41b
14 changed files with 184 additions and 179 deletions

View File

@ -519,6 +519,7 @@ bool TMenu::read(const char* name, TString& root)
// Menu
///////////////////////////////////////////////////////////
bool TMenu::read(const char* name)
{
TString root;
@ -756,14 +757,15 @@ TMenu::TMenu() : _current(NULL), _item(0), _mask_mode(0)
TMenu::~TMenu()
{ }
bool is_tassan()
{
bool yes = false;
if (dongle().number() == 202)
{
const TDate morti(24, 11, 2008); // Giorno della morte del programma
const TDate morte(24, 11, 2008); // Giorno della morte del programma
const TDate oggi(TODAY);
yes = oggi >= morti;
yes = oggi >= morte;
}
return yes;
}

View File

@ -1,20 +1,7 @@
#include "ba3300.h"
TOOLBAR "topbar" 0 0 0 2
BUTTON DLG_OK 10 2
BEGIN
PROMPT -12 -11 ""
END
BUTTON DLG_QUIT 10 2
BEGIN
PROMPT -22 -11 "~Fine"
MESSAGE EXIT,K_QUIT
PICTURE BMP_QUIT
PICTURE BMP_QUITDN
END
#include <printbar.h>
ENDPAGE
PAGE "Stampa fogli libri bollati" 0 0 0 2

View File

@ -1,4 +1,8 @@
#include "ba3800.h"
TOOLBAR "topbar" 0 0 0 2
#include <printbar.h>
ENDPAGE
PAGE "Stampa Tabella IV Direttiva CEE" -1 -1 40 5
@ -8,16 +12,6 @@ BEGIN
FLAGS "A"
END
BUTTON DLG_PRINT 10 2
BEGIN
PROMPT -12 -1 ""
END
BUTTON DLG_QUIT 10 2
BEGIN
PROMPT -22 -1 ""
END
ENDPAGE
ENDMASK

View File

@ -1,7 +1,6 @@
#include "ba3a00a.h"
PAGE "Stampa condizioni di pagamento" -1 -1 35 6
PAGE "Stampa condizioni di pagamento" -1 -1 40 5
STRING F_INIZIO 4
BEGIN
PROMPT 2 1 "Da codice "
@ -31,15 +30,10 @@ BEGIN
ADD NONE
END
BUTTON DLG_PRINT 10 2
BEGIN
PROMPT -12 -1 ""
END
BUTTON DLG_QUIT 10 2
BEGIN
PROMPT -22 -1 ""
END
ENDPAGE
TOOLBAR "topbar" 0 0 0 2
#include <printbar.h>
ENDPAGE
ENDMASK

View File

@ -63,13 +63,6 @@ bool TPersone_app::ba4200_handler(TMask& m, KEY k)
{
TPersone_app& app = (TPersone_app&)main_app();
if (k == K_F10)
{
if (app.ana_fis()) app.set_next_ana(TGIU);
else app.set_next_ana(TFIS);
m.stop_run(K_ESC);
return FALSE;
}
if (k != K_F5 || m.mode() != MODE_MOD)
return TRUE;
@ -105,7 +98,6 @@ void TPersone_app::init_query_mode(TMask& m)
{
m.disable(DLG_DITTE);
m.enable(DLG_CHGTIP);
}
bool TPersone_app::get_next_key(TToken_string& key)
@ -146,14 +138,12 @@ bool TPersone_app::get_next_key(TToken_string& key)
void TPersone_app::init_insert_mode(TMask& m)
{
m.disable(DLG_DITTE);
m.disable(DLG_CHGTIP);
}
void TPersone_app::init_modify_mode(TMask& m)
{
m.enable(DLG_DITTE);
m.disable(DLG_CHGTIP);
}
HIDDEN bool stato_hnd(TMask_field& f, KEY key)

View File

@ -346,7 +346,7 @@
#define FLD_AG1_COMRF_COMUNI_DENCOM 368
#define DLG_DITTE 369
#define FLD_ANAG_UTAGG 370
#define DLG_CHGTIP 371
#define DLG_OGGETTI 372
#define F_MAIL 373
#define F_UFFUUE 374

View File

@ -2,36 +2,20 @@
TOOLBAR "" 0 0 0 2
#include <relapbar.h>
ENDPAGE
TOOLBAR "" 0 -2 0 2
BUTTON DLG_CHGTIP 23 2
BUTTON DLG_NULL 2 2
BEGIN
PROMPT -13 0 "Persone ~Giuridiche"
MESSAGE K_F10
PROMPT -1 0 ""
PICTURE 0
END
BUTTON DLG_DITTE 10 2
BUTTON DLG_EMAIL 2 2
BEGIN
PROMPT -36 0 "~Ditte"
MESSAGE K_F5
END
BUTTON DLG_EMAIL 10 2
BEGIN
PROMPT -56 0 "~Posta"
PROMPT -1 0 "~Posta"
PICTURE BMP_EMAIL
END
GOLEM DLG_OGGETTI 10 2
BEGIN
PROMPT -66 0 "~Oggetti"
FIELD OGGETTI
FLAG "M"
END
ENDPAGE
ENDPAGE
PAGE "Pag.1" -1 -1 77 19
@ -72,6 +56,12 @@ MESSAGE COPY,1@
CHECKTYPE REQUIRED
END
BUTTON DLG_DITTE 6 1
BEGIN
PROMPT 55 1 "~Ditte"
MESSAGE K_F5
END
STRING FLD_ANAG_RAGSOC1 30
BEGIN
PROMPT 2 2 "Cognome "
@ -261,6 +251,18 @@ PROMPT 56 16 "Utente "
FLAGS "D"
END
TEXT -1
BEGIN
PROMPT 2 18 "Collegamento ad oggetti esterni "
END
GOLEM DLG_OGGETTI 10 2
BEGIN
PROMPT 2 19 "~Oggetti"
FIELD OGGETTI
FLAG "M"
END
ENDPAGE
PAGE "Pag.2" -1 -1 77 20

View File

@ -2,36 +2,20 @@
TOOLBAR "" 0 0 0 2
#include <relapbar.h>
ENDPAGE
TOOLBAR "" 0 -2 0 2
BUTTON DLG_CHGTIP 23 2
BUTTON DLG_NULL 2 2
BEGIN
PROMPT -13 0 "Persone ~Fisiche"
MESSAGE K_F10
PROMPT -1 0 ""
PICTURE 0
END
BUTTON DLG_DITTE 10 2
BUTTON DLG_EMAIL 2 2
BEGIN
PROMPT -36 0 "~Ditte"
MESSAGE K_F5
END
BUTTON DLG_EMAIL 10 2
BEGIN
PROMPT -56 0 "~Posta"
PROMPT -1 0 "~Posta"
PICTURE BMP_EMAIL
END
GOLEM DLG_OGGETTI 10 2
BEGIN
PROMPT -66 0 "~Oggetti"
FIELD OGGETTI
FLAG "M"
END
ENDPAGE
ENDPAGE
PAGE "Pag.1" -1 -1 77 19
@ -70,6 +54,12 @@ BEGIN
KEY 1
END
BUTTON DLG_DITTE 6 1
BEGIN
PROMPT 55 1 "~Ditte"
MESSAGE K_F5
END
STRING FLD_AG1_RAGSOC 50
BEGIN
PROMPT 2 2 "Ragione sociale "
@ -192,6 +182,18 @@ BEGIN
FLAGS "DA"
END
TEXT -1
BEGIN
PROMPT 2 18 "Collegamento ad oggetti esterni "
END
GOLEM DLG_OGGETTI 10 2
BEGIN
PROMPT 2 19 "~Oggetti"
FIELD OGGETTI
FLAG "M"
END
ENDPAGE
PAGE "Pag.2" -1 -1 77 20

View File

@ -2,32 +2,11 @@
TOOLBAR "" 0 0 0 2
#include <relapbar.h>
ENDPAGE
TOOLBAR "" 0 -2 0 2
BUTTON DLG_ATT 10 2
BUTTON DLG_NULL 2 2
BEGIN
PROMPT -16 -11 "~Attivita'"
MESSAGE K_F6
END
BUTTON DLG_ULC 10 2
BEGIN
PROMPT -26 -11 "U.~Locali"
MESSAGE K_F5
END
BUTTON DLG_SOC 10 2
BEGIN
PROMPT -36 -11 "~Soci"
MESSAGE K_F7
END
BUTTON DLG_REG 10 2
BEGIN
PROMPT -46 -11 "Re~gistri"
MESSAGE K_F8
PROMPT -1 0 ""
PICTURE 0
END
BUTTON DLG_EMAIL 10 2
@ -38,6 +17,7 @@ END
ENDPAGE
PAGE "Pag. 1" -1 -1 77 19
GROUPBOX DLG_NULL 76 4
@ -245,6 +225,30 @@ BEGIN
FLAGS "DU"
END
BUTTON DLG_ATT 10 1
BEGIN
PROMPT -14 19 "~Attivita'"
MESSAGE K_F6
END
BUTTON DLG_ULC 10 1
BEGIN
PROMPT -24 19 "U.~Locali"
MESSAGE K_F5
END
BUTTON DLG_SOC 10 1
BEGIN
PROMPT -34 19 "~Soci"
MESSAGE K_F7
END
BUTTON DLG_REG 10 1
BEGIN
PROMPT -44 19 "Re~gistri"
MESSAGE K_F8
END
ENDPAGE
PAGE "Pag. 2" -1 -1 77 18

View File

@ -1,5 +1,21 @@
#include "ba4600.h"
TOOLBAR "Toolbar" 0 0 0 2
BUTTON DLG_FINDREC 9 2
BEGIN
PROMPT 38 5 "Ri~cerca"
PICTURE 166
MESSAGE EXIT,K_F9
END
BUTTON DLG_QUIT 9 2
BEGIN
PROMPT 38 7 "Fine"
END
ENDPAGE
PAGE "Ricerca soci" -1 -1 54 9
RADIOBUTTON LST_SC1_TIPOASOC 20
@ -80,17 +96,6 @@ BEGIN
ITEM "D1|Quadro D1"
END
BUTTON DLG_FINDREC 9 2
BEGIN
PROMPT 38 5 "Ri~cerca"
MESSAGE EXIT,K_F9
END
BUTTON DLG_QUIT 9 2
BEGIN
PROMPT 38 7 "Fine"
END
ENDPAGE
ENDMASK

View File

@ -1,5 +1,70 @@
#include "ba6100a.h"
TOOLBAR "Toolbar" 0 0 0 2
BUTTON BUT_BA6_ELENCO 10 2
BEGIN
PROMPT 4 14 "~Elenco"
PICTURE 212
MESSAGE EXIT,BUT_BA6_ELENCO
END
BUTTON BUT_BA6_SCHEDE 10 2
BEGIN
PROMPT 16 14 "~Schede"
PICTURE 213
MESSAGE EXIT,BUT_BA6_SCHEDE
END
BUTTON BUT_BA6_ETICHETTE 10 2
BEGIN
PROMPT 40 14 "E~tichette"
PICTURE 214
MESSAGE EXIT,BUT_BA6_ETICHETTE
END
BUTTON BUT_BA6_RUBRICHE 10 2
BEGIN
PROMPT 28 14 "~Rubriche"
PICTURE 215
MESSAGE EXIT,BUT_BA6_RUBRICHE
END
BUTTON DLG_NULL 2 2
BEGIN
PROMPT 1 1 ""
PICTURE 0
END
BUTTON DLG_SETPRINT 2 2
BEGIN
PROMPT 1 1 "Imposta"
PICTURE BMP_SETPRINT
END
BUTTON DLG_INFO 2 2
BEGIN
PROMPT 2 1 "Info"
MESSAGE EXIT,K_F2
PICTURE BMP_INFO
END
BUTTON DLG_HELP 2 2
BEGIN
PROMPT 3 1 "Help"
MESSAGE EXIT,K_F1
PICTURE BMP_HELP
END
BUTTON DLG_QUIT 2 2
BEGIN
PROMPT 5 1 "Fine"
MESSAGE EXIT,K_QUIT
PICTURE BMP_QUIT
END
ENDPAGE
PAGE "Definizione Stampe" -1 -1 70 17
RADIOBUTTON RDB_BA6_TYPE 25
@ -217,39 +282,5 @@ BEGIN
HELP "Indicare se includere informazioni relative alle ditte"
END
GROUPBOX DLG_NULL 50 4
BEGIN
PROMPT 3 13 "Stampa"
END
BUTTON BUT_BA6_ELENCO 10 2
BEGIN
PROMPT 4 14 "~Elenco"
MESSAGE EXIT,BUT_BA6_ELENCO
END
BUTTON BUT_BA6_SCHEDE 10 2
BEGIN
PROMPT 16 14 "~Schede"
MESSAGE EXIT,BUT_BA6_SCHEDE
END
BUTTON BUT_BA6_RUBRICHE 10 2
BEGIN
PROMPT 28 14 "~Rubriche"
MESSAGE EXIT,BUT_BA6_RUBRICHE
END
BUTTON BUT_BA6_ETICHETTE 10 2
BEGIN
PROMPT 40 14 "E~tichette"
MESSAGE EXIT,BUT_BA6_ETICHETTE
END
BUTTON DLG_QUIT 10 2
BEGIN
PROMPT 56 14 ""
END
ENDPAGE
ENDMASK

View File

@ -17,7 +17,7 @@ BEGIN
ITEM "1|Residenza"
ITEM "2|Domicilio fiscale/Sede legale"
ITEM "3|Corrispondenza"
HELP "Indicare l'indirizzo da includere nelle etichette"
HELP "Indicare l'indirizzo da includere nelle etichette"
END
NUMBER FLD_BA6B_INDROW 4
@ -37,7 +37,7 @@ BEGIN
PROMPT 4 7 "Partita IVA/ Codice fiscale"
MESSAGE FALSE DISABLE,FLD_BA6B_PIVROW|DISABLE,FLD_BA6B_PIVCOL
MESSAGE TRUE ENABLE,FLD_BA6B_PIVROW|ENABLE,FLD_BA6B_PIVCOL
HELP "Indicare se stampare la Partita IVA/Codice fiscale"
HELP "Indicare se stampare la Partita IVA/Codice fiscale"
END
NUMBER FLD_BA6B_PIVROW 4
@ -59,7 +59,7 @@ BEGIN
PROMPT 4 8 "Includi codice anagrafico"
MESSAGE FALSE DISABLE,FLD_BA6B_CODROW|DISABLE,FLD_BA6B_CODCOL
MESSAGE TRUE ENABLE,FLD_BA6B_CODROW|ENABLE,FLD_BA6B_CODCOL
HELP "Indicare se stampare il codice anagrafico"
HELP "Indicare se stampare il codice anagrafico"
END
NUMBER FLD_BA6B_CODROW 4
@ -79,19 +79,19 @@ END
NUMBER FLD_BA6B_TOTROW 4
BEGIN
PROMPT 4 10 "Numero totale di righe e colonne "
HELP "Totale righe (altezza dell'etichetta)"
HELP "Totale righe (altezza dell'etichetta)"
END
NUMBER FLD_BA6B_TOTCOL 4
BEGIN
PROMPT 47 10 ""
HELP "Totale colonne (larghezza dell'etichetta)"
HELP "Totale colonne (larghezza dell'etichetta)"
END
BOOLEAN CHK_BA6B_SAVE
BEGIN
PROMPT 4 11 "Salva impostazioni"
HELP "Indicare se ritorvare le impostazioni successivamente"
HELP "Indicare se ritorvare le impostazioni successivamente"
END
BUTTON DLG_OK 10 2

View File

@ -1,5 +1,9 @@
#include "ba6200.h"
TOOLBAR "topbar" 0 0 0 2
#include "printbar.h"
ENDPAGE
PAGE "Stampa comuni" -1 -1 67 16
RADIOBUTTON F_SCELTA 25
@ -123,16 +127,6 @@ BEGIN
HELP "Stampa anche le aliquote I.C.I. dei vari comuni"
END
BUTTON DLG_OK 9 2
BEGIN
PROMPT -12 -2 ""
END
BUTTON DLG_CANCEL 9 2
BEGIN
PROMPT -22 -2 ""
END
ENDPAGE
ENDMASK

View File

@ -27,7 +27,7 @@ END
ENDPAGE
PAGE "Definizione Stampe Anagrafiche" 0 0 0 2
PAGE "Definizione Stampe Anagrafiche" 0 2 0 0
GROUPBOX DLG_NULL 76 11
BEGIN
PROMPT 1 1 "@bSelezione"