Patch level : 10.0 ???

Files correlati     : lv0
Ricompilazione Demo : [ ]
Commento            :
Coretta gestione calendario


git-svn-id: svn://10.65.10.50/trunk@17760 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-12-01 16:52:47 +00:00
parent 9691e7fc16
commit d4d4d1e9d6
2 changed files with 49 additions and 35 deletions

View File

@ -15,7 +15,7 @@ protected:
public: public:
// ereditato da TAlmanac_mask // ereditato da TAlmanac_mask
virtual bool is_date_void(int currpage, TDate& cdate); virtual bool is_date_void(int currpage, const TDate& cdate);
virtual void change_year(int newyear); virtual void change_year(int newyear);
// metodi di accesso // metodi di accesso
@ -25,7 +25,7 @@ public:
virtual void open_day_mask(const TDate & date); virtual void open_day_mask(const TDate & date);
// Costruttore // Costruttore
TConf_lavanderie_mask(const TFilename & f) : TAlmanac_mask(f), _cal(TDate(TODAY).year()) { } TConf_lavanderie_mask(const char* name);
// Distruttore // Distruttore
~TConf_lavanderie_mask() { } ~TConf_lavanderie_mask() { }
}; };
@ -45,7 +45,7 @@ bool TConf_lavanderie_mask::on_field_event(TOperable_field& o, TField_event e, l
return true; return true;
} }
bool TConf_lavanderie_mask::is_date_void(int currpage, TDate& cdate) bool TConf_lavanderie_mask::is_date_void(int currpage, const TDate& cdate)
{ {
return _cal.is_holiday(cdate); return _cal.is_holiday(cdate);
} }
@ -61,7 +61,7 @@ void TConf_lavanderie_mask::open_day_mask(const TDate & date)
TDate d(date); TDate d(date);
if (!d.ok()) if (!d.ok())
d = curr_almanac().selected_date(); d = almanac().selected_date();
const bool holiday = _cal.is_holiday(d) ? false : true; const bool holiday = _cal.is_holiday(d) ? false : true;
_cal.set_holiday(d, holiday); _cal.set_holiday(d, holiday);
@ -73,6 +73,12 @@ void TConf_lavanderie_mask::update_current_calendar(int year)
change_year(year); change_year(year);
} }
TConf_lavanderie_mask::TConf_lavanderie_mask(const char* name)
: TAlmanac_mask(name), _cal(TDate(TODAY).year())
{
activate_almanac(F_ALMANAC, "");
}
class TConf_Lavanderie : public TConfig_application class TConf_Lavanderie : public TConfig_application
{ {
TConf_lavanderie_mask * _mask; TConf_lavanderie_mask * _mask;
@ -92,10 +98,7 @@ public:
TMask* TConf_Lavanderie::create_mask(const TFilename & f) TMask* TConf_Lavanderie::create_mask(const TFilename & f)
{ {
if (_mask == NULL) if (_mask == NULL)
{
_mask = new TConf_lavanderie_mask(f); _mask = new TConf_lavanderie_mask(f);
_mask->activate_almanac(F_ALMANAC, 0, TDate(TODAY));
}
return _mask; return _mask;
} }

View File

@ -7,19 +7,54 @@ BEGIN
PROMPT -14 -1 "" PROMPT -14 -1 ""
END END
BUTTON DLG_NULL 10 2
BEGIN
PROMPT -1 -1 ""
END
BUTTON F_PREVYEAR 10 2
BEGIN
PROMPT 3 1 "~Anno -"
PICTURE BMP_FIRSTREC
END
BUTTON F_PREVMONTH 10 2
BEGIN
PROMPT 4 1 "~Mese -"
PICTURE BMP_PREVREC
END
BUTTON F_NEXTMONTH 10 2
BEGIN
PROMPT 5 1 "Mese +"
PICTURE BMP_NEXTREC
END
BUTTON F_NEXTYEAR 10 2
BEGIN
PROMPT 6 1 "~Anno +"
PICTURE BMP_LASTREC
END
BUTTON DLG_NULL 10 2
BEGIN
PROMPT -1 -1 ""
END
BUTTON DLG_INFO 10 2 BUTTON DLG_INFO 10 2
BEGIN BEGIN
PROMPT -24 -11 "" PROMPT 7 1 ""
END END
BUTTON DLG_HELP 10 2 BUTTON DLG_HELP 10 2
BEGIN BEGIN
PROMPT -34 -11 "" PROMPT 8 1 ""
END END
BUTTON DLG_QUIT 10 2 BUTTON DLG_QUIT 10 2
BEGIN BEGIN
PROMPT -44 -1 "" PROMPT 9 1 "~Fine"
MESSAGE EXIT,K_QUIT
END END
ENDPAGE ENDPAGE
@ -336,35 +371,11 @@ ENDPAGE
PAGE "Calendario" 0 2 0 0 PAGE "Calendario" 0 2 0 0
ALMANAC F_ALMANAC 60 16 ALMANAC F_ALMANAC 60 -2
BEGIN BEGIN
PROMPT -3 1 "" PROMPT -3 1 ""
END END
BUTTON F_PREVMONTH 10 2
BEGIN
PROMPT -26 -1 "~Precedente"
PICTURE BMP_PREVREC
END
LIST F_CHANGEMONTH 10
BEGIN
PROMPT -36 -1 ""
FLAGS "M"
END
NUMBER F_CHANGEYEAR 10
BEGIN
PROMPT -46 -1 ""
FLAGS "A"
END
BUTTON F_NEXTMONTH 10 2
BEGIN
PROMPT -56 -1 "S~uccessivo"
PICTURE BMP_NEXTREC
END
ENDPAGE ENDPAGE
ENDMASK ENDMASK