diff --git a/changelog.md b/changelog.md index c91db3b..0495254 100644 --- a/changelog.md +++ b/changelog.md @@ -15,6 +15,7 @@ * Fixed an error in the audio player that was skipping the first track if you were in the last song and pressed "play next" in the menu bar or via the keystroke. * Chats with unread messages will be placed at the top of the chats section. When a chat buffer receives a new message, socializer will move the buffer to the first position in the chats list. This should make easier for everyone to determine which chats contain unread items. ([#24,](https://code.manuelcortez.net/manuelcortez/socializer/issues/24)) * In dialogs for displaying posts and comments, and also in the two edit boxes present in chat buffers, it is possible to select all by pressing Control+A. +* Now it is possible to remove friends directly from the friends buffer. There is a new option for this purpose in the context menu for the focused friend. After being removed, the person will be placed in the subscribers buffer. ## Changes in version 0.18 (21.01.2019) diff --git a/src/controller/buffers.py b/src/controller/buffers.py index cf036ea..6b4115f 100644 --- a/src/controller/buffers.py +++ b/src/controller/buffers.py @@ -1080,6 +1080,7 @@ class peopleBuffer(feedBuffer): widgetUtils.connect_event(m, widgetUtils.MENU, self.accept_friendship, menuitem=m.add) else: m = menus.peopleMenu(is_request=False) + widgetUtils.connect_event(m, widgetUtils.MENU, self.decline_friendship, menuitem=m.decline) # It is not allowed to send messages to people who is not your friends, so let's disable it if we're in a pending or outgoing requests folder. if "friend_requests" in self.name: m.message.Enable(False) @@ -1107,8 +1108,7 @@ class peopleBuffer(feedBuffer): return result = self.session.vk.client.friends.delete(user_id=person["id"]) if "friend_deleted" in result: - msg = _("You've deleted {user1_nom} from your friends.").format(**user,) - print(msg) + msg = _("You've removed {user1_nom} from your friends.").format(**user,) pub.sendMessage("notify", message=msg) self.session.db[self.name]["items"].pop(self.tab.list.get_selected()) self.tab.list.remove_item(self.tab.list.get_selected()) diff --git a/src/wxUI/menus.py b/src/wxUI/menus.py index 1777fb2..22ef5f4 100644 --- a/src/wxUI/menus.py +++ b/src/wxUI/menus.py @@ -58,6 +58,9 @@ class peopleMenu(wx.Menu): self.Append(self.timeline) self.common_friends = wx.MenuItem(self, wx.NewId(), _("View friends in common")) self.Append(self.common_friends) + if is_request == False and is_subscriber == False: + self.decline = wx.MenuItem(self, wx.NewId(), _("Remove from friends")) + self.Append(self.decline) def create_request_items(self): self.accept = wx.MenuItem(self, wx.NewId(), _("Accept"))