Improve chat/message menu items

blink/chatwindow.py

@@ -1662,7 +1662,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
         self.control_menu = QMenu(self.control_button)
         self.control_button.setMenu(self.control_menu)
         self.control_button.actions = ContextMenuActions()
-        self.control_button.actions.connect = QAction("Start chat session", self, triggered=self._AH_Connect)
+        self.control_button.actions.connect = QAction("Start MSRP chat session", self, triggered=self._AH_Connect)
         self.control_button.actions.connect_with_audio = QAction("Start audio call", self, triggered=self._AH_ConnectWithAudio)
         self.control_button.actions.connect_with_video = QAction("Start video call", self, triggered=self._AH_ConnectWithVideo)
         self.control_button.actions.disconnect = QAction("Disconnect", self, triggered=self._AH_Disconnect)

blink/contacts.py

@@ -3122,7 +3122,7 @@ class ContactListView(QListView):
         self.actions.undo_last_delete = QAction("Undo Last Delete", self, triggered=self._AH_UndoLastDelete)
         self.actions.start_audio_call = QAction("Start Audio Call", self, triggered=self._AH_StartAudioCall)
         self.actions.start_video_call = QAction("Start Video Call", self, triggered=self._AH_StartVideoCall)
-        self.actions.start_chat_session = QAction("Start Chat Session", self, triggered=self._AH_StartChatSession)
+        self.actions.start_chat_session = QAction("Start MSRP Chat Session", self, triggered=self._AH_StartChatSession)
         self.actions.send_sms = QAction("Send Messages", self, triggered=self._AH_SendSMS)
         self.actions.send_files = QAction("Send File(s)...", self, triggered=self._AH_SendFiles)
         self.actions.request_screen = QAction("Request Screen", self, triggered=self._AH_RequestScreen)
@@ -3217,18 +3217,19 @@ class ContactListView(QListView):
                     call_item.triggered.connect(partial(self._AH_StartVideoCall, uri))
                     call_submenu.addAction(call_item)
 
-                call_submenu = menu.addMenu('Start Chat Session')
+
+                call_submenu = menu.addMenu('Send Messages')
                 for uri in contact.uris:
                     uri_text = '%s (%s)' % (uri.uri, uri.type) if uri.type not in ('SIP', 'Other') else uri.uri
                     call_item = QAction(uri_text, self)
-                    call_item.triggered.connect(partial(self._AH_StartChatSession, uri))
+                    call_item.triggered.connect(partial(self._AH_SendSMS, uri))
                     call_submenu.addAction(call_item)
 
-                call_submenu = menu.addMenu('Send Messages')
+                call_submenu = menu.addMenu('Start MSRP Chat Session')
                 for uri in contact.uris:
                     uri_text = '%s (%s)' % (uri.uri, uri.type) if uri.type not in ('SIP', 'Other') else uri.uri
                     call_item = QAction(uri_text, self)
-                    call_item.triggered.connect(partial(self._AH_SendSMS, uri))
+                    call_item.triggered.connect(partial(self._AH_StartChatSession, uri))
                     call_submenu.addAction(call_item)
 
                 call_submenu = menu.addMenu('Send File(s)...')
@@ -3658,7 +3659,7 @@ class ContactSearchListView(QListView):
         self.actions.undo_last_delete = QAction("Undo Last Delete", self, triggered=self._AH_UndoLastDelete)
         self.actions.start_audio_call = QAction("Start Audio Call", self, triggered=self._AH_StartAudioCall)
         self.actions.start_video_call = QAction("Start Video Call", self, triggered=self._AH_StartVideoCall)
-        self.actions.start_chat_session = QAction("Start Chat Session", self, triggered=self._AH_StartChatSession)
+        self.actions.start_chat_session = QAction("Start MSRP Chat Session", self, triggered=self._AH_StartChatSession)
         self.actions.send_sms = QAction("Send Messages", self, triggered=self._AH_SendSMS)
         self.actions.send_files = QAction("Send File(s)...", self, triggered=self._AH_SendFiles)
         self.actions.request_screen = QAction("Request Screen", self, triggered=self._AH_RequestScreen)
@@ -4005,7 +4006,7 @@ class ContactDetailView(QListView):
         self.actions.make_uri_default = QAction("Set Address As Default", self, triggered=self._AH_MakeURIDefault)
         self.actions.start_audio_call = QAction("Start Audio Call", self, triggered=self._AH_StartAudioCall)
         self.actions.start_video_call = QAction("Start Video Call", self, triggered=self._AH_StartVideoCall)
-        self.actions.start_chat_session = QAction("Start Chat Session", self, triggered=self._AH_StartChatSession)
+        self.actions.start_chat_session = QAction("Start MSRP Chat Session", self, triggered=self._AH_StartChatSession)
         self.actions.send_sms = QAction("Send Messages", self, triggered=self._AH_SendSMS)
         self.actions.send_files = QAction("Send File(s)...", self, triggered=self._AH_SendFiles)
         self.actions.request_screen = QAction("Request Screen", self, triggered=self._AH_RequestScreen)

resources/blink.ui

@@ -1447,7 +1447,7 @@ padding: 2px;</string>
   </action>
   <action name="show_last_messages_action">
    <property name="text">
-    <string>&amp;Show last messages/chats</string>
+    <string>&amp;Show last conversations</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+O</string>

resources/contact_editor.ui

@@ -240,7 +240,7 @@
      </item>
      <item>
       <property name="text">
-       <string>Start chat sessions by default</string>
+       <string>Start MSRP chat sessions by default</string>
       </property>
      </item>
      <item>
@@ -250,7 +250,7 @@
      </item>
      <item>
       <property name="text">
-       <string>Start message sessions by default</string>
+       <string>Send messages by default</string>
       </property>
      </item>
     </widget>