diff --git a/ba/ba0100.cpp b/ba/ba0100.cpp index 829d92559..de2318305 100755 --- a/ba/ba0100.cpp +++ b/ba/ba0100.cpp @@ -299,6 +299,7 @@ protected: virtual bool stop_run(KEY k); virtual bool on_key(KEY k); virtual void on_idle(); + virtual void on_firm_change(); virtual void update(); virtual void handler(WINDOW win, EVENT* ep); void draw_spider(int mode, const PNT& mouse) const; @@ -317,6 +318,11 @@ void TExplorer_mask::handler(WINDOW win, EVENT* ep) TMask::handler(win, ep); } +void TExplorer_mask::on_firm_change() +{ + force_update(); +} + bool TExplorer_mask::stop_run(KEY k) { if (k == K_CTRL+'R') @@ -464,6 +470,12 @@ void TExplorer_mask::update() { TMask::update(); + WINDOW w = win(); + RCT client; xvt_vobj_get_client_rect(w, &client); + const TString& ragsoc = prefix().firm().ragione_sociale(); + const int len = xvt_dwin_get_text_width(w, ragsoc, -1); + xvt_dwin_draw_text(w, (client.right-len)/2, CHARY, ragsoc, -1); + if (_spider) { const PNT pnt = { 0, 0 }; diff --git a/ba/ba0101.cpp b/ba/ba0101.cpp index 89bd8f5dd..0d4114cdb 100755 --- a/ba/ba0101.cpp +++ b/ba/ba0101.cpp @@ -671,9 +671,9 @@ TImage& TMenu::image(const char* name) if (img == NULL) { TFilename realname; - const char* ext[3] = { "jpg", "gif", "bmp" }; + const char* ext[4] = { "jpg", "gif", "bmp", "png" }; bool bFound = false; - for (int i = 0; i < 3 && !bFound; i++) + for (int i = 0; i < 4 && !bFound; i++) { realname = name; realname.ext(ext[i]); diff --git a/ba/bamenu.men b/ba/bamenu.men index efab7f278..1c7a92786 100755 --- a/ba/bamenu.men +++ b/ba/bamenu.men @@ -90,7 +90,7 @@ Picture = Module = 0 Flags = "" Item_01 = "Generatore query", "ba8 -1", "" -Item_02 = "Generatore report", "ba8 -2", "" +Item_02 = "Generatore report", "ba8 -2", "", 10217 Item_03 = "Convertitore da form a report", "ba8 -3", "" [MENU_015] diff --git a/ba/makefile b/ba/makefile deleted file mode 100755 index cdd06f061..000000000 --- a/ba/makefile +++ /dev/null @@ -1,102 +0,0 @@ -EXE=$(EP)ba0 $(EP)ba1 $(EP)ba2 $(EP)ba3 $(EP)ba4 $(EP)ba5 $(EP)ba6 $(EP)bacnv -FRL=$(EP)ba0.frl $(EP)ba1.frl $(EP)ba2.frl $(EP)ba3.frl $(EP)ba4.frl $(EP)ba5.frl $(EP)ba6.frl $(EP)bacnv.frl - -$(O)/%.o: %.cpp - $(CCOMP) $(CFLAGSD) $(basename $<) $(O)/$* - -$(O)/%.o: ../cg/%.cpp - cd ../cg - $(CCOMP) $(CFLAGSD) $(basename $<) $(O)/$* - cd ../ba - -$(EP)%.msk: %.uml - $(MCOMP) $(basename $<) $(basename $@) - -$(EP)%.frm: %.frm - cp $< $(EP) - -$(EP)%.rpt: %.rpt - rptcomp $(basename $<) $(basename $@) - -$(EP)%.mnu: %.mnu - cp $< $(EP) - -$(EP)%.ini: %.ini - cp $< $(EP) - -include ../include/include.mak - -.PRECIOUS: $(EXE) $(FRL) - -base: $(EXE) etc - -etc: masks rpts mnus inis $(FRL) $(EP)trc.gen - -include depend.mak - -$(EP)ba0: $(O)/ba0.o $(LIBD1) - $(LINK) $(LFLAGSD1) $@ $(O)/ba0.o - -$(EP)ba0.frl: ba0.url $(U1) - $(RCOMP) ba0 -l $(EP)ba0 - -$(EP)ba1: $(O)/ba1.o $(O)/ba1100.o $(O)/ba1101.o $(O)/ba1102.o $(O)/ba1200.o $(O)/ba1300.o $(O)/ba1301.o $(O)/ba1400.o $(O)/ba1500.o $(LIBD1) $(EP)ba1.frl - $(LINK) $(LFLAGSD1) $@ $(O)/ba1.o $(O)/ba1100.o $(O)/ba1101.o $(O)/ba1102.o $(O)/ba1200.o $(O)/ba1300.o $(O)/ba1301.o $(O)/ba1400.o $(O)/ba1500.o - -$(EP)ba1.frl: ba1.url $(U1) - $(RCOMP) ba1 -l $(EP)ba1 - -$(EP)ba2: $(O)/ba2.o $(O)/ba2100.o $(O)/ba2300.o $(LIBD1) $(EP)ba2.frl - $(LINK) $(LFLAGSD1) $@ $(O)/ba2.o $(O)/ba2100.o $(O)/ba2300.o - -$(EP)ba2.frl: ba2.url $(U1) - $(RCOMP) ba2 -l $(EP)ba2 - -$(O)/pagament.o: ../cg/pagament.cpp ../cg/pagament.h $(I7) $(I10) $(I27) $(I31) $(I42) $(I54) - -$(O)/conto.o: ../cg/conto.cpp ../cg/conto.h $(I15) $(I30) $(I31) - -$(EP)ba3: $(O)/ba3.o $(O)/ba3100.o $(O)/ba3200.o $(O)/ba3300.o $(O)/ba3400.o $(O)/ba3500.o $(O)/ba3600.o $(O)/ba3700.o $(O)/ba3800.o $(O)/pagament.o $(O)/conto.o $(EP)/ba3.frl $(LIBD1) $(EP)ba3.frl - $(LINK) $(LFLAGSD1) $@ $(O)/ba3.o $(O)/ba3100.o $(O)/ba3200.o $(O)/ba3300.o $(O)/ba3400.o $(O)/ba3500.o $(O)/ba3600.o $(O)/ba3700.o $(O)/ba3800.o $(O)/pagament.o $(O)/conto.o - -$(EP)/ba3.frl: ba3.url $(U1) - $(RCOMP) ba3 -l $(EP)/ba3 - -$(EP)ba4: $(O)/ba4.o $(O)/ba4100.o $(O)/ba4200.o $(O)/ba4300.o $(O)/ba4400.o $(O)/ba4500.o $(O)/ba4600.o $(LIBD1) $(EP)ba4.frl - $(LINK) $(LFLAGSD1) $@ $(O)/ba4.o $(O)/ba4100.o $(O)/ba4200.o $(O)/ba4300.o $(O)/ba4400.o $(O)/ba4500.o $(O)/ba4600.o - -$(EP)ba5: $(O)/ba5.o $(LIBD1) $(EP)ba5.frl - $(LINK) $(LFLAGSD1) $@ $(O)/ba5.o - -$(EP)ba6: $(O)/ba6.o $(O)/ba6100.o $(O)/ba6101.o $(O)/ba6200.o $(LIBD1) $(EP)ba6.frl - $(LINK) $(LFLAGSD1) $@ $(O)/ba6.o $(O)/ba6100.o $(O)/ba6101.o $(O)/ba6200.o - -$(EP)ba6.frl: ba6.url $(U1) - $(RCOMP) ba6 -l $(EP)ba6 - -$(EP)ba5.frl: ba5.url $(U1) - $(RCOMP) ba5 -l $(EP)ba5 - -$(EP)ba4.frl: ba4.url $(U1) - - $(RCOMP) ba4 -l $(EP)ba4 - -$(EP)bacnv.o: bacnv.cpp $(S1) $(I24) $(I6) $(I30) $(I47) $(I15) $(I31) $(I43) $(IP)rmov.h - -$(EP)bacnv.frl: bacnv.url $(U1) - $(RCOMP) bacnv -l $(EP)bacnv - -$(EP)trc.gen: trc.gen.asc - uudecode trc.gen.asc - mv trc.gen $(EP) - uudecode dir.gen.asc - mv dir.gen $(EP) - -mnus: $(EP)prassi.mnu - -$(EP)prassi.mnu: prassi.mnu - -inis: $(EP)fconv.ini - -$(EP)fconv.ini: fconv.ini - diff --git a/ba/maketrc.mak b/ba/maketrc.mak deleted file mode 100755 index 2562a4def..000000000 --- a/ba/maketrc.mak +++ /dev/null @@ -1,9 +0,0 @@ - -all: trc.gen.asc - -trc.gen.asc: $(EP)trc.gen - uuencode $(EP)trc.gen trc.gen >trc.gen.asc - touch $(EP)trc.gen - uuencode $(EP)dir.gen dir.gen >dir.gen.asc - touch $(EP)dir.gen - diff --git a/ba/prassi.hlp b/ba/prassi.hlp deleted file mode 100755 index 2c084a7bd..000000000 Binary files a/ba/prassi.hlp and /dev/null differ