diff options
| -rw-r--r-- | COPYING | 4 | ||||
| -rw-r--r-- | alot/defaults/alot.rc.spec | 2 | ||||
| -rw-r--r-- | docs/source/api/commands.rst | 4 | ||||
| -rw-r--r-- | docs/source/api/database.rst | 2 | ||||
| -rw-r--r-- | docs/source/api/interface.rst | 4 | ||||
| -rw-r--r-- | docs/source/configuration/accounts_table | 4 | ||||
| -rw-r--r-- | docs/source/configuration/alotrc_table | 8 | ||||
| -rw-r--r-- | docs/source/configuration/contacts_completion.rst | 2 | ||||
| -rw-r--r-- | docs/source/configuration/hooks.rst | 2 | ||||
| -rw-r--r-- | docs/source/configuration/key_bindings.rst | 2 | ||||
| -rw-r--r-- | docs/source/faq.rst | 4 | ||||
| -rw-r--r-- | docs/source/index.rst | 2 | ||||
| -rw-r--r-- | docs/source/usage/modes/global.rst | 4 | ||||
| -rw-r--r-- | docs/source/usage/modes/search.rst | 1 | ||||
| -rwxr-xr-x | extra/colour_picker.py | 42 |
15 files changed, 42 insertions, 45 deletions
@@ -77,7 +77,7 @@ modification follow. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - + "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. @@ -510,7 +510,7 @@ actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - + If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties diff --git a/alot/defaults/alot.rc.spec b/alot/defaults/alot.rc.spec index efeb3497..0bc4f9d9 100644 --- a/alot/defaults/alot.rc.spec +++ b/alot/defaults/alot.rc.spec @@ -239,7 +239,7 @@ msg_summary_hides_threadwide_tags = boolean(default=True) # first in the account block is used. reply_account_header_priority = force_list(default=list(From,To,Cc,Envelope-To,X-Envelope-To,Delivered-To)) -# Key bindings +# Key bindings [bindings] __many__ = string(default=None) [[___many___]] diff --git a/docs/source/api/commands.rst b/docs/source/api/commands.rst index cb1a9d7f..cae10a03 100644 --- a/docs/source/api/commands.rst +++ b/docs/source/api/commands.rst @@ -10,7 +10,7 @@ Command-line strings given by the user via the prompt or key bindings can be tra Specific actions are defined as subclasses of :class:`Command` and can be registered to a global command pool using the :class:`registerCommand` decorator. -.. Note:: +.. Note:: that the return value of :func:`commandfactory` depends on the current *mode* the user interface is in. @@ -34,7 +34,7 @@ to a global command pool using the :class:`registerCommand` decorator. .. autoclass:: Command :members: - + .. autoclass:: CommandParseError .. autoclass:: CommandArgumentParser .. autofunction:: commandfactory diff --git a/docs/source/api/database.rst b/docs/source/api/database.rst index ff66fd3e..bead2609 100644 --- a/docs/source/api/database.rst +++ b/docs/source/api/database.rst @@ -3,7 +3,7 @@ Email Database .. module:: alot.db -The python bindings to libnotmuch define :class:`notmuch.Thread` and +The python bindings to libnotmuch define :class:`notmuch.Thread` and :class:`notmuch.Message`, which unfortunately are very fragile. Alot defines the wrapper classes :class:`alot.db.Thread` and :class:`alot.db.Message` that use an :class:`manager.DBManager` instance to transparently provide persistent objects. diff --git a/docs/source/api/interface.rst b/docs/source/api/interface.rst index 27ed06d5..39b9cd3c 100644 --- a/docs/source/api/interface.rst +++ b/docs/source/api/interface.rst @@ -27,7 +27,7 @@ input and acts on it: .. code-block:: python from twisted.internet import defer - + @defer.inlineCallbacks def greet(ui): # ui is instance of alot.ui.UI name = yield ui.prompt('pls enter your name') @@ -102,7 +102,7 @@ Completion :meth:`alot.ui.UI.prompt` allows tab completion using a :class:`~alot.completion.Completer` object handed as 'completer' parameter. :mod:`alot.completion` defines several subclasses for different occasions like completing email addresses from an -:class:`~alot.account.AddressBook`, notmuch tagstrings. Some of these actually build on top +:class:`~alot.account.AddressBook`, notmuch tagstrings. Some of these actually build on top of each other; the :class:`~alot.completion.QueryCompleter` for example uses a :class:`~alot.completion.TagsCompleter` internally to allow tagstring completion after "is:" or "tag:" keywords when typing a notmuch querystring. diff --git a/docs/source/configuration/accounts_table b/docs/source/configuration/accounts_table index e267ff9b..cc3e5646 100644 --- a/docs/source/configuration/accounts_table +++ b/docs/source/configuration/accounts_table @@ -47,7 +47,7 @@ where to store outgoing mails, e.g. `maildir:///home/you/mail/Sent`. You can use mbox, maildir, mh, babyl and mmdf in the protocol part of the URL. - + .. note:: If you want to add outgoing mails automatically to the notmuch index you must use maildir in a path within your notmuch database path. @@ -61,7 +61,7 @@ where to store draft mails, e.g. `maildir:///home/you/mail/Drafts`. You can use mbox, maildir, mh, babyl and mmdf in the protocol part of the URL. - + .. note:: You will most likely want drafts indexed by notmuch to be able to later access them within alot. This currently only works for maildir containers in a path below your notmuch database path. diff --git a/docs/source/configuration/alotrc_table b/docs/source/configuration/alotrc_table index 4125e7fc..e1a4fa73 100644 --- a/docs/source/configuration/alotrc_table +++ b/docs/source/configuration/alotrc_table @@ -82,7 +82,7 @@ Format of the status-bar in bufferlist mode. This is a pair of strings to be left and right aligned in the status-bar that may contain variables: - + * `{buffer_no}`: index of this buffer in the global buffer list * `{total_messages}`: total numer of messages indexed by notmuch * `{pending_writes}`: number of pending write operations to the index @@ -227,7 +227,7 @@ This is a pair of strings to be left and right aligned in the status-bar. Apart from the global variables listed at :ref:`bufferlist_statusbar <bufferlist-statusbar>` these strings may contain variables: - + * `{to}`: To-header of the envelope :type: mixed_list @@ -444,7 +444,7 @@ This is a pair of strings to be left and right aligned in the status-bar. Apart from the global variables listed at :ref:`bufferlist_statusbar <bufferlist-statusbar>` these strings may contain variables: - + * `{querystring}`: search string * `{result_count}`: number of matching messages * `{result_count_positive}`: 's' if result count is greater than 0. @@ -578,7 +578,7 @@ This is a pair of strings to be left and right aligned in the status-bar. Apart from the global variables listed at :ref:`bufferlist_statusbar <bufferlist-statusbar>` these strings may contain variables: - + * `{tid}`: thread id * `{subject}`: subject line of the thread * `{authors}`: abbreviated authors string for this thread diff --git a/docs/source/configuration/contacts_completion.rst b/docs/source/configuration/contacts_completion.rst index 51fae0d7..707af984 100644 --- a/docs/source/configuration/contacts_completion.rst +++ b/docs/source/configuration/contacts_completion.rst @@ -55,7 +55,7 @@ Both respect the `ignorecase` option which defaults to `True` and results in cas command = notmuch_abook.py lookup regexp = ^((?P<name>[^(\\s+\<)]*)\s+<)?(?P<email>[^@]+?@[^>]+)>?$ - + `notmuch address` Since version `0.19`, notmuch itself offers a subcommand `address`, that returns email addresses found in the notmuch index. diff --git a/docs/source/configuration/hooks.rst b/docs/source/configuration/hooks.rst index a384d73e..7577e87a 100644 --- a/docs/source/configuration/hooks.rst +++ b/docs/source/configuration/hooks.rst @@ -184,7 +184,7 @@ Apart from command pre- and posthooks, the following hooks will be interpreted: returns `prefix` and `suffix` for a sanitized filename to use while opening an attachment. The `prefix` and `suffix` are used to open a file named - `prefix` + `XXXXXX` + `suffix` in a temporary directory. + `prefix` + `XXXXXX` + `suffix` in a temporary directory. :param filename: filename provided in the email (can be None) :type filename: str or None diff --git a/docs/source/configuration/key_bindings.rst b/docs/source/configuration/key_bindings.rst index ea8f9358..fe8da87f 100644 --- a/docs/source/configuration/key_bindings.rst +++ b/docs/source/configuration/key_bindings.rst @@ -31,7 +31,7 @@ Have a look at `the urwid User Input documentation <http://excess.org/urwid/wiki .. _config.key-bingings.defaults: -Default bindings +Default bindings ---------------- User-defined bindings are combined with the default bindings listed below. diff --git a/docs/source/faq.rst b/docs/source/faq.rst index 212603e6..f0836128 100644 --- a/docs/source/faq.rst +++ b/docs/source/faq.rst @@ -22,7 +22,7 @@ FAQ 3. I want feature X! - Me too! Feel free to file a new or comment on existing + Me too! Feel free to file a new or comment on existing `issues <https://github.com/pazz/alot/issues>`_ if you don't want/have the time/know how to implement it yourself. Be verbose as to how it should look or work when it's finished and give it some thought how you think we should implement it. We'll discuss it from there. @@ -51,7 +51,7 @@ FAQ Lazyness and Ignorance: In most cases I simply did not or still don't know a better solution. I try to outsource as much as I can to well established libraries and be it only to avoid - having to read rfc's. But there are lots + having to read rfc's. But there are lots of tasks I implemented myself, possibly overlooking a ready made and available solution. Twisted is such a feature-rich but gray area in my mind for example. If you think you know how to improve the current implementation let me know! diff --git a/docs/source/index.rst b/docs/source/index.rst index d383dad5..37d7c137 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -10,7 +10,7 @@ User Manual .. toctree:: :maxdepth: 2 :numbered: - + installation usage/index configuration/index diff --git a/docs/source/usage/modes/global.rst b/docs/source/usage/modes/global.rst index 8099500e..90d61f35 100644 --- a/docs/source/usage/modes/global.rst +++ b/docs/source/usage/modes/global.rst @@ -55,10 +55,8 @@ The following commands are available globally .. describe:: help - display help for a command. Use 'bindings' to display all keybings interpreted in current mode.' - argument command or 'bindings' @@ -154,7 +152,7 @@ The following commands are available globally .. describe:: call - Executes python code + Executes python code argument python command string to call diff --git a/docs/source/usage/modes/search.rst b/docs/source/usage/modes/search.rst index 76646a4e..20e22b44 100644 --- a/docs/source/usage/modes/search.rst +++ b/docs/source/usage/modes/search.rst @@ -98,7 +98,6 @@ The following commands are available in search mode A tag is considered present if at least one message contained in this thread is tagged with it. In that case this command will remove the tag from every message in the thread. - argument comma separated list of tags diff --git a/extra/colour_picker.py b/extra/colour_picker.py index 17fcf449..badb494e 100755 --- a/extra/colour_picker.py +++ b/extra/colour_picker.py @@ -42,10 +42,10 @@ CHART_256 = """ brown__ dark_red_ dark_magenta_ dark_blue_ dark_cyan_ dark_green_ yellow_ light_red light_magenta light_blue light_cyan light_green - #00f#06f#08f#0af#0df#0ff black_______ dark_gray___ + #00f#06f#08f#0af#0df#0ff black_______ dark_gray___ #60f#00d#06d#08d#0ad#0dd#0fd light_gray__ white_______ - #80f#60d#00a#06a#08a#0aa#0da#0fa - #a0f#80d#60a#008#068#088#0a8#0d8#0f8 + #80f#60d#00a#06a#08a#0aa#0da#0fa + #a0f#80d#60a#008#068#088#0a8#0d8#0f8 #d0f#a0d#80d#608#006#066#086#0a6#0d6#0f6 #f0f#d0d#a0a#808#606#000#060#080#0a0#0d0#0f0#0f6#0f8#0fa#0fd#0ff #f0d#d0a#a08#806#600#660#680#6a0#6d0#6f0#6f6#6f8#6fa#6fd#6ff#0df @@ -58,29 +58,29 @@ yellow_ light_red light_magenta light_blue light_cyan light_green #86d#66a#68a#6aa#6da #f80#f86#f88#f8a#f8d#f8f#d6f#a0f #a6d#86a#668#688#6a8#6d8 #f60#f66#f68#f6a#f6d#f6f#d0f #d6d#a6a#868#666#686#6a6#6d6#6d8#6da#6dd #f00#f06#f08#f0a#f0d#f0f - #d6a#a68#866#886#8a6#8d6#8d8#8da#8dd#6ad - #d68#a66#a86#aa6#ad6#ad8#ada#add#8ad#68d - #d66#d86#da6#dd6#dd8#dda#ddd#aad#88d#66d g78_g82_g85_g89_g93_g100 + #d6a#a68#866#886#8a6#8d6#8d8#8da#8dd#6ad + #d68#a66#a86#aa6#ad6#ad8#ada#add#8ad#68d + #d66#d86#da6#dd6#dd8#dda#ddd#aad#88d#66d g78_g82_g85_g89_g93_g100 #da6#da8#daa#dad#a8d#86d g52_g58_g62_g66_g70_g74_ #88a#8aa #d86#d88#d8a#d8d#a6d g27_g31_g35_g38_g42_g46_g50_ #a8a#888#8a8#8aa #d66#d68#d6a#d6d g0__g3__g7__g11_g15_g19_g23_ - #a88#aa8#aaa#88a + #a88#aa8#aaa#88a #a88#a8a -""" +""" CHART_88 = """ brown__ dark_red_ dark_magenta_ dark_blue_ dark_cyan_ dark_green_ yellow_ light_red light_magenta light_blue light_cyan light_green - #00f#08f#0cf#0ff black_______ dark_gray___ - #80f#00c#08c#0cc#0fc light_gray__ white_______ + #00f#08f#0cf#0ff black_______ dark_gray___ + #80f#00c#08c#0cc#0fc light_gray__ white_______ #c0f#80c#008#088#0c8#0f8 -#f0f#c0c#808#000#080#0c0#0f0#0f8#0fc#0ff #88c#8cc - #f0c#c08#800#880#8c0#8f0#8f8#8fc#8ff#0cf #c8c#888#8c8#8cc +#f0f#c0c#808#000#080#0c0#0f0#0f8#0fc#0ff #88c#8cc + #f0c#c08#800#880#8c0#8f0#8f8#8fc#8ff#0cf #c8c#888#8c8#8cc #f08#c00#c80#cc0#cf0#cf8#cfc#cff#8cf#08f #c88#cc8#ccc#88c - #f00#f80#fc0#ff0#ff8#ffc#fff#ccf#88f#00f #c88#c8c - #fc0#fc8#fcc#fcf#c8f#80f - #f80#f88#f8c#f8f#c0f g62_g74_g82_g89_g100 + #f00#f80#fc0#ff0#ff8#ffc#fff#ccf#88f#00f #c88#c8c + #fc0#fc8#fcc#fcf#c8f#80f + #f80#f88#f8c#f8f#c0f g62_g74_g82_g89_g100 #f00#f08#f0c#f0f g0__g19_g35_g46_g52 """ @@ -88,7 +88,7 @@ CHART_16 = """ brown__ dark_red_ dark_magenta_ dark_blue_ dark_cyan_ dark_green_ yellow_ light_red light_magenta light_blue light_cyan light_green -black_______ dark_gray___ light_gray__ white_______ +black_______ dark_gray___ light_gray__ white_______ """ ATTR_RE = re.compile("(?P<whitespace>[ \n]*)(?P<entry>[^ \n]+)") @@ -123,7 +123,7 @@ def parse_chart(chart, convert): attr, text = attrtext out.append((attr, text.ljust(elen))) return out - + def foreground_chart(chart, background, colors): """ Create text markup for a foreground colour chart @@ -206,7 +206,7 @@ def main(): if state: is_foreground_chart = chart_radio_buttons[0].state set_mode(colors, is_foreground_chart) - + def mode_rb(text, colors, state=False): # mode radio buttons rb = urwid.RadioButton(mode_radio_buttons, text, state) @@ -216,10 +216,10 @@ def main(): def on_chart_change(rb, state): # handle foreground check box state change set_mode(screen.colors, state) - + def click_exit(button): raise urwid.ExitMainLoop() - + lb.extend([ urwid.AttrMap(urwid.Text("Urwid Palette Test"), 'header'), urwid.AttrMap(urwid.Columns([ @@ -245,7 +245,7 @@ def main(): ]) set_mode(16, True) # displays the chart - + def unhandled_input(key): if key in ('Q','q','esc'): raise urwid.ExitMainLoop() |