k.add :activate_chunk, "Expand/collapse or activate item", :enter
k.add :expand_all_messages, "Expand/collapse all messages", 'E'
k.add :edit_draft, "Edit draft", 'e'
+ k.add :send_draft, "Send draft", 'y'
k.add :edit_labels, "Edit or add labels for a thread", 'l'
k.add :expand_all_quotes, "Expand/collapse all quotes in a message", 'o'
k.add :jump_to_next_open, "Jump to next open message", 'n'
def subscribe_to_list
m = @message_lines[curpos] or return
if m.list_subscribe && m.list_subscribe =~ /<mailto:(.*?)\?(subject=(.*?))>/
- ComposeMode.spawn_nicely :from => AccountManager.account_for(m.recipient_email), :to => [PersonManager.person_for($1)], :subj => $3
+ ComposeMode.spawn_nicely :from => AccountManager.account_for(m.recipient_email), :to => [Person.from_address($1)], :subj => $3
else
BufferManager.flash "Can't find List-Subscribe header for this message."
end
def unsubscribe_from_list
m = @message_lines[curpos] or return
if m.list_unsubscribe && m.list_unsubscribe =~ /<mailto:(.*?)\?(subject=(.*?))>/
- ComposeMode.spawn_nicely :from => AccountManager.account_for(m.recipient_email), :to => [PersonManager.person_for($1)], :subj => $3
+ ComposeMode.spawn_nicely :from => AccountManager.account_for(m.recipient_email), :to => [Person.from_address($1)], :subj => $3
else
BufferManager.flash "Can't find List-Unsubscribe header for this message."
end
def compose
p = @person_lines[curpos]
if p
- ComposeMode.spawn_nicely :to => [p]
+ ComposeMode.spawn_nicely :to_default => p
else
ComposeMode.spawn_nicely
end
def edit_as_new
m = @message_lines[curpos] or return
- mode = ComposeMode.new(:body => m.quotable_body_lines, :to => m.to, :cc => m.cc, :subj => m.subj, :bcc => m.bcc)
+ mode = ComposeMode.new(:body => m.quotable_body_lines, :to => m.to, :cc => m.cc, :subj => m.subj, :bcc => m.bcc, :refs => m.refs, :replytos => m.replytos)
BufferManager.spawn "edit as new", mode
mode.edit_message
end
chunk = @chunk_lines[curpos] or return
case chunk
when Chunk::Attachment
- fn = BufferManager.ask_for_filename :filename, "Save attachment to file: ", chunk.filename
+ default_dir = File.join(($config[:default_attachment_save_dir] || "."), chunk.filename)
+ fn = BufferManager.ask_for_filename :filename, "Save attachment to file: ", default_dir
save_to_file(fn) { |f| f.print chunk.raw_content } if fn
else
m = @message_lines[curpos]
end
end
+ def send_draft
+ m = @message_lines[curpos] or return
+ if m.is_draft?
+ mode = ResumeMode.new m
+ BufferManager.spawn "Send message", mode
+ BufferManager.kill_buffer self.buffer
+ mode.send_message
+ else
+ BufferManager.flash "Not a draft message!"
+ end
+ end
+
def jump_to_first_open loose_alignment=false
m = @message_lines[0] or return
if @layout[m].state != :closed
(0 ... text.length).each do |i|
@chunk_lines[@text.length + i] = m
@message_lines[@text.length + i] = m
- lw = text[i].flatten.select { |x| x.is_a? String }.map { |x| x.length }.sum
+ lw = text[i].flatten.select { |x| x.is_a? String }.map { |x| x.display_length }.sum
end
@text += text
(0 ... text.length).each do |i|
@chunk_lines[@text.length + i] = c
@message_lines[@text.length + i] = m
- lw = text[i].flatten.select { |x| x.is_a? String }.map { |x| x.length }.sum - (depth * INDENT_SPACES)
+ lw = text[i].flatten.select { |x| x.is_a? String }.map { |x| x.display_length }.sum - (depth * INDENT_SPACES)
l.width = lw if lw > l.width
end
@text += text
open_widget = [color, (state == :closed ? "+ " : "- ")]
new_widget = [color, (m.has_label?(:unread) ? "N" : " ")]
- starred_widget =
- if m.has_label?(:starred)
- [star_color, "* "]
+ starred_widget = if m.has_label?(:starred)
+ [star_color, "*"]
else
- [color, " "]
+ [color, " "]
end
+ attach_widget = [color, (m.has_label?(:attachment) ? "@" : " ")]
case state
when :open
@person_lines[start] = m.from
- [[prefix_widget, open_widget, new_widget, starred_widget,
+ [[prefix_widget, open_widget, new_widget, attach_widget, starred_widget,
[color,
"#{m.from ? m.from.mediumname : '?'} to #{m.recipients.map { |l| l.shortname }.join(', ')} #{m.date.to_nice_s} (#{m.date.to_nice_distance_s})"]]]
when :closed
@person_lines[start] = m.from
- [[prefix_widget, open_widget, new_widget, starred_widget,
+ [[prefix_widget, open_widget, new_widget, attach_widget, starred_widget,
[color,
"#{m.from ? m.from.mediumname : '?'}, #{m.date.to_nice_s} (#{m.date.to_nice_distance_s}) #{m.snippet}"]]]
when :detailed
@person_lines[start] = m.from
- from_line = [[prefix_widget, open_widget, new_widget, starred_widget,
+ from_line = [[prefix_widget, open_widget, new_widget, attach_widget, starred_widget,
[color, "From: #{m.from ? format_person(m.from) : '?'}"]]]
addressee_lines = []
def format_person_list prefix, people
ptext = people.map { |p| format_person p }
- pad = " " * prefix.length
+ pad = " " * prefix.display_length
[prefix + ptext.first + (ptext.length > 1 ? "," : "")] +
ptext[1 .. -1].map_with_index do |e, i|
pad + e + (i == ptext.length - 1 ? "" : ",")
[[[:missing_message_color, "#{prefix}<an unreceived message>"]]]
when Message
message_patina_lines(chunk, state, start, parent, prefix, color, star_color) +
- (chunk.is_draft? ? [[[:draft_notification_color, prefix + " >>> This message is a draft. To edit, hit 'e'. <<<"]]] : [])
+ (chunk.is_draft? ? [[[:draft_notification_color, prefix + " >>> This message is a draft. Hit 'e' to edit, 'y' to send. <<<"]]] : [])
else
raise "Bad chunk: #{chunk.inspect}" unless chunk.respond_to?(:inlineable?) ## debugging
projects / sup / blobdiff