summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2018-02-20 21:52:55 +0100
committermathieui <mathieui@mathieui.net>2018-02-20 21:52:55 +0100
commitac6adbf21b71985579b81e14712ded85bf3743f2 (patch)
treeeed86a7580ada778a88a2f6ce2b9191f763598ac
parent87ed4aff12e6251ced6a34e50fe643b84e60790f (diff)
downloadpoezio-ac6adbf21b71985579b81e14712ded85bf3743f2.tar.gz
poezio-ac6adbf21b71985579b81e14712ded85bf3743f2.tar.bz2
poezio-ac6adbf21b71985579b81e14712ded85bf3743f2.tar.xz
poezio-ac6adbf21b71985579b81e14712ded85bf3743f2.zip
Update documentation (& formatting)
- nick colors are not random by default - /close is a useful command
-rw-r--r--doc/source/usage.rst10
-rw-r--r--poezio/tabs/conversationtab.py5
-rw-r--r--poezio/tabs/muctab.py14
3 files changed, 16 insertions, 13 deletions
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
index 53387325..86936d03 100644
--- a/doc/source/usage.rst
+++ b/doc/source/usage.rst
@@ -81,13 +81,14 @@ The status of a tab is represented by its color:
You can go from one tab to another in many ways:
-* ``Ctrl+n`` and ``Ctrl+p``
+* ``Ctrl+n`` (next tab) and ``Ctrl+p`` (previous tab)
* :term:`/win` command
* :term:`/next` and :term:`/prev` commands
-* ``Alt`` + a number
-* ``Alt+j`` followed by a two-digits number
+* ``Alt`` + a number (to go to the tab with that number)
+* ``Alt+j`` followed by a two-digits number (same)
* ``Alt+e``, this will jump to the next tab with the highest priority. Priority
applies in this order: private message > highlight message > normal message.
+* :term:`/close` command to close a tab and go back to the previous one
.. _rostertab:
@@ -163,7 +164,7 @@ This tab contains a multi-user conversation.
- **Blue**: participant
- **Grey**: visitor
- The nicks have a random color given by poezio (which can be changed with :term:`/recolor`)
+ The nicks have a fixed color assigned using XEP-0392_.
#. Your information in that chatroom (the name of the room, your nick, your role
and affiliation).
@@ -278,3 +279,4 @@ have autojoin set to True.
:alt: Bookmarks tab screenshot
.. _XEP-0070: https://xmpp.org/extensions/xep-0070.html
+.. _XEP-0392: https://xmpp.org/extensions/xep-0392.html
diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py
index ec0d6659..8b713b2d 100644
--- a/poezio/tabs/conversationtab.py
+++ b/poezio/tabs/conversationtab.py
@@ -231,9 +231,8 @@ class ConversationTab(OneToOneTab):
return True
else:
self._text_buffer.add_message(
- "\x19%(info_col)s}No information available\x19o" % {
- 'info_col': dump_tuple(get_theme().COLOR_INFORMATION_TEXT)
- })
+ "\x19%(info_col)s}No information available\x19o" %
+ {'info_col': dump_tuple(get_theme().COLOR_INFORMATION_TEXT)})
return True
@command_args_parser.quoted(0, 1)
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index 9a1a0821..afe62188 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -523,16 +523,18 @@ class MucTab(ChatTab):
if '170' in status_codes:
self.add_message(
'\x19%(warn_col)s}Warning:\x19%(info_col)s}'
- ' This room is publicly logged' %
- {'info_col': info_col,
- 'warn_col': warn_col},
+ ' This room is publicly logged' % {
+ 'info_col': info_col,
+ 'warn_col': warn_col
+ },
typ=0)
if '100' in status_codes:
self.add_message(
'\x19%(warn_col)s}Warning:\x19%(info_col)s}'
- ' This room is not anonymous.' %
- {'info_col': info_col,
- 'warn_col': warn_col},
+ ' This room is not anonymous.' % {
+ 'info_col': info_col,
+ 'warn_col': warn_col
+ },
typ=0)
def handle_presence_joined(self, presence, status_codes):