Skip to content

Trash threads in index and view modes #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Trash threads in index and view modes #589

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a6ca15
Trash is working on single and multiple threads.
e11o Oct 28, 2018
1687a20
Trash is working from thread_index for single and multiple threads.
e11o Oct 28, 2018
82654de
Merge branch 'trash-threads' of github.com:e11o/astroid into trash-th…
e11o Oct 28, 2018
d9cb57b
Adding trash entry to right-click menu on thread_index
e11o Oct 28, 2018
b7a347f
Sending to trash works in thread_view mode
e11o Oct 28, 2018
9e9db19
Merge branch 'master' into trash-threads
e11o Oct 29, 2018
c481bdc
Merge branch 'master' into trash-threads
e11o Apr 4, 2020
d463681
Changing trash keybindings
e11o Apr 18, 2020
5c0783d
Changing default key binding for trashing in index list to "d"
e11o Apr 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/actions/toggle_action.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,13 @@ namespace Astroid {
MuteAction::MuteAction (vector<refptr<NotmuchItem>> nmts)
: ToggleAction (nmts, "muted") {
}

TrashAction::TrashAction (refptr<NotmuchItem> nmt)
: ToggleAction (nmt, "trash") {
}

TrashAction::TrashAction (vector<refptr<NotmuchItem>> nmts)
: ToggleAction (nmts, "trash") {
}

}
6 changes: 6 additions & 0 deletions src/actions/toggle_action.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,11 @@ namespace Astroid {
MuteAction (std::vector<refptr<NotmuchItem>>);
};

class TrashAction : public ToggleAction {
public:
TrashAction (refptr<NotmuchItem>);
TrashAction (std::vector<refptr<NotmuchItem>>);
};

}

39 changes: 39 additions & 0 deletions src/modes/thread_index/thread_index_list_view.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,20 @@ namespace Astroid {
, PopupItem::Archive));
archive_i->set_tooltip_text ("Archive");

Gtk::Image * trash = Gtk::manage (new Gtk::Image ());
trash->set_from_icon_name ("edit-delete", Gtk::ICON_SIZE_LARGE_TOOLBAR);
Gtk::MenuItem * trash_i = Gtk::manage (new Gtk::MenuItem (*trash));
trash_i->signal_activate ().connect (
sigc::bind (
sigc::mem_fun (*this, &ThreadIndexListView::popup_activate_generic)
, PopupItem::Trash));
trash_i->set_tooltip_text ("Send to Trash");

item_popup.attach (*reply_i, 0, 1, 0, 1);
item_popup.attach (*forward_i, 1, 2, 0, 1);
item_popup.attach (*flag_i, 2, 3, 0, 1);
item_popup.attach (*archive_i, 3, 4, 0, 1);
item_popup.attach (*trash_i, 4, 5, 0, 1);

Gtk::MenuItem * sep = Gtk::manage (new Gtk::SeparatorMenuItem ());
item_popup.append (*sep);
Expand Down Expand Up @@ -487,6 +497,11 @@ namespace Astroid {
"Toggle archive",
bind (&ThreadIndexListView::multi_key_handler, this, MArchive, _1));

multi_keys.register_key (Key (GDK_KEY_Delete),
"thread_index.multi.trash",
"Toggle trash",
bind (&ThreadIndexListView::multi_key_handler, this, MTrash, _1));

multi_keys.register_key ("S",
"thread_index.multi.mark_spam",
"Toggle spam",
Expand Down Expand Up @@ -875,6 +890,17 @@ namespace Astroid {
return true;
});

keys->register_key (Key (GDK_KEY_Delete), "thread_index.trash",
"Toggle 'trash' tag on thread",
[&] (Key) {
auto thread = get_current_thread ();
if (thread) {
main_window->actions->doit (refptr<Action>(new TrashAction(thread)));
}

return true;
});

