From a34eec8f4bd114ec8ff728fa89e396f1b9562a7d Mon Sep 17 00:00:00 2001
From: Cathal Garvey <cathalgarvey@cathalgarvey.me>
Date: Tue, 19 Feb 2013 12:42:42 +0000
Subject: [PATCH 1/2] Minor UI change to Addressbook tab.

Modified layout of rightclick-on-key to reduce odds of accidentally
deleting keys. Yes, this happened to me. Five times on the same key. :s
---
 bitmessagemain.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bitmessagemain.py b/bitmessagemain.py
index 9c968ac1..a39ff398 100755
--- a/bitmessagemain.py
+++ b/bitmessagemain.py
@@ -3232,10 +3232,10 @@ class MyForm(QtGui.QMainWindow):
         #Popup menu for the Address Book page
         self.ui.addressBookContextMenuToolbar = QtGui.QToolBar()
           # Actions
-        self.actionAddressBookNew = self.ui.addressBookContextMenuToolbar.addAction("New", self.on_action_AddressBookNew)
-        self.actionAddressBookDelete = self.ui.addressBookContextMenuToolbar.addAction("Delete", self.on_action_AddressBookDelete)
-        self.actionAddressBookClipboard = self.ui.addressBookContextMenuToolbar.addAction("Copy address to clipboard", self.on_action_AddressBookClipboard)
         self.actionAddressBookSend = self.ui.addressBookContextMenuToolbar.addAction("Send message to this address", self.on_action_AddressBookSend)
+        self.actionAddressBookClipboard = self.ui.addressBookContextMenuToolbar.addAction("Copy address to clipboard", self.on_action_AddressBookClipboard)
+        self.actionAddressBookNew = self.ui.addressBookContextMenuToolbar.addAction("Add New Address", self.on_action_AddressBookNew)
+        self.actionAddressBookDelete = self.ui.addressBookContextMenuToolbar.addAction("Delete", self.on_action_AddressBookDelete)
         self.ui.tableWidgetAddressBook.setContextMenuPolicy( QtCore.Qt.CustomContextMenu )
         self.connect(self.ui.tableWidgetAddressBook, QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), self.on_context_menuAddressBook)
         self.popMenuAddressBook = QtGui.QMenu( self )

From dca9b31367885aac3def3c0f99c012b4dceddaa0 Mon Sep 17 00:00:00 2001
From: Cathal Garvey <cathalgarvey@cathalgarvey.me>
Date: Tue, 19 Feb 2013 13:38:25 +0000
Subject: [PATCH 2/2] Reording menu items and not just handlers. Derp.

---
 bitmessagemain.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bitmessagemain.py b/bitmessagemain.py
index a39ff398..0f17097d 100755
--- a/bitmessagemain.py
+++ b/bitmessagemain.py
@@ -3239,12 +3239,11 @@ class MyForm(QtGui.QMainWindow):
         self.ui.tableWidgetAddressBook.setContextMenuPolicy( QtCore.Qt.CustomContextMenu )
         self.connect(self.ui.tableWidgetAddressBook, QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), self.on_context_menuAddressBook)
         self.popMenuAddressBook = QtGui.QMenu( self )
-        self.popMenuAddressBook.addAction( self.actionAddressBookNew )
-        self.popMenuAddressBook.addAction( self.actionAddressBookDelete )
-        self.popMenuAddressBook.addSeparator()
         self.popMenuAddressBook.addAction( self.actionAddressBookSend )
         self.popMenuAddressBook.addAction( self.actionAddressBookClipboard )
-
+        self.popMenuAddressBook.addSeparator()
+        self.popMenuAddressBook.addAction( self.actionAddressBookNew )
+        self.popMenuAddressBook.addAction( self.actionAddressBookDelete )
 
         #Popup menu for the Subscriptions page
         self.ui.subscriptionsContextMenuToolbar = QtGui.QToolBar()