commit 3915bcc14d6b5323983be0bbfaabca49866bffaa
parent f4c923284d2c031db342ff84ac9737e9b0771284
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Sat, 16 Feb 2008 11:19:56 -0800
Merge branch 'draft-colors' into next
Diffstat:
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/bin/sup b/bin/sup
@@ -138,6 +138,8 @@ begin
Ncurses::A_BOLD
c.add :index_starred_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK,
Ncurses::A_BOLD
+ c.add :index_draft_color, Ncurses::COLOR_RED, Ncurses::COLOR_BLACK,
+ Ncurses::A_BOLD
c.add :labellist_old_color, Ncurses::COLOR_WHITE, Ncurses::COLOR_BLACK
c.add :labellist_new_color, Ncurses::COLOR_WHITE, Ncurses::COLOR_BLACK,
Ncurses::A_BOLD
diff --git a/lib/sup/modes/inbox-mode.rb b/lib/sup/modes/inbox-mode.rb
@@ -9,7 +9,7 @@ class InboxMode < ThreadIndexMode
end
def initialize
- super [:inbox, :sent], { :label => :inbox, :skip_killed => true }
+ super [:inbox, :sent, :draft], { :label => :inbox, :skip_killed => true }
raise "can't have more than one!" if defined? @@instance
@@instance = self
end
diff --git a/lib/sup/modes/thread-index-mode.rb b/lib/sup/modes/thread-index-mode.rb
@@ -655,7 +655,6 @@ protected
date = t.date.to_nice_s
- new = t.has_label?(:unread)
starred = t.has_label?(:starred)
## format the from column
@@ -692,7 +691,9 @@ protected
p = dp || t.participants.any? { |p| AccountManager.is_account? p }
subj_color =
- if new
+ if t.has_label?(:draft)
+ :index_draft_color
+ elsif t.has_label?(:unread)
:index_new_color
elsif starred
:index_starred_color