keys->register_key (Key (GDK_KEY_asterisk), "thread_index.flag",
"Toggle 'flagged' tag on thread",
[&] (Key) {
Expand Down Expand Up @@ -1045,6 +1071,7 @@ namespace Astroid {
case MSpam:
case MMute:
case MArchive:
case MTrash:
case MTag:
{
vector<refptr<NotmuchItem>> threads;
Expand All @@ -1068,6 +1095,10 @@ namespace Astroid {
a = refptr<Action>(new ToggleAction(threads, "inbox"));
break;

case MTrash:
a = refptr<Action>(new TrashAction(threads));
break;

case MFlag:
a = refptr<Action>(new ToggleAction(threads, "flagged"));
break;
Expand Down Expand Up @@ -1203,6 +1234,14 @@ namespace Astroid {
}
break;

case Trash:
{
if (thread) {
main_window->actions->doit (refptr<Action>(new TrashAction(thread)));
}
}
break;

case Open:
{
if (thread) {
Expand Down
2 changes: 2 additions & 0 deletions src/modes/thread_index/thread_index_list_view.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ namespace Astroid {
MUnread = 0,
MFlag,
MArchive,
MTrash,
MSpam,
MMute,
MToggle,
Expand All @@ -103,6 +104,7 @@ namespace Astroid {
Forward,
Flag,
Archive,
Trash,
Open,
OpenNewWindow,
};
Expand Down
65 changes: 65 additions & 0 deletions src/modes/thread_view/thread_view.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,6 +1385,20 @@ namespace Astroid {
return true;
});

keys.register_key (Key (GDK_KEY_BackSpace),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it sometimes Backspace and sometimes Delete? Should always be the same I think. I think that we can use d

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will look again but I believe d is already taken in the default keybindings for one of the modes.

"thread_view.trash_thread",
"Toggle 'trash' tag on the whole thread",
[&] (Key) {

if (!edit_mode && focused_message) {
if (thread) {
main_window->actions->doit (refptr<Action>(new TrashAction(thread)));
}
}

return true;
});

keys.register_key ("C-P",
"thread_view.print",
"Print focused message",
Expand Down Expand Up @@ -1568,6 +1582,16 @@ namespace Astroid {
return true;
});

next_multi.register_key (UnboundKey(),
"thread_view.multi_next_thread.trash",
"Trash and goto next",
[&] (Key) {
keys.handle ("thread_view.trash_thread");
emit_index_action (IA_Next);

return true;
});

next_multi.register_key (Key ("A"),
"thread_view.multi_next_thread.archive_next_unread_thread",
"Archive, goto next unread",
Expand All @@ -1578,6 +1602,16 @@ namespace Astroid {
return true;
});

next_multi.register_key (UnboundKey(),
"thread_view.multi_next_thread.trash_next_unread_thread",
"Trash and goto next unread",
[&] (Key) {
keys.handle ("thread_view.archive_trash");
emit_index_action (IA_NextUnread);

return true;
});

next_multi.register_key (Key ("x"),
"thread_view.multi_next_thread.close",
"Archive, close",
Expand All @@ -1588,6 +1622,16 @@ namespace Astroid {
return true;
});

next_multi.register_key (Key (GDK_KEY_Delete),
"thread_view.multi_next_thread.trash_close",
"Trash and close",
[&] (Key) {
keys.handle ("thread_view.trash_thread");
close ();

return true;
});

next_multi.register_key (Key ("j"),
"thread_view.multi_next_thread.next_thread",
"Goto next",
Expand Down Expand Up @@ -1646,6 +1690,27 @@ namespace Astroid {
return next_multi.handle ("thread_view.multi_next_thread.close");
});

keys.register_key (UnboundKey (),
"thread_view.trash_then_next",
"Alias for thread_view.multi_next_thread.trash",
[&] (Key) {
return next_multi.handle ("thread_view.multi_next_thread.trash");
});

keys.register_key (UnboundKey (),
"thread_view.trash_then_next_unread",
"Alias for thread_view.multi_next_thread.trash_next_unread",
[&] (Key) {
return next_multi.handle ("thread_view.multi_next_thread.trash_next_unread_thread");
});

keys.register_key (Key (GDK_KEY_Delete),
"thread_view.trash_and_close",
"Alias for thread_view.multi_next_thread.trash_close",
[&] (Key) {
return next_multi.handle ("thread_view.multi_next_thread.trash_close");
});

keys.register_key (UnboundKey (),
"thread_view.next_thread",
"Alias for thread_view.multi_next_thread.next_thread",
Expand Down