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

Patch level : 12.0 532

Browse Source 
Files correlati     : ba
Commento            : 
- Aggiunto numero di patch da installare nell'interfaccia metro (stavo facendo dei test per capire come funziona)
- Aggiunto nuovo loghino Si Sirio nello stesso posto della faccina (ovviamente per i power_seller si vede la faccina)

git-svn-id: svn://10.65.10.50/branches/R_10_00@24370 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2018-02-12 16:52:13 +00:00
parent 92bbd9e862
commit 67f807899e
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ba/ba0103.cpp
View File

@ -10,6 +10,7 @@
#include <utility.h> #include <utility.h>
enum { DLG_TREE = 101, DLG_LOOK = 102, DLG_MAIN = 103 }; enum { DLG_TREE = 101, DLG_LOOK = 102, DLG_MAIN = 103 };
#define SISIRIO_PATH "setup\\SI_made_in_sirio_200.jpg"
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// TApp_window & TBook_window declarations // TApp_window & TBook_window declarations
@ -34,7 +35,7 @@ public:
class TBook_window : public TControl_host_window class TBook_window : public TControl_host_window
{ {
TImage _logo, _back; TImage _logo, _back, _sisirio;
TAssoc_array _alfano; TAssoc_array _alfano;
protected: protected:
@ -131,6 +132,13 @@ void TBook_window::update()
set_logo(get_logo()); set_logo(get_logo());
if (_logo.ok()) if (_logo.ok())
_logo.draw(w, rctw, 'R', 'B', '-'); // Disegna logo in basso _logo.draw(w, rctw, 'R', 'B', '-'); // Disegna logo in basso
if (!_sisirio.ok())
{
_sisirio.load(SISIRIO_PATH);
}
// Faccio lo stesso controllo (Con "!" davanti) della faccina sviluppatore
if (_sisirio.ok() && !(is_power_reseller() && ini_get_int(CONFIG_GUI, "Colors", "TreeView", 3) >= 2))
_sisirio.draw(win(), rctw, 'R', 'T', '-');
const PNT mouse = { 0, 0 }; const PNT mouse = { 0, 0 };
draw_spider(w, 0x3, mouse); draw_spider(w, 0x3, mouse);
@ -468,7 +476,7 @@ void TBook_window::kill_processes()
TBook_window::TBook_window(int x, int y, int dx, int dy, TBook_window::TBook_window(int x, int y, int dx, int dy,
WINDOW parent, TWindowed_field* owner) WINDOW parent, TWindowed_field* owner)
: TControl_host_window(x, y, dx, dy, parent, owner), _logo(""), _back("") : TControl_host_window(x, y, dx, dy, parent, owner), _logo(""), _back(""), _sisirio("")
{ {
} }

9
src/ba/ba0105.cpp
View File

@ -204,6 +204,7 @@ protected:
virtual COLOR back() const { return _updates > 0 ? FOCUS_BACK_COLOR : TMetro_cell::back(); } virtual COLOR back() const { return _updates > 0 ? FOCUS_BACK_COLOR : TMetro_cell::back(); }
virtual const TString& message() const; virtual const TString& message() const;
public: public:
const TString& caption() const;
TMetro_setup_cell(const TMenuitem& mi, int cnt, const TDate& last); TMetro_setup_cell(const TMenuitem& mi, int cnt, const TDate& last);
}; };
@ -214,6 +215,14 @@ const TString& TMetro_setup_cell::message() const
return tmp; return tmp;
} }
const TString& TMetro_setup_cell::caption() const
{
TString& caption = get_tmp_string();
caption << TMetro_cell::caption() << " (" << _updates << ")";
return caption;
}
// Metro auto update
TMetro_setup_cell::TMetro_setup_cell(const TMenuitem& mi, int cnt, const TDate& last) : TMetro_cell(mi, cnt, last), _updates(0) TMetro_setup_cell::TMetro_setup_cell(const TMenuitem& mi, int cnt, const TDate& last) : TMetro_cell(mi, cnt, last), _updates(0)
{ {
const TDongle& don = dongle(); const TDongle& don = dongle();