From 041685ab02e612005b89bc073e97b9d4e58b3fe7 Mon Sep 17 00:00:00 2001 From: Stas Degteff Date: Mon, 3 Oct 2005 15:56:54 +0000 Subject: [PATCH] New color config file item: "COLOR HEADER LOCATION" --- cfgs/config/gedcolor.cfg | 1 + cfgs/config/gedcolor.rus | 2 ++ golded3/gcmisc.cpp | 4 ++++ golded3/geall.h | 2 ++ golded3/geread.cpp | 1 + golded3/geview.cpp | 3 ++- golded3/geview.h | 1 + 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cfgs/config/gedcolor.cfg b/cfgs/config/gedcolor.cfg index 0846a5d..65df3db 100644 --- a/cfgs/config/gedcolor.cfg +++ b/cfgs/config/gedcolor.cfg @@ -48,6 +48,7 @@ COLOR HEADER WINDOW LGrey on Black ; header text COLOR HEADER FROM LGrey on Black ; header from field COLOR HEADER TO LGrey on Black ; header to field COLOR HEADER SUBJECT LGrey on Black ; header subject +COLOR HEADER LOCATION LGrey on Black ; header location field // Help Screens COLOR HELP BTYPE 0 ; help border type diff --git a/cfgs/config/gedcolor.rus b/cfgs/config/gedcolor.rus index 95ca6cd..b99104c 100644 --- a/cfgs/config/gedcolor.rus +++ b/cfgs/config/gedcolor.rus @@ -109,6 +109,7 @@ ; HEADER FROM Header From field. ; HEADER TO Header To field. ; HEADER SUBJECT Header Subject field. +; HEADER LOCATION Header location field. ; ; The FROM/TO/SUBJECT colors supplement the HEADER WINDOW color. Note ; that WINDOW will also set the FROM/TO/SUBJECT colors, so remember to @@ -265,6 +266,7 @@ COLOR HEADER HIGHLIGHT Yellow on Blue COLOR HEADER INPUT Black on Red COLOR HEADER TITLE LGreen on Blue COLOR HEADER WINDOW LGrey on Blue +COLOR HEADER LOCATION LGrey on Black // ==== Хелп вызываемый по F1 ==== diff --git a/golded3/gcmisc.cpp b/golded3/gcmisc.cpp index 706dd9e..ea55f8e 100644 --- a/golded3/gcmisc.cpp +++ b/golded3/gcmisc.cpp @@ -136,6 +136,7 @@ const word CRC_WINDOW = 0xCEFE; const word CRC_FROM = 0x9290; const word CRC_TO = 0x544F; const word CRC_SUBJECT = 0xF861; +const word CRC_LOCATION = 0x9E67; const word CRC_KLUDGE = 0xA600; const word CRC_HIDDEN = 0xE465; const word CRC_TAGLINE = 0xC328; @@ -497,6 +498,9 @@ void GetColors(char* value) { case CRC_SUBJECT: wptr->_Subject = attr; break; + case CRC_LOCATION: + wptr->_Location = attr; + break; case CRC_KLUDGE: wptr->_Kludge = attr; break; diff --git a/golded3/geall.h b/golded3/geall.h index db93811..d05b29f 100644 --- a/golded3/geall.h +++ b/golded3/geall.h @@ -650,6 +650,7 @@ struct SaveUtil { #define _Highlight c[4] #define _Noselect c[5] #define _Kludge c[5] +#define _Location c[5] #define _Tearline c[6] #define _Edit c[6] #define _Block c[7] @@ -733,6 +734,7 @@ struct SaveUtil { #define C_HEADBY GC_HEAD_._From #define C_HEADTO GC_HEAD_._To #define C_HEADRE GC_HEAD_._Subject +#define C_HEADLOC GC_HEAD_._Location #define C_ASKW GC_ASK__._Window #define C_ASKB GC_ASK__._Border diff --git a/golded3/geread.cpp b/golded3/geread.cpp index b793a08..6f2c4b8 100644 --- a/golded3/geread.cpp +++ b/golded3/geread.cpp @@ -207,6 +207,7 @@ void Reader() { HeaderView->from_color = C_HEADBY; HeaderView->to_color = C_HEADTO; HeaderView->subject_color = C_HEADRE; + HeaderView->location_color = C_HEADLOC; HeaderView->Create(); BodyView->at_row = 6; diff --git a/golded3/geview.cpp b/golded3/geview.cpp index b3906a8..99dced7 100644 --- a/golded3/geview.cpp +++ b/golded3/geview.cpp @@ -39,6 +39,7 @@ GMsgHeaderView::GMsgHeaderView() { at_row = at_column = width = height = 0; border_type = gwindow::bordertype_none; window_color = from_color = to_color = subject_color = BLUE|_LGREY; + location_color = BLUE|_LGREY; title_color = highlight_color = RED|_LGREY; border_color = YELLOW|_LGREY; } @@ -340,7 +341,7 @@ void GMsgHeaderView::Paint() { { loc += " "; int pos = window.width() - loc.length() - 1; - window.prints(5, pos, window_color, loc.c_str()); + window.prints(5, pos, location_color, loc.c_str()); } } } diff --git a/golded3/geview.h b/golded3/geview.h index ba968bd..6a61e47 100644 --- a/golded3/geview.h +++ b/golded3/geview.h @@ -58,6 +58,7 @@ public: int from_color; int to_color; int subject_color; + int location_color; void Use(Area *areaptr, GMsg *msgptr);