From 74af47043b4a788eacb36ffee7a6a9a982a08081 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Tue, 8 Nov 2011 03:03:27 +0100 Subject: POWER OF EQUALITY. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 6729fb0a..316c6339 100644 --- a/README +++ b/README @@ -66,7 +66,7 @@ feature you want. ======================= Authors ======================= -Florent Le Coz (louiz’) (main developper) +Florent Le Coz (louiz’) (developper) Mathieu Pasquet (mathieui) (developper) -- cgit v1.2.3 From 04146d6420f447e5e7c4680c510cc2a20bc2b3c6 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Tue, 8 Nov 2011 04:57:40 +0100 Subject: Update CHANGELOG file --- CHANGELOG | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 83e3b812..b960fbc5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,11 +4,22 @@ http://dev.louiz.org/project/poezio/roadmap * Poezio 0.7.2 - dev +- Huge speed improvements in both memory usage, text + refresh speed and interface resize. - Chatstate notifications (in private AND in MUCs) - /message command to talk to any JID - /version command to get the software version of an entity - /bind command, and keys can be bound in the config file - Multiline edition +- xhtml-im messages can be sent and received +- 256 colors support +- themes are easier to create and load. They can use + up to 256 colors +- completion now works not only at the end of the input +- /affiliation and /role commands to administrate MUCs +- /export command to export your roster in a file +- data forms support (only for room configuration at the moment) +- a *lot* of bugfixes * Poezio 0.7.1 - 2 Feb 2010 -- cgit v1.2.3 From 2e16304f2b8af9b5d863eecc9d405d0eb0e2bfec Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Tue, 8 Nov 2011 05:14:27 +0100 Subject: little additional update to README --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index b960fbc5..0769a63e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,7 @@ http://dev.louiz.org/project/poezio/roadmap - /affiliation and /role commands to administrate MUCs - /export command to export your roster in a file - data forms support (only for room configuration at the moment) +- documentation is now written in asciidoc format - a *lot* of bugfixes -- cgit v1.2.3 From 8eebea3ccc4557af079d7a9a5a1a3bc2ed911e3a Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Tue, 8 Nov 2011 05:14:39 +0100 Subject: Update README file. --- README | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/README b/README index 316c6339..9897e687 100644 --- a/README +++ b/README @@ -28,9 +28,9 @@ You need python 3.0 (and the associated devel package, to build C modules) or higher, and the SleekXMPP python library. In the developpement version, you’ll need this fork of SleekXMPP http://github.com/louiz/SleekXMPP. -Additionally, you’ll need asciidoc to build the html documentation pages. -You can read the documentation using the .txt files, as well, if you don’t -have asciidoc, or read it on the web. +Additionally, you’ll need asciidoc and source-highlight to build the html +documentation pages. To read the documentation without these dependance, +just read the .txt files, or read it on the webpage. The simplest way to have up-to-date dependencies and to be able to test this developpement version is to use the update.sh script that downloads @@ -45,13 +45,16 @@ you can then launch poezio with $ ./launch.sh or you can install it with (as root or with sudo) + $ make install + (`make uninstall' works, don't worry ;)) you can now simply launch `poezio' -You can edit the config file (~/.config/poezio/poezio.cfg by default) +You can edit the configuration file (~/.config/poezio/poezio.cfg by default) or data/default_config.cfg (if you want to edit the config before the -first launch). The default config file is fully commented. +first launch). The default config file is fully commented, but you can +also read the “configure” documentation page. Please, see the online documentation for more information on installing, configuring or using poezio: @@ -140,11 +143,13 @@ we merge it to “master” as well, of course). Thanks ======================= = People = - Link Mauve - Code, testing - Gaëtan Ribémont (http://www.bonbref.com) - Logo design - Ovart - Testing - Koshie - Donation - Gapan - Makefile - FlashCode (weechat dev) - Useful advices on how to use ncurses efficiently + - Link Mauve - Code, testing + - Gaëtan Ribémont (http://www.bonbref.com) - Logo design + - Ovart - Testing + - Koshie - Donation + - Gapan - Makefile + - FlashCode (weechat dev) - Useful advices on how to use ncurses efficiently + - And all the people using and testing poezio, and especially the one present + on the jabber chatroom doing bug reports and/or feature requests. = Project = Gajim - send_vcard method and common.py -- cgit v1.2.3 From 8fed41cd088dfdd43e0848d54234a0791d50dee6 Mon Sep 17 00:00:00 2001 From: mathieui Date: Tue, 8 Nov 2011 11:26:27 +0100 Subject: make clean also cleans the html files generated by asciidoc --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7e71edb1..1fd424ad 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ clean: find ./ -name \*.pyc -delete find ./ -name \*~ -delete find ./ -name "#*#" -delete + find ./ -name "*.html" -delete install: mkdir -p $(DESTDIR)$(prefix) @@ -39,4 +40,4 @@ doc: pot: xgettext src/*.py --from-code=utf-8 --keyword=_ -o locale/poezio.pot -.PHONY : doc \ No newline at end of file +.PHONY : doc -- cgit v1.2.3 From 2b74ebcb724d911fae6a9faa177950e5c3ddf386 Mon Sep 17 00:00:00 2001 From: mathieui Date: Tue, 8 Nov 2011 11:26:49 +0100 Subject: Key bindings in the doc. --- doc/en/keys.txt | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/doc/en/keys.txt b/doc/en/keys.txt index eaae961d..e7da0b0e 100644 --- a/doc/en/keys.txt +++ b/doc/en/keys.txt @@ -25,6 +25,22 @@ These keys work in *any* tab. *Alt-j*:: Waits for you to type a two-digits number. Go to tab number xx. +*Alt-e*:: Go to the tab with a higher priority (highlight = private message > message > non-empty input). + +*Alt-z*:: Go to the previous tab. + +*Alt-r*:: Go to the roster. + +*F7*:: Shrink the information buffer. + +*F8*:: Grow the information buffer. + +*Ctrl-l*:: Refresh the screen. + +*PageUp*:: Scroll a page up. + +*PageDown*:: Scroll a page down. + Input keys ~~~~~~~~~~ These keys concern only the inputs. @@ -47,6 +63,59 @@ These keys work in any conversation tab (MultiUserChat, Private or Conversation *Alt-/*:: Complete what you’re typing using the "recent" words from the current conversation, if any. +*Alt-v*:: Move the separator at the bottom of the tab. + +MultiUserChat tab input keys +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +These keys work only in the MultiUserChat tab. + +*Alt-u*:: Scroll the user list down. + +*Alt-y*:: Scroll the user list up. + +*tabulation*:: Complete a nick. + + +MultiUserChat List tab input keys +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +These keys work only in the MultiUserChat List tab (obtained with /list ). + +*Up*:: Go up one row. + +*Down*:: Go down one row. + +*j*:: Join the MultiUserChat currently selected. + +*J*:: Join the MultiUserChat currently selected, without giving focus to iuts tab. + +*Ctrl-M*:: Join the MultiUserChat currently selected (same as "j"). + + +Roster tab input keys +~~~~~~~~~~~~~~~~~~~~~ + +These keys work only in the Roster tab (the tab number 0). + +*/*:: Open a prompt for commands. + +*s*:: Start a search on the contacts. + +*Alt-u*:: Move the cursor to the next group. + +*Alt-y*:: Move the cursor to the previous group. + +The following will not work if you can still write things in the input +(meaning you previously typed "s" or "/"): + +*Space*:: Fold/Unfold the current item. + +*Up*:: Move the cursor down one contact. + +*Down*:: Move the cursor up one contact. + +*o*:: Show the offline contacts. + Key configuration ----------------- Bindings are keyboard shortcut aliases. You can use them -- cgit v1.2.3 From fa94e7fbe668b88b20316f6d0900d5321aeb9a70 Mon Sep 17 00:00:00 2001 From: mathieui Date: Tue, 8 Nov 2011 12:45:05 +0100 Subject: Doc: Key bindings - Fixed PgUp/Down --- doc/en/keys.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/en/keys.txt b/doc/en/keys.txt index e7da0b0e..b49540bc 100644 --- a/doc/en/keys.txt +++ b/doc/en/keys.txt @@ -37,10 +37,6 @@ These keys work in *any* tab. *Ctrl-l*:: Refresh the screen. -*PageUp*:: Scroll a page up. - -*PageDown*:: Scroll a page down. - Input keys ~~~~~~~~~~ These keys concern only the inputs. @@ -65,6 +61,10 @@ These keys work in any conversation tab (MultiUserChat, Private or Conversation *Alt-v*:: Move the separator at the bottom of the tab. +*PageUp*:: Scroll a page of messages up. + +*PageDown*:: Scroll a page of messages down. + MultiUserChat tab input keys ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -76,7 +76,6 @@ These keys work only in the MultiUserChat tab. *tabulation*:: Complete a nick. - MultiUserChat List tab input keys ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ These keys work only in the MultiUserChat List tab (obtained with /list ). @@ -91,6 +90,9 @@ These keys work only in the MultiUserChat List tab (obtained with /list *Ctrl-M*:: Join the MultiUserChat currently selected (same as "j"). +*PageUp*:: Scroll a page of chats up. + +*PageDown*:: Scroll a page of messages down. Roster tab input keys ~~~~~~~~~~~~~~~~~~~~~ @@ -116,6 +118,11 @@ The following will not work if you can still write things in the input *o*:: Show the offline contacts. +*PageUp*:: Scroll a page of contacts up. + +*PageDown*:: Scroll a page of contacts down. + + Key configuration ----------------- Bindings are keyboard shortcut aliases. You can use them -- cgit v1.2.3 From e8d6c5ccc17313872e3dd99a36eeee291d41257d Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Tue, 8 Nov 2011 19:43:12 +0100 Subject: Complete the keys documentation a little bit more. --- doc/en/keys.txt | 90 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 17 deletions(-) diff --git a/doc/en/keys.txt b/doc/en/keys.txt index b49540bc..f4b659f7 100644 --- a/doc/en/keys.txt +++ b/doc/en/keys.txt @@ -7,12 +7,14 @@ configure them. By default, most keys manipulating the input (where you type your messages and commands) behave like emacs does. -Note that keys are case sensitive. Ctrl-X is not the same than Ctrl-x +NOTE: keys are case sensitive. Ctrl-X is not the same than Ctrl-x + Key bindings listing -------------------- Some key bindings are available only in some tabs, others are global. + Global keys ~~~~~~~~~~~ These keys work in *any* tab. @@ -21,15 +23,16 @@ These keys work in *any* tab. *Ctrl-p*:: Go to the previous tab. -*Alt-number*:: Go to tab number x. +*Alt-number*:: Go to the tab with that number. *Alt-j*:: Waits for you to type a two-digits number. Go to tab number xx. -*Alt-e*:: Go to the tab with a higher priority (highlight = private message > message > non-empty input). +*Alt-e*:: Go to the tab with a higher priority (private message > + highlight > message > non-empty input). -*Alt-z*:: Go to the previous tab. +*Alt-z*:: Go to the previously selected tab. -*Alt-r*:: Go to the roster. +*Alt-r*:: Go to the roster tab. *F7*:: Shrink the information buffer. @@ -37,33 +40,46 @@ These keys work in *any* tab. *Ctrl-l*:: Refresh the screen. + Input keys ~~~~~~~~~~ These keys concern only the inputs. +NOTE: The clipboard is common to all inputs. This lets you cut a text +from one input to paste it into an other one. + *Ctrl-a*:: Move the cursor to the beginning of line. *Ctrl-e*:: Move the cursor to the end of line. +*Ctrl-u*:: Delete the text from the start of the input until the cursor + and save it to the clipboard. + +*Ctrl-k*:: Delete the text from the cursor until the end of the input + and save it to the clipboard. + +*Ctrl-y*:: Insert the content of the clipboard at the cursor position. + + Chat tab input keys ~~~~~~~~~~~~~~~~~~~~~ -These keys work in any conversation tab (MultiUserChat, Private or Conversation tabs) +These keys work in any conversation tab (MultiUserChat, Private or +Conversation tabs). *Key Up*:: Use the previous message from the message history. *Key Down*:: Use the next message from the message history. -*Page Up*:: Scroll up in the conversation by x lines, where x is the height of the conversation window - 1. +*Page Up*:: Scroll up in the conversation by x lines, where x is the +height of the conversation window - 1. -*Page Down*:: Likfe Page Up, but down. +*Page Down*:: Like Page Up, but down. -*Alt-/*:: Complete what you’re typing using the "recent" words from the current conversation, if any. +*Alt-/*:: Complete what you’re typing using the "recent" words from the + current conversation, if any. *Alt-v*:: Move the separator at the bottom of the tab. -*PageUp*:: Scroll a page of messages up. - -*PageDown*:: Scroll a page of messages down. MultiUserChat tab input keys ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -76,6 +92,7 @@ These keys work only in the MultiUserChat tab. *tabulation*:: Complete a nick. + MultiUserChat List tab input keys ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ These keys work only in the MultiUserChat List tab (obtained with /list ). @@ -94,6 +111,7 @@ These keys work only in the MultiUserChat List tab (obtained with /list *PageDown*:: Scroll a page of messages down. + Roster tab input keys ~~~~~~~~~~~~~~~~~~~~~ @@ -103,12 +121,16 @@ These keys work only in the Roster tab (the tab number 0). *s*:: Start a search on the contacts. +*S*:: Start a (slow) search with approximation on the contacts. + *Alt-u*:: Move the cursor to the next group. *Alt-y*:: Move the cursor to the previous group. -The following will not work if you can still write things in the input -(meaning you previously typed "s" or "/"): +*Ctrl-c*:: Cancel the input (search or command) + +NOTE: The following will not work if you can still write things in the +input (meaning you previously typed _s_ or _/_): *Space*:: Fold/Unfold the current item. @@ -123,18 +145,52 @@ The following will not work if you can still write things in the input *PageDown*:: Scroll a page of contacts down. +Data Forms tab keys +~~~~~~~~~~~~~~~~~~~ +*Ctrl+y*:: Validate the form, send it and close the tab. + +*Ctrl+g*:: Cancel that form (do not send your changes) and close the + tab. + +*Up*:: Select the next field. + +*Down*:: Select the previous field. + +*Right/Left*:: Switch between possible values, in a jid-multi, + list-multi, list-single or text-multi field. + +*Space*:: Select that option + + +MultiUserChat List tab input keys +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +These keys work only in the MultiUserChat List tab (obtained with /list +). + +*Up*:: Go up one row. + +*Down*:: Go down one row. + +*j*:: Join the MultiUserChat currently selected. + +*J*:: Join the MultiUserChat currently selected, without giving focus to + iuts tab. + +*Ctrl-M*:: Join the MultiUserChat currently selected (same as _j_). + + Key configuration ----------------- Bindings are keyboard shortcut aliases. You can use them to define your own keys to replace the default ones. -where ^x means Control + x -and M-x means Alt + x +where _^x_ means _Control + x_ +and _M-x_ means _Alt + x_ To know exactly what the code of a key is, just run ================== python3 src/keyboard.py ================== -And enter any keys +And enter any key. .Turn Alt-i into a tab key (completion, etc) ================== -- cgit v1.2.3 From 31c773cd209a3e91e579653ab6c6e790792c8a77 Mon Sep 17 00:00:00 2001 From: mathieui Date: Tue, 8 Nov 2011 13:26:31 +0100 Subject: Add general commands in the usage help --- doc/en/usage.txt | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 doc/en/usage.txt diff --git a/doc/en/usage.txt b/doc/en/usage.txt new file mode 100644 index 00000000..be6809ba --- /dev/null +++ b/doc/en/usage.txt @@ -0,0 +1,59 @@ +Usage +===== + +Commands +-------- + +Command listing +~~~~~~~~~~~~~~~ + +The commands are shown like this: + +/command [optional argument] + +Global commands +^^^^^^^^^^^^^^^ + +These commands work in *any* tab. + +*/join [room_name][@server][/nick] [password]*:: Join the specified room. You can specify a nickname after a slash (/). If no nickname is specified, you will use the default_nick in the configuration file. You can omit the room name: you will then join the room you're looking at (useful if you were kicked). You can also provide a room_name without specifying a server, the server of the room you're currently in will be used. You can also provide a password to join the room. + +- Examples: +* /join room@server.tld +* /join room@server.tld/John +* /join room2 +* /join /me_again +* /join +* /join room@server.tld/my_nick password +* /join / password + +*/exit*:: Just disconnect from the server and exit poezio. + +*/quit*:: Like /exit. + +*/next*:: Go to the next room. + +*/prev*:: Go to the previous room. + +*/win *:: Go to the specified room. + +*/w *:: Like /win. + +*/status [status message]*:: Set your availability and (optionaly) your status message. The argument is one of "available, chat, away, afk, dnd, busy, xa" and the optional [status] argument will be your status message.' + +*/bookmark [roomname][/nick]*:: Bookmark the specified room (you will then auto-join it on each poezio start). This commands uses the same syntax as /join. Type /help join for syntax examples. Note that when typing /bookmark on its own, the room will be bookmarked with the nickname you're currently using in this room (instead of default_nick). + +*/set