k.add :toggle_tagged, "Tag/untag selected thread", 't'
k.add :toggle_tagged_all, "Tag/untag all threads", 'T'
k.add :tag_matching, "Tag matching threads", 'g'
- k.add :apply_to_tagged, "Apply next command to all tagged threads", '+'
+ k.add :apply_to_tagged, "Apply next command to all tagged threads", '+', '='
k.add :join_threads, "Force tagged threads to be joined into the same thread", '#'
k.add :undo, "Undo the previous action", 'u'
end
end
end
+ ## returns an undo lambda
def actually_toggle_starred t
- thread = t # cargo cult programming
pos = curpos
if t.has_label? :starred # if ANY message has a star
- undo = lambda {
- thread.first.add_label :starred
- update_text_for_line pos
- UpdateManager.relay self, :starred, thread.first
- }
t.remove_label :starred # remove from all
UpdateManager.relay self, :unstarred, t.first
+ lambda do
+ t.first.add_label :starred
+ UpdateManager.relay self, :starred, t.first
+ regen_text
+ end
else
- undo = lambda {
- thread.remove_label :starred
- update_text_for_line pos
- UpdateManager.relay self, :unstarred, thread.first
- }
t.first.add_label :starred # add only to first
UpdateManager.relay self, :starred, t.first
+ lambda do
+ t.remove_label :starred
+ UpdateManager.relay self, :unstarred, t.first
+ regen_text
+ end
end
-
- return undo
end
def toggle_starred
t = cursor_thread or return
undo = actually_toggle_starred t
- UndoManager.register("starring/unstarring thread #{t.first.id}",undo)
+ UndoManager.register "toggling thread starred status", undo
update_text_for_line curpos
cursor_down
end
def multi_toggle_starred threads
- undo = threads.map { |t| actually_toggle_starred t }
- UndoManager.register("starring/unstarring #{threads.size} #{threads.size.pluralize 'thread'}",
- undo)
+ UndoManager.register "toggling #{threads.size.pluralize 'thread'} starred status",
+ threads.map { |t| actually_toggle_starred t }
regen_text
end
+ ## returns an undo lambda
def actually_toggle_archived t
thread = t
pos = curpos
if t.has_label? :inbox
t.remove_label :inbox
- undo = lambda {
+ UpdateManager.relay self, :archived, t.first
+ lambda do
thread.apply_label :inbox
update_text_for_line pos
UpdateManager.relay self,:unarchived, thread.first
- }
- UpdateManager.relay self, :archived, t.first
+ end
else
t.apply_label :inbox
- undo = lambda {
+ UpdateManager.relay self, :unarchived, t.first
+ lambda do
thread.remove_label :inbox
update_text_for_line pos
UpdateManager.relay self, :unarchived, thread.first
- }
- UpdateManager.relay self, :unarchived, t.first
+ end
end
-
- return undo
end
+ ## returns an undo lambda
def actually_toggle_spammed t
thread = t
if t.has_label? :spam
- undo = lambda {
- thread.apply_label :spam
- self.hide_thread thread
- UpdateManager.relay self,:spammed, thread.first
- }
t.remove_label :spam
add_or_unhide t.first
UpdateManager.relay self, :unspammed, t.first
+ lambda do
+ thread.apply_label :spam
+ self.hide_thread thread
+ UpdateManager.relay self,:spammed, thread.first
+ end
else
- undo = lambda {
- thread.remove_label :spam
- add_or_unhide thread.first
- UpdateManager.relay self,:unspammed, thread.first
- }
t.apply_label :spam
hide_thread t
UpdateManager.relay self, :spammed, t.first
+ lambda do
+ thread.remove_label :spam
+ add_or_unhide thread.first
+ UpdateManager.relay self,:unspammed, thread.first
+ end
end
-
- return undo
end
+ ## returns an undo lambda
def actually_toggle_deleted t
if t.has_label? :deleted
- undo = lambda {
- t.apply_label :deleted
- hide_thread t
- UpdateManager.relay self, :deleted, t.first
- }
t.remove_label :deleted
add_or_unhide t.first
UpdateManager.relay self, :undeleted, t.first
+ lambda do
+ t.apply_label :deleted
+ hide_thread t
+ UpdateManager.relay self, :deleted, t.first
+ end
else
- undo = lambda {
+ t.apply_label :deleted
+ hide_thread t
+ UpdateManager.relay self, :deleted, t.first
+ lambda do
t.remove_label :deleted
add_or_unhide t.first
UpdateManager.relay self, :undeleted, t.first
- }
- t.apply_label :deleted
- hide_thread t
- UpdateManager.relay self, :deleted, t.first
+ end
end
-
- return undo
end
def toggle_archived
t = cursor_thread or return
- undo = [actually_toggle_archived(t), lambda {self.update_text_for_line curpos}]
- UndoManager.register("deleting/undeleting thread #{t.first.id}",undo)
+ undo = actually_toggle_archived t
+ UndoManager.register "deleting/undeleting thread #{t.first.id}", undo, lambda { update_text_for_line curpos }
update_text_for_line curpos
end
def multi_toggle_archived threads
- undo = threads.map { |t| actually_toggle_archived t}
- UndoManager.register("deleting/undeleting #{threads.size} #{threads.size.pluralize 'thread'}",
- undo << lambda {self.regen_text})
+ undos = threads.map { |t| actually_toggle_archived t }
+ UndoManager.register "deleting/undeleting #{threads.size.pluralize 'thread'}", undos, lambda { regen_text }
regen_text
end
## see deleted or spam emails, and when you undelete or unspam them
## you also want them to disappear immediately.
def multi_toggle_spam threads
- undo = threads.map{ |t| actually_toggle_spammed t}
- UndoManager.register("marking/unmarking #{threads.size} #{threads.size.pluralize 'thread'} as spam",
- undo << lambda {self.regen_text})
+ undos = threads.map { |t| actually_toggle_spammed t }
+ UndoManager.register "marking/unmarking #{threads.size.pluralize 'thread'} as spam",
+ undos, lambda { regen_text }
regen_text
end
## see comment for multi_toggle_spam
def multi_toggle_deleted threads
- undo = threads.map{ |t| actually_toggle_deleted t}
- UndoManager.register("deleting/undeleting #{threads.size} #{threads.size.pluralize 'thread'}",
- undo << lambda {regen_text})
+ undos = threads.map { |t| actually_toggle_deleted t }
+ UndoManager.register "deleting/undeleting #{threads.size.pluralize 'thread'}",
+ undos, lambda { regen_text }
regen_text
end
## m-m-m-m-MULTI-KILL
def multi_kill threads
- undo = threads.map do |t|
+ UndoManager.register "killing #{threads.size.pluralize 'thread'}" do
+ threads.each do |t|
+ t.remove_label :killed
+ add_or_unhide t.first
+ end
+ regen_text
+ end
+
+ threads.each do |t|
t.apply_label :killed
hide_thread t
- thread = t
- lambda { thread.remove_label :killed
- add_or_unhide thread.first
- }
end
- UndoManager.register("killing #{threads.size} #{threads.size.pluralize 'thread'}",
- undo << lambda {regen_text})
+
regen_text
- BufferManager.flash "#{threads.size.pluralize 'Thread'} killed."
+ BufferManager.flash "#{threads.size.pluralize 'thread'} killed."
end
def save background=true
user_labels.each { |l| LabelManager << l }
update_text_for_line curpos
- undo = lambda{
+ UndoManager.register "labeling thread #{thread.first.id}" do
thread.labels = old_labels
update_text_for_line pos
UpdateManager.relay self, :labeled, thread.first
- }
-
- UndoManager.register("labeling thread #{thread.first.id}", undo)
+ end
UpdateManager.relay self, :labeled, thread.first
end
user_labels.map! { |l| (l.to_s =~ /^-/)? [l.to_s.gsub(/^-?/, '').to_sym, true] : [l, false] }
hl = user_labels.select { |(l,_)| @hidden_labels.member? l }
- if hl.empty?
- undo = threads.map do |t|
- old_labels = t.labels
- user_labels.each do |(l, to_remove)|
- if to_remove
- t.remove_label l
- else
- t.apply_label l
- end
- end
- ## UpdateManager or some other regresh mechanism?
- UpdateManager.relay self, :labeled, t.first
- lambda do
- t.labels = old_labels
- UpdateManager.relay self, :labeled, t.first
+ unless hl.empty?
+ BufferManager.flash "'#{hl}' is a reserved label!"
+ return
+ end
+
+ old_labels = threads.map { |t| t.labels.dup }
+
+ threads.each do |t|
+ user_labels.each do |(l, to_remove)|
+ if to_remove
+ t.remove_label l
+ else
+ t.apply_label l
end
+ LabelManager << l
end
- user_labels.each { |(l,_)| LabelManager << l }
- UndoManager.register("labeling #{threads.size} #{threads.size.pluralize 'thread'}",
- undo << lambda { regen_text})
- else
- BufferManager.flash "'#{hl}' is a reserved label!"
+ UpdateManager.relay self, :labeled, t.first
end
+
regen_text
+
+ UndoManager.register "labeling #{threads.size.pluralize 'thread'}" do
+ threads.zip(old_labels).map do |t, old_labels|
+ t.labels = old_labels
+ UpdateManager.relay self, :labeled, t.first
+ end
+ regen_text
+ end
end
def reply
date = t.date.to_nice_s
- starred = t.has_label?(:starred)
+ starred = t.has_label? :starred
## format the from column
cur_width = 0
projects / sup / blobdiff