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

applicat.cpp Tolti commenti e riscritto meglio controllo di abiliatzione cambio ditta

Browse Source 
controls.cpp   Migliorato riconoscimento tasti estesi
dongle.cpp     Aggiunto riconoscimento delle nuove chiavi programmatori
execp.cpp      Aggiunta chiamata per chiudere tutto il chiudibile prima di un'esecuzione sincrona


git-svn-id: svn://10.65.10.50/trunk@6455 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1998-03-30 13:39:21 +00:00
parent 97f1f7e5e1
commit 043790be92
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/applicat.cpp
View File

@ -493,7 +493,6 @@ void TApplication::set_perms()
if (use_files()) if (use_files())
{ {
TLocalisamfile users(LF_USER); TLocalisamfile users(LF_USER);
users.zero(); users.zero();
users.put("USERNAME", utente); users.put("USERNAME", utente);
if (users.read() == NOERR) if (users.read() == NOERR)
@ -589,7 +588,7 @@ void TApplication::run(
return; return;
XVT_CONFIG cfg; XVT_CONFIG cfg;
cfg.menu_bar_ID = TASK_MENUBAR /*+addbar */; cfg.menu_bar_ID = TASK_MENUBAR;
cfg.about_box_ID = 0; cfg.about_box_ID = 0;
cfg.base_appl_name = (char*)base.name(); cfg.base_appl_name = (char*)base.name();
cfg.appl_name = (char*)title; cfg.appl_name = (char*)title;
@ -754,7 +753,6 @@ bool TApplication::set_firm(long newfirm)
if (w != NULL_WIN) if (w != NULL_WIN)
{ {
TWindow * win = (TWindow *) xvt_vobj_get_data(w); TWindow * win = (TWindow *) xvt_vobj_get_data(w);
win->on_firm_change(); win->on_firm_change();
} }
on_firm_change(); on_firm_change();
@ -848,14 +846,11 @@ bool TApplication::firm_change_enabled() const
// @comm Praticamente controlla se e' stato lanciato da ba0 o dal program manager // @comm Praticamente controlla se e' stato lanciato da ba0 o dal program manager
{ {
static int can = 2;
if (can == 2)
#ifdef _DEMO_ #ifdef _DEMO_
can = FALSE; return FALSE;
#else #else
can = ::os_spawn_by_menu(); return ::os_spawn_by_menu();
#endif #endif
return can != 0;
} }
void TApplication::on_firm_change() void TApplication::on_firm_change()

2
include/controls.cpp
View File

@ -77,7 +77,7 @@ KEY TControl::xiev_to_key(const XI_EVENT* xiev)
if (xiev->v.chr.shift && (k < ' ' || k >= K_UP)) key += K_SHIFT; if (xiev->v.chr.shift && (k < ' ' || k >= K_UP)) key += K_SHIFT;
// if (xiev->v.chr.control && k >= ' ') key += K_CTRL; // if (xiev->v.chr.control && k >= ' ') key += K_CTRL;
// Correzione per gestire i tasti AltGr sulle tastiere non U.S.A. // Correzione per gestire i tasti AltGr sulle tastiere non U.S.A.
if (xiev->v.chr.control && ((k >= K_F1 && k <= K_F12) || isalnum(k))) if (xiev->v.chr.control && ((k >= K_F1 && k <= K_F12) || isalnum(k) || strchr("\r+-*/", k)))
key += K_CTRL; key += K_CTRL;
} }
return key; return key;

3
include/dongle.cpp
View File

@ -4,7 +4,6 @@
#include <config.h> #include <config.h>
#include <dongle.h> #include <dongle.h>
#include <isamrpc.h> #include <isamrpc.h>
#include <prefix.h>
#include <utility.h> #include <utility.h>
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -321,7 +320,7 @@ bool TDongle::eutron_login(bool test_all_keys)
_eutron_key->net_command = NET_KEY_OPEN; _eutron_key->net_command = NET_KEY_OPEN;
const char* labels[5] = { "AGA.INFORMATICA", "AGA.PRASSI", "AGA.PROCOM", const char* labels[5] = { "AGA.INFORMATICA", "AGA.PRASSI", "AGA.PROCOM",
"AGA.CAMPO", "2699DP" }; "AGA.CAMPO", "25EBAI" };
TDongleType types[5] = { _aga_dongle, _prassi_dongle, _procom_dongle, TDongleType types[5] = { _aga_dongle, _prassi_dongle, _procom_dongle,
_user_dongle, _developer_dongle }; _user_dongle, _developer_dongle };
for (int k = test_all_keys ? 0 : 3; k < 5; k++) for (int k = test_all_keys ? 0 : 3; k < 5; k++)

4
include/execp.cpp
View File

@ -97,7 +97,9 @@ word TExternal_app::run(
} }
} }
*/ */
if (!async)
prefix().close_closeable_isamfiles();
if (dongle().local()) if (dongle().local())
dongle().logout(); dongle().logout();