changeset 1707:94c450972346

primitivus and plugins: renamed a few menus: - display all menu with the first letter in upper case - moved Search directory from Service to Contacts - moved "Join room" from Communication to Groups - moved Bookmarks from Communication to Groups
author souliane <souliane@mailoo.org>
date Tue, 01 Dec 2015 12:45:14 +0100
parents aa60bd58ac23
children 6d6eae490681
files frontends/src/primitivus/primitivus src/plugins/plugin_misc_account.py src/plugins/plugin_misc_welcome.py src/plugins/plugin_xep_0048.py src/plugins/plugin_xep_0050.py src/plugins/plugin_xep_0055.py src/plugins/plugin_xep_0100.py
diffstat 7 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/frontends/src/primitivus/primitivus	Mon Nov 30 21:54:38 2015 +0100
+++ b/frontends/src/primitivus/primitivus	Tue Dec 01 12:45:14 2015 +0100
@@ -442,10 +442,10 @@
         menu.addMenu(general, _("Parameters"), self.onParam)
         menu.addMenu(general, _("About"), self.onAboutRequest)
         menu.addMenu(general, _("Exit"), self.onExitRequest, a_key['APP_QUIT'])
-        contact = _("Contacts")
-        menu.addMenu(contact)
-        communication = _("Communication")
-        menu.addMenu(communication, _("Join room"), self.onJoinRoomRequest, a_key['ROOM_JOIN'])
+        menu.addMenu(_("Contacts"))  # add empty menu to save the place in the menu order
+        groups = _("Groups")
+        menu.addMenu(groups)
+        menu.addMenu(groups, _("Join room"), self.onJoinRoomRequest, a_key['ROOM_JOIN'])
         #additionals menus
         #FIXME: do this in a more generic way (in quickapp)
         self.addMenus(menu, C.MENU_GLOBAL)
--- a/src/plugins/plugin_misc_account.py	Mon Nov 30 21:54:38 2015 +0100
+++ b/src/plugins/plugin_misc_account.py	Tue Dec 01 12:45:14 2015 +0100
@@ -256,8 +256,8 @@
 http://salut-a-toi.org/faq.html#certificate
 
 In the beginning, you have nobody to talk to. To find some contacts, use the users' directory:
-    - make yourself visible in "Settings" / "Parameters" / "Directory".
-    - search for people with "Communication" / "Search directory".
+    - make yourself visible in "Service / Directory subscription".
+    - search for people with "Contacts" / Search directory".
 
 Any feedback welcome. Thank you!
 
--- a/src/plugins/plugin_misc_welcome.py	Mon Nov 30 21:54:38 2015 +0100
+++ b/src/plugins/plugin_misc_welcome.py	Tue Dec 01 12:45:14 2015 +0100
@@ -42,9 +42,9 @@
 #      (i.e.: it may look weird on other frontends)
 WELCOME_MSG = D_(u"""Welcome to a free (as in freedom) network!
 
-If you have any trouble, or you want to help us for the bug hunting, you can contact us in real time chat by using the “help/official chat room”  menu.
+If you have any trouble, or you want to help us for the bug hunting, you can contact us in real time chat by using the “Help / Official chat room”  menu.
 
-To use Libervia, you'll need to add contacts, either people you know, or people you discover by using the “Service/Search directory” menu.
+To use Libervia, you'll need to add contacts, either people you know, or people you discover by using the “Contacts / Search directory” menu.
 
 We hope that you'll enjoy using this project.
 
--- a/src/plugins/plugin_xep_0048.py	Mon Nov 30 21:54:38 2015 +0100
+++ b/src/plugins/plugin_xep_0048.py	Tue Dec 01 12:45:14 2015 +0100
@@ -58,7 +58,7 @@
         self.host = host
         # self.__menu_id = host.registerCallback(self._bookmarksMenu, with_data=True)
         self.__bm_save_id = host.registerCallback(self._bookmarksSaveCb, with_data=True)
-        host.importMenu((D_("Communication"), D_("bookmarks")), self._bookmarksMenu, security_limit=0, help_string=D_("Use and manage bookmarks"))
+        host.importMenu((D_("Groups"), D_("Bookmarks")), self._bookmarksMenu, security_limit=0, help_string=D_("Use and manage bookmarks"))
         self.__selected_id = host.registerCallback(self._bookmarkSelectedCb, with_data=True)
         host.bridge.addMethod("bookmarksList", ".plugin", in_sign='sss', out_sign='a{sa{sa{ss}}}', method=self._bookmarksList, async=True)
         host.bridge.addMethod("bookmarksRemove", ".plugin", in_sign='ssss', out_sign='', method=self._bookmarksRemove, async=True)
--- a/src/plugins/plugin_xep_0050.py	Mon Nov 30 21:54:38 2015 +0100
+++ b/src/plugins/plugin_xep_0050.py	Tue Dec 01 12:45:14 2015 +0100
@@ -219,7 +219,7 @@
                               method=self._requestCommandsList,
                               async=True)
         self.__requesting_id = host.registerCallback(self._requestingEntity, with_data=True)
-        host.importMenu((D_("Service"), D_("commands")), self._commandsMenu, security_limit=2, help_string=D_("Execute ad-hoc commands"))
+        host.importMenu((D_("Service"), D_("Commands")), self._commandsMenu, security_limit=2, help_string=D_("Execute ad-hoc commands"))
 
     def getHandler(self, profile):
         return XEP_0050_handler(self)
--- a/src/plugins/plugin_xep_0055.py	Mon Nov 30 21:54:38 2015 +0100
+++ b/src/plugins/plugin_xep_0055.py	Tue Dec 01 12:45:14 2015 +0100
@@ -77,7 +77,7 @@
                               async=True)
 
         self.__search_menu_id = host.registerCallback(self._getMainUI, with_data=True)
-        host.importMenu((D_("Service"), D_("Search directory")), self._getMainUI, security_limit=1, help_string=D_("Search user directory"))
+        host.importMenu((D_("Contacts"), D_("Search directory")), self._getMainUI, security_limit=1, help_string=D_("Search user directory"))
         if "XEP-0050" in host.plugins:
             host.importMenu((D_("Service"), D_("Directory subscription")), self.subscribe, security_limit=1, help_string=D_("User directory subscription"))
 
--- a/src/plugins/plugin_xep_0100.py	Mon Nov 30 21:54:38 2015 +0100
+++ b/src/plugins/plugin_xep_0100.py	Tue Dec 01 12:45:14 2015 +0100
@@ -63,7 +63,7 @@
         host.bridge.addMethod("gatewayRegister", ".plugin", in_sign='ss', out_sign='s', method=self._gatewayRegister)
         self.__menu_id = host.registerCallback(self._gatewaysMenu, with_data=True)
         self.__selected_id = host.registerCallback(self._gatewaySelectedCb, with_data=True)
-        host.importMenu((D_("Service"), D_("gateways")), self._gatewaysMenu, security_limit=1, help_string=D_("Find gateways"))
+        host.importMenu((D_("Service"), D_("Gateways")), self._gatewaysMenu, security_limit=1, help_string=D_("Find gateways"))
 
     def _gatewaysMenu(self, data, profile):
         """ XMLUI activated by menu: return Gateways UI