From 8a1e54b19424f1956eec8176e74167bbbcc41881 Mon Sep 17 00:00:00 2001 From: souliane Date: Tue, 1 Dec 2015 12:45:14 +0100 Subject: [PATCH] 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 --- frontends/src/primitivus/primitivus | 8 ++++---- src/plugins/plugin_misc_account.py | 4 ++-- src/plugins/plugin_misc_welcome.py | 4 ++-- src/plugins/plugin_xep_0048.py | 2 +- src/plugins/plugin_xep_0050.py | 2 +- src/plugins/plugin_xep_0055.py | 2 +- src/plugins/plugin_xep_0100.py | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontends/src/primitivus/primitivus b/frontends/src/primitivus/primitivus index 1cfd9ec3..eb8378e4 100755 --- a/frontends/src/primitivus/primitivus +++ b/frontends/src/primitivus/primitivus @@ -442,10 +442,10 @@ class PrimitivusApp(QuickApp, InputHistory): 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) diff --git a/src/plugins/plugin_misc_account.py b/src/plugins/plugin_misc_account.py index cab949d8..92a56cb5 100755 --- a/src/plugins/plugin_misc_account.py +++ b/src/plugins/plugin_misc_account.py @@ -256,8 +256,8 @@ Your password has been chosen by yourself. If you haven't read our security noti 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! diff --git a/src/plugins/plugin_misc_welcome.py b/src/plugins/plugin_misc_welcome.py index 25d2e02c..3065dc85 100644 --- a/src/plugins/plugin_misc_welcome.py +++ b/src/plugins/plugin_misc_welcome.py @@ -42,9 +42,9 @@ WELCOME_MSG_TITLE = D_(u"Welcome to Libervia/Salut à Toi") # (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. diff --git a/src/plugins/plugin_xep_0048.py b/src/plugins/plugin_xep_0048.py index 090ae949..e77d700c 100644 --- a/src/plugins/plugin_xep_0048.py +++ b/src/plugins/plugin_xep_0048.py @@ -58,7 +58,7 @@ class XEP_0048(object): 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) diff --git a/src/plugins/plugin_xep_0050.py b/src/plugins/plugin_xep_0050.py index 44ef1b2b..8ad43f58 100644 --- a/src/plugins/plugin_xep_0050.py +++ b/src/plugins/plugin_xep_0050.py @@ -219,7 +219,7 @@ class XEP_0050(object): 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) diff --git a/src/plugins/plugin_xep_0055.py b/src/plugins/plugin_xep_0055.py index 150ca8fa..992b51ce 100644 --- a/src/plugins/plugin_xep_0055.py +++ b/src/plugins/plugin_xep_0055.py @@ -77,7 +77,7 @@ class XEP_0055(object): 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")) diff --git a/src/plugins/plugin_xep_0100.py b/src/plugins/plugin_xep_0100.py index a30cc5bc..38b463f7 100755 --- a/src/plugins/plugin_xep_0100.py +++ b/src/plugins/plugin_xep_0100.py @@ -63,7 +63,7 @@ class XEP_0100(object): 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