root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0

Browse Source 
Files correlati     : sistemati bottoni mancanti in tutti i programmi di ba
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/trunk@16627 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-05-15 15:01:55 +00:00
parent 45cc4b2e20
commit 81d17db674
9 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ba/ba0100.cpp
View File

@ -495,6 +495,8 @@ TColor_mask::TColor_mask()
const int sz = color.get_int("ToolSize");
set(217, (sz-16)/8);
set(218, EASY_RIDER ? "X" : "");
}
KEY TColor_mask::run()
@ -516,6 +518,7 @@ void TColor_mask::save_colors()
colors.set("TreeView", get_int(216));
const int sz = get_int(217);
colors.set("ToolSize", 16+sz*8);
colors.set("EasyRider", get_bool(218) ? "X" : "");
}
COLOR TColor_mask::get_color_entry(const char* name) const

2
ba/ba0101.cpp
View File

@ -303,7 +303,7 @@ bool TMenuitem::perform_program() const
}
else
{
if (submenu().menu().mask_mode() == 3 && !_action.starts_with("ba1 -"))
if (submenu().menu().mask_mode() == 3 && !_action.match("ba[1-2] -*", true))
a.run(true, 3, false); //e' un programma asincrono
else
{

5
ba/ba0103.cpp
View File

@ -325,8 +325,9 @@ bool TOutlook_mask::on_field_event(TOperable_field& o, TField_event e, long joll
}
else
{
const bool manu = mi.action().starts_with("ba1 -");
if (manu) // Manutenzione di qualsiasi cosa
// ba1 e ba2 sono programmi di manutenzione da eseguire in modo esclusivo
const bool manu = mi.action().match("ba[1-2] -*", true);
if (manu)
{
TBook_field& bf = (TBook_field&)field(DLG_MAIN);
bf.remove_all_pages(); // Chiude tutti i programmi in corso

7
ba/ba0200a.uml
View File

@ -139,9 +139,14 @@ BEGIN
PROMPT 1 3 "Grafica avanzata"
END
BOOLEAN 218
BEGIN
PROMPT 1 4 "Griglie a lettura facilitata"
END
RADIOBUTTON 216 1 16
BEGIN
PROMPT 24 0 "Tipo di Menu"
PROMPT 32 0 "Tipo di Menu"
ITEM "0|Normale"
ITEM "1|Albero"
ITEM "2|Explorer"

6
ba/ba1100.cpp
View File

@ -362,13 +362,9 @@ bool TManutenzione_app::create() // initvar e arrmask
load_des();
_mask = new TMask("ba1100a");
_browse = new TDir_sheet(TR("Manutenzione file di sistema"), _superprassi ? 0xC : 0x8);
_browse = new TDir_sheet(TR("Manutenzione file di sistema"), _superprassi);
if (_superprassi)
{
_browse->add_button(DLG_OTHERFILE, TR("File Esterni"), K_F5, 113);
_browse->add_button(DLG_CONVERT, TR("Conversione"), K_F7, 156);
if (is_power_station())
_browse->add_button(DLG_ADDFILE, TR("Nuovo file"), K_F8, BMP_NEWREC);
_mask->enable(-1); // Abilita campi privilegiati del gruppo 1
}
}

2
ba/ba1100.h
View File

@ -41,7 +41,7 @@ public:
void add();
void rebuild() { _items = _dir->items();}
TDir_sheet(const char* title,byte buttons=0x8,const char* col = "N.@3R|Nome@20|EOD@7R|EOX@7R|Lung.@7R|Descrizione@43|Formula@33|Flags@7R");
TDir_sheet(const char* title, bool superprassi, const char* col = "N.@3R|Nome@20|EOD@7R|EOX@7R|Lung.@7R|Descrizione@43|Formula@33|Flags@7R");
virtual ~TDir_sheet();
};

18
ba/ba1101.cpp
View File

@ -3,6 +3,7 @@
#include <isam.h>
#include <msksheet.h>
#include <progind.h>
#include <statbar.h>
#include <urldefid.h>
#include <utility.h>
@ -26,12 +27,25 @@ void TDir_sheet::add ()
_items = nitems;
}
TDir_sheet::TDir_sheet(const char* title, byte buttons, const char* colonne)
: TSheet(0, 0, 0, 0, title, colonne, buttons)
TDir_sheet::TDir_sheet(const char* title, bool superprassi, const char* colonne)
: TSheet(0, 0, 0, 0, title, colonne, superprassi ? 0xC : 0x8)
{
add_button(DLG_PRINT, TR("Stampa Tracciati"), K_F3, BMP_PRINT);
add_button(-1, "", 0, 1); // Separatore
if (superprassi)
{
add_button(DLG_OTHERFILE, TR("File Esterni"), K_F5, 113);
add_button(DLG_CONVERT, TR("Conversione"), K_F7, 156);
if (is_power_station())
add_button(DLG_ADDFILE, TR("Nuovo file"), K_F8, BMP_NEWREC);
add_button(-1, "", 0, 1); // Separatore
}
add_button(DLG_INFO, TR("Informazioni"), K_F2, BMP_INFO);
add_button(DLG_HELP, TR("Help"), K_F1, BMP_HELP);
xvt_toolbar_set_last_tool(toolbar(), DLG_QUIT);
_dir = new TDir;
_rec = new TTrec;
rebuild();

15
ba/ba1700.cpp
View File

@ -1,6 +1,5 @@
#include <agasys.h>
#include <applicat.h>
#include <defmask.h>
#include <dongle.h>
#include <execp.h>
#include <isamrpc.h>
@ -8,6 +7,8 @@
#include <prefix.h>
#include <progind.h>
#include <sheet.h>
#include <statbar.h>
#include <urldefid.h>
#include <utility.h>
#include "ba1.h"
@ -1543,6 +1544,10 @@ TInstaller_mask::TInstaller_mask()
HR("@1|Modulo@32|Cod.@3|Versione da\ninstallare@11|Liv.\nPatch@6|Data\nRilascio@10|Versione\nInstallata@10|Liv.\nPatch@6|Data\nInstallazione@13|Aggiornamento|Patch Base"),
0x18, 4)
{
add_button(F_UPDATE, BR("Rileggi", 9), '\0', TOOL_CONVERT);
add_button(F_INSTALL, BR("Installa", 9), '\0', TOOL_ELABORA); // NON mettere 'I'
xvt_toolbar_set_last_tool(toolbar(), DLG_QUIT);
_station_type = test_station_type();
_curr_mask = this;
_installed = false;
@ -1550,7 +1555,10 @@ TInstaller_mask::TInstaller_mask()
//in base al tipo di installazione che rileva decide se puo' effettuare aggiornamenti via web (un client..
//..non puo' fare aggiornamenti da web!!!)
TRadio_field& rf = add_radio(F_TYPE, 0, "", 1, 0, 21, "0|1", "Installa da disco|Installa da internet");
TToken_string installada;
installada.add(TR("Installa da disco"));
installada.add(TR("Installa da internet"));
TRadio_field& rf = add_radio(F_TYPE, 0, "", 1, 0, 21, "0|1", installada);
*rf.message(0, true) = "DISABLE,207|ENABLE,201";
*rf.message(1, true) = "DISABLE,201|ENABLE,207";
add_string(F_PATH, 0, "", 22, 1, 256, "", 58);
@ -1563,9 +1571,6 @@ TInstaller_mask::TInstaller_mask()
add_string(F_CURPATH, 0, PR("Installa in "), 1, 3, 80, "D", 58);
add_button(F_UPDATE, BR("Rileggi", 9), '\0');
add_button(F_INSTALL, BR("Installa", 9), '\0'); // NON mettere 'I'
set_handler(F_PATH, path_handler);
set_handler(F_WEB, web_handler);
set_handler(F_INSTALL, install_handler);

7
ba/ba7100.cpp
View File

@ -1154,9 +1154,7 @@ void TMailer_mask::save_all_lines()
TViswin& vv = bf.vis_win();
TString msg;
time_t tempo; time(&tempo);
const struct tm* d = localtime(&tempo);
const struct tm* d = xvt_time_now();
msg.format(FR("- Inizio elaborazione: %02d-%02d-%04d %02d:%02d:%02d"),
d->tm_mday, d->tm_mon+1, 1900+d->tm_year,
d->tm_hour, d->tm_min, d->tm_sec);
@ -1211,8 +1209,7 @@ void TMailer_mask::save_all_lines()
vv.add_line(msg);
}
time(&tempo);
d = localtime(&tempo);
d = xvt_time_now();
msg.format("- Fine elaborazione: %02d-%02d-%04d %02d:%02d:%02d",
d->tm_mday, d->tm_mon+1, 1900+d->tm_year,
d->tm_hour, d->tm_min, d->tm_sec);