added coloring for flagged msg in sidebar + fixed flagging
git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@92
e385b8ad-14ed-0310-8656-
cc95a2468c6d
}
tmp->msgcount = 0;
tmp->msg_unread = 0;
}
tmp->msgcount = 0;
tmp->msg_unread = 0;
while ((de = readdir (dirp)) != NULL)
{
char *p;
while ((de = readdir (dirp)) != NULL)
{
char *p;
{ "underline", MT_COLOR_UNDERLINE },
{ "index", MT_COLOR_INDEX },
{ "sidebar_new", MT_COLOR_NEW },
{ "underline", MT_COLOR_UNDERLINE },
{ "index", MT_COLOR_INDEX },
{ "sidebar_new", MT_COLOR_NEW },
+ { "sidebar_flagged", MT_COLOR_FLAGGED },
MT_COLOR_UNDERLINE,
MT_COLOR_INDEX,
MT_COLOR_NEW,
MT_COLOR_UNDERLINE,
MT_COLOR_INDEX,
MT_COLOR_NEW,
char *make_sidebar_entry(char *box, int size, int new, int flagged)
{
char *c;
char *make_sidebar_entry(char *box, int size, int new, int flagged)
{
char *c;
- int i = 0, dlen = mutt_strlen (SidebarDelim);
+ int i = 0, dlen = mutt_strlen (SidebarDelim), max = SidebarWidth-dlen-1,
+ shortened = 0;
c = realloc(entry, SidebarWidth + 1);
if ( c ) entry = c;
c = realloc(entry, SidebarWidth + 1);
if ( c ) entry = c;
- if (option(OPTSHORTENHIERARCHY)) {
+ max -= quick_log10(size);
+ if (new)
+ max -= quick_log10(new) + 2;
+ if (flagged > 0)
+ max -= quick_log10(flagged) + 2;
+ if (option(OPTSHORTENHIERARCHY) && mutt_strlen(box) > max) {
box = shortened_hierarchy(box);
box = shortened_hierarchy(box);
}
i = strlen(box);
strncpy( entry, box, i < SidebarWidth - dlen ? i :SidebarWidth - dlen);
}
i = strlen(box);
strncpy( entry, box, i < SidebarWidth - dlen ? i :SidebarWidth - dlen);
- if (option(OPTSHORTENHIERARCHY)) {
+ if (option(OPTSHORTENHIERARCHY) && shortened) {
free(box);
}
return entry;
free(box);
}
return entry;
for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP)); tmp = tmp->next ) {
if ( tmp == CurBuffy )
SETCOLOR(MT_COLOR_INDICATOR);
for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP)); tmp = tmp->next ) {
if ( tmp == CurBuffy )
SETCOLOR(MT_COLOR_INDICATOR);
+ else if ( tmp->msg_flagged > 0 )
+ SETCOLOR(MT_COLOR_FLAGGED);
else if ( tmp->msg_unread > 0 )
SETCOLOR(MT_COLOR_NEW);
else
else if ( tmp->msg_unread > 0 )
SETCOLOR(MT_COLOR_NEW);
else